Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5,893 changes: 3,400 additions & 2,493 deletions packages/modules/web_themes/koala/source/package-lock.json

Large diffs are not rendered by default.

52 changes: 26 additions & 26 deletions packages/modules/web_themes/koala/source/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,44 +14,44 @@
"build": "quasar build"
},
"dependencies": {
"@quasar/extras": "^1.16.12",
"chart.js": "^4.4.8",
"@quasar/extras": "^1.17.0",
"chart.js": "^4.5.0",
"chartjs-adapter-luxon": "^1.3.1",
"chartjs-plugin-annotation": "^3.1.0",
"chartjs-plugin-zoom": "^2.2.0",
"luxon": "^3.5.0",
"mqtt": "^5.10.1",
"pinia": "^2.2.4",
"quasar": "^2.17.0",
"luxon": "^3.7.1",
"mqtt": "^5.14.0",
"pinia": "^3.0.3",
"quasar": "^2.18.2",
"register-service-worker": "^1.7.2",
"vue": "^3.5.11",
"vue": "^3.5.18",
"vue-chartjs": "^5.3.2",
"vue-router": "^4.4.5"
"vue-router": "^4.5.1"
},
"devDependencies": {
"@quasar/app-vite": "^2.0.0-beta.12",
"@types/node": "^20.16.10",
"@quasar/app-vite": "^2.3.0",
"@types/node": "^20.19.10",
"@typescript-eslint/eslint-plugin": "^7.18.0",
"@typescript-eslint/parser": "^7.18.0",
"autoprefixer": "^10.4.20",
"autoprefixer": "^10.4.21",
"eslint": "^8.57.1",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-vue": "^9.28.0",
"prettier": "^3.3.3",
"typescript": "~5.5.4",
"vite-plugin-checker": "^0.8.0",
"vitest": "^2.1.2",
"vue-tsc": "^2.1.6",
"workbox-build": "^7.1.1",
"workbox-cacheable-response": "^7.1.0",
"workbox-core": "^7.1.0",
"workbox-expiration": "^7.1.0",
"workbox-precaching": "^7.1.0",
"workbox-routing": "^7.1.0",
"workbox-strategies": "^7.1.0"
"eslint-config-prettier": "^9.1.2",
"eslint-plugin-vue": "^9.33.0",
"prettier": "^3.6.2",
"typescript": "^5.5.4",
"vite-plugin-checker": "^0.10.2",
"vitest": "^2.1.9",
"vue-tsc": "^2.2.12",
"workbox-build": "^7.3.0",
"workbox-cacheable-response": "^7.3.0",
"workbox-core": "^7.3.0",
"workbox-expiration": "^7.3.0",
"workbox-precaching": "^7.3.0",
"workbox-routing": "^7.3.0",
"workbox-strategies": "^7.3.0"
},
"engines": {
"node": "^24 || ^22 || ^20 || ^18",
"node": "^24 || ^22 || ^20",
"npm": ">= 6.13.4",
"yarn": ">= 1.21.1"
}
Expand Down
14 changes: 7 additions & 7 deletions packages/modules/web_themes/koala/source/quasar.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
// Configuration for your app
// https://v2.quasar.dev/quasar-cli-vite/quasar-config-js

import { configure } from 'quasar/wrappers';
import { defineConfig } from '#q-app/wrappers';

export default configure((/* ctx */) => {
export default defineConfig((/* ctx */) => {
return {
// https://v2.quasar.dev/quasar-cli-vite/prefetch-feature
// preFetch: true,
Expand Down Expand Up @@ -206,11 +206,11 @@ export default configure((/* ctx */) => {
},

// Full list of options: https://v2.quasar.dev/quasar-cli-vite/developing-browser-extensions/configuring-bex
bex: {
// extendBexScriptsConf (esbuildConf) {},
// extendBexManifestJson (json) {},
// bex: {
// // extendBexScriptsConf (esbuildConf) {},
// // extendBexManifestJson (json) {},

contentScripts: ['my-content-script'],
},
// contentScripts: ['my-content-script'],
// },
};
});
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
import { computed, ref } from 'vue';
import { useMqttStore } from 'src/stores/mqtt-store';
import BatterySettingsDialog from './BatterySettingsDialog.vue';
import { useBatteryModes } from 'src/composables/useBatteryModes.ts';
import { useBatteryModes } from 'src/composables/useBatteryModes';
import SliderDouble from './SliderDouble.vue';

const cardRef = ref<{ $el: HTMLElement } | null>(null);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<script setup lang="ts">
import { useMqttStore } from 'src/stores/mqtt-store';
import { computed } from 'vue';
import { useBatteryModes } from 'src/composables/useBatteryModes.ts';
import { useBatteryModes } from 'src/composables/useBatteryModes';

const mqttStore = useMqttStore();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</div>
<HistoryChartLegend
v-if="legendDisplay"
:chart="chartRef?.chart || null"
:chart="chartInstance"
class="legend-wrapper q-mt-sm"
/>
</div>
Expand Down Expand Up @@ -65,6 +65,10 @@ const props = defineProps<{

const chartRef = ref<ChartComponentRef | null>(null);

const chartInstance = computed(() => {
return (chartRef.value?.chart as Chart) ?? null;
});

const applyHiddenDatasetsToChart = <TType extends ChartType, TData>(
chart: Chart<TType, TData>,
): void => {
Expand All @@ -83,7 +87,7 @@ watch(
() => chartRef.value?.chart,
(chart) => {
if (chart) {
applyHiddenDatasetsToChart(chart);
applyHiddenDatasetsToChart(chart as Chart);
}
},
{ immediate: true },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
:class="{ 'legend-item-hidden': dataset.hidden }"
@click="
dataset.datasetIndex !== undefined &&
toggleDataset(dataset.text, dataset.datasetIndex)
toggleDataset(dataset.text, dataset.datasetIndex)
"
>
<q-item-section avatar class="q-pr-none">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
:class="{ 'legend-item-hidden': dataset.hidden }"
@click="
dataset.datasetIndex !== undefined &&
toggleDataset(dataset.text, dataset.datasetIndex)
toggleDataset(dataset.text, dataset.datasetIndex)
"
>
<q-item-section avatar class="q-pr-none">
Expand Down
13 changes: 1 addition & 12 deletions packages/modules/web_themes/koala/source/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,3 @@
{
"extends": "@quasar/app-vite/tsconfig-preset",
"compilerOptions": {
"baseUrl": "."
},
"exclude": [
"./dist",
"./.quasar",
"./node_modules",
"./src-capacitor",
"./src-cordova",
"./quasar.config.*.temporary.compiled*"
]
"extends": "./.quasar/tsconfig.json"
}