From 88846558d97c059685b540761cbabdb2406235c0 Mon Sep 17 00:00:00 2001
From: jennymar <jenmar528@gmail.com>
Date: Thu, 16 May 2024 10:56:04 -0700
Subject: [PATCH] Wrapped all admin portal pages with PrivatePage component
 (except login)

---
 frontend/src/app/admin/dashboard/page.tsx | 59 +++++++++++------------
 frontend/src/app/admin/layout.tsx         |  3 +-
 2 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/frontend/src/app/admin/dashboard/page.tsx b/frontend/src/app/admin/dashboard/page.tsx
index c4de9933..dd2be1cd 100644
--- a/frontend/src/app/admin/dashboard/page.tsx
+++ b/frontend/src/app/admin/dashboard/page.tsx
@@ -3,39 +3,36 @@
 import styles from "./page.module.css";
 
 import DashboardCard from "@/components/DashboardCard";
-import PrivatePage from "@/components/admin/PrivatePage";
 
 export default function Dashboard() {
   return (
-    <PrivatePage>
-      <main className={styles.page}>
-        <div className={styles.gridContainer}>
-          <DashboardCard
-            imageURI="/dashboard_eventcreator.png"
-            url="/event-creator"
-            title="Event Creator"
-            last_updated="Month XX, XXXX, XX:XX"
-          />
-          <DashboardCard
-            imageURI="/dashboard_pageeditor.png"
-            url="/page-editor"
-            title="Page Editor"
-            last_updated="Month XX, XXXX, XX:XX"
-          />
-          <DashboardCard
-            imageURI="/dashboard_newsletter.png"
-            url="/newsletter-creator"
-            title="Newsletter"
-            last_updated="Month XX, XXXX, XX:XX"
-          />
-          <DashboardCard
-            imageURI="/dashboard_mailinglist.png"
-            url="/mailing-list"
-            title="Mailing List"
-            last_updated="Month XX, XXXX, XX:XX"
-          />
-        </div>
-      </main>
-    </PrivatePage>
+    <main className={styles.page}>
+      <div className={styles.gridContainer}>
+        <DashboardCard
+          imageURI="/dashboard_eventcreator.png"
+          url="/event-creator"
+          title="Event Creator"
+          last_updated="Month XX, XXXX, XX:XX"
+        />
+        <DashboardCard
+          imageURI="/dashboard_pageeditor.png"
+          url="/page-editor"
+          title="Page Editor"
+          last_updated="Month XX, XXXX, XX:XX"
+        />
+        <DashboardCard
+          imageURI="/dashboard_newsletter.png"
+          url="/newsletter-creator"
+          title="Newsletter"
+          last_updated="Month XX, XXXX, XX:XX"
+        />
+        <DashboardCard
+          imageURI="/dashboard_mailinglist.png"
+          url="/mailing-list"
+          title="Mailing List"
+          last_updated="Month XX, XXXX, XX:XX"
+        />
+      </div>
+    </main>
   );
 }
diff --git a/frontend/src/app/admin/layout.tsx b/frontend/src/app/admin/layout.tsx
index 0650055c..58015606 100644
--- a/frontend/src/app/admin/layout.tsx
+++ b/frontend/src/app/admin/layout.tsx
@@ -8,6 +8,7 @@ import HeaderBarSpace from "@/components/HeaderBarSpace";
 import NavigationBar from "@/components/NavigationBar";
 
 import "../globals.css";
+import PrivatePage from "@/components/admin/PrivatePage";
 
 export default function AdminLayout({ children }: { children: React.ReactNode }) {
   const pathname = usePathname();
@@ -18,7 +19,7 @@ export default function AdminLayout({ children }: { children: React.ReactNode })
       <section>
         {!isLoginPage && <NavigationBar />}
         {!isLoginPage && <HeaderBarSpace />}
-        {children}
+        {!isLoginPage ? <PrivatePage>{children}</PrivatePage> : children}
       </section>
     </ReactFireProvider>
   );