Merge commit '47b85744ce3b19533a8a0239acba9c17ef06aebc'

derGraph · Aug 20, 2024 · f198781 · f198781
2 parents 41c4281 + 47b8574
commit f198781
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 57 deletions.
diff --git a/src/lib/Leaflet.css b/src/lib/Leaflet.css
diff --git a/src/lib/Leaflet.svelte b/src/lib/Leaflet.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
 	import L from 'leaflet';
-	import 'leaflet/dist/leaflet.css';
 	import { onDestroy, onMount, setContext } from 'svelte';
 	import { modeCurrent } from '@skeletonlabs/skeleton';
 

diff --git a/src/lib/errorStore.js b/src/lib/errorStore.js
@@ -0,0 +1,3 @@
+import { writable } from "svelte/store";
+
+export default writable(new Response());
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
@@ -5,6 +5,7 @@
 	import { Avatar } from '@skeletonlabs/skeleton';
 	import { setModeCurrent, setModeUserPrefers, modeCurrent } from '@skeletonlabs/skeleton';
 	import { onMount } from 'svelte';
+	import errorStore from '$lib/errorStore';
 	import { storePopup } from '@skeletonlabs/skeleton';
 
 	let navHeight = 2;
@@ -29,6 +30,10 @@
 		return 'htstps://upload.wikimedia.org/wikipedia/en/9/9a/Trollface_non-free.png';
 	}
 
+	function resetError() {
+		$errorStore = new Response();
+	}
+
 	$: user = data.user;
 	$: session = data.session;
 </script>
@@ -90,6 +95,27 @@
 			</AppBar>
 		</div>
 	</svelte:fragment>
+	{#if $errorStore.status && $errorStore.status != 200}
+		<div class="md:container md:mx-auto flex flex-row flex flex-col pt-3 rounded-t-3xl">
+			<aside class="alert variant-ghost-warning text-warning-400-500-token">
+				<div class="material-symbols-outlined">warning</div>
+				<div class="alert-message">
+					{#await $errorStore.json()}
+						<h3 class="h3">"Loading..."</h3>
+					{:then parsed}
+						<h3 class="h3">{$errorStore.status} {$errorStore.statusText}: {parsed.message}</h3>
+					{:catch parsingError}
+						<h3 class="h3">Error in response: {parsingError}</h3>
+					{/await}
+				</div>
+				<div class="alert-actions">
+					<button class="btn variant-filled-warning" on:click={resetError}>
+						<span>Ok</span>
+					</button>
+				</div>
+			</aside>
+		</div>
+	{/if}
 	<slot />
 	<svelte:fragment slot="pageFooter">
 		<div

diff --git a/src/routes/sign_in/+page.svelte b/src/routes/sign_in/+page.svelte
@@ -1,27 +1,20 @@
 <script lang="ts">
+	import errorStore from '$lib/errorStore.js';
 	export let form;
 
-	function resetForm() {
-		form!.error = '';
+	$: if(form?.error){
+		$errorStore = new Response(JSON.stringify({
+			message: form.error
+		}), {
+			statusText: "Bad request!",
+			status: 400
+		});
 	}
 </script>
 
 <div class="md:container md:mx-auto py-3 rounded-3xl my-3 bg-surface-100-800-token">
 	<form method="post" class="md:mx-auto max-w-max space-y-3.5">
 		<h3 class="h3 md:mx-auto">Sign in!</h3>
-		{#if form?.error}
-			<aside class="alert variant-ghost-warning text-warning-400-500-token">
-				<div class="material-symbols-outlined">warning</div>
-				<div class="alert-message">
-					<h3 class="h3">{form?.error}</h3>
-				</div>
-				<div class="alert-actions">
-					<button class="btn variant-filled-warning" on:click={resetForm}>
-						<span>Ok</span>
-					</button>
-				</div>
-			</aside>
-		{/if}
 		<label class="label">
 			<span>Username/Email</span>
 			<input name="identifier" class="input" type="text" placeholder="Username/Email" required />

diff --git a/src/routes/sign_up/+page.svelte b/src/routes/sign_up/+page.svelte
@@ -1,27 +1,21 @@
 <script lang="ts">
+	import errorStore from '$lib/errorStore.js';
+
 	export let form;
 
-	function resetForm() {
-		form!.error = '';
+	$: if(form?.error){
+		$errorStore = new Response(JSON.stringify({
+			message: form.error
+		}), {
+			statusText: "Bad request!",
+			status: 400
+		});
 	}
 </script>
 
 <div class="md:container md:mx-auto py-3 rounded-3xl my-3 bg-surface-100-800-token">
 	<form method="post" class="md:mx-auto max-w-max space-y-3.5">
 		<h3 class="h3 md:mx-auto">Sign up!</h3>
-		{#if form?.error}
-			<aside class="alert variant-ghost-warning text-warning-400-500-token">
-				<div class="material-symbols-outlined">warning</div>
-				<div class="alert-message">
-					<h3 class="h3">{form?.error}</h3>
-				</div>
-				<div class="alert-actions">
-					<button class="btn variant-filled-warning" on:click={resetForm}>
-						<span>Ok</span>
-					</button>
-				</div>
-			</aside>
-		{/if}
 		<label class="label">
 			<span>Username</span>
 			<input name="username" class="input" type="text" placeholder="Username" required />

diff --git a/src/routes/user/[requestedUser]/+page.svelte b/src/routes/user/[requestedUser]/+page.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import { Avatar, ListBox } from '@skeletonlabs/skeleton';
 	import { onMount } from 'svelte';
+	import errorStore from '$lib/errorStore.js';
 	import Tiptap from '$lib/Tiptap/+Tiptap.svelte';
 
 	export let data;
@@ -9,8 +10,6 @@
 
 	$: requestedUserName = data.requestedUser;
 
-	let error = new Response();
-
 	let requestedUser = {
 		firstName: '',
 		lastName: '',
@@ -28,7 +27,7 @@
 					requestedUser.username = Object.keys(response_data)[0];
 				});
 			} else {
-				error = response;
+				$errorStore = response;
 			}
 		});
 	});
@@ -75,7 +74,7 @@
 				if (response_data.ok) {
 					return true;
 				} else {
-					error = response_data;
+					$errorStore = response_data;
 					return false;
 				}
 			})
@@ -84,32 +83,10 @@
 				return false;
 			});
 	};
-	function resetError() {
-		error = new Response();
-	}
 </script>
 
 <div class="md:container md:mx-auto py-3 h-full w-full flex flex-row">
 	<div class="flex flex-col w-full bg-surface-100-800-token rounded-3xl items-center">
-		{#if error.status && error.status != 200}
-			<aside class="alert variant-ghost-warning text-warning-400-500-token">
-				<div class="material-symbols-outlined">warning</div>
-				<div class="alert-message">
-					{#await error.json()}
-						<h3 class="h3">"Loading..."</h3>
-					{:then parsed}
-						<h3 class="h3">{error.status} {error.statusText}: {parsed.message}</h3>
-					{:catch parsingError}
-						<h3 class="h3">Error in response: {parsingError}</h3>
-					{/await}
-				</div>
-				<div class="alert-actions">
-					<button class="btn variant-filled-warning" on:click={resetError}>
-						<span>Ok</span>
-					</button>
-				</div>
-			</aside>
-		{/if}
 		{#if requestedUser.firstName && requestedUser.lastName}
 			<Avatar
 				initials={getInitials(requestedUser)}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import { writable } from "svelte/store";

		export default writable(new Response());