From 84ab757e1159eac3cd160aac158873deaf51bb3f Mon Sep 17 00:00:00 2001
From: Nicolai Ort <info@nicolai-ort.com>
Date: Sat, 21 Aug 2021 08:34:54 +0200
Subject: [PATCH] More userstore fixes ref #1

---
 src/lib/Apiclient.js       |  1 +
 src/lib/Sidebar.svelte     | 13 +------------
 src/lib/UserStore.js       |  3 +++
 src/routes/__layout.svelte | 14 +++++++++++++-
 src/routes/links.svelte    | 15 +++++++++++++--
 src/routes/login.svelte    |  1 -
 6 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/src/lib/Apiclient.js b/src/lib/Apiclient.js
index b8524c8..a56e2f0 100644
--- a/src/lib/Apiclient.js
+++ b/src/lib/Apiclient.js
@@ -18,6 +18,7 @@ export default class Apiclient {
 	}
 
 	static async getUrls() {
+		console.log("APICALL")
 		return (
 			await axios.get('https://kauft.es/api?showVisits=true', {
 				headers: { Authorization: `Bearer ${UserStore.state.token}` }
diff --git a/src/lib/Sidebar.svelte b/src/lib/Sidebar.svelte
index 3dc62a0..f428af4 100644
--- a/src/lib/Sidebar.svelte
+++ b/src/lib/Sidebar.svelte
@@ -1,21 +1,10 @@
 <script>
 	import UserStore from '$lib/UserStore';
-	import { onDestroy, onMount } from 'svelte';
-	import * as localForage from 'localforage';
+	import { onDestroy } from 'svelte';
 	import Apiclient from './Apiclient';
 
 	$: logged_in = false;
 
-	onMount(() => {
-		localForage.getItem('userdata', (err, value) => {
-			if (value) {
-				if (value.token) {
-					UserStore.login(value);
-				}
-			}
-		});
-	});
-
 	const unsubscribe = UserStore.subscribe((value) => {
 		logged_in = value.isLoggedIn;
 	});
diff --git a/src/lib/UserStore.js b/src/lib/UserStore.js
index 8e7a1e1..9bb6790 100644
--- a/src/lib/UserStore.js
+++ b/src/lib/UserStore.js
@@ -47,6 +47,9 @@ const userStore = () => {
                 return state;
             });
             location.replace("/");
+        },
+        getCurrent(){
+            return state;
         }
     };
 
diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte
index 4e80767..4edfec4 100644
--- a/src/routes/__layout.svelte
+++ b/src/routes/__layout.svelte
@@ -2,8 +2,20 @@
 	import '../app.postcss';
 	import Sidebar from '$lib/Sidebar.svelte';
 	import UserStore from '$lib/UserStore';
+	import { onMount } from 'svelte';
+	import * as localForage from 'localforage';
+
+	onMount(() => {
+		UserStore.init();
+		localForage.getItem('userdata', (err, value) => {
+			if (value) {
+				if (value.token) {
+					UserStore.login(value);
+				}
+			}
+		});
+	});
 
-	UserStore.init();
 </script>
 
 <div style="min-height: 640px;" class="bg-white dark:bg-gray-800">
diff --git a/src/routes/links.svelte b/src/routes/links.svelte
index 73c00b8..b54cc75 100644
--- a/src/routes/links.svelte
+++ b/src/routes/links.svelte
@@ -1,10 +1,21 @@
 <script>
 	import Apiclient from '$lib/Apiclient';
+	import UserStore from '$lib/UserStore';
+	import { onDestroy } from 'svelte';
+
 	$: urls = [];
-	let urlQuery = Apiclient.getUrls().then((res) => {
-		urls = res;
+	let urlQuery;
+
+	const unsubscribe = UserStore.subscribe((value) => {
+		if (value.isLoggedIn) {
+			urlQuery = Apiclient.getUrls().then((res) => {
+				urls = res;
+			});
+		}
 	});
 
+	onDestroy(unsubscribe);
+
 	function deleteUrl(shortcode) {
 		Apiclient.deleteUrl(shortcode).then(() => {
 			urls = urls.filter((url) => url.shortcode != shortcode);
diff --git a/src/routes/login.svelte b/src/routes/login.svelte
index 8fa6b86..64a8c68 100644
--- a/src/routes/login.svelte
+++ b/src/routes/login.svelte
@@ -7,7 +7,6 @@ import Apiclient from '$lib/Apiclient';
 	$: password = "";
 	$: error = "";
 
-	UserStore.init();
 	async function login() {
 		try {
 			const login = await Apiclient.login(username, password);