Merge pull request #41 from mapcomponents/Add-MultiTab

Removing test App and Fixing Hash Router
mapcomponents · Nov 28, 2024 · 5ca8777 · 5ca8777
2 parents 7a50846 + c2599e2
commit 5ca8777
Show file tree

Hide file tree

Showing 14 changed files with 7 additions and 281 deletions.
diff --git a/multi_tab/src/App.tsx b/multi_tab/src/App.tsx
@@ -6,7 +6,7 @@ import {Button} from "@mui/material";
 function App() {
 
     const openTable = () => {
-        const newUrl = `${window.location.href}table`;
+        const newUrl = `${window.location.href}#/table`;
         window.open(newUrl, "_blank", "popup");
     }
     return (

diff --git a/multi_tab/src/main.tsx b/multi_tab/src/main.tsx
@@ -4,7 +4,7 @@ import {MapComponentsProvider} from "@mapcomponents/react-maplibre";
 import App from './App';
 import DataTableManager from './components/DataTableManager.jsx';
 import './index.css';
-import { Route, HashRouter as Router } from "react-router-dom";
+import {HashRouter as Router, Route, Routes} from "react-router-dom";
 import {QueryClient, QueryClientProvider} from '@tanstack/react-query';
 import {DataContextProvider} from "./contexts/DataContext";
 import pwaUrl from "./lib/pwaUrl";
@@ -20,7 +20,6 @@ if ('serviceWorker' in navigator) {
         });
     });
 }
-const pathname = window.location.pathname;
 
 
 ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render(
@@ -29,8 +28,11 @@ ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render(
             <MapComponentsProvider>
                 <DataContextProvider>
                     <Router>
-                        <Route path={pathname + "/table"} element={<DataTableManager />} />
-                        <Route path={pathname + "/"} element={<App />} />
+                        <Routes>
+                            <Route path="*" element={<div>404 - Page Not Found</div>}/>
+                            <Route path={`/table`} element={<DataTableManager/>}/>
+                            <Route path={`/`} element={<App/>}/>
+                        </Routes>
                     </Router>
                 </DataContextProvider>
             </MapComponentsProvider>

diff --git a/test_app/.gitignore b/test_app/.gitignore
diff --git a/test_app/README.md b/test_app/README.md
diff --git a/test_app/eslint.config.js b/test_app/eslint.config.js
diff --git a/test_app/index.html b/test_app/index.html
diff --git a/test_app/package.json b/test_app/package.json
diff --git a/test_app/public/vite.svg b/test_app/public/vite.svg
diff --git a/test_app/src/App.css b/test_app/src/App.css
diff --git a/test_app/src/App.jsx b/test_app/src/App.jsx
diff --git a/test_app/src/assets/react.svg b/test_app/src/assets/react.svg
diff --git a/test_app/src/index.css b/test_app/src/index.css
diff --git a/test_app/src/main.jsx b/test_app/src/main.jsx
diff --git a/test_app/vite.config.js b/test_app/vite.config.js