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

Close hamburger menu on navbar item click #168

Merged
merged 1 commit into from
May 4, 2024
Merged

Close hamburger menu on navbar item click #168

Show file tree
Hide file tree
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
25 changes: 25 additions & 0 deletions frontend/src/lib/components/NavbarItem.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<script lang="ts">
import {unreachable} from '$lib/assert';

export let href: string;
export let text: string;
export let type: 'link' | 'button' = 'link';
export let reload = false;
export let closeMenu: () => void;

let linkClass: string;
$: switch (type) {
case 'link':
linkClass = 'navbar-item';
break;
case 'button':
linkClass = 'button';
break;
default:
unreachable(type);
}
</script>

<a class={linkClass} {href} on:click={() => closeMenu()} data-sveltekit-reload={reload || null}>
{text}
</a>
33 changes: 22 additions & 11 deletions frontend/src/routes/+layout.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<script lang="ts">
import {onMount} from 'svelte';

import NavbarItem from '$lib/components/NavbarItem.svelte';
import {loginState, refreshLoginState} from '$lib/stores';

let menuOpened = false;
Expand All @@ -9,6 +10,10 @@
menuOpened = !menuOpened;
}

function closeMenu(): void {
menuOpened = false;
}

onMount(() => {
refreshLoginState();
});
Expand Down Expand Up @@ -46,26 +51,32 @@
</div>
<div id="navbar-contents" class="navbar-menu" class:is-active={menuOpened}>
<div class="navbar-start">
<a class="navbar-item" href="/">Home</a>
<NavbarItem text="Home" href="/" {closeMenu} />
{#if $loginState?.username}
<a class="navbar-item" href="/gliders/">My Gliders</a>
<a class="navbar-item" href="/locations/">My Locations</a>
<a class="navbar-item" href="/flights/">My Flights</a>
<a class="navbar-item" href="/stats/">Stats</a>
<a class="navbar-item" href="/flights/add/">Submit flight</a>
<NavbarItem text="My Gliders" href="/gliders/" {closeMenu} />
<NavbarItem text="My Locations" href="/locations/" {closeMenu} />
<NavbarItem text="My Flights" href="/flights/" {closeMenu} />
<NavbarItem text="Stats" href="/stats/" {closeMenu} />
<NavbarItem text="Submit flight" href="/flights/add/" {closeMenu} />
{:else}
<a class="navbar-item" href="/screenshots/">Screenshots</a>
<NavbarItem text="Screenshots" href="/screenshots/" {closeMenu} />
{/if}
</div>
<div class="navbar-end">
<div class="navbar-item">
<div class="buttons">
{#if $loginState?.username}
<a class="button" href="/profile/">Profile</a>
<a class="button" href="/auth/logout/" data-sveltekit-reload>Logout</a>
<NavbarItem text="Profile" href="/profile/" type="button" {closeMenu} />
<NavbarItem
text="Logout"
href="/auth/logout/"
type="button"
reload={true}
{closeMenu}
/>
{:else}
<a class="button is-light" href="/auth/login/">Login</a>
<a class="button is-light" href="/auth/registration/">Register</a>
<NavbarItem text="Login" href="/auth/login/" type="button" {closeMenu} />
<NavbarItem text="Register" href="/auth/registration/" type="button" {closeMenu} />
{/if}
</div>
</div>
Expand Down