From 8db4e17a8aa0acd264369ec15affe02c3577a730 Mon Sep 17 00:00:00 2001
From: Azalea <22280294+hykilpikonna@users.noreply.github.com>
Date: Sun, 3 Mar 2024 01:00:36 -0500
Subject: [PATCH] [F] Fix login redirect logic

---
 AquaNet/src/pages/Welcome.svelte | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/AquaNet/src/pages/Welcome.svelte b/AquaNet/src/pages/Welcome.svelte
index b9bc1d28..834f21d1 100644
--- a/AquaNet/src/pages/Welcome.svelte
+++ b/AquaNet/src/pages/Welcome.svelte
@@ -36,7 +36,7 @@
       .catch(e => verifyMsg = `Email verification failed: ${e.message}`)
   }
 
-  async function submit() {
+  async function submit(): Promise<any> {
     submitting = true
 
     // Check if username and password are valid
@@ -71,7 +71,7 @@
     }
     else {
       // Send request to server
-      await USER.login({ email, password, turnstile })
+      await USER.login({ email, password, turnstile }).then(() => window.location.href = "/home")
         .catch(e => {
           if (e.message === 'Email not verified - STATE_0') {
             state = 'verify'
@@ -90,9 +90,6 @@
             submitting = false
           }
         })
-
-      // Redirect to portal page /home
-      window.location.href = "/home"
     }
 
     submitting = false