From 4bfcce3efc430153e56fafa836f890dabfb8d4a1 Mon Sep 17 00:00:00 2001
From: Michele Sciabarra <michele@sciabarra.com>
Date: Sun, 18 Oct 2020 20:13:04 +0200
Subject: [PATCH] fixed debugging

---
 admin/web/src/Debug.svelte     | 14 +++++++++-----
 admin/web/src/DebugData.svelte | 21 ++++++++++++++-------
 admin/web/src/Link.svelte      |  2 +-
 admin/web/src/ShipData.svelte  |  1 -
 admin/web/src/store.js         |  2 --
 5 files changed, 24 insertions(+), 16 deletions(-)
 delete mode 100644 admin/web/src/ShipData.svelte

diff --git a/admin/web/src/Debug.svelte b/admin/web/src/Debug.svelte
index 024452c..fffe441 100644
--- a/admin/web/src/Debug.svelte
+++ b/admin/web/src/Debug.svelte
@@ -1,9 +1,11 @@
 <script>
-  import { reload } from "./store";
-  import { onMount } from "svelte";
+  import { url } from "./url.js";
+  import { onMount, onDestroy } from "svelte";
   import Link from './Link.svelte'
+  import DebugData from './DebugData.svelte';
 
   export let api;
+  export let key = "";
 
   const cacheUrl = api + "/util/cache?";
   const scanUrl = cacheUrl + "scan="
@@ -46,11 +48,10 @@
   }
 
   onMount(start);
-  reload.subscribe(() => {
-    start();
-  });
+  onDestroy(url.subscribe(() => { start() }))
 </script>
 
+{#if key == ""}
 <h1>Cache</h1>
 <div class="form-group">
   <div class="input-group">
@@ -96,3 +97,6 @@
     </button>
   {/if}
 </div>
+{:else}
+<DebugData {api} {key}/>
+{/if}
\ No newline at end of file
diff --git a/admin/web/src/DebugData.svelte b/admin/web/src/DebugData.svelte
index f13d9f9..1d3b823 100644
--- a/admin/web/src/DebugData.svelte
+++ b/admin/web/src/DebugData.svelte
@@ -1,12 +1,14 @@
 <script>
-  export let key = "";
-  import { navigate, Link } from "svelte-routing";
   import { onMount } from "svelte";
+  import { navigate } from './url.js'
+
+  export let key = "";
+  export let api = "";
 
   let state = {};
 
   const url = api + "/util/cache";
-  let entry = window.atob(key);
+  const entry = window.atob(key);
 
   async function cache(action, entry) {
     let u = url + "?" + action + "=" + encodeURI(entry);
@@ -17,12 +19,13 @@
 
   onMount(() => cache("get", entry));
   function back() {
-    navigate("/debug");
+    navigate("debug", "")
   }
+
   function clean() {
     if(confirm("Are you sure?")) {
       cache("del", entry);
-      back();
+      back();     
     }
   }
 </script>
@@ -30,7 +33,7 @@
 <h1>Cache Data</h1>
 
 {#if state.get}
-  <big>Key:</big>
+  <big>Key:.</big>
   <p>{entry}</p>
   <big>Value:</big>
   <pre>{JSON.stringify(state.get, null, 2)}</pre>
@@ -45,4 +48,8 @@
   <h1>Error</h1>
   <p>{state.error}</p>
 {/if}
- <button type="button" class="btn btn-primary" on:click={back}>Back</button>
+<br>
+<button type="button" class="btn btn-primary" on:click={back}>
+  Back to Debugging
+</button>
+
diff --git a/admin/web/src/Link.svelte b/admin/web/src/Link.svelte
index 64433b2..6c6d2c4 100644
--- a/admin/web/src/Link.svelte
+++ b/admin/web/src/Link.svelte
@@ -5,7 +5,7 @@
   export let to = "";
   export let target = "";
   export let key = "";
-
+  
   function open(event) {
     event.preventDefault()
     window.open(target, "editor", )
diff --git a/admin/web/src/ShipData.svelte b/admin/web/src/ShipData.svelte
deleted file mode 100644
index ddefe91..0000000
--- a/admin/web/src/ShipData.svelte
+++ /dev/null
@@ -1 +0,0 @@
-<h1>Shipping</h1>
diff --git a/admin/web/src/store.js b/admin/web/src/store.js
index eb9e433..04236f4 100644
--- a/admin/web/src/store.js
+++ b/admin/web/src/store.js
@@ -2,5 +2,3 @@ import {writable} from 'svelte/store'
 
 export const formData = writable({})
 
-export const reload = writable()
-