Restructure route to not use uid

src/app/private/[uid]/admin/home/chapters/[chapterId]/page.tsx → src/app/private/admin/home/chapters/[chapterId]/page.tsx

@@ -3,7 +3,6 @@ import DisplayChapterInfo from "@components/DisplayChapterInfo";
 
 interface ChapterPageParams {
   params: {
-    uid: string;
     chapterId: string;
   };
 }

src/app/private/[uid]/admin/home/chapters/[chapterId]/users/[userId]/page.tsx → src/app/private/admin/home/chapters/[chapterId]/users/[userId]/page.tsx

@@ -5,14 +5,13 @@ import { CardGrid } from "@components/container";
 
 interface Params {
   params: {
-    uid: string;
     userId: string;
     chapterId: string;
   };
 }
 
 const UserPage = async ({ params }: Params) => {
-  const { userId, chapterId, uid } = params;
+  const { userId, chapterId } = params;
 
   const user = await prisma.user.findUniqueOrThrow({
     where: { id: userId, ChapterID: chapterId },
@@ -42,7 +41,7 @@ const UserPage = async ({ params }: Params) => {
           <UserTile
             key={senior.id}
             senior={senior}
-            link={`/private/${uid}/admin/home/chapters/${chapterId}/users/${userId}/seniors/${senior.id}`}
+            link={`/private/admin/home/chapters/${chapterId}/users/${userId}/seniors/${senior.id}`}
           />
         ))}
       />

src/app/private/[uid]/admin/home/chapters/[chapterId]/users/[userId]/seniors/[seniorId]/page.tsx → src/app/private/admin/home/chapters/[chapterId]/users/[userId]/seniors/[seniorId]/page.tsx

@@ -14,7 +14,6 @@ interface Params {
 const SeniorPage = async ({ params }: Params) => {
   const { userId, chapterId, seniorId } = params;
 
-  // TODO(nickbar01234) - Associate each senior to a chapter
   const senior = await prisma.senior.findUniqueOrThrow({
     where: {
       id: seniorId,
@@ -44,7 +43,6 @@ const SeniorPage = async ({ params }: Params) => {
           { display: `${senior.firstname} ${senior.lastname}`, url: seniorId },
         ]}
       />
-
       <CardGrid
         title={
           <>

src/app/private/admin/layout.tsx

@@ -0,0 +1,45 @@
+import { ISideBar } from "@components/Sidebar";
+import { CollapsibleSidebarContainer } from "@components/container";
+import {
+  faEnvelope,
+  faHome,
+  faHouseLock,
+  faUser,
+} from "@fortawesome/free-solid-svg-icons";
+
+interface IAdminLayout {
+  children: React.ReactNode;
+}
+
+const AdminLayout = ({ children }: IAdminLayout) => {
+  const buttons: ISideBar["buttons"] = [
+    {
+      name: "Home",
+      link: `/private/admin/home`,
+      icon: faHome,
+    },
+    {
+      name: "Pending",
+      link: `/private/admin/pending-chapters`,
+      icon: faHouseLock,
+    },
+    {
+      name: "E-list",
+      link: `/private/admin/elist`,
+      icon: faEnvelope,
+    },
+    {
+      name: "Profile",
+      link: `/private/admin/edit-profile`,
+      icon: faUser,
+    },
+  ];
+
+  return (
+    <CollapsibleSidebarContainer buttons={buttons}>
+      {children}
+    </CollapsibleSidebarContainer>
+  );
+};
+
+export default AdminLayout;

src/app/private/[uid]/chapter-leader/home/page.tsx → src/app/private/chapter-leader/home/page.tsx

@@ -1,5 +1,6 @@
 import DisplayChapterInfo from "@components/DisplayChapterInfo";
 import { prisma } from "@server/db/client";
+import { getServerSessionOrRedirect } from "@server/utils";
 
 interface UserHomePageParams {
   params: {
@@ -8,14 +9,10 @@ interface UserHomePageParams {
 }
 
 const UserHomePage = async ({ params }: UserHomePageParams) => {
-  const user = await prisma.user.findFirstOrThrow({
-    where: {
-      id: params.uid,
-    },
-  });
+  const session = await getServerSessionOrRedirect();
   const chapter = await prisma.chapter.findFirstOrThrow({
     where: {
-      id: user.ChapterID ?? "",
+      id: session.user?.ChapterID ?? "",
     },
     include: {
       students: {

src/app/private/chapter-leader/layout.tsx

@@ -0,0 +1,41 @@
+import { ISideBar } from "@components/Sidebar";
+import { CollapsibleSidebarContainer } from "@components/container";
+import { faHome, faUser, faUserGroup } from "@fortawesome/free-solid-svg-icons";
+
+interface IUserLayout {
+  children: React.ReactNode;
+}
+
+const UserLayout = ({ children }: IUserLayout) => {
+  const buttons: ISideBar["buttons"] = [
+    {
+      name: "Home",
+      link: `/private/chapter-leader/home`,
+      icon: faHome,
+    },
+    {
+      name: "Members",
+      link: `/private/chapter-leader/users`,
+      icon: faUserGroup,
+    },
+    // @TODO(nickbar01234) - Fix icon
+    {
+      name: "Seniors",
+      link: `/private/chapter-leader/seniors`,
+      icon: faUserGroup,
+    },
+    {
+      name: "Profile",
+      link: `/private/chapter-leader/edit-profile`,
+      icon: faUser,
+    },
+  ];
+
+  return (
+    <CollapsibleSidebarContainer buttons={buttons}>
+      {children}
+    </CollapsibleSidebarContainer>
+  );
+};
+
+export default UserLayout;

src/app/private/[uid]/chapter-leader/seniors/page.tsx → src/app/private/chapter-leader/seniors/page.tsx

@@ -2,22 +2,14 @@ import React from "react";
 import { prisma } from "@server/db/client";
 import { SeniorView } from "@components/SeniorView";
 import { compareSenior } from "@utils";
+import { getServerSessionOrRedirect } from "@server/utils";
 
-const UserSeniorsPage = async ({ params }: { params: { uid: string } }) => {
-  const userUid = params.uid;
-  const user = await prisma.user.findUnique({
-    where: {
-      id: userUid,
-    },
-  });
-  if (!user) {
-    return <div>User not found</div>;
-  }
-
+const UserSeniorsPage = async () => {
+  const session = await getServerSessionOrRedirect();
   // Fetch the seniors too
   const chapter = await prisma.chapter.findFirst({
     where: {
-      id: user.ChapterID ?? undefined,
+      id: session.user?.ChapterID ?? undefined,
     },
     include: {
       seniors: {},