Merge branch 'main' of https://github.com/csc309-winter-2022/team58

sports-matcher/src/App.js

@@ -5,6 +5,7 @@ import SignUp from './SignUp';
 import Admin from './Admin';
 import Home from './Home';
 import ChatWindow from './ChatWindow';
+import UserDashboard from './UserDashboard';
 function App() {
   return (
     <div className="App">
@@ -14,6 +15,7 @@ function App() {
         <Route path="sign-up" element={<SignUp />} />
         <Route path="admin" element={<Admin />} />
         <Route path="chat-window" element={<ChatWindow />} />
+        <Route path="user-dashboard" element={<UserDashboard />} />
       </Routes>
     </div>
   );

sports-matcher/src/Navbar.js

@@ -98,7 +98,7 @@ export default function Navbar() {
             {pages.map((page) => (
               <Button
                 key={page}
-                onClick={handleCloseNavMenu}
+                onClick={() => { navigate('/user-dashboard') }}
                 sx={{ my: 2, color: 'white', display: 'block', textTransform: 'none', fontSize: '100%' }}
               >
                 {page}

sports-matcher/src/UserDashboard.js

@@ -12,11 +12,13 @@ import Filter from "./Filter";
 import SearchBar from "./SearchBar";
 import { useNavigate } from 'react-router-dom';
 import MatchesList from './MatchesList';
+import Navbar from './Navbar';
 
 export default function UserDashboard() {
   const navigate = useNavigate();
   return (
     <div>
+      <Navbar></Navbar>
       <SearchBar></SearchBar>
       <Filter></Filter>
       <MatchesList></MatchesList>