Eric Whale

Edit routes

1 -// components
2 import { Outlet, useLocation } from "react-router-dom"; 1 import { Outlet, useLocation } from "react-router-dom";
2 +// components
3 import Bottombar from "./components/Bottombar"; 3 import Bottombar from "./components/Bottombar";
4 import Topbar from "./components/Topbar"; 4 import Topbar from "./components/Topbar";
5 5
...@@ -12,11 +12,7 @@ function App() { ...@@ -12,11 +12,7 @@ function App() {
12 } 12 }
13 return ( 13 return (
14 <div> 14 <div>
15 - <h1>Notification</h1> 15 + <h1>chatroom</h1>
16 -
17 - <p>temporal use when first logged in</p>
18 - <p>If user wants to use notifications after moving to another page</p>
19 - <p>the notification will be in settings page</p>
20 </div> 16 </div>
21 ); 17 );
22 }; 18 };
......
...@@ -6,7 +6,7 @@ function Bottombar() { ...@@ -6,7 +6,7 @@ function Bottombar() {
6 return ( 6 return (
7 <div className="bottombar"> 7 <div className="bottombar">
8 <nav> 8 <nav>
9 - <NavLink to="/chatroom">Chatroom</NavLink> |{" "} 9 + <NavLink to="/">Chatroom</NavLink> |{" "}
10 <NavLink to="/userroom">Userroom</NavLink> 10 <NavLink to="/userroom">Userroom</NavLink>
11 </nav> 11 </nav>
12 </div> 12 </div>
......
...@@ -5,7 +5,7 @@ import "../styles/bar.scss"; ...@@ -5,7 +5,7 @@ import "../styles/bar.scss";
5 function Topbar() { 5 function Topbar() {
6 return ( 6 return (
7 <div className="topbar"> 7 <div className="topbar">
8 - <Link to="/chatroom">LOGO</Link> 8 + <Link to="/">LOGO</Link>
9 <div>Search Bar</div> 9 <div>Search Bar</div>
10 <Link to="/settings">Settings</Link> 10 <Link to="/settings">Settings</Link>
11 </div> 11 </div>
......
...@@ -6,7 +6,6 @@ import App from "./App"; ...@@ -6,7 +6,6 @@ import App from "./App";
6 // routes 6 // routes
7 import Signup from "./routes/signup"; 7 import Signup from "./routes/signup";
8 import Login from "./routes/login"; 8 import Login from "./routes/login";
9 -import Chatroom from "./routes/chatroom";
10 import Userroom from "./routes/userroom"; 9 import Userroom from "./routes/userroom";
11 import Settings from "./routes/settings"; 10 import Settings from "./routes/settings";
12 11
...@@ -16,7 +15,6 @@ root.render( ...@@ -16,7 +15,6 @@ root.render(
16 <BrowserRouter> 15 <BrowserRouter>
17 <Routes> 16 <Routes>
18 <Route path="/" element={<App />}> 17 <Route path="/" element={<App />}>
19 - <Route path="/chatroom" element={<Chatroom />} />
20 <Route path="/userroom" element={<Userroom />} /> 18 <Route path="/userroom" element={<Userroom />} />
21 <Route path="/settings" element={<Settings />} /> 19 <Route path="/settings" element={<Settings />} />
22 </Route> 20 </Route>
......
1 -// styles
2 -import "../styles/chatroom.scss";
3 -
4 -function Chatroom() {
5 - return (
6 - <div className="chatroom">
7 - <h1>Chatroom page</h1>
8 - </div>
9 - );
10 -}
11 -
12 -export default Chatroom;
1 -.chatroom {
2 - margin: 0;
3 - padding: 0;
4 - display: flex;
5 - flex-direction: column;
6 -}