Merge pull request #119 from djedi/feature/monday-first-day-of-week

feat: add week start on Monday setting

Author: djedi

app/models.py

@@ -220,6 +220,7 @@ class User(Base):
     calendar_token = Column(String(64), unique=True, nullable=True)
     kanban_enabled = Column(Boolean, nullable=True, default=False)
     kanban_columns = Column(String(512), nullable=True, default='["todo", "done"]')
+    week_start_monday = Column(Boolean, nullable=True, default=False)
     notes = relationship("Note", lazy="dynamic", cascade="all, delete, delete-orphan")
     meta = relationship("Meta", lazy="dynamic", cascade="all, delete, delete-orphan")
     external_calendars = relationship(

app/routes.py

@@ -1280,6 +1280,8 @@ async def sidebar_data():
     except (json.JSONDecodeError, TypeError):
         kanban_columns = ["todo", "done"]
 
+    week_start_monday = user.week_start_monday or False
+
     return (
         jsonify(
             tags=tags,
@@ -1290,6 +1292,7 @@ async def sidebar_data():
             vim_mode=vim_mode,
             kanban_enabled=kanban_enabled,
             kanban_columns=kanban_columns,
+            week_start_monday=week_start_monday,
         ),
         200,
     )
@@ -1373,6 +1376,7 @@ async def get_settings():
             vim_mode=user.vim_mode or False,
             kanban_enabled=user.kanban_enabled or False,
             kanban_columns=kanban_columns,
+            week_start_monday=user.week_start_monday or False,
         ),
         200,
     )
@@ -1414,6 +1418,9 @@ async def update_settings():
             if valid_columns:
                 user.kanban_columns = json.dumps(valid_columns)
 
+    if "week_start_monday" in req:
+        user.week_start_monday = req["week_start_monday"]
+
     db.session.add(user)
     db.session.flush()
     db.session.commit()
@@ -1432,6 +1439,7 @@ async def update_settings():
             vim_mode=user.vim_mode or False,
             kanban_enabled=user.kanban_enabled or False,
             kanban_columns=kanban_columns,
+            week_start_monday=user.week_start_monday or False,
         ),
         200,
     )

client/src/components/Calendar.vue

@@ -8,6 +8,7 @@
       :nearby-month-days="true"
       :nearby-selectable-month-days="true"
       :focusable="false"
+      :first-day-of-week="sidebar.weekStartMonday ? 1 : 0"
       @update:model-value="changeDate"
     >
     </b-datepicker>

client/src/components/NestedTags.vue

@@ -75,7 +75,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed, watch } from 'vue';
+import { computed, ref, watch } from 'vue';
 import type { ITagNode } from '../interfaces';
 import { getExpandedTags, saveExpandedTags } from '../services/localstorage';
 

client/src/components/Settings.vue

@@ -16,6 +16,14 @@
                 Enable Auto-Save
               </b-switch>
             </div>
+            <div class="setting-row">
+              <b-switch v-model="localWeekStartMonday" @update:modelValue="onWeekStartMondayChange">
+                Start week on Monday
+              </b-switch>
+              <p class="setting-hint">
+                Display the calendar with Monday as the first day of the week (European style).
+              </p>
+            </div>
           </div>
 
           <div class="settings-card">
@@ -207,10 +215,10 @@
 import { computed, getCurrentInstance, onMounted, ref } from 'vue';
 import type { IExternalCalendar } from '../interfaces';
 import { CalendarService } from '../services/calendars';
+import directionService, { type DirectionPreference } from '../services/direction';
 import { Requests } from '../services/requests';
 import type { BuefyInstance } from '../services/sharedBuefy';
 import sidebar from '../services/sidebar';
-import directionService, { type DirectionPreference } from '../services/direction';
 import themeService, { type ThemePreference } from '../services/theme';
 
 const emit = defineEmits<{
@@ -226,6 +234,7 @@ const localTheme = ref<ThemePreference>('system');
 const localDirection = ref<DirectionPreference>('ltr');
 const localKanbanEnabled = ref(false);
 const localKanbanColumns = ref<string[]>(['todo', 'done']);
+const localWeekStartMonday = ref(false);
 
 const themeOptions = [
   { value: 'light', label: 'Light', icon: 'fas fa-sun' },
@@ -257,6 +266,7 @@ onMounted(() => {
   localDirection.value = directionService.preference;
   localKanbanEnabled.value = sidebar.kanbanEnabled;
   localKanbanColumns.value = [...sidebar.kanbanColumns];
+  localWeekStartMonday.value = sidebar.weekStartMonday;
 
   fetchCalendarUrl();
   fetchExternalCalendars();
@@ -274,6 +284,18 @@ const onAutoSaveChange = (value: boolean) => {
   });
 };
 
+const onWeekStartMondayChange = (value: boolean) => {
+  // Update the setting immediately
+  sidebar.toggleWeekStartMonday(value);
+
+  // Show success toast
+  buefy?.toast.open({
+    message: `Week now starts on ${value ? 'Monday' : 'Sunday'}`,
+    type: 'is-success',
+    duration: 2000,
+  });
+};
+
 const onVimModeChange = (value: boolean) => {
   // Update the setting immediately
   sidebar.toggleVimMode(value);

client/src/interfaces.ts

@@ -61,8 +61,8 @@ export interface IExternalEvent {
 }
 
 export interface ITagNode {
-  name: string;        // Display name (e.g., "family" for "home/family")
-  fullPath: string;    // Full tag path (e.g., "home/family")
+  name: string; // Display name (e.g., "family" for "home/family")
+  fullPath: string; // Full tag path (e.g., "home/family")
   children: ITagNode[];
-  isLeaf: boolean;     // True if this is an actual tag, not just a parent folder
+  isLeaf: boolean; // True if this is an actual tag, not just a parent folder
 }

client/src/services/sidebar.ts

@@ -75,6 +75,7 @@ class SidebarSerivce {
   public vimMode: boolean = false;
   public kanbanEnabled: boolean = false;
   public kanbanColumns: string[] = ['todo', 'done'];
+  public weekStartMonday: boolean = false;
   public currentNoteId: string | null = null;
   public date: Date | null = null;
   public sidebarLoading: boolean = false;
@@ -195,6 +196,7 @@ class SidebarSerivce {
         this.vimMode = res.data.vim_mode;
         this.kanbanEnabled = res.data.kanban_enabled || false;
         this.kanbanColumns = res.data.kanban_columns || ['todo', 'done'];
+        this.weekStartMonday = res.data.week_start_monday || false;
       }
 
       if (this.selectedSearch.length && this.searchString.length) {
@@ -272,6 +274,13 @@ class SidebarSerivce {
     } catch (_e) {}
   }
 
+  public async toggleWeekStartMonday(enabled: boolean) {
+    try {
+      await Requests.put('/settings', { week_start_monday: enabled });
+      this.weekStartMonday = enabled;
+    } catch (_e) {}
+  }
+
   public async updateKanbanColumns(columns: string[]) {
     try {
       await Requests.put('/settings', { kanban_columns: columns });

client/src/views/Day.vue

@@ -41,7 +41,7 @@ import {
   watch,
 } from 'vue';
 import { onBeforeRouteLeave, onBeforeRouteUpdate, useRoute, useRouter } from 'vue-router';
-import Editor from '@/components/Editor.vue';
+import type Editor from '@/components/Editor.vue';
 import Header from '@/components/Header.vue';
 import MarkdownPreview from '@/components/MarkdownPreview.vue';
 import UnsavedForm from '@/components/UnsavedForm.vue';

client/src/views/Note.vue

@@ -37,7 +37,7 @@ import {
   ref,
 } from 'vue';
 import { onBeforeRouteLeave, onBeforeRouteUpdate, useRoute, useRouter } from 'vue-router';
-import Editor from '@/components/Editor.vue';
+import type Editor from '@/components/Editor.vue';
 import Header from '@/components/Header.vue';
 import MarkdownPreview from '@/components/MarkdownPreview.vue';
 import type { IHeaderOptions, INote } from '../interfaces';

migrations/versions/week_start_monday_column.py

@@ -0,0 +1,31 @@
+"""Add week_start_monday column to User table
+
+Revision ID: week_start_monday_001
+Revises: f1803e0263f1
+Create Date: 2025-12-12 00:00:00.000000
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = "week_start_monday_001"
+down_revision = "f1803e0263f1"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    with op.batch_alter_table("user", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column(
+                "week_start_monday", sa.Boolean(), nullable=True, server_default="0"
+            )
+        )
+
+
+def downgrade():
+    with op.batch_alter_table("user", schema=None) as batch_op:
+        batch_op.drop_column("week_start_monday")