|
|
@ -63,16 +63,7 @@ function App() {
|
|
|
|
|
|
|
|
|
|
|
|
//const location = useLocation();
|
|
|
|
//const location = useLocation();
|
|
|
|
const hasNavbarVisible = ["/", "/login", "/signup", "/play", "/lobby", "/endgame"]//.includes(window.location.pathname);
|
|
|
|
const hasNavbarVisible = ["/", "/login", "/signup", "/play", "/lobby", "/endgame"]//.includes(window.location.pathname);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return (
|
|
|
|
return (
|
|
|
|
// <div className="App">
|
|
|
|
|
|
|
|
// <header className="App-header">
|
|
|
|
|
|
|
|
// <Home />
|
|
|
|
|
|
|
|
// <img src={logo} className="App-logo" alt="logo" />
|
|
|
|
|
|
|
|
// </header>
|
|
|
|
|
|
|
|
// </div>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<ErrorBoundary fallback={(error, errorInfo) => <ErrorPage />}>
|
|
|
|
<ErrorBoundary fallback={(error, errorInfo) => <ErrorPage />}>
|
|
|
|
<AuthProvider>
|
|
|
|
<AuthProvider>
|
|
|
|
<GameProvider>
|
|
|
|
<GameProvider>
|
|
|
@ -94,7 +85,7 @@ function App() {
|
|
|
|
<Route path="/join" element={<Lobbies/>}/>
|
|
|
|
<Route path="/join" element={<Lobbies/>}/>
|
|
|
|
{/* <Route path="/solo" element={<SoloGame locale={locale} changeLocale={changeLocale} />}/> */}
|
|
|
|
{/* <Route path="/solo" element={<SoloGame locale={locale} changeLocale={changeLocale} />}/> */}
|
|
|
|
|
|
|
|
|
|
|
|
<Route path="*" element={<ErrorPage msg='404 not found' />} /> {/* page 404 */}
|
|
|
|
<Route path="*" element={<ErrorPage code="404" msg='not found' />} /> {/* page 404 */}
|
|
|
|
</Routes>
|
|
|
|
</Routes>
|
|
|
|
</BrowserRouter>
|
|
|
|
</BrowserRouter>
|
|
|
|
</ThemeProvider>
|
|
|
|
</ThemeProvider>
|
|
|
|