Skip to content

Your favorite shift management application!

feat: Calendar Settings (#70)

panteL6c4e8bb1140e
diff --git a/app/page.tsx b/app/page.tsx
index a4f1573..cf11760 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -331,7 +331,9 @@ function HomeContent() {
onSelectCalendar={setSelectedCalendar}
onSelectPreset={setSelectedPresetId}
onCreateCalendar={() => dialogStates.setShowCalendarDialog(true)}
- onManagePassword={() => dialogStates.setShowManagePasswordDialog(true)}
+ onManagePassword={() =>
+ dialogStates.setShowCalendarSettingsDialog(true)
+ }
onDeleteCalendar={initiateDeleteCalendar}
onExternalSync={handleExternalSyncClick}
onSyncNotifications={handleSyncNotifications}
@@ -440,9 +442,11 @@ function HomeContent() {
onPasswordDialogChange={dialogStates.setShowPasswordDialog}
calendars={calendars}
onPasswordSuccess={handlePasswordSuccess}
- showManagePasswordDialog={dialogStates.showManagePasswordDialog}
- onManagePasswordDialogChange={dialogStates.setShowManagePasswordDialog}
- onManagePasswordSuccess={refetchCalendars}
+ showCalendarSettingsDialog={dialogStates.showCalendarSettingsDialog}
+ onCalendarSettingsDialogChange={
+ dialogStates.setShowCalendarSettingsDialog
+ }
+ onCalendarSettingsSuccess={refetchCalendars}
showDeleteCalendarDialog={dialogStates.showDeleteCalendarDialog}
onDeleteCalendarDialogChange={dialogStates.setShowDeleteCalendarDialog}
calendarToDelete={dialogStates.calendarToDelete}
diff --git a/components/calendar-dialog.tsx b/components/calendar-dialog.tsx
index f976587..db40840 100644
--- a/components/calendar-dialog.tsx
+++ b/components/calendar-dialog.tsx
@@ -61,7 +61,7 @@ export function CalendarDialog({
// Can't lock without password
if (lockCalendar && !usePassword) {
- setError(t("password.lockRequiresPassword"));
+ setError(t("calendar.lockRequiresPassword"));
return;
}
@@ -218,10 +218,10 @@ export function CalendarDialog({
htmlFor="lockCalendar"
className="text-sm font-medium cursor-pointer"
>
- {t("password.lockCalendar")}
+ {t("calendar.lockCalendar")}
</Label>
<p className="text-xs text-muted-foreground mt-0.5">
- {t("password.lockCalendarHint")}
+ {t("calendar.lockCalendarHint")}
</p>
</div>
</div>
diff --git a/components/calendar-selector.tsx b/components/calendar-selector.tsx
index c913280..e0867e3 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, KeyRound, Trash2, Cloud, Bell } from "lucide-react";
+import { Plus, CalendarCog, Trash2, Cloud, Bell } from "lucide-react";
import { getCachedPassword } from "@/lib/password-cache";
interface CalendarSelectorProps {
@@ -74,9 +74,11 @@ export function CalendarSelector({
size="icon"
variant="outline"
className="h-9 w-9 sm:h-10 sm:w-10"
- title={t("calendar.managePassword")}
+ title={t("calendar.settings", {
+ name: selectedCalendar?.name || "",
+ })}
>
- <KeyRound className="h-4 w-4" />
+ <CalendarCog className="h-4 w-4" />
</Button>
)}
{onExternalSync && selectedId && !shouldHideSyncButtons && (
@@ -167,9 +169,11 @@ export function CalendarSelector({
size="sm"
variant="outline"
className="h-9"
- title={t("calendar.managePassword")}
+ title={t("calendar.settings", {
+ name: selectedCalendar?.name || "",
+ })}
>
- <KeyRound className="h-4 w-4" />
+ <CalendarCog className="h-4 w-4" />
</Button>
)}
{onExternalSync && !shouldHideSyncButtons && (
diff --git a/components/manage-password-dialog.tsx b/components/calendar-settings-dialog.tsx
similarity index 72%
rename from components/manage-password-dialog.tsx
rename to components/calendar-settings-dialog.tsx
index 07329e7..01c92a6 100644
--- a/components/manage-password-dialog.tsx
+++ b/components/calendar-settings-dialog.tsx
@@ -15,27 +15,32 @@ import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
import { Checkbox } from "@/components/ui/checkbox";
import { removeCachedPassword, setCachedPassword } from "@/lib/password-cache";
+import { PRESET_COLORS } from "@/lib/constants";
-interface ManagePasswordDialogProps {
+interface CalendarSettingsDialogProps {
open: boolean;
onOpenChange: (open: boolean) => void;
calendarId: string;
calendarName: string;
+ calendarColor: string;
hasPassword: boolean;
isLocked: boolean;
onSuccess: () => void;
}
-export function ManagePasswordDialog({
+export function CalendarSettingsDialog({
open,
onOpenChange,
calendarId,
calendarName,
+ calendarColor,
hasPassword,
isLocked,
onSuccess,
-}: ManagePasswordDialogProps) {
+}: CalendarSettingsDialogProps) {
const t = useTranslations();
+ const [name, setName] = useState(calendarName);
+ const [selectedColor, setSelectedColor] = useState(calendarColor);
const [currentPassword, setCurrentPassword] = useState("");
const [newPassword, setNewPassword] = useState("");
const [confirmPassword, setConfirmPassword] = useState("");
@@ -46,6 +51,8 @@ export function ManagePasswordDialog({
useEffect(() => {
if (open) {
+ setName(calendarName);
+ setSelectedColor(calendarColor);
setCurrentPassword("");
setNewPassword("");
setConfirmPassword("");
@@ -53,7 +60,7 @@ export function ManagePasswordDialog({
setLockCalendar(isLocked);
setError("");
}
- }, [open, isLocked]);
+ }, [open, calendarName, calendarColor, isLocked]);
const handleSubmit = async (e: React.FormEvent) => {
e.preventDefault();
@@ -76,7 +83,7 @@ export function ManagePasswordDialog({
// If trying to lock without password
if (lockCalendar && removePassword) {
- setError(t("password.lockRequiresPassword"));
+ setError(t("calendar.lockRequiresPassword"));
return;
}
@@ -84,10 +91,14 @@ export function ManagePasswordDialog({
try {
const requestBody: {
+ name?: string;
+ color?: string;
currentPassword?: string;
isLocked: boolean;
password?: string | null;
} = {
+ name: name !== calendarName ? name : undefined,
+ color: selectedColor !== calendarColor ? selectedColor : undefined,
currentPassword: hasPassword ? currentPassword : undefined,
isLocked: lockCalendar,
};
@@ -132,7 +143,7 @@ export function ManagePasswordDialog({
onSuccess();
onOpenChange(false);
} catch (error) {
- console.error("Failed to update password:", error);
+ console.error("Failed to update calendar:", error);
setError(t("validation.passwordIncorrect"));
} finally {
setLoading(false);
@@ -141,21 +152,74 @@ export function ManagePasswordDialog({
return (
<Dialog open={open} onOpenChange={onOpenChange}>
- <DialogContent className="sm:max-w-[480px] p-0 gap-0 border border-border/50 bg-gradient-to-b from-background via-background to-muted/30 backdrop-blur-xl shadow-2xl">
+ <DialogContent className="sm:max-w-[600px] max-w-[95vw] max-h-[85vh] flex flex-col p-0 gap-0 border border-border/50 bg-gradient-to-b from-background via-background to-muted/30 backdrop-blur-xl shadow-2xl">
<DialogHeader className="border-b border-border/50 bg-gradient-to-r from-primary/10 via-primary/5 to-transparent p-6 pb-5 space-y-1.5">
<DialogTitle className="text-xl font-semibold bg-gradient-to-r from-foreground to-foreground/70 bg-clip-text">
- {t("password.manage", { name: calendarName })}
+ {t("calendar.settings", { name: calendarName })}
</DialogTitle>
- <DialogDescription asChild>
- <div className="text-sm text-muted-foreground flex items-center gap-2">
- <div className="w-1 h-4 bg-gradient-to-b from-primary to-primary/50 rounded-full"></div>
- {hasPassword
- ? t("password.currentlyProtected")
- : t("password.notProtected")}
- </div>
+ <DialogDescription className="text-sm text-muted-foreground">
+ {t("calendar.settingsDescription")}
</DialogDescription>
</DialogHeader>
- <form onSubmit={handleSubmit} className="p-6 space-y-5">
+ <form
+ onSubmit={handleSubmit}
+ className="space-y-4 overflow-y-auto flex-1 px-6 pb-6"
+ >
+ {/* Calendar Name */}
+ <div className="space-y-2.5 pt-6">
+ <Label
+ htmlFor="calendarName"
+ className="text-sm font-medium flex items-center gap-2"
+ >
+ <div className="w-1 h-4 bg-gradient-to-b from-primary to-primary/50 rounded-full"></div>
+ {t("form.nameLabel")}
+ </Label>
+ <Input
+ id="calendarName"
+ type="text"
+ value={name}
+ onChange={(e) => setName(e.target.value)}
+ placeholder={t("form.namePlaceholder", {
+ example: t("calendar.name"),
+ })}
+ className="h-11 border-primary/30 focus:border-primary/50 focus:ring-primary/20 bg-background/50"
+ required
+ />
+ </div>
+
+ {/* Calendar Color */}
+ <div className="space-y-2.5">
+ <Label className="text-sm font-medium flex items-center gap-2">
+ <div className="w-1 h-4 bg-gradient-to-b from-primary to-primary/50 rounded-full"></div>
+ {t("form.colorLabel")}
+ </Label>
+ <div className="grid grid-cols-4 gap-2">
+ {PRESET_COLORS.map((colorObj) => (
+ <button
+ key={colorObj.value}
+ type="button"
+ onClick={() => setSelectedColor(colorObj.value)}
+ className={`h-11 rounded-lg transition-all ${
+ selectedColor === colorObj.value
+ ? "ring-2 ring-primary ring-offset-2 ring-offset-background scale-105"
+ : "hover:scale-105"
+ }`}
+ style={{ backgroundColor: colorObj.value }}
+ title={colorObj.name}
+ />
+ ))}
+ </div>
+ </div>
+
+ {/* Password Section Header */}
+ <div className="pt-2 pb-1">
+ <div className="flex items-center gap-2 text-sm font-medium text-muted-foreground">
+ <div className="flex-1 h-px bg-border"></div>
+ <span>{t("password.optional")}</span>
+ <div className="flex-1 h-px bg-border"></div>
+ </div>
+ </div>
+
{hasPassword && (
<div className="space-y-2.5">
<Label
@@ -172,8 +236,10 @@ export function ManagePasswordDialog({
onChange={(e) => setCurrentPassword(e.target.value)}
placeholder={t("password.currentPasswordPlaceholder")}
className="h-11 border-primary/30 focus:border-primary/50 focus:ring-primary/20 bg-background/50"
- autoFocus
/>
+ <p className="text-xs text-muted-foreground">
+ {t("calendar.currentlyProtected")}
+ </p>
</div>
)}
@@ -212,10 +278,10 @@ export function ManagePasswordDialog({
htmlFor="lockCalendar"
className="text-sm font-medium cursor-pointer"
>
- {t("password.lockCalendar")}
+ {t("calendar.lockCalendar")}
</Label>
<p className="text-xs text-muted-foreground mt-0.5">
- {t("password.lockCalendarHint")}
+ {t("calendar.lockCalendarHint")}
</p>
</div>
</div>
@@ -246,7 +312,6 @@ export function ManagePasswordDialog({
onChange={(e) => setNewPassword(e.target.value)}
placeholder={t("password.newPasswordPlaceholder")}
className="h-11 border-primary/30 focus:border-primary/50 focus:ring-primary/20 bg-background/50"
- autoFocus={!hasPassword}
/>
</div>
diff --git a/components/dialog-manager.tsx b/components/dialog-manager.tsx
index 18d6173..b88d06f 100644
--- a/components/dialog-manager.tsx
+++ b/components/dialog-manager.tsx
@@ -1,7 +1,7 @@
import { CalendarDialog } from "@/components/calendar-dialog";
import { ShiftDialog, ShiftFormData } from "@/components/shift-dialog";
import { PasswordDialog } from "@/components/password-dialog";
-import { ManagePasswordDialog } from "@/components/manage-password-dialog";
+import { CalendarSettingsDialog } from "@/components/calendar-settings-dialog";
import { DeleteCalendarDialog } from "@/components/delete-calendar-dialog";
import { ExternalSyncManageDialog } from "@/components/external-sync-manage-dialog";
import { SyncNotificationDialog } from "@/components/sync-notification-dialog";
@@ -36,10 +36,10 @@ interface DialogManagerProps {
calendars: CalendarWithCount[];
onPasswordSuccess: (password: string) => void;
- // Manage Password Dialog
- showManagePasswordDialog: boolean;
- onManagePasswordDialogChange: (open: boolean) => void;
- onManagePasswordSuccess: () => void;
+ // Calendar Settings Dialog
+ showCalendarSettingsDialog: boolean;
+ onCalendarSettingsDialogChange: (open: boolean) => void;
+ onCalendarSettingsSuccess: () => void;
// Delete Calendar Dialog
showDeleteCalendarDialog: boolean;
@@ -136,14 +136,18 @@ export function DialogManager(props: DialogManagerProps) {
onSuccess={props.onPasswordSuccess}
/>
- <ManagePasswordDialog
- open={props.showManagePasswordDialog}
- onOpenChange={props.onManagePasswordDialogChange}
+ <CalendarSettingsDialog
+ open={props.showCalendarSettingsDialog}
+ onOpenChange={props.onCalendarSettingsDialogChange}
calendarId={props.selectedCalendar}
calendarName={
props.calendars.find((c) => c.id === props.selectedCalendar)
?.name || ""
}
+ calendarColor={
+ props.calendars.find((c) => c.id === props.selectedCalendar)
+ ?.color || "#3b82f6"
+ }
hasPassword={
!!props.calendars.find((c) => c.id === props.selectedCalendar)
?.passwordHash
@@ -152,7 +156,7 @@ export function DialogManager(props: DialogManagerProps) {
props.calendars.find((c) => c.id === props.selectedCalendar)
?.isLocked || false
}
- onSuccess={props.onManagePasswordSuccess}
+ onSuccess={props.onCalendarSettingsSuccess}
/>
<ExternalSyncManageDialog
diff --git a/hooks/useDialogStates.ts b/hooks/useDialogStates.ts
index 7c03198..435de7e 100644
--- a/hooks/useDialogStates.ts
+++ b/hooks/useDialogStates.ts
@@ -5,7 +5,7 @@ export function useDialogStates() {
const [showCalendarDialog, setShowCalendarDialog] = useState(false);
const [showShiftDialog, setShowShiftDialog] = useState(false);
const [showPasswordDialog, setShowPasswordDialog] = useState(false);
- const [showManagePasswordDialog, setShowManagePasswordDialog] =
+ const [showCalendarSettingsDialog, setShowCalendarSettingsDialog] =
useState(false);
const [showMobileCalendarDialog, setShowMobileCalendarDialog] =
useState(false);
@@ -36,8 +36,8 @@ export function useDialogStates() {
setShowShiftDialog,
showPasswordDialog,
setShowPasswordDialog,
- showManagePasswordDialog,
- setShowManagePasswordDialog,
+ showCalendarSettingsDialog,
+ setShowCalendarSettingsDialog,
showMobileCalendarDialog,
setShowMobileCalendarDialog,
showDeleteCalendarDialog,
diff --git a/messages/de.json b/messages/de.json
index 74061ad..62f0b9f 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -60,7 +60,13 @@
"select": "Dein BetterShift Kalender",
"deleteCalendar": "Kalender löschen",
"deleteWarning": "Alle Schichten, Presets und Notizen werden ebenfalls gelöscht.",
- "managePassword": "Passwort verwalten"
+ "managePassword": "Passwort verwalten",
+ "settings": "Kalendereinstellungen für \"{name}\"",
+ "settingsDescription": "Passe Name, Farbe und Passwortschutz an",
+ "currentlyProtected": "Dieser Kalender ist derzeit passwortgeschützt.",
+ "lockCalendar": "Kalender komplett sperren",
+ "lockCalendarHint": "Sperrt Kalender komplett - Passwort zum sehen und verwalten erforderlich",
+ "lockRequiresPassword": "Kalendersperre erfordert ein Passwort"
},
"color": {
"custom": "Eigene Farbe",
@@ -79,11 +85,6 @@
"manage": "Passwort für \"{name}\" verwalten",
"enter": "Passwort für \"{name}\" eingeben",
"enterCalendarPassword": "Kalenderpasswort eingeben",
- "currentlyProtected": "Dieser Kalender ist derzeit passwortgeschützt.",
- "notProtected": "Dieser Kalender ist derzeit nicht passwortgeschützt.",
- "lockCalendar": "Kalender komplett sperren",
- "lockCalendarHint": "Sperrt Kalender komplett - Passwort zum sehen und verwalten erforderlich",
- "lockRequiresPassword": "Kalendersperre erfordert ein Passwort",
"currentlyLocked": "Dieser Kalender ist derzeit gesperrt.",
"unlockRequired": "Kalender ist passwortgeschützt",
"unlockRequiredDescription": "Dieser Kalender ist passwortgeschützt. Bitte entsperre den Kalender, um Vorlagen zu verwalten und Schichten zu erstellen.",
diff --git a/messages/en.json b/messages/en.json
index 7a2e9e4..57c3f6c 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -60,7 +60,13 @@
"select": "Your BetterShift Calendar",
"deleteCalendar": "Delete Calendar",
"deleteWarning": "All shifts, presets and notes will also be deleted.",
- "managePassword": "Manage Password"
+ "managePassword": "Manage Password",
+ "settings": "Calendar Settings for \"{name}\"",
+ "settingsDescription": "Customize name, color and password protection",
+ "currentlyProtected": "This calendar is currently password protected.",
+ "lockCalendar": "Lock calendar completely",
+ "lockCalendarHint": "Locks calendar completely - password required to view and manage",
+ "lockRequiresPassword": "Locking the calendar requires a password"
},
"color": {
"custom": "Custom",
@@ -79,11 +85,6 @@
"manage": "Manage Password for \"{name}\"",
"enter": "Enter Password for \"{name}\"",
"enterCalendarPassword": "Enter calendar password",
- "currentlyProtected": "This calendar is currently password protected.",
- "notProtected": "This calendar is currently not password protected.",
- "lockCalendar": "Lock calendar completely",
- "lockCalendarHint": "Locks calendar completely - password required to view and manage",
- "lockRequiresPassword": "Locking the calendar requires a password",
"currentlyLocked": "This calendar is currently locked.",
"unlockRequired": "Calendar is password protected",
"unlockRequiredDescription": "This calendar is password protected. Please unlock the calendar to manage presets and create shifts.",
diff --git a/messages/it.json b/messages/it.json
index 992c152..625efe5 100644
--- a/messages/it.json
+++ b/messages/it.json
@@ -60,7 +60,13 @@
"select": "Il tuo Calendario BetterShift",
"deleteCalendar": "Elimina Calendario",
"deleteWarning": "Anche tutti i turni, i preset e le note verranno eliminati.",
- "managePassword": "Gestisci Password"
+ "managePassword": "Gestisci Password",
+ "settings": "Impostazioni Calendario per \"{name}\"",
+ "settingsDescription": "Personalizza nome, colore e protezione password",
+ "currentlyProtected": "Questo calendario è attualmente protetto da password.",
+ "lockCalendar": "Blocca calendario completamente",
+ "lockCalendarHint": "Blocca il calendario completamente - è necessaria la password per visualizzare e gestire",
+ "lockRequiresPassword": "Il blocco del calendario richiede una password"
},
"color": {
"custom": "Personalizzato",
@@ -79,11 +85,6 @@
"manage": "Gestisci Password per \"{name}\"",
"enter": "Inserisci Password per \"{name}\"",
"enterCalendarPassword": "Inserisci la password del calendario",
- "currentlyProtected": "Questo calendario è attualmente protetto da password.",
- "notProtected": "Questo calendario non è attualmente protetto da password.",
- "lockCalendar": "Blocca calendario completamente",
- "lockCalendarHint": "Blocca il calendario completamente - è necessaria la password per visualizzare e gestire",
- "lockRequiresPassword": "Il blocco del calendario richiede una password",
"currentlyLocked": "Questo calendario è attualmente bloccato.",
"unlockRequired": "Il calendario è protetto da password",
"unlockRequiredDescription": "Questo calendario è protetto da password. Sblocca il calendario per gestire i preset e creare turni.",