Compare commits

..

No commits in common. "18135a081680c9ab02f8723c3773d5b74c8b3747" and "977905c390f06e9c42b05f4d96204dcede6fe251" have entirely different histories.

14 changed files with 1666 additions and 3556 deletions

5078
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -13,43 +13,41 @@
"format": "prettier --write ." "format": "prettier --write ."
}, },
"devDependencies": { "devDependencies": {
"@fontsource/nunito": "^5.1.0", "@sveltejs/adapter-node": "^1.3.1",
"@fontsource/roboto": "^5.1.0", "@sveltejs/kit": "^1.27.6",
"@sveltejs/adapter-node": "^5.2.8",
"@sveltejs/kit": "^2.7.1",
"@types/bcrypt": "^5.0.2", "@types/bcrypt": "^5.0.2",
"@types/node": "^22.7.7", "@types/node": "^20.10.0",
"@types/validator": "^13.12.2", "@types/validator": "^13.11.7",
"@typescript-eslint/eslint-plugin": "^8.10.0", "@typescript-eslint/eslint-plugin": "^6.13.1",
"@typescript-eslint/parser": "^8.10.0", "@typescript-eslint/parser": "^6.13.1",
"autoprefixer": "^10.4.20", "autoprefixer": "^10.4.16",
"daisyui": "^4.12.13", "daisyui": "^4.4.14",
"eslint": "^9.13.0", "eslint": "^8.54.0",
"eslint-config-prettier": "^9.1.0", "eslint-config-prettier": "^9.0.0",
"eslint-plugin-svelte": "^2.45.1", "eslint-plugin-svelte": "^2.35.1",
"postcss": "^8.4.47", "postcss": "^8.4.31",
"prettier": "^3.3.3", "prettier": "^3.1.0",
"prettier-plugin-svelte": "^3.2.7", "prettier-plugin-svelte": "^3.1.2",
"sass": "^1.80.3", "sass": "^1.69.5",
"skinview3d": "^3.1.0", "skinview3d": "^3.0.1",
"svelte": "^4.2.19", "svelte": "^4.2.7",
"svelte-check": "^4.0.5", "svelte-check": "^3.6.2",
"svelte-heros-v2": "^1.3.0", "svelte-heros-v2": "^0.10.12",
"svelte-multicssclass": "^2.1.1", "svelte-multicssclass": "^2.1.1",
"svelte-preprocess": "^6.0.3", "svelte-preprocess": "^5.1.1",
"tailwindcss": "^3.4.14", "tailwindcss": "^3.3.5",
"tslib": "^2.8.0", "tslib": "^2.6.2",
"typescript": "^5.6.3", "typescript": "^5.3.2",
"vite": "^5.4.9", "vite": "^4.5.0",
"vitest": "^2.1.3" "vitest": "^0.34.6"
}, },
"type": "module", "type": "module",
"dependencies": { "dependencies": {
"bcrypt": "^5.1.1", "bcrypt": "^5.1.1",
"dotenv": "^16.4.5", "dotenv": "^16.3.1",
"mariadb": "^3.3.2", "mariadb": "^3.2.2",
"sequelize": "^6.37.4", "sequelize": "^6.35.1",
"sequelize-typescript": "^2.1.6", "sequelize-typescript": "^2.1.6",
"sqlite3": "^5.1.7" "sqlite3": "^5.1.6"
} }
} }

View File

@ -1,6 +1,3 @@
@import '@fontsource/nunito';
@import '@fontsource/roboto';
@tailwind base; @tailwind base;
@tailwind components; @tailwind components;
@tailwind utilities; @tailwind utilities;
@ -11,6 +8,30 @@
src: url('/fonts/MinecraftRegular.otf') format('opentype'); src: url('/fonts/MinecraftRegular.otf') format('opentype');
} }
@font-face {
font-family: 'Roboto';
src: url('/fonts/Roboto-Regular.ttf') format('truetype');
font-weight: normal;
}
@font-face {
font-family: 'Roboto';
src: url('/fonts/Roboto-Medium.ttf') format('truetype');
font-weight: 500;
}
@font-face {
font-family: 'Roboto';
src: url('/fonts/Roboto-Bold.ttf') format('truetype');
font-weight: bold;
}
@font-face {
font-family: 'Roboto';
src: url('/fonts/Roboto-Black.ttf') format('truetype');
font-weight: 900;
}
html { html {
@apply font-roboto scroll-smooth; @apply font-roboto scroll-smooth;
} }

View File

@ -79,7 +79,7 @@
</main> </main>
<nav> <nav>
<div <div
class="fixed bottom-4 right-4 sm:left-4 sm:right-[initial] group/menu-bar flex flex-col-reverse justify-center items-center z-50" class="fixed bottom-4 right-4 sm:left-4 sm:right-[initial] group/menu-bar flex flex-col-reverse justify-center items-center"
class:hidden={onAdminPage} class:hidden={onAdminPage}
bind:this={nav} bind:this={nav}
> >

View File

@ -55,8 +55,8 @@
]; ];
let pageTitleSuffix = let pageTitleSuffix =
(tabs.find((t) => $page.url.pathname === t.path)?.name ?? tabs.find((t) => $page.url.pathname === t.path)?.name ??
$page.url.pathname === `${env.PUBLIC_BASE_PATH}/admin/login`) $page.url.pathname === `${env.PUBLIC_BASE_PATH}/admin/login`
? 'Login ' ? 'Login '
: null; : null;
</script> </script>

View File

@ -26,7 +26,7 @@
> >
{#if !data.enabled} {#if !data.enabled}
<div <div
class="absolute top-0 left-0 w-full h-full bg-black bg-opacity-50 backdrop-blur-sm z-10 rounded-xl flex justify-center md:items-center pt-20 md:pt-0" class="absolute top-0 left-0 w-full h-full bg-black bg-opacity-50 backdrop-blur-sm z-50 rounded-xl flex justify-center md:items-center pt-20 md:pt-0"
> >
<h1 class="text-2xl sm:text-3xl md:text-5xl text-white">Anmeldung geschlossen</h1> <h1 class="text-2xl sm:text-3xl md:text-5xl text-white">Anmeldung geschlossen</h1>
</div> </div>

View File

@ -1,5 +1,5 @@
<script lang="ts"> <script lang="ts">
import { rulesLong, rulesShort } from '$lib/rules'; import { rulesLong } from '$lib/rules';
</script> </script>
<svelte:head> <svelte:head>
@ -7,26 +7,14 @@
</svelte:head> </svelte:head>
<h1 class="text-3xl lg:text-5xl mb-4">CraftAttack 6 Regelwerk</h1> <h1 class="text-3xl lg:text-5xl mb-4">CraftAttack 6 Regelwerk</h1>
<div class="collapse collapse-arrow"> <p>{rulesLong.header}</p>
<input type="checkbox" autocomplete="off" checked /> <ol class="p-[revert] list-decimal my-6">
<div class="collapse-title"> {#each rulesLong.sections as section}
<p>0. Vorwort</p> <li class="mb-2">
</div> {section.content}
<div class="collapse-content"> </li>
<p>{rulesShort.header}</p>
<p class="mt-1 text-[.75rem]">{rulesShort.footer}</p>
</div>
<span class="block w-full h-[1px] mx-auto mb-1 bg-gray-600" />
</div>
{#each rulesShort.sections as section, i}
<div class="collapse collapse-arrow">
<input type="checkbox" autocomplete="off" />
<div class="collapse-title">
<p>{i + 1}. {section.title}</p>
</div>
<div class="collapse-content">
<p>{section.content}</p>
</div>
</div>
<span class="block w-full h-[1px] mx-auto mb-1 bg-gray-600" />
{/each} {/each}
</ol>
<p>
{rulesLong.footer}
</p>

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -5,7 +5,6 @@ export default {
extend: {}, extend: {},
fontFamily: { fontFamily: {
minecraft: ['Minecraft'], minecraft: ['Minecraft'],
nunito: ['Nunito'],
roboto: ['Roboto'] roboto: ['Roboto']
} }
}, },