diff --git a/src/app/admin/layout.tsx b/src/app/admin/layout.tsx index b4b537c..08d777a 100644 --- a/src/app/admin/layout.tsx +++ b/src/app/admin/layout.tsx @@ -1,55 +1,12 @@ import { headers } from "next/headers"; import { auth } from "@/lib/auth"; import { redirect } from "next/navigation"; -import { AdminNav } from "@/components/admin/admin-nav"; -import { LogoutButton } from "@/components/layout/logout-button"; +import { AdminShell } from "@/components/admin/admin-shell"; export default async function AdminLayout({ children }: { children: React.ReactNode }) { const session = await auth.api.getSession({ headers: await headers() }); if (!session) redirect("/login"); if (session.user.role !== "admin") redirect("/dashboard"); - return ( -
- {/* Sidebar */} - - - {/* Main content */} -
- {children} -
-
- ); + return {children}; } diff --git a/src/app/curator/layout.tsx b/src/app/curator/layout.tsx index 564e8aa..239278a 100644 --- a/src/app/curator/layout.tsx +++ b/src/app/curator/layout.tsx @@ -3,15 +3,16 @@ import { auth } from "@/lib/auth"; import { redirect } from "next/navigation"; import Link from "next/link"; import { LogoutButton } from "@/components/layout/logout-button"; +import { AdminShell } from "@/components/admin/admin-shell"; export default async function CuratorLayout({ children }: { children: React.ReactNode }) { const session = await auth.api.getSession({ headers: await headers() }); if (!session) redirect("/login"); if (session.user.role !== "curator" && session.user.role !== "admin") redirect("/dashboard"); - // Admin uses their own layout — render content only + // Admin uses the admin shell with sidebar if (session.user.role === "admin") { - return <>{children}; + return {children}; } return ( diff --git a/src/components/admin/admin-shell.tsx b/src/components/admin/admin-shell.tsx new file mode 100644 index 0000000..a0227ef --- /dev/null +++ b/src/components/admin/admin-shell.tsx @@ -0,0 +1,40 @@ +import { AdminNav } from "@/components/admin/admin-nav"; +import { LogoutButton } from "@/components/layout/logout-button"; + +export function AdminShell({ + children, + userName, +}: { + children: React.ReactNode; + userName: string; +}) { + return ( +
+ +
+ {children} +
+
+ ); +}