diff --git a/compforge/src/App.js b/compforge/src/App.js index 9d5a29b2f31aa5202136a69a3daaed32380b3ede..01b4237f3169daf081042782b4eaf9c1f5e09171 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 5819c67f18d4e7b296c8e8a7d2f3f0e306a2d518..26e514507608b8ba989e94485d98bb5ec4774d95 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 8e7ebf9d8ec0156d82d8988fac68609818bd2d10..bd43c56730573f1bb33f27dab71fc538c984b04e 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">