diff --git a/astro-i18n.config.ts b/astro-i18n.config.ts index da65a05..d38b78f 100644 --- a/astro-i18n.config.ts +++ b/astro-i18n.config.ts @@ -22,7 +22,7 @@ export default defineAstroI18nConfig({ stats: "statistiken", announcements: "ankuendigungen", "privacy-policy": "datenschutzerklaerung", - "create-token": "token-erstellen" + "set-password": "passwort-setzen" } }, }) \ No newline at end of file diff --git a/astro.config.mjs b/astro.config.mjs index 66ed92a..9d5f075 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -12,9 +12,6 @@ export default defineConfig({ image: { service: sharpImageService() }, - experimental: { - optimizeHoistedScript: true, - }, compressHTML: true, site: "https://steamwar.de", integrations: [svelte(), tailwind({ @@ -33,4 +30,5 @@ export default defineConfig({ disallow: ["/admin", "/login", "/dashboard", "/de", "/_astro"] }] })], + vite: {} }); \ No newline at end of file diff --git a/package.json b/package.json index 0af7840..40c2b3e 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "autoprefixer": "^10.4.16", "cssnano": "^6.0.2", "esbuild": "^0.19.9", - "postcss-nesting": "^12.0.1", + "postcss-nesting": "^12.0.2", "sass": "^1.69.5", "svelte": "^4.2.8", "tailwind-merge": "^2.1.0", @@ -38,7 +38,7 @@ "@astrojs/sitemap": "^3.0.3", "@codemirror/lang-json": "^6.0.1", "@ddietr/codemirror-themes": "^1.4.2", - "astro": "^4.0.5", + "astro": "^4.0.6", "astro-i18n": "^2.1.18", "astro-robots-txt": "^1.0.0", "astro-seo": "^0.8.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 04b2e2b..2442c3a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -15,8 +15,8 @@ dependencies: specifier: ^1.4.2 version: 1.4.2 astro: - specifier: ^4.0.5 - version: 4.0.5(@types/node@20.10.4)(sass@1.69.5)(typescript@5.3.3) + specifier: ^4.0.6 + version: 4.0.6(@types/node@20.10.4)(sass@1.69.5)(typescript@5.3.3) astro-i18n: specifier: ^2.1.18 version: 2.1.18(esbuild@0.19.9) @@ -75,13 +75,13 @@ dependencies: devDependencies: '@astrojs/svelte': specifier: ^5.0.1 - version: 5.0.1(astro@4.0.5)(svelte@4.2.8)(typescript@5.3.3)(vite@5.0.9) + version: 5.0.1(astro@4.0.6)(svelte@4.2.8)(typescript@5.3.3)(vite@5.0.10) '@astrojs/tailwind': specifier: ^5.0.3 - version: 5.0.3(astro@4.0.5)(tailwindcss@3.3.6) + version: 5.0.3(astro@4.0.6)(tailwindcss@3.3.6) '@astropub/icons': specifier: ^0.2.0 - version: 0.2.0(astro@4.0.5) + version: 0.2.0(astro@4.0.6) '@types/color': specifier: ^3.0.6 version: 3.0.6 @@ -101,8 +101,8 @@ devDependencies: specifier: ^0.19.9 version: 0.19.9 postcss-nesting: - specifier: ^12.0.1 - version: 12.0.1(postcss@8.4.32) + specifier: ^12.0.2 + version: 12.0.2(postcss@8.4.32) sass: specifier: ^1.69.5 version: 1.69.5 @@ -132,8 +132,8 @@ packages: '@jridgewell/gen-mapping': 0.3.3 '@jridgewell/trace-mapping': 0.3.20 - /@astrojs/compiler@2.3.2: - resolution: {integrity: sha512-jkY7bCVxl27KeZsSxIZ+pqACe+g8VQUdTiSJRj/sXYdIaZlW3ZMq4qF2M17P/oDt3LBq0zLNwQr4Cb7fSpRGxQ==} + /@astrojs/compiler@2.3.4: + resolution: {integrity: sha512-33/YtWoBCE0cBUNy1kh78FCDXBoBANX87ShgATlAHECYbG2+buNTAgq4Xgz4t5NgnEHPN21GIBC2Mvvwisoutw==} /@astrojs/internal-helpers@0.2.1: resolution: {integrity: sha512-06DD2ZnItMwUnH81LBLco3tWjcZ1lGU9rLCCBaeUCGYe9cI0wKyY2W3kDyoW1I6GmcWgt1fu+D1CTvz+FIKf8A==} @@ -171,15 +171,15 @@ packages: zod: 3.22.4 dev: false - /@astrojs/svelte@5.0.1(astro@4.0.5)(svelte@4.2.8)(typescript@5.3.3)(vite@5.0.9): + /@astrojs/svelte@5.0.1(astro@4.0.6)(svelte@4.2.8)(typescript@5.3.3)(vite@5.0.10): resolution: {integrity: sha512-MQvm0VmkiHVBb41hkKvQKtZa2YZqImdJD23dDW6EGhFxRy1GEgJ4Hm6p4T30FXrLPQUoiay/BU5U/lHDd6ZlNg==} engines: {node: '>=18.14.1'} peerDependencies: astro: ^4.0.0 svelte: ^4.0.0 || ^5.0.0-next.1 dependencies: - '@sveltejs/vite-plugin-svelte': 3.0.1(svelte@4.2.8)(vite@5.0.9) - astro: 4.0.5(@types/node@20.10.4)(sass@1.69.5)(typescript@5.3.3) + '@sveltejs/vite-plugin-svelte': 3.0.1(svelte@4.2.8)(vite@5.0.10) + astro: 4.0.6(@types/node@20.10.4)(sass@1.69.5)(typescript@5.3.3) svelte: 4.2.8 svelte2tsx: 0.6.27(svelte@4.2.8)(typescript@5.3.3) transitivePeerDependencies: @@ -188,13 +188,13 @@ packages: - vite dev: true - /@astrojs/tailwind@5.0.3(astro@4.0.5)(tailwindcss@3.3.6): + /@astrojs/tailwind@5.0.3(astro@4.0.6)(tailwindcss@3.3.6): resolution: {integrity: sha512-p+uFa1PNuV8RxhGkPUFgVq8CUbmS3xr0u5k1An2xKECLotRh7vsrGcPUijHvYOt42URohcg8rIq0CxNoVMhReg==} peerDependencies: astro: ^3.0.0 || ^4.0.0 tailwindcss: ^3.0.24 dependencies: - astro: 4.0.5(@types/node@20.10.4)(sass@1.69.5)(typescript@5.3.3) + astro: 4.0.6(@types/node@20.10.4)(sass@1.69.5)(typescript@5.3.3) autoprefixer: 10.4.16(postcss@8.4.32) postcss: 8.4.32 postcss-load-config: 4.0.2(postcss@8.4.32) @@ -217,12 +217,12 @@ packages: transitivePeerDependencies: - supports-color - /@astropub/icons@0.2.0(astro@4.0.5): + /@astropub/icons@0.2.0(astro@4.0.6): resolution: {integrity: sha512-qM/ldW/9rVHULNOZgz/23Yzgm2r3Iy2JJ1FuvJB6sFU67n61o1ImuXdHiaWSNoEHubD+IUkD9WG0hbhINgszqA==} peerDependencies: astro: '*' dependencies: - astro: 4.0.5(@types/node@20.10.4)(sass@1.69.5)(typescript@5.3.3) + astro: 4.0.6(@types/node@20.10.4)(sass@1.69.5)(typescript@5.3.3) dev: true /@babel/code-frame@7.23.5: @@ -398,7 +398,7 @@ packages: resolution: {integrity: sha512-zHd0eUrf5GZoOWVCXp6koAKQTfZV07eit6bGPmJgnZdnSAvvZee6zniW2XMF7Cmc4ISOOnPy3QaSiIJGJkVEDQ==} engines: {node: '>=6.9.0'} dependencies: - regenerator-runtime: 0.14.0 + regenerator-runtime: 0.14.1 /@babel/template@7.22.15: resolution: {integrity: sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==} @@ -502,8 +502,8 @@ packages: w3c-keyname: 2.2.8 dev: false - /@csstools/selector-specificity@3.0.0(postcss-selector-parser@6.0.13): - resolution: {integrity: sha512-hBI9tfBtuPIi885ZsZ32IMEU/5nlZH/KOVYJCOh7gyMxaVLGmLedYqFN6Ui1LXkI8JlC8IsuC0rF0btcRZKd5g==} + /@csstools/selector-specificity@3.0.1(postcss-selector-parser@6.0.13): + resolution: {integrity: sha512-NPljRHkq4a14YzZ3YD406uaxh7s0g6eAq3L9aLOWywoqe8PkYamAvtsh7KNX6c++ihDrJ0RiU+/z7rGnhlZ5ww==} engines: {node: ^14 || ^16 || >=18} peerDependencies: postcss-selector-parser: ^6.0.13 @@ -878,7 +878,7 @@ packages: requiresBuild: true optional: true - /@sveltejs/vite-plugin-svelte-inspector@2.0.0(@sveltejs/vite-plugin-svelte@3.0.1)(svelte@4.2.8)(vite@5.0.9): + /@sveltejs/vite-plugin-svelte-inspector@2.0.0(@sveltejs/vite-plugin-svelte@3.0.1)(svelte@4.2.8)(vite@5.0.10): resolution: {integrity: sha512-gjr9ZFg1BSlIpfZ4PRewigrvYmHWbDrq2uvvPB1AmTWKuM+dI1JXQSUu2pIrYLb/QncyiIGkFDFKTwJ0XqQZZg==} engines: {node: ^18.0.0 || >=20} peerDependencies: @@ -886,30 +886,30 @@ packages: svelte: ^4.0.0 || ^5.0.0-next.0 vite: ^5.0.0 dependencies: - '@sveltejs/vite-plugin-svelte': 3.0.1(svelte@4.2.8)(vite@5.0.9) + '@sveltejs/vite-plugin-svelte': 3.0.1(svelte@4.2.8)(vite@5.0.10) debug: 4.3.4 svelte: 4.2.8 - vite: 5.0.9(@types/node@20.10.4)(sass@1.69.5) + vite: 5.0.10(@types/node@20.10.4)(sass@1.69.5) transitivePeerDependencies: - supports-color dev: true - /@sveltejs/vite-plugin-svelte@3.0.1(svelte@4.2.8)(vite@5.0.9): + /@sveltejs/vite-plugin-svelte@3.0.1(svelte@4.2.8)(vite@5.0.10): resolution: {integrity: sha512-CGURX6Ps+TkOovK6xV+Y2rn8JKa8ZPUHPZ/NKgCxAmgBrXReavzFl8aOSCj3kQ1xqT7yGJj53hjcV/gqwDAaWA==} engines: {node: ^18.0.0 || >=20} peerDependencies: svelte: ^4.0.0 || ^5.0.0-next.0 vite: ^5.0.0 dependencies: - '@sveltejs/vite-plugin-svelte-inspector': 2.0.0(@sveltejs/vite-plugin-svelte@3.0.1)(svelte@4.2.8)(vite@5.0.9) + '@sveltejs/vite-plugin-svelte-inspector': 2.0.0(@sveltejs/vite-plugin-svelte@3.0.1)(svelte@4.2.8)(vite@5.0.10) debug: 4.3.4 deepmerge: 4.3.1 kleur: 4.1.5 magic-string: 0.30.5 svelte: 4.2.8 svelte-hmr: 0.15.3(svelte@4.2.8) - vite: 5.0.9(@types/node@20.10.4)(sass@1.69.5) - vitefu: 0.2.5(vite@5.0.9) + vite: 5.0.10(@types/node@20.10.4)(sass@1.69.5) + vitefu: 0.2.5(vite@5.0.10) transitivePeerDependencies: - supports-color dev: true @@ -924,12 +924,12 @@ packages: dependencies: '@babel/parser': 7.23.6 '@babel/types': 7.23.6 - '@types/babel__generator': 7.6.7 + '@types/babel__generator': 7.6.8 '@types/babel__template': 7.4.4 '@types/babel__traverse': 7.20.4 - /@types/babel__generator@7.6.7: - resolution: {integrity: sha512-6Sfsq+EaaLrw4RmdFWE9Onp63TOUue71AWb4Gpa6JxzgTYtimbM086WnYTy2U67AofR++QKCo08ZP6pwx8YFHQ==} + /@types/babel__generator@7.6.8: + resolution: {integrity: sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==} dependencies: '@babel/types': 7.23.6 @@ -1072,8 +1072,8 @@ packages: normalize-path: 3.0.0 picomatch: 2.3.1 - /apexcharts@3.44.2: - resolution: {integrity: sha512-QWOFS/SC1TDsuI8VudVuIwLhs1qE6kwixRvmABMUgTVeVzizRWgQh8pdEIgwl+Zvr0TlM3vHPz6Dc5NP1hJ7BA==} + /apexcharts@3.45.0: + resolution: {integrity: sha512-o+XI4ysvKtt+l+bGbk19s6Y2gFes/7LRLMAonDgcapz4frS0vzTfXiK77QcQc30TMwPiSN9Z8Tv+CBn57x63wg==} dependencies: '@yr/monotone-cubic-spline': 1.0.3 svg.draggable.js: 2.2.2 @@ -1123,12 +1123,12 @@ packages: resolution: {integrity: sha512-7gq6lhibCM8FuzZIJlbLLWP5EJ9KL2/4XqeFrAg9O6ZK2xMFxJ5ubKf+a0VJwwTu8W8Xr421CmpiXu6Hq7n/7Q==} dev: false - /astro@4.0.5(@types/node@20.10.4)(sass@1.69.5)(typescript@5.3.3): - resolution: {integrity: sha512-OTiTEiXYdXTkVJXNNKIWdYG1z2wpTST+92Qcldm36x91Pe4fKpLxeuRloy5cW175oHi8lvXytgG3Gl3VBP18RQ==} + /astro@4.0.6(@types/node@20.10.4)(sass@1.69.5)(typescript@5.3.3): + resolution: {integrity: sha512-P7CfFqWKzkJozzF6IoOC6qoI2ONndV8P3ULhGDgMiXPL7xVkWI5haTBSpyrcjBx643tVXspIRsSV/v+Cx+CjGw==} engines: {node: '>=18.14.1', npm: '>=6.14.0'} hasBin: true dependencies: - '@astrojs/compiler': 2.3.2 + '@astrojs/compiler': 2.3.4 '@astrojs/internal-helpers': 0.2.1 '@astrojs/markdown-remark': 4.0.1 '@astrojs/telemetry': 3.0.4 @@ -1184,8 +1184,8 @@ packages: tsconfck: 3.0.0(typescript@5.3.3) unist-util-visit: 5.0.0 vfile: 6.0.1 - vite: 5.0.9(@types/node@20.10.4)(sass@1.69.5) - vitefu: 0.2.5(vite@5.0.9) + vite: 5.0.10(@types/node@20.10.4)(sass@1.69.5) + vitefu: 0.2.5(vite@5.0.10) which-pm: 2.1.1 yargs-parser: 21.1.1 zod: 3.22.4 @@ -1291,7 +1291,7 @@ packages: hasBin: true dependencies: caniuse-lite: 1.0.30001570 - electron-to-chromium: 1.4.613 + electron-to-chromium: 1.4.614 node-releases: 2.0.14 update-browserslist-db: 1.0.13(browserslist@4.22.2) @@ -1774,8 +1774,8 @@ packages: marked: 4.3.0 dev: false - /electron-to-chromium@1.4.613: - resolution: {integrity: sha512-r4x5+FowKG6q+/Wj0W9nidx7QO31BJwmR2uEo+Qh3YLGQ8SbBAFuDFpTxzly/I2gsbrFwBuIjrMp423L3O5U3w==} + /electron-to-chromium@1.4.614: + resolution: {integrity: sha512-X4ze/9Sc3QWs6h92yerwqv7aB/uU8vCjZcrMjA8N9R1pjMFRe44dLsck5FzLilOYvcXuDn93B+bpGYyufc70gQ==} /emoji-regex@10.3.0: resolution: {integrity: sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==} @@ -1951,8 +1951,8 @@ packages: svelte: ^4.0.0 dependencies: '@floating-ui/dom': 1.5.3 - apexcharts: 3.44.2 - flowbite: 2.2.0 + apexcharts: 3.45.0 + flowbite: 2.2.1 svelte: 4.2.8 tailwind-merge: 2.1.0 dev: false @@ -1964,8 +1964,8 @@ packages: mini-svg-data-uri: 1.4.4 dev: false - /flowbite@2.2.0: - resolution: {integrity: sha512-Eq0qWz4a5nlxaGuUcspzpu+8Ny0A7lKEJEKcuPpkdSoF8tWjbKeuVVgKk8/q10ZE9bhXh1GHBXdCsRxu0LZTNQ==} + /flowbite@2.2.1: + resolution: {integrity: sha512-iiZyBTtriEDRHrqXZgpKHaxl4B2J8HZUP8Yn1RXozUDKszWHDVj4GxQqMMB9AJHRWOgXV/4E/LJZ/zqQgBUhWA==} dependencies: '@popperjs/core': 2.11.8 mini-svg-data-uri: 1.4.4 @@ -3223,13 +3223,13 @@ packages: postcss: 8.4.32 postcss-selector-parser: 6.0.13 - /postcss-nesting@12.0.1(postcss@8.4.32): - resolution: {integrity: sha512-6LCqCWP9pqwXw/njMvNK0hGY44Fxc4B2EsGbn6xDcxbNRzP8GYoxT7yabVVMLrX3quqOJ9hg2jYMsnkedOf8pA==} + /postcss-nesting@12.0.2(postcss@8.4.32): + resolution: {integrity: sha512-63PpJHSeNs93S3ZUIyi+7kKx4JqOIEJ6QYtG3x+0qA4J03+4n0iwsyA1GAHyWxsHYljQS4/4ZK1o2sMi70b5wQ==} engines: {node: ^14 || ^16 || >=18} peerDependencies: postcss: ^8.4 dependencies: - '@csstools/selector-specificity': 3.0.0(postcss-selector-parser@6.0.13) + '@csstools/selector-specificity': 3.0.1(postcss-selector-parser@6.0.13) postcss: 8.4.32 postcss-selector-parser: 6.0.13 dev: true @@ -3485,8 +3485,8 @@ packages: dependencies: picomatch: 2.3.1 - /regenerator-runtime@0.14.0: - resolution: {integrity: sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==} + /regenerator-runtime@0.14.1: + resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==} /regexparam@2.0.1: resolution: {integrity: sha512-zRgSaYemnNYxUv+/5SeoHI0eJIgTL/A2pUtXUPLHQxUldagouJ9p+K6IbIZ/JiQuCEv2E2B1O11SjVQy3aMCkw==} @@ -4290,8 +4290,8 @@ packages: unist-util-stringify-position: 4.0.0 vfile-message: 4.0.2 - /vite@5.0.9(@types/node@20.10.4)(sass@1.69.5): - resolution: {integrity: sha512-wVqMd5kp28QWGgfYPDfrj771VyHTJ4UDlCteLH7bJDGDEamaz5hV8IX6h1brSGgnnyf9lI2RnzXq/JmD0c2wwg==} + /vite@5.0.10(@types/node@20.10.4)(sass@1.69.5): + resolution: {integrity: sha512-2P8J7WWgmc355HUMlFrwofacvr98DAjoE52BfdbwQtyLH06XKwaL/FMnmKM2crF0iX4MpmMKoDlNCB1ok7zHCw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: @@ -4326,7 +4326,7 @@ packages: optionalDependencies: fsevents: 2.3.3 - /vitefu@0.2.5(vite@5.0.9): + /vitefu@0.2.5(vite@5.0.10): resolution: {integrity: sha512-SgHtMLoqaeeGnd2evZ849ZbACbnwQCIwRH57t18FxcXoZop0uQu0uzlIhJBlF/eWVzuce0sHeqPcDo+evVcg8Q==} peerDependencies: vite: ^3.0.0 || ^4.0.0 || ^5.0.0 @@ -4334,7 +4334,7 @@ packages: vite: optional: true dependencies: - vite: 5.0.9(@types/node@20.10.4)(sass@1.69.5) + vite: 5.0.10(@types/node@20.10.4)(sass@1.69.5) /w3c-keyname@2.2.8: resolution: {integrity: sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==} diff --git a/src/components/Login.svelte b/src/components/Login.svelte index 1bf6c66..9d87d0e 100644 --- a/src/components/Login.svelte +++ b/src/components/Login.svelte @@ -20,38 +20,34 @@ @@ -61,11 +57,11 @@
- - + +

- {t("login.generateToken")}

+ {t("login.setPassword")}

{#if error}

{error}

diff --git a/src/components/dashboard/SchematicListTile.svelte b/src/components/dashboard/SchematicListTile.svelte index 732f332..65db619 100644 --- a/src/components/dashboard/SchematicListTile.svelte +++ b/src/components/dashboard/SchematicListTile.svelte @@ -75,8 +75,8 @@ + \ No newline at end of file diff --git a/src/pages/admin/index.astro b/src/pages/admin/index.astro index 9ab312f..b7e9338 100644 --- a/src/pages/admin/index.astro +++ b/src/pages/admin/index.astro @@ -5,4 +5,4 @@ import Basic from "../../layouts/Basic.astro"; - + \ No newline at end of file diff --git a/src/pages/announcements/[...slug].astro b/src/pages/announcements/[...slug].astro index 8219ef2..57d56d9 100644 --- a/src/pages/announcements/[...slug].astro +++ b/src/pages/announcements/[...slug].astro @@ -136,4 +136,4 @@ const { Content } = await post.render(); @apply w-fit p-4 rounded-md border-2 border-gray-600 my-4; } } - + \ No newline at end of file diff --git a/src/pages/announcements/tags/[tag].astro b/src/pages/announcements/tags/[tag].astro index 6978ec8..e7851d5 100644 --- a/src/pages/announcements/tags/[tag].astro +++ b/src/pages/announcements/tags/[tag].astro @@ -60,4 +60,4 @@ const { posts, tag } = Astro.props; {index !== posts.length - 1 &&
} ))} - + \ No newline at end of file diff --git a/src/pages/help/[...slug].astro b/src/pages/help/[...slug].astro index 8856de7..736d5b7 100644 --- a/src/pages/help/[...slug].astro +++ b/src/pages/help/[...slug].astro @@ -25,48 +25,16 @@ const { Content } = await page.render(); + \ No newline at end of file diff --git a/src/pages/index.astro b/src/pages/index.astro index 3c2b3fd..b2133f2 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -7,6 +7,7 @@ import {CaretRight, Archive, Rocket, Bell} from "@astropub/icons" import {t} from "astro-i18n"; import {l} from "../util/util" import PlayerCount from "../components/PlayerCount.svelte"; +import "../../public/fonts/barlow-condensed/barlow-condensed.css" const teamMember = await fetch("http://localhost:1337/data/team").then(value => value.json()) @@ -37,7 +38,6 @@ function mapMap(i: Map, fn: (key: T, value: K) => J): J[] { --- -
Bau @@ -146,10 +146,6 @@ function mapMap(i: Map, fn: (key: T, value: K) => J): J[] {