Merge pull request #343 from uwblueprint/navraj/admin_announcements_refactor

Admin Announcement Refactor

Author: applepie7864

frontend/src/App.tsx

@@ -13,7 +13,7 @@ import { ChakraProvider, extendTheme } from "@chakra-ui/react";
 import AdminLoginPage from "./admin/pages/login/Main";
 import AdminHomePage from "./admin/pages/home/Main";
 // import AdminSchedulePage from "./admin/pages/schedule/Main";
-// import AdminAnnouncementsPage from "./admin/pages/announcements/Main";
+import AdminAnnouncementsPage from "./admin/pages/announcements/Main";
 // import AdminParticipantsPage from "./admin/pages/participants/Main";
 // import AdminTasksPage from "./admin/pages/tasks/Main";
 import AdminBadgesPage from "./admin/pages/badges/Main";
@@ -99,6 +99,14 @@ const App = (): React.ReactElement => {
                   </AdminRoute>
                 }
               />
+              <Route
+                path={ROUTES.ADMIN_ANNOUNCEMENTS_PAGE}
+                element={
+                  <AdminRoute>
+                    <AdminAnnouncementsPage />
+                  </AdminRoute>
+                }
+              />
               <Route
                 path={ROUTES.ADMIN_BADGES_PAGE}
                 element={
@@ -115,11 +123,7 @@ const App = (): React.ReactElement => {
                 element={<ParticipantLoginPage />}
               />
             </Route>
-            {/* <Route element={<AdminLayout />}>
-              <Route
-                path={ROUTES.ADMIN_LOGIN_PAGE}
-                element={<AdminLoginPage />}
-              />
+            {/* 
               <Route
                 path={ROUTES.ADMIN_PARTICIPANTS_PAGE}
                 element={
@@ -128,14 +132,6 @@ const App = (): React.ReactElement => {
                   </AdminRoute>
                 }
               />
-              <Route
-                path={ROUTES.ADMIN_ANNOUNCEMENTS_PAGE}
-                element={
-                  <AdminRoute>
-                    <AdminAnnouncementsPage />
-                  </AdminRoute>
-                }
-              />
               <Route
                 path={ROUTES.ADMIN_SCHEDULE_PAGE}
                 element={
@@ -162,10 +158,6 @@ const App = (): React.ReactElement => {
               />
             </Route>
             <Route element={<ParticipantLayout />}>
-              <Route
-                path={ROUTES.PARTICIPANTS_LOGIN_PAGE}
-                element={<ParticipantLoginPage />}
-              />
               <Route
                 path={ROUTES.PARTICIPANTS_HOME_PAGE}
                 element={