Files
hope-events/frontend/src/app/dashboard/layout.tsx
T
joshuaandClaude Sonnet 5 8e6cb542d9 Full site redesign, help system, and dashboard stats fixes
Multi-phase visual facelift (design tokens, dashboards, sidebar/navbar
shell, per-page help guides, and a layout/content pass across every
remaining page) plus backend fixes to the dashboard KPI stats:

- Admin/Supervisor dashboard KPIs (revenue, donations, registrations,
  tickets sold) now use a rolling trailing-month window (today back one
  calendar month, e.g. 9 May - 8 June if today is 8 June) instead of
  calendar month-to-date, which under-counted for most of the month.
  The comparison window shifts the same way, so like is still compared
  with like.
- Reports deep-links from those stat tiles now match the same window
  (range=trailing_month, replacing range=this_month).
- Design tokens (brand-* Tailwind scale + shadcn CSS variables), a
  site-wide contextual help button, fixed dashboard sidebar/navbar,
  Admin/Supervisor/Staff/User dashboard rebuilds backed by a new
  GET /api/stats/overview endpoint, a dedicated Contact page, Site
  Settings restyle with WhatsApp config folded in, and an Account
  activity feed backed by a new SecurityEvent model.
- Every remaining page (home, events, registration flow, auth, legal,
  payment results, and every Admin/Supervisor/Staff/User tool page)
  restyled onto the same design tokens, several with real layout
  upgrades (home hero, events list/detail, donate page, auth pages).
- 20+ new dedicated help guides so the whole site has page-specific
  help content instead of falling back to a generic guide.
- Assorted fixes surfaced along the way: donation-leg double-counting
  in payment stats, donations not counting toward revenue, refund
  netting in per-method report breakdowns, and donation
  over-allocation after a refund.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-08-06 15:00:10 +02:00

108 lines
3.6 KiB
TypeScript

"use client";
import React, { useEffect } from "react";
import { useAuth } from "@/hooks/useAuth";
import { usePathname, useRouter } from "next/navigation";
import { Navbar } from "@/components/layout/Navbar";
import { Footer } from "@/components/layout/Footer";
import { Sidebar, MobileSidebar } from "@/components/layout/Sidebar";
// The sidebar shows only on these exact routes — each role's dashboard root,
// plus Profile & Security and Site Settings (matching the redesign
// mockups). Every other /dashboard/* route relies on the global floating
// help button instead of sidebar nav, same as before this redesign.
const SIDEBAR_ROUTES = [
"/dashboard/admin",
"/dashboard/supervisor",
"/dashboard/staff",
"/dashboard/user",
"/dashboard/user/profile",
"/dashboard/admin/settings",
];
export default function DashboardLayout({ children }: { children: React.ReactNode }) {
const { user, loading } = useAuth();
const router = useRouter();
const pathname = usePathname();
// Redirect unauthenticated users to login
useEffect(() => {
if (loading) return;
if (!user) {
router.replace("/login");
}
}, [user, loading, router]);
// Role-based route guard within /dashboard
useEffect(() => {
if (loading) return;
if (!user) return; // handled above
if (!pathname || !pathname.startsWith("/dashboard")) return;
const role = user.role || "user";
// Determine allowed prefixes and default destination per role
let allowed: string[] = ["/dashboard/user"]; // everyone can access user dashboard
let dest = "/dashboard/user";
if (role === "admin") {
allowed = ["/dashboard/admin", "/dashboard/user"];
dest = "/dashboard/admin";
} else if (role === "supervisor") {
allowed = ["/dashboard/supervisor", "/dashboard/user"];
dest = "/dashboard/supervisor";
} else if (role === "staff") {
allowed = ["/dashboard/staff", "/dashboard/user"];
dest = "/dashboard/staff";
}
// Allow admin to access supervisor and staff subpages (but not their root dashboards)
const isAllowed =
allowed.some(prefix => pathname === prefix || pathname.startsWith(prefix + "/")) ||
(role === "admin" && (pathname.startsWith("/dashboard/supervisor/") || pathname.startsWith("/dashboard/staff/"))) ||
(role === "supervisor" && pathname.startsWith("/dashboard/staff/"));
if (!isAllowed && pathname !== dest) {
router.replace(dest);
}
}, [pathname, user, loading, router]);
// Don't render protected content until auth state is known
if (loading || !user) {
return (
<div className="min-h-screen flex items-center justify-center bg-gray-50">
<div className="text-sm text-gray-400">Loading</div>
</div>
);
}
const showSidebar = !!pathname && SIDEBAR_ROUTES.includes(pathname);
if (showSidebar) {
// App-shell layout: the whole viewport is claimed (h-screen, no body
// scroll) so the sidebar can be a plain sibling column that never
// scrolls — only the content column (main + footer) scrolls internally.
return (
<div className="h-screen flex flex-col overflow-hidden">
<Navbar />
<MobileSidebar />
<div className="flex-1 flex min-h-0">
<Sidebar />
<div className="flex-1 min-w-0 flex flex-col overflow-y-auto">
<main className="flex-1 p-6 bg-gray-50">{children}</main>
<Footer />
</div>
</div>
</div>
);
}
return (
<div className="min-h-screen flex flex-col">
<Navbar />
<main className="flex-1 p-6 bg-gray-50">{children}</main>
<Footer />
</div>
);
}