From 3cdedc921cb6ea6afc76e2a26a6dbff00c0edae9 Mon Sep 17 00:00:00 2001
From: Me <me@Philip.local>
Date: Wed, 7 Dec 2022 19:20:55 +0100
Subject: [PATCH] ok now it actually works, had a few imports left over that i
 needed to get rid of, also added extra protection in my ProfileSettings so
 you can not change the username and it's still ok

---
 .../svelte/api_front/src/pages/TmpTestPage.svelte           | 3 +++
 .../api_front/src/pages/TwoFactorAuthentication.svelte      | 1 -
 .../api_front/src/pages/profile/ProfileSettings.svelte      | 6 +++++-
 .../svelte/api_front/src/routes/primaryRoutes.js            | 6 ++++--
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/srcs/requirements/svelte/api_front/src/pages/TmpTestPage.svelte b/srcs/requirements/svelte/api_front/src/pages/TmpTestPage.svelte
index 708c9c36..53dccaa7 100644
--- a/srcs/requirements/svelte/api_front/src/pages/TmpTestPage.svelte
+++ b/srcs/requirements/svelte/api_front/src/pages/TmpTestPage.svelte
@@ -2,11 +2,14 @@
 
   import { replace } from "svelte-spa-router";
 
+  export let user;
+
 </script>
 
 <div class="wrapper">
   <h1>You made it to Test</h1>
   <button on:click={ () => (replace('/'))}>Go Home</button>
+  <div>{user}</div>
 </div>
 
 <style>
diff --git a/srcs/requirements/svelte/api_front/src/pages/TwoFactorAuthentication.svelte b/srcs/requirements/svelte/api_front/src/pages/TwoFactorAuthentication.svelte
index 3731a995..1d74ad9d 100644
--- a/srcs/requirements/svelte/api_front/src/pages/TwoFactorAuthentication.svelte
+++ b/srcs/requirements/svelte/api_front/src/pages/TwoFactorAuthentication.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import { onMount } from "svelte";
   import { push } from "svelte-spa-router";
-  import { userStore, userLogout } from "../../old_unused/loginStatusStore";
 
   // onMount( async() => {
   //  await fetch("http://transcendance:8080/api/v2/auth/2fa/generate",
diff --git a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte
index b59df40b..bc4370ce 100644
--- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte
+++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte
@@ -54,13 +54,17 @@
 
     // I don't really care which i use at this point...
     // if (set.username === nameTmp) {
-    if (set.username === user.username || (set.username.trim() === '' && set.username !== '')) {
+    if (set.username === user.username || (set.username !== '' && set.username.trim() === '')) {
       errors.username = 'Invalid new username';
       valid = false;
     } else {
       errors.username = '';
       valid = true;
     }
+    if (set.username === '') {
+      set.username === nameTmp;
+      // set.username === user.username;
+    }
 
     if (valid) {
       await fetch('http://transcendance:8080/api/v2/user',{
diff --git a/srcs/requirements/svelte/api_front/src/routes/primaryRoutes.js b/srcs/requirements/svelte/api_front/src/routes/primaryRoutes.js
index 8bc5abe8..e3d1c7b5 100644
--- a/srcs/requirements/svelte/api_front/src/routes/primaryRoutes.js
+++ b/srcs/requirements/svelte/api_front/src/routes/primaryRoutes.js
@@ -6,7 +6,6 @@ import UnauthorizedAccessPage from '../pages/UnauthorizedAccessPage.svelte';
 import { wrap } from 'svelte-spa-router/wrap'
 import { get } from 'svelte/store';
 import TestPage from '../pages/TmpTestPage.svelte';
-import { userStore, userLogout } from "../stores/loginStatusStore";
 
 
 
@@ -141,7 +140,10 @@ export const primaryRoutes = {
         else
           return false;
       }
-    ]
+    ],
+    // props: {
+    //   user: user
+    // }
   }),
   '/profile': wrap({
     component: ProfilePage,