Fix navbar path and design (#155)

varianter · Oct 19, 2023 · db65fd6 · db65fd6
1 parent c35104e
commit db65fd6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/frontend/src/components/NavBar/NavBar.tsx b/frontend/src/components/NavBar/NavBar.tsx
@@ -6,7 +6,7 @@ export default function NavBar() {
   return (
     <div className="bg-primary_default w-full h-[52px] flex flex-row justify-between sticky top-0 px-4">
       <div className="flex flex-row">
-        <NavBarLink text="Bemanning" path="/" />
+        <NavBarLink text="Bemanning" path={`/bemanning`} />
       </div>
       <div className="flex flex-row gap-6 items-center">
         <Image

diff --git a/frontend/src/components/NavBar/NavBarLink.tsx b/frontend/src/components/NavBar/NavBarLink.tsx
@@ -3,7 +3,8 @@ import { usePathname } from "next/navigation";
 
 export default function NavBarLink(props: { text: string; path: string }) {
   const pathname = usePathname();
-  const isCurrentPath = props.path.includes(pathname);
+  const isCurrentPath = pathname.includes(props.path);
+  const orgUrl = pathname.split("/")[1] || "";
 
   return (
     <a
@@ -12,7 +13,7 @@ export default function NavBarLink(props: { text: string; path: string }) {
           ? "body-large-bold border-b-[3px] border-secondary_default"
           : "body-large opacity-70 hover:opacity-100"
       }`}
-      href={`${props.path}`}
+      href={`/${orgUrl}/${props.path}`}
     >
       {props.text}
     </a>