Deleting and readding signup

Signup.js

@@ -0,0 +1,102 @@
+import React from "react";
+import { Button, Card, Form, Alert, Container } 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 = {
+            newUser: null,
+            alertShow: false,
+            alertKey: null,
+            alertMsg: null
+        };
+        this.state.newUser = {
+            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 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");
+            sleep(3000).then(() => {
+                this.context.navigate("/dashboard", { replace: true });
+            });
+        } 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) {
+        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({alertKey: key});
+    }
+
+    render() {
+        return (
+            <div className="page-root">
+                <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>
+        );
+    }
+}

sports-matcher/client/src/Layout.js

@@ -8,9 +8,9 @@ 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 Signup from "./pages/Signup";
 import { globalContext } from "./context.js";
 
 
@@ -81,7 +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 />} />
+                        <Route path="/signup" element={<Signup />} />
                     </Routes>
                 </main>
                 <footer>

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

@@ -1,219 +0,0 @@
-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

@@ -1,88 +0,0 @@
-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

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