Skip to content

armgit / kaneo

Public Imported from GitHub
0

⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.

feat: add Saturday week-start option

Navdeep Singh23327e3803cb
diff --git a/apps/web/src/routes/_layout/_authenticated/dashboard/settings/account/preferences.tsx b/apps/web/src/routes/_layout/_authenticated/dashboard/settings/account/preferences.tsx
index c98d6b7d9..a1a462e8d 100644
--- a/apps/web/src/routes/_layout/_authenticated/dashboard/settings/account/preferences.tsx
+++ b/apps/web/src/routes/_layout/_authenticated/dashboard/settings/account/preferences.tsx
@@ -18,7 +18,12 @@ import {
import { Separator } from "@/components/ui/separator";
import { Switch } from "@/components/ui/switch";
import { useLocale } from "@/hooks/use-locale";
-import { useUserPreferencesStore } from "@/store/user-preferences";
+import {
+ isWeekStartDay,
+ useUserPreferencesStore,
+ WEEK_START_DAYS,
+ type WeekStartDay,
+} from "@/store/user-preferences";
export const Route = createFileRoute(
"/_layout/_authenticated/dashboard/settings/account/preferences",
@@ -85,9 +90,10 @@ function RouteComponent() {
board: t("settings:preferencesPage.board"),
list: t("settings:preferencesPage.list"),
};
- const weekStartLabels: Record<"0" | "1", string> = {
- "0": t("settings:preferencesPage.weekStartsOnSunday"),
- "1": t("settings:preferencesPage.weekStartsOnMonday"),
+ const weekStartLabels: Record<WeekStartDay, string> = {
+ 0: t("settings:preferencesPage.weekStartsOnSunday"),
+ 1: t("settings:preferencesPage.weekStartsOnMonday"),
+ 6: t("settings:preferencesPage.weekStartsOnSaturday"),
};
const selectedLocale: AppLocale = locale ?? defaultLocale;
@@ -198,8 +204,14 @@ function RouteComponent() {
<Select
value={String(weekStartsOn)}
onValueChange={(value) => {
- if (value === "0" || value === "1") {
- setWeekStartsOn(Number(value) as 0 | 1);
+ if (!value) {
+ return;
+ }
+
+ const parsedWeekStart = Number(value);
+
+ if (isWeekStartDay(parsedWeekStart)) {
+ setWeekStartsOn(parsedWeekStart);
}
}}
>
@@ -209,16 +221,15 @@ function RouteComponent() {
"settings:preferencesPage.selectFirstDayOfWeek",
)}
>
- {weekStartLabels[String(weekStartsOn) as "0" | "1"]}
+ {weekStartLabels[weekStartsOn]}
</SelectValue>
</SelectTrigger>
<SelectContent>
- <SelectItem value="0">
- {t("settings:preferencesPage.weekStartsOnSunday")}
- </SelectItem>
- <SelectItem value="1">
- {t("settings:preferencesPage.weekStartsOnMonday")}
- </SelectItem>
+ {WEEK_START_DAYS.map((day) => (
+ <SelectItem key={day} value={String(day)}>
+ {weekStartLabels[day]}
+ </SelectItem>
+ ))}
</SelectContent>
</Select>
</div>
diff --git a/apps/web/src/store/user-preferences.ts b/apps/web/src/store/user-preferences.ts
index 60019394f..e745ab7e2 100644
--- a/apps/web/src/store/user-preferences.ts
+++ b/apps/web/src/store/user-preferences.ts
@@ -1,6 +1,13 @@
import { create } from "zustand";
import { createJSONStorage, persist } from "zustand/middleware";
+export const WEEK_START_DAYS = [0, 1, 6] as const;
+export type WeekStartDay = (typeof WEEK_START_DAYS)[number];
+
+export function isWeekStartDay(value: number): value is WeekStartDay {
+ return WEEK_START_DAYS.some((day) => day === value);
+}
+
type UserPreferencesStore = {
theme: "light" | "dark" | "system";
setTheme: (
@@ -34,8 +41,8 @@ type UserPreferencesStore = {
sidebarDefaultOpen: boolean;
setSidebarDefaultOpen: (open: boolean) => void;
- weekStartsOn: 0 | 1;
- setWeekStartsOn: (weekStartsOn: 0 | 1) => void;
+ weekStartsOn: WeekStartDay;
+ setWeekStartsOn: (weekStartsOn: WeekStartDay) => void;
};
export const useUserPreferencesStore = create<UserPreferencesStore>()(
diff --git a/i18n/en-US.json b/i18n/en-US.json
index 0415238e2..8ad5cf085 100644
--- a/i18n/en-US.json
+++ b/i18n/en-US.json
@@ -445,10 +445,11 @@
"languageDescription": "Choose your preferred interface language",
"selectLanguage": "Select a language",
"firstDayOfWeek": "First Day of Week",
- "firstDayOfWeekDescription": "Choose whether calendars and weekly ranges start on Sunday or Monday",
- "selectFirstDayOfWeek": "Select the first day",
+ "firstDayOfWeekDescription": "Choose which day calendars and weekly ranges start on",
+ "selectFirstDayOfWeek": "Select first day",
"weekStartsOnSunday": "Sunday",
"weekStartsOnMonday": "Monday",
+ "weekStartsOnSaturday": "Saturday",
"defaultView": "Default View",
"defaultViewDescription": "Choose your preferred task view mode",
"selectViewMode": "Select a view mode",