feat: start of week

e-zz · Apr 8, 2024 · c213283 · c213283
1 parent 7a09812
commit c213283
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git 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 }) => <WeekNumber weekNumber={num} date={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
@@ -44,6 +44,24 @@ const GeneralSettingsForm = () => {
  ]}
  />
  </div>
+ <div className="mt-4">
+ <div className="text-gray-500">Start of Week</div>
+ <Select
+ placeholder="Select Start of Week"
+ className="w-[300px]"
+ value={settings.general?.startOfWeek || '1'}
+ onChange={(e) => onChange('general.startOfWeek', e)}
+ options={[
+ { label: 'Sun', value: '0' },
+ { label: 'Mon', value: '1' },
+ { label: 'Tue', value: '2' },
+ { label: 'Wed', value: '3' },
+ { label: 'Thu', value: '4' },
+ { label: 'Fri', value: '5' },
+ { label: 'Sat', value: '6' },
+ ]}
+ />
+ </div>
  </div>
  </>
  )

diff --git a/src/Agenda3/models/settings.ts b/src/Agenda3/models/settings.ts
@@ -6,6 +6,7 @@ export type Settings = {
  general?: {
  useJournalDayAsSchedule?: boolean
  language?: Language
+ startOfWeek?: string
  }
  ics?: {
  repo?: string