Merge pull request #10 from csc309-winter-2022/develop

Develop

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,6 +13,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"
   },
   "scripts": {

sports-matcher/client/src/Layout.js

@@ -1,6 +1,6 @@
 import "./styles/Layout.css";
 import "./styles/extra.css";
-import { useEffect, useState } from "react";
+import { useState } from "react";
 import { NavLink, Route, Routes, useNavigate } from "react-router-dom";
 import Welcome from "./pages/Welcome";
 import Navbar from "react-bootstrap/Navbar";
@@ -8,31 +8,22 @@ import { Container, Nav, NavbarBrand } from "react-bootstrap";
 import NavbarToggle from "react-bootstrap/esm/NavbarToggle";
 import NavbarCollapse from "react-bootstrap/esm/NavbarCollapse";
 import Dashboard from "./pages/Dashboard";
+import Logout from "./pages/Logout";
+import Rentals from "./pages/Rentals";
+import Admin from "./pages/Administration";
 import Login from "./pages/Login";
-import { apiClient } from "./utils/httpClients";
+import Context from "./globals.js";
-import { globalContext } from "./context.js";
+import Signup from "./pages/Signup";
 
 
 export default function layout() {
-    const navigate = useNavigate();
+    const [globals, setGlobals] = useState({
-    const [state, setState] = useState({
         user: null,
+        update: (updates, onUpdate) => setGlobals((state) => { return { ...state, ...updates }; }, onUpdate),
+        navigate: useNavigate()
     });
 
-    useEffect(async () => {
+    let identityDisplay = (
-        await updateAuthStatus();
-    });
-
-    async function updateAuthStatus() {
-        const getUserResponse = await apiClient.get("/user");
-        if (getUserResponse !== 200) {
-            setState({ user: null });
-        } else {
-            setState({ user: getUserResponse.data });
-        }
-    }
-
-    let indentityDisplay = (
         <Nav>
             <li className="nav-item">
                 <NavLink className="nav-link" to="/login" >Login</NavLink>
@@ -43,11 +34,11 @@ export default function layout() {
         </Nav>
     );
 
-    if (state.user) {
+    if (globals.user) {
-        indentityDisplay = (
+        identityDisplay = (
             <Nav>
                 <li className="nav-item">
-                    <NavLink className="nav-link" to="/" >Hi, {this.state.user.firstName}</NavLink>
+                    <NavLink className="nav-link" to="/" >Hi, {globals.user.firstName}</NavLink>
                 </li>
                 <li className="nav-item">
                     <NavLink className="nav-link" to="/logout" >Logout</NavLink>
@@ -58,7 +49,7 @@ export default function layout() {
 
     return (
         <div id="app">
-            <globalContext.Provider value={{ navigate: navigate }}>
+            <Context.Provider value={globals}>
                 <header>
                     <Navbar bg="light" expand="md">
                         <Container>
@@ -70,7 +61,7 @@ export default function layout() {
                                         <NavLink className="nav-link" to="/" >Home</NavLink>
                                     </li>
                                 </Nav>
-                                {indentityDisplay}
+                                {identityDisplay}
                             </NavbarCollapse>
                         </Container>
                     </Navbar>
@@ -80,12 +71,16 @@ export default function layout() {
                         <Route path="/" element={<Welcome />} />
                         <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>
-            </globalContext.Provider>
+            </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/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

@@ -11,7 +11,7 @@ export default class SportInfoCard extends React.Component {
             <Card style={{ width: "20rem" }}>
                 <Card.Body>
                     <Card.Title>{this.props.sport.name}</Card.Title>
-                    <Card.Subtitle className="mb-2 text-muted">{this.props.sport.minPlayers.toString()}</Card.Subtitle>
+                    <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>

sports-matcher/client/src/context.js

@@ -1,3 +0,0 @@
-import React from "react";
-
-export const globalContext = React.createContext({});

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

@@ -4,8 +4,8 @@ import "../styles/Dashboard.css";
 import { apiClient } from "../utils/httpClients.js";
 import MatchInfoCardDisplay from "../components/MatchInfoCardDisplay";
 import SportInfoCardDisplay from "../components/SportInfoCardDisplay";
-import { globalContext } from "../context";
+import AuthenticationGuard from "../components/AuthenticationGuard";
-import { needUser } from "../utils/routing";
+import globals from "../globals";
 
 export default class Dashboard extends React.Component {
     constructor(props) {
@@ -18,15 +18,15 @@ export default class Dashboard extends React.Component {
         };
     }
 
-    static contextType = globalContext;
+    static contextType = globals;
 
     async componentDidMount() {
-        await needUser(this.context.navigate);
+        this.setState({ user: this.context.user });
         await this.latestMatches();
         await this.availableSports();
     }
     async latestMatches() {
-        let recentMatchesRes = await apiClient.get("/match/recent/15");
+        let recentMatchesRes = await apiClient.get("/match/recent/user/15");
         if (recentMatchesRes.status === 200) {
             this.setState({ displayedMatches: recentMatchesRes.data.recent });
         }
@@ -41,6 +41,8 @@ export default class Dashboard extends React.Component {
 
     render() {
         return (
+            <AuthenticationGuard>
+                <div className="page-root">
                     <React.Fragment>
                         <h1></h1>
                         <InputGroup className="w-50">
@@ -61,9 +63,9 @@ export default class Dashboard extends React.Component {
                             <h2>Available Sports</h2>
                             <SportInfoCardDisplay recommendedsports={this.state.displayedSports} />
                         </div>
-
-
                     </React.Fragment>
+                </div>
+            </AuthenticationGuard>
         );
     }
 }

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

@@ -1,8 +1,7 @@
 import React from "react";
 import { Alert, Button, Card, Container, Form } from "react-bootstrap";
-import { globalContext } from "../context";
+import globals from "../globals";
 import { apiClient } from "../utils/httpClients";
-import { guard } from "../utils/routing";
 
 export default class Login extends React.Component {
     constructor(props) {
@@ -16,16 +15,14 @@ export default class Login extends React.Component {
         this.attemptLogin = this.attemptLogin.bind(this);
     }
 
-    static contextType = globalContext;
+    static contextType = globals;
 
     async componentDidMount() {
-        try {
-            const getUserResponse = await apiClient.get("/user");
-            guard(this.context.navigate, () => getUserResponse.status === 401, "/dashboard"); // If it's not 401, then we redirect to dashboard.
-        } catch (error) {
-            if (error.message !== "Request failed with status code 401") {
-                throw error;
     }
+
+    componentDidUpdate() {
+        if (this.context.user) {
+            this.context.navigate("/dashboard");
         }
     }
 
@@ -34,13 +31,9 @@ export default class Login extends React.Component {
         const loginResponse = await apiClient.post("/user/login", {
             email: this.state.email,
             password: this.state.password,
-        }, {
-            validateStatus: function (status) {
-                return status === 200 || status === 401 || status === 400;
-            }
         });
         if (loginResponse.status === 200) {
-            this.context.navigate("/dashboard", { replace: true });
+            this.context.update({ user: loginResponse.data });
         } else if (loginResponse.status === 401) {
             this.setState({ errorDisplayed: true });
         }

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

@@ -1,5 +1,5 @@
 import React from "react";
-import { useNavigate } from "react-router-dom";
+import globals from "../globals";
 import { apiClient } from "../utils/httpClients";
 
 export default class Logout extends React.Component {
@@ -7,19 +7,22 @@ export default class Logout extends React.Component {
         super(props);
     }
 
+    static contextType = globals;
+
     async componentDidMount() {
         const logoutResponse = await apiClient.get("/user/logout");
-        let navigation = useNavigate();
+        if (logoutResponse.status === 200) {
-        if (logoutResponse.status === 401) {
-            navigation("/dashboard", { replace: true });
-        } else {
             this.redirectTimer = setTimeout(() => {
-                navigation("/", { replace: true });
+                this.context.navigate("/", { replace: true });
             }, 2000);
-        }
+        } else if (logoutResponse.status == 401) {
+            this.context.navigate("/", { replace: true });
         }
 
-    async componentWillUnmount() {
+        this.context.update({ user: null });
+    }
+
+    componentWillUnmount() {
         clearTimeout(this.redirectTimer);
     }
 

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

@@ -1,88 +0,0 @@
-import React from "react";
-import { Button, Card, Form } from "react-bootstrap";
-import { apiClient } from "../utils/httpClients";
-import { guard } from "../utils/routing";
-
-export default class Signup extends React.Component {
-    constructor(props) {
-        super(props);
-        this.state = {
-            user: null,
-            alertShow: false,
-            alertKey: null,
-            alertMsg: null
-        }
-        this.state.user = {
-            email: null,
-            firstName: null,
-            lastName: null,
-            phone: null,
-            password: null
-        }
-    }
-
-    async registerUser() {
-        const res = await apiClient.post("/user", this.state);
-        if (res.status === 200) {
-            this.warnUser("You are successfully signed up!", "success")
-        } else if (res === 409) {
-            this.warnUser("This user already exists. Try logging in instead.", "danger")
-        } else if (res === 400) {
-            this.warnUser("Missing required fields.", "danger")
-        } else {
-            this.warnUser("Internal server error. Please try again later.", "danger")
-        }
-    }
-
-    setUserState(event) {
-        newUser = this.state.user;
-        newUser[event.target.controlId] = event.target.value
-        this.setState({user: newUser})
-    }
-
-    warnUser(msg, key) {
-        this.setState({alertMsg: msg})
-        this.setState({show: true})
-    }
-
-    render() {
-        return (
-            <div className="page-root">
-                <Alert show={this.state.alertShow} variant={this.state.alertKey}>
-                    <Alert.Heading>{this.state.alertMsg}</Alert.Heading>
-                </Alert>
-                <Card>
-                    <Card.Body>
-                        <Card.Title>Login</Card.Title>
-                        <Card.Subtitle>Welcome to Sports Matcher!</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}/>
-                            </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}/>
-                            </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}/>
-                            </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}/>
-                            </Form.Group>
-                            <Button variant="primary" type="submit">
-                                Login
-                            </Button>
-                        </Form>
-                    </Card.Body>
-                </Card>
-            </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/utils/httpClients.js

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

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

@@ -1,22 +0,0 @@
-import { apiClient } from "./httpClients";
-
-export function guard(navigator, evaluator, redirect, navigateOptions, onRedirect) {
-    if (!evaluator) throw new Error("evaluator required.");
-    if (!redirect) throw new Error("redirect required.");
-    if (!navigateOptions) {
-        navigateOptions = {
-            replace: true
-        };
-    }
-    let redirecting = !evaluator();
-    if (redirecting) {
-        if (onRedirect) onRedirect();
-        navigator(redirect, navigateOptions);
-    }
-}
-
-export async function needUser(navigator) {
-    let userDataResponse = await apiClient.get("/user");
-    guard(navigator, () => userDataResponse.status === 200, "/login");
-    return userDataResponse.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 { requireAuthenticated } 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";
@@ -27,17 +27,8 @@ MatchController.get("/search/:sport", needDatabase, async (req, res) => {
 
 MatchController.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)) {
-            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;
@@ -46,18 +37,39 @@ MatchController.get("/recent/:limit?", needDatabase, async (req, res) => {
             res.status(400).send("Limit greater than maximum limit of 50.");
             return;
         }
-        let recent = null;
+        let recent = matchModel.find().where("publicity").gte(2);
-        if (user) {
-            recent = matchModel.find({ creator: user._id });
-        } else {
-            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 (error) {
         console.error(error);
         res.status(500).send("Internal server error.");
-        // TODO: Check and improve error handling.
+    }
+});
+
+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.");
     }
 });
 

sports-matcher/server/controllers/rentalController.js

@@ -39,7 +39,6 @@ rentalController.get("/recent/:limit?", needDatabase, async (req, res) => {
         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;
         }

sports-matcher/server/controllers/userController.js

@@ -1,5 +1,5 @@
 import express from "express";
-import { requireAuthenticated } 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") {
@@ -66,7 +67,9 @@ UserController.get("/:id?", needDatabase, requireAuthenticated, async (req, res)
     res.status(200).send(user);
 });
 
+
 UserController.patch("/:id?", needDatabase, requireAuthenticated, async (req, res) => {
+    try {
         let user = null;
         if (req.params.id) {
             if (req.user.accessLevel > 2) {
@@ -108,8 +111,47 @@ UserController.patch("/:id?", needDatabase, requireAuthenticated, async (req, re
             return;
         }
 
+        if (req.body.suspend && req.user.accessLevel < 3) {
+            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.
@@ -135,13 +177,15 @@ UserController.delete("/:id?", needDatabase, requireAuthenticated, async (req, r
 
 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: {
@@ -18,6 +19,10 @@ if (process.env.NODE_ENV === "production") {
 export const userSession = session(sessionConf);
 
 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();
@@ -26,3 +31,22 @@ export async function requireAuthenticated(req, res, next) {
         return;
     }
 }
+
+
+export async function requireAdmin(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);
+        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/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/rentalModel.js

@@ -8,7 +8,7 @@ const rentalSchema = new mongoose.Schema({
     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 },
+    createDate: { type: Date, required: true, default: Date.now() },
     creator: { type: Types.ObjectId, ref: modelNameRegister.User }
 });
 

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,
@@ -36,6 +36,7 @@ const userSchema = new mongoose.Schema({
     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) {