1 files changed, 70 insertions, 83 deletions

diff --git a/fe/src/stores/auth.ts b/fe/src/stores/auth.ts
index 0efc80b..63f027e 100644
--- a/fe/src/stores/auth.ts
+++ b/fe/src/stores/auth.ts
@@ -1,100 +1,87 @@
-import type { Invalidator, Subscriber, Unsubscriber } from 'svelte/store';
-import type { Preference } from '../types';
-import { writable, derived } from 'svelte/store';
+import type { Preference, TokenStore, Nullable, UserStore, User, PreferenceStore } from "../types";
+import { writable, derived } from "svelte/store";
 
-type Nullable<T> = T | null;
-
-interface User {
-  uuid: string;
-  username: string;
-}
-
-interface TokenStore {
-  subscribe: (run: Subscriber<Nullable<string>>, invalidate?: Invalidator<Nullable<string>>) => Unsubscriber,
-  authenticate: (newToken: string) => void,
-  unauthenticate: () => void
-}
-
-
-interface UserStore {
-  subscribe: (run: Subscriber<Nullable<User>>, invalidate?: Invalidator<Nullable<User>>) => Unsubscriber,
-  setUser: (user: User) => void,
-  reset: () => void
-}
-
-interface PreferenceStore {
-  subscribe: (run: Subscriber<Preference>, invalidate?: Invalidator<Preference>) => Unsubscriber,
-  set: (this: void, value: Preference) => void
-}
 
 function createTokenStore(): TokenStore {
-  const storedToken = localStorage.getItem("token");
-  const { subscribe, set } = writable<string | null>(storedToken);
-
-  function authenticate(newToken: string): void {
-    try {
-      localStorage.setItem("token", newToken);
-      set(newToken);
-    } catch (e) {
-      console.error('error', e);
+    const storedToken = localStorage.getItem("token");
+    const { subscribe, set } = writable<string | null>(storedToken);
+
+    function authenticate(newToken: string): void {
+        try {
+            localStorage.setItem("token", newToken);
+            set(newToken);
+        } catch (e) {
+            console.error("error", e);
+        }
+    }
+
+    function unauthenticate(): void {
+        localStorage.removeItem("token");
+        set(null);
     }
-  }
-
-  function unauthenticate(): void {
-    localStorage.removeItem("token");
-    set(null);
-  }
-
-  return {
-    subscribe,
-    authenticate,
-    unauthenticate
-  };
+
+    return {
+        subscribe,
+        authenticate,
+        unauthenticate
+    };
 }
 
 function onTokenChange($token: Nullable<string>): boolean {
-  return $token ? true : false;
+    return $token ? true : false;
 }
 
 function createUserStore(): UserStore {
-  const user = localStorage.getItem('user');
-  const userObj: Nullable<User> = user ? JSON.parse(user) : null;
-  const { subscribe, set } = writable<User | null>(userObj);
-
-  const setUser = (user: User) => {
-    localStorage.setItem('user', JSON.stringify(user));
-    set(user);
-  }
-
-  const reset = () => {
-    localStorage.removeItem('user');
-    set(null);
-  }
-
-  return {
-    subscribe,
-    setUser,
-    reset
-  }
+    const user = localStorage.getItem("user");
+    const userObj: Nullable<User> = user ? JSON.parse(user) : null;
+    const { subscribe, set } = writable<User | null>(userObj);
+
+    const setUser = (user: User) => {
+        localStorage.setItem("user", JSON.stringify(user));
+        set(user);
+    };
+
+    const reset = () => {
+        localStorage.removeItem("user");
+        set(null);
+    };
+
+    return {
+        subscribe,
+        setUser,
+        reset
+    };
 }
 
 
 function createPreferenceStore(): PreferenceStore {
-  const preferences = localStorage.getItem('preferences');
-  const preferenceObj: Preference = preferences ? JSON.parse(preferences) : {
-    color: "#FF0000",
-    size: {
-      size: 16,
-      unit: 'oz'
-    }
-  };
-
-  const { subscribe, set } = writable<Preference>(preferenceObj);
-
-  return {
-    subscribe,
-    set
-  }
+    const preferences = localStorage.getItem("preferences");
+    const preferenceObj: Preference = preferences ? JSON.parse(preferences) : {
+        id: 0,
+        color: "#FF0000",
+        size_id: 0,
+        user_id: 0
+    };
+
+    const { subscribe, set, update } = writable<Nullable<Preference>>(preferenceObj);
+
+    const setPreference = (preference: Preference) => {
+        localStorage.setItem("preference", JSON.stringify(preference));
+        set(preference);
+    };
+
+    const reset = () => {
+        localStorage.removeItem("preference");
+        set(null);
+    };
+
+    return {
+        set,
+        subscribe,
+        reset,
+        update,
+        setPreference,
+    };
 }
 
 export const token = createTokenStore();