attempting to make the sidenav links better

monoxane · Apr 12, 2023 · 337bfb7 · 337bfb7
1 parent 0fb637f
commit 337bfb7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/frontend/src/Index.jsx b/frontend/src/Index.jsx
@@ -53,17 +53,17 @@ const App =  function App() {
         }
         <Content className="connect-content">
           <Routes>
-            <Route path="/login" element={<Login />} />
-            <Route path="/unauthorized" element={<Unauthorized />} />
-            <Route path="/" element={<PersistLogin />}>
+            <Route exact path="/login" element={<Login />} />
+            <Route exact path="/unauthorized" element={<Unauthorized />} />
+            <Route exact path="/" element={<PersistLogin />}>
               <Route element={<RequireAuth allowedRoles={["ADMIN", "ZONE_ADMIN", "OPERATOR"]} />}>
-                <Route path="/" element={<Dashboard />} />
+                <Route exact path="/" element={<Dashboard />} />
               </Route>
               <Route element={<RequireAuth allowedRoles={["ADMIN", "ZONE_ADMIN"]} />}>
-                <Route path="/dns/zones" element={<Zones />} />
+                <Route exact path="/dns/zones" element={<Zones />} />
               </Route>
               <Route element={<RequireAuth allowedRoles={["ADMIN", "ZONE_ADMIN"]} />}>
-                <Route path="/dns/zones/:zoneId" element={<Zones />} />
+                <Route exact path="/dns/zones/:zoneId/records" element={<Zones />} />
               </Route>
               <Route element={<RequireAuth allowedRoles={["NOONEHASTHIS"]} />}>
                 <Route path="/test" element={<Dashboard />} />

diff --git a/frontend/src/components/SideNavLink.jsx b/frontend/src/components/SideNavLink.jsx
@@ -6,7 +6,7 @@ import {
 import { SideNavLink } from '@carbon/react'
 
 function CustomSideNavLink ({ label, to, renderIcon }) {
-  const match = useMatch(to, { exact: false});
+  const match = useMatch({path: to, end: true});
   const navigate = useNavigate();
 
   if (match) {