Dont redirect home page

wweitzel · Aug 21, 2024 · 7fd139e · 7fd139e
1 parent dacd4b2
commit 7fd139e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -15,7 +15,7 @@ const router = createBrowserRouter([
     children: [
       {
         path: '/',
-        element: <Navigate to="/goals" />,
+        element: <Goals />,
         errorElement: <Error />,
       },
       {

diff --git a/src/components/Header.tsx b/src/components/Header.tsx
@@ -23,10 +23,10 @@ function Header() {
     setLogo(logoToDisplay);
   }, [theme]);
 
-  const homeActive = Boolean(useMatch('/goals'));
   const fixturesActive = Boolean(useMatch('/fixtures'));
   const settingsActive = Boolean(useMatch('/settings'));
   const goalsDrilldownActive = Boolean(useMatch('/goals/:goalId'));
+  const homeActive = Boolean(useMatch('/goals')) || (!fixturesActive && !settingsActive && !goalsDrilldownActive);
 
   return (
     <div className="container d-flex justify-content-center">
@@ -40,8 +40,8 @@ function Header() {
             <li className="nav-item">
               <NavLink
                 to="/goals"
-                className={({isActive}) => {
-                  return `nav-link ${isActive ? 'active' : ''}`;
+                className={() => {
+                  return `nav-link ${homeActive ? 'active' : ''}`;
                 }}
                 id="home-tab"
                 type="button"