diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml index 4ef28fa..2626abd 100644 --- a/.github/workflows/build_and_deploy.yml +++ b/.github/workflows/build_and_deploy.yml @@ -40,13 +40,6 @@ jobs: CI=false yarn build cd .. cp -r multi_tab/dist docs-build/multi_tab - - name: Install and build test_app🔧 - run: | - cd test_app - yarn - CI=false yarn build - cd .. - cp -r test_app/dist docs-build/test_app - name: copy catalogue metadata run: | cp mc_meta.json docs-build/mc_meta.json diff --git a/multi_tab/src/App.tsx b/multi_tab/src/App.tsx index f73ba97..c4481b1 100644 --- a/multi_tab/src/App.tsx +++ b/multi_tab/src/App.tsx @@ -1,41 +1,35 @@ import "./App.css"; -import { MapLibreMap } from "@mapcomponents/react-maplibre"; +import {MapLibreMap} from "@mapcomponents/react-maplibre"; import LayerManager from "./components/LayerManager.jsx"; -import { useState } from "react"; -import { Button } from "@mui/material"; +import {Button} from "@mui/material"; function App() { - const [tableOpen, setTableOpen] = useState(false); - - const openTable = () => { - if (!tableOpen) { - const newUrl = `${window.location.href}table`; - window.open(newUrl, "_blank", "popup"); - setTableOpen(true); + const openTable = () => { + const newUrl = `${window.location.href}table`; + window.open(newUrl, "_blank", "popup"); } - } - return ( - <> - - - - - ); + return ( + <> + + + + + ); } export default App; \ No newline at end of file diff --git a/multi_tab/src/main.tsx b/multi_tab/src/main.tsx index 342619e..f80334d 100644 --- a/multi_tab/src/main.tsx +++ b/multi_tab/src/main.tsx @@ -4,10 +4,7 @@ import {MapComponentsProvider} from "@mapcomponents/react-maplibre"; import App from './App'; import DataTableManager from './components/DataTableManager.jsx'; import './index.css'; -import { - createBrowserRouter, - RouterProvider, -} from "react-router-dom"; +import { Route, Routes } from "react-router-dom"; import {QueryClient, QueryClientProvider} from '@tanstack/react-query'; import {DataContextProvider} from "./contexts/DataContext"; import pwaUrl from "./lib/pwaUrl"; @@ -25,27 +22,16 @@ if ('serviceWorker' in navigator) { } const pathname = window.location.pathname; -const router = createBrowserRouter([ - { - path: pathname + '/', - element: ( - - ), - }, - { - path: pathname + '/table', - element: ( - - ) - } -]) ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render( - + + } /> + } /> +