Support the read-only calendar role, show "Vorstand", fix link buttons
Test and deploy / test (pull_request) Successful in 2m18s
Test and deploy / deploy (pull_request) Skipped

- Read-only role: /admin/me's permissions decide via canEditCalendar
  (lib/permissions.ts, mirrors the API's canWrite: only `access` writes).
  Read-only accounts see everything but get no "Neuer Termin", no "+", no
  "Veröffentlichen"; an event opens as "Termin ansehen" with locked fields.
  A "Nur lesen" badge in the header explains why. The API refuses their
  writes regardless.
- The management calendar is labelled "Vorstand"; the slug stays
  `management` for the API, URLs and iCal links.
- The subscription dialog's Apple/Google links are plain anchors styled with
  buttonVariants instead of Base UI Buttons rendering an <a>, which warned in
  dev and would have given them role="button".

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
PaddyandClaude Opus 5.5 committed 2026-11-08 22:15:31 +01:00
1 parent 1971d2bd6f
commit 61e0393f01
16 files changed
+155 -32

No files matched your search

+11 -1
View File
@@ -1,6 +1,6 @@
"use client";
import { LogOutIcon, RefreshCwIcon } from "lucide-react";
import { EyeIcon, LogOutIcon, RefreshCwIcon } from "lucide-react";
import Link from "next/link";
import { usePathname } from "next/navigation";
import { useEffect, useState } from "react";
@@ -11,6 +11,7 @@ import { Skeleton } from "@/components/ui/skeleton";
import { Toaster } from "@/components/ui/sonner";
import { goToAdminLogin, signOut } from "@/lib/admin-auth";
import { api, ApiError } from "@/lib/api";
import { canEditCalendar } from "@/lib/permissions";
import type { AdminUser } from "@/lib/types";
type Failure = "denied" | "unavailable";
@@ -82,6 +83,15 @@ export default function AdminLayout({ children }: { children: React.ReactNode })
) : (
<Skeleton className="hidden h-4 w-24 sm:block" />
)}
{me && !canEditCalendar(me) && (
<span
className="inline-flex h-6 items-center gap-1 rounded-full bg-muted px-2 text-xs font-medium text-muted-foreground"
title="Dein Konto darf den Kalender ansehen, aber nichts ändern."
>
<EyeIcon aria-hidden className="size-3.5" />
Nur lesen
</span>
)}
{me && <SubscriptionsDialog />}
<Button variant="ghost" size="sm" onClick={() => void signOut()} aria-label="Abmelden">
<LogOutIcon />
+20 -13
View File
@@ -6,6 +6,7 @@ import { toast } from "sonner";
import { CalendarChips } from "@/components/admin/CalendarChips";
import { EventList } from "@/components/admin/EventList";
import { EventSheet, type SheetMode } from "@/components/admin/EventSheet";
import { useCanEdit } from "@/components/admin/AdminSession";
import { EventsToolbar } from "@/components/admin/EventsToolbar";
import { PublishDialog } from "@/components/admin/PublishDialog";
import { useEvents } from "@/components/admin/useEvents";
@@ -32,6 +33,8 @@ export default function AdminPage() {
function EventsPage() {
const [state, update] = useListState();
// Read-only role: everything visible, no way to change it (the API refuses writes anyway).
const canEdit = useCanEdit();
const { events, loads, reload, refresh, upsertEvent, removeEvent } = useEvents();
// Fixed per visit: "upcoming" should not reshuffle while someone is looking at it.
const [now] = useState(() => new Date());
@@ -138,10 +141,12 @@ function EventsPage() {
</span>
)}
</div>
<Button onClick={newEvent} className="hidden sm:inline-flex">
<PlusIcon />
Neuer Termin
</Button>
{canEdit && (
<Button onClick={newEvent} className="hidden sm:inline-flex">
<PlusIcon />
Neuer Termin
</Button>
)}
</div>
<EventsToolbar
@@ -183,19 +188,21 @@ function EventsPage() {
publishingId={publishingId}
todayMarker={todayMarker}
onOpen={(event) => openSheet({ kind: "edit", event })}
onPublish={setConfirmPublish}
onPublish={canEdit ? setConfirmPublish : undefined}
onClearQuery={() => update({ query: "" })}
/>
{/* Phones: a thumb-reach button instead of the header one. */}
<Button
onClick={newEvent}
size="icon-lg"
aria-label="Neuer Termin"
className="fixed right-5 bottom-[calc(1.25rem+env(safe-area-inset-bottom))] z-20 size-14 rounded-full shadow-lg sm:hidden [&_svg:not([class*='size-'])]:size-6"
>
<PlusIcon />
</Button>
{canEdit && (
<Button
onClick={newEvent}
size="icon-lg"
aria-label="Neuer Termin"
className="fixed right-5 bottom-[calc(1.25rem+env(safe-area-inset-bottom))] z-20 size-14 rounded-full shadow-lg sm:hidden [&_svg:not([class*='size-'])]:size-6"
>
<PlusIcon />
</Button>
)}
<EventSheet
key={sheet.key}