moved the side and bottom navigator out of the navigation container and into the header to stop the wildcard pages from re-rendering/loading whenever the navigator drawer is opened

This commit is contained in:
csawatzky 2025-01-21 15:09:38 -06:00
parent 38e0bcb33c
commit f891e4c29b
3 changed files with 14 additions and 29 deletions

View file

@ -4,10 +4,7 @@ import { BrowserRouter, Navigate, Route, Routes } from "react-router-dom";
import { Typography } from "@mui/material";
import { useAuth0 } from "@auth0/auth0-react";
import Teams from "pages/Teams";
import SideNavigator from "./SideNavigator";
import Users from "pages/Users";
import { useMobile } from "hooks";
import BottomNavigator from "./BottomNavigator";
import TeamPage from "pages/Team";
import Header from "app/Header";
import Logout from "pages/Logout";
@ -17,9 +14,6 @@ import GroupsPage from "pages/Groups";
import GroupPage from "pages/Group";
interface Props {
open: boolean,
onOpen: () => void;
onClose: () => void;
toggleTheme: () => void;
}
@ -30,9 +24,8 @@ export const appendToUrl = (appendage: number | string) => {
export default function Router(props: Props) {
const {open, onOpen, onClose, toggleTheme } = props;
const { toggleTheme } = props;
const { isAuthenticated, loginWithRedirect, isLoading } = useAuth0();
const isMobile = useMobile();
const RelativeRoutes = () => {
return (
@ -127,13 +120,10 @@ export default function Router(props: Props) {
<Suspense fallback={<LoadingScreen />}>
<BrowserRouter>
<Header
sideIsOpen={open}
openSide={onOpen}
toggleTheme={toggleTheme}
// teams={teams}
// setTeams={setTeams}
/>
<SideNavigator open={open} onOpen={onOpen} onClose={onClose} />
<Routes>
{/* Redirects */}
@ -148,7 +138,6 @@ export default function Router(props: Props) {
<Route path="*" element={<RelativeRoutes/>} />
</Routes>
{isMobile && <BottomNavigator openSide={onOpen} sideIsOpen={open} />}
</BrowserRouter>
</Suspense>
)