From 2f86c4169f473b6299430f506f65e158db1c6ee4 Mon Sep 17 00:00:00 2001
From: cupcakearmy <hi@nicco.io>
Date: Mon, 22 Nov 2021 01:58:09 +0100
Subject: [PATCH] cleanup

---
 src/dashboard/App.svelte                           |  2 +-
 src/dashboard/components/DateInput.svelte          |  5 ++---
 src/dashboard/components/Dev.svelte                |  2 +-
 src/dashboard/components/FileUpload.svelte         | 12 +++++-------
 src/dashboard/components/RangeChooser.svelte       | 12 ++++++------
 src/dashboard/components/Rules.svelte              |  3 ++-
 src/dashboard/{components => pages}/Options.svelte |  2 +-
 7 files changed, 18 insertions(+), 20 deletions(-)
 rename src/dashboard/{components => pages}/Options.svelte (97%)

diff --git a/src/dashboard/App.svelte b/src/dashboard/App.svelte
index 521e067..41fe553 100644
--- a/src/dashboard/App.svelte
+++ b/src/dashboard/App.svelte
@@ -5,7 +5,7 @@
   import Dashboard from './pages/Dashboard.svelte'
   import Limits from './pages/Limits.svelte'
   import Footer from './components/Footer.svelte'
-  import Options from './components/Options.svelte'
+  import Options from './pages/Options.svelte'
 
   import { isDev } from '../shared/utils'
 
diff --git a/src/dashboard/components/DateInput.svelte b/src/dashboard/components/DateInput.svelte
index 2440a57..8040736 100644
--- a/src/dashboard/components/DateInput.svelte
+++ b/src/dashboard/components/DateInput.svelte
@@ -1,5 +1,4 @@
 <script>
-  import { onMount } from 'svelte'
   import dayjs from 'dayjs'
 
   const format = 'YYYY-MM-DD'
@@ -16,10 +15,10 @@
   $: output(internal)
 </script>
 
+<input class="form-input input-sm" type="date" bind:value={internal} {name} />
+
 <style>
   input {
     width: 7rem !important;
   }
 </style>
-
-<input class="form-input input-sm" type="date" bind:value={internal} {name} />
diff --git a/src/dashboard/components/Dev.svelte b/src/dashboard/components/Dev.svelte
index a275422..620deb2 100644
--- a/src/dashboard/components/Dev.svelte
+++ b/src/dashboard/components/Dev.svelte
@@ -3,7 +3,7 @@
   import day from 'dayjs'
   import { range, random } from 'lodash'
 
-  import { insertLog, normalizeTimestamp, DB, clear as clearDB } from '../../shared/db'
+  import { insertLog, normalizeTimestamp, clear as clearDB } from '../../shared/db'
 
   let loading = false
 
diff --git a/src/dashboard/components/FileUpload.svelte b/src/dashboard/components/FileUpload.svelte
index 8274309..625e3b1 100644
--- a/src/dashboard/components/FileUpload.svelte
+++ b/src/dashboard/components/FileUpload.svelte
@@ -1,6 +1,4 @@
 <script>
-  import { isEqual } from 'lodash'
-
   let text = 'Select File'
 
   export let value = undefined
@@ -30,6 +28,11 @@
   }
 </script>
 
+<label class="btn">
+  {#if error}Invalid file{:else}{text}{/if}
+  <input bind:this={input} on:change={validate} class="input" accept="application/json" type="file" />
+</label>
+
 <style>
   label {
     width: 18em;
@@ -40,8 +43,3 @@
     display: none;
   }
 </style>
-
-<label class="btn">
-  {#if error}Invalid file{:else}{text}{/if}
-  <input bind:this={input} on:change={validate} class="input" accept="application/json" type="file" />
-</label>
diff --git a/src/dashboard/components/RangeChooser.svelte b/src/dashboard/components/RangeChooser.svelte
index 5dd46df..36b6135 100644
--- a/src/dashboard/components/RangeChooser.svelte
+++ b/src/dashboard/components/RangeChooser.svelte
@@ -23,12 +23,6 @@
   onMount(() => set('day', 0)())
 </script>
 
-<style>
-  .spacer {
-    width: 0.5em;
-  }
-</style>
-
 <div class="flex items-center">
   <div class="btn-group">
     <button class="btn btn-sm" on:click={all}>All</button>
@@ -43,3 +37,9 @@
     <DateInput bind:date={end} />
   </div>
 </div>
+
+<style>
+  .spacer {
+    width: 0.5em;
+  }
+</style>
diff --git a/src/dashboard/components/Rules.svelte b/src/dashboard/components/Rules.svelte
index cff3677..1011ce4 100644
--- a/src/dashboard/components/Rules.svelte
+++ b/src/dashboard/components/Rules.svelte
@@ -21,7 +21,8 @@
         style={`width:${percentage}%;`}
         aria-valuenow={percentage}
         aria-valuemin="0"
-        aria-valuemax="100" />
+        aria-valuemax="100"
+      />
     </div>
   {/await}
 {/each}
diff --git a/src/dashboard/components/Options.svelte b/src/dashboard/pages/Options.svelte
similarity index 97%
rename from src/dashboard/components/Options.svelte
rename to src/dashboard/pages/Options.svelte
index 91cb1bf..ad52987 100644
--- a/src/dashboard/components/Options.svelte
+++ b/src/dashboard/pages/Options.svelte
@@ -4,7 +4,7 @@
   import { saveAs } from 'file-saver'
   import dj from 'dayjs'
 
-  import FileUpload from './FileUpload.svelte'
+  import FileUpload from '../components/FileUpload.svelte'
 
   import { dump as dumpDB, load as loadDB, clear as clearDB, validate } from '../../shared/db'
   import { longPress } from '../../shared/lib'