chore: show complete route

This commit is contained in:
Rodolfo Ruiz
2025-09-01 13:20:00 -06:00
parent 38626a3a81
commit b79d976c3e
2 changed files with 9 additions and 14 deletions

View File

@@ -1,3 +1,4 @@
// App.jsx
import { useState } from 'react'; import { useState } from 'react';
import { Box, useMediaQuery } from '@mui/material'; import { Box, useMediaQuery } from '@mui/material';
import { useTheme } from '@mui/material/styles'; import { useTheme } from '@mui/material/styles';
@@ -7,8 +8,7 @@ import Footer from './components/Footer';
import Dashboard from './private/dashboard/Dashboard'; import Dashboard from './private/dashboard/Dashboard';
import UserManagement from './private/users/UserManagement'; import UserManagement from './private/users/UserManagement';
import LoginPage from './private/LoginPage'; import LoginPage from './private/LoginPage';
import { BrowserRouter, Routes, Route, Navigate } from 'react-router-dom'; import { Routes, Route, Navigate } from 'react-router-dom';
import { useAuth } from './context/AuthContext'; import { useAuth } from './context/AuthContext';
const DRAWER_EXPANDED = OPEN_WIDTH; const DRAWER_EXPANDED = OPEN_WIDTH;
@@ -23,8 +23,7 @@ function PrivateRoute({ children }) {
export default function App() { export default function App() {
const theme = useTheme(); const theme = useTheme();
const isMobile = useMediaQuery('(max-width:900px)'); const isMobile = useMediaQuery('(max-width:900px)');
const [zone, setZone] = useState('public'); // public | restricted | private const [zone] = useState('public');
const [drawerExpanded, setDrawerExpanded] = useState(true); const [drawerExpanded, setDrawerExpanded] = useState(true);
const [currentView, setCurrentView] = useState('Dashboard'); const [currentView, setCurrentView] = useState('Dashboard');
@@ -34,13 +33,14 @@ export default function App() {
<> <>
<AppHeader <AppHeader
zone="private" zone="private"
onSelectMenuItem={setCurrentView} currentPage={currentView} // <-- show this in the header
drawerExpanded={drawerExpanded} leftOffset={mainLeft} // <-- keep title clear of the drawer
/> />
<MenuDrawerPrivate <MenuDrawerPrivate
onSelect={(value) => { onSelect={(value) => {
setCurrentView(value === '/users/UserManagement' ? 'UserManagement' : value); // normalize any custom route keys
setCurrentView(value);
}} }}
onExpandedChange={(expanded) => setDrawerExpanded(expanded)} onExpandedChange={(expanded) => setDrawerExpanded(expanded)}
/> />
@@ -64,12 +64,8 @@ export default function App() {
path="/" path="/"
element={ element={
<PrivateRoute> <PrivateRoute>
{zone === 'private' && <Clients />}
{zone === 'restricted' && <Clients />}
{zone === 'public' && currentView === 'Dashboard' && <Dashboard />} {zone === 'public' && currentView === 'Dashboard' && <Dashboard />}
{zone === 'public' && currentView === '/Users/UserManagement' && <UserManagement />}
{zone === 'public' && currentView === 'UserManagement' && <UserManagement />}
</PrivateRoute> </PrivateRoute>
} }
/> />
@@ -78,7 +74,6 @@ export default function App() {
<Box sx={{ height: 64 }} /> <Box sx={{ height: 64 }} />
<Footer zone={zone} /> <Footer zone={zone} />
</> </>
); );
} }

View File

@@ -154,7 +154,7 @@ export default function MenuDrawerPrivate({
handleToggleNode(key); handleToggleNode(key);
} else { } else {
if (node.title === 'Users Management') { if (node.title === 'Users Management') {
onSelect?.('UserManagement'); onSelect?.('/Users/UserManagement');
} else { } else {
onSelect?.(node.title); onSelect?.(node.title);
} }