Merge branch 'develop' of https://github.com/COS301-SE-2024/occupi in…

…to develop
COS301-SE-2024 · Aug 12, 2024 · 7ff9aea · 7ff9aea
2 parents 56a25e2 + c3175c9
commit 7ff9aea
Showing 1 changed file with 9 additions and 27 deletions.
diff --git a/frontend/occupi-web/src/components/sideNavComponent/SideNav.tsx b/frontend/occupi-web/src/components/sideNavComponent/SideNav.tsx
@@ -68,27 +68,14 @@ const SideNav = () => {
 
   function setSelectedPanelF(arg: string) {
     setSelectedPanel(arg);
-    if (arg === "Dashboard") {
-      navigate("/dashboard");
-    } else if (arg === "Analysis") {
-      navigate("/analysis");
-    } else if (arg === "AI Analysis") {
-      navigate("/ai-dashboard");
-    } else if (arg === "Rooms") {
-      navigate("/rooms");
-    } else if (arg === "Teams") {
-      navigate("/teams");
-    } else if (arg === "Notifications") {
-      navigate("/notifications");
-    } else if (arg === "Settings") {
-      navigate("/settings");
-    } else if (arg === "Logout") {
-      navigate("/");
-    } else if (arg === "Reports") {
-      navigate("/reports");
-    } else if (arg === "Help") {
-      navigate("/faq");
-    }
+    if (arg === "Dashboard")navigate("/dashboard");
+    else if (arg === "AI Analysis")navigate("/ai-dashboard");
+    else if (arg === "Rooms")navigate("/rooms");
+    else if (arg === "Notifications")navigate("/notifications");
+    else if (arg === "Settings")navigate("/settings");
+    else if (arg === "Logout")navigate("/");
+    else if (arg === "Reports")navigate("/reports");
+    else if (arg === "Help")navigate("/faq");
   }
 
   function toggleSideNav() {
@@ -99,13 +86,8 @@ const SideNav = () => {
     const selectPanel = () => {
       const pn: string = location.pathname;
       if (pn.startsWith("/dashboard")) setSelectedPanel("Dashboard");
-      else if (pn.startsWith("/analysis")) setSelectedPanel("Analysis");
-      else if (pn.startsWith("/ai-model")) setSelectedPanel("AI model");
+      else if (pn.startsWith("/ai-dashboard")) setSelectedPanel("AI Analysis");
       else if (pn.startsWith("/rooms")) setSelectedPanel("Rooms");
-      else if (pn.startsWith("/teams")) setSelectedPanel("Teams");
-      else if (pn.startsWith("/notifications"))
-        setSelectedPanel("Notifications");
-      else if (pn.startsWith("/settings")) setSelectedPanel("Settings");
       else if (pn.startsWith("/reports")) setSelectedPanel("Reports");
       else;
     };