Skip to content

Commit f69ba56

Browse files
committed
fix tabs, remove debugs
1 parent dd8a82c commit f69ba56

2 files changed

Lines changed: 22 additions & 20 deletions

File tree

src/routes/(authenticated)/shares/user/+layout.svelte

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,32 @@
11
<script lang="ts">
22
import { Plus } from '@lucide/svelte';
3+
import { goto } from '$app/navigation';
4+
import { page } from '$app/state';
35
import type { BasicUserInfo } from '$lib/api/internal/v1';
46
import { Button } from '$lib/components/ui/button';
57
import * as Tabs from '$lib/components/ui/tabs/index.js';
6-
import { refreshOwnHubs } from '$lib/stores/HubsStore';
8+
import { refreshOwnHubs } from '$lib/stores/HubsStore';
79
import { type Snippet, onMount } from 'svelte';
810
import { toast } from 'svelte-sonner';
911
import DialogShareCodeCreate from './dialog-share-code-create.svelte';
1012
import DialogShareCodeCreated from './dialog-share-code-created.svelte';
11-
import { goto } from '$app/navigation';
12-
import { page } from '$app/state';
1313
1414
let createDialogOpen = $state(false);
1515
1616
let createdCode = $state<string | null>(null);
1717
18-
let tab = $derived(page.url.pathname.includes('outstanding') ? 'outstanding' : 'shares');
18+
let tab = $derived(() => {
19+
switch (page.url.pathname) {
20+
case '/shares/user/outgoing':
21+
return 'shares';
22+
case '/shares/user/incoming':
23+
return 'incoming';
24+
case '/shares/user/outstanding':
25+
return 'outstanding';
26+
default:
27+
return 'shares';
28+
}
29+
});
1930
2031
let { children }: { children?: Snippet } = $props();
2132
@@ -41,11 +52,15 @@
4152

4253
<div class="h-full m-8 mt-4 flex flex-col gap-4">
4354
<div class="flex-none flex w-full">
44-
<Tabs.Root value={tab} class="w-[400px]">
55+
<Tabs.Root value={tab()} class="w-[400px]">
4556
<Tabs.List>
4657
<Tabs.Trigger value="shares" onclick={() => navigateTo('outgoing')}>Shares</Tabs.Trigger>
47-
<Tabs.Trigger value="outstanding" onclick={() => navigateTo('outstanding')}>Outstanding Invites & Codes</Tabs.Trigger>
48-
<Tabs.Trigger value="incoming" onclick={() => navigateTo('incoming')}>Shared with Me</Tabs.Trigger>
58+
<Tabs.Trigger value="outstanding" onclick={() => navigateTo('outstanding')}
59+
>Outstanding Invites & Codes</Tabs.Trigger
60+
>
61+
<Tabs.Trigger value="incoming" onclick={() => navigateTo('incoming')}
62+
>Shared with Me</Tabs.Trigger
63+
>
4964
</Tabs.List>
5065
</Tabs.Root>
5166

src/routes/(authenticated)/shares/user/outgoing/+page.svelte

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,17 @@
44
import UserShareItem from './user-share-item.svelte';
55
import LoadingCircle from '$lib/components/svg/LoadingCircle.svelte';
66
import { UserShares, refreshUserShares } from '$lib/stores/UserSharesStore';
7-
import { onMount } from 'svelte';
87
98
let editShareDrawerOpen = $state(false);
109
let editShareDrawerOpenCount = $state(0);
1110
let editIndex = $state(0);
12-
let a = $state(0);
13-
1411
let refreshPromise = $state(refreshUserShares())
1512
1613
function openEditDrawer(userShareIndex: number) {
1714
editIndex = userShareIndex;
1815
editShareDrawerOpenCount += 1;
1916
editShareDrawerOpen = true;
2017
}
21-
22-
onMount(() => {
23-
UserShares.subscribe((value) => {
24-
console.log(value);
25-
}); // logs '0'
26-
});
2718
</script>
2819

2920
{#key editShareDrawerOpenCount}
@@ -35,9 +26,6 @@
3526
{/if}
3627
{/key}
3728

38-
<button onclick={() => a += 1}>aaa</button>
39-
40-
{#key a}
4129
{#await refreshPromise}
4230
<div class="flex justify-center items-center h-full w-full">
4331
<LoadingCircle />
@@ -59,5 +47,4 @@
5947
{:catch error}
6048
<div class="text-red-500">Failed to load shares: {error.message}</div>
6149
{/await}
62-
{/key}
6350

0 commit comments

Comments
 (0)