Merge branch 'signup-page' into restructure

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/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,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/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/MatchInfoCardDisplay.css

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

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

@@ -1,9 +1,7 @@
 import axios from "axios";
 
-const apiClientConf = {
+export const apiClient = axios.create({
     baseURL: process.env.REACT_APP_API_HOST + "/api/",
     timeout: 5000,
-    withCredentials: process.env.NODE_ENV === "development"
+    withCredentials: process.env.NODE_ENV === "development",
-};
+});
-console.log(apiClientConf);
-export const apiClient = axios.create(apiClientConf);