⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.
TypeScript honoissue-managementissue-trackerjira-alternativekanbanlinear-alternativemcpproject-managementreactself-hostedtypescript
feat: add configurable first day of week
Tin3e532e606c4e
diff --git a/apps/web/src/components/ui/calendar.tsx b/apps/web/src/components/ui/calendar.tsxindex 9c5a49331..74c6c1ac7 100644--- a/apps/web/src/components/ui/calendar.tsx+++ b/apps/web/src/components/ui/calendar.tsx@@ -9,6 +9,7 @@ import type * as React from "react";import { DayPicker } from "react-day-picker";import { cn } from "@/lib/cn";+import { useUserPreferencesStore } from "@/store/user-preferences";const buttonClassNames ="relative flex size-(--cell-size) text-base sm:text-sm items-center justify-center rounded-lg text-foreground not-in-data-selected:hover:bg-accent disabled:pointer-events-none disabled:opacity-64 [&_svg:not([class*='opacity-'])]:opacity-80 [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0";@@ -18,8 +19,12 @@ function Calendar({classNames,showOutsideDays = true,components: userComponents,+ weekStartsOn: weekStartsOnProp,...props}: React.ComponentProps<typeof DayPicker>) {+ const preferredWeekStartsOn = useUserPreferencesStore(+ (state) => state.weekStartsOn,+ );const defaultClassNames = {button_next: buttonClassNames,button_previous: buttonClassNames,@@ -129,6 +134,7 @@ function Calendar({}}mode="single"showOutsideDays={showOutsideDays}+ weekStartsOn={weekStartsOnProp ?? preferredWeekStartsOn}{...props}/>);diff --git a/apps/web/src/hooks/use-task-filters-with-labels-support.ts b/apps/web/src/hooks/use-task-filters-with-labels-support.tsindex 6db603e8b..107e68b20 100644--- a/apps/web/src/hooks/use-task-filters-with-labels-support.ts+++ b/apps/web/src/hooks/use-task-filters-with-labels-support.ts@@ -1,6 +1,7 @@import { useQueryClient } from "@tanstack/react-query";import { addWeeks, endOfWeek, isWithinInterval, startOfWeek } from "date-fns";import { useCallback, useEffect, useMemo, useState } from "react";+import { useUserPreferencesStore } from "@/store/user-preferences";import type { ProjectWithTasks } from "@/types/project";import type Task from "@/types/task";import { type BoardFilters, DUE_DATE_FILTER_VALUES } from "./use-task-filters";@@ -46,6 +47,7 @@ export function useTaskFiltersWithLabelsSupport(textQuery?: string,) {const queryClient = useQueryClient();+ const weekStartsOn = useUserPreferencesStore((state) => state.weekStartsOn);const storageKey = projectId ? `kaneo:board-filters:${projectId}` : null;const [filters, setFilters] = useState<BoardFilters>(DEFAULT_FILTERS);@@ -139,16 +141,20 @@ export function useTaskFiltersWithLabelsSupport(switch (dueDateFilter) {case DUE_DATE_FILTER_VALUES.dueThisWeek: {- const weekStart = startOfWeek(today);- const weekEnd = endOfWeek(today);+ const weekStart = startOfWeek(today, { weekStartsOn });+ const weekEnd = endOfWeek(today, { weekStartsOn });return isWithinInterval(taskDate, {start: weekStart,end: weekEnd,});}case DUE_DATE_FILTER_VALUES.dueNextWeek: {- const nextWeekStart = startOfWeek(addWeeks(today, 1));- const nextWeekEnd = endOfWeek(addWeeks(today, 1));+ const nextWeekStart = startOfWeek(addWeeks(today, 1), {+ weekStartsOn,+ });+ const nextWeekEnd = endOfWeek(addWeeks(today, 1), {+ weekStartsOn,+ });return isWithinInterval(taskDate, {start: nextWeekStart,end: nextWeekEnd,@@ -182,7 +188,7 @@ export function useTaskFiltersWithLabelsSupport(return true;});},- [filters, getTaskLabels, textQuery],+ [filters, getTaskLabels, textQuery, weekStartsOn],);const filteredProject = useMemo(() => {diff --git a/apps/web/src/hooks/use-task-filters.ts b/apps/web/src/hooks/use-task-filters.tsindex 0827c47a2..cbbce1cb8 100644--- a/apps/web/src/hooks/use-task-filters.ts+++ b/apps/web/src/hooks/use-task-filters.ts@@ -1,5 +1,6 @@import { addWeeks, endOfWeek, isWithinInterval, startOfWeek } from "date-fns";import { useEffect, useState } from "react";+import { useUserPreferencesStore } from "@/store/user-preferences";import type { ProjectWithTasks } from "@/types/project";import type Task from "@/types/task";@@ -56,6 +57,7 @@ export function useTaskFilters(project: ProjectWithTasks | null | undefined,projectId?: string,) {+ const weekStartsOn = useUserPreferencesStore((state) => state.weekStartsOn);const storageKey = projectId ? `kaneo:board-filters:${projectId}` : null;const [filters, setFilters] = useState<BoardFilters>(DEFAULT_FILTERS);@@ -122,16 +124,20 @@ export function useTaskFilters(switch (dueDateFilter) {case DUE_DATE_FILTER_VALUES.dueThisWeek: {- const weekStart = startOfWeek(today);- const weekEnd = endOfWeek(today);+ const weekStart = startOfWeek(today, { weekStartsOn });+ const weekEnd = endOfWeek(today, { weekStartsOn });return isWithinInterval(taskDate, {start: weekStart,end: weekEnd,});}case DUE_DATE_FILTER_VALUES.dueNextWeek: {- const nextWeekStart = startOfWeek(addWeeks(today, 1));- const nextWeekEnd = endOfWeek(addWeeks(today, 1));+ const nextWeekStart = startOfWeek(addWeeks(today, 1), {+ weekStartsOn,+ });+ const nextWeekEnd = endOfWeek(addWeeks(today, 1), {+ weekStartsOn,+ });return isWithinInterval(taskDate, {start: nextWeekStart,end: nextWeekEnd,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.tsxindex 988387109..c98d6b7d9 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@@ -56,6 +56,8 @@ function RouteComponent() {const {theme,setTheme,+ weekStartsOn,+ setWeekStartsOn,viewMode,setViewMode,showTaskNumbers,@@ -83,6 +85,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 selectedLocale: AppLocale = locale ?? defaultLocale;@@ -180,6 +186,45 @@ function RouteComponent() {<Separator />+ <div className="flex items-center justify-between">+ <div className="space-y-0.5">+ <Label className="text-sm font-medium">+ {t("settings:preferencesPage.firstDayOfWeek")}+ </Label>+ <p className="text-xs text-muted-foreground">+ {t("settings:preferencesPage.firstDayOfWeekDescription")}+ </p>+ </div>+ <Select+ value={String(weekStartsOn)}+ onValueChange={(value) => {+ if (value === "0" || value === "1") {+ setWeekStartsOn(Number(value) as 0 | 1);+ }+ }}+ >+ <SelectTrigger size="sm" className="w-40">+ <SelectValue+ placeholder={t(+ "settings:preferencesPage.selectFirstDayOfWeek",+ )}+ >+ {weekStartLabels[String(weekStartsOn) as "0" | "1"]}+ </SelectValue>+ </SelectTrigger>+ <SelectContent>+ <SelectItem value="0">+ {t("settings:preferencesPage.weekStartsOnSunday")}+ </SelectItem>+ <SelectItem value="1">+ {t("settings:preferencesPage.weekStartsOnMonday")}+ </SelectItem>+ </SelectContent>+ </Select>+ </div>++ <Separator />+<div className="flex items-center justify-between"><div className="space-y-0.5"><Label className="text-sm font-medium">diff --git a/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/project/$projectId/gantt.tsx b/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/project/$projectId/gantt.tsxindex cc8187737..8bdedca57 100644--- a/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/project/$projectId/gantt.tsx+++ b/apps/web/src/routes/_layout/_authenticated/dashboard/workspace/$workspaceId/project/$projectId/gantt.tsx@@ -24,6 +24,7 @@ import { useGetTasks } from "@/hooks/queries/task/use-get-tasks";import { useIsMobile } from "@/hooks/use-mobile";import { cn } from "@/lib/cn";import { getStatusLabel } from "@/lib/i18n/domain";+import { useUserPreferencesStore } from "@/store/user-preferences";type GanttSearchParams = {taskId?: string;@@ -50,6 +51,7 @@ function RouteComponent() {const { taskId } = Route.useSearch();const navigate = useNavigate();const { data: project } = useGetTasks(projectId);+ const weekStartsOn = useUserPreferencesStore((state) => state.weekStartsOn);const [searchQuery, setSearchQuery] = useState("");const isMobile = useIsMobile();const [isTaskRailOpen, setIsTaskRailOpen] = useState(false);@@ -135,8 +137,8 @@ function RouteComponent() {// Week-aligned bounds around task dates, then pad with extra days so bars can// be resized or moved past the current last task without running out of grid.- const weekStart = startOfWeek(earliest, { weekStartsOn: 1 });- const weekEnd = endOfWeek(latest, { weekStartsOn: 1 });+ const weekStart = startOfWeek(earliest, { weekStartsOn });+ const weekEnd = endOfWeek(latest, { weekStartsOn });const rangeStart = subDays(weekStart, 7);const rangeEnd = addDays(weekEnd, 28);@@ -148,7 +150,7 @@ function RouteComponent() {gridTemplateColumns: `repeat(${days.length}, minmax(${dayColumnWidthRem}rem, ${dayColumnWidthRem}rem))`,timelineMinWidthRem: days.length * dayColumnWidthRem,};- }, [parsedTasks, dayColumnWidthRem]);+ }, [parsedTasks, dayColumnWidthRem, weekStartsOn]);useLayoutEffect(() => {const element = timelineTrackRef.current;diff --git a/apps/web/src/store/user-preferences.ts b/apps/web/src/store/user-preferences.tsindex a97798f86..60019394f 100644--- a/apps/web/src/store/user-preferences.ts+++ b/apps/web/src/store/user-preferences.ts@@ -33,6 +33,9 @@ type UserPreferencesStore = {sidebarDefaultOpen: boolean;setSidebarDefaultOpen: (open: boolean) => void;++ weekStartsOn: 0 | 1;+ setWeekStartsOn: (weekStartsOn: 0 | 1) => void;};export const useUserPreferencesStore = create<UserPreferencesStore>()(@@ -102,6 +105,9 @@ export const useUserPreferencesStore = create<UserPreferencesStore>()(sidebarDefaultOpen: true,setSidebarDefaultOpen: (open) => set({ sidebarDefaultOpen: open }),++ weekStartsOn: 0,+ setWeekStartsOn: (weekStartsOn) => set({ weekStartsOn }),}),{name: "user-preferences",diff --git a/i18n/de-DE.json b/i18n/de-DE.jsonindex 5cd53291c..044686651 100644--- a/i18n/de-DE.json+++ b/i18n/de-DE.json@@ -424,6 +424,11 @@"language": "Sprache","languageDescription": "Wähle deine bevorzugte Oberflächensprache","selectLanguage": "Sprache auswählen",+ "firstDayOfWeek": "Erster Wochentag",+ "firstDayOfWeekDescription": "Lege fest, ob Kalender und Wochenbereiche am Sonntag oder Montag beginnen",+ "selectFirstDayOfWeek": "Ersten Tag auswählen",+ "weekStartsOnSunday": "Sonntag",+ "weekStartsOnMonday": "Montag","defaultView": "Standardansicht","defaultViewDescription": "Wähle deine bevorzugte Aufgabenansicht","selectViewMode": "Ansicht auswählen",diff --git a/i18n/el-GR.json b/i18n/el-GR.jsonindex 962714922..554190c80 100644--- a/i18n/el-GR.json+++ b/i18n/el-GR.json@@ -424,6 +424,11 @@"language": "Γλώσσα","languageDescription": "Επιλέξτε τη γλώσσα διεπαφής που προτιμάτε","selectLanguage": "Επιλέξτε γλώσσα",+ "firstDayOfWeek": "Πρώτη ημέρα της εβδομάδας",+ "firstDayOfWeekDescription": "Επιλέξτε αν τα ημερολόγια και οι εβδομάδες ξεκινούν την Κυριακή ή τη Δευτέρα",+ "selectFirstDayOfWeek": "Επιλέξτε την πρώτη ημέρα",+ "weekStartsOnSunday": "Κυριακή",+ "weekStartsOnMonday": "Δευτέρα","defaultView": "Προεπιλεγμένη προβολή","defaultViewDescription": "Επιλέξτε τον προτιμώμενο τρόπο προβολής εργασιών","selectViewMode": "Επιλέξτε τρόπο προβολής",diff --git a/i18n/en-US.json b/i18n/en-US.jsonindex 50bdc2b26..bfc9c6378 100644--- a/i18n/en-US.json+++ b/i18n/en-US.json@@ -424,6 +424,11 @@"language": "Language","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",+ "weekStartsOnSunday": "Sunday",+ "weekStartsOnMonday": "Monday","defaultView": "Default View","defaultViewDescription": "Choose your preferred task view mode","selectViewMode": "Select a view mode",diff --git a/i18n/es-ES.json b/i18n/es-ES.jsonindex 5e15efba6..c3da6266e 100644--- a/i18n/es-ES.json+++ b/i18n/es-ES.json@@ -334,6 +334,11 @@"language": "Idioma","languageDescription": "Elige el idioma de la interfaz","selectLanguage": "Seleccionar un idioma",+ "firstDayOfWeek": "Primer día de la semana",+ "firstDayOfWeekDescription": "Elige si los calendarios y las semanas empiezan en domingo o lunes",+ "selectFirstDayOfWeek": "Selecciona el primer día",+ "weekStartsOnSunday": "Domingo",+ "weekStartsOnMonday": "Lunes","defaultView": "Vista por defecto","defaultViewDescription": "Elige la vista por defecto para las tareas","selectViewMode": "Elige una vista por defecto",diff --git a/i18n/fr-FR.json b/i18n/fr-FR.jsonindex 5043201de..3723de785 100644--- a/i18n/fr-FR.json+++ b/i18n/fr-FR.json@@ -424,6 +424,11 @@"language": "Langue","languageDescription": "Choisissez la langue de l'interface","selectLanguage": "Sélectionnez une langue",+ "firstDayOfWeek": "Premier jour de la semaine",+ "firstDayOfWeekDescription": "Choisissez si les calendriers et les semaines commencent le dimanche ou le lundi",+ "selectFirstDayOfWeek": "Sélectionnez le premier jour",+ "weekStartsOnSunday": "Dimanche",+ "weekStartsOnMonday": "Lundi","defaultView": "Vue par défaut","defaultViewDescription": "Choisissez votre mode d'affichage des tâches préféré","selectViewMode": "Sélectionnez un mode d'affichage",diff --git a/i18n/mk-MK.json b/i18n/mk-MK.jsonindex 17717445c..a7c61e55f 100644--- a/i18n/mk-MK.json+++ b/i18n/mk-MK.json@@ -424,6 +424,11 @@"language": "Јазик","languageDescription": "Избери го претпочитаниот јазик на интерфејсот","selectLanguage": "Избери јазик",+ "firstDayOfWeek": "Прв ден од неделата",+ "firstDayOfWeekDescription": "Избери дали календарите и неделите почнуваат во недела или понеделник",+ "selectFirstDayOfWeek": "Избери прв ден",+ "weekStartsOnSunday": "Недела",+ "weekStartsOnMonday": "Понеделник","defaultView": "Стандарден приказ","defaultViewDescription": "Избери го претпочитаниот режим на приказ на задачи","selectViewMode": "Избери режим на приказ",diff --git a/i18n/nl-NL.json b/i18n/nl-NL.jsonindex 948dce6f0..60a72401d 100644--- a/i18n/nl-NL.json+++ b/i18n/nl-NL.json@@ -334,6 +334,11 @@"language": "Taal","languageDescription": "Kies je gewenste taal voor de interface","selectLanguage": "Selecteer een taal",+ "firstDayOfWeek": "Eerste dag van de week",+ "firstDayOfWeekDescription": "Kies of kalenders en weekoverzichten op zondag of maandag beginnen",+ "selectFirstDayOfWeek": "Selecteer de eerste dag",+ "weekStartsOnSunday": "Zondag",+ "weekStartsOnMonday": "Maandag","defaultView": "Standaardweergave","defaultViewDescription": "Kies de weergavemodus voor taken","selectViewMode": "Selecteer een weergavemodus",diff --git a/i18n/ru-RU.json b/i18n/ru-RU.jsonindex 214fa19f7..6d59f5493 100644--- a/i18n/ru-RU.json+++ b/i18n/ru-RU.json@@ -424,6 +424,11 @@"language": "Язык","languageDescription": "Выберите предпочтительный язык интерфейса","selectLanguage": "Выберите язык",+ "firstDayOfWeek": "Первый день недели",+ "firstDayOfWeekDescription": "Выберите, начинаются ли календари и недели с воскресенья или понедельника",+ "selectFirstDayOfWeek": "Выберите первый день",+ "weekStartsOnSunday": "Воскресенье",+ "weekStartsOnMonday": "Понедельник","defaultView": "Вид по умолчанию","defaultViewDescription": "Выберите предпочтительный режим отображения задач","selectViewMode": "Выберите режим просмотра",diff --git a/i18n/schema.json b/i18n/schema.jsonindex e97858693..3ca3292b1 100644--- a/i18n/schema.json+++ b/i18n/schema.json@@ -1660,6 +1660,21 @@"selectLanguage": {"type": "string"},+ "firstDayOfWeek": {+ "type": "string"+ },+ "firstDayOfWeekDescription": {+ "type": "string"+ },+ "selectFirstDayOfWeek": {+ "type": "string"+ },+ "weekStartsOnSunday": {+ "type": "string"+ },+ "weekStartsOnMonday": {+ "type": "string"+ },"defaultView": {"type": "string"},@@ -1735,6 +1750,11 @@"language","languageDescription","selectLanguage",+ "firstDayOfWeek",+ "firstDayOfWeekDescription",+ "selectFirstDayOfWeek",+ "weekStartsOnSunday",+ "weekStartsOnMonday","defaultView","defaultViewDescription","selectViewMode",diff --git a/i18n/uk-UA.json b/i18n/uk-UA.jsonindex 1fa139aae..e894f5f5d 100644--- a/i18n/uk-UA.json+++ b/i18n/uk-UA.json@@ -424,6 +424,11 @@"language": "Мова","languageDescription": "Оберіть бажану мову інтерфейсу","selectLanguage": "Обрати мову",+ "firstDayOfWeek": "Перший день тижня",+ "firstDayOfWeekDescription": "Оберіть, чи календарі та тижні починаються в неділю або понеділок",+ "selectFirstDayOfWeek": "Обрати перший день",+ "weekStartsOnSunday": "Неділя",+ "weekStartsOnMonday": "Понеділок","defaultView": "Перегляд за замовчуванням","defaultViewDescription": "Оберіть бажаний режим перегляду завдань","selectViewMode": "Обрати режим перегляду",