diff --git a/frontend/src/hooks.server.ts b/frontend/src/hooks.server.ts index 24cea5a..65c3426 100644 --- a/frontend/src/hooks.server.ts +++ b/frontend/src/hooks.server.ts @@ -38,7 +38,6 @@ export const handle: Handle = async ({ event, resolve }) => { // Fam-user session: pb_token JWT → authRefresh → locals.user. const token = event.cookies.get(SESSION_COOKIE); - if (token) { const pb = createPbClient(token); try { @@ -50,7 +49,6 @@ export const handle: Handle = async ({ event, resolve }) => { // name/role/famId, since PB doesn't embed custom fields in the // token itself. const { record, token: freshToken } = await pb.collection('users').authRefresh(); - event.locals.user = { id: record.id, name: record.name || record.username || '', @@ -71,4 +69,4 @@ export const handle: Handle = async ({ event, resolve }) => { } return resolve(event); -}; \ No newline at end of file +}; diff --git a/frontend/src/lib/components/Sidebar.svelte b/frontend/src/lib/components/Sidebar.svelte index 5db33c0..61e2ae4 100644 --- a/frontend/src/lib/components/Sidebar.svelte +++ b/frontend/src/lib/components/Sidebar.svelte @@ -13,15 +13,9 @@ let { famName = '', session = null, isParent = false, role = 'child' } = $props(); - let collapsed = $state(false); - let famSlug = $derived(page.data.famSlug ?? page.params.fam); let memberName = $derived(session?.memberName || page.params.username || ''); - function toggle() { - collapsed = !collapsed; - } - let showChildItems = $derived(!!memberName); let navItems = $derived( @@ -49,28 +43,24 @@ ? [{ href: `/${famSlug}/${memberName}/settings`, label: 'Settings', icon: settingsIcon }] : []), { - href: session ? '/logout' : '/login', + href: session ? '/logout' : role === 'child' ? `/${famSlug}/join` : '/login', label: session ? 'Log out' : 'Log in', icon: logoutIcon } ]); -