From 5d3194dd41a8019e909b2c3f49aba39308d2bfa5 Mon Sep 17 00:00:00 2001
From: Azalea <22280294+hykilpikonna@users.noreply.github.com>
Date: Sat, 2 Mar 2024 19:29:35 -0500
Subject: [PATCH] [O] Better loading and error display

---
 AquaNet/src/components/Confirm.svelte        | 36 --------
 AquaNet/src/components/StatusOverlays.svelte | 90 ++++++++++++++++++++
 AquaNet/src/pages/Home/LinkCard.svelte       |  8 +-
 3 files changed, 92 insertions(+), 42 deletions(-)
 delete mode 100644 AquaNet/src/components/Confirm.svelte
 create mode 100644 AquaNet/src/components/StatusOverlays.svelte

diff --git a/AquaNet/src/components/Confirm.svelte b/AquaNet/src/components/Confirm.svelte
deleted file mode 100644
index 3b86511d..00000000
--- a/AquaNet/src/components/Confirm.svelte
+++ /dev/null
@@ -1,36 +0,0 @@
-<!-- Svelte 4.2.11 -->
-
-<script lang="ts">
-  import { fade } from 'svelte/transition'
-  import { clz } from "../libs/ui";
-  import type { ConfirmProps } from "../libs/generalTypes";
-
-  // Props
-  export let show: ConfirmProps
-</script>
-
-{#if show}
-  <div class="overlay" transition:fade>
-    <div>
-      <h2>{show.title}</h2>
-      <span>{show.message}</span>
-
-      <div class="actions">
-        {#if show.cancel}
-          <!-- Svelte LSP is very annoying here -->
-          <button on:click={() => show.cancel && show.cancel()}>Cancel</button>
-        {/if}
-        <button on:click={() => show.confirm()} class={clz({error: show.dangerous})}>Confirm</button>
-      </div>
-    </div>
-  </div>
-{/if}
-
-<style lang="sass">
-  .actions
-    display: flex
-    gap: 16px
-
-    button
-      width: 100%
-</style>
\ No newline at end of file
diff --git a/AquaNet/src/components/StatusOverlays.svelte b/AquaNet/src/components/StatusOverlays.svelte
new file mode 100644
index 00000000..3ee1d1d3
--- /dev/null
+++ b/AquaNet/src/components/StatusOverlays.svelte
@@ -0,0 +1,90 @@
+<!-- Svelte 4.2.11 -->
+
+<script lang="ts">
+  import { fade } from 'svelte/transition'
+  import { clz } from "../libs/ui";
+  import type { ConfirmProps } from "../libs/generalTypes";
+  import { DISCORD_INVITE } from "../libs/config";
+  import Icon from "@iconify/svelte";
+
+  // Props
+  export let confirm: ConfirmProps | null = null
+  export let error: string | null
+  export let loading: boolean = false
+</script>
+
+{#if confirm}
+  <div class="overlay" transition:fade>
+    <div>
+      <h2>{confirm.title}</h2>
+      <span>{confirm.message}</span>
+
+      <div class="actions">
+        {#if confirm.cancel}
+          <!-- Svelte LSP is very annoying here -->
+          <button on:click={() => {
+            confirm && confirm.cancel && confirm.cancel()
+
+            // Set to null
+            confirm = null
+          }}>Cancel</button>
+        {/if}
+        <button on:click={() => confirm && confirm.confirm()} class={clz({error: confirm.dangerous})}>Confirm</button>
+      </div>
+    </div>
+  </div>
+{/if}
+
+{#if error}
+  <div class="overlay" transition:fade>
+    <div>
+      <h2 class="error">Error</h2>
+      <span>Something went wrong, please try again later or <a href={DISCORD_INVITE}>join our discord for support.</a></span>
+      <span>Detail: {error}</span>
+<!--      <div class="actions">-->
+<!--        <button on:click={() => error = null}>Close</button>-->
+<!--      </div>-->
+
+      <div class="actions">
+        <button on:click={() => location.reload()} class="error">
+          Refresh
+        </button>
+      </div>
+    </div>
+  </div>
+{/if}
+
+{#if loading && !error}
+  <div class="overlay loading" transition:fade>
+    <Icon class="icon" icon="svg-spinners:pulse-2"/>
+    <span><span>LOADING</span></span>
+  </div>
+{/if}
+
+<style lang="sass">
+  .actions
+    display: flex
+    gap: 16px
+
+    button
+      width: 100%
+
+  .loading.overlay
+    font-size: 28rem
+
+    :global(.icon)
+      opacity: 0.5
+
+    > span
+      position: absolute
+      inset: 0
+      display: flex
+      justify-content: center
+      align-items: center
+      background: transparent
+
+      letter-spacing: 20px
+      margin-left: 20px
+
+      font-size: 1.5rem
+</style>
\ No newline at end of file
diff --git a/AquaNet/src/pages/Home/LinkCard.svelte b/AquaNet/src/pages/Home/LinkCard.svelte
index 255b4639..39ac0174 100644
--- a/AquaNet/src/pages/Home/LinkCard.svelte
+++ b/AquaNet/src/pages/Home/LinkCard.svelte
@@ -7,7 +7,7 @@
   import { CARD, USER } from "../../libs/sdk";
   import moment from "moment"
   import Icon from "@iconify/svelte";
-  import Confirm from "../../components/Confirm.svelte";
+  import StatusOverlays from "../../components/StatusOverlays.svelte";
 
   // State
   let state: 'ready' | 'linking-AC' | 'linking-SN' | 'loading' = "loading"
@@ -230,10 +230,6 @@
         </div>
       {/each}
     </div>
-  {:else if error}
-    <span class="error" transition:slide>{error}</span>
-  {:else}
-    <span>Loading...</span>
   {/if}
 
   <h2>Link Card</h2>
@@ -310,7 +306,7 @@
     </div>
   {/if}
 
-  <Confirm show={showConfirm} />
+  <StatusOverlays bind:confirm={showConfirm} bind:error={error} loading={!me} />
 </div>
 
 <style lang="sass">