From da6f5c8265c057d861e13fe9936e3e5c8209cacd Mon Sep 17 00:00:00 2001
From: Hansi Xu <hxacs7755@gmail.com>
Date: Wed, 6 Apr 2022 23:56:39 -0400
Subject: [PATCH] Fixed signup page routing

---
 sports-matcher/client/src/Layout.js       |   2 +
 sports-matcher/client/src/pages/SIgnup.js | 111 ++++++++++++----------
 2 files changed, 64 insertions(+), 49 deletions(-)

diff --git a/sports-matcher/client/src/Layout.js b/sports-matcher/client/src/Layout.js
index 9864c39..f829f9f 100644
--- a/sports-matcher/client/src/Layout.js
+++ b/sports-matcher/client/src/Layout.js
@@ -10,6 +10,7 @@ import NavbarCollapse from "react-bootstrap/esm/NavbarCollapse";
 import Dashboard from "./pages/Dashboard";
 import Login from "./pages/Login";
 import { apiClient } from "./utils/httpClients";
+import Signup from "./pages/Signup";
 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="/signup" element={<Signup />} />
                     </Routes>
                 </main>
                 <footer>
diff --git a/sports-matcher/client/src/pages/SIgnup.js b/sports-matcher/client/src/pages/SIgnup.js
index c603579..2f91db0 100644
--- a/sports-matcher/client/src/pages/SIgnup.js
+++ b/sports-matcher/client/src/pages/SIgnup.js
@@ -1,87 +1,100 @@
 import React from "react";
-import { Button, Card, Form } from "react-bootstrap";
+import { Button, Card, Form, Alert, Container } from "react-bootstrap";
 import { apiClient } from "../utils/httpClients";
-import { guard } from "../utils/routing";
+// 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
-        }
+        };
+        this.warnUser("Internal server error. Please try again later.", "danger");
+
+        const sleep = ms => new Promise(res => setTimeout(res, ms));
+        this.setState({ alertKey: "danger" }, () => {
+            console.log(this.state.alertKey);
+        }); 
+        console.log("Hello");
     }
 
     async registerUser() {
-        const res = await apiClient.post("/user", this.state);
+        const sleep = ms => new Promise(res => setTimeout(res, ms));
+        const res = await apiClient.post("/user", this.state.newUser);
         if (res.status === 200) {
-            this.warnUser("You are successfully signed up!", "success")
+            this.warnUser("You are successfully signed up!", "success");
+            sleep(3000).then(() => {
+                this.context.navigate("/dashboard", { replace: true });
+            });
         } else if (res === 409) {
-            this.warnUser("This user already exists. Try logging in instead.", "danger")
+            this.warnUser("This user already exists. Try logging in instead.", "danger");
         } else if (res === 400) {
-            this.warnUser("Missing required fields.", "danger")
+            this.warnUser("Missing required fields.", "danger");
         } else {
-            this.warnUser("Internal server error. Please try again later.", "danger")
+            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})
+        let 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})
+        this.setState({alertMsg: msg});
+        this.setState({alertKey: key});
     }
 
     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>
+                <Container style={{ maxWidth: "35rem" }}>
+                    <Alert variant={this.state.alertKey} style={{ width: "35rem" }}>
+                        <Alert.Heading>{this.state.alertMsg}</Alert.Heading>
+                    </Alert>
+                    
+                    <Card>
+                        <Card.Body>
+                            <Card.Title>Sign up with us</Card.Title> <br />
+                            <Card.Subtitle>Welcome to Sports Matcher!</Card.Subtitle> <br />
+                            <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">
+                                    Register!
+                                </Button>
+                            </Form>
+                        </Card.Body>
+                    </Card>
+                </Container>
             </div>
         );
     }