From 897278580a12d293bf1625bfc2ca473192c65171 Mon Sep 17 00:00:00 2001 From: mrtavor Date: Wed, 11 Dec 2024 15:04:49 +0100 Subject: [PATCH 1/4] added margin left for notification & etc. titels | edited border radius for last time part --- src/components/drawer/index.tsx | 1 + .../midweek/S140/app_normal/S140PartTime.tsx | 13 +++++++++++-- .../meetings/midweek/S140/app_normal/index.tsx | 11 +++++++++++ .../meetings/midweek/S140/app_normal/index.types.ts | 1 + 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/components/drawer/index.tsx b/src/components/drawer/index.tsx index 454c616fd8..e76077e142 100644 --- a/src/components/drawer/index.tsx +++ b/src/components/drawer/index.tsx @@ -85,6 +85,7 @@ const Drawer: FC = ({ justifyContent={'space-between'} alignItems={'center'} mb={'24px'} + ml={'12px'} > {title} diff --git a/src/views/meetings/midweek/S140/app_normal/S140PartTime.tsx b/src/views/meetings/midweek/S140/app_normal/S140PartTime.tsx index f5b74af298..e542e7635e 100644 --- a/src/views/meetings/midweek/S140/app_normal/S140PartTime.tsx +++ b/src/views/meetings/midweek/S140/app_normal/S140PartTime.tsx @@ -2,9 +2,18 @@ import { Text, View } from '@react-pdf/renderer'; import { S140PartTimeType } from './index.types'; import styles from './index.styles'; -const S140PartTime = ({ time, color, backgroundColor }: S140PartTimeType) => { +const S140PartTime = ({ + time, + color, + backgroundColor, + isClosingSong, +}: S140PartTimeType) => { + const conditionalStyle = isClosingSong ? { borderBottomLeftRadius: 6 } : {}; + return ( - + {time} ); diff --git a/src/views/meetings/midweek/S140/app_normal/index.tsx b/src/views/meetings/midweek/S140/app_normal/index.tsx index 9aac9d2866..d806a7d22b 100644 --- a/src/views/meetings/midweek/S140/app_normal/index.tsx +++ b/src/views/meetings/midweek/S140/app_normal/index.tsx @@ -71,6 +71,7 @@ const TemplateS140AppNormal = ({ time={meetingData.timing.pgm_start} color="#3B4CA3" backgroundColor="#F2F5FF" + isClosingSong={false} /> @@ -243,6 +250,7 @@ const TemplateS140AppNormal = ({ time={meetingData.timing.co_talk} color="#942926" backgroundColor="rgba(184, 43, 16, 0.08)" + isClosingSong={false} /> @@ -269,6 +277,7 @@ const TemplateS140AppNormal = ({ time={meetingData.timing.cbs} color="#942926" backgroundColor="rgba(184, 43, 16, 0.08)" + isClosingSong={false} /> @@ -306,6 +316,7 @@ const TemplateS140AppNormal = ({ time={meetingData.timing.pgm_end} color="#942926" backgroundColor="rgba(184, 43, 16, 0.08)" + isClosingSong={true} /> Date: Wed, 11 Dec 2024 22:47:08 +0100 Subject: [PATCH 2/4] Added a new key and illustration for empty assignments, updated the illustration and text in the Notifications pop-up --- src/assets/img/illustration_no_assigments.svg | 10 +++++++ .../app_notification/container/index.tsx | 3 +- .../meetings/my_assignments/index.tsx | 28 +++++++++++++++++++ src/locales/en/congregation.json | 1 + 4 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 src/assets/img/illustration_no_assigments.svg diff --git a/src/assets/img/illustration_no_assigments.svg b/src/assets/img/illustration_no_assigments.svg new file mode 100644 index 0000000000..f0b20885a0 --- /dev/null +++ b/src/assets/img/illustration_no_assigments.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/features/app_notification/container/index.tsx b/src/features/app_notification/container/index.tsx index 6bdf9a30df..e57e9592ce 100644 --- a/src/features/app_notification/container/index.tsx +++ b/src/features/app_notification/container/index.tsx @@ -34,9 +34,10 @@ const NotificationContainer = ({ {notifications.length === 0 && ( diff --git a/src/features/meetings/my_assignments/index.tsx b/src/features/meetings/my_assignments/index.tsx index 8e7ecffa3e..cfb87c5611 100644 --- a/src/features/meetings/my_assignments/index.tsx +++ b/src/features/meetings/my_assignments/index.tsx @@ -9,6 +9,7 @@ import MenuItem from '@components/menuitem'; import MonthContainer from './month_container'; import Select from '@components/select'; import Typography from '@components/typography'; +import NoAssigmentsImg from '@assets/img/illustration_no_assigments.svg?component'; const MyAssignments = () => { const { t } = useAppTranslation(); @@ -70,6 +71,33 @@ const MyAssignments = () => { }, }} > + {personAssignments.length === 0 && ( + + + + + {t('tr_noAssignmentsYet')} + + + {t('tr_noAssignmentsYetDesc')} + + + + )} + {personAssignments.map((month) => ( diff --git a/src/locales/en/congregation.json b/src/locales/en/congregation.json index f1bb8517e5..7d597dec55 100644 --- a/src/locales/en/congregation.json +++ b/src/locales/en/congregation.json @@ -29,6 +29,7 @@ "tr_ministerialServants": "Ministerial servants", "tr_studentAssignments": "Student assignments", "tr_noAssignmentsYet": "No assignments yet", + "tr_noAssignmentsYetDesc": "You don’t have any upcoming assignments, or none that match your current display filter.", "tr_withTerritory": "With territory", "tr_withoutTerritory": "Without territory", "tr_overdue": "Overdue", From 89e764f9079a3707b42e5f765c56b2d7a4adbb48 Mon Sep 17 00:00:00 2001 From: mrtavor Date: Thu, 12 Dec 2024 08:26:03 +0100 Subject: [PATCH 3/4] isClosingSong updated --- src/views/meetings/midweek/S140/app_normal/index.tsx | 10 ---------- .../meetings/midweek/S140/app_normal/index.types.ts | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/views/meetings/midweek/S140/app_normal/index.tsx b/src/views/meetings/midweek/S140/app_normal/index.tsx index d806a7d22b..4da72b3258 100644 --- a/src/views/meetings/midweek/S140/app_normal/index.tsx +++ b/src/views/meetings/midweek/S140/app_normal/index.tsx @@ -71,7 +71,6 @@ const TemplateS140AppNormal = ({ time={meetingData.timing.pgm_start} color="#3B4CA3" backgroundColor="#F2F5FF" - isClosingSong={false} /> @@ -250,7 +243,6 @@ const TemplateS140AppNormal = ({ time={meetingData.timing.co_talk} color="#942926" backgroundColor="rgba(184, 43, 16, 0.08)" - isClosingSong={false} /> @@ -277,7 +269,6 @@ const TemplateS140AppNormal = ({ time={meetingData.timing.cbs} color="#942926" backgroundColor="rgba(184, 43, 16, 0.08)" - isClosingSong={false} /> diff --git a/src/views/meetings/midweek/S140/app_normal/index.types.ts b/src/views/meetings/midweek/S140/app_normal/index.types.ts index 74bde3a3fb..c7bc13e3c5 100644 --- a/src/views/meetings/midweek/S140/app_normal/index.types.ts +++ b/src/views/meetings/midweek/S140/app_normal/index.types.ts @@ -9,7 +9,7 @@ export type S140PartTimeType = { time: string; color: string; backgroundColor: string; - isClosingSong: boolean; + isClosingSong?: boolean; }; export type S140SourceType = { From a2ac8696c61a86e6daba666e1bbf6617efd9e839 Mon Sep 17 00:00:00 2001 From: mrtavor Date: Thu, 12 Dec 2024 17:52:56 +0100 Subject: [PATCH 4/4] Fix the length of the part name for midweek congregation --- .../meetings/midweek/S140/app_normal/S140Source.tsx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/views/meetings/midweek/S140/app_normal/S140Source.tsx b/src/views/meetings/midweek/S140/app_normal/S140Source.tsx index 892c036095..d06d1d76be 100644 --- a/src/views/meetings/midweek/S140/app_normal/S140Source.tsx +++ b/src/views/meetings/midweek/S140/app_normal/S140Source.tsx @@ -12,9 +12,13 @@ const S140Source = ({ return ( {source && ( - - {source} - {duration && ({duration})} + + + {source}{' '} + {duration && ( + ({duration}) + )} + )}