ydeng/csc309-team58
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Login complete.

Browse Source
This commit is contained in:
Harrison Deng 2022-04-05 19:14:11 -05:00
parent 5c393cb73d
commit c4c4031e4c
6 changed files with 104 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sports-matcher/client/src/Layout.js
View File

@ -1,6 +1,6 @@
import "./styles/Layout.css";
import "./styles/extra.css";
import React, { useEffect, useState } from "react";
import { useEffect, useState } from "react";
import { NavLink, Route, Routes, useNavigate } from "react-router-dom";
import Welcome from "./pages/Welcome";
import Navbar from "react-bootstrap/Navbar";
@ -10,11 +10,11 @@ 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 function layout() {
const navigate = useNavigate();
const navigationContext = React.createContext(navigate);
const [state, setState] = useState({
user: null,
});
@ -58,7 +58,7 @@ export default function layout() {
return (
<div id="app">
<navigationContext.Provider value={navigate}>
<globalContext.Provider value={{ navigate: navigate }}>
<header>
<Navbar bg="light" expand="md">
<Container>
@ -85,7 +85,7 @@ export default function layout() {
<footer>
</footer>
</navigationContext.Provider>
</globalContext.Provider>
</div>
);
}

1
sports-matcher/client/src/components/MatchInfoCard.js
View File

@ -9,7 +9,6 @@ export default class MatchInfoCard extends React.Component {
getParticipants() {
let participants = [];
console.log(this.props);
this.props.match.participants.forEach(user => {
participants.push(user.firstName);
});

3
sports-matcher/client/src/context.js Normal file
View File

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

48
sports-matcher/client/src/pages/Login.js
View File

@ -1,40 +1,74 @@
import React from "react";
import { Button, Card, Form } from "react-bootstrap";
import { Button, Card, Container, 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");
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="page-root">
<div className="d-flex justify-content-center align-items-center
page-root">
<Container style={{ maxWidth: "30rem" }}>
<Card>
<Card.Body>
<Card.Title>Login</Card.Title>
<Card.Subtitle>Welcome back!</Card.Subtitle>
<Form>
<Form onSubmit={this.attemptLogin}>
<Form.Group className="mb-3" controlId="loginEmail">
<Form.Label>E-mail</Form.Label>
<Form.Control type="email" placeholder="Ex. youremail@mail.com" />
<Form.Control type="email" placeholder="Ex. youremail@mail.com" onChange={(e) => {
this.setState({ email: e.target.value });
}} />
</Form.Group>
<Form.Group className="mb-3" controlId="loginPassword">
<Form.Label>Password</Form.Label>
<Form.Control type="password" placeholder="Enter password" />
<Form.Control type="password" placeholder="Enter password" onChange={(e) => {
this.setState({ password: e.target.value });
}} />
</Form.Group>
<Button variant="primary" type="submit">
Login
Submit
</Button>
</Form>
</Card.Body>
</Card>
</Container>
</div>
);
}

36
sports-matcher/client/src/pages/Logout.js Normal file
View File

@ -0,0 +1,36 @@
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>
);
}
}

10
sports-matcher/client/src/utils/routing.js
View File

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