From fdbc654a86af5511fe3e6d44e8dd7bd43b6d1c91 Mon Sep 17 00:00:00 2001
From: CheddarCrisp <cheddar@crispbyte.dev>
Date: Sun, 16 Feb 2020 13:56:38 -0500
Subject: [PATCH] Add history display

---
 package-lock.json           |  35 +++++++++
 package.json                |   1 +
 src/ncounter/App.svelte     |  21 ++++--
 src/ncounter/Counter.svelte |  33 ++++++---
 src/ncounter/History.svelte | 143 ++++++++++++++++++++++++++++++++++++
 src/ncounter/site.css       |   6 ++
 6 files changed, 220 insertions(+), 19 deletions(-)
 create mode 100644 src/ncounter/History.svelte

diff --git a/package-lock.json b/package-lock.json
index 7db1cdb..64fcb39 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -907,6 +907,35 @@
         "supports-color": "^5.3.0"
       }
     },
+    "chart.js": {
+      "version": "2.9.3",
+      "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.9.3.tgz",
+      "integrity": "sha512-+2jlOobSk52c1VU6fzkh3UwqHMdSlgH1xFv9FKMqHiNCpXsGPQa/+81AFa+i3jZ253Mq9aAycPwDjnn1XbRNNw==",
+      "dev": true,
+      "requires": {
+        "chartjs-color": "^2.1.0",
+        "moment": "^2.10.2"
+      }
+    },
+    "chartjs-color": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/chartjs-color/-/chartjs-color-2.4.1.tgz",
+      "integrity": "sha512-haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w==",
+      "dev": true,
+      "requires": {
+        "chartjs-color-string": "^0.6.0",
+        "color-convert": "^1.9.3"
+      }
+    },
+    "chartjs-color-string": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz",
+      "integrity": "sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A==",
+      "dev": true,
+      "requires": {
+        "color-name": "^1.0.0"
+      }
+    },
     "chokidar": {
       "version": "2.1.6",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz",
@@ -3828,6 +3857,12 @@
         }
       }
     },
+    "moment": {
+      "version": "2.24.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
+      "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==",
+      "dev": true
+    },
     "move-concurrently": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
diff --git a/package.json b/package.json
index 517dc4e..bba21b4 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
   "license": "MIT",
   "devDependencies": {
     "@beyonk/google-fonts-webpack-plugin": "^1.2.3",
+    "chart.js": "^2.9.3",
     "clean-webpack-plugin": "^3.0.0",
     "css-loader": "^3.4.2",
     "google-fonts-webpack-plugin": "^0.4.4",
diff --git a/src/ncounter/App.svelte b/src/ncounter/App.svelte
index e68caec..4a4809e 100644
--- a/src/ncounter/App.svelte
+++ b/src/ncounter/App.svelte
@@ -2,8 +2,8 @@
 {#each $counters as counter}
 <Counter counterId={ counter.id }></Counter>
 {/each}
-</div>
 <button class="add" on:click="{ showAdd }"><i class="material-icons">add</i></button>
+</div>
 {#if showAddDialog}
 <div class="dialog">
     <div class="dialog-content">
@@ -60,6 +60,8 @@ function add(){
         bottom: 15px;
         right: 15px;
 
+        z-index: 2;
+
         background-color: #90C090;
         border-radius: 50%;
 
@@ -72,13 +74,16 @@ function add(){
         margin-left: auto;
     }
 
-    .dialog-content button {
-        padding: 10px;
-        font-size: 14px;
-        font-weight: 600;
-    }
-
     .app {
-        padding: 5px 5px 60px 5px;
+        padding: 5px;
+        position: fixed;
+        top: 0;
+        right: 0;
+        bottom: 0;
+        left: 0;
+
+        z-index: 1;
+
+        overflow: auto;
     }
 </style>
\ No newline at end of file
diff --git a/src/ncounter/Counter.svelte b/src/ncounter/Counter.svelte
index 7f88945..1cb51c9 100644
--- a/src/ncounter/Counter.svelte
+++ b/src/ncounter/Counter.svelte
@@ -7,8 +7,11 @@
     <div class="controls">
         <button on:click={ () => { showIncrement = true; } }><i class="material-icons">add</i></button>
         <button on:click={ () => { showSet = true; } }><i class="material-icons">edit</i></button>
-        <button class="reset" on:click={ reset }><i class="material-icons">undo</i></button>
-        <button on:click={ startEdit }><i class="material-icons">edit</i></button>
+        <button class="reset" on:click={ reset }><i class="material-icons">replay</i></button>
+        {#if counter.saveHistory}
+        <button class="history" on:click={ () => { showHistory = true; } }><i class="material-icons">show_chart</i></button>
+        {/if}
+        <button on:click={ startEdit }><i class="material-icons">settings</i></button>
         <button on:click={ remove }><i class="material-icons">delete</i></button>
     </div>
     {#if showValueDialog}
@@ -33,15 +36,16 @@
         </div>
     </div>
     {/if}
+    {#if showHistory}
+    <History { counterId } on:close={ () => { showHistory = false; } }></History>
+    {/if}
 </div>
 <script>
 import MyProgress from './MyProgress.svelte';
+import History from './History.svelte';
 import { tick } from 'svelte';
-import { createEventDispatcher } from 'svelte';
 import { counters } from './db.js';
 
-const dispatch = createEventDispatcher();
-
 export let counterId;
 
 $: counter = $counters.find(x => x.id == counterId);
@@ -51,6 +55,7 @@ let showIncrement;
 let showSet;
 let showEditDialog;
 let editingCounter;
+let showHistory;
 
 $: showValueDialog = showIncrement || showSet;
 
@@ -125,6 +130,10 @@ function remove(){
     padding: 5px;
 }
 
+.counter:last-child {
+    margin-bottom: 72px;
+}
+
 .controls {
     display: flex;
 }
@@ -142,9 +151,17 @@ header {
 }
 
 .reset {
+    margin-left: 24px;
+}
+
+.reset + button {
     margin-left: auto;
 }
 
+.history {
+    margin-right: 24px;
+}
+
 .dialog-value {
     width: 100%;
     margin: 5px 0;
@@ -153,10 +170,4 @@ header {
 .ok {
     margin-left: auto;
 }
-
-.dialog-content button {
-    padding: 10px;
-    font-size: 14px;
-    font-weight: 600;
-}
 </style>
\ No newline at end of file
diff --git a/src/ncounter/History.svelte b/src/ncounter/History.svelte
new file mode 100644
index 0000000..fbcc3d7
--- /dev/null
+++ b/src/ncounter/History.svelte
@@ -0,0 +1,143 @@
+<div class="history-container">
+    <header>
+        <h1>{ counter.title }</h1>
+        <button class="close" on:click={ close }><i class="material-icons">close</i></button>
+    </header>
+    <canvas class="chart-container" bind:this={ chartEl } width="{ window.outerWidth }" height="250">
+    </canvas>
+    <div class="table-container">
+        <table class="history">
+            <thead>
+                <tr>
+                    <th>Time</th>
+                    <th>Value</th>
+                </tr>
+            </thead>
+            <tbody>
+            {#each history as data}
+                <tr>
+                    <td>{ data.time }</td>
+                    <td>{ data.value }</td>
+                </tr>
+            {/each}
+            </tbody>
+        </table>
+    </div>
+</div>
+<script>
+import { createEventDispatcher } from 'svelte';
+import { counters } from './db.js';
+import Chart from 'chart.js';
+
+const dispatch = createEventDispatcher();
+
+const formatter = new Intl.DateTimeFormat('en-US',
+        {
+            month: 'short',
+            day: 'numeric',
+            year: 'numeric',
+            hour: 'numeric',
+            minute: 'numeric'
+        });
+
+$: counter = $counters.find(x => x.id == counterId);
+$: history = counter.history.map(x => {
+    return {
+        time: formatter.format(x.time),
+        value: x.value
+    }
+});
+$: dataset = counter.history.reduce((acc, x) => {
+    return {
+        labels: [...acc.labels, x.time],
+        datasets: [
+            {
+                data: [...acc.datasets[0].data, x.value]
+            }
+        ]
+    }
+}, {
+    labels: [],
+    datasets: [
+        {
+            data: []
+        }
+    ]
+});
+
+export let counterId;
+
+let chartEl;
+
+$: {
+    if(chartEl){
+        new Chart(chartEl, {
+            type: 'line',
+            data: dataset,
+            options: {
+                scales: {
+                    xAxes: [
+                        {
+                            type: 'time'
+                        }
+                    ]
+                },
+                legend: {
+                    display: false
+                }
+            }
+        });
+    }
+}
+
+function close(){
+    dispatch('close');
+}
+</script>
+<style>
+    .history-container{
+        background-color: white;
+        position: fixed;
+        top: 0;
+        right: 0;
+        bottom: 0;
+        left: 0;
+        z-index: 3;
+
+        display: flex;
+        flex-direction: column;
+        align-items: stretch;
+
+        overflow: auto;
+    }
+
+    header {
+        display: flex;
+    }
+
+    header h1 {
+        font-size: 22px;
+        font-weight: 600;
+        margin: 5px;
+    }
+
+    .table-container {
+        position: relative;
+    }
+
+    .close {
+        margin-left: auto;
+    }
+
+    .history th {
+        font-weight: 600;
+        position: sticky;
+        background-color: white;
+        top: 0;
+    }
+
+    .history th, .history td {
+        border: 1px solid black;
+        padding: 5px;
+    }
+</style>
\ No newline at end of file
diff --git a/src/ncounter/site.css b/src/ncounter/site.css
index 2033a9c..1521431 100644
--- a/src/ncounter/site.css
+++ b/src/ncounter/site.css
@@ -70,6 +70,12 @@ button {
     margin-left: auto;
 }
 
+.dialog-content button {
+    padding: 10px;
+    font-size: 14px;
+    font-weight: 600;
+}
+
 input[type="text"],
 input[type="number"] {
     font-size: 16px;