From 52fa4db1e2342b9ce9da7d0afd0bec868eec91e7 Mon Sep 17 00:00:00 2001
From: James D'Alton <jda1g15@soton.ac.uk>
Date: Tue, 12 May 2020 14:30:26 +0100
Subject: [PATCH] Removed home page
---
compforge/src/App.js | 28 ++++++++++++++++----
compforge/src/Components/AppHeader.react.jsx | 8 +++---
compforge/src/Components/Login.react.jsx | 2 +-
3 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/compforge/src/App.js b/compforge/src/App.js
index 9d5a29b2..01b4237f 100644
--- a/compforge/src/App.js
+++ b/compforge/src/App.js
@@ -7,7 +7,7 @@ import ProtectedRoute from "./Components/ProtectedRoute.react";
// Presentational Components
import AppHeader from "./Components/AppHeader.react";
-import HomePage from "./Components/HomePage.react";
+// import HomePage from "./Components/HomePage.react";
import Login from "./Components/Login.react";
import UserDashboard from "./Components/UserDashboard.react";
import Signup from "./Components/Signup.react";
@@ -21,12 +21,30 @@ function App(props) {
<div className="rootApp" style={{ maxWidth: 1200, margin: '16px auto auto' }}>
<AppHeader isAuthenticated={isAuthenticated} isVerifying={isVerifying} />
<Switch>
- <ProtectedRoute exact path='/userhome' component={()=>{return (<UserDashboard user={user ? user : false} />)}} isAuthenticated={isAuthenticated} isVerifying={isVerifying} ></ProtectedRoute>
- <ProtectedRoute exact path='/mysubmissions' component={()=>{return (<SubsScreen mySubs={true} user={user ? user : false} />)}} isAuthenticated={isAuthenticated} isVerifying={isVerifying} ></ProtectedRoute>
- <ProtectedRoute exact path='/partnerssubmissions' component={()=>{return (<SubsScreen mySubs={false} user={user ? user : false} />)}} isAuthenticated={isAuthenticated} isVerifying={isVerifying} ></ProtectedRoute>
+ <ProtectedRoute
+ exact path='/'
+ component={()=>{return (<UserDashboard user={user ? user : false} />)}}
+ isAuthenticated={isAuthenticated}
+ isVerifying={isVerifying} >
+ </ProtectedRoute>
+
+ <ProtectedRoute
+ exact path='/mysubmissions'
+ component={()=>{return (<SubsScreen mySubs={true} user={user ? user : false} />)}}
+ isAuthenticated={isAuthenticated}
+ isVerifying={isVerifying} >
+ </ProtectedRoute>
+
+ <ProtectedRoute
+ exact path='/partnerssubmissions'
+ component={()=>{return (<SubsScreen mySubs={false} user={user ? user : false} />)}}
+ isAuthenticated={isAuthenticated}
+ isVerifying={isVerifying} >
+ </ProtectedRoute>
+
<Route path="/login" component={Login} />
+
<Route path="/signup" component={Signup} />
- <Route path="/" component={()=><HomePage isAuthenticated={isAuthenticated} />} />
</Switch>
</div>
);
diff --git a/compforge/src/Components/AppHeader.react.jsx b/compforge/src/Components/AppHeader.react.jsx
index 5819c67f..26e51450 100644
--- a/compforge/src/Components/AppHeader.react.jsx
+++ b/compforge/src/Components/AppHeader.react.jsx
@@ -91,7 +91,7 @@ const AppHeader = (props) => {
let { user } = props;
let { isAdmin } = props;
- const [open, setOpen] = React.useState(true);
+ const [open, setOpen] = React.useState(false);
const [openModal, setOpenModal] = React.useState(false);
const toggleModalState = () => {
@@ -114,7 +114,7 @@ const AppHeader = (props) => {
<MenuIcon /> <span style={{marginLeft: 8, fontSize: 16}}> Menu </span>
</IconButton>
<div style={{margin: "auto", position: 'relative', left: isAuthenticated ? 10 : 56 }}>
- <Link to={ isAuthenticated ? '/userhome' : '/'} style={{textDecoration: 'none', color: 'white', cursor: 'pointer'}}>
+ <Link to={ isAuthenticated ? '/' : '/'} style={{textDecoration: 'none', color: 'white', cursor: 'pointer'}}>
<Typography variant="h6" className={classes.title}>
CompForge
</Typography>
@@ -129,8 +129,8 @@ const AppHeader = (props) => {
</Link>}
</Toolbar>
</AppBar>
- <AppMenu
- toggleModalState={toggleModalState}
+ <AppMenu
+ toggleModalState={toggleModalState}
logout={logout}
isAdmin={isAuthenticated && isAdmin}
isAuthenticated={isAuthenticated}
diff --git a/compforge/src/Components/Login.react.jsx b/compforge/src/Components/Login.react.jsx
index 8e7ebf9d..bd43c567 100644
--- a/compforge/src/Components/Login.react.jsx
+++ b/compforge/src/Components/Login.react.jsx
@@ -88,7 +88,7 @@ const Login = (props) => {
}
if (isAuthenticated) {
- return <Redirect to="/userhome" />;
+ return <Redirect to="/" />;
}
return (<Container component="main" style={{marginBottom: 100, paddingLeft: 0, paddingRight: 0}} maxWidth="xs">
--
GitLab