From 56c33656562079bb773491c8aecedea3f6acdb74 Mon Sep 17 00:00:00 2001
From: Philipp Dormann <philipp@philippdormann.de>
Date: Sat, 22 Apr 2023 11:11:50 +0200
Subject: [PATCH] add svelte-french-toast

---
 package.json                              |  1 +
 pnpm-lock.yaml                            | 28 +++++++++++++++++++----
 src/components/cards/CardsOverview.svelte | 11 ++++-----
 src/components/dashboard/Dashboard.svelte |  2 ++
 4 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 45784ca6..3414d5ca 100644
--- a/package.json
+++ b/package.json
@@ -49,6 +49,7 @@
 		"localforage": "1.10.0",
 		"marked": "2.0.3",
 		"svelte": "3.58.0",
+		"svelte-french-toast": "1.0.4-beta.0",
 		"svelte-i18n": "3.6.0",
 		"tinro": "0.6.12",
 		"toastify-js": "1.12.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a8c122fa..0050db47 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -2,8 +2,8 @@ lockfileVersion: '6.0'
 
 dependencies:
   '@odit/lfk-client-js':
-    specifier: 1.1.0
-    version: 1.1.0
+    specifier: 1.1.1
+    version: 1.1.1
   '@paralleldrive/cuid2':
     specifier: ^2.2.0
     version: 2.2.0
@@ -31,6 +31,9 @@ dependencies:
   svelte:
     specifier: 3.58.0
     version: 3.58.0
+  svelte-french-toast:
+    specifier: 1.0.4-beta.0
+    version: 1.0.4-beta.0(svelte@3.58.0)
   svelte-i18n:
     specifier: 3.6.0
     version: 3.6.0(svelte@3.58.0)
@@ -510,8 +513,8 @@ packages:
       '@octokit/openapi-types': 16.0.0
     dev: true
 
-  /@odit/lfk-client-js@1.1.0:
-    resolution: {integrity: sha512-yhjsi7YMzL9/fJ7o06yszzw15iZhao3VmX0G9oqZWFwYJd1M2td3Lvm76mXNzTVlbdG6W0W3+eEjcalBdo51Pg==}
+  /@odit/lfk-client-js@1.1.1:
+    resolution: {integrity: sha512-EVwK/kT8VBs0vLk64KgCsHCl2heWHJMWAmZAghEDZWPCPQWX9xL6UzRuKewLXl36/T9YKqZLfDyM5e3WfgLyOg==}
     dev: false
 
   /@odit/license-exporter@0.0.12:
@@ -3443,6 +3446,15 @@ packages:
     engines: {node: '>= 0.4'}
     dev: true
 
+  /svelte-french-toast@1.0.4-beta.0(svelte@3.58.0):
+    resolution: {integrity: sha512-PkYNukEQAPZyV5ei+JzeYEsbaXFSbJS8/SDTdC8giYa5Atxp2SRepFnPDWx6mu7rV53g886FNLktPMLwRljkpw==}
+    peerDependencies:
+      svelte: ^3.57.0
+    dependencies:
+      svelte: 3.58.0
+      svelte-writable-derived: 3.0.1(svelte@3.58.0)
+    dev: false
+
   /svelte-hmr@0.15.1(svelte@3.58.0):
     resolution: {integrity: sha512-BiKB4RZ8YSwRKCNVdNxK/GfY+r4Kjgp9jCLEy0DuqAKfmQtpL38cQK3afdpjw4sqSs4PLi3jIPJIFp259NkZtA==}
     engines: {node: ^12.20 || ^14.13.1 || >= 16}
@@ -3472,6 +3484,14 @@ packages:
     resolution: {integrity: sha512-ITmX/XUiSdkaILmsTviKRkZPaXckM5/FA7Y8BhiUPoamaZG/ZDyOo6ydjFu9fDVFTbwoAUGUi6HBjs+ZdK2AwA==}
     dev: true
 
+  /svelte-writable-derived@3.0.1(svelte@3.58.0):
+    resolution: {integrity: sha512-zBWCS5c3MA9o4NT/UJHP3KoPOhtmH2ZQ/QRK31w9LzLdPP7MNncUcBGIu4iH2RVt17iRfR6agm7nEqwNvsYuMw==}
+    peerDependencies:
+      svelte: ^3.2.1
+    dependencies:
+      svelte: 3.58.0
+    dev: false
+
   /svelte@3.58.0:
     resolution: {integrity: sha512-brIBNNB76mXFmU/Kerm4wFnkskBbluBDCjx/8TcpYRb298Yh2dztS2kQ6bhtjMcvUhd5ynClfwpz5h2gnzdQ1A==}
     engines: {node: '>= 8'}
diff --git a/src/components/cards/CardsOverview.svelte b/src/components/cards/CardsOverview.svelte
index d511c445..9878a35b 100644
--- a/src/components/cards/CardsOverview.svelte
+++ b/src/components/cards/CardsOverview.svelte
@@ -2,7 +2,7 @@
   import { _ } from "svelte-i18n";
   import { RunnerCardService } from "@odit/lfk-client-js";
   import store from "../../store";
-  import Toastify from "toastify-js";
+  import toast from "svelte-french-toast";
   import CardsEmptyState from "./CardsEmptyState.svelte";
   import CardDetailModal from "./CardDetailModal.svelte";
   import GenerateRunnerCards from "../pdf_generation/GenerateRunnerCards.svelte";
@@ -148,14 +148,11 @@
       ...options,
       data: current_cards,
     }));
-    Toastify({
-      text: $_("card-deleted"),
-      duration: 3500,
-      backgroundColor: "linear-gradient(to right, #00b09b, #96c93d)",
-    }).showToast();
+    toast.success($_("card-deleted"));
   }
 
   onMount(async () => {
+    toast.loading("Karten werden geladen...");
     let page = 0;
     while (page >= 0) {
       const cards = await RunnerCardService.runnerCardControllerGetAll(
@@ -175,6 +172,8 @@
       dataLoaded = true;
       page++;
     }
+    toast.dismiss();
+    toast.success("All cards loaded");
     console.log("All cards loaded");
   });
 </script>
diff --git a/src/components/dashboard/Dashboard.svelte b/src/components/dashboard/Dashboard.svelte
index f6ebf1f9..efedc60e 100644
--- a/src/components/dashboard/Dashboard.svelte
+++ b/src/components/dashboard/Dashboard.svelte
@@ -5,6 +5,7 @@
   import { router } from "tinro";
   import NoComponentLoaded from "../base/NoComponentLoaded.svelte";
   import { AuthService } from "@odit/lfk-client-js";
+  import { Toaster } from 'svelte-french-toast';
   $: navOpen = false;
   function logout() {
     localForage.clear();
@@ -345,6 +346,7 @@
             d="M3 5a1 1 0 011-1h12a1 1 0 110 2H4A1 1 0 013 5zm0 5a1 1 0 011-1h12a1 1 0 110 2H4a1 1 0 01-1-1zm0 5a1 1 0 011-1h12a1 1 0 110 2H4a1 1 0 01-1-1z"
             clip-rule="evenodd" /></svg></button>
     </header>
+    <Toaster position="top-right" />
     <slot>
       <NoComponentLoaded />
     </slot>