From aa0a2ac373fd1cb5b10a564a951de25c95837820 Mon Sep 17 00:00:00 2001 From: Dobromir Popov Date: Tue, 2 Apr 2024 01:34:46 +0300 Subject: [PATCH 1/4] v bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ce05476..3858483 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pwwa", - "version": "1.1.1", + "version": "1.1.2", "private": true, "description": "JW PW Web App", "repository": "http://git.d-popov.com/popov/next-cart-app.git", From eb7aa228e75a62b2a8968994f7159419a2fc47c4 Mon Sep 17 00:00:00 2001 From: Dobromir Popov Date: Tue, 2 Apr 2024 01:37:26 +0300 Subject: [PATCH 2/4] fix typo --- pages/api/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/api/index.ts b/pages/api/index.ts index b6a9da3..a6ee908 100644 --- a/pages/api/index.ts +++ b/pages/api/index.ts @@ -594,7 +594,7 @@ export async function filterPublishers(selectFields, searchText, filterDate, fet // This includes availabilities from previous assignments but not with preference { dayOfMonth: null, // includes monthly and weekly repeats - dayofweek: dayOfWeekEnum, + dayofweek: dayOfWeekEnum // ToDo: and weekOfMonth //startTime: { gte: currentMonthStart }, } From a81a19bbb7b615b06bc40485ee2098ae7b4ea93c Mon Sep 17 00:00:00 2001 From: Dobromir Popov Date: Tue, 2 Apr 2024 01:42:06 +0300 Subject: [PATCH 3/4] fix domain name typo --- .env.production | 4 ++-- components/publisher/PublisherForm.js | 2 +- pages/contactUs.tsx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.env.production b/.env.production index 8f9c4eb..5853ac7 100644 --- a/.env.production +++ b/.env.production @@ -1,7 +1,7 @@ PORT= -HOST=sofia.mwhitnessing.com +HOST=sofia.mwitnessing.com 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 NEXTAUTH_SECRET=1dd8a5457970d1dda50600be28e935ecc4513ff27c49c431849e6746f158d638 diff --git a/components/publisher/PublisherForm.js b/components/publisher/PublisherForm.js index a95e520..e3e6f16 100644 --- a/components/publisher/PublisherForm.js +++ b/components/publisher/PublisherForm.js @@ -282,7 +282,7 @@ export default function PublisherForm({ item, me }) { - + Телеграм Телеграм diff --git a/pages/contactUs.tsx b/pages/contactUs.tsx index a7cd1a8..6fb5088 100644 --- a/pages/contactUs.tsx +++ b/pages/contactUs.tsx @@ -24,7 +24,7 @@ const ContactsPage = () => { */ } - {/* + {/* Телеграм Телеграм */} From 1e1c4888d870984e9766ed99ce15f1fd4b2cc1b5 Mon Sep 17 00:00:00 2001 From: Dobromir Popov Date: Tue, 2 Apr 2024 01:42:54 +0300 Subject: [PATCH 4/4] email related publisher settings: data model --- prisma/schema.prisma | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/prisma/schema.prisma b/prisma/schema.prisma index b76fc17..1faea21 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -106,20 +106,21 @@ model Publisher { userId String? @unique user User? @relation(fields: [userId], references: [id]) - role UserRole @default(USER) - desiredShiftsPerMonth Int @default(4) - isMale Boolean @default(true) - isNameForeign Boolean @default(false) - - familyHeadId String? // Optional familyHeadId for each family member - familyHead Publisher? @relation("FamilyMember", fields: [familyHeadId], references: [id]) - familyMembers Publisher[] @relation("FamilyMember") - alwaysAsFamily Boolean? @default(false) //NEW v1.0.1 // New field to indicate if the publisher always wants to be assigned with the family - type PublisherType @default(Publisher) - town String? - comments String? - reports Report[] - Message Message[] + role UserRole @default(USER) + desiredShiftsPerMonth Int @default(4) + isMale Boolean @default(true) + isNameForeign Boolean @default(false) + isSubscribedToCoverMe Boolean @default(false) + isSubscribedToReminders Boolean @default(false) + familyHeadId String? // Optional familyHeadId for each family member + familyHead Publisher? @relation("FamilyMember", fields: [familyHeadId], references: [id]) + familyMembers Publisher[] @relation("FamilyMember") + alwaysAsFamily Boolean? @default(false) //NEW v1.0.1 // New field to indicate if the publisher always wants to be assigned with the family + type PublisherType @default(Publisher) + town String? + comments String? + reports Report[] + Message Message[] } model Availability {