Login complete.
This commit is contained in:
parent
5c393cb73d
commit
c4c4031e4c
@ -1,6 +1,6 @@
|
|||||||
import "./styles/Layout.css";
|
import "./styles/Layout.css";
|
||||||
import "./styles/extra.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 { NavLink, Route, Routes, useNavigate } from "react-router-dom";
|
||||||
import Welcome from "./pages/Welcome";
|
import Welcome from "./pages/Welcome";
|
||||||
import Navbar from "react-bootstrap/Navbar";
|
import Navbar from "react-bootstrap/Navbar";
|
||||||
@ -10,11 +10,11 @@ import NavbarCollapse from "react-bootstrap/esm/NavbarCollapse";
|
|||||||
import Dashboard from "./pages/Dashboard";
|
import Dashboard from "./pages/Dashboard";
|
||||||
import Login from "./pages/Login";
|
import Login from "./pages/Login";
|
||||||
import { apiClient } from "./utils/httpClients";
|
import { apiClient } from "./utils/httpClients";
|
||||||
|
import { globalContext } from "./context.js";
|
||||||
|
|
||||||
|
|
||||||
export default function layout() {
|
export default function layout() {
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
const navigationContext = React.createContext(navigate);
|
|
||||||
const [state, setState] = useState({
|
const [state, setState] = useState({
|
||||||
user: null,
|
user: null,
|
||||||
});
|
});
|
||||||
@ -58,7 +58,7 @@ export default function layout() {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div id="app">
|
<div id="app">
|
||||||
<navigationContext.Provider value={navigate}>
|
<globalContext.Provider value={{ navigate: navigate }}>
|
||||||
<header>
|
<header>
|
||||||
<Navbar bg="light" expand="md">
|
<Navbar bg="light" expand="md">
|
||||||
<Container>
|
<Container>
|
||||||
@ -85,7 +85,7 @@ export default function layout() {
|
|||||||
<footer>
|
<footer>
|
||||||
|
|
||||||
</footer>
|
</footer>
|
||||||
</navigationContext.Provider>
|
</globalContext.Provider>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
@ -9,7 +9,6 @@ export default class MatchInfoCard extends React.Component {
|
|||||||
|
|
||||||
getParticipants() {
|
getParticipants() {
|
||||||
let participants = [];
|
let participants = [];
|
||||||
console.log(this.props);
|
|
||||||
this.props.match.participants.forEach(user => {
|
this.props.match.participants.forEach(user => {
|
||||||
participants.push(user.firstName);
|
participants.push(user.firstName);
|
||||||
});
|
});
|
||||||
|
3
sports-matcher/client/src/context.js
Normal file
3
sports-matcher/client/src/context.js
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
import React from "react";
|
||||||
|
|
||||||
|
export const globalContext = React.createContext({});
|
@ -1,40 +1,74 @@
|
|||||||
import React from "react";
|
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 { apiClient } from "../utils/httpClients";
|
||||||
import { guard } from "../utils/routing";
|
import { guard } from "../utils/routing";
|
||||||
|
|
||||||
export default class Login extends React.Component {
|
export default class Login extends React.Component {
|
||||||
constructor(props) {
|
constructor(props) {
|
||||||
super(props);
|
super(props);
|
||||||
|
this.state = {
|
||||||
|
email: "",
|
||||||
|
password: ""
|
||||||
|
};
|
||||||
|
|
||||||
|
this.attemptLogin = this.attemptLogin.bind(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static contextType = globalContext;
|
||||||
|
|
||||||
async componentDidMount() {
|
async componentDidMount() {
|
||||||
const getUserResponse = await apiClient.get("/user");
|
try {
|
||||||
guard(() => getUserResponse.status === 401, "/dashboard"); // If it's not 401, then we redirect to dashboard.
|
const getUserResponse = await apiClient.get("/user");
|
||||||
|
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() {
|
render() {
|
||||||
return (
|
return (
|
||||||
<div className="page-root">
|
<div className="d-flex justify-content-center align-items-center
|
||||||
<Card>
|
page-root">
|
||||||
<Card.Body>
|
<Container style={{ maxWidth: "30rem" }}>
|
||||||
<Card.Title>Login</Card.Title>
|
<Card>
|
||||||
<Card.Subtitle>Welcome back!</Card.Subtitle>
|
<Card.Body>
|
||||||
<Form>
|
<Card.Title>Login</Card.Title>
|
||||||
<Form.Group className="mb-3" controlId="loginEmail">
|
<Card.Subtitle>Welcome back!</Card.Subtitle>
|
||||||
<Form.Label>E-mail</Form.Label>
|
<Form onSubmit={this.attemptLogin}>
|
||||||
<Form.Control type="email" placeholder="Ex. youremail@mail.com" />
|
<Form.Group className="mb-3" controlId="loginEmail">
|
||||||
</Form.Group>
|
<Form.Label>E-mail</Form.Label>
|
||||||
<Form.Group className="mb-3" controlId="loginPassword">
|
<Form.Control type="email" placeholder="Ex. youremail@mail.com" onChange={(e) => {
|
||||||
<Form.Label>Password</Form.Label>
|
this.setState({ email: e.target.value });
|
||||||
<Form.Control type="password" placeholder="Enter password" />
|
}} />
|
||||||
</Form.Group>
|
</Form.Group>
|
||||||
<Button variant="primary" type="submit">
|
<Form.Group className="mb-3" controlId="loginPassword">
|
||||||
Login
|
<Form.Label>Password</Form.Label>
|
||||||
</Button>
|
<Form.Control type="password" placeholder="Enter password" onChange={(e) => {
|
||||||
</Form>
|
this.setState({ password: e.target.value });
|
||||||
</Card.Body>
|
}} />
|
||||||
</Card>
|
</Form.Group>
|
||||||
|
<Button variant="primary" type="submit">
|
||||||
|
Submit
|
||||||
|
</Button>
|
||||||
|
</Form>
|
||||||
|
</Card.Body>
|
||||||
|
</Card>
|
||||||
|
</Container>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
36
sports-matcher/client/src/pages/Logout.js
Normal file
36
sports-matcher/client/src/pages/Logout.js
Normal 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>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
@ -1,7 +1,6 @@
|
|||||||
import { useNavigate } from "react-router-dom";
|
|
||||||
import { apiClient } from "./httpClients";
|
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 (!evaluator) throw new Error("evaluator required.");
|
||||||
if (!redirect) throw new Error("redirect required.");
|
if (!redirect) throw new Error("redirect required.");
|
||||||
if (!navigateOptions) {
|
if (!navigateOptions) {
|
||||||
@ -9,16 +8,15 @@ export function guard(evaluator, redirect, navigateOptions, onRedirect) {
|
|||||||
replace: true
|
replace: true
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
let navigate = useNavigate();
|
|
||||||
let redirecting = !evaluator();
|
let redirecting = !evaluator();
|
||||||
if (redirecting) {
|
if (redirecting) {
|
||||||
if (onRedirect) onRedirect();
|
if (onRedirect) onRedirect();
|
||||||
navigate(redirect, navigateOptions);
|
navigator(redirect, navigateOptions);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function needUser() {
|
export async function needUser(navigator) {
|
||||||
let userDataResponse = await apiClient.get("/user");
|
let userDataResponse = await apiClient.get("/user");
|
||||||
guard(() => userDataResponse.status === 200, "/login");
|
guard(navigator, () => userDataResponse.status === 200, "/login");
|
||||||
return userDataResponse.data;
|
return userDataResponse.data;
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user