Refactor routing logic in App component and update navigation to remo…

…ve '/navigation.html' from current route path
vliz-be-opsci · Feb 5, 2025 · 8ca5d5f · 8ca5d5f
1 parent cf3cb46
commit 8ca5d5f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/src/App.jsx b/src/App.jsx
@@ -39,14 +39,6 @@ const App = () => {
     });
   }, []);
 
-  useEffect(() => {
-    //if hash and / is not in hash then scroll to the hash
-    console.log(hash);
-    if (hash && !hash.includes("/")) {
-      window.location = "/";
-    }
-  }, [hash]);
-
   const landingPageData= {
     "Header" : MainData,
     "Profiles" : ProfilesData,
@@ -62,7 +54,7 @@ const App = () => {
       <Route path="/" element={<Homepage data={landingPageData} />} />
       <Route path="/data-explorer/:id" element={<FilePage data={landingPageData} />} />
       <Route path="/data-explorer" element={<Data data={landingPageData} />} />
-      <Route path="/*" element={<GroupedCrates data={landingPageData} />} />
+      <Route path="/*" element={<Homepage data={landingPageData} />} />
     </Routes>
   );
 };

diff --git a/src/components/navigation.jsx b/src/components/navigation.jsx
@@ -9,10 +9,10 @@ export const Navigation = (props) => {
   //if the end of the current route is /navigation.html then remove /navigation.html
   if (currentRoutePath.endsWith("/navigation.html")) {
     currentRoutePath = currentRoutePath.replace("/navigation.html", "");
-
-
   }
 
+  console.log(props);
+
   //get the current hash route
   const currentRoute = window.location.hash;
   console.log(currentRoute);