Compare commits

...

2 Commits

Author SHA1 Message Date
27c525d5bd use hard location assignment after successful login
All checks were successful
delpoy / build-and-deploy (push) Successful in 42s
2023-12-26 20:00:16 +01:00
b2d18b81a8 add missing page titles 2023-12-26 19:58:24 +01:00
3 changed files with 12 additions and 2 deletions

View File

@ -53,8 +53,18 @@
enabled: data.settingsRead enabled: data.settingsRead
} }
]; ];
let pageTitleSuffix =
tabs.find((t) => $page.url.pathname === t.path)?.name ??
$page.url.pathname === `${env.PUBLIC_BASE_PATH}/admin/login`
? 'Login '
: null;
</script> </script>
<svelte:head>
<title>Craftattack Admin{pageTitleSuffix ? ` - ${pageTitleSuffix}` : ''}</title>
</svelte:head>
{#if $page.url.pathname !== `${env.PUBLIC_BASE_PATH}/admin/login`} {#if $page.url.pathname !== `${env.PUBLIC_BASE_PATH}/admin/login`}
<div class="h-12 relative bg-base-200 flex justify-center items-center"> <div class="h-12 relative bg-base-200 flex justify-center items-center">
<ul class="menu menu-horizontal h-10 p-0 flex items-center bg-base-300 rounded-lg"> <ul class="menu menu-horizontal h-10 p-0 flex items-center bg-base-300 rounded-lg">

View File

@ -1,7 +1,6 @@
<script lang="ts"> <script lang="ts">
import Input from '$lib/components/Input/Input.svelte'; import Input from '$lib/components/Input/Input.svelte';
import { env } from '$env/dynamic/public'; import { env } from '$env/dynamic/public';
import { goto } from '$app/navigation';
import { errorMessage } from '$lib/stores'; import { errorMessage } from '$lib/stores';
let passwordValue: string; let passwordValue: string;
@ -13,7 +12,7 @@
body: new FormData(document.forms[0]) body: new FormData(document.forms[0])
}); });
if (response.ok) { if (response.ok) {
await goto(`${env.PUBLIC_BASE_PATH}/admin`, { invalidateAll: true }); window.location = `${env.PUBLIC_BASE_PATH}/admin`;
resolve(); resolve();
} else if (response.status == 401) { } else if (response.status == 401) {
passwordValue = ''; passwordValue = '';

View File

@ -9,6 +9,7 @@
</script> </script>
<svelte:head> <svelte:head>
<title>Report</title>
<!-- just in case... --> <!-- just in case... -->
<meta name="robots" content="noindex" /> <meta name="robots" content="noindex" />
</svelte:head> </svelte:head>