One Calendar is a privacy-first calendar web app built with Next.js. It has modern security features, including e2ee, password-protected sharing, and self-destructing share links ๐
calendar.xyehr.cn
Merge pull request #246 from EvanTechDev/feature/add-ellipsis-to-month-view-schedule-titles
Add category reorder actions and dropdown menu in sidebar; implement moveCategory in context
authored by
Evan Huang
and committed by
GitHub
e481d907
ddf9722b
+96
-22
+1
-1
components/app/views/month-view.tsx
+1
-1
components/app/views/month-view.tsx
+21
components/providers/calendar-context.tsx
+21
components/providers/calendar-context.tsx
···
39
39
addCategory: (category: CalendarCategory) => void
40
40
removeCategory: (id: string) => void
41
41
updateCategory: (id: string, category: Partial<CalendarCategory>) => void
42
+
moveCategory: (id: string, direction: 'up' | 'down') => void
42
43
addEvent: (newEvent: CalendarEvent) => void
43
44
}
44
45
···
86
87
)
87
88
}
88
89
90
+
const moveCategory = (id: string, direction: 'up' | 'down') => {
91
+
setCalendars((prevCalendars) => {
92
+
const currentIndex = prevCalendars.findIndex((cal) => cal.id === id)
93
+
if (currentIndex === -1) return prevCalendars
94
+
95
+
const targetIndex =
96
+
direction === 'up' ? currentIndex - 1 : currentIndex + 1
97
+
98
+
if (targetIndex < 0 || targetIndex >= prevCalendars.length) {
99
+
return prevCalendars
100
+
}
101
+
102
+
const nextCalendars = [...prevCalendars]
103
+
const [movedCalendar] = nextCalendars.splice(currentIndex, 1)
104
+
nextCalendars.splice(targetIndex, 0, movedCalendar)
105
+
return nextCalendars
106
+
})
107
+
}
108
+
89
109
const addEvent = (newEvent: CalendarEvent) => {
90
110
setEvents((prevEvents) => {
91
111
const eventExists = prevEvents.some((event) => event.id === newEvent.id)
···
110
130
addCategory,
111
131
removeCategory,
112
132
updateCategory,
133
+
moveCategory,
113
134
addEvent,
114
135
}}
115
136
>
+4
-1
lib/i18n.ts
+4
-1
lib/i18n.ts
···
97
97
)
98
98
}
99
99
100
-
export const isZhLanguage = (language: Language) => language.startsWith('zh')
100
+
const zhLanguages: Language[] = ['zh-CN', 'zh-HK', 'zh-TW']
101
+
102
+
export const isZhLanguage = (language: Language) =>
103
+
zhLanguages.includes(language)
101
104
102
105
export const getStoredLanguage = async (): Promise<Language> => {
103
106
const storedLanguage = await readEncryptedLocalStorage<string | null>(
+4
locales/en.json
+4
locales/en.json
···
332
332
"categoryDeletedDescription": "Category has been deleted successfully",
333
333
"noMatchingEvents": "No matching events found",
334
334
"edit": "Edit",
335
+
"moveUp": "Move up",
336
+
"moveDown": "Move down",
337
+
"categoryMovedUp": "Category moved up",
338
+
"categoryMovedDown": "Category moved down",
335
339
"dragToNewPosition": "Drag to new position",
336
340
"categoryAdded": "Category added",
337
341
"categoryAddedDesc": "Successfully added",