From 18c458d91ca5e7187ffb3615fca8970fc6e4ca65 Mon Sep 17 00:00:00 2001
From: ivarlovlie <git@ivarlovlie.no>
Date: Mon, 6 Jun 2022 15:48:53 +0200
Subject: feat: More work on portal

---
 apps/projects/src/app/index.svelte                 |  3 ++-
 apps/projects/src/app/lib/services/user-service.ts | 21 +++++++--------------
 2 files changed, 9 insertions(+), 15 deletions(-)

(limited to 'apps/projects/src')

diff --git a/apps/projects/src/app/index.svelte b/apps/projects/src/app/index.svelte
index c217797..77d290d 100644
--- a/apps/projects/src/app/index.svelte
+++ b/apps/projects/src/app/index.svelte
@@ -24,7 +24,6 @@
 	}
 
 	const queryClient = new QueryClient();
-
 	
 	const routes = {
 		"/home": wrap({
@@ -47,7 +46,9 @@
 		"*": NotFound,
 	};
 </script>
+
 <PreHeader show="{!online}">You seem to be offline, please check your internet connection.</PreHeader>
+
 <QueryClientProvider client={queryClient}>
     <Router
             {routes}
diff --git a/apps/projects/src/app/lib/services/user-service.ts b/apps/projects/src/app/lib/services/user-service.ts
index 6e4a200..4155819 100644
--- a/apps/projects/src/app/lib/services/user-service.ts
+++ b/apps/projects/src/app/lib/services/user-service.ts
@@ -1,21 +1,14 @@
-import {delete_account, logout} from "$shared/lib/api/user";
 import {portal_base} from "$shared/lib/configuration";
-import {clear_session_data} from "$shared/lib/session";
+import {end_session} from "$shared/lib/session";
 import {clear_categories} from "$app/lib/stores/categories";
 import {clear_entries} from "$app/lib/stores/entries";
 import {clear_labels} from "$app/lib/stores/labels";
 
 export async function logout_user(reason: string = "") {
-    await logout();
-    clear_session_data();
-    clear_categories();
-    clear_labels();
-    clear_entries();
-    location.replace(portal_base("#/login" + (reason ? "?" + reason : "")));
-}
-
-export async function delete_user() {
-    await delete_account();
-    clear_session_data();
-    location.replace(portal_base("#/login?deleted"));
+    await end_session(() => {
+        clear_categories();
+        clear_labels();
+        clear_entries();
+        location.replace(portal_base("#/login" + (reason ? "?" + reason : "")));
+    });
 }
-- 
cgit v1.3