Added cards and scroll styling

sports-matcher/client/src/Layout.js

@@ -1,7 +1,7 @@
 import "./styles/Layout.css";
 import "./styles/extra.css";
-import { useEffect, useState } from "react";
+import React from "react";
-import { NavLink, Route, Routes, useNavigate } from "react-router-dom";
+import { NavLink, Route, Routes } from "react-router-dom";
 import Welcome from "./pages/Welcome";
 import Navbar from "react-bootstrap/Navbar";
 import { Container, Nav, NavbarBrand } from "react-bootstrap";
@@ -9,56 +9,11 @@ import NavbarToggle from "react-bootstrap/esm/NavbarToggle";
 import NavbarCollapse from "react-bootstrap/esm/NavbarCollapse";
 import Dashboard from "./pages/Dashboard";
 import Login from "./pages/Login";
-import { apiClient } from "./utils/httpClients";
-import { globalContext } from "./context.js";
 
-
+export default class Layout extends React.Component {
-export default function layout() {
+    render() {
-    const navigate = useNavigate();
+        return (
-    const [state, setState] = useState({
+            <div id="app">
-        user: null,
-    });
-
-    useEffect(async () => {
-        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>
-            </li>
-            <li className="nav-item">
-                <NavLink className="nav-link" to="/signup" >Sign up!</NavLink>
-            </li>
-        </Nav>
-    );
-
-    if (state.user) {
-        indentityDisplay = (
-            <Nav>
-                <li className="nav-item">
-                    <NavLink className="nav-link" to="/" >Hi, {this.state.user.firstName}</NavLink>
-                </li>
-                <li className="nav-item">
-                    <NavLink className="nav-link" to="/logout" >Logout</NavLink>
-                </li>
-            </Nav>
-        );
-    }
-
-    return (
-        <div id="app">
-            <globalContext.Provider value={{ navigate: navigate }}>
                 <header>
                     <Navbar bg="light" expand="md">
                         <Container>
@@ -70,7 +25,6 @@ export default function layout() {
                                         <NavLink className="nav-link" to="/" >Home</NavLink>
                                     </li>
                                 </Nav>
-                                {indentityDisplay}
                             </NavbarCollapse>
                         </Container>
                     </Navbar>
@@ -85,7 +39,7 @@ export default function layout() {
                 <footer>
 
                 </footer>
-            </globalContext.Provider>
+            </div>
-        </div>
+        );
-    );
+    }
 }

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

@@ -9,6 +9,7 @@ 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/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>
+                        <p>{this.props.sport.description}</p>
+                    </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 && 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/context.js

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

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

@@ -3,7 +3,8 @@ 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 { needUser } from "../utils/routing.js";
 export default class Dashboard extends React.Component {
     constructor(props) {
         super(props);
@@ -13,11 +14,16 @@ export default class Dashboard extends React.Component {
             displayedEquipment: [],
             user: null
         };
-        this.getFirstName();
+        // this.getFirstName();
     }
+    // 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.
+    //     this.setState({ displayedMatches: await this.latestMatches() });
+    // }
     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 this.latestMatches();
-        this.setState({ displayedMatches: await this.latestMatches() });
+        await this.availableSports();
+        // await this.availableEquipment();
     }
     async latestMatches() {
         let recentMatchesRes = await apiClient.get("/match/recent/15");
@@ -26,26 +32,26 @@ 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.recent });
         }
     }
 
-    async availableEquipment() {
+    // async availableEquipment() {
-        let availableEquipmentRes = await apiClient.get("/rentals");
+    //     let availableEquipmentRes = await apiClient.get("/rentals");
-        if (availableEquipmentRes.status === 200) {
+    //     if (availableEquipmentRes.status === 200) {
-            this.setState({ displayedEquipment: availableEquipmentRes.data.recent });
+    //         this.setState({ displayedEquipment: availableEquipmentRes.data.recent });
-        }
+    //     }
-    }
+    // }
 
-    async getFirstName() {
+    // async getFirstName() {
-        // let result = await apiClient.post("/user/login", {"email": "johndoe@gmail.com", "password": "csc309h1"}).then(apiClient.get("/user"));
+    //     // let result = await apiClient.post("/user/login", {"email": "johndoe@gmail.com", "password": "csc309h1"}).then(apiClient.get("/user"));
-        let user = await apiClient.get("/user");
+    //     let user = await apiClient.get("/user");
-        let tags = document.getElementsByTagName("h1");
+    //     let tags = document.getElementsByTagName("h1");
-        tags[0].innerHTML = user.firstName;
+    //     tags[0].innerHTML = user.firstName;
-    }
+    // }
     render() {
         return (
             <React.Fragment>
@@ -66,12 +72,13 @@ 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">
+                {/* <div className="p-4">
                     <h2>Available Equipment</h2>
                     <MatchInfoCardDisplay recommendedmatches={this.state.displayedEquipment} />
-                </div>
+                </div> */}
+
             </React.Fragment>
         );
     }

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

@@ -1,74 +1,40 @@
 import React from "react";
-import { Button, Card, Container, Form } from "react-bootstrap";
+import { Button, Card, Form } from "react-bootstrap";
-import { globalContext } from "../context";
 import { apiClient } from "../utils/httpClients";
 import { guard } from "../utils/routing";
 
 export default class Login extends React.Component {
     constructor(props) {
         super(props);
-        this.state = {
-            email: "",
-            password: ""
-        };
-
-        this.attemptLogin = this.attemptLogin.bind(this);
     }
 
-    static contextType = globalContext;
-
     async componentDidMount() {
-        try {
+        const getUserResponse = await apiClient.get("/user");
-            const getUserResponse = await apiClient.get("/user");
+        guard(() => getUserResponse.status === 401, "/dashboard"); // If it's not 401, then we redirect to dashboard.
-            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;
-            }
-        }
-    }
-
-    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.navigate("/dashboard", { replace: true });
-        }
     }
 
     render() {
         return (
-            <div className="d-flex justify-content-center align-items-center
+            <div className="page-root">
-            page-root">
+                <Card>
-                <Container style={{ maxWidth: "30rem" }}>
+                    <Card.Body>
-                    <Card>
+                        <Card.Title>Login</Card.Title>
-                        <Card.Body>
+                        <Card.Subtitle>Welcome back!</Card.Subtitle>
-                            <Card.Title>Login</Card.Title>
+                        <Form>
-                            <Card.Subtitle>Welcome back!</Card.Subtitle>
+                            <Form.Group className="mb-3" controlId="loginEmail">
-                            <Form onSubmit={this.attemptLogin}>
+                                <Form.Label>E-mail</Form.Label>
-                                <Form.Group className="mb-3" controlId="loginEmail">
+                                <Form.Control type="email" placeholder="Ex. youremail@mail.com" />
-                                    <Form.Label>E-mail</Form.Label>
+                            </Form.Group>
-                                    <Form.Control type="email" placeholder="Ex. youremail@mail.com" onChange={(e) => {
+                            <Form.Group className="mb-3" controlId="loginPassword">
-                                        this.setState({ email: e.target.value });
+                                <Form.Label>Password</Form.Label>
-                                    }} />
+                                <Form.Control type="password" placeholder="Enter password" />
-                                </Form.Group>
+                            </Form.Group>
-                                <Form.Group className="mb-3" controlId="loginPassword">
+                            <Button variant="primary" type="submit">
-                                    <Form.Label>Password</Form.Label>
+                                Login
-                                    <Form.Control type="password" placeholder="Enter password" onChange={(e) => {
+                            </Button>
-                                        this.setState({ password: e.target.value });
+                        </Form>
-                                    }} />
+                    </Card.Body>
-                                </Form.Group>
+                </Card>
-                                <Button variant="primary" type="submit">
-                                    Submit
-                                </Button>
-                            </Form>
-                        </Card.Body>
-                    </Card>
-                </Container>
             </div>
         );
     }

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

@@ -1,36 +0,0 @@
-import React from "react";
-import { useNavigate } from "react-router-dom";
-import { apiClient } from "../utils/httpClients";
-
-export default class Logout extends React.Component {
-    constructor(props) {
-        super(props);
-    }
-
-    async componentDidMount() {
-        const logoutResponse = await apiClient.get("/user/logout");
-        let navigation = useNavigate();
-        if (logoutResponse.status === 401) {
-            navigation("/dashboard", { replace: true });
-        } else {
-            this.redirectTimer = setTimeout(() => {
-                navigation("/", { replace: true });
-            }, 2000);
-        }
-    }
-
-    async 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/styles/MatchInfoCardDisplay.css

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

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

@@ -1,9 +1,6 @@
 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,
     timeout: 5000,
-    withCredentials: process.env.NODE_ENV === "development"
+});
-};
-console.log(apiClientConf);
-export const apiClient = axios.create(apiClientConf);

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

@@ -1,6 +1,7 @@
+import { useNavigate } from "react-router-dom";
 import { apiClient } from "./httpClients";
 
-export function guard(navigator, evaluator, redirect, navigateOptions, onRedirect) {
+export function guard(evaluator, redirect, navigateOptions, onRedirect) {
     if (!evaluator) throw new Error("evaluator required.");
     if (!redirect) throw new Error("redirect required.");
     if (!navigateOptions) {
@@ -8,15 +9,16 @@ export function guard(navigator, evaluator, redirect, navigateOptions, onRedirec
             replace: true
         };
     }
+    let navigate = useNavigate();
     let redirecting = !evaluator();
     if (redirecting) {
         if (onRedirect) onRedirect();
-        navigator(redirect, navigateOptions);
+        navigate(redirect, navigateOptions);
     }
 }
 
-export async function needUser(navigator) {
+export async function needUser() {
     let userDataResponse = await apiClient.get("/user");
-    guard(navigator, () => userDataResponse.status === 200, "/login");
+    guard(() => userDataResponse.status === 200, "/login");
     return userDataResponse.data;
 }

sports-matcher/server/server.js

@@ -27,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
@@ -38,10 +38,10 @@ server.use(bodyParser.urlencoded({ extended: true }));
 
 server.use(userSession);
 
-server.use("/api/user", UserController);
+server.use("/user", UserController);
-server.use("/api/match", MatchController);
+server.use("/match", MatchController);
-server.use("/api/sport", SportController);
+server.use("/sport", SportController);
-server.use("/api/rental", rentalController);
+server.use("/rental", rentalController);
 
 server.listen(port, () => {
     console.log(`Server listening on port ${port}.`);