chore: show complete route
This commit is contained in:
		
							
								
								
									
										21
									
								
								src/App.jsx
									
									
									
									
									
								
							
							
						
						
									
										21
									
								
								src/App.jsx
									
									
									
									
									
								
							| @@ -1,3 +1,4 @@ | ||||
| // App.jsx | ||||
| import { useState } from 'react'; | ||||
| import { Box, useMediaQuery } from '@mui/material'; | ||||
| import { useTheme } from '@mui/material/styles'; | ||||
| @@ -7,8 +8,7 @@ import Footer from './components/Footer'; | ||||
| import Dashboard from './private/dashboard/Dashboard'; | ||||
| import UserManagement from './private/users/UserManagement'; | ||||
| 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'; | ||||
|  | ||||
| const DRAWER_EXPANDED = OPEN_WIDTH; | ||||
| @@ -23,8 +23,7 @@ function PrivateRoute({ children }) { | ||||
| export default function App() { | ||||
|   const theme = useTheme(); | ||||
|   const isMobile = useMediaQuery('(max-width:900px)'); | ||||
|   const [zone, setZone] = useState('public'); // public | restricted | private | ||||
|  | ||||
|   const [zone] = useState('public'); | ||||
|   const [drawerExpanded, setDrawerExpanded] = useState(true); | ||||
|   const [currentView, setCurrentView] = useState('Dashboard'); | ||||
|  | ||||
| @@ -34,13 +33,14 @@ export default function App() { | ||||
|     <> | ||||
|       <AppHeader | ||||
|         zone="private" | ||||
|         onSelectMenuItem={setCurrentView} | ||||
|         drawerExpanded={drawerExpanded} | ||||
|         currentPage={currentView}              // <-- show this in the header | ||||
|         leftOffset={mainLeft}                 // <-- keep title clear of the drawer | ||||
|       /> | ||||
|  | ||||
|       <MenuDrawerPrivate | ||||
|         onSelect={(value) => { | ||||
|           setCurrentView(value === '/users/UserManagement' ? 'UserManagement' : value); | ||||
|           // normalize any custom route keys | ||||
|           setCurrentView(value); | ||||
|         }} | ||||
|         onExpandedChange={(expanded) => setDrawerExpanded(expanded)} | ||||
|       /> | ||||
| @@ -64,12 +64,8 @@ export default function App() { | ||||
|             path="/" | ||||
|             element={ | ||||
|               <PrivateRoute> | ||||
|                 {zone === 'private' && <Clients />} | ||||
|                 {zone === 'restricted' && <Clients />} | ||||
|  | ||||
|                 {zone === 'public' && currentView === 'Dashboard' && <Dashboard />} | ||||
|  | ||||
|                 {zone === 'public' && currentView === 'UserManagement' && <UserManagement />} | ||||
|                 {zone === 'public' && currentView === '/Users/UserManagement' && <UserManagement />} | ||||
|               </PrivateRoute> | ||||
|             } | ||||
|           /> | ||||
| @@ -78,7 +74,6 @@ export default function App() { | ||||
|  | ||||
|       <Box sx={{ height: 64 }} /> | ||||
|       <Footer zone={zone} /> | ||||
|  | ||||
|     </> | ||||
|   ); | ||||
| } | ||||
| @@ -154,7 +154,7 @@ export default function MenuDrawerPrivate({ | ||||
|                                 handleToggleNode(key); | ||||
|                             } else { | ||||
|                                 if (node.title === 'Users Management') { | ||||
|                                     onSelect?.('UserManagement'); | ||||
|                                     onSelect?.('/Users/UserManagement'); | ||||
|                                 } else { | ||||
|                                     onSelect?.(node.title); | ||||
|                                 } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Rodolfo Ruiz
					Rodolfo Ruiz