From 1b86e6260fdc619e5a3f8a049a7af9873f0ae498 Mon Sep 17 00:00:00 2001
From: Piyush Sharma <piyush19sha@gmail.com>
Date: Tue, 1 Mar 2022 13:32:42 -0500
Subject: [PATCH 1/3] Added Routing and Sign in/up Pages

---
 package-lock.json            |  6 +++
 sports-matcher/package.json  |  5 ++
 sports-matcher/src/App.js    | 22 +++------
 sports-matcher/src/SignIn.js | 68 ++++++++++++++++++++++++++
 sports-matcher/src/SignUp.js | 94 ++++++++++++++++++++++++++++++++++++
 sports-matcher/src/index.js  |  5 +-
 6 files changed, 183 insertions(+), 17 deletions(-)
 create mode 100644 package-lock.json
 create mode 100644 sports-matcher/src/SignIn.js
 create mode 100644 sports-matcher/src/SignUp.js

diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..a3c03c6
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,6 @@
+{
+  "name": "team58",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {}
+}
diff --git a/sports-matcher/package.json b/sports-matcher/package.json
index bad46ea..71556c7 100644
--- a/sports-matcher/package.json
+++ b/sports-matcher/package.json
@@ -3,11 +3,16 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
+    "@emotion/react": "^11.8.1",
+    "@emotion/styled": "^11.8.1",
+    "@mui/icons-material": "^5.4.4",
+    "@mui/material": "^5.4.4",
     "@testing-library/jest-dom": "^5.16.2",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^13.5.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
+    "react-router-dom": "^6.2.2",
     "react-scripts": "^5.0.0",
     "web-vitals": "^2.1.4"
   },
diff --git a/sports-matcher/src/App.js b/sports-matcher/src/App.js
index 3784575..f00a5a2 100644
--- a/sports-matcher/src/App.js
+++ b/sports-matcher/src/App.js
@@ -1,23 +1,15 @@
 import logo from './logo.svg';
 import './App.css';
-
+import { Routes, Route, Link } from "react-router-dom";
+import SignIn from './SignIn';
+import SignUp from './SignUp';
 function App() {
   return (
     <div className="App">
-      <header className="App-header">
-        <img src={logo} className="App-logo" alt="logo" />
-        <p>
-          Edit <code>src/App.js</code> and save to reload.
-        </p>
-        <a
-          className="App-link"
-          href="https://reactjs.org"
-          target="_blank"
-          rel="noopener noreferrer"
-        >
-          Learn React
-        </a>
-      </header>
+      <Routes>
+        <Route path="sign-in" element={<SignIn />} />
+        <Route path="sign-up" element={<SignUp />} />
+      </Routes>
     </div>
   );
 }
diff --git a/sports-matcher/src/SignIn.js b/sports-matcher/src/SignIn.js
new file mode 100644
index 0000000..e7cd153
--- /dev/null
+++ b/sports-matcher/src/SignIn.js
@@ -0,0 +1,68 @@
+import * as React from 'react';
+import Avatar from '@mui/material/Avatar';
+import Button from '@mui/material/Button';
+import CssBaseline from '@mui/material/CssBaseline';
+import TextField from '@mui/material/TextField';
+import FormControlLabel from '@mui/material/FormControlLabel';
+import Checkbox from '@mui/material/Checkbox';
+import { useHistory } from 'react-router-dom';
+import Box from '@mui/material/Box';
+import Typography from '@mui/material/Typography';
+import Container from '@mui/material/Container';
+import { Link } from '@mui/material';
+import AccountCircleIcon from '@mui/icons-material/AccountCircle';
+
+export default function SignIn() {
+  return (
+      <Container component="main" maxWidth="xs">
+        <CssBaseline />
+        <Box
+          sx={{
+            marginTop: 8,
+            display: 'flex',
+            flexDirection: 'column',
+            alignItems: 'center',
+          }}
+        >
+          <Avatar sx={{ m: 1, bgcolor: 'primary.main' }}>
+            <AccountCircleIcon />
+          </Avatar>
+          <Typography component="h1" variant="h5">
+            Sign in
+          </Typography>
+          <Box component="form" noValidate sx={{ mt: 1 }}>
+            <TextField
+              margin="normal"
+              required
+              fullWidth
+              id="email"
+              label="Email Address"
+              name="email"
+              autoComplete="email"
+              autoFocus
+            />
+            <TextField
+              margin="normal"
+              required
+              fullWidth
+              name="password"
+              label="Password"
+              type="password"
+              id="password"
+              autoComplete="current-password"
+            />
+            <Button
+              type="submit"
+              fullWidth
+              variant="contained"
+              sx={{ mt: 3, mb: 2 }}
+            >
+              Sign In
+            </Button>
+            <Link href="/sign-up" underline="always">
+            {"Don't have an account?"}
+            </Link>
+            </Box>
+            </Box>
+            </Container>
+            )}
\ No newline at end of file
diff --git a/sports-matcher/src/SignUp.js b/sports-matcher/src/SignUp.js
new file mode 100644
index 0000000..c4e86e2
--- /dev/null
+++ b/sports-matcher/src/SignUp.js
@@ -0,0 +1,94 @@
+import * as React from 'react';
+import Avatar from '@mui/material/Avatar';
+import Button from '@mui/material/Button';
+import CssBaseline from '@mui/material/CssBaseline';
+import TextField from '@mui/material/TextField';
+import FormControlLabel from '@mui/material/FormControlLabel';
+import Checkbox from '@mui/material/Checkbox';
+import { useHistory } from 'react-router-dom';
+import Box from '@mui/material/Box';
+import AccountBoxIcon from '@mui/icons-material/AccountBox';
+import Typography from '@mui/material/Typography';
+import Container from '@mui/material/Container';
+import { Link } from '@mui/material';
+import { Router, Link as RouterLink } from 'react-router-dom';
+import { Grid } from '@mui/material';
+
+export default function SignUp() {
+  return (
+      <Container component="main" maxWidth="xs">
+        <CssBaseline />
+        <Box
+          sx={{
+            marginTop: 8,
+            display: 'flex',
+            flexDirection: 'column',
+            alignItems: 'center',
+          }}
+        >
+          <Avatar sx={{ m: 1, bgcolor: 'info.main' }}>
+            <AccountBoxIcon />
+          </Avatar>
+          <Typography component="h1" variant="h5">
+            Sign up
+          </Typography>
+          <Box component="form" noValidate sx={{ mt: 1 }}>
+          <Grid container spacing={2}>
+              <Grid item xs={12} sm={6}>
+                <TextField
+                  autoComplete="given-name"
+                  name="firstName"
+                  required
+                  fullWidth
+                  id="firstName"
+                  label="First Name"
+                  autoFocus
+                />
+              </Grid>
+              <Grid item xs={12} sm={6}>
+                <TextField
+                  required
+                  fullWidth
+                  id="lastName"
+                  label="Last Name"
+                  name="lastName"
+                  autoComplete="family-name"
+                />
+              </Grid>
+              <Grid item xs={12}>
+                <TextField
+                  required
+                  fullWidth
+                  id="email"
+                  label="Email Address"
+                  name="email"
+                  autoComplete="email"
+                />
+              </Grid>
+              <Grid item xs={12}>
+                <TextField
+                  required
+                  fullWidth
+                  name="password"
+                  label="Password"
+                  type="password"
+                  id="password"
+                  autoComplete="new-password"
+                />
+              </Grid>
+            </Grid>
+            <Button
+              type="submit"
+              fullWidth
+              variant="contained"
+              sx={{ mt: 3, mb: 2 }}
+            >
+              Sign Up
+            </Button>
+            <Link href="/sign-in" underline="always">
+            {'Already have an account?'}
+            </Link>
+            </Box>
+            </Box>
+            </Container>
+            )}
\ No newline at end of file
diff --git a/sports-matcher/src/index.js b/sports-matcher/src/index.js
index ef2edf8..78717fc 100644
--- a/sports-matcher/src/index.js
+++ b/sports-matcher/src/index.js
@@ -1,13 +1,14 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
+import { BrowserRouter } from "react-router-dom";
 import './index.css';
 import App from './App';
 import reportWebVitals from './reportWebVitals';
 
 ReactDOM.render(
-  <React.StrictMode>
+  <BrowserRouter>
     <App />
-  </React.StrictMode>,
+  </BrowserRouter>,
   document.getElementById('root')
 );
 

From 4c75dc2c752eab185dccda8dd8ecd3fd0f4043eb Mon Sep 17 00:00:00 2001
From: Piyush Sharma <piyush19sha@gmail.com>
Date: Sat, 5 Mar 2022 18:51:36 -0500
Subject: [PATCH 2/3] Cleaned up files

---
 sports-matcher/src/App.js    | 1 -
 sports-matcher/src/SignIn.js | 3 ---
 sports-matcher/src/SignUp.js | 5 +----
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/sports-matcher/src/App.js b/sports-matcher/src/App.js
index f00a5a2..13e5403 100644
--- a/sports-matcher/src/App.js
+++ b/sports-matcher/src/App.js
@@ -1,4 +1,3 @@
-import logo from './logo.svg';
 import './App.css';
 import { Routes, Route, Link } from "react-router-dom";
 import SignIn from './SignIn';
diff --git a/sports-matcher/src/SignIn.js b/sports-matcher/src/SignIn.js
index e7cd153..6192d11 100644
--- a/sports-matcher/src/SignIn.js
+++ b/sports-matcher/src/SignIn.js
@@ -3,9 +3,6 @@ import Avatar from '@mui/material/Avatar';
 import Button from '@mui/material/Button';
 import CssBaseline from '@mui/material/CssBaseline';
 import TextField from '@mui/material/TextField';
-import FormControlLabel from '@mui/material/FormControlLabel';
-import Checkbox from '@mui/material/Checkbox';
-import { useHistory } from 'react-router-dom';
 import Box from '@mui/material/Box';
 import Typography from '@mui/material/Typography';
 import Container from '@mui/material/Container';
diff --git a/sports-matcher/src/SignUp.js b/sports-matcher/src/SignUp.js
index c4e86e2..25d6ef2 100644
--- a/sports-matcher/src/SignUp.js
+++ b/sports-matcher/src/SignUp.js
@@ -3,15 +3,11 @@ import Avatar from '@mui/material/Avatar';
 import Button from '@mui/material/Button';
 import CssBaseline from '@mui/material/CssBaseline';
 import TextField from '@mui/material/TextField';
-import FormControlLabel from '@mui/material/FormControlLabel';
-import Checkbox from '@mui/material/Checkbox';
-import { useHistory } from 'react-router-dom';
 import Box from '@mui/material/Box';
 import AccountBoxIcon from '@mui/icons-material/AccountBox';
 import Typography from '@mui/material/Typography';
 import Container from '@mui/material/Container';
 import { Link } from '@mui/material';
-import { Router, Link as RouterLink } from 'react-router-dom';
 import { Grid } from '@mui/material';
 
 export default function SignUp() {
@@ -81,6 +77,7 @@ export default function SignUp() {
               type="submit"
               fullWidth
               variant="contained"
+              color='info'
               sx={{ mt: 3, mb: 2 }}
             >
               Sign Up

From e1befed1155981029f98c3424882cf59912d49bd Mon Sep 17 00:00:00 2001
From: Piyush Sharma <piyush19sha@gmail.com>
Date: Sun, 6 Mar 2022 20:22:23 -0500
Subject: [PATCH 3/3] Added Homepage and Navbar

---
 sports-matcher/package.json      |   2 +
 sports-matcher/public/index.html |   6 ++
 sports-matcher/src/App.js        |   2 +
 sports-matcher/src/Home.css      |   4 +
 sports-matcher/src/Home.js       |  46 ++++++++++
 sports-matcher/src/Homebar.js    |  44 +++++++++
 sports-matcher/src/Navbar.js     | 153 +++++++++++++++++++++++++++++++
 sports-matcher/src/SignIn.js     |  20 +++-
 sports-matcher/src/SignUp.js     |   1 +
 9 files changed, 273 insertions(+), 5 deletions(-)
 create mode 100644 sports-matcher/src/Home.css
 create mode 100644 sports-matcher/src/Home.js
 create mode 100644 sports-matcher/src/Homebar.js
 create mode 100644 sports-matcher/src/Navbar.js

diff --git a/sports-matcher/package.json b/sports-matcher/package.json
index 71556c7..e8e0974 100644
--- a/sports-matcher/package.json
+++ b/sports-matcher/package.json
@@ -10,7 +10,9 @@
     "@testing-library/jest-dom": "^5.16.2",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^13.5.0",
+    "bootstrap": "^5.1.3",
     "react": "^17.0.2",
+    "react-bootstrap": "^2.2.0",
     "react-dom": "^17.0.2",
     "react-router-dom": "^6.2.2",
     "react-scripts": "^5.0.0",
diff --git a/sports-matcher/public/index.html b/sports-matcher/public/index.html
index aa069f2..c87dbda 100644
--- a/sports-matcher/public/index.html
+++ b/sports-matcher/public/index.html
@@ -24,6 +24,12 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
+    <link
+  rel="stylesheet"
+  href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css"
+  integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3"
+  crossorigin="anonymous"
+/>
     <title>React App</title>
   </head>
   <body>
diff --git a/sports-matcher/src/App.js b/sports-matcher/src/App.js
index 13e5403..e631343 100644
--- a/sports-matcher/src/App.js
+++ b/sports-matcher/src/App.js
@@ -2,10 +2,12 @@ import './App.css';
 import { Routes, Route, Link } from "react-router-dom";
 import SignIn from './SignIn';
 import SignUp from './SignUp';
+import Home from './Home';
 function App() {
   return (
     <div className="App">
       <Routes>
+        <Route path="" element={<Home />} />
         <Route path="sign-in" element={<SignIn />} />
         <Route path="sign-up" element={<SignUp />} />
       </Routes>
diff --git a/sports-matcher/src/Home.css b/sports-matcher/src/Home.css
new file mode 100644
index 0000000..84dede7
--- /dev/null
+++ b/sports-matcher/src/Home.css
@@ -0,0 +1,4 @@
+h1, h2{
+    -webkit-text-stroke-width: 1px;
+    -webkit-text-stroke-color: black;
+}
\ No newline at end of file
diff --git a/sports-matcher/src/Home.js b/sports-matcher/src/Home.js
new file mode 100644
index 0000000..c42e1fa
--- /dev/null
+++ b/sports-matcher/src/Home.js
@@ -0,0 +1,46 @@
+import * as React from 'react';
+import Homebar from './Homebar';
+import { Carousel } from 'react-bootstrap';
+import './Home.css';
+export default function Home() {
+    return(
+    <React.Fragment>
+    <Homebar></Homebar>
+    <Carousel>
+    <Carousel.Item>
+    <img
+      src='https://d39l2hkdp2esp1.cloudfront.net/img/photo/148976/148976_00_2x.jpg'
+      alt="Connect Slide"
+      style={{ height: '680px', width: '2000px'}}
+    />
+    <Carousel.Caption>
+      <h1>Connect</h1>
+      <h2>Connect with other athletes in your area!</h2>
+    </Carousel.Caption>
+  </Carousel.Item>
+  <Carousel.Item>
+    <img
+      src='https://www.groovypost.com/wp-content/uploads/2021/08/sports-calendar-featured.jpg'
+      alt="Schedule Slide"
+      style={{ height: '680px', width: '2000px' }}
+    />
+    <Carousel.Caption>
+      <h1>Schedule</h1>
+      <h2>Schedule sport meets with other athletes!</h2>
+    </Carousel.Caption>
+  </Carousel.Item>
+  <Carousel.Item>
+    <img
+      src='https://i.pinimg.com/736x/dd/80/c3/dd80c3136a96c2fbf6004aef8e9619f3.jpg'
+      alt="Rent Slide"
+      style={{ height: '680px', width: '2000px' }}
+    />
+    <Carousel.Caption>
+      <h1>Rent</h1>
+      <h2>Rent sports equipment from other athletes!</h2>
+    </Carousel.Caption>
+  </Carousel.Item>
+    </Carousel>
+    </React.Fragment>
+    )
+}
\ No newline at end of file
diff --git a/sports-matcher/src/Homebar.js b/sports-matcher/src/Homebar.js
new file mode 100644
index 0000000..7f7e49f
--- /dev/null
+++ b/sports-matcher/src/Homebar.js
@@ -0,0 +1,44 @@
+import * as React from 'react';
+import AppBar from '@mui/material/AppBar';
+import Box from '@mui/material/Box';
+import Toolbar from '@mui/material/Toolbar';
+import Typography from '@mui/material/Typography';
+import Container from '@mui/material/Container';
+import Button from '@mui/material/Button';
+import { useNavigate } from 'react-router-dom';
+
+export default function Navbar(){
+
+  const navigate = useNavigate();
+
+  return (
+    <AppBar position="static" sx={{background: '#00226D'}}>
+      <Container maxWidth="xl">
+        <Toolbar disableGutters>
+          <Typography
+            variant="h6"
+            noWrap
+            component="div"
+            sx={{ mr: 2, fontSize: '200%', textAlign: 'center', flexGrow: 1, marginLeft: '10%'}}
+          >
+            Sports Matcher
+          </Typography>
+          <Box sx={{display: { xs: 'none', md: 'flex' }}}>
+              <Button
+                sx={{ my: 2, color: 'white', display: 'block', textTransform: 'none', fontSize: '100%'}}
+                onClick={() => navigate('sign-up')}
+              >
+                Sign Up
+              </Button>
+              <Button
+                sx={{ my: 2, color: 'white', display: 'block', textTransform: 'none', fontSize: '100%'}}
+                onClick={() => navigate('sign-in')}
+              >
+                Sign In
+              </Button>
+          </Box>
+        </Toolbar>
+      </Container>
+    </AppBar>
+  );
+};
diff --git a/sports-matcher/src/Navbar.js b/sports-matcher/src/Navbar.js
new file mode 100644
index 0000000..6fef1b2
--- /dev/null
+++ b/sports-matcher/src/Navbar.js
@@ -0,0 +1,153 @@
+import * as React from 'react';
+import AppBar from '@mui/material/AppBar';
+import Box from '@mui/material/Box';
+import Toolbar from '@mui/material/Toolbar';
+import IconButton from '@mui/material/IconButton';
+import Typography from '@mui/material/Typography';
+import Menu from '@mui/material/Menu';
+import MenuIcon from '@mui/icons-material/Menu';
+import Container from '@mui/material/Container';
+import Button from '@mui/material/Button';
+import Tooltip from '@mui/material/Tooltip';
+import MenuItem from '@mui/material/MenuItem';
+import AccountCircle from '@mui/icons-material/AccountCircle';
+import ForumIcon from '@mui/icons-material/Forum';
+import { useNavigate } from 'react-router-dom';
+
+const pages = ['Dashboard'];
+
+export default function Navbar(){
+  const [anchorElNav, setAnchorElNav] = React.useState(null);
+  const [anchorElUser, setAnchorElUser] = React.useState(null);
+
+  const handleOpenNavMenu = (event) => {
+    setAnchorElNav(event.currentTarget);
+  };
+  const handleOpenUserMenu = (event) => {
+    setAnchorElUser(event.currentTarget);
+  };
+
+  const handleCloseNavMenu = () => {
+    setAnchorElNav(null);
+  };
+
+  const handleCloseUserMenu = () => {
+    setAnchorElUser(null);
+  };
+
+  const navigate = useNavigate();
+
+  return (
+    <AppBar position="static" sx={{background: '#00226D'}}>
+      <Container maxWidth="xl">
+        <Toolbar disableGutters>
+          <Typography
+            variant="h6"
+            noWrap
+            component="div"
+            sx={{ mr: 2, display: { xs: 'none', md: 'flex' }, fontSize: '150%', borderRight: '0.05em solid black', borderColor: 'white', paddingRight: '1.5em' }}
+          >
+            Sports Matcher
+          </Typography>
+
+          <Box sx={{ flexGrow: 1, display: { xs: 'flex', md: 'none' } }}>
+            <IconButton
+              size="large"
+              aria-label="account of current user"
+              aria-controls="menu-appbar"
+              aria-haspopup="true"
+              onClick={handleOpenNavMenu}
+              color="inherit"
+            >
+              <MenuIcon />
+            </IconButton>
+            <Menu
+              id="menu-appbar"
+              anchorEl={anchorElNav}
+              anchorOrigin={{
+                vertical: 'bottom',
+                horizontal: 'left',
+              }}
+              keepMounted
+              transformOrigin={{
+                vertical: 'top',
+                horizontal: 'left',
+              }}
+              open={Boolean(anchorElNav)}
+              onClose={handleCloseNavMenu}
+              sx={{
+                display: { xs: 'block', md: 'none' },
+              }}
+            >
+              {pages.map((page) => (
+                <MenuItem key={page} onClick={handleCloseNavMenu}>
+                  <Typography textAlign="center">{page}</Typography>
+                </MenuItem>
+              ))}
+            </Menu>
+          </Box>
+          <Typography
+            variant="h6"
+            noWrap
+            component="div"
+            sx={{ flexGrow: 1, display: { xs: 'flex', md: 'none' } }}
+          >
+            Sports Matcher
+          </Typography>
+          <Box sx={{ flexGrow: 1, display: { xs: 'none', md: 'flex' }, marginLeft: '2%' }}>
+            {pages.map((page) => (
+              <Button
+                key={page}
+                onClick={handleCloseNavMenu}
+                sx={{ my: 2, color: 'white', display: 'block', textTransform: 'none', fontSize: '100%'}}
+              >
+                {page}
+              </Button>
+            ))}
+          </Box>
+
+          <Box sx={{ flexGrow: 0, marginRight: '1%'}}>
+           <Tooltip title="Chats">
+              <IconButton sx={{ p: 0}}>
+                <ForumIcon sx={{color: 'white'}}></ForumIcon>
+              </IconButton>
+            </Tooltip>
+            </Box>
+            <Box sx={{ flexGrow: 0 }}>
+            <Tooltip title="Settings">
+              <IconButton onClick={handleOpenUserMenu} sx={{ p: 0}}>
+                <AccountCircle sx={{color: 'white'}}></AccountCircle>
+              </IconButton>
+            </Tooltip>
+            <Menu
+              sx={{ mt: '30px' }}
+              id="menu-appbar"
+              anchorEl={anchorElUser}
+              anchorOrigin={{
+                vertical: 'top',
+                horizontal: 'right',
+              }}
+              keepMounted
+              transformOrigin={{
+                vertical: 'top',
+                horizontal: 'right',
+              }}
+              open={Boolean(anchorElUser)}
+              onClose={handleCloseUserMenu}
+            >
+                <MenuItem onClick={handleCloseUserMenu}>
+                  <Typography textAlign="center">Profile</Typography>
+                </MenuItem>
+                <MenuItem onClick={handleCloseUserMenu}>
+                  <Typography textAlign="center">Account</Typography>
+                </MenuItem>
+                <MenuItem onClick={() => navigate('sign-in')}>
+                  <Typography textAlign="center">Sign Out</Typography>
+                </MenuItem>
+            </Menu>
+          </Box>
+        </Toolbar>
+      </Container>
+    </AppBar>
+  );
+};
diff --git a/sports-matcher/src/SignIn.js b/sports-matcher/src/SignIn.js
index 6192d11..a5df9a6 100644
--- a/sports-matcher/src/SignIn.js
+++ b/sports-matcher/src/SignIn.js
@@ -8,8 +8,18 @@ import Typography from '@mui/material/Typography';
 import Container from '@mui/material/Container';
 import { Link } from '@mui/material';
 import AccountCircleIcon from '@mui/icons-material/AccountCircle';
+import { useNavigate } from 'react-router-dom';
 
 export default function SignIn() {
+  const navigate = useNavigate();
+  const handleSubmit = (event) => {
+    event.preventDefault();
+    const data = new FormData(event.currentTarget);
+    // eslint-disable-next-line no-console
+    if(data.get('username') == "admin" && data.get('password') == "admin"){
+      navigate('/');
+    }
+  };
   return (
       <Container component="main" maxWidth="xs">
         <CssBaseline />
@@ -27,15 +37,15 @@ export default function SignIn() {
           <Typography component="h1" variant="h5">
             Sign in
           </Typography>
-          <Box component="form" noValidate sx={{ mt: 1 }}>
+          <Box component="form" noValidate sx={{ mt: 1 }} onSubmit={handleSubmit}>
             <TextField
               margin="normal"
               required
               fullWidth
-              id="email"
-              label="Email Address"
-              name="email"
-              autoComplete="email"
+              id="username"
+              label="Username"
+              name="username"
+              autoComplete="username"
               autoFocus
             />
             <TextField
diff --git a/sports-matcher/src/SignUp.js b/sports-matcher/src/SignUp.js
index 25d6ef2..36f69c7 100644
--- a/sports-matcher/src/SignUp.js
+++ b/sports-matcher/src/SignUp.js
@@ -9,6 +9,7 @@ import Typography from '@mui/material/Typography';
 import Container from '@mui/material/Container';
 import { Link } from '@mui/material';
 import { Grid } from '@mui/material';
+import { useNavigate } from 'react-router-dom';
 
 export default function SignUp() {
   return (