From cbba25f939a12026816c1b8202d821f57606f248 Mon Sep 17 00:00:00 2001 From: Kit La Touche Date: Thu, 21 Nov 2024 16:25:04 -0500 Subject: Clean up extraneous variables Just use state, don't derive from a non-state local variable. --- ui/lib/components/CreateChannelForm.svelte | 7 +++---- ui/lib/components/MessageInput.svelte | 8 +++----- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/ui/lib/components/CreateChannelForm.svelte b/ui/lib/components/CreateChannelForm.svelte index afa3f78..d50e60d 100644 --- a/ui/lib/components/CreateChannelForm.svelte +++ b/ui/lib/components/CreateChannelForm.svelte @@ -2,17 +2,16 @@ import { createChannel } from '$lib/apiServer'; let name = $state(''); - let pending = false; - let disabled = $derived(pending); + let disabled = $state(false); async function handleSubmit(event) { event.preventDefault(); - pending = true; + disabled = true; const response = await createChannel(name); if (200 <= response.status && response.status < 300) { name = ''; } - pending = false; + disabled = false; } diff --git a/ui/lib/components/MessageInput.svelte b/ui/lib/components/MessageInput.svelte index 26521e1..22456f3 100644 --- a/ui/lib/components/MessageInput.svelte +++ b/ui/lib/components/MessageInput.svelte @@ -5,16 +5,14 @@ let form; let value = $state(''); - let pending = false; - - let disabled = $derived(pending); + let disabled = $state(false); async function onSubmit(event) { event.preventDefault(); - pending = true; + disabled = true; await postToChannel(channel, value); form.reset(); - pending = false; + disabled = false; } function onKeyDown(event) { -- cgit v1.2.3 From c2f711c56a3bc736cf507a920dee0915b69af77e Mon Sep 17 00:00:00 2001 From: Kit La Touche Date: Thu, 21 Nov 2024 16:26:10 -0500 Subject: Use store.set where appropriate If you're setting it to a static value, use set. --- ui/lib/components/LogOut.svelte | 2 +- ui/routes/(app)/+layout.svelte | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ui/lib/components/LogOut.svelte b/ui/lib/components/LogOut.svelte index 25dd5e9..52aa039 100644 --- a/ui/lib/components/LogOut.svelte +++ b/ui/lib/components/LogOut.svelte @@ -7,7 +7,7 @@ event.preventDefault(); const response = await logOut(); if (200 <= response.status && response.status < 300) { - currentUser.update(() => null); + currentUser.set(null); goto('/login'); } } diff --git a/ui/routes/(app)/+layout.svelte b/ui/routes/(app)/+layout.svelte index cc900a6..e542f24 100644 --- a/ui/routes/(app)/+layout.svelte +++ b/ui/routes/(app)/+layout.svelte @@ -20,10 +20,10 @@ let channel = $derived($page.params.channel); function onBooted(boot) { - currentUser.update(() => ({ + currentUser.set({ id: boot.login.id, username: boot.login.name - })); + }); logins.update((value) => value.setLogins(boot.logins)); channelsList.update((value) => value.setChannels(boot.channels)); messages.update((value) => value.setMessages(boot.messages)); @@ -51,11 +51,11 @@ events = subscribeToEvents(response.data.resume_point); break; case 401: - currentUser.update(() => null); + currentUser.set(null); goto('/login'); break; case 503: - currentUser.update(() => null); + currentUser.set(null); goto('/setup'); break; default: -- cgit v1.2.3