From 75573340f85470ba8cbceb4af29d1db0932e0e45 Mon Sep 17 00:00:00 2001 From: Dobromir Popov Date: Fri, 3 May 2024 16:47:28 +0300 Subject: [PATCH 1/3] crf fix when logged out --- package-lock.json | 6 ------ pages/auth/signin.tsx | 4 +++- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index e6292bd..1dbaf43 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26,7 +26,6 @@ "axios": "^1.6.7", "axios-jwt": "^4.0.2", "bcrypt": "^5.1.1", - "bcryptjs": "^2.4.3", "date-fns": "^3.3.1", "docx": "^8.5.0", "docx-templates": "^4.11.4", @@ -5499,11 +5498,6 @@ "tweetnacl": "^0.14.3" } }, - "node_modules/bcryptjs": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz", - "integrity": "sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ==" - }, "node_modules/bidi-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/bidi-js/-/bidi-js-1.0.3.tgz", diff --git a/pages/auth/signin.tsx b/pages/auth/signin.tsx index ce655e3..a22b01a 100644 --- a/pages/auth/signin.tsx +++ b/pages/auth/signin.tsx @@ -131,9 +131,11 @@ export default function SignIn({ csrfToken }) { // This gets called on every request export async function getServerSideProps(context) { + const csrfToken = await getCsrfToken(context); return { props: { - csrfToken: await getCsrfToken(context), + ...(csrfToken ? { csrfToken } : {}), }, }; } + From 43a4f93bb3be29e15f800fca87b60b98892a7e40 Mon Sep 17 00:00:00 2001 From: Dobromir Popov Date: Fri, 3 May 2024 21:18:08 +0300 Subject: [PATCH 2/3] email subscription labels update --- components/publisher/PublisherForm.js | 58 ++++++++++++++++++++++----- 1 file changed, 49 insertions(+), 9 deletions(-) diff --git a/components/publisher/PublisherForm.js b/components/publisher/PublisherForm.js index 1635270..fc4b42f 100644 --- a/components/publisher/PublisherForm.js +++ b/components/publisher/PublisherForm.js @@ -246,15 +246,54 @@ export default function PublisherForm({ item, me }) { -
- {/* notifications */} -
- - - - - {/* prompt to install PWA */} -
+ + {/* notifications */} +
+
+ Известия по имейл +
+
+ + +
+
+ + +
+
+ + +
+
+
{/* button to install PWA */} @@ -267,6 +306,7 @@ export default function PublisherForm({ item, me }) { {/* ADMINISTRATORS ONLY */}
+ {/* prompt to install PWA */}
From 924928178548c1611091146425767ac329b6016b Mon Sep 17 00:00:00 2001 From: Dobromir Popov Date: Sat, 4 May 2024 00:51:31 +0300 Subject: [PATCH 3/3] fix searchreplacemet UI on small screens --- components/publisher/SearchReplacement.js | 75 ++++++++++++----------- 1 file changed, 39 insertions(+), 36 deletions(-) diff --git a/components/publisher/SearchReplacement.js b/components/publisher/SearchReplacement.js index 5d69bf1..9f9b545 100644 --- a/components/publisher/SearchReplacement.js +++ b/components/publisher/SearchReplacement.js @@ -85,43 +85,46 @@ function ConfirmationModal({ isOpen, onClose, onConfirm, subscribedPublishers, a return (
-
+

Можете да изпратите заявка за заместник до следните групи:

-
- -
-
- +
+
+ handleToggleGroup('subscribedPublishers')} + /> + +
+
+ +
+
+ handleToggleGroup('availablePublishers')} + /> + +
+
+ +