fix: auth and note by id bugs

src/components/Navbar.svelte

@@ -29,7 +29,19 @@
     import('@sweetalert2/theme-dark/dark.css')
   }
 
-  onMount(async () => updateUserInfo())
+  onMount(async () => {
+    const data = await updateUserInfo()
+
+    if (!data) {
+      return
+    }
+
+    user.set({
+      email: data.email,
+      loggedIn: true,
+      tag: data.tag
+    })
+  })
 
   async function logOut() {
     await signOut()

src/constants.ts

@@ -184,8 +184,7 @@ export const versions = [
   },
 ]
 
-export const API_BASE_URL = 'https://bible-api.deno.dev'
-// export const API_BASE_URL = 'http://localhost:8000'
+export const API_BASE_URL = import.meta.env.VITE_PUBLIC_API_URL ?? 'http://localhost:8000'
 
 export const DEFAULT_NOTE = `
  <div>

src/routes/notes/[id]/+page.svelte

@@ -1,13 +1,10 @@
 <script>
   import { goto } from '$app/navigation'
-  import Button from '@/components/Button.svelte'
   import Editor from '@/components/Editor.svelte'
-  import Create from '@/components/icons/Create.svelte'
-  import Lock from '@/components/icons/Lock.svelte'
   import { API_BASE_URL } from '@/constants'
   import { createAlert } from '@/services/alert.js'
+  import { updateUserInfo } from '@/services/api/auth.js'
   import { editable, getNote, editableNote, sendCreateNote } from '@/state/notes.js'
-  import { draft } from '@/state/study.js'
   import { user } from '@/state/user.js'
   import { isValidNote } from '@/utils/note.js'
   import { onMount } from 'svelte'
@@ -117,6 +114,10 @@
   }
 
   onMount(async () => {
+    if (!$user.loggedIn) {
+      await updateUserInfo()
+    }
+
     if (!$user.loggedIn) {
       goto('/login')
     }

src/services/api/auth.js

@@ -34,10 +34,39 @@ export async function singIn(data) {
     createAlert(message, 'error')
   }
 
+  /**
+   * @type {usrDat}
+   */
+  const usr = await response.json()
+
+  if (usr) {
+    const userInfo = {
+      tag: usr.user,
+      email: usr.email,
+      loggedIn: true
+    }
+
+    user.set({
+      email: usr.email,
+      tag: usr.user,
+      loggedIn: true
+    })
+
+    localStorage.setItem('user', JSON.stringify(userInfo))
+  }
+
   return response
 }
 
 /**
+ * @typedef usrDat {
+ * @property {string} user
+ * @property {string} email
+ * @property {boolean} loggedIn
+ * } 
+ */
+/**
+ * 
  *
  * @param {string} book
  * @returns {Promise<{
@@ -91,6 +120,24 @@ export async function singUp(data) {
     createAlert(message, 'error')
   }
 
+
+  /** @type {usrDat} */
+  const usrData = await response.json()
+
+  user.set({
+    tag: usrData.user,
+    email: usrData.email,
+    loggedIn: true
+  })
+
+  const info = {
+    tag: usrData.user,
+    email: usrData.email,
+    loggedIn: true
+  }
+
+  localStorage.setItem('user', JSON.stringify(info))
+
   return response
 }
 
@@ -124,32 +171,16 @@ export async function updateUserInfo() {
     const local = localStorage.getItem('user')
     const existLocal = local !== null
     if (existLocal) {
+
+      /**
+       * @type {import('@/state/user').User}
+       */
       const usr = JSON.parse(local)
 
-      user.set({
-        email: usr.email,
-        loggedIn: true,
-        tag: usr.tag
-      })
 
-      return user
+      return usr
     }
 
-    const res = await fetch(`${API_BASE_URL}/user`, {
-      credentials: 'include'
-    })
-
-    if (res.ok) {
-      const info = await res.json()
-      localStorage.setItem('user', JSON.stringify(info))
-      user.set({
-        tag: info.tag,
-        loggedIn: true,
-        email: info.email
-      })
-
-      return user
-    }
   } catch (error) {
     console.error(error)
     return null