CraftAttack/varo-website
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update path handling
All checks were successful
deploy / build-and-deploy (push) Successful in 22s
Details

Browse Source
This commit is contained in:
bytedream
2025-05-18 15:26:52 +02:00
parent 13a8eae450
commit 28ead9a281
20 changed files with 61 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/layouts/BaseLayout.astro
View File

@ -1,5 +1,6 @@
---
import { ClientRouter } from 'astro:transitions';
import { BASE_PATH } from 'astro:env/server';
interface Props {
title: string;
@ -22,6 +23,7 @@ const { title, description, keywords, viewTransition } = Astro.props;
<meta name="og:title" content={title} />
<meta name="description" content={description} />
{keywords && <meta name="keywords" content={keywords.join(', ')} />}
<base href=`${BASE_PATH}/` />
</head>
<body>
<slot />

18
src/layouts/admin/AdminLayout.astro
View File

@ -3,7 +3,6 @@ import '@assets/admin_layout.css';
import BaseLayout from '../BaseLayout.astro';
import { ClientRouter } from 'astro:transitions';
import { Icon } from 'astro-icon/components';
import { BASE_PATH } from 'astro:env/client';
import Popup from '@components/popup/Popup.svelte';
import ConfirmPopup from '@components/popup/ConfirmPopup.svelte';
import { Session } from '@util/session.ts';
@ -18,44 +17,44 @@ const session = Session.sessionFromCookies(Astro.cookies);
const preTabs = [
{
href: `${BASE_PATH}`,
href: ``,
name: 'Varo Startseite',
icon: 'heroicons:computer-desktop-20-solid'
}
];
const adminTabs = [
{
href: `${BASE_PATH}/admin/users`,
href: 'admin/users',
name: 'Registrierte Nutzer',
icon: 'heroicons:user',
enabled: session?.permissions.users
},
{
href: `${BASE_PATH}/admin/teams`,
href: 'admin/teams',
name: 'Teams',
icon: 'heroicons:users',
enabled: session?.permissions.users
},
{
href: `${BASE_PATH}/admin/reports`,
href: 'admin/reports',
name: 'Reports',
icon: 'heroicons:flag',
enabled: session?.permissions.reports
},
{
href: `${BASE_PATH}/admin/feedback`,
href: 'admin/feedback',
name: 'Feedback',
icon: 'heroicons:book-open',
enabled: session?.permissions.feedback
},
{
href: `${BASE_PATH}/admin/admins`,
href: 'admin/admins',
name: 'Website Admins',
icon: 'heroicons:code-bracket-16-solid',
enabled: session?.permissions.admin
},
{
href: `${BASE_PATH}/admin/settings`,
href: 'admin/settings',
name: 'Einstellungen',
icon: 'heroicons:adjustments-horizontal',
enabled: session?.permissions.settings
@ -113,13 +112,12 @@ const adminTabs = [
<script>
import { actions } from 'astro:actions';
import { BASE_PATH } from 'astro:env/client';
document.addEventListener('astro:page-load', () => {
const logout = document.getElementById('logout') as HTMLButtonElement;
logout.addEventListener('click', async () => {
await actions.session.logout();
window.location.href = `${BASE_PATH}/admin/login`;
window.location.href = `${document.baseURI}admin/login`;
});
});
</script>