From 8a7fbd074b6215ec21d5841a58727de5620bd5e5 Mon Sep 17 00:00:00 2001
From: Harrison Deng <yunyangdeng@gmail.com>
Date: Tue, 5 Apr 2022 14:52:19 -0500
Subject: [PATCH] Began integrating dashboard.

Also fixed match controller populate calls.
---
 sports-matcher/client/src/Layout.js           |  7 +++-
 sports-matcher/client/src/pages/Dashboard.js  | 18 +++++----
 sports-matcher/client/src/pages/Login.js      | 40 ++++++++++---------
 sports-matcher/scripts/start_mongo.sh         |  2 +-
 .../server/controllers/matchController.js     |  6 +--
 5 files changed, 40 insertions(+), 33 deletions(-)

diff --git a/sports-matcher/client/src/Layout.js b/sports-matcher/client/src/Layout.js
index 5e7bd08..1c546ac 100644
--- a/sports-matcher/client/src/Layout.js
+++ b/sports-matcher/client/src/Layout.js
@@ -8,6 +8,8 @@ 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 Login from "./pages/Login";
+
 export default class Layout extends React.Component {
     render() {
         return (
@@ -29,8 +31,9 @@ export default class Layout extends React.Component {
                 </header>
                 <main>
                     <Routes>
-                        <Route path="/" element={<Welcome></Welcome>} />
-                        <Route path="/Dashboard" element={<Dashboard></Dashboard>} />
+                        <Route path="/" element={<Welcome />} />
+                        <Route path="/dashboard" element={<Dashboard />} />
+                        <Route path="/login" element={<Login />} />
                     </Routes>
                 </main>
                 <footer>
diff --git a/sports-matcher/client/src/pages/Dashboard.js b/sports-matcher/client/src/pages/Dashboard.js
index 1795892..0d6b3a6 100644
--- a/sports-matcher/client/src/pages/Dashboard.js
+++ b/sports-matcher/client/src/pages/Dashboard.js
@@ -1,21 +1,23 @@
 import React from "react";
 import { Button, InputGroup, FormControl } from "react-bootstrap";
 import "../styles/Dashboard.css";
-import { apiClient } from "../utils/httpClients";
+import { apiClient } from "../utils/httpClients.js";
 import MatchInfoCardDisplay from "../components/MatchInfoCardDisplay";
-export default class Dashboard extends React.Component{
+import { needUser } from "../utils/routing.js";
+export default class Dashboard extends React.Component {
     constructor(props) {
         super(props);
         this.state = {
             displayedMatches: [],
             displayedSports: [],
-            displayedEquipment: []
+            displayedEquipment: [],
+            user: null
         };
         this.getFirstName();
     }
     async componentDidMount() {
-        await this.latestMatches();
-
+        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.
+        this.setState({ displayedMatches: await this.latestMatches() });
     }
     async latestMatches() {
         let recentMatchesRes = await apiClient.get("/match/recent/15");
@@ -38,14 +40,14 @@ export default class Dashboard extends React.Component{
         }
     }
 
-    async getFirstName(){
+    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(
+        return (
             <React.Fragment>
                 <h1></h1>
                 <InputGroup className="w-50">
@@ -55,7 +57,7 @@ export default class Dashboard extends React.Component{
                         aria-describedby="basic-addon2"
                     />
                     <Button variant="outline-secondary" id="button-addon2">
-                Search
+                        Search
                     </Button>
                 </InputGroup>
                 <div className="p-4">
diff --git a/sports-matcher/client/src/pages/Login.js b/sports-matcher/client/src/pages/Login.js
index 650879e..a74018d 100644
--- a/sports-matcher/client/src/pages/Login.js
+++ b/sports-matcher/client/src/pages/Login.js
@@ -15,25 +15,27 @@ export default class Login extends React.Component {
 
     render() {
         return (
-            <Card>
-                <Card.Body>
-                    <Card.Title>Login</Card.Title>
-                    <Card.Subtitle>Welcome back!</Card.Subtitle>
-                    <Form>
-                        <Form.Group className="mb-3" controlId="loginEmail">
-                            <Form.Label>E-mail</Form.Label>
-                            <Form.Control type="email" placeholder="Ex. youremail@mail.com" />
-                        </Form.Group>
-                        <Form.Group className="mb-3" controlId="loginPassword">
-                            <Form.Label>Password</Form.Label>
-                            <Form.Control type="password" placeholder="Enter password" />
-                        </Form.Group>
-                        <Button variant="primary" type="submit">
-                            Login
-                        </Button>
-                    </Form>
-                </Card.Body>
-            </Card>
+            <div className="page-root">
+                <Card>
+                    <Card.Body>
+                        <Card.Title>Login</Card.Title>
+                        <Card.Subtitle>Welcome back!</Card.Subtitle>
+                        <Form>
+                            <Form.Group className="mb-3" controlId="loginEmail">
+                                <Form.Label>E-mail</Form.Label>
+                                <Form.Control type="email" placeholder="Ex. youremail@mail.com" />
+                            </Form.Group>
+                            <Form.Group className="mb-3" controlId="loginPassword">
+                                <Form.Label>Password</Form.Label>
+                                <Form.Control type="password" placeholder="Enter password" />
+                            </Form.Group>
+                            <Button variant="primary" type="submit">
+                                Login
+                            </Button>
+                        </Form>
+                    </Card.Body>
+                </Card>
+            </div>
         );
     }
 }
\ No newline at end of file
diff --git a/sports-matcher/scripts/start_mongo.sh b/sports-matcher/scripts/start_mongo.sh
index 0d12fdc..5786fc0 100755
--- a/sports-matcher/scripts/start_mongo.sh
+++ b/sports-matcher/scripts/start_mongo.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-mongod --dbpath ./server/mongo-data
\ No newline at end of file
+mongod --dbpath ../server/mongo-data
\ No newline at end of file
diff --git a/sports-matcher/server/controllers/matchController.js b/sports-matcher/server/controllers/matchController.js
index 0ec8ed0..c4f02da 100644
--- a/sports-matcher/server/controllers/matchController.js
+++ b/sports-matcher/server/controllers/matchController.js
@@ -48,12 +48,12 @@ MatchController.get("/recent/:limit?", needDatabase, async (req, res) => {
         }
         let recent = null;
         if (user) {
-            await user.populate("participatingMatches");
+            await user.populate("participatingMatches").populate("participatingMatches.members.$");
             recent = user.participatingMatches.slice(-limit);
         } else {
-            recent = await matchModel.find().where("publicity").gte(2).limit(limit).sort({ createDate: -1 });
+            recent = await matchModel.find().where("publicity").gte(2).limit(limit).sort({ createDate: -1 }).populate("members.$");
         }
-        await recent.populate("members.$"); // Populates all references.
+        await recent; // Populates all references.
         res.status(200).send({ recent: recent });
     } catch (error) {
         console.error(error);