1- import { BrowserRouter , Routes , Route , Navigate } from 'react-router-dom' ;
1+ import { BrowserRouter , Routes , Route , Navigate , useLocation } from 'react-router-dom' ;
22import './App.css' ;
33import Header from './components/Header' ;
44import Footer from './components/Footer' ;
@@ -12,12 +12,13 @@ import ViewPage from './pages/ViewPage';
1212import QueueAdminPage from './pages/QueueAdminPage' ;
1313import UserAdminPage from './pages/UserAdminPage' ;
1414import LoadingPage from './pages/LoadingPage' ;
15+ import LandingPage from './pages/LandingPage' ;
1516import AuthProvider from './auth/AuthProvider' ;
1617import { useAuth } from './auth/authContext' ;
1718
1819function AppContent ( ) {
1920 const { isLoading, isAuthenticated, hasRole, hasAnyRole } = useAuth ( ) ;
20-
21+ const location = useLocation ( ) ;
2122 if ( isLoading ) {
2223 return < LoadingPage /> ;
2324 }
@@ -37,7 +38,7 @@ function AppContent() {
3738
3839 return (
3940 < div className = "app-container" >
40- < Header />
41+ { ! ( location . pathname === '/' && ! isAuthenticated ) && < Header /> }
4142 < main className = "content" >
4243 < Routes >
4344 < Route
@@ -47,7 +48,7 @@ function AppContent() {
4748 < Route
4849 path = "/"
4950 element = {
50- ! isAuthenticated ? < Navigate to = "/login" /> :
51+ ! isAuthenticated ? < LandingPage /> :
5152 hasRole ( 'admin' ) ? < AdminHome /> : < UserHome />
5253 }
5354 />
0 commit comments