feat(web): add Shell component with header, sidebar, and user menu
Persistent chrome used by every authenticated route. Sidebar hides below md:; mobile nav is a separate concern for a later plan.
This commit is contained in:
@@ -0,0 +1,80 @@
|
|||||||
|
<script lang="ts">
|
||||||
|
import { page } from '$app/state';
|
||||||
|
import { goto } from '$app/navigation';
|
||||||
|
import { user, logout } from '$lib/auth/store.svelte';
|
||||||
|
|
||||||
|
let { children } = $props<{ children: import('svelte').Snippet }>();
|
||||||
|
|
||||||
|
let menuOpen = $state(false);
|
||||||
|
|
||||||
|
async function handleLogout() {
|
||||||
|
menuOpen = false;
|
||||||
|
await logout();
|
||||||
|
goto('/login', { replaceState: true });
|
||||||
|
}
|
||||||
|
|
||||||
|
function isActive(href: string): boolean {
|
||||||
|
if (href === '/') return page.url.pathname === '/';
|
||||||
|
return page.url.pathname.startsWith(href);
|
||||||
|
}
|
||||||
|
|
||||||
|
const navItems = [
|
||||||
|
{ href: '/', label: 'Library' },
|
||||||
|
{ href: '/search', label: 'Search' },
|
||||||
|
{ href: '/playlists', label: 'Playlists' }
|
||||||
|
];
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<svelte:window onclick={() => (menuOpen = false)} onkeydown={(e) => e.key === 'Escape' && (menuOpen = false)} />
|
||||||
|
|
||||||
|
<div class="grid h-screen grid-cols-[auto_1fr] grid-rows-[auto_1fr] bg-background text-text-primary">
|
||||||
|
<header class="col-span-2 flex items-center justify-between border-b border-border bg-surface px-4 py-3">
|
||||||
|
<div class="font-semibold">Minstrel</div>
|
||||||
|
<div class="relative">
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="rounded px-3 py-1 hover:bg-surface-hover"
|
||||||
|
onclick={(e) => { e.stopPropagation(); menuOpen = !menuOpen; }}
|
||||||
|
>
|
||||||
|
{user.value?.username ?? ''}
|
||||||
|
</button>
|
||||||
|
{#if menuOpen}
|
||||||
|
<div
|
||||||
|
class="absolute right-0 mt-1 w-32 rounded border border-border bg-surface shadow"
|
||||||
|
onclick={(e) => e.stopPropagation()}
|
||||||
|
onkeydown={(e) => e.stopPropagation()}
|
||||||
|
role="menu"
|
||||||
|
tabindex="-1"
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="block w-full px-3 py-2 text-left hover:bg-surface-hover"
|
||||||
|
onclick={handleLogout}
|
||||||
|
>
|
||||||
|
Log out
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
<nav class="hidden w-48 border-r border-border bg-surface md:block">
|
||||||
|
<ul class="p-2">
|
||||||
|
{#each navItems as item}
|
||||||
|
<li>
|
||||||
|
<a
|
||||||
|
href={item.href}
|
||||||
|
class="block rounded px-3 py-2 hover:bg-surface-hover"
|
||||||
|
aria-current={isActive(item.href) ? 'page' : undefined}
|
||||||
|
>
|
||||||
|
{item.label}
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
{/each}
|
||||||
|
</ul>
|
||||||
|
</nav>
|
||||||
|
|
||||||
|
<main class="overflow-y-auto p-4 md:col-start-2">
|
||||||
|
{@render children?.()}
|
||||||
|
</main>
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
import { afterEach, describe, expect, test, vi } from 'vitest';
|
||||||
|
import { render, screen, fireEvent } from '@testing-library/svelte';
|
||||||
|
|
||||||
|
vi.mock('$app/state', () => ({
|
||||||
|
page: { url: new URL('http://localhost/') }
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock('$app/navigation', () => ({
|
||||||
|
goto: vi.fn()
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock('$lib/auth/store.svelte', () => ({
|
||||||
|
user: { value: { id: '1', username: 'alice', is_admin: false } },
|
||||||
|
logout: vi.fn().mockResolvedValue(undefined)
|
||||||
|
}));
|
||||||
|
|
||||||
|
import Shell from './Shell.svelte';
|
||||||
|
import { logout } from '$lib/auth/store.svelte';
|
||||||
|
import { goto } from '$app/navigation';
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
vi.clearAllMocks();
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('Shell', () => {
|
||||||
|
test('renders the username in the header', () => {
|
||||||
|
render(Shell);
|
||||||
|
expect(screen.getByText('alice')).toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('renders three nav items: Library, Search, Playlists', () => {
|
||||||
|
render(Shell);
|
||||||
|
expect(screen.getByRole('link', { name: 'Library' })).toHaveAttribute('href', '/');
|
||||||
|
expect(screen.getByRole('link', { name: 'Search' })).toHaveAttribute('href', '/search');
|
||||||
|
expect(screen.getByRole('link', { name: 'Playlists' })).toHaveAttribute('href', '/playlists');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('user-menu "Log out" calls logout() and navigates to /login', async () => {
|
||||||
|
render(Shell);
|
||||||
|
await fireEvent.click(screen.getByRole('button', { name: /alice/i }));
|
||||||
|
await fireEvent.click(screen.getByRole('button', { name: /log out/i }));
|
||||||
|
expect(logout).toHaveBeenCalledTimes(1);
|
||||||
|
expect(goto).toHaveBeenCalledWith('/login', { replaceState: true });
|
||||||
|
});
|
||||||
|
});
|
||||||
+21
-2
@@ -9,6 +9,25 @@
|
|||||||
"skipLibCheck": true,
|
"skipLibCheck": true,
|
||||||
"sourceMap": true,
|
"sourceMap": true,
|
||||||
"strict": true,
|
"strict": true,
|
||||||
"moduleResolution": "bundler"
|
"moduleResolution": "bundler",
|
||||||
}
|
"types": ["node", "vitest"]
|
||||||
|
},
|
||||||
|
"include": [
|
||||||
|
".svelte-kit/ambient.d.ts",
|
||||||
|
".svelte-kit/non-ambient.d.ts",
|
||||||
|
".svelte-kit/types/**/$types.d.ts",
|
||||||
|
"vite.config.js",
|
||||||
|
"vite.config.ts",
|
||||||
|
"vitest.config.ts",
|
||||||
|
"vitest.setup.ts",
|
||||||
|
"src/**/*.js",
|
||||||
|
"src/**/*.ts",
|
||||||
|
"src/**/*.svelte",
|
||||||
|
"test/**/*.js",
|
||||||
|
"test/**/*.ts",
|
||||||
|
"test/**/*.svelte",
|
||||||
|
"tests/**/*.js",
|
||||||
|
"tests/**/*.ts",
|
||||||
|
"tests/**/*.svelte"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
import { sveltekit } from '@sveltejs/kit/vite';
|
import { sveltekit } from '@sveltejs/kit/vite';
|
||||||
|
import { svelteTesting } from '@testing-library/svelte/vite';
|
||||||
import { defineConfig } from 'vitest/config';
|
import { defineConfig } from 'vitest/config';
|
||||||
|
|
||||||
export default defineConfig({
|
export default defineConfig({
|
||||||
plugins: [sveltekit()],
|
plugins: [sveltekit(), svelteTesting()],
|
||||||
test: {
|
test: {
|
||||||
environment: 'jsdom',
|
environment: 'jsdom',
|
||||||
include: ['src/**/*.test.ts'],
|
include: ['src/**/*.test.ts'],
|
||||||
|
|||||||
Reference in New Issue
Block a user