Improve login behaviour

OpenShock · Apr 13, 2024 · ef94e34 · ef94e34
1 parent 730eae2
commit ef94e34
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/lib/stores/UserStore.ts b/src/lib/stores/UserStore.ts
@@ -3,11 +3,12 @@ import { usersApi } from "$lib/api";
 import type { ApiUser, ApiUserSelf } from "$lib/types/ApiUser";
 import { writable } from "svelte/store";
 
-
 export const UserSelfStore = writable<ApiUserSelf | null>(null);
 export const UsersStore = writable<ApiUser[]>([]);
 
-if (browser) {
+export function refreshUserSelf() {
+  if (!browser) return;
+
   usersApi.usersGetSelf().then(({ data, message }) => {
     if (!data) {
       console.error(`Failed to get user self: ${message}`);
@@ -28,3 +29,5 @@ if (browser) {
     console.error(error);
   });
 }
+
+refreshUserSelf();
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
@@ -10,6 +10,7 @@
   import { modalRegistry } from '$lib/modals';
   import { page } from '$app/stores';
   import { buildMetaData } from '$lib/metadata';
+  import { UserSelfStore } from '$lib/stores/UserStore';
 
   storePopup.set({ computePosition, autoUpdate, flip, shift, offset, arrow });
   initializeStores();
@@ -25,7 +26,9 @@
 
 <AppShell>
   <Header slot="header" />
-  <Sidebar slot="sidebarLeft" />
+  {#if $UserSelfStore}
+    <Sidebar slot="sidebarLeft" />
+  {/if}
   <slot />
   <Footer slot="pageFooter" />
 </AppShell>
diff --git a/src/routes/login/+page.svelte b/src/routes/login/+page.svelte
@@ -3,6 +3,7 @@
   import { accountApi } from '$lib/api';
   import PasswordInput from '$lib/components/PasswordInput.svelte';
   import TextInput from '$lib/components/TextInput.svelte';
+  import { refreshUserSelf } from '$lib/stores/UserStore';
   import type { ValidationResult } from '$lib/types/ValidationResult';
 
   let usernameOrEmail = '';
@@ -15,6 +16,7 @@
     accountApi
       .accountLogin({ email: usernameOrEmail, password })
       .then(() => {
+        refreshUserSelf();
         goto('/home');
       })
       .catch((err) => {