Commit fed831c6 authored by Martin Lowe's avatar Martin Lowe 🇨🇦
Browse files

Revert "Merge branch 'zhoufang/dev/errorPageIssue' into 'master'"

This reverts merge request !462
parent b8abb507
Pipeline #1730 passed with stage
in 0 seconds
......@@ -65,8 +65,7 @@ export default function MainPortal({
const classes = useStyles();
const [mobileOpen, setMobileOpen] = useState(false);
const { gotCSRF, currentUser } = useContext(GlobalContext);
// The loggedIn will only be true when the user is logged in and he/she is at least linked to 1 org
const loggedIn = currentUser !== null && currentUser.relation.length > 0;
const loggedIn = currentUser !== null;
const handleDrawerToggle = () => {
setMobileOpen(!mobileOpen);
};
......@@ -83,7 +82,7 @@ export default function MainPortal({
return (
<>
{loggedIn && (
{currentUser && (
<>
<AppTopBar handleDrawerToggle={handleDrawerToggle} />
<LeftNavBar mobileOpen={mobileOpen} handleDrawerToggle={handleDrawerToggle} />
......@@ -114,7 +113,7 @@ export default function MainPortal({
<Redirect to="/portal/dashboard" />
</Route>
</Switch>
<div className={loggedIn ? '' : classes.loginFooter}>
<div className={classes.loginFooter}>
<PortalFooter />
</div>
</>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment