205418fc4e
Fix blank /org/login (and /admin/login): the guarded portal layout was wrapping its own login route, rendering null when unauthenticated. Move each portal's authed pages into a (authed)/(chapter) route group so login pages live outside the guard. Structure: - app/(chapter)/* — chapter admin pages + guarded layout (was root-level) - app/org/(authed)/* — org pages + guarded layout; /org/login now free - app/admin/(authed)/* — admin pages + guarded layout; /admin/login free - Root layout slimmed to providers only (no shared sidebar) - Convert moved files' relative imports to @/app alias Design system: - PortalShell: shared sidebar shell (brand mark, themed active nav with accent bar, avatar dropdown user menu, loading skeletons) - portal-theme.ts: per-portal theme tokens (violet/slate/blue/emerald) - PortalLoginShell redesigned: two-column with gradient branding panel, dotted pattern, value-prop highlights, built-in back link - New shadcn components: Avatar, DropdownMenu, Skeleton - Move shared DraftCard to _components/draft-card.tsx (used by 2 portals) - Portal selector: remove Super Admin card, icon tiles, hover lift - All 4 login pages use react-hook-form + Zod + themed shell - Member nav restored to full 11-section list with icons Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
37 lines
1.2 KiB
TypeScript
37 lines
1.2 KiB
TypeScript
'use client';
|
|
|
|
import { useEffect } from 'react';
|
|
import { useRouter } from 'next/navigation';
|
|
import { useOrgAdmin } from '@/app/_lib/org-admin-context';
|
|
import { PortalShell } from '@/app/_components/portal-shell';
|
|
import { LayoutDashboard, Building2, Shield } from 'lucide-react';
|
|
|
|
const NAV = [
|
|
{ href: '/org', label: 'Dashboard', icon: <LayoutDashboard /> },
|
|
{ href: '/org/tenants', label: 'Chapters', icon: <Building2 /> },
|
|
{ href: '/org/rules', label: 'Org Rules', icon: <Shield /> },
|
|
];
|
|
|
|
export default function OrgAuthedLayout({ children }: { children: React.ReactNode }) {
|
|
const { orgAdmin, loading, logout } = useOrgAdmin();
|
|
const router = useRouter();
|
|
|
|
useEffect(() => {
|
|
if (!loading && !orgAdmin) router.replace('/org/login');
|
|
}, [orgAdmin, loading, router]);
|
|
|
|
return (
|
|
<PortalShell
|
|
portalName="Organisation"
|
|
theme="violet"
|
|
navItems={NAV}
|
|
loading={loading}
|
|
authed={!!orgAdmin}
|
|
user={orgAdmin ? { email: orgAdmin.email, name: orgAdmin.name, role: orgAdmin.role, subtitle: orgAdmin.organization?.name } : undefined}
|
|
onLogout={() => { void logout(); router.replace('/org/login'); }}
|
|
>
|
|
{children}
|
|
</PortalShell>
|
|
);
|
|
}
|