From 25a9f21ab4e56b503c0c39591e78b0cebbb5b911 Mon Sep 17 00:00:00 2001
From: Chaoscaot <chaos@chaoscaot.de>
Date: Tue, 6 Aug 2024 18:58:07 +0200
Subject: [PATCH] Lixfel anmerkungen #1

---
 astro-i18n.config.ts              |  1 -
 src/components/Navbar.svelte      |  8 +++----
 src/content/pages/de/about.md     | 19 ----------------
 src/content/pages/en/about.md     | 31 -------------------------
 src/i18n/common/de.json           |  9 ++++----
 src/i18n/common/en.json           |  5 ++--
 src/pages/index.astro             | 38 +++++--------------------------
 src/pages/statistiken/fight.astro |  1 +
 8 files changed, 16 insertions(+), 96 deletions(-)
 delete mode 100644 src/content/pages/de/about.md
 delete mode 100644 src/content/pages/en/about.md

diff --git a/astro-i18n.config.ts b/astro-i18n.config.ts
index 18ff61d..c1a4391 100644
--- a/astro-i18n.config.ts
+++ b/astro-i18n.config.ts
@@ -12,7 +12,6 @@ export default defineAstroI18nConfig({
     translations: {},
     routes: {
         en: {
-            "ueber-uns": "about",
             "jetzt-spielen": "join",
             impressum: "imprint",
             verhaltensrichtlinien: "code-of-conduct",
diff --git a/src/components/Navbar.svelte b/src/components/Navbar.svelte
index 0d40b83..49caa28 100644
--- a/src/components/Navbar.svelte
+++ b/src/components/Navbar.svelte
@@ -61,11 +61,9 @@
                 </button>
                 <div>
                     <a class="btn btn-gray" href={l("/announcements")}>{t("navbar.links.home.announcements")}</a>
-                    <a class="btn btn-gray" href={l("/about")}>{t("navbar.links.home.about")}</a>
-                    <a class="btn btn-gray" href={l("/publics")}>{t("navbar.links.home.publics")}</a>
                     <a class="btn btn-gray" href={l("/downloads")}>{t("navbar.links.home.downloads")}</a>
-                    <a class="btn btn-gray" href={l("/ranked")}>{t("navbar.links.home.ranked")}</a>
                     <a class="btn btn-gray" href={l("/faq")}>{t("navbar.links.home.faq")}</a>
+                    <a class="btn btn-gray" href={l("/code-of-conduct")}>{t("navbar.links.rules.coc")}</a>
                 </div>
             </div>
             <div class="btn-dropdown my-1">
@@ -76,7 +74,6 @@
                     <CaretDownOutline class="ml-2 mt-auto"/>
                 </button>
                 <div>
-                    <h2 class="px-2 text-gray-300">{t("navbar.links.rules.gamemode")}</h2>
                     <a href={l("/rules/wargear")} class="btn btn-gray">{t("navbar.links.rules.wg")}</a>
                     <a href={l("/rules/miniwargear")} class="btn btn-gray">{t("navbar.links.rules.mwg")}</a>
                     <a href={l("/rules/warship")} class="btn btn-gray">{t("navbar.links.rules.ws")}</a>
@@ -89,7 +86,8 @@
                        class="btn btn-gray">{t("navbar.links.rules.micro")}</a>
                     <a href={l("/rules/streetfight")} class="btn btn-gray">{t("navbar.links.rules.sf")}</a>
                     <h2 class="px-2 text-gray-300">{t("navbar.links.rules.general")}</h2>
-                    <a class="btn btn-gray" href={l("/code-of-conduct")}>{t("navbar.links.rules.coc")}</a>
+                    <a class="btn btn-gray" href={l("/publics")}>{t("navbar.links.rules.publics")}</a>
+                    <a class="btn btn-gray" href={l("/ranked")}>{t("navbar.links.rules.ranked")}</a>
                 </div>
             </div>
             <!-- TODO: Add help center
diff --git a/src/content/pages/de/about.md b/src/content/pages/de/about.md
deleted file mode 100644
index 2ad196c..0000000
--- a/src/content/pages/de/about.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-title: Über uns
-description: Über SteamWar
-slug: ueber-uns
----
-
-# Das ist SteamWar.de
-
-Gegründet im Jahr 2019, ist SteamWar.de der aktuell größte Server, der sich auf WarGears, MiniWarGears, QuickGears, WarShips und AirShips spezialisiert.
-
-Neben den fünf Hauptspielmodi gibt es auch immer noch einen durch rotierenden Spielmodus, der sich alle paar Monate ändert.
-
-Außerdem gibt es auch noch die Möglichkeit TowerRun und MissleWars zu spielen.
-
-## Der Bau-Server
-
-Unser Bau-Server bietet eine Vielzahl von einzigartigen Funktionen, die beim Bauen von Kampfmaschinen und -schiffen helfen.
-
-Jeder Spieler hat seine eigenen Server, welche komplett unabhängig von anderen Servern ist. Das bedeutet, dass jeder Spieler seine eigene Welt hat, in der er bauen kann, ohne dass andere Spieler ihn stören.
\ No newline at end of file
diff --git a/src/content/pages/en/about.md b/src/content/pages/en/about.md
deleted file mode 100644
index c8b24e2..0000000
--- a/src/content/pages/en/about.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-title: About Us
-description: About SteamWar
-slug: about
----
-
-# Security
-
-We value security. 
-
-Therefore, no one except you and those to whom you give the rights, has in-game access to your schematics and your building world. Only AdmiralSeekrank, YoyoNow, Chaoscaot, and Lixfel have access to it (outside of Minecraft) for administrative reasons.
-
-<hr>
-
-# Stability
-
-Our servers are intended to run lag-free and stable.
-
-Therefore, each arena and each building world runs on its own server. This keeps your building world as stable and lag-free as possible, as long as you don't crash it yourself :).
-
-<hr>
-
-# Comfort
-
-Our building server offers unique features that will be helpful in developing your technology.
-
-<hr>
-
-# AirShips
-
-To find a middle ground between the game modes WarShip and WarGear, we have developed the game mode AirShips! With a simple set of rules, we aim to create a maximally exciting and interesting gaming experience.
\ No newline at end of file
diff --git a/src/i18n/common/de.json b/src/i18n/common/de.json
index ea03887..cf48ae1 100644
--- a/src/i18n/common/de.json
+++ b/src/i18n/common/de.json
@@ -58,14 +58,11 @@
         "title": "Start",
         "announcements": "Ankündigungen",
         "about": "Über Uns",
-        "publics": "Publics",
         "downloads": "Downloads",
-        "ranked": "Ranked",
         "faq": "FAQ"
       },
       "rules": {
-        "title": "Regeln",
-        "gamemode": "Spielmodi",
+        "title": "Spielmodi",
         "wg": "WarGear",
         "mwg": "MiniWarGear",
         "ws": "WarShip",
@@ -76,7 +73,9 @@
         "micro": "MicroWarGear",
         "sf": "StreetFight",
         "general": "Allgemein",
-        "coc": "Verhaltensrichtlinien"
+        "coc": "Verhaltensrichtlinien",
+        "publics": "Publics",
+        "ranked": "Ranked"
       },
       "help": {
         "title": "Hilfe",
diff --git a/src/i18n/common/en.json b/src/i18n/common/en.json
index c22fab6..f895c97 100644
--- a/src/i18n/common/en.json
+++ b/src/i18n/common/en.json
@@ -9,8 +9,7 @@
         "faq": "FAQ"
       },
       "rules": {
-        "title": "Rules",
-        "gamemode": "Gamemodes",
+        "title": "Gamemodes",
         "rotating": "Rotating",
         "general": "General",
         "coc": "Code of Conduct"
@@ -105,7 +104,7 @@
       "logout": "Logout"
     },
     "stats": {
-      "playtime": "Playtime: {# playtime #}h",
+      "playtime": "Playtime: {# playtime #}",
       "fights": "Fights: {# fights #}",
       "checked": "Schematics Checked: {# checked #}"
     },
diff --git a/src/pages/index.astro b/src/pages/index.astro
index d8452e5..73a60e3 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -9,33 +9,10 @@ import {t} from "astro-i18n";
 import {l} from "@utils/util";
 import PlayerCount from "@components/PlayerCount.svelte";
 import "../../public/fonts/barlow-condensed/barlow-condensed.css";
-import type {Player} from "@components/types/data";
+import {Player} from "../components/types/data";
 
-const teamMember = await fetch("http://127.0.0.1:1337/data/team").then(value => value.json());
-
-function groupByGroup(array) {
-    const groups = new Map<string, Player[]>();
-
-    for (let user of array) {
-        if (groups.has(user.prefix)) {
-            groups.get(user.prefix).push(user);
-        } else {
-            groups.set(user.prefix, [user]);
-        }
-    }
-
-    return groups;
-}
-
-const groupedTeamMember = groupByGroup(teamMember);
-
-function mapMap<T, K, J>(i: Map<T, K>, fn: (key: T, value: K) => J): J[] {
-    const arr = [];
-    for (let [key, value] of i) {
-        arr.push(fn(key, value));
-    }
-    return arr;
-}
+const teamMember: { [key: string]: Player[]} = await fetch("http://127.0.0.1:1337/data/team")
+    .then(value => value.json());
 ---
 
 <NavbarLayout title={t("home.page")} description="SteamWar.de Homepage">
@@ -150,16 +127,13 @@ function mapMap<T, K, J>(i: Map<T, K>, fn: (key: T, value: K) => J): J[] {
                 <p class="mt-4">{t("home.benefits.events.description.2")}</p>
             </Card>
         </div>
-        <a class="btn btn-ghost px-8 my-4 flex" href={l("/about")}>{t("home.benefits.read")}
-            <CaretRight width="24" heigth="24"/>
-        </a>
     </section>
     <section class="w-full py-12">
-        {mapMap(groupedTeamMember, (key, value) => (
+        {Object.entries(teamMember).map(([prefix, players]) => (
             <div class="flex items-center flex-col">
-                <h2 class="dark:text-white text-4xl font-bold">{t("home.prefix." + key)}</h2>
+                <h2 class="dark:text-white text-4xl font-bold">{t("home.prefix." + prefix)}</h2>
                 <div class="flex my-4 md:flex-row flex-col flex-wrap justify-center">
-                    {value.map(v => (
+                    {players.map(v => (
                         <Card extraClasses="py-24 px-12" client:idle>
                             <figure class="flex flex-col items-center">
                                 <figcaption class="text-center mb-4 text-2xl">{v.name}</figcaption>
diff --git a/src/pages/statistiken/fight.astro b/src/pages/statistiken/fight.astro
index 5db1c56..5d3a567 100644
--- a/src/pages/statistiken/fight.astro
+++ b/src/pages/statistiken/fight.astro
@@ -5,5 +5,6 @@ import {t} from "astro-i18n";
 ---
 
 <PageLayout title={t("stats.title")}>
+    <h1>{t("stats.title")}</h1>
     <FightStatistics client:only="svelte"/>
 </PageLayout>
\ No newline at end of file