Merge remote-tracking branch 'origin/master'

astro.config.mjs

@@ -5,7 +5,6 @@ import configureI18n from "./astro-i18n.adapter";
 import sitemap from "@astrojs/sitemap";
 
 import robotsTxt from "astro-robots-txt";
-import {resolve} from "node:url";
 import path from "node:path";
 import mdx from "@astrojs/mdx";
 import pagefind from "astro-pagefind";

package.json

@@ -44,6 +44,7 @@
 		"@astrojs/mdx": "^3.1.9",
 		"@astrojs/sitemap": "^3.2.1",
 		"@codemirror/lang-json": "^6.0.1",
+		"@codemirror/commands": "^6.8.0",
 		"@ddietr/codemirror-themes": "^1.4.4",
 		"astro": "^4.16.14",
 		"astro-i18n": "^2.2.4",

pnpm-lock.yaml

@@ -11,6 +11,9 @@ dependencies:
   '@astrojs/sitemap':
     specifier: ^3.2.1
     version: 3.2.1
+  '@codemirror/commands':
+    specifier: ^6.8.0
+    version: 6.8.0
   '@codemirror/lang-json':
     specifier: ^6.0.1
     version: 6.0.1
@@ -522,8 +525,8 @@ packages:
       '@lezer/common': 1.2.3
     dev: false
 
-  /@codemirror/commands@6.7.1:
-    resolution: {integrity: sha512-llTrboQYw5H4THfhN4U3qCnSZ1SOJ60ohhz+SzU0ADGtwlc533DtklQP0vSFaQuCPDn3BPpOd1GbbnUtwNjsrw==}
+  /@codemirror/commands@6.8.0:
+    resolution: {integrity: sha512-q8VPEFaEP4ikSlt6ZxjB3zW72+7osfAYW9i8Zu943uqbKuz6utc1+F170hyLUCUltXORjQXRyYQNfkckzA/bPQ==}
     dependencies:
       '@codemirror/language': 6.10.8
       '@codemirror/state': 6.5.0
@@ -541,8 +544,8 @@ packages:
   /@codemirror/language@6.10.4:
     resolution: {integrity: sha512-qjt7Wn/nxGuI278GYVlqE5V93Xn8ZQwzqZtgS0FaWr7K2yWgd5/FlBNqNi4jtUvBVvWJzAGfnggIlpyjTOaF4A==}
     dependencies:
-      '@codemirror/state': 6.4.1
-      '@codemirror/view': 6.35.0
+      '@codemirror/state': 6.5.0
+      '@codemirror/view': 6.36.1
       '@lezer/common': 1.2.3
       '@lezer/highlight': 1.2.1
       '@lezer/lr': 1.4.2
@@ -589,7 +592,7 @@ packages:
   /@codemirror/view@6.35.0:
     resolution: {integrity: sha512-I0tYy63q5XkaWsJ8QRv5h6ves7kvtrBWjBcnf/bzohFJQc5c14a1AQRdE8QpPF9eMp5Mq2FMm59TCj1gDfE7kw==}
     dependencies:
-      '@codemirror/state': 6.4.1
+      '@codemirror/state': 6.5.0
       style-mod: 4.1.2
       w3c-keyname: 2.2.8
     dev: false
@@ -2790,7 +2793,7 @@ packages:
     resolution: {integrity: sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==}
     dependencies:
       '@codemirror/autocomplete': 6.18.4
-      '@codemirror/commands': 6.7.1
+      '@codemirror/commands': 6.8.0
       '@codemirror/language': 6.10.8
       '@codemirror/lint': 6.8.4
       '@codemirror/search': 6.5.8

src/content/downloads/advancedscripts.json

@@ -2,8 +2,9 @@
   "name": "AdvancedScripts",
   "description": "Ein Fabric-Mod, der für den BauServer von SteamWar Hotkeys für das ScriptSystem hinzufügt. Hierzu werden die einzelnen Zeichen an den Server gesendet und vom Server verarbeitet.",
   "url": {
-    "1.20.1": "https://steamwar.de/AdvancedScriptsV3",
-    "1.19": "https://steamwar.de/AdvancedScripts"
+    "1.21.4": "https://git.steamwar.de/SteamWar/AdvancedScripts/releases/download/2.2.0/AdvancedScripts-2.2.0.jar",
+    "1.20.6": "https://git.steamwar.de/SteamWar/AdvancedScripts/releases/download/2.1.0/AdvancedScripts-2.1.0.jar",
+    "1.19.3": "https://git.steamwar.de/SteamWar/AdvancedScripts/releases/download/2.0.0/AdvancedScripts-2.0.0.jar"
   },
-  "sourceUrl": "https://steamwar.de/devlabs/SteamWar/AdvancedScripts"
+  "sourceUrl": "https://git.steamwar.de/SteamWar/AdvancedScripts"
 }

src/content/downloads/modsender.json

@@ -1,6 +0,0 @@
-{
-  "name": "FabricModSender",
-  "description": "Ein Fabric-Mod, der SteamWar beim Serverjoin die von dir installierten Mods sendet und es uns damit ermöglicht, sie auf schädliche Mods zu überprüfen. Eine Installation dieses Mods ermöglicht dir das Joinen von Arenen mit Fabric auf SteamWar.",
-  "url": "https://steamwar.de/FabricModSender",
-  "sourceUrl": "https://steamwar.de/devlabs/SteamWar/FabricModSender"
-}

src/i18n/common/de.json

@@ -240,5 +240,9 @@
   },
   "ranking": {
     "heading": "{# mode #} Rangliste"
+  },
+  "404": {
+    "title": "404 - Seite nicht gefunden",
+    "description": "Seite nicht gefunden"
   }
 }

src/i18n/common/en.json

@@ -180,5 +180,9 @@
   },
   "stats": {
     "title": "Fight Statistics"
+  },
+  "404": {
+    "title": "404 - Page not found",
+    "description": "Page not found"
   }
 }

src/pages/not-found.astro

@@ -0,0 +1,39 @@
+---
+import PageLayout from "../layouts/PageLayout.astro";
+import {t} from "astro-i18n";
+---
+
+<PageLayout title={t("404.title")}>
+    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 800 400">
+        <!-- 404 Text - heller für besseren Kontrast -->
+        <text x="400" y="150" font-family="Arial Black" font-size="120" fill="#ffffff" text-anchor="middle">404</text>
+
+        <!-- Trauriger Roboter - hellere Farben für besseren Kontrast -->
+        <!-- Körper -->
+        <rect x="350" y="200" width="100" height="120" rx="10" fill="#888888"/>
+
+        <!-- Kopf -->
+        <rect x="365" y="160" width="70" height="60" rx="5" fill="#888888"/>
+
+        <!-- Augen -->
+        <circle cx="385" cy="185" r="8" fill="#ff6b6b"/>
+        <circle cx="415" cy="185" r="8" fill="#ff6b6b"/>
+
+        <!-- Antenne -->
+        <line x1="400" y1="160" x2="400" y2="140" stroke="#888888" stroke-width="4"/>
+        <circle cx="400" cy="135" r="5" fill="#888888"/>
+
+        <!-- Arme -->
+        <rect x="320" y="220" width="30" height="10" rx="5" fill="#888888"/>
+        <rect x="450" y="220" width="30" height="10" rx="5" fill="#888888"/>
+
+        <!-- Text unter dem Roboter - heller für besseren Kontrast -->
+        <text x="400" y="360" font-family="Arial" font-size="24" fill="#ffffff" text-anchor="middle">{t("404.description")}</text>
+
+        <!-- Dekorative Elemente - heller für besseren Kontrast -->
+        <circle cx="250" cy="100" r="5" fill="#bbbbbb"/>
+        <circle cx="550" cy="150" r="5" fill="#bbbbbb"/>
+        <circle cx="200" cy="300" r="5" fill="#bbbbbb"/>
+        <circle cx="600" cy="250" r="5" fill="#bbbbbb"/>
+    </svg>
+</PageLayout>

steamwarci.yml

@@ -1,7 +1,7 @@
 build:
-  - "echo 'PUBLIC_API_SERVER=https://dev.steamwar.de/api' > .env"
+  - "echo 'PUBLIC_API_SERVER=https://api.steamwar.de' > .env"
   - "pnpm run ci"
 
 release:
-  - "rm -r /var/www/dev/*"
-  - "mv dist/* /var/www/dev"
+  - "rm -r /var/www/html/*"
+  - "mv dist/* /var/www/html"

tailwind.config.cjs

@@ -9,7 +9,6 @@ module.exports = {
 	theme: {
 		extend: {
 			colors: {
-				// flowbite-svelte
 				primary: { 50: '#FFF5F2', 100: '#FFF1EE', 200: '#FFE4DE', 300: '#FFD5CC', 400: '#FFBCAD', 500: '#FE795D', 600: '#EF562F', 700: '#EB4F27', 800: '#CC4522', 900: '#A5371B'},
 			}
 		},