Skip to content

Your favorite shift management application!

feat: Adds calendar comparison mode and related UI/logic (#85)

panteL5461a9d7880e
diff --git a/README.md b/README.md
index 013b810..43e19ac 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@
> **Note**
>
-> BetterShift is a modern shift management application designed to simplify variable work schedules. Manage unlimited calendars with one-click shift toggles, reusable presets, and real-time synchronization across devices. Features include external calendar integration (Google, Outlook, iCal), password-protected calendars, ICS/PDF export, live statistics, and multi-language support. Built with Next.js 16 and SQLite for fast, self-hosted deployment.
+> BetterShift is a modern shift management application designed to simplify variable work schedules. Manage unlimited calendars with one-click shift toggles, reusable presets, and real-time synchronization across devices. Features include external calendar integration (Google, Outlook, iCal), password-protected calendars, ICS/PDF export, live statistics, calendar comparison and multi-language support. Built with Next.js 16 and SQLite for fast, self-hosted deployment.
## 🔗 Quick Links
@@ -40,6 +40,7 @@
- **Quick Actions** — Left-click to add/remove shifts, right-click to add notes
- **External Calendar Sync** — Subscribe to Google, Outlook or iCal calendars with auto/manual refresh
- **Sync Monitoring** — Real-time sync status and error notifications
+- **Calendar Comparison** — Overlay multiple calendars for easy shift comparison
### 🎨 Customization & Organization
diff --git a/app/api/calendars/route.ts b/app/api/calendars/route.ts
index 92b0b25..945659d 100644
--- a/app/api/calendars/route.ts
+++ b/app/api/calendars/route.ts
@@ -18,7 +18,7 @@ export async function GET() {
updatedAt: calendars.updatedAt,
_count:
sql<number>`(SELECT COUNT(*) FROM ${shifts} WHERE ${shifts.calendarId} = ${calendars.id})`.as(
- "shift_count"
+ "_count"
),
})
.from(calendars)
diff --git a/app/page.tsx b/app/page.tsx
index 3e838b3..e045ffe 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -7,8 +7,14 @@ import { isSameDay } from "date-fns";
import { Button } from "@/components/ui/button";
import { Plus } from "lucide-react";
import { getDateLocale } from "@/lib/locales";
-import { motion } from "motion/react";
+import { motion, AnimatePresence } from "motion/react";
import { ShiftWithCalendar } from "@/lib/types";
+import {
+ ShiftPreset,
+ CalendarNote,
+ ExternalSync,
+ Shift,
+} from "@/lib/db/schema";
import { useCalendars } from "@/hooks/useCalendars";
import { useShifts } from "@/hooks/useShifts";
import { usePresets } from "@/hooks/usePresets";
@@ -26,18 +32,28 @@ import { LockedCalendarView } from "@/components/locked-calendar-view";
import { CalendarSkeleton } from "@/components/calendar-skeleton";
import { CalendarContentSkeleton } from "@/components/calendar-content-skeleton";
import { LockedCalendarSkeleton } from "@/components/locked-calendar-skeleton";
+import { CalendarCompareSkeleton } from "@/components/calendar-compare-skeleton";
import { CalendarContent } from "@/components/calendar-content";
+import { CalendarCompareSheet } from "@/components/calendar-compare-sheet";
+import { CalendarCompareView } from "@/components/calendar-compare-view";
import { AppFooter } from "@/components/app-footer";
import { AppHeader } from "@/components/app-header";
import { DialogManager } from "@/components/dialog-manager";
import { getCalendarDays } from "@/lib/calendar-utils";
-import { getCachedPassword } from "@/lib/password-cache";
+import {
+ getCachedPassword,
+ verifyAndCachePassword,
+} from "@/lib/password-cache";
+import { formatDateToLocal } from "@/lib/date-utils";
+import { toast } from "sonner";
+import { useTranslations } from "next-intl";
function HomeContent() {
const router = useRouter();
const searchParams = useSearchParams();
const locale = useLocale();
const dateLocale = getDateLocale(locale);
+ const t = useTranslations();
// Data hooks
const {
@@ -66,15 +82,31 @@ function HomeContent() {
refetchPresets,
} = usePresets(selectedCalendar);
+ // Local state
+ const [selectedPresetId, setSelectedPresetId] = useState<
+ string | undefined
+ >();
+ const [currentDate, setCurrentDate] = useState(new Date());
+ const [selectedDate, setSelectedDate] = useState<Date | undefined>();
+ const [statsRefreshTrigger, setStatsRefreshTrigger] = useState(0);
+ const [isConnected, setIsConnected] = useState(true);
+ const [compareNoteCalendarId, setCompareNoteCalendarId] = useState<
+ string | undefined
+ >();
+
+ // Compare mode state (needs to be before useNotes hook)
+ const [isCompareMode, setIsCompareMode] = useState(false);
+ const [showCompareSelector, setShowCompareSelector] = useState(false);
+ const [selectedCompareIds, setSelectedCompareIds] = useState<string[]>([]);
+ const [compareDataLoading, setCompareDataLoading] = useState(false);
+
const {
notes,
createNote: createNoteHook,
updateNote: updateNoteHook,
deleteNote: deleteNoteHook,
refetchNotes,
- } = useNotes(selectedCalendar);
-
- // External sync management
+ } = useNotes(isCompareMode ? compareNoteCalendarId : selectedCalendar);
const {
externalSyncs,
hasSyncErrors,
@@ -113,14 +145,73 @@ function HomeContent() {
},
});
- // Local state
- const [selectedPresetId, setSelectedPresetId] = useState<
- string | undefined
- >();
- const [currentDate, setCurrentDate] = useState(new Date());
- const [selectedDate, setSelectedDate] = useState<Date | undefined>();
- const [statsRefreshTrigger, setStatsRefreshTrigger] = useState(0);
- const [isConnected, setIsConnected] = useState(true);
+ // Wrapper for note submit that reloads compare data
+ const handleNoteSubmit = async (noteText: string) => {
+ await noteActions.handleNoteSubmit(noteText);
+
+ // Reload notes for the specific calendar in compare mode
+ if (isCompareMode && compareNoteCalendarId) {
+ const password = getCachedPassword(compareNoteCalendarId);
+ const passwordParam = password ? `&password=${password}` : "";
+ try {
+ const notesRes = await fetch(
+ `/api/notes?calendarId=${compareNoteCalendarId}${passwordParam}`
+ );
+ const notesData = notesRes.ok ? await notesRes.json() : [];
+ setCompareCalendarData((prev) => {
+ const updated = new Map(prev);
+ const data = updated.get(compareNoteCalendarId);
+ if (data) {
+ updated.set(compareNoteCalendarId, { ...data, notes: notesData });
+ }
+ return updated;
+ });
+ } catch (error) {
+ console.error("Failed to reload notes:", error);
+ }
+ }
+ };
+
+ // Wrapper for note delete that reloads compare data
+ const handleNoteDelete = async () => {
+ await noteActions.handleNoteDelete();
+
+ // Reload notes for the specific calendar in compare mode
+ if (isCompareMode && compareNoteCalendarId) {
+ const password = getCachedPassword(compareNoteCalendarId);
+ const passwordParam = password ? `&password=${password}` : "";
+ try {
+ const notesRes = await fetch(
+ `/api/notes?calendarId=${compareNoteCalendarId}${passwordParam}`
+ );
+ const notesData = notesRes.ok ? await notesRes.json() : [];
+ setCompareCalendarData((prev) => {
+ const updated = new Map(prev);
+ const data = updated.get(compareNoteCalendarId);
+ if (data) {
+ updated.set(compareNoteCalendarId, { ...data, notes: notesData });
+ }
+ return updated;
+ });
+ } catch (error) {
+ console.error("Failed to reload notes:", error);
+ }
+ }
+ };
+
+ // External sync management
+ const [compareCalendarData, setCompareCalendarData] = useState<
+ Map<
+ string,
+ {
+ shifts: ShiftWithCalendar[];
+ notes: CalendarNote[];
+ externalSyncs: ExternalSync[];
+ presets: ShiftPreset[];
+ togglingDates: Set<string>;
+ }
+ >
+ >(new Map());
// Version info
const versionInfo = useVersionInfo();
@@ -156,23 +247,138 @@ function HomeContent() {
setIsConnected,
});
- // Update URL when calendar changes
+ // Load data for compare mode
useEffect(() => {
- if (selectedCalendar) {
+ if (!isCompareMode || selectedCompareIds.length === 0) return;
+
+ const loadCompareData = async () => {
+ setCompareDataLoading(true);
+ const dataMap = new Map();
+
+ // Load all calendars in parallel
+ await Promise.all(
+ selectedCompareIds.map(async (calendarId) => {
+ try {
+ const password = getCachedPassword(calendarId);
+ const passwordParam = password ? `&password=${password}` : "";
+
+ // Fetch all data for this calendar in parallel
+ const [shiftsRes, notesRes, syncsRes, presetsRes] =
+ await Promise.all([
+ fetch(`/api/shifts?calendarId=${calendarId}${passwordParam}`),
+ fetch(`/api/notes?calendarId=${calendarId}${passwordParam}`),
+ fetch(
+ `/api/external-syncs?calendarId=${calendarId}${passwordParam}`
+ ),
+ fetch(`/api/presets?calendarId=${calendarId}${passwordParam}`),
+ ]);
+
+ const [shiftsData, notesData, syncsData, presetsData] =
+ await Promise.all([
+ shiftsRes.ok ? shiftsRes.json() : [],
+ notesRes.ok ? notesRes.json() : [],
+ syncsRes.ok ? syncsRes.json() : [],
+ presetsRes.ok ? presetsRes.json() : [],
+ ]);
+
+ dataMap.set(calendarId, {
+ shifts: shiftsData,
+ notes: notesData,
+ externalSyncs: syncsData,
+ presets: presetsData,
+ togglingDates: new Set<string>(),
+ });
+ } catch (error) {
+ console.error(
+ `Error loading data for calendar ${calendarId}:`,
+ error
+ );
+ dataMap.set(calendarId, {
+ shifts: [],
+ notes: [],
+ externalSyncs: [],
+ presets: [],
+ togglingDates: new Set<string>(),
+ });
+ }
+ })
+ );
+
+ setCompareCalendarData(dataMap);
+ setCompareDataLoading(false);
+ };
+
+ loadCompareData();
+ }, [isCompareMode, selectedCompareIds]);
+
+ // Load compare mode from URL on initial load
+ useEffect(() => {
+ const compareParam = searchParams.get("compare");
+ if (compareParam && !isCompareMode) {
+ const calendarIds = compareParam.split(",").filter((id) => id.trim());
+ if (calendarIds.length >= 2 && calendarIds.length <= 3) {
+ // Verify that all calendars exist
+ const validIds = calendarIds.filter((id) =>
+ calendars.some((cal) => cal.id === id)
+ );
+ if (validIds.length >= 2) {
+ setSelectedCompareIds(validIds);
+ setIsCompareMode(true);
+ }
+ }
+ } else if (!compareParam && isCompareMode) {
+ // If compare param is removed from URL, exit compare mode
+ setIsCompareMode(false);
+ setSelectedCompareIds([]);
+ setCompareCalendarData(new Map());
+ }
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [searchParams, calendars]);
+
+ // Update URL when calendar or compare mode changes
+ useEffect(() => {
+ if (isCompareMode && selectedCompareIds.length >= 2) {
+ // In compare mode
+ router.replace(`/?compare=${selectedCompareIds.join(",")}`, {
+ scroll: false,
+ });
+ } else if (selectedCalendar && !isCompareMode) {
+ // Normal mode with selected calendar
router.replace(`/?id=${selectedCalendar}`, { scroll: false });
}
- }, [selectedCalendar, router]);
+ }, [selectedCalendar, isCompareMode, selectedCompareIds, router]);
+
+ // Old URL update effect removed - now handled above
// Handle password success with data refresh
const handlePasswordSuccess = async () => {
- await Promise.all([
- refetchShifts(),
- refetchPresets(),
- refetchNotes(),
- fetchExternalSyncs(),
- fetchSyncErrorStatus(),
- ]);
- setStatsRefreshTrigger((prev) => prev + 1);
+ if (isCompareMode && compareNoteCalendarId) {
+ // In compare mode, reload notes for the specific calendar
+ await refetchNotes();
+ const password = getCachedPassword(compareNoteCalendarId);
+ const passwordParam = password ? `&password=${password}` : "";
+ const notesRes = await fetch(
+ `/api/notes?calendarId=${compareNoteCalendarId}${passwordParam}`
+ );
+ const notesData = notesRes.ok ? await notesRes.json() : [];
+ setCompareCalendarData((prev) => {
+ const updated = new Map(prev);
+ const data = updated.get(compareNoteCalendarId);
+ if (data) {
+ updated.set(compareNoteCalendarId, { ...data, notes: notesData });
+ }
+ return updated;
+ });
+ } else {
+ await Promise.all([
+ refetchShifts(),
+ refetchPresets(),
+ refetchNotes(),
+ fetchExternalSyncs(),
+ fetchSyncErrorStatus(),
+ ]);
+ setStatsRefreshTrigger((prev) => prev + 1);
+ }
baseHandlePasswordSuccess();
// Execute pending action if exists
@@ -278,6 +484,267 @@ function HomeContent() {
refetchShifts();
};
+ // Compare mode handlers
+ const handleCompareClick = () => {
+ setShowCompareSelector(true);
+ };
+
+ const handleToggleCompareCalendar = (calendarId: string) => {
+ setSelectedCompareIds((prev) =>
+ prev.includes(calendarId)
+ ? prev.filter((id) => id !== calendarId)
+ : [...prev, calendarId]
+ );
+ };
+
+ const handleStartCompare = () => {
+ setShowCompareSelector(false);
+ setIsCompareMode(true);
+ };
+
+ const handleExitCompare = () => {
+ setIsCompareMode(false);
+ setSelectedCompareIds([]);
+ setCompareCalendarData(new Map());
+ // Immediately update URL to prevent re-loading from URL parameter
+ if (selectedCalendar) {
+ router.replace(`/?id=${selectedCalendar}`, { scroll: false });
+ } else {
+ router.replace(`/`, { scroll: false });
+ }
+ };
+
+ // Compare mode interaction handlers
+ const handleCompareDayClick = async (calendarId: string, date: Date) => {
+ if (!selectedPresetId) {
+ // No preset selected, just show existing shifts if any
+ const calendarData = compareCalendarData.get(calendarId);
+ if (!calendarData) return;
+
+ const dayShifts = calendarData.shifts.filter(
+ (shift) => shift.date && isSameDay(new Date(shift.date), date)
+ );
+
+ if (dayShifts.length > 0) {
+ dialogStates.setSelectedDayDate(date);
+ dialogStates.setSelectedDayShifts(dayShifts);
+ dialogStates.setShowDayShiftsDialog(true);
+ }
+ return;
+ }
+
+ // Preset selected, add or remove shift
+ const calendarData = compareCalendarData.get(calendarId);
+ if (!calendarData) return;
+
+ const preset = calendarData.presets.find((p) => p.id === selectedPresetId);
+ if (!preset) return;
+
+ const targetDate = new Date(date);
+ const dateKey = formatDateToLocal(targetDate);
+
+ // Check if already toggling
+ if (calendarData.togglingDates.has(dateKey)) return;
+
+ // Mark as toggling
+ const newTogglingDates = new Set(calendarData.togglingDates);
+ newTogglingDates.add(dateKey);
+ setCompareCalendarData((prev) => {
+ const updated = new Map(prev);
+ const data = updated.get(calendarId);
+ if (data) {
+ updated.set(calendarId, { ...data, togglingDates: newTogglingDates });
+ }
+ return updated;
+ });
+
+ try {
+ const password = getCachedPassword(calendarId);
+
+ // Check password if needed
+ const result = await verifyAndCachePassword(calendarId, password);
+ if (result.protected && !result.valid) {
+ // Clear toggling state before showing password dialog
+ setCompareCalendarData((prev) => {
+ const updated = new Map(prev);
+ const data = updated.get(calendarId);
+ if (data) {
+ const newTogglingDates = new Set(data.togglingDates);
+ newTogglingDates.delete(dateKey);
+ updated.set(calendarId, {
+ ...data,
+ togglingDates: newTogglingDates,
+ });
+ }
+ return updated;
+ });
+ setPendingAction({
+ type: "edit",
+ calendarId: calendarId,
+ action: async () => {
+ await handleCompareDayClick(calendarId, targetDate);
+ },
+ });
+ dialogStates.setShowPasswordDialog(true);
+ return;
+ }
+
+ // Check if shift already exists
+ const existingShift = calendarData.shifts.find(
+ (shift) =>
+ shift.date &&
+ isSameDay(new Date(shift.date), targetDate) &&
+ shift.title === preset.title &&
+ shift.startTime === preset.startTime &&
+ shift.endTime === preset.endTime
+ );
+
+ if (existingShift) {
+ // Delete existing shift
+ const response = await fetch(`/api/shifts/${existingShift.id}`, {
+ method: "DELETE",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ password }),
+ });
+
+ if (!response.ok) {
+ toast.error(t("common.deleteError", { item: t("shift.shift_one") }));
+ } else {
+ toast.success(t("common.deleted", { item: t("shift.shift_one") }));
+ // Reload shifts for this calendar
+ const shiftsRes = await fetch(
+ `/api/shifts?calendarId=${calendarId}${
+ password ? `&password=${password}` : ""
+ }`
+ );
+ const shiftsData = shiftsRes.ok ? await shiftsRes.json() : [];
+ setCompareCalendarData((prev) => {
+ const updated = new Map(prev);
+ const data = updated.get(calendarId);
+ if (data) {
+ updated.set(calendarId, { ...data, shifts: shiftsData });
+ }
+ return updated;
+ });
+ setStatsRefreshTrigger((prev) => prev + 1);
+ }
+ } else {
+ // Create new shift
+ const shiftData = {
+ calendarId,
+ date: dateKey,
+ startTime: preset.startTime,
+ endTime: preset.endTime,
+ title: preset.title,
+ color: preset.color,
+ notes: preset.notes || "",
+ presetId: preset.id,
+ isAllDay: preset.isAllDay || false,
+ password,
+ };
+
+ const response = await fetch("/api/shifts", {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify(shiftData),
+ });
+
+ if (!response.ok) {
+ toast.error(t("common.createError", { item: t("shift.shift_one") }));
+ } else {
+ toast.success(t("common.created", { item: t("shift.shift_one") }));
+ // Reload shifts for this calendar
+ const shiftsRes = await fetch(
+ `/api/shifts?calendarId=${calendarId}${
+ password ? `&password=${password}` : ""
+ }`
+ );
+ const shiftsData = shiftsRes.ok ? await shiftsRes.json() : [];
+ setCompareCalendarData((prev) => {
+ const updated = new Map(prev);
+ const data = updated.get(calendarId);
+ if (data) {
+ updated.set(calendarId, { ...data, shifts: shiftsData });
+ }
+ return updated;
+ });
+ setStatsRefreshTrigger((prev) => prev + 1);
+ }
+ }
+ } catch (error) {
+ console.error("Failed to toggle shift:", error);
+ toast.error(t("common.error"));
+ } finally {
+ // Remove toggling state
+ setCompareCalendarData((prev) => {
+ const updated = new Map(prev);
+ const data = updated.get(calendarId);
+ if (data) {
+ const newTogglingDates = new Set(data.togglingDates);
+ newTogglingDates.delete(dateKey);
+ updated.set(calendarId, { ...data, togglingDates: newTogglingDates });
+ }
+ return updated;
+ });
+ }
+ };
+
+ const handleCompareDayRightClick = (
+ calendarId: string,
+ e: React.MouseEvent,
+ date: Date
+ ) => {
+ e.preventDefault();
+ const calendarData = compareCalendarData.get(calendarId);
+ if (!calendarData) return;
+
+ const existingNote = calendarData.notes.find(
+ (note) => note.date && isSameDay(new Date(note.date), date)
+ );
+ setCompareNoteCalendarId(calendarId);
+ noteActions.openNoteDialog(date, existingNote);
+ };
+
+ const handleCompareNoteIconClick = (
+ calendarId: string,
+ e: React.MouseEvent,
+ date: Date
+ ) => {
+ e.stopPropagation();
+ handleCompareDayRightClick(calendarId, e, date);
+ };
+
+ const handleCompareLongPress = (calendarId: string, date: Date) => {
+ const calendarData = compareCalendarData.get(calendarId);
+ if (!calendarData) return;
+
+ const existingNote = calendarData.notes.find(
+ (note) => note.date && isSameDay(new Date(note.date), date)
+ );
+ setCompareNoteCalendarId(calendarId);
+ noteActions.openNoteDialog(date, existingNote);
+ };
+
+ const handleCompareShowAllShifts = (
+ calendarId: string,
+ date: Date,
+ dayShifts: ShiftWithCalendar[]
+ ) => {
+ dialogStates.setSelectedDayDate(date);
+ dialogStates.setSelectedDayShifts(dayShifts);
+ dialogStates.setShowDayShiftsDialog(true);
+ };
+
+ const handleCompareShowSyncedShifts = (
+ calendarId: string,
+ date: Date,
+ syncedShifts: ShiftWithCalendar[]
+ ) => {
+ dialogStates.setSelectedDayDate(date);
+ dialogStates.setSelectedSyncedShifts(syncedShifts);
+ dialogStates.setShowSyncedShiftsDialog(true);
+ };
+
// Calendar grid calculations
const calendarDays = getCalendarDays(currentDate);
@@ -287,6 +754,306 @@ function HomeContent() {
calendars.find((c) => c.id === selectedCalendar)?.isLocked &&
!getCachedPassword(selectedCalendar);
+ // If in compare mode, render compare view
+ if (isCompareMode) {
+ // Show skeleton while loading
+ if (compareDataLoading) {
+ return (
+ <CalendarCompareSkeleton
+ count={selectedCompareIds.length}
+ hidePresetHeader={viewSettings.hidePresetHeader}
+ />
+ );
+ }
+
+ return (
+ <>
+ <CalendarCompareView
+ calendars={calendars}
+ selectedIds={selectedCompareIds}
+ allCalendars={calendars}
+ calendarDays={calendarDays}
+ currentDate={currentDate}
+ onDateChange={setCurrentDate}
+ shiftsMap={
+ new Map(
+ Array.from(compareCalendarData.entries()).map(([id, data]) => [
+ id,
+ data.shifts,
+ ])
+ )
+ }
+ notesMap={
+ new Map(
+ Array.from(compareCalendarData.entries()).map(([id, data]) => [
+ id,
+ data.notes,
+ ])
+ )
+ }
+ externalSyncsMap={
+ new Map(
+ Array.from(compareCalendarData.entries()).map(([id, data]) => [
+ id,
+ data.externalSyncs,
+ ])
+ )
+ }
+ presetsMap={
+ new Map(
+ Array.from(compareCalendarData.entries()).map(([id, data]) => [
+ id,
+ data.presets || [],
+ ])
+ )
+ }
+ selectedPresetId={selectedPresetId}
+ onSelectPreset={setSelectedPresetId}
+ togglingDatesMap={
+ new Map(
+ Array.from(compareCalendarData.entries()).map(([id, data]) => [
+ id,
+ data.togglingDates,
+ ])
+ )
+ }
+ maxShiftsToShow={
+ viewSettings.shiftsPerDay === null
+ ? undefined
+ : viewSettings.shiftsPerDay
+ }
+ maxExternalShiftsToShow={
+ viewSettings.externalShiftsPerDay === null
+ ? undefined
+ : viewSettings.externalShiftsPerDay
+ }
+ showShiftNotes={viewSettings.showShiftNotes}
+ showFullTitles={viewSettings.showFullTitles}
+ shiftSortType={viewSettings.shiftSortType}
+ shiftSortOrder={viewSettings.shiftSortOrder}
+ combinedSortMode={viewSettings.combinedSortMode}
+ statsRefreshTrigger={statsRefreshTrigger}
+ locale={dateLocale}
+ onDayClick={handleCompareDayClick}
+ onDayRightClick={handleCompareDayRightClick}
+ onNoteIconClick={handleCompareNoteIconClick}
+ onLongPress={handleCompareLongPress}
+ onShowAllShifts={handleCompareShowAllShifts}
+ onShowSyncedShifts={handleCompareShowSyncedShifts}
+ onViewSettingsClick={() =>
+ dialogStates.setShowViewSettingsDialog(true)
+ }
+ onExit={handleExitCompare}
+ hidePresetHeader={viewSettings.hidePresetHeader}
+ onHidePresetHeaderChange={viewSettings.handleHidePresetHeaderChange}
+ onPresetsChange={async (calendarId: string) => {
+ // Reload presets and shifts for specific calendar
+ const password = getCachedPassword(calendarId);
+ const passwordParam = password ? `&password=${password}` : "";
+
+ try {
+ const [presetsRes, shiftsRes] = await Promise.all([
+ fetch(`/api/presets?calendarId=${calendarId}${passwordParam}`),
+ fetch(`/api/shifts?calendarId=${calendarId}${passwordParam}`),
+ ]);
+
+ const [presetsData, shiftsData] = await Promise.all([
+ presetsRes.ok ? presetsRes.json() : [],
+ shiftsRes.ok ? shiftsRes.json() : [],
+ ]);
+
+ setCompareCalendarData((prev) => {
+ const updated = new Map(prev);
+ const data = updated.get(calendarId);
+ if (data) {
+ updated.set(calendarId, {
+ ...data,
+ presets: presetsData,
+ shifts: shiftsData,
+ });
+ }
+ return updated;
+ });
+ setStatsRefreshTrigger((prev) => prev + 1);
+ } catch (error) {
+ console.error(
+ `Error reloading presets for calendar ${calendarId}:`,
+ error
+ );
+ }
+ }}
+ onShiftsChange={() => {
+ // Reload shifts for all calendars
+ const loadShifts = async () => {
+ // Build updates for each calendar in parallel
+ const updates = new Map<string, Shift[]>();
+ await Promise.all(
+ selectedCompareIds.map(async (calendarId) => {
+ try {
+ const password = getCachedPassword(calendarId);
+ const passwordParam = password
+ ? `&password=${password}`
+ : "";
+ const shiftsRes = await fetch(
+ `/api/shifts?calendarId=${calendarId}${passwordParam}`
+ );
+ const shiftsData = shiftsRes.ok
+ ? await shiftsRes.json()
+ : [];
+ updates.set(calendarId, shiftsData);
+ } catch (error) {
+ console.error(
+ `Error loading shifts for calendar ${calendarId}:`,
+ error
+ );
+ }
+ })
+ );
+ // Apply updates using functional state updater
+ setCompareCalendarData((prev) => {
+ const dataMap = new Map(prev);
+ for (const [calendarId, shiftsData] of updates.entries()) {
+ const currentData = dataMap.get(calendarId);
+ if (currentData) {
+ dataMap.set(calendarId, {
+ ...currentData,
+ shifts: shiftsData,
+ });
+ }
+ }
+ return dataMap;
+ });
+ };
+ loadShifts();
+ }}
+ onStatsRefresh={() => setStatsRefreshTrigger((prev) => prev + 1)}
+ onPasswordRequired={(calendarId, action) => {
+ setPendingAction({ type: "edit", calendarId, action });
+ dialogStates.setShowPasswordDialog(true);
+ }}
+ onUnlockCalendar={(calendarId) => {
+ // Reload data for unlocked calendar
+ const loadCalendarData = async () => {
+ try {
+ const password = getCachedPassword(calendarId);
+ const passwordParam = password ? `&password=${password}` : "";
+
+ const [shiftsRes, notesRes, syncsRes, presetsRes] =
+ await Promise.all([
+ fetch(
+ `/api/shifts?calendarId=${calendarId}${passwordParam}`
+ ),
+ fetch(
+ `/api/notes?calendarId=${calendarId}${passwordParam}`
+ ),
+ fetch(
+ `/api/external-syncs?calendarId=${calendarId}${passwordParam}`
+ ),
+ fetch(
+ `/api/presets?calendarId=${calendarId}${passwordParam}`
+ ),
+ ]);
+
+ const [shiftsData, notesData, syncsData, presetsData] =
+ await Promise.all([
+ shiftsRes.ok ? shiftsRes.json() : [],
+ notesRes.ok ? notesRes.json() : [],
+ syncsRes.ok ? syncsRes.json() : [],
+ presetsRes.ok ? presetsRes.json() : [],
+ ]);
+
+ setCompareCalendarData((prev) => {
+ const updated = new Map(prev);
+ updated.set(calendarId, {
+ shifts: shiftsData,
+ notes: notesData,
+ externalSyncs: syncsData,
+ presets: presetsData,
+ togglingDates:
+ prev.get(calendarId)?.togglingDates || new Set<string>(),
+ });
+ return updated;
+ });
+ } catch (error) {
+ console.error(
+ `Error loading data for calendar ${calendarId}:`,
+ error
+ );
+ }
+ };
+ loadCalendarData();
+ }}
+ />
+
+ {/* Dialogs still work in compare mode */}
+ <DialogManager
+ showCalendarDialog={dialogStates.showCalendarDialog}
+ onCalendarDialogChange={dialogStates.setShowCalendarDialog}
+ onCreateCalendar={createCalendarHook}
+ showShiftDialog={dialogStates.showShiftDialog}
+ onShiftDialogChange={dialogStates.setShowShiftDialog}
+ onShiftSubmit={shiftActions.handleShiftSubmit}
+ selectedDate={selectedDate}
+ selectedCalendar={
+ pendingAction?.calendarId || selectedCalendar || null
+ }
+ onPresetsChange={refetchPresets}
+ showPasswordDialog={dialogStates.showPasswordDialog}
+ onPasswordDialogChange={dialogStates.setShowPasswordDialog}
+ calendars={calendars}
+ onPasswordSuccess={handlePasswordSuccess}
+ showCalendarSettingsDialog={dialogStates.showCalendarSettingsDialog}
+ onCalendarSettingsDialogChange={
+ dialogStates.setShowCalendarSettingsDialog
+ }
+ onCalendarSettingsSuccess={refetchCalendars}
+ onDeleteCalendar={handleDeleteCalendar}
+ showExternalSyncDialog={dialogStates.showExternalSyncDialog}
+ onExternalSyncDialogChange={dialogStates.setShowExternalSyncDialog}
+ syncErrorRefreshTrigger={syncLogRefreshTrigger}
+ onSyncComplete={handleSyncComplete}
+ showSyncNotificationDialog={dialogStates.showSyncNotificationDialog}
+ onSyncNotificationDialogChange={
+ dialogStates.setShowSyncNotificationDialog
+ }
+ onErrorsMarkedRead={fetchSyncErrorStatus}
+ onSyncLogUpdate={() => setSyncLogRefreshTrigger((prev) => prev + 1)}
+ showDayShiftsDialog={dialogStates.showDayShiftsDialog}
+ onDayShiftsDialogChange={dialogStates.setShowDayShiftsDialog}
+ selectedDayDate={dialogStates.selectedDayDate}
+ selectedDayShifts={dialogStates.selectedDayShifts}
+ locale={locale}
+ onDeleteShiftFromDayDialog={handleDeleteShiftFromDayDialog}
+ showSyncedShiftsDialog={dialogStates.showSyncedShiftsDialog}
+ onSyncedShiftsDialogChange={dialogStates.setShowSyncedShiftsDialog}
+ selectedSyncedShifts={dialogStates.selectedSyncedShifts}
+ showViewSettingsDialog={dialogStates.showViewSettingsDialog}
+ onViewSettingsDialogChange={dialogStates.setShowViewSettingsDialog}
+ viewSettings={viewSettings}
+ onViewSettingsChange={{
+ handleShiftsPerDayChange: viewSettings.handleShiftsPerDayChange,
+ handleExternalShiftsPerDayChange:
+ viewSettings.handleExternalShiftsPerDayChange,
+ handleShowShiftNotesChange: viewSettings.handleShowShiftNotesChange,
+ handleShowFullTitlesChange: viewSettings.handleShowFullTitlesChange,
+ handleShiftSortTypeChange: viewSettings.handleShiftSortTypeChange,
+ handleShiftSortOrderChange: viewSettings.handleShiftSortOrderChange,
+ handleCombinedSortModeChange:
+ viewSettings.handleCombinedSortModeChange,
+ }}
+ showNoteDialog={noteActions.showNoteDialog}
+ onNoteDialogChange={noteActions.handleNoteDialogChange}
+ selectedNote={noteActions.selectedNote}
+ selectedNoteDate={noteActions.selectedDate}
+ onNoteSubmit={handleNoteSubmit}
+ onNoteDelete={noteActions.selectedNote ? handleNoteDelete : undefined}
+ />
+
+ <AppFooter versionInfo={versionInfo} />
+ </>
+ );
+ }
+
// Loading state
if (loading) {
return <CalendarSkeleton />;
@@ -303,6 +1070,22 @@ function HomeContent() {
return (
<div className="min-h-screen flex flex-col">
+ {/* Compare Selector Overlay */}
+ <AnimatePresence>
+ {showCompareSelector && (
+ <CalendarCompareSheet
+ calendars={calendars}
+ selectedIds={selectedCompareIds}
+ onToggleCalendar={handleToggleCompareCalendar}
+ onStartCompare={handleStartCompare}
+ onCancel={() => {
+ setShowCompareSelector(false);
+ setSelectedCompareIds([]);
+ }}
+ />
+ )}
+ </AnimatePresence>
+
<AppHeader
calendars={calendars}
selectedCalendar={selectedCalendar}
@@ -319,6 +1102,7 @@ function HomeContent() {
}
onExternalSync={handleExternalSyncClick}
onSyncNotifications={handleSyncNotifications}
+ onCompare={handleCompareClick}
onPresetsChange={refetchPresets}
onShiftsChange={refetchShifts}
onStatsRefresh={() => setStatsRefreshTrigger((prev) => prev + 1)}
@@ -469,10 +1253,8 @@ function HomeContent() {
onNoteDialogChange={noteActions.handleNoteDialogChange}
selectedNote={noteActions.selectedNote}
selectedNoteDate={noteActions.selectedDate}
- onNoteSubmit={noteActions.handleNoteSubmit}
- onNoteDelete={
- noteActions.selectedNote ? noteActions.handleNoteDelete : undefined
- }
+ onNoteSubmit={handleNoteSubmit}
+ onNoteDelete={noteActions.selectedNote ? handleNoteDelete : undefined}
/>
<AppFooter versionInfo={versionInfo} />
diff --git a/components/app-header.tsx b/components/app-header.tsx
index 9f4ab26..e42dadb 100644
--- a/components/app-header.tsx
+++ b/components/app-header.tsx
@@ -37,6 +37,7 @@ interface AppHeaderProps {
onManagePassword: () => void;
onExternalSync: () => void;
onSyncNotifications: () => void;
+ onCompare?: () => void;
onPresetsChange: () => void;
onShiftsChange: () => void;
onStatsRefresh: () => void;
@@ -63,6 +64,7 @@ export function AppHeader({
onManagePassword,
onExternalSync,
onSyncNotifications,
+ onCompare,
onPresetsChange,
onShiftsChange,
onStatsRefresh,
@@ -149,6 +151,7 @@ export function AppHeader({
onManagePassword={onManagePassword}
onExternalSync={onExternalSync}
onSyncNotifications={onSyncNotifications}
+ onCompare={onCompare}
hasSyncErrors={hasSyncErrors}
/>
</div>
@@ -333,6 +336,14 @@ export function AppHeader({
onMobileCalendarDialogChange(false);
onSyncNotifications();
}}
+ onCompare={
+ onCompare
+ ? () => {
+ onMobileCalendarDialogChange(false);
+ onCompare();
+ }
+ : undefined
+ }
hasSyncErrors={hasSyncErrors}
variant="mobile"
/>
diff --git a/components/calendar-compare-sheet.tsx b/components/calendar-compare-sheet.tsx
new file mode 100644
index 0000000..5a7a8d7
--- /dev/null
+++ b/components/calendar-compare-sheet.tsx
@@ -0,0 +1,107 @@
+"use client";
+
+import { useTranslations } from "next-intl";
+import { CalendarWithCount } from "@/lib/types";
+import { BaseSheet } from "@/components/ui/base-sheet";
+import { Checkbox } from "@/components/ui/checkbox";
+import { motion } from "motion/react";
+
+interface CalendarCompareSheetProps {
+ calendars: CalendarWithCount[];
+ selectedIds: string[];
+ onToggleCalendar: (id: string) => void;
+ onStartCompare: () => void;
+ onCancel: () => void;
+}
+
+const MAX_CALENDARS = 3;
+
+export function CalendarCompareSheet({
+ calendars,
+ selectedIds,
+ onToggleCalendar,
+ onStartCompare,
+ onCancel,
+}: CalendarCompareSheetProps) {
+ const t = useTranslations();
+ const canStartCompare =
+ selectedIds.length >= 2 && selectedIds.length <= MAX_CALENDARS;
+ const isMaxReached = selectedIds.length >= MAX_CALENDARS;
+
+ return (
+ <BaseSheet
+ open={true}
+ onOpenChange={onCancel}
+ title={t("calendar.selectToCompare")}
+ description={t("calendar.selectToCompareDescription")}
+ showSaveButton
+ onSave={onStartCompare}
+ saveDisabled={!canStartCompare}
+ saveLabel={t("calendar.startComparing")}
+ maxWidth="md"
+ >
+ {/* Mobile Warning */}
+ <div className="lg:hidden mb-3">
+ <div className="bg-amber-500/10 border border-amber-500/30 rounded-lg p-3">
+ <p className="text-xs text-amber-600 dark:text-amber-400 text-center">
+ {t("calendar.mobileNotOptimized")}
+ </p>
+ </div>
+ </div>
+
+ <div className="space-y-3">
+ {calendars.map((calendar) => {
+ const isSelected = selectedIds.includes(calendar.id);
+ const isDisabled = !isSelected && isMaxReached;
+
+ return (
+ <motion.div
+ key={calendar.id}
+ className={`border rounded-lg p-4 transition-all ${
+ isDisabled
+ ? "border-border opacity-50 cursor-not-allowed"
+ : isSelected
+ ? "border-primary bg-primary/5 cursor-pointer"
+ : "border-border hover:border-primary/50 hover:bg-accent/50 cursor-pointer"
+ }`}
+ onClick={() => !isDisabled && onToggleCalendar(calendar.id)}
+ whileHover={!isDisabled ? { scale: 1.01 } : {}}
+ whileTap={!isDisabled ? { scale: 0.99 } : {}}
+ >
+ <div className="flex items-center gap-3">
+ <Checkbox
+ checked={isSelected}
+ disabled={isDisabled}
+ onCheckedChange={() =>
+ !isDisabled && onToggleCalendar(calendar.id)
+ }
+ className="pointer-events-none"
+ />
+ <div
+ className="w-4 h-4 rounded-full shrink-0"
+ style={{ backgroundColor: calendar.color }}
+ />
+ <div className="flex-1 min-w-0">
+ <p className="font-medium truncate">{calendar.name}</p>
+ </div>
+ </div>
+ </motion.div>
+ );
+ })}
+ </div>
+
+ {/* Info Footer */}
+ <div className="mt-4 text-sm text-muted-foreground text-center">
+ {selectedIds.length > 0 ? (
+ <span>
+ {t("calendar.compareSelected", {
+ count: selectedIds.length,
+ })}
+ </span>
+ ) : (
+ <span>{t("calendar.selectToCompareDescription")}</span>
+ )}
+ </div>
+ </BaseSheet>
+ );
+}
diff --git a/components/calendar-compare-skeleton.tsx b/components/calendar-compare-skeleton.tsx
new file mode 100644
index 0000000..2f0129e
--- /dev/null
+++ b/components/calendar-compare-skeleton.tsx
@@ -0,0 +1,91 @@
+import { Skeleton } from "@/components/ui/skeleton";
+import { PresetListSkeleton } from "@/components/preset-list-skeleton";
+
+interface CalendarCompareSkeletonProps {
+ count: number;
+ hidePresetHeader?: boolean;
+}
+
+export function CalendarCompareSkeleton({
+ count,
+ hidePresetHeader = false,
+}: CalendarCompareSkeletonProps) {
+ return (
+ <div className="min-h-screen flex flex-col bg-background">
+ {/* Header */}
+ <div className="sticky top-0 z-10 bg-background/80 backdrop-blur-xl border-b border-border/50 shadow-sm">
+ <div className="w-full px-3 sm:px-4 py-3 sm:py-4">
+ <div className="space-y-3">
+ {/* Title and Buttons */}
+ <div className="flex items-center justify-between">
+ <div className="space-y-2">
+ <Skeleton className="h-8 w-48" />
+ <Skeleton className="h-4 w-32" />
+ </div>
+ <div className="flex gap-2">
+ <Skeleton className="h-10 w-32" />
+ <Skeleton className="h-10 w-32" />
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ {/* Mobile Warning Skeleton */}
+ <div className="lg:hidden mx-3 mt-3 mb-1">
+ <Skeleton className="h-16 w-full rounded-lg" />
+ </div>
+
+ {/* Calendars Grid */}
+ <div className="flex-1 w-full px-1 sm:px-4 py-4">
+ <div
+ className={`grid gap-4 ${
+ count === 2
+ ? "grid-cols-1 lg:grid-cols-2"
+ : "grid-cols-1 lg:grid-cols-2 xl:grid-cols-3"
+ }`}
+ >
+ {Array.from({ length: count }).map((_, index) => (
+ <div
+ key={index}
+ className="border border-border rounded-xl overflow-hidden bg-card shadow-sm"
+ >
+ {/* Calendar Header */}
+ <div className="border-b border-border/50 bg-gradient-to-r from-primary/10 via-primary/5 to-transparent px-4 py-3">
+ <div className="flex items-center gap-3">
+ <Skeleton className="w-5 h-5 rounded-full" />
+ <Skeleton className="h-6 w-32" />
+ </div>
+ </div>
+
+ {/* Calendar Content */}
+ <div className="p-4 space-y-4">
+ {/* Preset List Skeleton */}
+ <PresetListSkeleton hidePresetHeader={hidePresetHeader} />
+
+ {/* Calendar Grid Skeleton (compact version) */}
+ <div className="grid grid-cols-7 gap-1 mt-4">
+ {/* Weekday headers */}
+ {Array.from({ length: 7 }).map((_, i) => (
+ <Skeleton key={`header-${index}-${i}`} className="h-5" />
+ ))}
+
+ {/* Calendar days (limited to 35 for performance) */}
+ {Array.from({ length: 35 }).map((_, i) => (
+ <div
+ key={`day-${index}-${i}`}
+ className="min-h-20 border border-border/30 rounded-lg p-1.5 space-y-1"
+ >
+ <Skeleton className="h-4 w-5" />
+ <Skeleton className="h-3 w-full" />
+ </div>
+ ))}
+ </div>
+ </div>
+ </div>
+ ))}
+ </div>
+ </div>
+ </div>
+ );
+}
diff --git a/components/calendar-compare-view.tsx b/components/calendar-compare-view.tsx
new file mode 100644
index 0000000..276d967
--- /dev/null
+++ b/components/calendar-compare-view.tsx
@@ -0,0 +1,338 @@
+"use client";
+
+import { useTranslations } from "next-intl";
+import { CalendarWithCount, ShiftWithCalendar } from "@/lib/types";
+import { CalendarNote, ExternalSync, ShiftPreset } from "@/lib/db/schema";
+import { Button } from "@/components/ui/button";
+import { CalendarContent } from "@/components/calendar-content";
+import { PresetSelector } from "@/components/preset-selector";
+import { LockedCalendarView } from "@/components/locked-calendar-view";
+import { X, Link } from "lucide-react";
+import { getCachedPassword } from "@/lib/password-cache";
+import { motion } from "motion/react";
+import { Locale } from "date-fns";
+import { toast } from "sonner";
+
+interface CalendarCompareViewProps {
+ calendars: CalendarWithCount[];
+ selectedIds: string[];
+ allCalendars: CalendarWithCount[];
+ calendarDays: Date[];
+ currentDate: Date;
+ onDateChange: (date: Date) => void;
+ shiftsMap: Map<string, ShiftWithCalendar[]>;
+ notesMap: Map<string, CalendarNote[]>;
+ externalSyncsMap: Map<string, ExternalSync[]>;
+ presetsMap: Map<string, ShiftPreset[]>;
+ selectedPresetId?: string;
+ onSelectPreset: (id: string | undefined) => void;
+ togglingDatesMap: Map<string, Set<string>>;
+ maxShiftsToShow?: number;
+ maxExternalShiftsToShow?: number;
+ showShiftNotes: boolean;
+ showFullTitles: boolean;
+ shiftSortType: "startTime" | "createdAt" | "title";
+ shiftSortOrder: "asc" | "desc";
+ combinedSortMode: boolean;
+ statsRefreshTrigger: number;
+ locale?: Locale;
+ onDayClick: (calendarId: string, date: Date) => void;
+ onDayRightClick?: (
+ calendarId: string,
+ e: React.MouseEvent,
+ date: Date
+ ) => void;
+ onNoteIconClick?: (
+ calendarId: string,
+ e: React.MouseEvent,
+ date: Date
+ ) => void;
+ onLongPress?: (calendarId: string, date: Date) => void;
+ onShowAllShifts: (
+ calendarId: string,
+ date: Date,
+ shifts: ShiftWithCalendar[]
+ ) => void;
+ onShowSyncedShifts: (
+ calendarId: string,
+ date: Date,
+ shifts: ShiftWithCalendar[]
+ ) => void;
+ onDeleteShift?: (calendarId: string, id: string) => void;
+ onViewSettingsClick: () => void;
+ onExit: () => void;
+ hidePresetHeader?: boolean;
+ onHidePresetHeaderChange?: (hide: boolean) => void;
+ onPresetsChange: (calendarId: string) => void;
+ onShiftsChange?: () => void;
+ onStatsRefresh?: () => void;
+ onPasswordRequired: (calendarId: string, action: () => Promise<void>) => void;
+ presetsLoadingMap?: Map<string, boolean>;
+ onUnlockCalendar?: (calendarId: string) => void;
+}
+
+export function CalendarCompareView(props: CalendarCompareViewProps) {
+ const t = useTranslations();
+
+ const selectedCalendars = props.calendars.filter((cal) =>
+ props.selectedIds.includes(cal.id)
+ );
+
+ // Find which calendar owns the selected preset
+ const selectedPresetCalendarId = props.selectedPresetId
+ ? (() => {
+ for (const [calendarId, presets] of props.presetsMap.entries()) {
+ if (presets.some((p) => p.id === props.selectedPresetId)) {
+ return calendarId;
+ }
+ }
+ return null;
+ })()
+ : null;
+
+ const handleShareLink = () => {
+ const url = new URL(window.location.href);
+ url.searchParams.set("compare", props.selectedIds.join(","));
+
+ navigator.clipboard
+ .writeText(url.toString())
+ .then(() => {
+ toast.success(t("calendar.linkCopied"));
+ })
+ .catch(() => {
+ toast.error(t("common.error"));
+ });
+ };
+
+ return (
+ <div className="min-h-screen flex flex-col bg-background">
+ {/* Header */}
+ <div className="sticky top-0 z-10 bg-background/80 backdrop-blur-xl border-b border-border/50 shadow-sm">
+ <div className="w-full px-3 sm:px-4 py-3 sm:py-4">
+ <div className="space-y-3">
+ {/* Title and Exit Button */}
+ <div className="flex items-center justify-between">
+ <div>
+ <h1 className="text-xl sm:text-2xl font-semibold bg-gradient-to-r from-foreground to-foreground/70 bg-clip-text text-transparent">
+ {t("calendar.compareMode")}
+ </h1>
+ <p className="text-sm text-muted-foreground mt-1">
+ {t("calendar.compareSelected", {
+ count: selectedCalendars.length,
+ })}
+ </p>
+ </div>
+ <div className="flex gap-2">
+ <Button
+ onClick={handleShareLink}
+ variant="outline"
+ className="gap-2"
+ title={t("calendar.shareLinkDescription")}
+ >
+ <Link className="h-4 w-4" />
+ <span className="hidden sm:inline">
+ {t("calendar.shareLink")}
+ </span>
+ </Button>
+ <Button
+ onClick={props.onExit}
+ variant="outline"
+ className="gap-2"
+ >
+ <X className="h-4 w-4" />
+ <span className="hidden sm:inline">
+ {t("calendar.exitCompare")}
+ </span>
+ </Button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ {/* Mobile Warning */}
+ <div className="lg:hidden mx-3 mt-3 mb-1">
+ <div className="bg-amber-500/10 border border-amber-500/30 rounded-lg p-3">
+ <p className="text-xs text-amber-600 dark:text-amber-400 text-center">
+ {t("calendar.mobileNotOptimized")}
+ </p>
+ </div>
+ </div>
+
+ {/* Calendars Grid */}
+ <div className="flex-1 w-full px-1 sm:px-4 py-4">
+ <div
+ className={`grid gap-4 ${
+ selectedCalendars.length === 2
+ ? "grid-cols-1 lg:grid-cols-2"
+ : "grid-cols-1 lg:grid-cols-2 xl:grid-cols-3"
+ }`}
+ >
+ {selectedCalendars.map((calendar) => {
+ const shifts = props.shiftsMap.get(calendar.id) || [];
+ const notes = props.notesMap.get(calendar.id) || [];
+ const externalSyncs = props.externalSyncsMap.get(calendar.id) || [];
+ const togglingDates =
+ props.togglingDatesMap.get(calendar.id) || new Set();
+ const calendarPresets = props.presetsMap.get(calendar.id) || [];
+ const presetsLoading =
+ props.presetsLoadingMap?.get(calendar.id) || false;
+
+ // Check if calendar is locked (has password but no cached password)
+ const isLocked = calendar.passwordHash && calendar.isLocked;
+ const hasPassword = getCachedPassword(calendar.id);
+ const showLockedView = isLocked && !hasPassword;
+
+ // Check if this calendar is disabled (preset from different calendar selected)
+ const isDisabled =
+ selectedPresetCalendarId !== null &&
+ selectedPresetCalendarId !== calendar.id;
+
+ return (
+ <motion.div
+ key={calendar.id}
+ className="border border-border rounded-xl overflow-hidden bg-card shadow-sm"
+ initial={{ opacity: 0, y: 20 }}
+ animate={{ opacity: 1, y: 0 }}
+ transition={{ duration: 0.3 }}
+ >
+ {/* Calendar Header */}
+ <div
+ className="px-4 py-3 border-b border-border/50 space-y-3"
+ style={{
+ background: `linear-gradient(135deg, ${calendar.color}20 0%, ${calendar.color}10 50%, transparent 100%)`,
+ }}
+ >
+ <div className="flex items-center gap-3">
+ <div
+ className="w-5 h-5 rounded-full shrink-0 ring-2 ring-background"
+ style={{ backgroundColor: calendar.color }}
+ />
+ <div className="flex-1 min-w-0">
+ <h3 className="font-semibold truncate text-base">
+ {calendar.name}
+ </h3>
+ </div>
+ </div>
+
+ {/* Preset List for this calendar */}
+ {!showLockedView && (
+ <div className="-mx-2">
+ <PresetSelector
+ calendars={props.allCalendars}
+ presets={calendarPresets}
+ selectedPresetId={props.selectedPresetId}
+ onSelectPreset={props.onSelectPreset}
+ onPresetsChange={() =>
+ props.onPresetsChange(calendar.id)
+ }
+ onShiftsChange={props.onShiftsChange}
+ onStatsRefresh={props.onStatsRefresh}
+ calendarId={calendar.id}
+ onPasswordRequired={(action) =>
+ props.onPasswordRequired(calendar.id, action)
+ }
+ onViewSettingsClick={props.onViewSettingsClick}
+ loading={presetsLoading}
+ hidePresetHeader={props.hidePresetHeader}
+ onHidePresetHeaderChange={
+ props.onHidePresetHeaderChange
+ }
+ hideManageButton={true}
+ />
+ </div>
+ )}
+ </div>
+
+ {/* Calendar Content or Locked View */}
+ <div className="p-2 sm:p-3">
+ {showLockedView ? (
+ <LockedCalendarView
+ calendarId={calendar.id}
+ onUnlock={() => {
+ if (props.onUnlockCalendar) {
+ props.onUnlockCalendar(calendar.id);
+ }
+ }}
+ />
+ ) : (
+ <>
+ {/* Hint when preset from different calendar is selected */}
+ {isDisabled && (
+ <div className="mb-3 p-3 bg-muted/50 border border-border/50 rounded-lg">
+ <p className="text-xs text-muted-foreground text-center">
+ {t("preset.cannotAddPresetHint")}
+ </p>
+ </div>
+ )}
+ <CalendarContent
+ calendarDays={props.calendarDays}
+ currentDate={props.currentDate}
+ onDateChange={props.onDateChange}
+ shifts={shifts}
+ notes={notes}
+ selectedPresetId={
+ isDisabled ? undefined : props.selectedPresetId
+ }
+ togglingDates={togglingDates}
+ externalSyncs={externalSyncs}
+ maxShiftsToShow={props.maxShiftsToShow}
+ maxExternalShiftsToShow={props.maxExternalShiftsToShow}
+ showShiftNotes={props.showShiftNotes}
+ showFullTitles={props.showFullTitles}
+ shiftSortType={props.shiftSortType}
+ shiftSortOrder={props.shiftSortOrder}
+ combinedSortMode={props.combinedSortMode}
+ selectedCalendar={calendar.id}
+ statsRefreshTrigger={props.statsRefreshTrigger}
+ shouldHideUIElements={false}
+ locale={props.locale}
+ onDayClick={
+ isDisabled
+ ? () => {}
+ : (date) => props.onDayClick(calendar.id, date)
+ }
+ onDayRightClick={
+ props.onDayRightClick
+ ? (e, date) =>
+ props.onDayRightClick!(calendar.id, e, date)
+ : undefined
+ }
+ onNoteIconClick={
+ props.onNoteIconClick
+ ? (e, date) =>
+ props.onNoteIconClick!(calendar.id, e, date)
+ : undefined
+ }
+ onLongPress={
+ props.onLongPress
+ ? (date) => props.onLongPress!(calendar.id, date)
+ : undefined
+ }
+ onShowAllShifts={(date, dayShifts) =>
+ props.onShowAllShifts(calendar.id, date, dayShifts)
+ }
+ onShowSyncedShifts={(date, syncedShifts) =>
+ props.onShowSyncedShifts(
+ calendar.id,
+ date,
+ syncedShifts
+ )
+ }
+ onDeleteShift={
+ props.onDeleteShift
+ ? (id) => props.onDeleteShift!(calendar.id, id)
+ : undefined
+ }
+ />
+ </>
+ )}
+ </div>
+ </motion.div>
+ );
+ })}
+ </div>
+ </div>
+ </div>
+ );
+}
diff --git a/components/calendar-selector.tsx b/components/calendar-selector.tsx
index 31a6c28..6a4a435 100644
--- a/components/calendar-selector.tsx
+++ b/components/calendar-selector.tsx
@@ -10,7 +10,7 @@ import {
SelectValue,
} from "@/components/ui/select";
import { Button } from "@/components/ui/button";
-import { Plus, CalendarCog, Cloud, Bell } from "lucide-react";
+import { Plus, CalendarCog, Cloud, Bell, Copy } from "lucide-react";
import { getCachedPassword } from "@/lib/password-cache";
interface CalendarSelectorProps {
@@ -21,6 +21,7 @@ interface CalendarSelectorProps {
onManagePassword?: () => void;
onExternalSync?: () => void;
onSyncNotifications?: () => void;
+ onCompare?: () => void;
hasSyncErrors?: boolean;
variant?: "desktop" | "mobile";
}
@@ -33,6 +34,7 @@ export function CalendarSelector({
onManagePassword,
onExternalSync,
onSyncNotifications,
+ onCompare,
hasSyncErrors = false,
variant = "desktop",
}: CalendarSelectorProps) {
@@ -43,6 +45,7 @@ export function CalendarSelector({
const requiresPassword = !!selectedCalendar?.passwordHash;
const hasPassword = selectedId ? !!getCachedPassword(selectedId) : false;
const shouldHideSyncButtons = requiresPassword && !hasPassword;
+ const canCompare = calendars.length >= 2;
// Desktop: Compact icon-based layout
if (variant === "desktop") {
@@ -112,6 +115,17 @@ export function CalendarSelector({
)}
</Button>
)}
+ {onCompare && canCompare && (
+ <Button
+ onClick={onCompare}
+ size="icon"
+ variant="outline"
+ className="h-9 w-9 sm:h-10 sm:w-10"
+ title={t("calendar.compare")}
+ >
+ <Copy className="h-4 w-4" />
+ </Button>
+ )}
<Button
onClick={onCreateNew}
size="icon"
@@ -199,11 +213,29 @@ export function CalendarSelector({
</div>
)}
- {/* Create New Button - Full Width */}
- <Button onClick={onCreateNew} size="sm" variant="outline" className="h-9">
- <Plus className="h-4 w-4 mr-2" />
- {t("common.create")}
- </Button>
+ {/* Compare and Create Buttons */}
+ <div className="grid grid-cols-2 gap-2">
+ {onCompare && canCompare && (
+ <Button
+ onClick={onCompare}
+ size="sm"
+ variant="outline"
+ className="h-9"
+ >
+ <Copy className="h-4 w-4 mr-2" />
+ {t("calendar.compare")}
+ </Button>
+ )}
+ <Button
+ onClick={onCreateNew}
+ size="sm"
+ variant="outline"
+ className={`h-9 ${canCompare && onCompare ? "" : "col-span-2"}`}
+ >
+ <Plus className="h-4 w-4 mr-2" />
+ {t("common.create")}
+ </Button>
+ </div>
</div>
);
}
diff --git a/components/preset-list.tsx b/components/preset-list.tsx
index 6d9b772..1460606 100644
--- a/components/preset-list.tsx
+++ b/components/preset-list.tsx
@@ -29,6 +29,7 @@ interface PresetListProps {
loading?: boolean;
hidePresetHeader?: boolean;
onHidePresetHeaderChange?: (hide: boolean) => void;
+ hideManageButton?: boolean;
}
export function PresetList({
@@ -43,6 +44,7 @@ export function PresetList({
loading = false,
hidePresetHeader = false,
onHidePresetHeaderChange,
+ hideManageButton = false,
}: PresetListProps) {
const t = useTranslations();
const [showSecondary, setShowSecondary] = React.useState(false);
@@ -129,17 +131,19 @@ export function PresetList({
<p className="text-[10px] sm:text-xs text-muted-foreground max-w-md mx-auto">
{t("preset.createFirstDescription")}
</p>
- <Button
- onClick={onManageClick}
- size="sm"
- className="gap-2"
- disabled={!onManageClick}
- >
- <Plus className="h-4 w-4" />
- <span className="text-xs sm:text-sm">
- {t("preset.createYourFirst")}
- </span>
- </Button>
+ {!hideManageButton && (
+ <Button
+ onClick={onManageClick}
+ size="sm"
+ className="gap-2"
+ disabled={!onManageClick}
+ >
+ <Plus className="h-4 w-4" />
+ <span className="text-xs sm:text-sm">
+ {t("preset.createYourFirst")}
+ </span>
+ </Button>
+ )}
</div>
);
}
@@ -204,7 +208,7 @@ export function PresetList({
{/* Control Buttons Row */}
<div className="flex items-center gap-1.5 sm:gap-2">
- {!hidePresetHeader && (
+ {!hidePresetHeader && !hideManageButton && (
<Button
variant="outline"
size="sm"
diff --git a/components/preset-selector.tsx b/components/preset-selector.tsx
index dbeef6d..9e220e7 100644
--- a/components/preset-selector.tsx
+++ b/components/preset-selector.tsx
@@ -21,6 +21,7 @@ interface PresetSelectorProps {
loading?: boolean;
hidePresetHeader?: boolean;
onHidePresetHeaderChange?: (hide: boolean) => void;
+ hideManageButton?: boolean;
}
export function PresetSelector({
@@ -37,6 +38,7 @@ export function PresetSelector({
loading = false,
hidePresetHeader = false,
onHidePresetHeaderChange,
+ hideManageButton = false,
}: PresetSelectorProps) {
const [showManageDialog, setShowManageDialog] = useState(false);
@@ -72,6 +74,7 @@ export function PresetSelector({
loading={loading}
hidePresetHeader={hidePresetHeader}
onHidePresetHeaderChange={onHidePresetHeaderChange}
+ hideManageButton={hideManageButton}
/>
<PresetManageSheet
diff --git a/components/ui/base-sheet.tsx b/components/ui/base-sheet.tsx
index 648cb6f..8d9f644 100644
--- a/components/ui/base-sheet.tsx
+++ b/components/ui/base-sheet.tsx
@@ -26,6 +26,7 @@ interface BaseSheetProps {
onSave?: () => void | Promise<void>;
isSaving?: boolean;
saveDisabled?: boolean;
+ saveLabel?: string;
hasUnsavedChanges?: boolean;
maxWidth?: "sm" | "md" | "lg" | "xl";
}
@@ -49,6 +50,7 @@ export function BaseSheet({
onSave,
isSaving = false,
saveDisabled = false,
+ saveLabel,
hasUnsavedChanges = false,
maxWidth = "md",
}: BaseSheetProps) {
@@ -118,7 +120,9 @@ export function BaseSheet({
disabled={saveDisabled || isSaving}
className="flex-1 h-11 bg-gradient-to-r from-primary to-primary/90 hover:from-primary/90 hover:to-primary/80 shadow-lg shadow-primary/25 disabled:opacity-50 disabled:shadow-none"
>
- {isSaving ? t("common.saving") : t("common.save")}
+ {isSaving
+ ? t("common.saving")
+ : saveLabel || t("common.save")}
</Button>
)}
</div>
diff --git a/hooks/usePasswordManagement.ts b/hooks/usePasswordManagement.ts
index eaa3f4a..7d9a852 100644
--- a/hooks/usePasswordManagement.ts
+++ b/hooks/usePasswordManagement.ts
@@ -8,6 +8,7 @@ import { ShiftFormData } from "@/components/shift-sheet";
export interface PendingAction {
type: "delete" | "edit" | "syncNotifications";
+ calendarId?: string;
shiftId?: string;
formData?: ShiftFormData;
presetAction?: () => Promise<void>;
diff --git a/messages/de.json b/messages/de.json
index abd544f..b3a90c8 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -82,7 +82,18 @@
"currentPasswordRequired": "Erforderlich, um Änderungen zu speichern",
"lockCalendar": "Kalender komplett sperren",
"lockCalendarHint": "Sperrt Kalender komplett - Passwort zum sehen und verwalten erforderlich",
- "lockRequiresPassword": "Kalendersperre erfordert ein Passwort"
+ "lockRequiresPassword": "Kalendersperre erfordert ein Passwort",
+ "compare": "Vergleichen",
+ "compareMode": "Vergleichsmodus",
+ "exitCompare": "Vergleich beenden",
+ "selectToCompare": "Wähle Kalender zum Vergleichen",
+ "selectToCompareDescription": "Wähle 2-3 Kalender aus, um sie nebeneinander zu vergleichen",
+ "compareSelected": "{count} ausgewählt",
+ "startComparing": "Vergleich starten",
+ "mobileNotOptimized": "Die Vergleichsansicht ist nicht für Mobile optimiert. Für die beste Erfahrung nutze bitte einen größeren Bildschirm.",
+ "shareLink": "Link teilen",
+ "shareLinkDescription": "Kopiere den Link zur Vergleichsansicht",
+ "linkCopied": "Link in Zwischenablage kopiert"
},
"color": {
"custom": "Eigene Farbe",
@@ -153,7 +164,8 @@
"hideFromStatsHint": "Schichten dieser Vorlage aus der Statistik ausschließen",
"showPresets": "Vorlagen anzeigen",
"hidePresets": "Vorlagen ausblenden",
- "hiddenFromStats": "Aus Statistik ausgeblendet"
+ "hiddenFromStats": "Aus Statistik ausgeblendet",
+ "cannotAddPresetHint": "Diese Vorlage gehört zu einem anderen Kalender und kann hier nicht hinzugefügt werden."
},
"view": {
"settingsTitle": "Ansichtseinstellungen",
diff --git a/messages/en.json b/messages/en.json
index c866efa..f3fcbf7 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -82,7 +82,18 @@
"currentPasswordRequired": "Required to save changes",
"lockCalendar": "Lock calendar completely",
"lockCalendarHint": "Locks calendar completely - password required to view and manage",
- "lockRequiresPassword": "Locking the calendar requires a password"
+ "lockRequiresPassword": "Locking the calendar requires a password",
+ "compare": "Compare Calendars",
+ "compareMode": "Comparison Mode",
+ "exitCompare": "Exit Comparison",
+ "selectToCompare": "Select calendars to compare",
+ "selectToCompareDescription": "Choose 2-3 calendars to view them side by side",
+ "compareSelected": "{count} selected",
+ "startComparing": "Start Comparing",
+ "mobileNotOptimized": "The comparison view is not optimized for mobile. Please use a larger screen for the best experience.",
+ "shareLink": "Share Link",
+ "shareLinkDescription": "Copy link to comparison view",
+ "linkCopied": "Link copied to clipboard"
},
"color": {
"custom": "Custom",
@@ -153,7 +164,8 @@
"hideFromStatsHint": "Exclude shifts from this preset from statistics",
"showPresets": "Show presets",
"hidePresets": "Hide presets",
- "hiddenFromStats": "Hidden from statistics"
+ "hiddenFromStats": "Hidden from statistics",
+ "cannotAddPresetHint": "This preset belongs to a different calendar and cannot be added here."
},
"view": {
"settingsTitle": "View Settings",
diff --git a/messages/it.json b/messages/it.json
index b3a5542..e53eb78 100644
--- a/messages/it.json
+++ b/messages/it.json
@@ -82,7 +82,18 @@
"currentPasswordRequired": "Richiesto per salvare le modifiche",
"lockCalendar": "Blocca calendario completamente",
"lockCalendarHint": "Blocca il calendario completamente - è necessaria la password per visualizzare e gestire",
- "lockRequiresPassword": "Il blocco del calendario richiede una password"
+ "lockRequiresPassword": "Il blocco del calendario richiede una password",
+ "compare": "Confronta Calendari",
+ "compareMode": "Modalità Confronto",
+ "exitCompare": "Esci dal Confronto",
+ "selectToCompare": "Seleziona calendari da confrontare",
+ "selectToCompareDescription": "Scegli 2-3 calendari per visualizzarli affiancati",
+ "compareSelected": "{count} selezionati",
+ "startComparing": "Inizia Confronto",
+ "mobileNotOptimized": "La vista confronto non è ottimizzata per dispositivi mobili. Utilizza uno schermo più grande per un'esperienza migliore.",
+ "shareLink": "Condividi Link",
+ "shareLinkDescription": "Copia link alla vista confronto",
+ "linkCopied": "Link copiato negli appunti"
},
"color": {
"custom": "Personalizzato",
@@ -153,7 +164,8 @@
"hideFromStatsHint": "Escludi i turni da questo preset dalle statistiche",
"showPresets": "Mostra preset",
"hidePresets": "Nascondi preset",
- "hiddenFromStats": "Nascosto dalle statistiche"
+ "hiddenFromStats": "Nascosto dalle statistiche",
+ "cannotAddPresetHint": "Questo preset appartiene a un altro calendario e non può essere aggiunto qui."
},
"view": {
"settingsTitle": "Impostazioni Vista",