Fix Merge

src/components/EloTable.svelte

@@ -20,6 +20,7 @@
 <script lang="ts">
     import {t} from "astro-i18n";
     import {statsRepo} from "@repo/stats.ts";
+    import "@styles/table.css"
 
 
   interface Props {
@@ -64,7 +65,3 @@
     <p>{error.message}</p>
 {/await}
 
-<style>
-    @import "../styles/table.css";
-</style>
-

src/components/FightStatsChart.svelte

@@ -79,6 +79,8 @@
                     })
                 },
                 options: {
+                    maintainAspectRatio: false,
+
                     scales: {
                         x: {
                             type: "time",
@@ -105,5 +107,5 @@
 </script>
 
 <div>
-    <canvas bind:this={canvas}></canvas>
+    <canvas height="500" bind:this={canvas}></canvas>
 </div>

src/components/Navbar.svelte

@@ -101,6 +101,8 @@
                     <a href={l("/rules/microwargear")}
                        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.ranked")}</h2>
+                    <a href={l("/rangliste/missilewars")} class="btn btn-gray">{t("navbar.links.ranked.mw")}</a>
                 </div>
             </div>
             <!-- TODO: Add help center

src/components/dashboard/Statistics.svelte

@@ -43,7 +43,5 @@
             maximumFractionDigits: 2
         }).format(data.playtime)})}h</p>
     <p>{t("dashboard.stats.fights", {fights: data.fights})}</p>
-    {#if user.perms.includes("CHECK")}
-        <p>{t("dashboard.stats.checked", {checked: data.acceptedSchematics})}</p>
-    {/if}
+    <p>{t("dashboard.stats.checked", {checked: data.acceptedSchematics})}</p>
 {/await}

src/components/dashboard/UploadModal.svelte

@@ -21,19 +21,21 @@
     import {createEventDispatcher} from "svelte";
     import {schemRepo} from "@repo/schem.ts";
     import SWModal from "@components/styled/SWModal.svelte";
-    import {t} from "astro-i18n"
+    import {t} from "astro-i18n";
 
     const dispatch = createEventDispatcher();
 
-  interface Props {
-    open?: boolean;
-  }
+    interface Props {
+        open?: boolean;
+    }
 
-  let { open = $bindable(false) }: Props = $props();
+    let {open = $bindable(false)}: Props = $props();
 
-    async function upload() {
+    async function upload(e: Event) {
+        e.stopPropagation();
         if (uploadFile == null) {
-            return
+            error = "dashboard.schematic.errors.noFile";
+            return;
         }
         let file = uploadFile[0];
 
@@ -42,33 +44,46 @@
         let type = name.split(".").pop();
 
         if (type !== "schem" && type !== "schematic") {
-            return
+            error = "dashboard.schematic.errors.invalidEnding";
+            return;
         }
 
         let content = await file.arrayBuffer();
 
-        // @ts-ignore
         let b64 = btoa(String.fromCharCode.apply(null, new Uint8Array(content)));
 
-        let response = await $schemRepo.uploadSchematic(name, b64);
+        try {
+            await $schemRepo.uploadSchematic(name, b64);
 
-        open = false;
+            open = false;
+            value = "";
+            dispatch("reset");
+        } catch (e) {
+            error = "dashboard.schematic.errors.upload";
+        }
+    }
+
+    function reset(e: Event) {
+        e.stopPropagation();
+        open = false
         value = "";
-        dispatch("reset")
     }
 
     let uploadFile: FileList | null = $state(null);
     let value = $state("");
+    let error = $state(null)
 </script>
 
 <SWModal title={t("dashboard.schematic.title")} bind:open>
     <form>
-        <input type="file" bind:files={uploadFile} bind:value />
+        <label for="schem-upload">{t("dashboard.schematic.title")}</label>
+        <input type="file" id="schem-upload" bind:files={uploadFile} class="overflow-ellipsis" bind:value accept=".schem, .schematic"/>
+        {#if error !== null}
+            <p class="text-red-400">{t(error)}</p>
+        {/if}
     </form>
     {#snippet footer()}
-  
-          <button class="btn !ml-auto" onclick={upload}>{t("dashboard.schematic.upload")}</button>
-          <button class="btn btn-gray" onclick={() => open = false}>{t("dashboard.schematic.cancel")}</button>
-      
-  {/snippet}
+        <button class="btn" onclick={upload}>{t("dashboard.schematic.upload")}</button>
+        <button class="btn btn-gray" onclick={reset}>{t("dashboard.schematic.cancel")}</button>
+    {/snippet}
 </SWModal>

src/components/styled/SWModal.svelte

@@ -68,16 +68,18 @@
     })
 </script>
 
-<dialog bind:this={dialog} onclose={close} onclick={(e) => dialog.close()} aria-hidden="true" class="max-h-full max-w-md w-full rounded-lg shadow-lg dark:bg-neutral-800 dark:text-neutral-100">
-    <div onclick={stopPropagation(onclick)} aria-hidden="true">
+<dialog bind:this={dialog} onclose={close} onclick={(e) => dialog.close()} aria-hidden="true" class="max-h-full min-w-md w-fit rounded-lg shadow-lg dark:bg-neutral-800 dark:text-neutral-100">
+    <div onclick={stopPropagation(onclick)} aria-hidden="true" class="w-fit">
         <div class="p-6 border-b border-neutral-200 dark:border-neutral-700">
             <h1 class="text-4xl font-bold">{title}</h1>
         </div>
         <div class="p-6 main border-b border-neutral-200 dark:border-neutral-700">
             {@render children?.()}
         </div>
-        <div class="flex mx-4 my-2 p-6" onclick={() => dialog.close()} aria-hidden="true">
-            {@render footer?.()}
+        <div class="mx-4 my-2 p-6">
+            <div class="ml-auto flex justify-end" onclick={() => dialog.close()} aria-hidden="true">
+                {@render footer?.()}
+            </div>
         </div>
     </div>
 </dialog>