From 48586f1a500b06274d2c9052d20d487c370c90cb Mon Sep 17 00:00:00 2001
From: Chaoscaot <chaos@chaoscaot.de>
Date: Wed, 2 Apr 2025 09:52:37 +0200
Subject: [PATCH] Add error handling and improve file upload UX

---
 src/components/dashboard/UploadModal.svelte | 51 +++++++++++++--------
 src/components/styled/SWModal.svelte        | 10 ++--
 src/i18n/common/de.json                     |  7 ++-
 src/i18n/common/en.json                     |  5 ++
 4 files changed, 50 insertions(+), 23 deletions(-)

diff --git a/src/components/dashboard/UploadModal.svelte b/src/components/dashboard/UploadModal.svelte
index 015fbb8..b9c019d 100644
--- a/src/components/dashboard/UploadModal.svelte
+++ b/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>
\ No newline at end of file
diff --git a/src/components/styled/SWModal.svelte b/src/components/styled/SWModal.svelte
index 502ee88..0d7704a 100644
--- a/src/components/styled/SWModal.svelte
+++ b/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>
diff --git a/src/i18n/common/de.json b/src/i18n/common/de.json
index f263819..841ad21 100644
--- a/src/i18n/common/de.json
+++ b/src/i18n/common/de.json
@@ -200,7 +200,12 @@
         }
       },
       "cancel": "Abbrechen",
-      "title": "Schematic hochladen"
+      "title": "Schematic hochladen",
+      "errors": {
+        "invalidEnding": "Diese Dateiendung kann nicht Hochgeladen werden.",
+        "noFile": "Keine Datei.",
+        "upload": "Fehler beim Hochladen, Überprüfe deine Schematic!"
+      }
     }
   },
   "login": {
diff --git a/src/i18n/common/en.json b/src/i18n/common/en.json
index 84ea819..3de45a7 100644
--- a/src/i18n/common/en.json
+++ b/src/i18n/common/en.json
@@ -137,6 +137,11 @@
           "download": "Download",
           "close": "Close"
         }
+      },
+      "errors": {
+        "invalidEnding": "This file extension cannot be uploaded.",
+        "noFile": "No file.",
+        "upload": "Error uploading, check your schematic!"
       }
     }
   },