Allowing proxying for secure cookies.

Environment variable encapsulated within quotes.

.gitignore

@@ -165,3 +165,4 @@ dist
 
 # End of https://www.toptal.com/developers/gitignore/api/visualstudiocode,node
 
+**/server/public/**

README.md

@@ -4,13 +4,13 @@ Sports Matcher is an application that allows users to connect with other athlete
 
 **Built Using**
 
-It is built using the React framework and the Material UI and React Bootstrap libraries.
+It is built using the React framework and React Bootstrap library. It uses MongoDB for the database, Express for the server, and Axios for requests.
 
 **Instructions**
 
-To use Sports Matcher, navigate to the sports-matcher directory in the repository and run the commands `npm i` and `npm start` in order. This should launch a localhost window in your browser which shows the homepage.
+To use Sports Matcher, please go to https://hidden-bayou-86321.herokuapp.com 
 
-From here you can Sign In to your account using the username "admin" and password "admin" OR using the username "user" and password "user" as specified in the handout.
+From here you can Sign In or Sign Up.
 
 Signing in as 'admin' will take you to the admin page. You will be able to see a list of current matches, users and suspended users. You will need to click the appropriate button for the correct table to appear.
 
@@ -18,4 +18,14 @@ Every page has a navbar at the top. There is a chat and profile icon. Clicking o
 
 
 
+**Functionality**
+
+Our app has a fully functioning backend which supports the CRUD functionality for the following entites
+1. We have a User entity which has the following attributes: Name, Email and Password, Sports and levels, Griends, Auth level, and suspended status
+2. We have a Match which supports the following attributes: Players, Date, Sport and skill, and Location
+
+We also support searching the database for the above entites.
+1. Matches can be searched for. They can be sorted and filtered based on location, friends, skill level and date.
+2. Users can also be searched for
+
 

sports-matcher/client/.eslintrc.json

@@ -25,7 +25,7 @@
             4
         ],
         "linebreak-style": [
-            "error",
+            "warn",
             "unix"
         ],
         "quotes": [
@@ -35,6 +35,7 @@
         "semi": [
             "error",
             "always"
-        ]
+        ],
+        "no-unused-vars": "warn"
     }
 }

sports-matcher/client/package-lock.json

@@ -18,6 +18,7 @@
         "react-dom": "^17.0.2",
         "react-router-dom": "^6.2.2",
         "react-scripts": "5.0.0",
+        "validator": "^13.7.0",
         "web-vitals": "^2.1.4"
       },
       "devDependencies": {
@@ -15382,6 +15383,14 @@
         "node": ">= 8"
       }
     },
+    "node_modules/validator": {
+      "version": "13.7.0",
+      "resolved": "https://registry.npmjs.org/validator/-/validator-13.7.0.tgz",
+      "integrity": "sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw==",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
     "node_modules/vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
@@ -27295,6 +27304,11 @@
         }
       }
     },
+    "validator": {
+      "version": "13.7.0",
+      "resolved": "https://registry.npmjs.org/validator/-/validator-13.7.0.tgz",
+      "integrity": "sha512-nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw=="
+    },
     "vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",

sports-matcher/client/package.json

@@ -13,11 +13,12 @@
     "react-dom": "^17.0.2",
     "react-router-dom": "^6.2.2",
     "react-scripts": "5.0.0",
+    "validator": "^13.7.0",
     "web-vitals": "^2.1.4"
   },
   "scripts": {
     "start": "NODE_ENV='development' REACT_APP_API_HOST='http://localhost:5000' react-scripts start",
-    "build": "../scripts/build.py",
+    "build": "python3 ../scripts/build.py",
     "test": "react-scripts test",
     "eject": "react-scripts eject"
   },

sports-matcher/client/src/Layout.js

@@ -1,16 +1,55 @@
 import "./styles/Layout.css";
 import "./styles/extra.css";
-import React from "react";
+import { useState } from "react";
-import { NavLink, Route, Routes } from "react-router-dom";
+import { NavLink, Route, Routes, useNavigate } from "react-router-dom";
 import Welcome from "./pages/Welcome";
 import Navbar from "react-bootstrap/Navbar";
 import { Container, Nav, NavbarBrand } from "react-bootstrap";
 import NavbarToggle from "react-bootstrap/esm/NavbarToggle";
 import NavbarCollapse from "react-bootstrap/esm/NavbarCollapse";
-export default class Layout extends React.Component {
+import Dashboard from "./pages/Dashboard";
-    render() {
+import Logout from "./pages/Logout";
-        return (
+import Rentals from "./pages/Rentals";
-            <div id="app">
+import Admin from "./pages/Administration";
+import Login from "./pages/Login";
+import Context from "./globals.js";
+import Signup from "./pages/Signup";
+
+
+export default function layout() {
+    const [globals, setGlobals] = useState({
+        user: null,
+        update: (updates, onUpdate) => setGlobals((state) => { return { ...state, ...updates }; }, onUpdate),
+        navigate: useNavigate()
+    });
+
+    let identityDisplay = (
+        <Nav>
+            <li className="nav-item">
+                <NavLink className="nav-link" to="/login" >Login</NavLink>
+            </li>
+            <li className="nav-item">
+                <NavLink className="nav-link" to="/signup" >Sign up!</NavLink>
+            </li>
+        </Nav>
+    );
+
+    if (globals.user) {
+        identityDisplay = (
+            <Nav>
+                <li className="nav-item">
+                    <NavLink className="nav-link" to="/" >Hi, {globals.user.firstName}</NavLink>
+                </li>
+                <li className="nav-item">
+                    <NavLink className="nav-link" to="/logout" >Logout</NavLink>
+                </li>
+            </Nav>
+        );
+    }
+
+    return (
+        <div id="app">
+            <Context.Provider value={globals}>
                 <header>
                     <Navbar bg="light" expand="md">
                         <Container>
@@ -22,20 +61,26 @@ export default class Layout extends React.Component {
                                         <NavLink className="nav-link" to="/" >Home</NavLink>
                                     </li>
                                 </Nav>
+                                {identityDisplay}
                             </NavbarCollapse>
                         </Container>
                     </Navbar>
                 </header>
                 <main>
                     <Routes>
-                        <Route path="/" element={<Welcome></Welcome>}>
+                        <Route path="/" element={<Welcome />} />
-                        </Route>
+                        <Route path="/dashboard" element={<Dashboard />} />
+                        <Route path="/login" element={<Login />} />
+                        <Route path="/signup" element={<Signup />} />
+                        <Route path="/logout" element={<Logout />} />
+                        <Route path="/admin" element={<Admin />} />
+                        <Route path="/rentals" element={<Rentals />} />
                     </Routes>
                 </main>
                 <footer>
 
                 </footer>
-            </div>
+            </Context.Provider>
-        );
+        </div>
-    }
+    );
 }

sports-matcher/client/src/components/AuthenticationGuard.js

@@ -0,0 +1,44 @@
+import React from "react";
+import globals from "../globals";
+import { apiClient } from "../utils/httpClients";
+import propTypes from "prop-types";
+
+export default class AuthenticationGuard extends React.Component {
+    constructor(props) {
+        super(props);
+    }
+    static contextType = globals;
+
+    async componentDidMount() {
+        let userDataResponse = await apiClient.get("/user");
+        if (userDataResponse.status === 200) {
+            this.context.update({ user: userDataResponse.data });
+            if (this.context.user && this.context.user.accessLevel < this.props.accessLevel) {
+                this.context.navigate("/", { replace: true });
+            }
+        } else if (userDataResponse.status == 401) {
+            this.context.navigate("/signup", { replace: true });
+            this.context.update({ user: null });
+        }
+    }
+
+    componentDidUpdate() {
+    }
+
+    render() {
+        if (this.context.user) {
+            return this.props.children;
+        } else {
+            return null;
+        }
+    }
+}
+
+AuthenticationGuard.defaultProps = {
+    accessLevel: 0
+};
+
+AuthenticationGuard.propTypes = {
+    accessLevel: propTypes.number,
+    children: propTypes.any
+};

sports-matcher/client/src/components/MatchInfoCard.js

@@ -9,7 +9,6 @@ export default class MatchInfoCard extends React.Component {
 
     getParticipants() {
         let participants = [];
-        console.log(this.props);
         this.props.match.participants.forEach(user => {
             participants.push(user.firstName);
         });

sports-matcher/client/src/components/MatchInfoCardDisplay.js

@@ -1,7 +1,7 @@
 import React from "react";
 import propTypes from "prop-types";
 import MatchInfoCard from "./MatchInfoCard";
-
+import "../styles/MatchInfoCardDisplay.css";
 export default class MatchInfoCardDisplay extends React.Component {
     constructor(props) {
         super(props);

sports-matcher/client/src/components/RentalInfoCard.js

@@ -0,0 +1,31 @@
+import React from "react";
+import { Card } from "react-bootstrap";
+//import { Button, Card } from "react-bootstrap";
+import propTypes from "prop-types";
+//import { grammaticalListString } from "../utils/strings";
+export default class MatchInfoCard extends React.Component {
+    constructor(props) {
+        super(props);
+    }
+
+
+    render() {
+        return (
+            // <Card style={{ width: "20rem" }}>
+            <Card>
+                <Card.Body>
+                    <Card.Title>{this.props.rental.title}</Card.Title>
+                    <Card.Text className="mb-2 text-muted">Rate: {this.props.rental.rate}</Card.Text>
+                    <Card.Text>Date Created: {this.props.rental.createDate}</Card.Text>
+                    <Card.Text>Owner: {this.props.rental.creator}</Card.Text>
+                    <Card.Text>Contact: {this.props.rental.contact}</Card.Text>
+                    <Card.Text>Description: {this.props.rental.description}</Card.Text>
+                </Card.Body>
+            </Card>
+        );
+    }
+}
+
+MatchInfoCard.propTypes = {
+    rental: propTypes.object,
+};

sports-matcher/client/src/components/SportInfoCard.js

@@ -0,0 +1,26 @@
+import React from "react";
+import { Card } from "react-bootstrap";
+import propTypes from "prop-types";
+export default class SportInfoCard extends React.Component {
+    constructor(props) {
+        super(props);
+    }
+
+    render() {
+        return (
+            <Card style={{ width: "20rem" }}>
+                <Card.Body>
+                    <Card.Title>{this.props.sport.name}</Card.Title>
+                    <Card.Subtitle className="mb-2 text-muted">Requires a minimum of {this.props.sport.minPlayers.toString()} players.</Card.Subtitle>
+                    <Card.Text>
+                        {this.props.sport.description}
+                    </Card.Text>
+                </Card.Body>
+            </Card>
+        );
+    }
+}
+
+SportInfoCard.propTypes = {
+    sport: propTypes.object,
+};

sports-matcher/client/src/components/SportInfoCardDisplay.js

@@ -0,0 +1,24 @@
+import React from "react";
+import propTypes from "prop-types";
+import SportInfoCard from "./SportInfoCard";
+import "../styles/MatchInfoCardDisplay.css";
+export default class SportInfoCardDisplay extends React.Component {
+    constructor(props) {
+        super(props);
+    }
+    render() {
+        let sports = null;
+        if (this.props.recommendedsports.length > 0) {
+            sports = this.props.recommendedsports.map((sport) => <SportInfoCard key={sport._id} sport={sport}></SportInfoCard>);
+        }
+        return (
+            <div className="horizontal-scroller">
+                {sports}
+            </div>
+        );
+    }
+}
+
+SportInfoCardDisplay.propTypes = {
+    recommendedsports: propTypes.array,
+};

sports-matcher/client/src/globals.js

@@ -0,0 +1,7 @@
+import React from "react";
+
+export default React.createContext({
+    user: null,
+    update: () => { },
+    navigate: () => { }
+});

sports-matcher/client/src/pages/Administration.js

@@ -0,0 +1,251 @@
+import React from "react";
+import { Button, ButtonGroup, Spinner, Table } from "react-bootstrap";
+import "../styles/Admin.css";
+import globals from "../globals";
+import AuthenticationGuard from "../components/AuthenticationGuard";
+import { apiClient } from "../utils/httpClients";
+
+export default class Admin extends React.Component {
+    constructor(props) {
+        super(props);
+        // Use null to indicate not loaded
+        // Use empty array to indicate no items for that state.
+        this.state = {
+            users: null,
+            suspendedUsers: null,
+            matches: null,
+            user: null,
+            currentTab: "matches",
+        };
+    }
+
+    static contextType = globals;
+
+    async componentDidMount() {
+        await this.loadActiveUsers();
+        await this.loadSuspendedUsers();
+        await this.loadMatches();
+    }
+
+    async loadActiveUsers() {
+        let response = await apiClient.get("/user/all/active");
+        if (response.status === 200) {
+            this.setState({ users: response.data.active });
+        }
+    }
+
+    async loadSuspendedUsers() {
+        let response = await apiClient.get("/user/all/suspended");
+        if (response.status === 200) {
+            this.setState({ suspendedUsers: response.data.suspended });
+        } else {
+            console.error(response.status);
+        }
+    }
+
+    async loadMatches() {
+        let response = await apiClient.get("/match/all");
+        if (response.status === 200) {
+            this.setState({ matches: response.data.all });
+        }
+    }
+
+    DeleteButton() {
+        return <Button onClick={() => {
+            alert("User deleted.");
+        }} variant="outline-secondary">Delete</Button>;
+
+    }
+
+    PardonButton() {
+        return <Button onClick={() => {
+            alert("User pardoned.");
+        }} variant="outline-secondary">Pardon</Button>;
+
+    }
+
+    EditButton() {
+        return <Button onClick={() => {
+            alert("clicked");
+        }} variant="outline-secondary">Edit</Button>;
+
+    }
+
+    userTableHead() {
+        return (
+            <thead>
+                <tr>
+                    <th>ID</th>
+                    <th>Username</th>
+                    <th>Name</th>
+                    <th>Email</th>
+                    <th>Phone</th>
+                    <th></th>
+                    <th></th>
+                </tr>
+            </thead>
+        );
+    }
+
+    matchTableHead() {
+        return (
+            <thead>
+                <tr>
+                    <th>ID</th>
+                    <th>Sport</th>
+                    <th>Date</th>
+                    <th>Location</th>
+                    <th></th>
+                    <th></th>
+                </tr>
+            </thead>
+        );
+    }
+
+
+    userTableData() {
+        if (!this.state.users) {
+            return (
+                <tr>
+                    <td><Spinner animation="grow" /></td>
+                    <td><Spinner animation="grow" /></td>
+                    <td><Spinner animation="grow" /></td>
+                    <td><Spinner animation="grow" /></td>
+                    <td><Spinner animation="grow" /></td>
+                    <td><Spinner animation="grow" /></td>
+                    <td><Spinner animation="grow" /></td>
+                </tr>
+            );
+        }
+        return this.state.users.map((user) => {
+            const { _id, firstName, lastName, email, phone } = user;
+            return (
+                <tr key={_id}>
+                    <td>{_id}</td>
+                    <td>{firstName}</td>
+                    <td>{lastName}</td>
+                    <td>{email}</td>
+                    <td>{phone}</td>
+                    <td>{this.DeleteButton()}</td>
+                    <td>{this.EditButton()}</td>
+                </tr>
+            );
+        });
+    }
+
+    susUserTableData() {
+        if (!this.state.suspendedUsers) {
+            return (
+                <tr>
+                    <td><Spinner animation="grow" /></td>
+                    <td><Spinner animation="grow" /></td>
+                    <td><Spinner animation="grow" /></td>
+                    <td><Spinner animation="grow" /></td>
+                    <td><Spinner animation="grow" /></td>
+                    <td><Spinner animation="grow" /></td>
+                    <td><Spinner animation="grow" /></td>
+                    <td><Spinner animation="grow" /></td>
+                </tr>
+            );
+        }
+
+        return this.state.suspendedUsers.map((user) => {
+            const { _id, firstName, lastName, email, phone } = user;
+            return (
+                <tr key={_id}>
+                    <td>{_id}</td>
+                    <td>{firstName}</td>
+                    <td>{lastName}</td>
+                    <td>{email}</td>
+                    <td>{phone}</td>
+                    <td>{this.DeleteButton()}</td>
+                    <td>{this.EditButton()}</td>
+                    <td>{this.PardonButton()}</td>
+                </tr>
+            );
+        });
+    }
+
+
+    matchTableData() {
+        if (!this.state.matches) {
+            return (
+                <tr>
+                    <td><Spinner animation="grow" /></td>
+                    <td><Spinner animation="grow" /></td>
+                    <td><Spinner animation="grow" /></td>
+                    <td><Spinner animation="grow" /></td>
+                    <td><Spinner animation="grow" /></td>
+                    <td><Spinner animation="grow" /></td>
+                </tr>
+            );
+        }
+
+        return this.state.matches.map((match) => {
+            const { _id, sport, when, location } = match;
+            const sportName = sport.name;
+            return (
+                <tr key={_id}>
+                    <td>{_id}</td>
+                    <td>{sportName}</td>
+                    <td>{when}</td>
+                    <td>{location}</td>
+                    <td>{this.DeleteButton()}</td>
+                    <td>{this.EditButton()}</td>
+                </tr>
+            );
+        });
+    }
+
+    renderTableHead() {
+        if (this.state.currentTab === "matches") {
+            return this.matchTableHead();
+        } else if (this.state.currentTab === "users") {
+            return this.userTableHead();
+        } else {
+            return this.userTableHead();
+        }
+    }
+
+    renderTableData() {
+        if (this.state.currentTab === "matches") {
+            return this.matchTableData();
+        } else if (this.state.currentTab === "users") {
+            return this.userTableData();
+        } else {
+            return this.susUserTableData();
+        }
+    }
+
+    render() {
+        return (
+            <div className="page-root">
+                <AuthenticationGuard accessLevel={3}>
+                    <React.Fragment>
+                        <div className='center'>
+                            <h1 id='title'>Administration</h1>
+                            <ButtonGroup aria-label="Pages">
+                                <Button onClick={() => {
+                                    this.setState({ currentTab: "matches" });
+                                }} variant="outline-secondary" active={this.state.currentTab === "matches"}>Matches</Button>
+                                <Button onClick={() => {
+                                    this.setState({ currentTab: "users" });
+                                }} variant="outline-secondary" active={this.state.currentTab === "users"}>Users</Button>
+                                <Button onClick={() => {
+                                    this.setState({ currentTab: "suspended" });
+                                }} variant="outline-secondary" active={this.state.currentTab === "suspended"}>Suspended Users</Button>
+                            </ButtonGroup>
+                        </div>
+                        <Table striped bordered hover>
+                            {this.renderTableHead()}
+                            <tbody>
+                                {this.renderTableData()}
+                                {/* {this.matchUserTableData()} */}
+                            </tbody>
+                        </Table>
+                    </React.Fragment>
+                </AuthenticationGuard >
+            </div>
+        );
+    }
+}

sports-matcher/client/src/pages/Dashboard.js

@@ -0,0 +1,71 @@
+import React from "react";
+import { Button, InputGroup, FormControl } from "react-bootstrap";
+import "../styles/Dashboard.css";
+import { apiClient } from "../utils/httpClients.js";
+import MatchInfoCardDisplay from "../components/MatchInfoCardDisplay";
+import SportInfoCardDisplay from "../components/SportInfoCardDisplay";
+import AuthenticationGuard from "../components/AuthenticationGuard";
+import globals from "../globals";
+
+export default class Dashboard extends React.Component {
+    constructor(props) {
+        super(props);
+        this.state = {
+            displayedMatches: [],
+            displayedSports: [],
+            displayedEquipment: [],
+            user: null
+        };
+    }
+
+    static contextType = globals;
+
+    async componentDidMount() {
+        this.setState({ user: this.context.user });
+        await this.latestMatches();
+        await this.availableSports();
+    }
+    async latestMatches() {
+        let recentMatchesRes = await apiClient.get("/match/recent/user/15");
+        if (recentMatchesRes.status === 200) {
+            this.setState({ displayedMatches: recentMatchesRes.data.recent });
+        }
+    }
+
+    async availableSports() {
+        let availableSportsRes = await apiClient.get("/sport");
+        if (availableSportsRes.status === 200) {
+            this.setState({ displayedSports: availableSportsRes.data });
+        }
+    }
+
+    render() {
+        return (
+            <AuthenticationGuard>
+                <div className="page-root">
+                    <React.Fragment>
+                        <h1></h1>
+                        <InputGroup className="w-50">
+                            <FormControl
+                                placeholder="Search for Matches"
+                                aria-label="Search Bar"
+                                aria-describedby="basic-addon2"
+                            />
+                            <Button variant="outline-secondary" id="button-addon2">
+                                Search
+                            </Button>
+                        </InputGroup>
+                        <div className="p-4">
+                            <h2>Available Matches</h2>
+                            <MatchInfoCardDisplay recommendedmatches={this.state.displayedMatches} />
+                        </div>
+                        <div className="p-4">
+                            <h2>Available Sports</h2>
+                            <SportInfoCardDisplay recommendedsports={this.state.displayedSports} />
+                        </div>
+                    </React.Fragment>
+                </div>
+            </AuthenticationGuard>
+        );
+    }
+}

sports-matcher/client/src/pages/Login.js

@@ -0,0 +1,87 @@
+import React from "react";
+import { Alert, Button, Card, Container, Form } from "react-bootstrap";
+import globals from "../globals";
+import { apiClient } from "../utils/httpClients";
+
+export default class Login extends React.Component {
+    constructor(props) {
+        super(props);
+        this.state = {
+            email: "",
+            password: "",
+            errorDisplayed: false,
+        };
+
+        this.attemptLogin = this.attemptLogin.bind(this);
+    }
+
+    static contextType = globals;
+
+    async componentDidMount() {
+    }
+
+    componentDidUpdate() {
+        if (this.context.user) {
+            this.context.navigate("/dashboard");
+        }
+    }
+
+    async attemptLogin(e) {
+        e.preventDefault();
+        const loginResponse = await apiClient.post("/user/login", {
+            email: this.state.email,
+            password: this.state.password,
+        });
+        if (loginResponse.status === 200) {
+            this.context.update({ user: loginResponse.data });
+        } else if (loginResponse.status === 401) {
+            this.setState({ errorDisplayed: true });
+        }
+    }
+
+    render() {
+        let errorMsg = (
+            <div></div>
+        );
+        if (this.state.errorDisplayed) {
+            errorMsg = (
+                < Alert variant="danger" onClose={() => this.setState({ errorDisplayed: false })} dismissible >
+                    <Alert.Heading>Incorrect credentials</Alert.Heading>
+                    <p>Double check your provided e-mail and password!</p>
+                </Alert >
+            );
+        }
+
+        return (
+            <div className="d-flex justify-content-center align-items-center
+            page-root">
+                {errorMsg}
+                <Container style={{ maxWidth: "35rem" }}>
+                    <Card>
+                        <Card.Body>
+                            <Card.Title>Login</Card.Title>
+                            <Card.Subtitle>Welcome back!</Card.Subtitle>
+                            <Form onSubmit={this.attemptLogin}>
+                                <Form.Group className="mb-3" controlId="loginEmail">
+                                    <Form.Label>E-mail</Form.Label>
+                                    <Form.Control type="email" placeholder="Ex. youremail@mail.com" onChange={(e) => {
+                                        this.setState({ email: e.target.value });
+                                    }} />
+                                </Form.Group>
+                                <Form.Group className="mb-3" controlId="loginPassword">
+                                    <Form.Label>Password</Form.Label>
+                                    <Form.Control type="password" placeholder="Enter password" onChange={(e) => {
+                                        this.setState({ password: e.target.value });
+                                    }} />
+                                </Form.Group>
+                                <Button variant="primary" type="submit">
+                                    Submit
+                                </Button>
+                            </Form>
+                        </Card.Body>
+                    </Card>
+                </Container>
+            </div>
+        );
+    }
+}

sports-matcher/client/src/pages/Logout.js

@@ -0,0 +1,39 @@
+import React from "react";
+import globals from "../globals";
+import { apiClient } from "../utils/httpClients";
+
+export default class Logout extends React.Component {
+    constructor(props) {
+        super(props);
+    }
+
+    static contextType = globals;
+
+    async componentDidMount() {
+        const logoutResponse = await apiClient.get("/user/logout");
+        if (logoutResponse.status === 200) {
+            this.redirectTimer = setTimeout(() => {
+                this.context.navigate("/", { replace: true });
+            }, 2000);
+        } else if (logoutResponse.status == 401) {
+            this.context.navigate("/", { replace: true });
+        }
+
+        this.context.update({ user: null });
+    }
+
+    componentWillUnmount() {
+        clearTimeout(this.redirectTimer);
+    }
+
+    render() {
+        return (
+            <div className="page-root">
+                <div>
+                    <h1>You are now logged out. See you later!</h1>
+                    <p className="text-muted">We will redirect you shortly...</p>
+                </div>
+            </div>
+        );
+    }
+}

sports-matcher/client/src/pages/Profile.js

@@ -0,0 +1,14 @@
+import React from "react";
+import { Container } from "react-bootstrap";
+
+export default class Profile extends React.Component {
+    render() {
+        return (
+            <div className="page-root">
+                <Container>
+
+                </Container>
+            </div>
+        );
+    }
+}

sports-matcher/client/src/pages/Rentals.js

@@ -0,0 +1,89 @@
+import React from "react";
+import { Button, InputGroup, FormControl } from "react-bootstrap";
+import "../styles/Dashboard.css";
+// import { apiClient } from "../utils/httpClients.js";
+// import MatchInfoCardDisplay from "../components/MatchInfoCardDisplay";
+// import SportInfoCardDisplay from "../components/SportInfoCardDisplay";
+import RentalInfoCard from "../components/RentalInfoCard";
+// import AuthenticationGuard from "../components/AuthenticationGuard";
+// import globals from "../globals";
+
+export default class Rentals extends React.Component {
+    constructor(props) {
+        super(props);
+        this.state = {
+            rentals: [
+                { id: 9, creator: "Person5", createDate: "05/21/2022", title: "Horse", rate: "$1000/day", description: "This is an amazing horse, has won many races", contact: "647 765 1234" },
+                { id: 7, creator: "Person1", createDate: "05/05/2022", title: "Tennis Racquet", rate: "$300/day", description: "This is an amazing tennis racquet, used by Roger Federer to win Wimbledon in 2003", contact: "123 456 7890" },
+                { id: 3, creator: "Person2", createDate: "05/11/2022", title: "Soccer Ball", rate: "$70/day", description: "This is an amazing soccer ball, signed by Messi", contact: "647 822 4321" },
+                { id: 2, creator: "Person3", createDate: "05/13/2022", title: "Basket Ball", rate: "$7/day", description: "This is an amazing basketball, same model as the ones used in the NBA", contact: "467 279 4321" },
+                { id: 1, creator: "Person4", createDate: "05/18/2022", title: "Table Tennis Racquet", rate: "$7/day", description: "This is an amazing table tennis racquet, it's very good", contact: "326 111 4321" },
+
+            ]
+        };
+    }
+
+    // static contextType = globals;
+
+    // async componentDidMount() {
+    //     this.setState({ user: this.context.user });
+    //     await this.latestMatches();
+    //     await this.availableSports();
+    // }
+    // async latestMatches() {
+    //     let recentMatchesRes = await apiClient.get("/match/recent/user/15");
+    //     if (recentMatchesRes.status === 200) {
+    //         this.setState({ displayedMatches: recentMatchesRes.data.recent });
+    //     }
+    // }
+
+    // async availableSports() {
+    //     let availableSportsRes = await apiClient.get("/sport");
+    //     if (availableSportsRes.status === 200) {
+    //         this.setState({ displayedSports: availableSportsRes.data });
+    //     }
+    // }
+
+    // renderRentals() {
+    //     let matches = null;
+    //     if (this.props.recommendedmatches.length > 0) {
+    //         matches = this.props.recommendedmatches.map((match) => <MatchInfoCard key={match._id} match={match}></MatchInfoCard>);
+    //     }
+    //     return (
+    //         <div className="horizontal-scroller">
+    //             {matches}
+    //         </div>
+    //     );
+    //  }
+
+    rentalsCards() {
+        return this.state.rentals.map((rental) => {
+            return (<RentalInfoCard key={rental.id} rental={rental}></RentalInfoCard>);
+        });
+    }
+
+    render() {
+        return (
+
+            <div className="page-root">
+                <React.Fragment>
+                    <h1></h1>
+                    <InputGroup className="w-50">
+                        <FormControl
+                            placeholder="Search for Rentals"
+                            aria-label="Search Bar"
+                            aria-describedby="basic-addon2"
+                        />
+                        <Button variant="outline-secondary" id="button-addon2">
+                            Search
+                        </Button>
+                    </InputGroup>
+                    <div className="p-4">
+                        <h2>Available Rentals</h2>
+                        {this.rentalsCards()}
+                    </div>
+                </React.Fragment>
+            </div>
+        );
+    }
+}

sports-matcher/client/src/pages/Signup.js

@@ -0,0 +1,147 @@
+import React from "react";
+import { Alert, Button, Card, Container, Form } from "react-bootstrap";
+import { Link } from "react-router-dom";
+import validator from "validator";
+import globals from "../globals";
+import { apiClient } from "../utils/httpClients";
+
+export default class Signup extends React.Component {
+    constructor(props) {
+        super(props);
+        this.state = {
+            user: {
+                email: null,
+                firstName: null,
+                lastName: null,
+                phone: null,
+                password: null
+            },
+            alert: {
+                show: false,
+                variant: null,
+                headerMsg: null,
+                content: null
+            }
+        };
+
+        this.registerUser = this.registerUser.bind(this);
+        this.setUserState = this.setUserState.bind(this);
+    }
+
+    static contextType = globals;
+
+    async registerUser(event) {
+        event.preventDefault();
+        let formIssues = this.validateCurrentForm();
+        if (formIssues.length > 0) {
+            this.notifyUser("Oops there were issue(s)", (
+                <ul>
+                    {formIssues.map((issue) => {
+                        return (
+                            <li key={issue}>{issue}</li>
+                        );
+                    })}
+                </ul>
+            ), "danger");
+            return;
+        }
+
+        const res = await apiClient.post("/user", this.state.user);
+        if (res.status === 201) {
+            this.notifyUser("Success!", <div>You are successfully signed up! You wil be directed to <Link to="/login">login</Link> now.</div>, "success");
+            this.redirectTimer = setTimeout(() => {
+                this.context.navigate("/signin", { replace: true });
+            }, 1000);
+        } else if (res.status === 409) {
+            this.notifyUser("User exists!", <div>This user already exists. Try <Link to="/login">logging in</Link> instead.</div>, "danger");
+        } else if (res.status === 400) {
+            this.notifyUser("There were errors in the submitted info.", <div>Double check to see if everything is inputted is valid.</div>, "danger");
+        } else {
+            this.notifyUser("Error", <div>Internal server error. Please try again later.</div>, "danger");
+        }
+    }
+
+    componentWillUnmount() {
+        clearTimeout(this.redirectTimer);
+    }
+
+    validateCurrentForm() {
+        let formIssues = [];
+        if (!validator.isEmail(this.state.user.email)) {
+            formIssues.push("The email submitted is invalid.");
+        }
+
+        if (this.state.user.password.length < 8) {
+            formIssues.push("The password submitted must have a minimum length of 8 characters.");
+        }
+
+        return formIssues;
+    }
+
+    setUserState(event) {
+        this.setState((state) => {
+            state.user[event.target.id] = event.target.value;
+            return state;
+        });
+    }
+
+    notifyUser(headerMsg, content, key) {
+        this.setState((state) => {
+            state.alert.show = true;
+            state.alert.headerMsg = headerMsg;
+            state.alert.content = content;
+            state.alert.key = key;
+            return state;
+        });
+    }
+
+    componentDidMount() {
+        if (this.context.user) {
+            this.context.navigate("/dashboard");
+        }
+    }
+
+    render() {
+        return (
+            <div className="page-root pt-3">
+                <Container>
+                    <Alert show={this.state.alert.show} variant="warning" onClose={() => this.setState((state) => { state.alert.show = false; return state; })} dismissible>
+                        <Alert.Heading>{this.state.alert.headerMsg}</Alert.Heading>
+                        {this.state.alert.content}
+                    </Alert>
+                    <Card style={{ width: "35rem" }}>
+                        <Card.Body>
+                            <Card.Title>Sign up!</Card.Title>
+                            <Card.Subtitle>Welcome to Sports Matcher! Already <Link to="/login">have an account</Link>?</Card.Subtitle>
+                            <Form onSubmit={this.registerUser}>
+                                <Form.Group className="mb-3" controlId="firstName">
+                                    <Form.Label>First name</Form.Label>
+                                    <Form.Control type="text" placeholder="Ex. John" onChange={this.setUserState} required />
+                                </Form.Group>
+                                <Form.Group className="mb-3" controlId="lastName">
+                                    <Form.Label>Last name</Form.Label>
+                                    <Form.Control type="text" placeholder="Ex. Smith" onChange={this.setUserState} required />
+                                </Form.Group>
+                                <Form.Group className="mb-3" controlId="email">
+                                    <Form.Label>E-mail</Form.Label>
+                                    <Form.Control type="email" placeholder="Ex. youremail@mail.com" onChange={this.setUserState} required />
+                                </Form.Group>
+                                <Form.Group className="mb-3" controlId="phone">
+                                    <Form.Label>Phone number</Form.Label>
+                                    <Form.Control type="text" placeholder="Ex. (123) 456-7890" onChange={this.setUserState} />
+                                </Form.Group>
+                                <Form.Group className="mb-3" controlId="password">
+                                    <Form.Label>Password</Form.Label>
+                                    <Form.Control type="password" placeholder="Enter password" onChange={this.setUserState} required />
+                                </Form.Group>
+                                <Button variant="primary" type="submit">
+                                    Register!
+                                </Button>
+                            </Form>
+                        </Card.Body>
+                    </Card>
+                </Container>
+            </div >
+        );
+    }
+}

sports-matcher/client/src/styles/Admin.css

@@ -0,0 +1,15 @@
+
+.MainTable {
+    padding : 20px;
+}
+
+.center {
+    text-align: center;
+    padding: 21px;
+}
+
+
+.somespace {
+    padding: 17px;
+}
+

sports-matcher/client/src/styles/Dashboard.css

@@ -0,0 +1,5 @@
+.w-50{
+    margin-top: 5%;
+    margin-left: 25%;
+    margin-right: 25%;
+}

sports-matcher/client/src/styles/MatchInfoCardDisplay.css

@@ -0,0 +1,4 @@
+.horizontal-scroller{
+    display: flex;
+    overflow-x: auto;
+}

sports-matcher/client/src/utils/httpClients.js

@@ -1,6 +1,10 @@
 import axios from "axios";
 
 export const apiClient = axios.create({
-    baseURL: process.env.REACT_APP_API_HOST,
+    baseURL: (process.env.REACT_APP_API_HOST || "") + "/api/",
     timeout: 5000,
+    withCredentials: process.env.NODE_ENV === "development",
+    validateStatus: function (status) {
+        return status === 401 || status === 200 || status === 400 || status === 201;
+    }
 });

sports-matcher/scripts/build.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 import os
 import shutil
 

sports-matcher/scripts/start_mongo.bat

@@ -0,0 +1 @@
+mongod --dbpath ./server/mongo-data

sports-matcher/scripts/start_mongo.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+mongod --dbpath ../server/mongo-data

sports-matcher/server/.eslintrc.json

@@ -14,7 +14,7 @@
             4
         ],
         "linebreak-style": [
-            "error",
+            "warn",
             "unix"
         ],
         "quotes": [
@@ -24,6 +24,7 @@
         "semi": [
             "error",
             "always"
-        ]
+        ],
+        "no-unused-vars": "warn"
     }
 }

sports-matcher/server/controllers/matchController.js

@@ -1,5 +1,5 @@
 import express from "express";
-import { authenticationGuard } from "../middleware/authority.js";
+import { requireAdmin, requireAuthenticated } from "../middleware/authority.js";
 import { needDatabase } from "../middleware/database.js";
 import matchModel from "../schemas/matchModel.js";
 import sportModel from "../schemas/sportModel.js";
@@ -18,7 +18,7 @@ MatchController.get("/search/:sport", needDatabase, async (req, res) => {
         if (req.query.beforeDate) query.where("when").lte(req.query.beforeDate);
 
         let queryResults = await query;
-        res.send({ queryResults });
+        res.send({ results: queryResults });
     } catch (error) {
         console.error(error);
         res.status(500).send("Internal server error.");
@@ -26,40 +26,54 @@ MatchController.get("/search/:sport", needDatabase, async (req, res) => {
 });
 
 MatchController.get("/recent/:limit?", needDatabase, async (req, res) => {
-    const user = req.user;
-    let limit = parseInt(req.params.limit);
-    if (!req.params.limit) limit = 10;
-    if (isNaN(limit)) {
-        console.log(typeof (limit));
-        res.status(400).send("Limit parameter is not a number.");
-        return;
-    }
-    if (isNaN(limit)) {
-        res.status(400).send("Limit parameter not a number.");
-        return;
-    }
-    if (limit > 50) {
-        res.status(400).send("Limit greater than maximum limit of 50.");
-        return;
-    }
-    let recent = null;
     try {
-        if (user) {
+        let limit = parseInt(req.params.limit);
-            await user.populate("participatingMatches").populate("participatingMatches.participants").populate("participatingMatches.sport");
+        if (!req.params.limit) limit = 10;
-            recent = user.participatingMatches;
+        if (isNaN(limit)) {
-        } else {
+            res.status(400).send("Limit parameter not a number.");
-            recent = await matchModel.find().where("publicity").gte(2).limit(limit).sort({ createDate: -1 });
+            return;
         }
-        await recent.populate("members.$"); // Populates all references.
+        if (limit > 50) {
+            res.status(400).send("Limit greater than maximum limit of 50.");
+            return;
+        }
+        let recent = matchModel.find().where("publicity").gte(2);
+        recent = await recent.sort({ createDate: -1 }).limit(limit).populate(["sport", "participants"]);
         res.status(200).send({ recent: recent });
-    } catch (err) {
+    } catch (error) {
-        console.error(err);
+        console.error(error);
         res.status(500).send("Internal server error.");
-        // TODO: Check and improve error handling.
     }
 });
 
-MatchController.post("/", needDatabase, authenticationGuard, async (req, res) => {
+MatchController.get("/all", requireAdmin, async (req, res) => {
+    try {
+        const allmatches = await matchModel.find().populate("sport");
+        res.status(200).send({ all: allmatches });
+    } catch (error) {
+        console.error(error);
+        res.status(500).send("Internal server error.");
+    }
+});
+
+MatchController.get("/recent/user/:limit", needDatabase, requireAuthenticated, async (req, res) => {
+    try {
+        let user = req.user;
+        let limit = parseInt(req.params.limit);
+        if (!req.params.limit) limit = 10;
+        if (isNaN(limit)) {
+            res.status(400).send("Limit parameter not a number.");
+            return;
+        }
+        let recent = await matchModel.find({ creator: user._id }).sort({ createDate: -1 }).limit(limit).populate(["sport", "participants"]);
+        res.status(200).send({ recent: recent });
+    } catch (error) {
+        console.error(error);
+        res.status(500).send("Internal server error.");
+    }
+});
+
+MatchController.post("/", needDatabase, requireAuthenticated, async (req, res) => {
     try {
         const userId = req.session.userId;
         const user = await userModel.findById(userId);
@@ -73,11 +87,15 @@ MatchController.post("/", needDatabase, authenticationGuard, async (req, res) =>
             sport: await sportModel.findByName(req.body.sport),
             participants: [user._id]
         });
+        if (!match.sport) {
+            res.status(400).send("Invalid sport name provided.");
+            return;
+        }
         await match.save();
         user.createdMatches.push(match._id);
         user.participatingMatches.push(match._id);
         await user.save();
-        res.status(201).send(match);
+        res.status(201).send({ createdMatch: match });
     } catch (error) {
         console.error(error);
         res.status(500).send("Internal server error.");
@@ -85,110 +103,129 @@ MatchController.post("/", needDatabase, authenticationGuard, async (req, res) =>
     }
 });
 
-MatchController.patch("/:id", needDatabase, authenticationGuard, async (req, res) => {
+MatchController.patch("/:id", needDatabase, requireAuthenticated, async (req, res) => {
-    const match = await matchModel.findById(req.params.id);
+    try {
-    if (!match) {
+        const match = await matchModel.findById(req.params.id);
-        res.status(400).send("Invalid match ID provided.");
+        if (!match) {
-        return;
+            res.status(400).send("Invalid match ID provided.");
-    }
+            return;
+        }
 
-    if (req.user._id !== match.creator && req.user.accessLevel < 3) {
+        if (req.user._id !== match.creator && req.user.accessLevel < 3) {
-        res.status(401).send("Not authorized.");
+            res.status(401).send("Not authorized.");
-        return;
+            return;
-    }
+        }
 
-    if (req.body._id) {
+        if (req.body._id) {
-        res.status(400).send("Cannot change ID of match.");
+            res.status(400).send("Cannot change ID of match.");
-        return;
+            return;
-    }
+        }
 
-    if (req.body.creator) {
+        if (req.body.creator) {
-        res.status(400).send("Cannot change creator of match.");
+            res.status(400).send("Cannot change creator of match.");
-        return;
+            return;
-    }
+        }
+        await match.updateOne(req.body);
+        res.status(200).send({ updatedMatch: match });
 
-    await match.updateOne(req.body);
+    } catch (error) {
-    res.status(200).send(match);
+        res.status(200).send("Internal server error.");
+    }
 });
 
-MatchController.delete("/:id", needDatabase, authenticationGuard, async (req, res) => {
+MatchController.delete("/:id", needDatabase, requireAuthenticated, async (req, res) => {
-    const match = await matchModel.findById(req.params.id);
+    try {
-    if (!match) {
+        const match = await matchModel.findById(req.params.id);
-        res.status(400).send("Invalid match ID provided.");
+        if (!match) {
-        return;
+            res.status(400).send("Invalid match ID provided.");
+            return;
+        }
+        if (req.user._id !== match.creator && req.user.accessLevel < 3) {
+            res.status(401).send("Not authorized.");
+            return;
+        }
+        await match.deleteOne();
+        res.status(200).send("Deleted.");
+    } catch (error) {
+        console.error(error);
+        res.status(500).send("Internal server error");
     }
-
-    if (req.user._id !== match.creator && req.user.accessLevel < 3) {
-        res.status(401).send("Not authorized.");
-        return;
-    }
-    await match.deleteOne();
-    res.status(200).send("Deleted.");
 });
 
 MatchController.get("/:id", needDatabase, async (req, res) => {
-    if (!req.params.id) {
-        res.status(404).send("Id must be provided to retrieve match");
-        return;
-    }
     try {
+        if (!req.params.id) {
+            res.status(404).send("Id must be provided to retrieve match");
+            return;
+        }
         const match = await matchModel.findById(req.params.id).populate("sport");
         if (match) {
-            res.status(200).send(match);
+            res.status(200).send({ match: match });
         } else {
             res.status(404).send("Could not find match with ID: " + req.params.id);
         }
     } catch (error) {
+        console.error(error);
         res.status(500).send("Internal server error.");
-        // TODO: Develop the error handling.
+        // TODO: Improve the error handling.
     }
 });
 
-MatchController.get("/join/:id", needDatabase, authenticationGuard, async (req, res) => {
+MatchController.get("/join/:id", needDatabase, requireAuthenticated, async (req, res) => {
-    const match = await matchModel.findById(req.params.id);
+    try {
-    const user = req.user;
+        const match = await matchModel.findById(req.params.id);
-    if (!match) {
+        const user = req.user;
-        res.status(400).send("Invalid match ID provided.");
+        if (!match) {
-        return;
+            res.status(400).send("Invalid match ID provided.");
+            return;
+        }
+
+        if (user.participatingMatches.includes(match._id)) {
+            res.status(400).send("Already participating in match.");
+            return;
+        }
+
+        match.participants.push(user._id);
+        user.participatingMatches.push(match._id);
+
+        await match.save();
+        await user.save();
+
+        res.status(200).send("Joined.");
+    } catch (error) {
+        console.error(error);
+        res.status(500).send("Internal server error.");
     }
-
-    if (user.participatingMatches.includes(match._id)) {
-        res.status(400).send("Already participating in match.");
-        return;
-    }
-
-    match.participants.push(user._id);
-    user.participatingMatches.push(match._id);
-
-    await match.save();
-    await user.save();
-
-    res.status(200).send("Joined.");
 });
 
-MatchController.get("/leave/:id", needDatabase, authenticationGuard, async (req, res) => {
+MatchController.get("/leave/:id", needDatabase, requireAuthenticated, async (req, res) => {
-    const match = await matchModel.findById(req.params.id);
+    try {
-    const user = req.user;
+        const match = await matchModel.findById(req.params.id);
+        const user = req.user;
 
-    if (!match) {
+        if (!match) {
-        res.status(400).send("Invalid match ID provided.");
+            res.status(400).send("Invalid match ID provided.");
-        return;
+            return;
+        }
+
+        if (!user.participatingMatches.includes(match._id)) {
+            res.status(400).send("Not part of match.");
+            return;
+        }
+
+        const userIndex = match.participants.indexOf(user._id);
+        match.participants.splice(userIndex, 1);
+        await match.save();
+
+        const matchIndex = user.participatingMatches.indexOf(match._id);
+        user.participatingMatches.splice(matchIndex, 1);
+        await user.save();
+
+        res.status(200).send("Left match.");
+    } catch (error) {
+        console.error(error);
+        res.status(500).send("Internal server error.");
     }
-
-    if (!user.participatingMatches.includes(match._id)) {
-        res.status(400).send("Not part of match.");
-        return;
-    }
-
-    const userIndex = match.participants.indexOf(user._id);
-    match.participants.splice(userIndex, 1);
-    await match.save();
-
-    const matchIndex = user.participatingMatches.indexOf(match._id);
-    user.participatingMatches.splice(matchIndex, 1);
-    await user.save();
-
-    res.status(200).send("Left match.");
 });
 
 export default MatchController;

sports-matcher/server/controllers/rentalController.js

@@ -0,0 +1,115 @@
+import express from "express";
+import { requireAuthenticated } from "../middleware/authority.js";
+import { needDatabase } from "../middleware/database.js";
+import rentalModel from "../schemas/rentalModel.js";
+import userModel from "../schemas/userModel.js";
+const rentalController = express.Router();
+
+
+rentalController.post("/", needDatabase, requireAuthenticated, async (req, res) => {
+    try {
+        const user = req.user;
+        req.body.createDate = undefined;
+        req.body.creator = user._id;
+        const rental = new rentalModel(req.body);
+        await rental.save();
+        res.status(201).send({ createdRental: rental });
+    } catch (error) {
+        console.error(error);
+        res.status(500).send("Internal server error.");
+    }
+});
+
+rentalController.get("/:id", needDatabase, async (req, res) => {
+    try {
+        const rental = await rentalModel.findById(req.params.id).populate("creator");
+        res.status(200).send({ rental: rental });
+    } catch (error) {
+        console.error(error);
+        res.status(500).send("Internal server error");
+    }
+});
+
+rentalController.get("/recent/:limit?", needDatabase, async (req, res) => {
+    try {
+        let user = null;
+        if (req.session.userId) {
+            user = await userModel.findById(req.session.userId);
+        }
+        let limit = parseInt(req.params.limit);
+        if (!req.params.limit) limit = 10;
+        if (isNaN(limit)) {
+            res.status(400).send("Limit parameter is not a number.");
+            return;
+        }
+        if (isNaN(limit)) {
+            res.status(400).send("Limit parameter not a number.");
+            return;
+        }
+        if (limit > 50) {
+            res.status(400).send("Limit greater than maximum limit of 50.");
+            return;
+        }
+        let recent = null;
+        if (user) {
+            await user.populate("createdRentals");
+            recent = user.createdRentals.slice(-limit);
+        } else {
+            recent = await rentalModel.find().limit(limit).sort({ createDate: -1 });
+        }
+        await recent.populate("members.$");
+        res.status(200).send({ recent: recent });
+    } catch (error) {
+        console.error(error);
+        res.status(500).send("Internal server error.");
+    }
+});
+
+rentalController.patch("/:id", needDatabase, requireAuthenticated, async (req, res) => {
+    try {
+        const rental = await rentalModel.findById(req.params.id);
+        if (!rental) {
+            res.status(400).send("Invalid rental ID provided.");
+            return;
+        }
+        if (req.body._id) {
+            res.status(400).send("Cannot change ID of rental.");
+            return;
+        }
+        if (req.body.creator) {
+            res.status(400).send("Cannot change creator of rental.");
+            return;
+        }
+        if (req.user._id !== rental.creator && req.user.accessLevel < 3) {
+            res.status(401).send("Not authorized.");
+            return;
+        }
+        await rental.updateOne(req.body);
+        res.status(200).send({ updated: rental });
+    } catch (error) {
+        console.error(error);
+        res.status(500).send("Internal server error.");
+    }
+});
+
+rentalController.delete("/:id", needDatabase, requireAuthenticated, async (req, res) => {
+    try {
+        const rental = await rentalModel.findById(req.params.id);
+        if (!rental) {
+            res.status(400).send("Invalid match ID provided.");
+            return;
+        }
+
+        if (req.user._id !== rental.creator && req.user.accessLevel < 3) {
+            res.status(401).send("Not authorized.");
+            return;
+        }
+        await rental.deleteOne();
+        res.status(200).send("Deleted.");
+    } catch (error) {
+        console.error(error);
+        res.status(500).send("Internal server error");
+    }
+});
+
+export default rentalController;

sports-matcher/server/controllers/sportController.js

@@ -1,12 +1,12 @@
 import express from "express";
-import { authenticationGuard } from "../middleware/authority.js";
+import { requireAuthenticated } from "../middleware/authority.js";
 import { needDatabase } from "../middleware/database.js";
 import sportModel from "../schemas/sportModel.js";
 import userModel from "../schemas/userModel.js";
 
 const SportController = express.Router();
 
-SportController.post("/", needDatabase, authenticationGuard, async (req, res) => {
+SportController.post("/", needDatabase, requireAuthenticated, async (req, res) => {
     const user = await userModel.findById(req.session.userId);
     try {
         if (user.accessLevel <= 2) {

sports-matcher/server/controllers/userController.js

@@ -1,5 +1,5 @@
 import express from "express";
-import { authenticationGuard } from "../middleware/authority.js";
+import { requireAdmin, requireAuthenticated } from "../middleware/authority.js";
 import { needDatabase } from "../middleware/database.js";
 import userModel from "../schemas/userModel.js";
 import User from "../schemas/userModel.js";
@@ -16,7 +16,8 @@ UserController.post("/login", needDatabase, async (req, res) => {
         } else {
             req.session.userId = user._id;
             req.session.email = user.email;
-            res.status(200).send("Authenticated.");
+            user.password = undefined;
+            res.status(200).send(user);
         }
     } catch (error) {
         if (error.name === "TypeError") {
@@ -34,7 +35,7 @@ UserController.post("/login", needDatabase, async (req, res) => {
     }
 });
 
-UserController.get("/logout", authenticationGuard, (req, res) => {
+UserController.get("/logout", requireAuthenticated, (req, res) => {
     req.session.destroy((err) => {
         if (err) {
             console.error(err);
@@ -50,7 +51,7 @@ UserController.get("/logout", authenticationGuard, (req, res) => {
     });
 });
 
-UserController.get("/:id?", needDatabase, authenticationGuard, async (req, res) => {
+UserController.get("/:id?", needDatabase, requireAuthenticated, async (req, res) => {
     let user = null;
     if (req.params.id) {
         if (req.user.accessLevel > 2) {
@@ -66,55 +67,96 @@ UserController.get("/:id?", needDatabase, authenticationGuard, async (req, res)
     res.status(200).send(user);
 });
 
-UserController.patch("/:id?", needDatabase, authenticationGuard, async (req, res) => {
+
-    let user = null;
+UserController.patch("/:id?", needDatabase, requireAuthenticated, async (req, res) => {
-    if (req.params.id) {
+    try {
-        if (req.user.accessLevel > 2) {
+        let user = null;
-            user = await userModel.findById(req.params.id);
+        if (req.params.id) {
+            if (req.user.accessLevel > 2) {
+                user = await userModel.findById(req.params.id);
+            } else {
+                res.status(401).send("Unauthorized.");
+                return;
+            }
         } else {
-            res.status(401).send("Unauthorized.");
+            user = req.user;
+        }
+        if (req.body._id) {
+            res.status(400).send("Cannot change user ID.");
             return;
         }
-    } else {
-        user = req.user;
-    }
-    if (req.body._id) {
-        res.status(400).send("Cannot change user ID.");
-        return;
-    }
 
-    if (req.body.createdMatches) {
+        if (req.body.createdMatches) {
-        res.status(400).send("Cannot directly change the list of created matches.");
+            res.status(400).send("Cannot directly change the list of created matches.");
-        return;
+            return;
-    }
+        }
 
-    if (req.body.password) {
+        if (req.body.password) {
-        res.status(400).send("Cannot directly change user password.");
+            res.status(400).send("Cannot directly change user password.");
-        return;
+            return;
-    }
+        }
 
-    if (req.body.participatingMatches) {
+        if (req.body.participatingMatches) {
-        res.status(400).send("Cannot directly change the list of participating matches.");
+            res.status(400).send("Cannot directly change the list of participating matches.");
-        return;
+            return;
-    }
+        }
 
-    if (req.body.joinDate) {
+        if (req.body.joinDate) {
-        res.status(400).send("Cannot change the join date.");
+            res.status(400).send("Cannot change the join date.");
-        return;
+            return;
-    }
+        }
 
-    if (req.body.accessLevel && req.user.accessLevel < 3) {
+        if (req.body.accessLevel && req.user.accessLevel < 3) {
-        res.status(401).send("Unauthorized to change the access level of this user.");
+            res.status(401).send("Unauthorized to change the access level of this user.");
-        return;
+            return;
-    }
+        }
 
-    await user.updateOne(req.body);
+        if (req.body.suspend && req.user.accessLevel < 3) {
-    res.status(200).send("Updated.");
+            res.status(401).send("Unauthorized to change the accounts disabled date. ");
+            return;
+        }
+
+        await user.updateOne(req.body);
+        res.status(200).send("Updated.");
+    } catch (error) {
+        console.error(error);
+        res.status(500).send("Internal server error");
+    }
+});
+
+UserController.get("/all", requireAdmin, async (req, res) => {
+    try {
+        let all = await userModel.find();
+        res.status(200).send({ all: all });
+    } catch (error) {
+        console.error(error);
+        res.status(500).send("Internal server error");
+    }
+});
+
+UserController.get("/all/active", requireAdmin, async (req, res) => {
+    try {
+        let active = await userModel.find().where("suspend").lt(Date.now());
+        res.status(200).send({ active: active });
+    } catch (error) {
+        console.error(error);
+        res.status(500).send("Internal server error");
+    }
+});
+
+UserController.get("/all/suspended", requireAuthenticated, async (req, res) => {
+    try {
+        let suspended = await userModel.find().where("suspend").gte(Date.now());
+        res.status(200).send({ suspended: suspended });
+    } catch (error) {
+        console.error(error);
+        res.status(500).send("Internal server error");
+    }
 });
 
 /* TODO: Implement middleware for removing users.
 
-UserController.delete("/:id?", needDatabase, authenticationGuard, async (req, res) => {
+UserController.delete("/:id?", needDatabase, requireAuthenticated, async (req, res) => {
     let user = null;
     if (req.params.id) {
         if (req.user.accessLevel > 2) {
@@ -135,13 +177,15 @@ UserController.delete("/:id?", needDatabase, authenticationGuard, async (req, re
 
 UserController.post("/", needDatabase, async (req, res) => {
     try {
-        let createdUser = new User({
+        const data = {
             email: req.body.email,
             firstName: req.body.firstName,
             lastName: req.body.lastName,
             phone: req.body.phone,
             password: req.body.password,
-        });
+        };
+
+        let createdUser = new User(data);
         await createdUser.save();
         res.sendStatus(201);
         return;

sports-matcher/server/middleware/authority.js

@@ -2,6 +2,7 @@ import MongoStore from "connect-mongo";
 import session from "express-session";
 import { mongooseDbName, mongoURI } from "../database/mongoose.js";
 import userModel from "../schemas/userModel.js";
+import { checkDatabaseConnection } from "./database.js";
 const sessionConf = {
     secret: process.env.SESSION_SECRET || "super duper secret string.",
     cookie: {
@@ -13,11 +14,16 @@ const sessionConf = {
 };
 if (process.env.NODE_ENV === "production") {
     sessionConf.cookie.secure = true;
+    sessionConf.proxy = true;
     sessionConf.store = MongoStore.create({ mongoUrl: mongoURI, dbName: mongooseDbName });
 }
 export const userSession = session(sessionConf);
 
-export async function authenticationGuard(req, res, next) {
+export async function requireAuthenticated(req, res, next) {
+    if (!checkDatabaseConnection()) {
+        req.status(500).send("Internal server error.");
+        return;
+    }
     if (req.session.userId) {
         req.user = await userModel.findById(req.session.userId);
         next();
@@ -27,6 +33,21 @@ export async function authenticationGuard(req, res, next) {
     }
 }
 
-// TODO: Authentication
+
-// TODO: Identity
+export async function requireAdmin(req, res, next) {
-// TODO: Authority
+    if (!checkDatabaseConnection()) {
+        req.status(500).send("Internal server error.");
+        return;
+    }
+    if (req.session.userId) {
+        req.user = await userModel.findById(req.session.userId);
+        if (req.user.accessLevel < 3) {
+            res.status(401).send("Not authorized");
+            return;
+        }
+        next();
+    } else {
+        res.status(401).send("Not authorized.");
+        return;
+    }
+}

sports-matcher/server/middleware/database.js

@@ -1,9 +1,13 @@
 import mongoose from "mongoose";
 
-export function needDatabase(res, req, next) {
+export function needDatabase(req, res, next) {
-    if (mongoose.connection.readyState != 1) {
+    if (!checkDatabaseConnection()) {
         res.status(500).send("Internal server error: Database connection faulty.");
     } else {
         next();
     }
 }
+
+export function checkDatabaseConnection() {
+    return mongoose.connection.readyState == 1;
+}

sports-matcher/server/package.json

@@ -7,7 +7,7 @@
   "main": "server.js",
   "scripts": {
     "develop": "NODE_ENV=development nodemon server.js",
-    "start": "NODE_ENV=production node server.js",
+    "start": "NODE_ENV=production MONGODB_URI='mongodb+srv://sports-matcher:PFebEO0btV91HjwF@cluster0.bow9f.mongodb.net/myFirstDatabase?retryWrites=true&w=majority' node server.js",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "",

sports-matcher/server/schemas/matchModel.js

@@ -21,7 +21,7 @@ const matchSchema = new mongoose.Schema({
     participants: { type: [{ type: Types.ObjectId, ref: ModelNameRegister.User }], required: true, default: [] },
     difficulty: { type: Number, required: true },
     sport: { type: Types.ObjectId, ref: ModelNameRegister.Sport },
-    createDate: { type: Date, required: true, default: Date.now }
+    createDate: { type: Date, required: true, default: Date.now() }
 });
 
 matchSchema.pre("remove", function (next) {

sports-matcher/server/schemas/modelNameRegister.js

@@ -1,5 +1,6 @@
 export default {
     Match: "match",
     User: "user",
-    Sport: "sport"
+    Sport: "sport",
+    Rental: "rental",
 };

sports-matcher/server/schemas/rentalModel.js

@@ -0,0 +1,23 @@
+import mongoose from "mongoose";
+import modelNameRegister from "./modelNameRegister.js";
+
+const Types = mongoose.Schema.Types;
+
+const rentalSchema = new mongoose.Schema({
+    title: { type: String, required: true, trim: true },
+    rate: { type: String, required: true, trim: true },
+    description: { type: String, required: true },
+    contact: { type: String, required: true },
+    createDate: { type: Date, required: true, default: Date.now() },
+    creator: { type: Types.ObjectId, ref: modelNameRegister.User }
+});
+
+rentalSchema.pre("remove", async function (next) {
+    const rental = this;
+    const rentalInd = rental.creator.createdRentals.indexOf(rental._id);
+    rental.creator.createdRentals.splice(rentalInd, 1);
+    await rental.save();
+    next();
+});
+
+export default mongoose.model(modelNameRegister.Rental, rentalSchema);

sports-matcher/server/schemas/userModel.js

@@ -19,7 +19,7 @@ const userSchema = new mongoose.Schema({
     },
     firstName: { type: String, required: true, trim: true },
     lastName: { type: String, required: true, trim: true },
-    joinDate: { type: Date, default: Date.now, required: true },
+    joinDate: { type: Date, default: Date.now(), required: true },
     phone: { type: Number, required: false, min: 0 },
     password: {
         type: String,
@@ -29,12 +29,14 @@ const userSchema = new mongoose.Schema({
     },
     createdMatches: { type: [{ type: Types.ObjectId, ref: modelNameRegister.Match }], required: true, default: [] },
     participatingMatches: { type: [{ type: Types.ObjectId, ref: modelNameRegister.Match }], required: true, default: [] },
+    createdRentals: { type: [{ type: Types.ObjectId, ref: modelNameRegister.Rental }], required: true, default: [] },
     emailPublicity: { type: Number, required: true, default: 0 },
     bioPublicity: { type: Boolean, required: true, default: false },
     phonePublicity: { type: Boolean, required: true, default: false },
     participatingMatchesPublicity: { type: Boolean, required: true, default: false },
     friends: { type: Types.ObjectId, ref: modelNameRegister.User },
     accessLevel: { type: Number, required: true, default: 0 },
+    suspend: { type: Date, required: true, default: Date.now() } // suspend the user until the when the user was created.
 });
 
 userSchema.statics.credentialsExist = async function (email, password) {

sports-matcher/server/server.js

@@ -7,6 +7,7 @@ import SportController from "./controllers/sportController.js";
 import { userSession } from "./middleware/authority.js";
 import { mongooseDbName, mongoURI } from "./database/mongoose.js";
 import cors from "cors";
+import rentalController from "./controllers/rentalController.js";
 
 const server = express();
 const port = process.env.PORT || 5000;
@@ -26,9 +27,9 @@ try {
 
 
 if (process.env.NODE_ENV === "development") {
+    console.log("We are running in development mode.");
     mongoose.set("bufferCommands", false); // We want to know if there are connection issues immediately for development. Disables globally.
-
+    server.use(cors({ credentials: true, origin: "http://localhost:3000" }));
-    server.use(cors());
 }
 
 // Docs: https://www.npmjs.com/package/body-parser
@@ -37,10 +38,10 @@ server.use(bodyParser.urlencoded({ extended: true }));
 
 server.use(userSession);
 
-server.use("/user", UserController);
+server.use("/api/user", UserController);
-server.use("/match", MatchController);
+server.use("/api/match", MatchController);
-server.use("/sport", SportController);
+server.use("/api/sport", SportController);
-
+server.use("/api/rental", rentalController);
 
 server.listen(port, () => {
     console.log(`Server listening on port ${port}.`);