Arnaud
4c3880e07f
Moderator role existed in the schema and was already respected by
comment deletion, but every admin page/route treated moderator
identically to a regular user (403/redirect). Wires it up narrowly:
admin/layout.tsx now lets admin+moderator through and filters the
nav by role, while every admin-only page (users, tiers, settings,
webhooks, insights, etc.) explicitly redirects moderators away via a
new requireFullAdminPage() helper -- the nav filter is UX, this is
the actual gate. Moderators land on Reports and Recipes: reports
GET/PATCH now accept requireAdmin({allowModerator: true}), and a new
PATCH /api/v1/admin/recipes/[id] lets admin+moderator unpublish a
public recipe (flip to private) as a takedown action, audit-logged.
Also found and fixed a real bug while auditing the PWA push pipeline
for a "push click-through" gap: public/sw.js had no `push` event
listener at all, so incoming push messages never displayed anything
-- push was silently non-functional end-to-end despite the
subscribe/send plumbing all working. Added the push listener
(showNotification) and a notificationclick listener that focuses an
existing tab or opens one at the payload's url.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
78 lines
3.8 KiB
TypeScript
78 lines
3.8 KiB
TypeScript
import Link from "next/link";
|
|
import { Shield, Users, BookOpen, Settings, BarChart3, ClipboardList, HardDrive, Bot, ArrowLeft, Gauge, Mail, Flag, History, LifeBuoy, TrendingUp, Webhook } from "lucide-react";
|
|
import { cn } from "@/lib/utils";
|
|
import { getStaffRole } from "@/lib/require-admin-page";
|
|
import { redirect } from "next/navigation";
|
|
|
|
// adminOnly items are hidden from moderators (and, redundantly but safely,
|
|
// each of those pages also redirects moderators away server-side via
|
|
// requireFullAdminPage — the nav filter here is UX, not the real gate).
|
|
const adminNav = [
|
|
{ href: "/admin", label: "Overview", icon: BarChart3, adminOnly: true },
|
|
{ href: "/admin/insights", label: "Insights", icon: TrendingUp, adminOnly: true },
|
|
{ href: "/admin/users", label: "Users", icon: Users, adminOnly: true },
|
|
{ href: "/admin/invites", label: "Invites", icon: Mail, adminOnly: true },
|
|
{ href: "/admin/recipes", label: "Recipes", icon: BookOpen, adminOnly: false },
|
|
{ href: "/admin/reports", label: "Reports", icon: Flag, adminOnly: false },
|
|
{ href: "/admin/support", label: "Support", icon: LifeBuoy, adminOnly: true },
|
|
{ href: "/admin/tiers", label: "Tier Limits", icon: Gauge, adminOnly: true },
|
|
{ href: "/admin/webhooks", label: "Webhooks", icon: Webhook, adminOnly: true },
|
|
{ href: "/admin/audit-logs", label: "Audit Logs", icon: ClipboardList, adminOnly: true },
|
|
{ href: "/admin/storage", label: "Storage", icon: HardDrive, adminOnly: true },
|
|
{ href: "/admin/ai-config", label: "AI Config", icon: Bot, adminOnly: true },
|
|
{ href: "/admin/settings", label: "Settings", icon: Settings, adminOnly: true },
|
|
{ href: "/admin/changelog", label: "Changelog", icon: History, adminOnly: true },
|
|
];
|
|
|
|
export default async function AdminLayout({ children }: { children: React.ReactNode }) {
|
|
const role = await getStaffRole();
|
|
if (!role) redirect("/recipes");
|
|
|
|
const visibleNav = role === "admin" ? adminNav : adminNav.filter((item) => !item.adminOnly);
|
|
|
|
return (
|
|
<div className="flex flex-col md:flex-row min-h-screen">
|
|
<aside className="w-full md:w-56 md:shrink-0 border-b md:border-b-0 md:border-r bg-muted/30 flex flex-col md:sticky md:top-0 md:h-screen">
|
|
<div className="flex items-center justify-between gap-2 p-4 border-b font-semibold">
|
|
<span className="flex items-center gap-2">
|
|
<Shield className="h-4 w-4 text-destructive" />
|
|
{role === "admin" ? "Admin" : "Moderator"}
|
|
</span>
|
|
<Link
|
|
href="/recipes"
|
|
className="md:hidden flex items-center gap-1 text-xs font-normal text-muted-foreground hover:text-foreground"
|
|
>
|
|
<ArrowLeft className="h-3.5 w-3.5" />
|
|
Back to app
|
|
</Link>
|
|
</div>
|
|
<nav className="flex overflow-x-auto gap-1 p-2 md:flex-col md:overflow-visible md:flex-1 [scrollbar-width:none] [&::-webkit-scrollbar]:hidden">
|
|
{visibleNav.map(({ href, label, icon: Icon }) => (
|
|
<Link
|
|
key={href}
|
|
href={href}
|
|
className={cn(
|
|
"flex items-center gap-2 rounded-md px-3 py-2 text-sm whitespace-nowrap shrink-0 md:shrink transition-colors",
|
|
"hover:bg-accent hover:text-accent-foreground"
|
|
)}
|
|
>
|
|
<Icon className="h-4 w-4" />
|
|
{label}
|
|
</Link>
|
|
))}
|
|
</nav>
|
|
<div className="p-2 border-t hidden md:block">
|
|
<Link
|
|
href="/recipes"
|
|
className="flex items-center gap-2 rounded-md px-3 py-2 text-sm text-muted-foreground hover:text-foreground hover:bg-accent transition-colors"
|
|
>
|
|
<ArrowLeft className="h-4 w-4" />
|
|
Back to app
|
|
</Link>
|
|
</div>
|
|
</aside>
|
|
<main className="flex-1 p-4 md:p-8 overflow-auto min-w-0">{children}</main>
|
|
</div>
|
|
);
|
|
}
|