Merge pull request #48 from dscsnu/SmallFix

Token FIx

Author: lalitm1004

frontend/src/routes/+layout.svelte

@@ -1,59 +1,73 @@
 <script lang="ts">
-	import '../app.css';
-    import { onMount } from 'svelte';
-    import { invalidateAll } from '$app/navigation';
-    import { device, setDevice } from '$lib/stores/DeviceStore';
-    import { SupaStore, UserStore } from '$lib/stores/SupabaseStore';
-    import MobileOnly from '$lib/components/MobileOnly.svelte';
-    import { PUBLIC_ENVIRONMENT } from '$env/static/public';
-    import { setToken, token } from '$lib/stores/TokenStore';
-    import { ToastStore } from '$lib/stores/ToastStore';
-    import Toast from '$lib/components/Toast.svelte';
-    import { LoadingStore } from '$lib/stores/LoadingStore';
-    import Loading from '$lib/components/Loading.svelte';
+	import "../app.css";
+	import { onMount } from "svelte";
+	import { invalidateAll } from "$app/navigation";
+	import { device, setDevice } from "$lib/stores/DeviceStore";
+	import { SupaStore, UserStore } from "$lib/stores/SupabaseStore";
+	import MobileOnly from "$lib/components/MobileOnly.svelte";
+	import { PUBLIC_ENVIRONMENT } from "$env/static/public";
+	import { setToken } from "$lib/stores/TokenStore";
+	import { ToastStore } from "$lib/stores/ToastStore";
+	import Toast from "$lib/components/Toast.svelte";
+	import { LoadingStore } from "$lib/stores/LoadingStore";
+	import Loading from "$lib/components/Loading.svelte";
 
 	let { data, children } = $props();
 	let { supabase, session, user } = $derived(data);
 
 	onMount(() => {
 		const {
-			data: { subscription }
+			data: { subscription },
 		} = supabase.auth.onAuthStateChange((event, newSession) => {
-			if (newSession?.expires_at !== session?.expires_at || event === 'SIGNED_OUT') {
+			if (
+				newSession?.expires_at !== session?.expires_at ||
+				event === "SIGNED_OUT"
+			) {
 				setToken(null);
 				invalidateAll();
 			}
 
-			if (['SIGNED_IN', 'TOKEN_REFRESHED'].includes(event) && session?.access_token) {
+			if (
+				["SIGNED_IN", "TOKEN_REFRESHED"].includes(event) &&
+				session?.access_token
+			) {
 				setToken(session.access_token);
 			}
 		});
 
 		SupaStore.set(supabase);
 		UserStore.set(user);
 
-		if (window.matchMedia('(max-width: 767px)').matches) setDevice('mobile');
-        else setDevice('desktop');
+		if (window.matchMedia("(max-width: 767px)").matches)
+			setDevice("mobile");
+		else setDevice("desktop");
 
 		return () => subscription.unsubscribe();
-	})
+	});
 </script>
 
 <!-- handle device resize -->
-<svelte:window onresize={() => setDevice(window.matchMedia('(max-width: 767px').matches ? 'mobile' : 'desktop')}/>
+<svelte:window
+	onresize={() =>
+		setDevice(
+			window.matchMedia("(max-width: 767px").matches
+				? "mobile"
+				: "desktop",
+		)}
+/>
 
-{#if $device === 'mobile' || PUBLIC_ENVIRONMENT === 'development'}
+{#if $device === "mobile" || PUBLIC_ENVIRONMENT === "development"}
 	{@render children()}
 {:else}
 	<MobileOnly />
 {/if}
 
 {#if $ToastStore}
 	{#each $ToastStore as toast (toast.id)}
-		<Toast {...toast}/>
+		<Toast {...toast} />
 	{/each}
 {/if}
 
 {#if $LoadingStore}
 	<Loading />
-{/if}
+{/if}

frontend/src/routes/+page.svelte

@@ -1,7 +1,4 @@
 <script lang="ts">
-    import { onMount } from 'svelte';
-    import { token } from '$lib/stores/TokenStore';
-    import { goto } from '$app/navigation';
     let { data } = $props();
     let { supabase, user } = $derived(data);
 
@@ -17,11 +14,6 @@
             }
         })
     }
-    onMount(() => {
-        if (token) {
-            goto('/newplayer');  
-        }
-    });
 </script>
 
 <main class={`h-screen w-screen flex flex-col justify-center items-center`}>