++
- Can now join games - Can continue games using table - Can create accounts - Can create Games
This commit is contained in:
+40
-34
@@ -1,5 +1,6 @@
|
||||
import React, { useState } from 'react';
|
||||
import { BrowserRouter as Router, Routes, Route } from 'react-router-dom';
|
||||
import { Helmet } from 'react-helmet';
|
||||
import './App.css';
|
||||
import Header from './components/header';
|
||||
import Home from './pages/home';
|
||||
@@ -7,6 +8,7 @@ import Login from './pages/login';
|
||||
import Register from './pages/register';
|
||||
import JoinGame from './pages/joinGame';
|
||||
import StartGame from './pages/startGame';
|
||||
import { UserProvider } from './context/UserContext.jsx';
|
||||
|
||||
function App() {
|
||||
const [isLoggedIn, setIsLoggedIn] = useState(false);
|
||||
@@ -18,41 +20,45 @@ function App() {
|
||||
};
|
||||
|
||||
return (
|
||||
<Router>
|
||||
<div>
|
||||
{popupMessage && <div className="popup">{popupMessage}</div>}
|
||||
<UserProvider>
|
||||
<meta name="DND Master" content="WoW. A description."/>
|
||||
<Router>
|
||||
<div>
|
||||
<Helmet>
|
||||
<title>DND Master</title>
|
||||
</Helmet>
|
||||
{popupMessage && <div className="popup">{popupMessage}</div>}
|
||||
<Header isLoggedIn={isLoggedIn} />
|
||||
|
||||
{/* Header is placed at the top of the page */}
|
||||
<Header isLoggedIn={isLoggedIn} />
|
||||
|
||||
<Routes>
|
||||
<Route
|
||||
path="/"
|
||||
element={<Home isLoggedIn={isLoggedIn} setIsLoggedIn={setIsLoggedIn} />}
|
||||
/>
|
||||
<Route
|
||||
path="/login"
|
||||
element={<Login setIsLoggedIn={setIsLoggedIn} />}
|
||||
/>
|
||||
<Route
|
||||
path="/register"
|
||||
element={<Register setIsLoggedIn={(status) => {
|
||||
setIsLoggedIn(status);
|
||||
showPopup('User registered successfully!');
|
||||
}} />}
|
||||
/>
|
||||
<Route
|
||||
path="joinGame"
|
||||
element={<JoinGame isLoggedIn={isLoggedIn} />}
|
||||
/>
|
||||
<Route
|
||||
path="/startGame"
|
||||
element={<StartGame isLoggedIn={isLoggedIn} />}
|
||||
/>
|
||||
</Routes>
|
||||
</div>
|
||||
</Router>
|
||||
<Routes>
|
||||
<Route
|
||||
path="/"
|
||||
element={<Home isLoggedIn={isLoggedIn} setIsLoggedIn={setIsLoggedIn} />}
|
||||
/>
|
||||
<Route
|
||||
path="/login"
|
||||
element={<Login setIsLoggedIn={setIsLoggedIn} />}
|
||||
/>
|
||||
<Route
|
||||
path="/register"
|
||||
element={<Register setIsLoggedIn={(status) => {
|
||||
setIsLoggedIn(status);
|
||||
showPopup('User registered successfully!');
|
||||
}} />}
|
||||
/>
|
||||
<Route
|
||||
path="joinGame"
|
||||
element={<JoinGame isLoggedIn={isLoggedIn} />}
|
||||
/>
|
||||
<Route
|
||||
path="/startGame"
|
||||
element={<StartGame isLoggedIn={isLoggedIn} />}
|
||||
/>
|
||||
</Routes>
|
||||
</div>
|
||||
</Router>
|
||||
</UserProvider>
|
||||
);
|
||||
}
|
||||
|
||||
export default App;
|
||||
export default App;
|
||||
Reference in New Issue
Block a user