Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rework login / logout button #387

Merged
merged 1 commit into from
Nov 22, 2023
Merged

Rework login / logout button #387

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 37 additions & 73 deletions frontend/src/components/Header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,92 +147,56 @@ const Header = ({ authSession }) => {
<Typography variant={navVariant} sx={{ fontWeight: 'bold' }} color={headerTextColor}>
Sandbox
</Typography>

</Button>
</Box>

{/**** LOG IN/OUT ****/}
<Box variant="h5" sx={{ alignItems: 'center', flexWrap: 'wrap', flexGrow: 0, display: { xs: 'none', md: 'flex' } }}>

{authSession.isLoggedIn() ?
<>
<Typography variant={navVariant} sx={{ fontWeight: 'medium' }} color={headerTextColor}>
<Box sx={{ flexGrow: 0, display: 'flex' }}>
{authSession.isLoggedIn() && <>
<IconButton
size="large"
aria-label="account of current user"
aria-controls="menu-appbar"
aria-haspopup="true"
onClick={handleOpenUserMenu}
color="inherit">
<AccountCircleIcon />
</IconButton>
<Menu
id="menu-appbar"
anchorEl={anchorElUser}
anchorOrigin={{
vertical: 'bottom',
horizontal: 'left',
}}
keepMounted
transformOrigin={{
vertical: 'top',
horizontal: 'left',
}}
open={Boolean(anchorElUser)}
onClose={handleCloseUserMenu}
sx={{ display: 'block'}}
>
<MenuItem>
{authSession.getIdField('email')}
</Typography>
<Button
</MenuItem>
<MenuItem
color='inherit'
onClick={() => authSession.openLogout()}
>
<Typography variant={navVariant} sx={{ fontWeight: 'bold' }} color={headerTextColor}>
Log Out
</Typography>
</Button>
</>
:
<Button
color='inherit'
onClick={() => authSession.openLogin()}
>

Logout
</MenuItem>
</Menu>
</>}
{!authSession.isLoggedIn() &&
<Button color='inherit' onClick={() => authSession.openLogin()} >
<Typography variant={navVariant} sx={{ fontWeight: 'bold' }} color={headerTextColor}>
Log In
Login
</Typography>
</Button>
}
</Box>
<Box sx={{ flexGrow: 0, display: { xs: 'flex', md: 'none' } }}>
<IconButton
size="large"
aria-label="account of current user"
aria-controls="menu-appbar"
aria-haspopup="true"
onClick={handleOpenUserMenu}
color="inherit">
<AccountCircleIcon />
</IconButton>
<Menu
id="menu-appbar"
anchorEl={anchorElUser}
anchorOrigin={{
vertical: 'bottom',
horizontal: 'left',
}}
keepMounted
transformOrigin={{
vertical: 'top',
horizontal: 'left',
}}
open={Boolean(anchorElUser)}
onClose={handleCloseUserMenu}
sx={{
display: { xs: 'block', md: 'none' },
}}
>
{authSession.isLoggedIn() ?
<>
<MenuItem>
{authSession.getIdField('email')}
</MenuItem>
<MenuItem
color='inherit'
onClick={() => authSession.openLogout()}
>
Logout
</MenuItem>
</>
:
<>
<MenuItem
color='inherit'
onClick={() => authSession.openLogin()}
>
Login
</MenuItem>
</>
}

</Menu>
</Box>

</Toolbar>
</AppBar >
Expand Down