package-lock.json

@@ -29,7 +29,7 @@
 				"eslint-config-prettier": "^8.5.0",
 				"eslint-plugin-svelte": "^2.30.0",
 				"postcss": "^8.4.27",
-				"prettier": "^2.8.8",
+				"prettier": "^2.8.0",
 				"prettier-plugin-svelte": "^2.10.1",
 				"sass": "^1.66.1",
 				"svelte": "^4.0.5",

package.json

@@ -26,7 +26,7 @@
 		"eslint-config-prettier": "^8.5.0",
 		"eslint-plugin-svelte": "^2.30.0",
 		"postcss": "^8.4.27",
-		"prettier": "^2.8.8",
+		"prettier": "^2.8.0",
 		"prettier-plugin-svelte": "^2.10.1",
 		"sass": "^1.66.1",
 		"svelte": "^4.0.5",

src/lib/stores.ts

@@ -4,16 +4,5 @@ import { writable } from 'svelte/store';
 
 export const playAudio: Writable<boolean> = persisted('playAudio', false);
 
-export const errorMessage: Writable<string | null> = (() => {
-	const store: Writable<string | null> = writable(null);
-	return {
-		subscribe: store.subscribe,
-		set: (value) => {
-			if (value != null) store.set(null);
-			store.set(value);
-		},
-		update: store.update
-	};
-})();
 export const reportCount: Writable<number> = writable(0);
 export const adminCount: Writable<number> = writable(0);

src/routes/admin/+layout.svelte

@@ -5,8 +5,7 @@
 	import { buttonTriggeredRequest } from '$lib/components/utils';
 	import { goto } from '$app/navigation';
 	import type { LayoutData } from './$types';
-	import { adminCount, errorMessage, reportCount } from '$lib/stores';
-	import ErrorToast from '$lib/components/Toast/ErrorToast.svelte';
+	import { adminCount, reportCount } from '$lib/stores';
 
 	async function logout() {
 		const response = await fetch(`${env.PUBLIC_BASE_PATH}/admin/logout`, {
@@ -22,8 +21,6 @@
 	export let data: LayoutData;
 	if (data.reportCount) $reportCount = data.reportCount;
 	if (data.adminCount) $adminCount = data.adminCount;
-
-	errorMessage.subscribe(console.log);
 </script>
 
 {#if $page.url.pathname !== `${env.PUBLIC_BASE_PATH}/admin/login`}
@@ -74,9 +71,3 @@
 		<slot />
 	</div>
 {/if}
-
-{#if $errorMessage}
-	<ErrorToast timeout={2000} show={$errorMessage != null}>
-		<span>{$errorMessage}</span>
-	</ErrorToast>
-{/if}

src/routes/admin/login/+page.svelte

@@ -1,13 +1,13 @@
 <script lang="ts">
 	import Input from '$lib/components/Input/Input.svelte';
 	import { env } from '$env/dynamic/public';
+	import ErrorToast from '$lib/components/Toast/ErrorToast.svelte';
 	import { goto } from '$app/navigation';
-	import { errorMessage } from '$lib/stores';
 
 	let passwordValue: string;
 	async function login() {
 		// eslint-disable-next-line no-async-promise-executor
-		loginRequest = new Promise(async (resolve) => {
+		loginRequest = new Promise(async (resolve, reject) => {
 			const response = await fetch(`${env.PUBLIC_BASE_PATH}/admin/login`, {
 				method: 'POST',
 				body: new FormData(document.forms[0])
@@ -15,18 +15,21 @@
 			if (response.ok) {
 				await goto(`${env.PUBLIC_BASE_PATH}/admin`, { invalidateAll: true });
 				resolve();
-			} else if (response.status == 401) {
+			} else if (response.status == 403) {
 				passwordValue = '';
-				$errorMessage = 'Nutzername oder Passwort falsch';
+				showError = true;
+				errorToastElement.reset();
 				resolve();
 			} else {
-				$errorMessage = `${response.statusText} (${response.status})`;
+				reject(Error(`${response.statusText} (${response.status})`));
 			}
 			loginRequest = null;
 		});
 	}
 
 	let loginRequest: Promise<void> | null = null;
+	let showError = false;
+	let errorToastElement: ErrorToast;
 </script>
 
 <div class="card px-14 py-6 shadow-lg">
@@ -79,3 +82,7 @@
 		</div>
 	</form>
 </div>
+
+<ErrorToast timeout={2000} bind:show={showError} bind:this={errorToastElement}>
+	<span>Nutzername oder Passwort falsch</span>
+</ErrorToast>

src/routes/admin/users/+page.svelte

@@ -17,7 +17,7 @@
 	let currentPageUsersRequest: Promise<void> = new Promise((resolve) => resolve());
 	let usersPerPage = 50;
 	let userPage = 0;
-	let userFilter = { name: null, playertype: null };
+	let userFilter = { name: null, edition: null };
 	let userTableContainerElement: HTMLDivElement;
 
 	function fetchPageUsers(page: number) {

src/routes/admin/users/+server.ts

@@ -16,7 +16,7 @@ export const POST = (async ({ request, cookies }) => {
 		from: number | null;
 
 		name: string | null;
-		playertype: 'java' | 'bedrock' | 'cracked' | null;
+		edition: 'java' | 'bedrock' | 'cracked' | null;
 
 		search: string | null;
 		slim: boolean | null;
@@ -39,8 +39,8 @@ export const POST = (async ({ request, cookies }) => {
 			}
 		});
 	}
-	if (data.playertype) {
-		usersFindOptions.playertype = data.playertype;
+	if (data.edition) {
+		usersFindOptions.edition = data.edition;
 	}
 	const users = await User.findAll({
 		where: usersFindOptions,

src/routes/admin/users/HeaderBar.svelte

@@ -4,7 +4,7 @@
 
 	export let userFilter = {
 		name: null,
-		playertype: null
+		edition: null
 	};
 </script>
 
@@ -15,7 +15,7 @@
 		</Input>
 	</div>
 	<div class="w-1/6">
-		<Select label="Edition" size="sm" bind:value={userFilter.playertype}>
+		<Select label="Edition" size="sm" bind:value={userFilter.edition}>
 			<option value={null}>Alle</option>
 			<option value="java">Java</option>
 			<option value="beckdrock">Bedrock</option>