From 72f3d8c5ab3e2a42cf1a76d0c08815dbe46e50a1 Mon Sep 17 00:00:00 2001
From: Owen Jacobson <owen@grimoire.ca>
Date: Fri, 11 Oct 2024 01:18:18 -0400
Subject: Move login to its own route.

This - in passing - fixes the problem where the client failed to subscribe after logging in, by causing the whole subscription process to be re-run when returning to the main interface.
---
 ui/lib/apiServer.js                   | 2 ++
 ui/lib/components/LogIn.svelte        | 4 +++-
 ui/lib/components/LogOut.svelte       | 8 ++++++--
 ui/lib/components/MessageInput.svelte | 2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'ui/lib')

diff --git a/ui/lib/apiServer.js b/ui/lib/apiServer.js
index 538fa85..ccd6e66 100644
--- a/ui/lib/apiServer.js
+++ b/ui/lib/apiServer.js
@@ -66,6 +66,8 @@ export function subscribeToEvents(resume_point) {
         break;
     }
   }
+
+  return evtSource;
 }
 
 function onLoginEvent(data) {
diff --git a/ui/lib/components/LogIn.svelte b/ui/lib/components/LogIn.svelte
index 2836e6d..e1cda8a 100644
--- a/ui/lib/components/LogIn.svelte
+++ b/ui/lib/components/LogIn.svelte
@@ -1,4 +1,5 @@
 <script>
+    import { goto } from '$app/navigation';
     import { logIn } from '$lib/apiServer';
     import { currentUser } from '$lib/store';
 
@@ -6,13 +7,14 @@
     let username = '';
     let password = '';
 
-    async function handleLogin(event) {
+    async function handleLogin() {
         disabled = true;
         const response = await logIn(username, password);
         if (200 <= response.status && response.status < 300) {
             currentUser.update(() => ({ username }));
             username = '';
             password = '';
+            goto('/');
         }
         disabled = false;
     }
diff --git a/ui/lib/components/LogOut.svelte b/ui/lib/components/LogOut.svelte
index 01bef1b..ba0861a 100644
--- a/ui/lib/components/LogOut.svelte
+++ b/ui/lib/components/LogOut.svelte
@@ -1,17 +1,21 @@
 <script>
+    import { goto } from '$app/navigation';
     import { logOut} from '$lib/apiServer';
     import { currentUser } from '$lib/store';
 
-    async function handleLogout(event) {
+    async function handleLogout() {
         const response = await logOut();
         if (200 <= response.status && response.status < 300) {
             currentUser.update(() => null);
+            goto('/login');
         }
     }
 </script>
 
 <form on:submit|preventDefault={handleLogout}>
-    @{$currentUser.username}
+    {#if $currentUser}
+        @{$currentUser.username}
+    {/if}
     <button
         class="border-slate-500 border-solid border-2 font-bold p-1 rounded"
         type="submit"
diff --git a/ui/lib/components/MessageInput.svelte b/ui/lib/components/MessageInput.svelte
index 0da78d4..b2746e0 100644
--- a/ui/lib/components/MessageInput.svelte
+++ b/ui/lib/components/MessageInput.svelte
@@ -4,7 +4,7 @@
 
     export let channel = null;
     let input;
-    let value;
+    let value = '';
     let sending = false;
 
     $: disabled = (channel === null);
-- 
cgit v1.2.3