From fa8552d4883947c127673458db6afcb7876eb114 Mon Sep 17 00:00:00 2001 From: Harrison Deng Date: Thu, 7 Apr 2022 13:36:49 -0500 Subject: [PATCH] Fixed login route and authentication guards. --- sports-matcher/client/src/Layout.js | 16 +++++-------- .../src/components/AuthenticationGuard.js | 23 ++++++------------- sports-matcher/client/src/globals.js | 2 +- sports-matcher/client/src/pages/Dashboard.js | 4 ++-- sports-matcher/client/src/pages/Login.js | 17 +++++++------- sports-matcher/client/src/pages/Logout.js | 10 ++++---- sports-matcher/client/src/pages/NewAdmin.js | 14 +++-------- 7 files changed, 33 insertions(+), 53 deletions(-) diff --git a/sports-matcher/client/src/Layout.js b/sports-matcher/client/src/Layout.js index 538c08f..612e2c8 100644 --- a/sports-matcher/client/src/Layout.js +++ b/sports-matcher/client/src/Layout.js @@ -1,6 +1,6 @@ import "./styles/Layout.css"; import "./styles/extra.css"; -import { useEffect, useState } from "react"; +import { useState } from "react"; import { NavLink, Route, Routes, useNavigate } from "react-router-dom"; import Welcome from "./pages/Welcome"; import Navbar from "react-bootstrap/Navbar"; @@ -15,16 +15,12 @@ import Context from "./globals.js"; export default function layout() { - const [state, setState] = useState({ + const [globals, setGlobals] = useState({ user: null, - setUser: setUser, + update: (updates, onUpdate) => setGlobals((state) => { return { ...state, ...updates }; }, onUpdate), navigate: useNavigate() }); - function setUser(user) { - setState({ user: user }); - } - let identityDisplay = ( ); - if (state.user) { + if (globals.user) { identityDisplay = (