summaryrefslogtreecommitdiff
path: root/ui/routes/(app)/+layout.svelte
diff options
context:
space:
mode:
authorOwen Jacobson <owen@grimoire.ca>2024-10-10 22:30:18 -0400
committerOwen Jacobson <owen@grimoire.ca>2024-10-10 23:08:36 -0400
commit2e2e3980ab78052be74f4007c343e69a583648fe (patch)
treee791f18ee018a504db6da4939a8b82d1d84fe725 /ui/routes/(app)/+layout.svelte
parent1798988c5bc6ad8c2286848df14c7fa478e135d1 (diff)
Compute the active channel from the current routing state, not from a store.
Diffstat (limited to 'ui/routes/(app)/+layout.svelte')
-rw-r--r--ui/routes/(app)/+layout.svelte6
1 files changed, 4 insertions, 2 deletions
diff --git a/ui/routes/(app)/+layout.svelte b/ui/routes/(app)/+layout.svelte
index f8744c1..1d561ae 100644
--- a/ui/routes/(app)/+layout.svelte
+++ b/ui/routes/(app)/+layout.svelte
@@ -1,5 +1,6 @@
<script>
import { onMount } from 'svelte';
+ import { page } from '$app/stores';
import { boot, subscribeToEvents } from '$lib/apiServer';
import { currentUser, logins, channelsList, messages } from '$lib/store';
@@ -11,6 +12,7 @@
let user;
let loading = true;
+ $: channel = $page?.params?.channel;
currentUser.subscribe((value) => {
user = value;
@@ -53,7 +55,7 @@
{:else if user != null}
<div id="interface">
<div class="channel-list">
- <ChannelList />
+ <ChannelList active={channel} />
</div>
<div class="active-channel">
<slot />
@@ -62,7 +64,7 @@
<CreateChannelForm />
</div>
<div class="create-message">
- <MessageInput />
+ <MessageInput {channel} />
</div>
</div>
{:else}