Skip to content

Commit 8835440

Browse files
committed
fixed prettier problems
1 parent 5035591 commit 8835440

File tree

4 files changed

+38
-27
lines changed

4 files changed

+38
-27
lines changed

webapp/src/components/BarChart.vue

+18-13
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,24 @@ const options_col = {
1818
chartArea: {
1919
top: 25,
2020
width: '85%',
21-
height: '80%'
21+
height: '80%',
2222
},
2323
bar: {
24-
groupWidth: '90%'
24+
groupWidth: '90%',
2525
},
2626
legend: {
27-
position: 'none'
27+
position: 'none',
2828
},
2929
hAxis: {
3030
format: 'HH',
3131
minorGridlines: {
32-
count: 0
33-
}
32+
count: 0,
33+
},
3434
},
3535
vAxis: {
3636
minValue: 0,
37-
format: '# Wh'
38-
}
37+
format: '# Wh',
38+
},
3939
};
4040
export default defineComponent({
4141
components: {
@@ -46,7 +46,7 @@ export default defineComponent({
4646
chartData: data_col,
4747
chartOptions: options_col,
4848
dataLoaded: false,
49-
}
49+
};
5050
},
5151
created() {
5252
this.getInitialData();
@@ -55,15 +55,20 @@ export default defineComponent({
5555
methods: {
5656
getInitialData() {
5757
this.dataLoaded = false;
58-
fetch("/api/databaseHour", { headers: authHeader() })
58+
fetch('/api/databaseHour', { headers: authHeader() })
5959
.then((response) => handleResponse(response, this.$emitter, this.$router))
6060
.then((energy) => {
6161
if (energy) {
62-
this.chartData = [[{ type: 'date', id: 'Time' }, { type: 'number', id: 'Energy' }]];
62+
this.chartData = [
63+
[
64+
{ type: 'date', id: 'Time' },
65+
{ type: 'number', id: 'Energy' },
66+
],
67+
];
6368
// eslint-disable-next-line @typescript-eslint/no-explicit-any
6469
energy.forEach((x: any[]) => {
6570
const d = new Date(x[0] + 2000, x[1] - 1, x[2], x[3]);
66-
this.chartData.push([d, Math.round(x[4])])
71+
this.chartData.push([d, Math.round(x[4])]);
6772
});
6873
this.dataLoaded = true;
6974
}
@@ -76,7 +81,7 @@ export default defineComponent({
7681
},
7782
callEveryHour() {
7883
this.getInitialData();
79-
setInterval(this.getInitialData, 1000 * 60 * 60); // refresh every hour
84+
setInterval(this.getInitialData, 1000 * 60 * 60); // refresh every hour
8085
},
8186
startautorefresh() {
8287
const nextDate = new Date();
@@ -86,6 +91,6 @@ export default defineComponent({
8691
const difference: number = nextDate.valueOf() - Date.now();
8792
setTimeout(this.callEveryHour, difference);
8893
},
89-
}
94+
},
9095
});
9196
</script>
+17-11
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
11
<template>
22
<div class="card row" v-if="dataLoaded">
3-
<CalendarHeatmap :values="values" :round="1" :end-date="endDate" :style="{'font-size': '10px'}" tooltip-unit="Wh" />
3+
<CalendarHeatmap
4+
:values="values"
5+
:round="1"
6+
:end-date="endDate"
7+
:style="{ 'font-size': '10px' }"
8+
tooltip-unit="Wh"
9+
/>
410
</div>
511
</template>
612

713
<script lang="ts">
814
import { defineComponent } from 'vue';
9-
import { CalendarHeatmap } from 'vue3-calendar-heatmap'
15+
import { CalendarHeatmap } from 'vue3-calendar-heatmap';
1016
import { authHeader, handleResponse } from '@/utils/authentication';
11-
const data: Array<{ date: Date; count: number; }> = [];
17+
const data: Array<{ date: Date; count: number }> = [];
1218
1319
export default defineComponent({
1420
components: {
@@ -19,7 +25,7 @@ export default defineComponent({
1925
values: data,
2026
endDate: new Date(),
2127
dataLoaded: false,
22-
}
28+
};
2329
},
2430
created() {
2531
this.getInitialData();
@@ -28,24 +34,24 @@ export default defineComponent({
2834
methods: {
2935
getInitialData() {
3036
this.dataLoaded = false;
31-
fetch("/api/databaseDay", { headers: authHeader() })
37+
fetch('/api/databaseDay', { headers: authHeader() })
3238
.then((response) => handleResponse(response, this.$emitter, this.$router))
3339
.then((energy) => {
3440
if (energy) {
3541
this.values = [];
3642
let d: Date;
3743
// eslint-disable-next-line @typescript-eslint/no-explicit-any
3844
energy.forEach((x: any[]) => {
39-
d = new Date(x[0] + 2000, x[1] - 1, x[2], x[3])
40-
this.values.push({ date: d, count: Math.round(x[4]) })
41-
})
45+
d = new Date(x[0] + 2000, x[1] - 1, x[2], x[3]);
46+
this.values.push({ date: d, count: Math.round(x[4]) });
47+
});
4248
this.dataLoaded = true;
4349
}
44-
})
50+
});
4551
},
4652
callEveryHour() {
4753
this.getInitialData();
48-
setInterval(this.getInitialData, 1000 * 60 * 60); // refresh every hour
54+
setInterval(this.getInitialData, 1000 * 60 * 60); // refresh every hour
4955
},
5056
startautorefresh() {
5157
const nextDate = new Date();
@@ -55,6 +61,6 @@ export default defineComponent({
5561
const difference: number = nextDate.valueOf() - Date.now();
5662
setTimeout(this.callEveryHour, difference);
5763
},
58-
}
64+
},
5965
});
6066
</script>

webapp/src/components/MemoryInfo.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
:total="systemStatus.psram_total"
2323
:used="systemStatus.psram_used"
2424
/>
25-
<a href='/api/database'>Read Database</a>
25+
<a href="/api/database">Read Database</a>
2626
<FsInfo
2727
:name="$t('memoryinfo.LittleFs')"
2828
:total="systemStatus.littlefs_total"

webapp/src/views/HomeView.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -504,8 +504,8 @@ import DevInfo from '@/components/DevInfo.vue';
504504
import EventLog from '@/components/EventLog.vue';
505505
import GridProfile from '@/components/GridProfile.vue';
506506
import HintView from '@/components/HintView.vue';
507-
import BarChart from "@/components/BarChart.vue";
508-
import CalendarChart from "@/components/CalendarChart.vue";
507+
import BarChart from '@/components/BarChart.vue';
508+
import CalendarChart from '@/components/CalendarChart.vue';
509509
import InverterChannelInfo from '@/components/InverterChannelInfo.vue';
510510
import InverterTotalInfo from '@/components/InverterTotalInfo.vue';
511511
import ModalDialog from '@/components/ModalDialog.vue';

0 commit comments

Comments
 (0)