comment

sports-matcher/client/.eslintrc.json

@@ -35,6 +35,7 @@
         "semi": [
             "error",
             "always"
-        ]
+        ],
+        "no-unused-vars": "warn"
     }
 }

sports-matcher/client/src/Layout.js

@@ -8,6 +8,7 @@ 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 Admin from "./pages/NewAdmin";
 import Login from "./pages/Login";
 import { apiClient } from "./utils/httpClients";
 import { globalContext } from "./context.js";
@@ -80,6 +81,7 @@ export default function layout() {
                         <Route path="/" element={<Welcome />} />
                         <Route path="/dashboard" element={<Dashboard />} />
                         <Route path="/login" element={<Login />} />
+                        <Route path="/admin" element={<Admin />} />
                     </Routes>
                 </main>
                 <footer>

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/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">{this.props.sport.minPlayers.toString()}</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/pages/Dashboard.js

@@ -3,7 +3,10 @@ import { Button, InputGroup, FormControl } from "react-bootstrap";
 import "../styles/Dashboard.css";
 import { apiClient } from "../utils/httpClients.js";
 import MatchInfoCardDisplay from "../components/MatchInfoCardDisplay";
-import { needUser } from "../utils/routing.js";
+import SportInfoCardDisplay from "../components/SportInfoCardDisplay";
+import { globalContext } from "../context";
+import { needUser } from "../utils/routing";
+
 export default class Dashboard extends React.Component {
     constructor(props) {
         super(props);
@@ -13,11 +16,14 @@ export default class Dashboard extends React.Component {
             displayedEquipment: [],
             user: null
         };
-        this.getFirstName();
     }
+
+    static contextType = globalContext;
+
     async componentDidMount() {
-        this.setState({ user: await needUser() }); // needUser says this page needs a user, and therefore, if there isn't a user, get them to login first. It returns the authenticated user.
+        await needUser(this.context.navigate);
-        this.setState({ displayedMatches: await this.latestMatches() });
+        await this.latestMatches();
+        await this.availableSports();
     }
     async latestMatches() {
         let recentMatchesRes = await apiClient.get("/match/recent/15");
@@ -26,26 +32,13 @@ export default class Dashboard extends React.Component {
         }
     }
 
-    async availableMatches() {
+    async availableSports() {
-        let availableMatchesRes = await apiClient.get("/sports");
+        let availableSportsRes = await apiClient.get("/sport");
-        if (availableMatchesRes.status === 200) {
+        if (availableSportsRes.status === 200) {
-            this.setState({ displayedSports: availableMatchesRes.data.recent });
+            this.setState({ displayedSports: availableSportsRes.data });
         }
     }
 
-    async availableEquipment() {
-        let availableEquipmentRes = await apiClient.get("/rentals");
-        if (availableEquipmentRes.status === 200) {
-            this.setState({ displayedEquipment: availableEquipmentRes.data.recent });
-        }
-    }
-
-    async getFirstName() {
-        // let result = await apiClient.post("/user/login", {"email": "johndoe@gmail.com", "password": "csc309h1"}).then(apiClient.get("/user"));
-        let user = await apiClient.get("/user");
-        let tags = document.getElementsByTagName("h1");
-        tags[0].innerHTML = user.firstName;
-    }
     render() {
         return (
             <React.Fragment>
@@ -66,12 +59,10 @@ export default class Dashboard extends React.Component {
                 </div>
                 <div className="p-4">
                     <h2>Available Sports</h2>
-                    <MatchInfoCardDisplay recommendedmatches={this.state.displayedSports} />
+                    <SportInfoCardDisplay recommendedsports={this.state.displayedSports} />
-                </div>
-                <div className="p-4">
-                    <h2>Available Equipment</h2>
-                    <MatchInfoCardDisplay recommendedmatches={this.state.displayedEquipment} />
                 </div>
+
+
             </React.Fragment>
         );
     }

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

@@ -1,5 +1,5 @@
 import React from "react";
-import { Button, Card, Container, Form } from "react-bootstrap";
+import { Alert, Button, Card, Container, Form } from "react-bootstrap";
 import { globalContext } from "../context";
 import { apiClient } from "../utils/httpClients";
 import { guard } from "../utils/routing";
@@ -9,7 +9,8 @@ export default class Login extends React.Component {
         super(props);
         this.state = {
             email: "",
-            password: ""
+            password: "",
+            errorDisplayed: false,
         };
 
         this.attemptLogin = this.attemptLogin.bind(this);
@@ -33,18 +34,36 @@ 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 });
+        } 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">
-                <Container style={{ maxWidth: "30rem" }}>
+                {errorMsg}
+                <Container style={{ maxWidth: "35rem" }}>
                     <Card>
                         <Card.Body>
                             <Card.Title>Login</Card.Title>

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

@@ -0,0 +1,219 @@
+import React from "react";
+import { Button, Table } from "react-bootstrap";
+import "../styles/Admin.css";
+import { globalContext } from "../context";
+import { needUser } from "../utils/routing";
+//import Button from "@mui/material/Button";
+// import Typography from "@mui/material/Typography";
+// import Container from "@mui/material/Container";
+// import { TableContainer, TableCell, Table, TableBody, TableRow, TableHead, Paper } from "@mui/material";
+// import { apiClient } from "../utils/httpClients.js";
+// import MatchInfoCardDisplay from "../components/MatchInfoCardDisplay";
+// import { needUser } from "../utils/routing.js";
+export default class Admin extends React.Component {
+    constructor(props) {
+        super(props);
+
+
+
+        this.state = {
+            users: [
+                { id: 1, username: "username1", name: "name1", email: "user1@email.com", phone: "123-456-7890" },
+                { id: 2, username: "username2", name: "name2", email: "user2@email.com", phone: "123-456-7890" },
+                { id: 3, username: "username3", name: "name3", email: "user3@email.com", phone: "123-456-7890" },
+                { id: 4, username: "username4", name: "name4", email: "user4@email.com", phone: "123-456-7890" }
+            ],
+            suspendedUsers: [
+                { id: 1, username: "suspended1", name: "s1", email: "s1@email.com", phone: "123-456-7890" },
+                { id: 2, username: "suspended2", name: "s2", email: "s2@email.com", phone: "123-456-7890" },
+                { id: 3, username: "suspended3", name: "s3", email: "s3@email.com", phone: "123-456-7890" },
+                { id: 4, username: "suspended4", name: "s4", email: "s4@email.com", phone: "123-456-7890" }
+            ],
+            matches: [
+                { id: 1, sport: "Tennis", date: "08/08/2021", location: "toronto", description: "Tennis match" },
+                { id: 2, sport: "Basketball", date: "09/09/2021", location: "toronto", description: "Basketball match" }
+            ],
+            buttonColors: ["black", "", ""],
+            user: null
+        };
+
+
+    }
+
+    static contextType = globalContext;
+
+    async componentDidMount() {
+        await needUser(this.context.navigate);
+    }
+
+    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>Description</th>
+                    <th></th>
+                    <th></th>
+                </tr>
+            </thead>
+        );
+    }
+
+
+    userTableData() {
+        return this.state.users.map((user) => {
+            const { id, username, name, email, phone } = user;
+            return (
+                <tr key={id}>
+                    <td>{id}</td>
+                    <td>{username}</td>
+                    <td>{name}</td>
+                    <td>{email}</td>
+                    <td>{phone}</td>
+                    <td>{this.DeleteButton()}</td>
+                    <td>{this.EditButton()}</td>
+                </tr>
+            );
+        });
+    }
+
+    susUserTableData() {
+        return this.state.suspendedUsers.map((user) => {
+            const { id, username, name, email, phone } = user;
+            return (
+                <tr key={id}>
+                    <td>{id}</td>
+                    <td>{username}</td>
+                    <td>{name}</td>
+                    <td>{email}</td>
+                    <td>{phone}</td>
+                    <td>{this.DeleteButton()}</td>
+                    <td>{this.EditButton()}</td>
+                    <td>{this.PardonButton()}</td>
+                </tr>
+            );
+        });
+    }
+
+
+    matchTableData() {
+        return this.state.matches.map((match) => {
+            const { id, sport, date, location, description } = match;
+            return (
+                <tr key={id}>
+                    <td>{id}</td>
+                    <td>{sport}</td>
+                    <td>{date}</td>
+                    <td>{location}</td>
+                    <td>{description}</td>
+                    <td>{this.DeleteButton()}</td>
+                    <td>{this.EditButton()}</td>
+                    <td>{this.PardonButton()}</td>
+                </tr>
+            );
+        });
+    }
+
+    selectTable() {
+        this.setState({ buttonColors: ["", "", ""] });
+    }
+
+    renderTableHead() {
+        if (this.state.buttonColors[0] === "black") {
+            return this.matchTableHead();
+        } else if (this.state.buttonColors[1] === "black") {
+            return this.userTableHead();
+        } else {
+            return this.userTableHead();
+        }
+    }
+
+    renderTableData() {
+        if (this.state.buttonColors[0] === "black") {
+            return this.matchTableData();
+        } else if (this.state.buttonColors[1] === "black") {
+            return this.userTableData();
+        } else {
+            return this.susUserTableData();
+        }
+
+    }
+
+
+
+    render() {
+        return (
+            <React.Fragment>
+
+                <div className='center'>
+                    <h1 id='title'>Administration</h1>
+                    <Button onClick={() => {
+                        this.setState({ buttonColors: ["black", "", ""] });
+                    }} sx={{
+                        margin: 3,
+                        backgroundColor: this.state.buttonColors[0],
+                    }} variant="outline-secondary">Matches</Button>
+                    <Button onClick={() => {
+                        this.setState({ buttonColors: ["", "black", ""] });
+                    }} sx={{
+                        margin: 3,
+                        backgroundColor: this.state.buttonColors[1],
+                    }} variant="outline-secondary">Users</Button>
+                    <Button onClick={() => {
+                        this.setState({ buttonColors: ["", "", "black"] });
+                    }} sx={{
+                        margin: 3,
+                        backgroundColor: this.state.buttonColors[2],
+                    }} variant="outline-secondary">Suspended Users</Button></div>
+                <Table striped bordered hover>
+                    {this.renderTableHead()}
+                    <tbody>
+                        {this.renderTableData()}
+                        {/* {this.matchUserTableData()} */}
+                    </tbody>
+                </Table>
+
+            </React.Fragment>
+        );
+    }
+}

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

@@ -0,0 +1,88 @@
+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/styles/Admin.css

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

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,9 +1,10 @@
 import axios from "axios";
 
-const apiClientConf = {
+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"
+    withCredentials: process.env.NODE_ENV === "development",
-};
+    validateStatus: function (status) {
-console.log(apiClientConf);
+        return status === 401 || status == 200;
-export const apiClient = axios.create(apiClientConf);
+    }
+});

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"
     }
 }