chight/Web-Frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update pulled app foundation out into a route of its own

Browse Source
This commit is contained in:
chight
2026-06-05 11:04:17 -07:00
parent 8532a2558e
commit 6fd777d804
1 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/App.jsx
+24 -11
View File
@@ -1,5 +1,5 @@
import 'leaflet/dist/leaflet.css';
import { Routes, Route } from 'react-router-dom';
import { Routes, Route, Navigate } from 'react-router-dom';
import { useRecipe, Grid, GridItem, useDialog } from "@chakra-ui/react";
import { createContext } from "react";
import Login from "@/Login.jsx";
@@ -46,17 +46,30 @@ function AppFoundation({children}) {
// }
function App() {
const sidebarContext = createContext(["Home", "Global Map", "Regional Map", "Volcano", "Admin"]);
// const [user, setUser] = useState(null);
const sidebarContext = createContext(["Home", "Global Map", "Regional Map", "Volcano", "Admin"]);
// const [user, setUser] = useState(null);
return (
<Routes>
<Route path="/login" element={<Login />} />
<Route path="/home" element={<AppFoundation> <Home/> </AppFoundation>} />
<Route path="/global-map" element={<AppFoundation> <GlobalMap/> </AppFoundation>} />
<Route path="/regional-map" element={<AppFoundation> <RegionalMap/> </AppFoundation>} />
<Route path="/volcano" element={<AppFoundation> <Volcano/> </AppFoundation>} />
<Route path="/admin" element={<AppFoundation> <Admin/> </AppFoundation>} />
return (
<Routes>
{/*Public Routes*/}
<Route path="/login" element={<Login />} />
<Route path="/home" element={<AppFoundation> <Home/> </AppFoundation>} />
<Route path="/global-map" element={<AppFoundation> <GlobalMap/> </AppFoundation>} />
<Route path="/regional-map" element={<AppFoundation> <RegionalMap/> </AppFoundation>} />
<Route path="/volcano" element={<AppFoundation> <Volcano/> </AppFoundation>} />
<Route path="/admin" element={<AppFoundation> <Admin/> </AppFoundation>} />
{/*Non-Public Routes*/}
<Route element={<AppFoundation />}>
<Route path="/home" element={<Home />} />
<Route path="/global-map" element={<GlobalMap />} />
<Route path="/regional-map" element={<RegionalMap />} />
<Route path="/volcano" element={<Volcano />} />
<Route path="/admin" element={<Admin />} />
</Route>
{/*Redirect Routes*/}
<Route path="/" element={<Navigate to="/home" replace />} />
</Routes>
);
}