popov/mwitnessing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '1e1c4888d870984e9766ed99ce15f1fd4b2cc1b5'

Browse Source
This commit is contained in:
Dobromir Popov
2024-04-02 01:45:02 +03:00
parent 5901c11761 1e1c4888d8
commit 91145bdad1
6 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.env.production
View File

@ -1,7 +1,7 @@
PORT= PORT=
HOST=sofia.mwhitnessing.com HOST=sofia.mwitnessing.com
PROTOCOL=http # we're behind a reverse proxy. SSL is handled by the proxy PROTOCOL=http # we're behind a reverse proxy. SSL is handled by the proxy
NEXT_PUBLIC_PUBLIC_URL= https://sofia.mwhitnessing.com NEXT_PUBLIC_PUBLIC_URL= https://sofia.mwitnessing.com
# Linux: `openssl rand -hex 32` or go to https://generate-secret.now.sh/32 # Linux: `openssl rand -hex 32` or go to https://generate-secret.now.sh/32
NEXTAUTH_SECRET=1dd8a5457970d1dda50600be28e935ecc4513ff27c49c431849e6746f158d638 NEXTAUTH_SECRET=1dd8a5457970d1dda50600be28e935ecc4513ff27c49c431849e6746f158d638

2
components/publisher/PublisherForm.js
View File

@ -282,7 +282,7 @@ export default function PublisherForm({ item, me }) {
</select> </select>
</div> </div>
<a href="https://t.me/mwhitnessing_bot" className="inline-flex items-center ml-4" target="_blank"> <a href="https://t.me/mwHitnessing_bot" className="inline-flex items-center ml-4" target="_blank">
<img src="/content/icons/telegram-svgrepo-com.svg" alt="Телеграм" width="32" height="32" className="align-middle" /> <img src="/content/icons/telegram-svgrepo-com.svg" alt="Телеграм" width="32" height="32" className="align-middle" />
<span className="align-middle">Телеграм</span> <span className="align-middle">Телеграм</span>
</a> </a>

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "pwwa", "name": "pwwa",
"version": "1.1.1", "version": "1.1.2",
"private": true, "private": true,
"description": "JW PW Web App", "description": "JW PW Web App",
"repository": "http://git.d-popov.com/popov/next-cart-app.git", "repository": "http://git.d-popov.com/popov/next-cart-app.git",

2
pages/api/index.ts
View File

@ -594,7 +594,7 @@ export async function filterPublishers(selectFields, searchText, filterDate, fet
// This includes availabilities from previous assignments but not with preference // This includes availabilities from previous assignments but not with preference
{ {
dayOfMonth: null, // includes monthly and weekly repeats dayOfMonth: null, // includes monthly and weekly repeats
dayofweek: dayOfWeekEnum, dayofweek: dayOfWeekEnum
// ToDo: and weekOfMonth // ToDo: and weekOfMonth
//startTime: { gte: currentMonthStart }, //startTime: { gte: currentMonthStart },
} }

2
pages/contactUs.tsx
View File

@ -24,7 +24,7 @@ const ContactsPage = () => {
</div> </div>
</div > */ </div > */
} }
{/* <a href="https://t.me/mwhitnessing_bot" className="inline-flex items-center ml-4" target="_blank"> {/* <a href="https://t.me/mwHitnessing_bot" className="inline-flex items-center ml-4" target="_blank">
<img src="styles/icons/telegram-svgrepo-com.svg" alt="Телеграм" width="32" height="32" className="align-middle" /> <img src="styles/icons/telegram-svgrepo-com.svg" alt="Телеграм" width="32" height="32" className="align-middle" />
<span className="align-middle">Телеграм</span> <span className="align-middle">Телеграм</span>
</a> */} </a> */}

29
prisma/schema.prisma
View File

@ -106,20 +106,21 @@ model Publisher {
userId String? @unique userId String? @unique
user User? @relation(fields: [userId], references: [id]) user User? @relation(fields: [userId], references: [id])
role UserRole @default(USER) role UserRole @default(USER)
desiredShiftsPerMonth Int @default(4) desiredShiftsPerMonth Int @default(4)
isMale Boolean @default(true) isMale Boolean @default(true)
isNameForeign Boolean @default(false) isNameForeign Boolean @default(false)
isSubscribedToCoverMe Boolean @default(false)
familyHeadId String? // Optional familyHeadId for each family member isSubscribedToReminders Boolean @default(false)
familyHead Publisher? @relation("FamilyMember", fields: [familyHeadId], references: [id]) familyHeadId String? // Optional familyHeadId for each family member
familyMembers Publisher[] @relation("FamilyMember") familyHead Publisher? @relation("FamilyMember", fields: [familyHeadId], references: [id])
alwaysAsFamily Boolean? @default(false) //NEW v1.0.1 // New field to indicate if the publisher always wants to be assigned with the family familyMembers Publisher[] @relation("FamilyMember")
type PublisherType @default(Publisher) alwaysAsFamily Boolean? @default(false) //NEW v1.0.1 // New field to indicate if the publisher always wants to be assigned with the family
town String? type PublisherType @default(Publisher)
comments String? town String?
reports Report[] comments String?
Message Message[] reports Report[]
Message Message[]
} }
model Availability { model Availability {