Merge branch 'develop' into admin_page
This commit is contained in:
commit
468f1cfa31
@ -35,6 +35,7 @@
|
||||
"semi": [
|
||||
"error",
|
||||
"always"
|
||||
]
|
||||
],
|
||||
"no-unused-vars": "warn"
|
||||
}
|
||||
}
|
@ -1,7 +1,7 @@
|
||||
import "./styles/Layout.css";
|
||||
import "./styles/extra.css";
|
||||
import React from "react";
|
||||
import { NavLink, Route, Routes } from "react-router-dom";
|
||||
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";
|
||||
import { Container, Nav, NavbarBrand } from "react-bootstrap";
|
||||
@ -10,11 +10,56 @@ 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 { globalContext } from "./context.js";
|
||||
|
||||
export default class Layout extends React.Component {
|
||||
render() {
|
||||
return (
|
||||
<div id="app">
|
||||
|
||||
export default function layout() {
|
||||
const navigate = useNavigate();
|
||||
const [state, setState] = useState({
|
||||
user: null,
|
||||
});
|
||||
|
||||
useEffect(async () => {
|
||||
await updateAuthStatus();
|
||||
});
|
||||
|
||||
async function updateAuthStatus() {
|
||||
const getUserResponse = await apiClient.get("/user");
|
||||
if (getUserResponse !== 200) {
|
||||
setState({ user: null });
|
||||
} else {
|
||||
setState({ user: getUserResponse.data });
|
||||
}
|
||||
}
|
||||
|
||||
let indentityDisplay = (
|
||||
<Nav>
|
||||
<li className="nav-item">
|
||||
<NavLink className="nav-link" to="/login" >Login</NavLink>
|
||||
</li>
|
||||
<li className="nav-item">
|
||||
<NavLink className="nav-link" to="/signup" >Sign up!</NavLink>
|
||||
</li>
|
||||
</Nav>
|
||||
);
|
||||
|
||||
if (state.user) {
|
||||
indentityDisplay = (
|
||||
<Nav>
|
||||
<li className="nav-item">
|
||||
<NavLink className="nav-link" to="/" >Hi, {this.state.user.firstName}</NavLink>
|
||||
</li>
|
||||
<li className="nav-item">
|
||||
<NavLink className="nav-link" to="/logout" >Logout</NavLink>
|
||||
</li>
|
||||
</Nav>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<div id="app">
|
||||
<globalContext.Provider value={{ navigate: navigate }}>
|
||||
<header>
|
||||
<Navbar bg="light" expand="md">
|
||||
<Container>
|
||||
@ -26,6 +71,7 @@ export default class Layout extends React.Component {
|
||||
<NavLink className="nav-link" to="/" >Home</NavLink>
|
||||
</li>
|
||||
</Nav>
|
||||
{indentityDisplay}
|
||||
</NavbarCollapse>
|
||||
</Container>
|
||||
</Navbar>
|
||||
@ -41,7 +87,7 @@ export default class Layout extends React.Component {
|
||||
<footer>
|
||||
|
||||
</footer>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
</globalContext.Provider>
|
||||
</div>
|
||||
);
|
||||
}
|
@ -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);
|
||||
});
|
||||
|
@ -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);
|
||||
|
26
sports-matcher/client/src/components/SportInfoCard.js
Normal file
26
sports-matcher/client/src/components/SportInfoCard.js
Normal file
@ -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>
|
||||
{this.props.sport.description}
|
||||
</Card.Text>
|
||||
</Card.Body>
|
||||
</Card>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
SportInfoCard.propTypes = {
|
||||
sport: propTypes.object,
|
||||
};
|
24
sports-matcher/client/src/components/SportInfoCardDisplay.js
Normal file
24
sports-matcher/client/src/components/SportInfoCardDisplay.js
Normal file
@ -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.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,
|
||||
};
|
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({});
|
@ -3,7 +3,10 @@ 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 { globalContext } from "../context";
|
||||
import { needUser } from "../utils/routing";
|
||||
|
||||
export default class Dashboard extends React.Component {
|
||||
constructor(props) {
|
||||
super(props);
|
||||
@ -13,11 +16,14 @@ export default class Dashboard extends React.Component {
|
||||
displayedEquipment: [],
|
||||
user: null
|
||||
};
|
||||
this.getFirstName();
|
||||
}
|
||||
|
||||
static contextType = globalContext;
|
||||
|
||||
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() });
|
||||
await needUser(this.context.navigate);
|
||||
await this.latestMatches();
|
||||
await this.availableSports();
|
||||
}
|
||||
async latestMatches() {
|
||||
let recentMatchesRes = await apiClient.get("/match/recent/15");
|
||||
@ -26,26 +32,13 @@ export default class Dashboard extends React.Component {
|
||||
}
|
||||
}
|
||||
|
||||
async availableMatches() {
|
||||
let availableMatchesRes = await apiClient.get("/sports");
|
||||
if (availableMatchesRes.status === 200) {
|
||||
this.setState({ displayedSports: availableMatchesRes.data.recent });
|
||||
async availableSports() {
|
||||
let availableSportsRes = await apiClient.get("/sport");
|
||||
if (availableSportsRes.status === 200) {
|
||||
this.setState({ displayedSports: availableSportsRes.data });
|
||||
}
|
||||
}
|
||||
|
||||
async availableEquipment() {
|
||||
let availableEquipmentRes = await apiClient.get("/rentals");
|
||||
if (availableEquipmentRes.status === 200) {
|
||||
this.setState({ displayedEquipment: availableEquipmentRes.data.recent });
|
||||
}
|
||||
}
|
||||
|
||||
async getFirstName() {
|
||||
// let result = await apiClient.post("/user/login", {"email": "johndoe@gmail.com", "password": "csc309h1"}).then(apiClient.get("/user"));
|
||||
let user = await apiClient.get("/user");
|
||||
let tags = document.getElementsByTagName("h1");
|
||||
tags[0].innerHTML = user.firstName;
|
||||
}
|
||||
render() {
|
||||
return (
|
||||
<React.Fragment>
|
||||
@ -66,12 +59,10 @@ export default class Dashboard extends React.Component {
|
||||
</div>
|
||||
<div className="p-4">
|
||||
<h2>Available Sports</h2>
|
||||
<MatchInfoCardDisplay recommendedmatches={this.state.displayedSports} />
|
||||
</div>
|
||||
<div className="p-4">
|
||||
<h2>Available Equipment</h2>
|
||||
<MatchInfoCardDisplay recommendedmatches={this.state.displayedEquipment} />
|
||||
<SportInfoCardDisplay recommendedsports={this.state.displayedSports} />
|
||||
</div>
|
||||
|
||||
|
||||
</React.Fragment>
|
||||
);
|
||||
}
|
||||
|
@ -1,40 +1,93 @@
|
||||
import React from "react";
|
||||
import { Button, Card, 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";
|
||||
|
||||
export default class Login extends React.Component {
|
||||
constructor(props) {
|
||||
super(props);
|
||||
this.state = {
|
||||
email: "",
|
||||
password: "",
|
||||
errorDisplayed: false,
|
||||
};
|
||||
|
||||
this.attemptLogin = this.attemptLogin.bind(this);
|
||||
}
|
||||
|
||||
static contextType = globalContext;
|
||||
|
||||
async componentDidMount() {
|
||||
const getUserResponse = await apiClient.get("/user");
|
||||
guard(() => getUserResponse.status === 401, "/dashboard"); // If it's not 401, then we redirect to dashboard.
|
||||
try {
|
||||
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,
|
||||
}, {
|
||||
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="page-root">
|
||||
<Card>
|
||||
<Card.Body>
|
||||
<Card.Title>Login</Card.Title>
|
||||
<Card.Subtitle>Welcome back!</Card.Subtitle>
|
||||
<Form>
|
||||
<Form.Group className="mb-3" controlId="loginEmail">
|
||||
<Form.Label>E-mail</Form.Label>
|
||||
<Form.Control type="email" placeholder="Ex. youremail@mail.com" />
|
||||
</Form.Group>
|
||||
<Form.Group className="mb-3" controlId="loginPassword">
|
||||
<Form.Label>Password</Form.Label>
|
||||
<Form.Control type="password" placeholder="Enter password" />
|
||||
</Form.Group>
|
||||
<Button variant="primary" type="submit">
|
||||
Login
|
||||
</Button>
|
||||
</Form>
|
||||
</Card.Body>
|
||||
</Card>
|
||||
<div className="d-flex justify-content-center align-items-center
|
||||
page-root">
|
||||
{errorMsg}
|
||||
<Container style={{ maxWidth: "35rem" }}>
|
||||
<Card>
|
||||
<Card.Body>
|
||||
<Card.Title>Login</Card.Title>
|
||||
<Card.Subtitle>Welcome back!</Card.Subtitle>
|
||||
<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" 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" onChange={(e) => {
|
||||
this.setState({ password: e.target.value });
|
||||
}} />
|
||||
</Form.Group>
|
||||
<Button variant="primary" type="submit">
|
||||
Submit
|
||||
</Button>
|
||||
</Form>
|
||||
</Card.Body>
|
||||
</Card>
|
||||
</Container>
|
||||
</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>
|
||||
);
|
||||
}
|
||||
}
|
88
sports-matcher/client/src/pages/SIgnup.js
Normal file
88
sports-matcher/client/src/pages/SIgnup.js
Normal file
@ -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>
|
||||
);
|
||||
}
|
||||
}
|
@ -0,0 +1,4 @@
|
||||
.horizontal-scroller{
|
||||
display: flex;
|
||||
overflow-x: auto;
|
||||
}
|
@ -1,6 +1,10 @@
|
||||
import axios from "axios";
|
||||
|
||||
export const apiClient = axios.create({
|
||||
baseURL: process.env.REACT_APP_API_HOST,
|
||||
baseURL: (process.env.REACT_APP_API_HOST || "") + "/api/",
|
||||
timeout: 5000,
|
||||
withCredentials: process.env.NODE_ENV === "development",
|
||||
validateStatus: function (status) {
|
||||
return status === 401 || status == 200;
|
||||
}
|
||||
});
|
@ -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;
|
||||
}
|
@ -14,7 +14,7 @@
|
||||
4
|
||||
],
|
||||
"linebreak-style": [
|
||||
"error",
|
||||
"warn",
|
||||
"unix"
|
||||
],
|
||||
"quotes": [
|
||||
@ -24,6 +24,7 @@
|
||||
"semi": [
|
||||
"error",
|
||||
"always"
|
||||
]
|
||||
],
|
||||
"no-unused-vars": "warn"
|
||||
}
|
||||
}
|
@ -27,9 +27,9 @@ try {
|
||||
|
||||
|
||||
if (process.env.NODE_ENV === "development") {
|
||||
console.log("We are running in development mode.");
|
||||
mongoose.set("bufferCommands", false); // We want to know if there are connection issues immediately for development. Disables globally.
|
||||
|
||||
server.use(cors());
|
||||
server.use(cors({ credentials: true, origin: "http://localhost:3000" }));
|
||||
}
|
||||
|
||||
// Docs: https://www.npmjs.com/package/body-parser
|
||||
@ -38,10 +38,10 @@ server.use(bodyParser.urlencoded({ extended: true }));
|
||||
|
||||
server.use(userSession);
|
||||
|
||||
server.use("/user", UserController);
|
||||
server.use("/match", MatchController);
|
||||
server.use("/sport", SportController);
|
||||
server.use("/rental", rentalController);
|
||||
server.use("/api/user", UserController);
|
||||
server.use("/api/match", MatchController);
|
||||
server.use("/api/sport", SportController);
|
||||
server.use("/api/rental", rentalController);
|
||||
|
||||
server.listen(port, () => {
|
||||
console.log(`Server listening on port ${port}.`);
|
||||
|
Loading…
Reference in New Issue
Block a user