fix bugs

HKN-UCSD · May 7, 2024 · f16a36e · f16a36e
1 parent fc035c1
commit f16a36e
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 21 deletions.
diff --git a/frontend/src/App.svelte b/frontend/src/App.svelte
@@ -40,28 +40,30 @@
                 <!--ProfileEdit /-->
             </Route>
 
-        {#if $adminStatus}
+        {#if $adminStatus !== null}
             <Route path="/profile/:id" let:params>
                 <Profile id={params.id}/>
             </Route>
-            <Route path="/inductees" component={Inductees} />
-            <Route path="/outreach" component={Outreach} />
-
-            <Route path="/events/create">
-                <EventCreate />
-            </Route>
-            <Route path="/events/edit/:id" let:params>
-                <EventCreate idOfEventToEdit={params.id}/>
-            </Route>
-            <Route path="/events/rides/:id" let:params>
-                <EventRides id={params.id}/>
+            <Route path="/events/:id" let:params>
+                <EventDetail id={params.id}/>
             </Route>
+            {#if $adminStatus}
+                <Route path="/inductees" component={Inductees} />
+                <Route path="/outreach" component={Outreach} />
+                <Route path="/events/create">
+                    <EventCreate />
+                </Route>
+                <Route path="/events/edit/:id" let:params>
+                    <EventCreate idOfEventToEdit={params.id}/>
+                </Route>
+                <Route path="/events/rides/:id" let:params>
+                    <EventRides id={params.id}/>
+                </Route>
+            {/if}
         {/if}
 
 
-        <Route path="/events/:id" let:params>
-            <EventDetail id={params.id}/>
-        </Route>
+
     </div>
 </Router>
 

diff --git a/frontend/src/Components/Sidebar.svelte b/frontend/src/Components/Sidebar.svelte
@@ -44,7 +44,7 @@
 </style>
 
 <!--While getting admin status, load the other buttons first-->
-  
+
     <div class="sidebar">
     <img src={logo} alt="HKN logo" />
     <a href="/">Home Page</a>
@@ -58,7 +58,7 @@
     <a href="/">Home Page</a>
     <a href="/profile/self">Profile</a>
 
-    {#if adminStatus}
+    {#if $adminStatus}
       <a href="/inductees">Inductees</a>
       <a href="/outreach">Outreach</a>
     {/if}

diff --git a/frontend/src/Pages/Inductees.svelte b/frontend/src/Pages/Inductees.svelte
@@ -181,7 +181,7 @@ import Layout from "../Layout.svelte";
 
 <Layout>
 
-    {#if adminStatus}
+    {#if $adminStatus}
         <div style="padding-left:50px">
             <h1 style="margin-left: 15px">Inductees</h1>
             <div>
@@ -298,7 +298,7 @@ import Layout from "../Layout.svelte";
                 <h1 style="margin-left: 15px">Loading</h1>
             {/if}
         </div>
-    {:else if adminStatus == null}
+    {:else if $adminStatus == null}
         <div>
             <h1 style="margin-left: 15px"> Loading...</h1>
         </div>

diff --git a/frontend/src/Pages/Outreach.svelte b/frontend/src/Pages/Outreach.svelte
@@ -149,7 +149,7 @@
 </svelte:head>
 <Layout>
     <main>
-        {#if adminStatus}
+        {#if $adminStatus}
             <div style="padding-left:50px">
                 <h1 style="margin-left: 15px">Outreach Students</h1>
                 <div>
@@ -226,7 +226,7 @@
                     <h1 style="margin-left: 15px">Loading...</h1>
                 {/if}
             </div>
-        {:else if adminStatus === null}
+        {:else if $adminStatus === null}
             <div>
                 <h1 style="margin-left: 15px">Loading...</h1>
             </div>