From c2132836c07bbece332aad6e7740ff6d065e923f Mon Sep 17 00:00:00 2001 From: e-zz <37920155+e-zz@users.noreply.github.com> Date: Mon, 8 Apr 2024 15:18:21 +0200 Subject: [PATCH] feat: start of week --- src/Agenda3/components/calendar/Calendar.tsx | 3 ++- .../SettingsModal/GeneralSettingsForm.tsx | 18 ++++++++++++++++++ src/Agenda3/models/settings.ts | 1 + 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/Agenda3/components/calendar/Calendar.tsx b/src/Agenda3/components/calendar/Calendar.tsx index c1078e2..a8a624e 100644 --- a/src/Agenda3/components/calendar/Calendar.tsx +++ b/src/Agenda3/components/calendar/Calendar.tsx @@ -45,6 +45,7 @@ const Calendar = ({ onCalendarTitleChange }: CalendarProps, ref) => { const tasksWithStart = useAtomValue(tasksWithStartAtom) const settings = useAtomValue(settingsAtom) const { currentGraph } = useAtomValue(logseqAtom) + const startingDay = settings.general?.startOfWeek const groupType = settings.selectedFilters?.length ? 'filter' : 'page' const showTasks = tasksWithStart?.filter((task) => settings.viewOptions?.hideCompleted ? task.status === 'todo' : true, @@ -191,7 +192,7 @@ const Calendar = ({ onCalendarTitleChange }: CalendarProps, ref) => { weekNumbers weekNumberContent={({ num, date }) => } defaultTimedEventDuration="00:30" - firstDay={1} + firstDay={Number(startingDay)} fixedWeekCount={false} ref={calendarRef} height="100%" diff --git a/src/Agenda3/components/modals/SettingsModal/GeneralSettingsForm.tsx b/src/Agenda3/components/modals/SettingsModal/GeneralSettingsForm.tsx index 7bc545e..f321f13 100644 --- a/src/Agenda3/components/modals/SettingsModal/GeneralSettingsForm.tsx +++ b/src/Agenda3/components/modals/SettingsModal/GeneralSettingsForm.tsx @@ -44,6 +44,24 @@ const GeneralSettingsForm = () => { ]} /> +
+
Start of Week
+