diff --git a/srcs/requirements/svelte/api_front/src/stores/loginStatusStore.js b/srcs/requirements/svelte/api_front/old_unused/loginStatusStore.js similarity index 100% rename from srcs/requirements/svelte/api_front/src/stores/loginStatusStore.js rename to srcs/requirements/svelte/api_front/old_unused/loginStatusStore.js diff --git a/srcs/requirements/svelte/api_front/src/pages/SplashPage.svelte b/srcs/requirements/svelte/api_front/src/pages/SplashPage.svelte index f50bb74a..d803bf9c 100644 --- a/srcs/requirements/svelte/api_front/src/pages/SplashPage.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/SplashPage.svelte @@ -2,32 +2,19 @@ import Canvas from "../pieces/Canvas.svelte"; import { push } from "svelte-spa-router"; import { onMount } from 'svelte'; - import { userStore, userLogout } from '../stores/loginStatusStore.js'; import { get } from "svelte/store"; + let user; + onMount(async () => { - // console.log('SplashPage testing if logged in') - - // hold on, maybe this is all i need? - let user = await fetch('http://transcendance:8080/api/v2/user') + user = await fetch('http://transcendance:8080/api/v2/user') .then((resp) => resp.json()) - // .then((data) => void userStore.set(data)) // this returns void so local var user is undefined... - // .catch( userLogout(); ) - // yea ok i don't know how to use catch... - // Testing Svelet get(store) + // i mean i could do a failed to load user or some shit, maybe with a .catch or something? but atm why bother - // let tmp = get(userStore); - // console.log('in SplashPage get(store)') - // console.log(tmp) - - - // userStore.set(user); - // console.log('user in userStore'); - // console.log($userStore); - // console.log('now user in the local var'); - // console.log(user); + console.log('User var'); + console.log(user); // if (user && user.statusCode && user.statusCode === 403) { // console.log('user not logged in') // } @@ -39,24 +26,14 @@ // if (user === undefined) { if (user && user.statusCode && user.statusCode === 403) { console.log('on mount no user, returned status code 403 so logging out of userStore') - userLogout(); // which i think should delete any previous local storage + // userLogout(); // which i think should delete any previous local storage } - // in theory now we should be logged in... }); const login = async() => { window.location.href = 'http://transcendance:8080/api/v2/auth'; - // await fetch ('http://transcendance:8080/api/v2/auth'); console.log('you are now logged in'); - - await fetch('http://transcendance:8080/api/v2/user') - .then((resp) => resp.json()) - .then((data) => userStore.set(data)); - // .then((data) => void userStore.set(data)); - - // decide if do this here on in backend - // push('/profile'); } // i could prolly put this in it's own compoent, i seem to use it in several places... or maybe just some JS? like no need for html @@ -65,8 +42,7 @@ await fetch('http://transcendance:8080/api/v2/auth/logout', { method: 'POST', }); - // loginStatus.allFalse() - userLogout(); + user = undefined; }; @@ -75,7 +51,8 @@

Potato Pong