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

Jump to bottom

feat(website): Show Account if LoggedIn #1109

Merged
merged 5 commits into from
Feb 26, 2024
Merged

feat(website): Show Account if LoggedIn #1109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
59e0200
feat(website): Show `Account` if LoggedIn, `Login` otherwise
corneliusroemer Feb 25, 2024
61483d1
Format
corneliusroemer Feb 25, 2024
922e5a4
Rename `Account` -> `My account` per comments
corneliusroemer Feb 26, 2024
01016a0
feat(website): login menu button redirects back to current page
corneliusroemer Feb 26, 2024
a633d13
fix formatting
corneliusroemer Feb 26, 2024
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
17 changes: 15 additions & 2 deletions website/src/components/Navigation/Navigation.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,30 @@
---
import { SandwichMenu } from './SandwichMenu.tsx';
import { cleanOrganism } from './cleanOrganism';
import { getAuthUrl } from '../../middleware/authMiddleware';
import { navigationItems } from '../../routes';

const { organism, knownOrganisms } = cleanOrganism(Astro.params.organism);

const isLoggedIn = Astro.locals.session.isLoggedIn;

const loginUrl = await getAuthUrl(Astro.url.toString());
---

<div class='flex justify-end'>
<div class='subtitle hidden sm:flex sm:z-6 gap-4'>
{navigationItems.top(organism?.key).map(({ text, path }) => <a href={path}>{text}</a>)}
{navigationItems.top(organism?.key, isLoggedIn, loginUrl).map(({ text, path }) => <a href={path}>{text}</a>)}
</div>

<div class='sm:hidden fixed z-0'>
<SandwichMenu top={16} right={28} organism={organism} knownOrganisms={knownOrganisms} client:load />
<SandwichMenu
top={16}
right={28}
organism={organism}
knownOrganisms={knownOrganisms}
isLoggedIn={isLoggedIn}
loginUrl={loginUrl}
client:load
/>
</div>
</div>
6 changes: 4 additions & 2 deletions website/src/components/Navigation/SandwichMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ type SandwichMenuProps = {
right: number;
organism: Organism | undefined;
knownOrganisms: Organism[];
isLoggedIn: boolean;
loginUrl: string | undefined;
};

export const SandwichMenu: FC<SandwichMenuProps> = ({ top, right, organism, knownOrganisms }) => {
export const SandwichMenu: FC<SandwichMenuProps> = ({ top, right, organism, knownOrganisms, isLoggedIn, loginUrl }) => {
const { isOpen, toggle: toggleMenu, close: closeMenu } = useOffCanvas();

return (
Expand Down Expand Up @@ -48,7 +50,7 @@ export const SandwichMenu: FC<SandwichMenuProps> = ({ top, right, organism, know
path={routes.organismStartPage(organism.key)}
/>
))}
{navigationItems.top(organism?.key).map(({ text, path }) => (
{navigationItems.top(organism?.key, isLoggedIn, loginUrl).map(({ text, path }) => (
<OffCanvasNavItem key={path} text={text} level={1} path={path} />
))}
</div>
Expand Down
16 changes: 7 additions & 9 deletions website/src/routes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ export const navigationItems = {
],
};

function topNavigationItems(organism: string | undefined) {
function topNavigationItems(organism: string | undefined, isLoggedIn: boolean, loginUrl: string | undefined) {
if (organism === undefined) {
return [
{
Expand All @@ -186,10 +186,9 @@ function topNavigationItems(organism: string | undefined) {
text: 'Submit',
path: routes.organismSelectorPage('submit'),
},
{
text: 'User',
path: routes.userOverviewPage(),
},
...(isLoggedIn
? [{ text: 'My account', path: routes.userOverviewPage() }]
: [{ text: 'Login', path: loginUrl! }]),
{
text: 'Datasets',
path: routes.datasetsPage(),
Expand All @@ -210,10 +209,9 @@ function topNavigationItems(organism: string | undefined) {
text: 'Revise',
path: routes.revisePage(organism),
},
{
text: 'User',
path: routes.userOverviewPage(organism),
},
...(isLoggedIn
? [{ text: 'My account', path: routes.userOverviewPage(organism) }]
: [{ text: 'Login', path: loginUrl! }]),
{
text: 'Datasets',
path: routes.datasetsPage(),
Expand Down
Loading