Bring back history, without the chart
This commit is contained in:
parent
4679d04076
commit
602dbf5f3f
2 changed files with 4 additions and 71 deletions
|
@ -40,9 +40,13 @@
|
|||
</form>
|
||||
</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 { counters } from './db.js';
|
||||
|
||||
export let counterId;
|
||||
|
|
|
@ -3,8 +3,6 @@
|
|||
<h1>{ counter.title }</h1>
|
||||
<button class="close" on:click={ close }><span class="material-symbols-outlined">close</span></button>
|
||||
</header>
|
||||
<canvas class="chart-container" bind:this={ chartEl } width="{ window.outerWidth }" height="250">
|
||||
</canvas>
|
||||
<div class="table-container">
|
||||
<table class="history">
|
||||
<thead>
|
||||
|
@ -27,7 +25,6 @@
|
|||
<script>
|
||||
import { createEventDispatcher } from 'svelte';
|
||||
import { counters } from './db.js';
|
||||
import Chart from 'chart.js';
|
||||
|
||||
const dispatch = createEventDispatcher();
|
||||
|
||||
|
@ -47,77 +44,9 @@ $: history = counter.history.map(x => {
|
|||
value: x.value
|
||||
}
|
||||
});
|
||||
$: dataset = counter.history.reduce((acc, x) => {
|
||||
return {
|
||||
labels: [...acc.labels, x.time],
|
||||
datasets: [
|
||||
{
|
||||
...acc.datasets[0],
|
||||
data: [...acc.datasets[0].data, x.value]
|
||||
}
|
||||
]
|
||||
}
|
||||
}, {
|
||||
labels: [],
|
||||
datasets: [
|
||||
{
|
||||
borderColor: darkMode ? 'rgba(255, 255, 255, 0.25)' : undefined,
|
||||
backgroundColor: darkMode ? 'rgba(255, 255, 255, 0.25)' : undefined,
|
||||
lineTension: 0.1,
|
||||
data: []
|
||||
}
|
||||
]
|
||||
});
|
||||
|
||||
export let counterId;
|
||||
|
||||
let chartEl;
|
||||
|
||||
const themeMatch = window.matchMedia('(prefers-color-scheme: dark)');
|
||||
let darkMode = themeMatch.matches;
|
||||
themeMatch.addListener((e) => {
|
||||
darkMode = e.matches;
|
||||
});
|
||||
|
||||
$: {
|
||||
if(chartEl){
|
||||
const theme = darkMode ?
|
||||
{
|
||||
gridLines: {
|
||||
color: 'rgba(255, 255, 255, 0.1)',
|
||||
zeroLineColor: 'rgba(255, 255, 255, 0.25)'
|
||||
},
|
||||
ticks: {
|
||||
fontColor: '#FFFFFF'
|
||||
}
|
||||
} :
|
||||
{} //Use defaults for light mode;
|
||||
|
||||
new Chart(chartEl, {
|
||||
type: 'line',
|
||||
data: dataset,
|
||||
options: {
|
||||
scales: {
|
||||
xAxes: [
|
||||
{
|
||||
...theme,
|
||||
type: 'time'
|
||||
}
|
||||
],
|
||||
yAxes: [
|
||||
{
|
||||
...theme
|
||||
}
|
||||
]
|
||||
},
|
||||
legend: {
|
||||
display: false
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
function close(){
|
||||
dispatch('close');
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue