Skip to content

Commit 8004c0f

Browse files
benderlbenderl
authored
Package updates and code/text cleanup (#630)
* updated dependencies * cleanup console messages * code and text cleanup
1 parent a1fd50a commit 8004c0f

32 files changed

+219
-257
lines changed

‎package-lock.json

Lines changed: 146 additions & 140 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@
1313
"build-prod": "vite build --out-dir=/var/www/html/openWB/web/settings --emptyOutDir"
1414
},
1515
"dependencies": {
16-
"@fortawesome/fontawesome-svg-core": "^6.6.0",
17-
"@fortawesome/free-brands-svg-icons": "^6.6.0",
18-
"@fortawesome/free-regular-svg-icons": "^6.6.0",
19-
"@fortawesome/free-solid-svg-icons": "^6.6.0",
16+
"@fortawesome/fontawesome-svg-core": "^6.7.2",
17+
"@fortawesome/free-brands-svg-icons": "^6.7.2",
18+
"@fortawesome/free-regular-svg-icons": "^6.7.2",
19+
"@fortawesome/free-solid-svg-icons": "^6.7.2",
2020
"@fortawesome/vue-fontawesome": "^3.0.8",
2121
"@popperjs/core": "^2.11.8",
22-
"axios": "^1.7.7",
22+
"axios": "^1.7.9",
2323
"bootstrap": "^4.6.2",
2424
"browserify": "^17.0.1",
2525
"buffer": "^6.0.3",
26-
"chart.js": "^4.4.6",
26+
"chart.js": "^4.4.7",
2727
"chartjs-adapter-luxon": "^1.3.1",
28-
"chartjs-plugin-zoom": "^2.0.1",
29-
"core-js": "^3.39.0",
28+
"chartjs-plugin-zoom": "^2.2.0",
29+
"core-js": "^3.40.0",
3030
"crypto-browserify": "^3.12.1",
3131
"hammerjs": "^2.0.8",
3232
"jquery": "^3.7.1",
@@ -37,29 +37,29 @@
3737
"stream-browserify": "^3.0.0",
3838
"url": "^0.11.4",
3939
"urlsafe-base64": "^1.0.0",
40-
"vue": "^3.5.12",
40+
"vue": "^3.5.13",
4141
"vue-axios": "^3.5.2",
4242
"vue-chartjs": "^5.3.2",
43-
"vue-router": "^4.4.5",
44-
"vue3-table-lite": "^1.4.0",
43+
"vue-router": "^4.5.0",
44+
"vue3-table-lite": "^1.4.2",
4545
"vuedraggable": "^4.1.0",
4646
"vuex": "^4.1.0"
4747
},
4848
"devDependencies": {
49-
"@rushstack/eslint-patch": "^1.10.4",
49+
"@rushstack/eslint-patch": "^1.10.5",
5050
"@vitejs/plugin-vue": "^4.6.2",
5151
"@vue/eslint-config-prettier": "^9.0.0",
5252
"@vue/test-utils": "^2.4.6",
53-
"eslint": "^9.14.0",
53+
"eslint": "^9.19.0",
5454
"eslint-config-prettier": "^9.1.0",
55-
"eslint-plugin-prettier": "^5.2.1",
56-
"eslint-plugin-vue": "^9.31.0",
55+
"eslint-plugin-prettier": "^5.2.3",
56+
"eslint-plugin-vue": "^9.32.0",
5757
"jsdom": "^24.1.3",
58-
"postcss": "^8.4.47",
58+
"postcss": "^8.5.1",
5959
"postcss-preset-env": "^9.6.0",
60-
"prettier": "^3.3.3",
60+
"prettier": "^3.4.2",
6161
"rollup-plugin-node-polyfills": "^0.2.1",
62-
"vite": "^4.5.5",
62+
"vite": "^4.5.9",
6363
"vite-plugin-node-polyfills": "^0.9.0",
6464
"vitest": "^1.6.0"
6565
}

‎src/App.vue

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ export default {
8686
return new Promise((resolve) => setTimeout(resolve, milliseconds));
8787
}
8888
89-
console.debug("saving values...");
9089
this.$store.state.local.savingData = true;
9190
// collect data
9291
let topics = {};
@@ -102,7 +101,6 @@ export default {
102101
console.error("expected array, got ", typeof topicsToSave);
103102
}
104103
}
105-
// console.debug("topics", topics);
106104
for (const [topic, payload] of Object.entries(topics)) {
107105
let setTopic = topic.replace("openWB/", "openWB/set/");
108106
console.debug("saving data:", setTopic, payload);
@@ -111,7 +109,6 @@ export default {
111109
// This may change with newer versions.
112110
await sleep(100);
113111
}
114-
console.debug("done saving data");
115112
this.$store.state.local.savingData = false;
116113
},
117114
/**
@@ -167,9 +164,6 @@ export default {
167164
console.error("Connection failed", error);
168165
});
169166
this.client.on("message", (topic, message) => {
170-
// console.debug(
171-
// `Received message "${message}" from topic "${topic}"`
172-
// );
173167
if (message.toString().length > 0) {
174168
let myPayload = undefined;
175169
try {
@@ -192,7 +186,6 @@ export default {
192186
});
193187
},
194188
doSubscribe(topics) {
195-
console.debug("doSubscribe", topics);
196189
topics.forEach((topic) => {
197190
this.$store.commit("addSubscription", topic);
198191
if (this.$store.getters.subscriptionCount(topic) == 1) {
@@ -216,7 +209,6 @@ export default {
216209
});
217210
},
218211
doUnsubscribe(topics) {
219-
console.debug("doUnsubscribe", topics);
220212
topics.forEach((topic) => {
221213
this.$store.commit("removeSubscription", topic);
222214
if (this.$store.getters.subscriptionCount(topic) == 0) {

‎src/components/OpenwbBaseCopyToClipboard.vue

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ export default {
3737
methods: {
3838
click() {
3939
// event.target may be our icon, so we use a ref here
40-
console.debug(this.$refs["slot-wrapper"].innerText);
4140
if (this.clipboardApiAvailable) {
4241
navigator.clipboard.writeText(this.$refs["slot-wrapper"].innerText).then(
4342
() => {
@@ -48,9 +47,8 @@ export default {
4847
},
4948
);
5049
} else {
51-
console.debug("clipboard api not supported/enabled, fallback to select");
50+
console.debug("clipboard api not supported/enabled, fallback to selection or text range");
5251
if (window.getSelection) {
53-
console.debug("using 'window.getSelection'");
5452
const selection = window.getSelection();
5553
const range = document.createRange();
5654
range.selectNodeContents(this.$refs["slot-wrapper"]);
@@ -59,7 +57,6 @@ export default {
5957
return;
6058
}
6159
if (document.body.createTextRange) {
62-
console.debug("using 'document.body.createTextRange'");
6360
const range = document.body.createTextRange();
6461
range.moveToElementText(this.$refs["slot-wrapper"]);
6562
range.select();

‎src/components/OpenwbBaseTextarea.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ export default {
9393
get() {
9494
if (this.subtype == "json") {
9595
if (this.inputInvalid) {
96-
console.debug("returning invalid String");
96+
console.debug("returning invalid JSON as String");
9797
return this.tempValue;
9898
} else {
9999
return JSON.stringify(this.tempValue, undefined, 2);

‎src/components/OpenwbNestedList.vue

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,6 @@ export default {
104104
return undefined;
105105
}
106106
},
107-
// elementEdit(id) {
108-
// console.log("edit Element:", id);
109-
// },
110107
},
111108
};
112109
</script>

‎src/components/OpenwbSortableList.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ export default {
4343
return this.modelValue;
4444
},
4545
set(newValue) {
46-
console.debug("update in sortableList", newValue);
4746
this.$emit("update:modelValue", newValue);
4847
},
4948
},

‎src/components/backup_clouds/OpenwbBackupCloudProxy.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export default {
2020
emits: ["update:configuration", "sendCommand"],
2121
computed: {
2222
myComponent() {
23-
console.debug(`loading backup cloud: ${this.backupCloud.type}`);
23+
console.debug(`loading backup cloud: ${this.backupCloud.name} (${this.backupCloud.type})`);
2424
return defineAsyncComponent({
2525
loader: () => import(`./${this.backupCloud.type}/backup_cloud.vue`),
2626
errorComponent: OpenwbBackupCloudFallback,

‎src/components/charge_points/OpenwbChargePointProxy.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ export default {
2626
emits: ["update:configuration"],
2727
computed: {
2828
myChargePointSettingsComponent() {
29-
console.debug(`loading charge point settings: ${this.chargePoint.type}`);
29+
console.debug(`loading charge point settings: ${this.chargePoint.name} (${this.chargePoint.type})`);
3030
return defineAsyncComponent({
3131
loader: () => import(`./${this.chargePoint.type}/chargePoint.vue`),
3232
errorComponent: OpenwbChargePointConfigFallback,
3333
});
3434
},
3535
myChargePointCommandsComponent() {
36-
console.debug(`loading charge point commands: ${this.chargePoint.type}`);
36+
console.debug(`loading charge point commands: ${this.chargePoint.name} (${this.chargePoint.type})`);
3737
return defineAsyncComponent({
3838
loader: () => import(`./${this.chargePoint.type}/commands.vue`),
3939
errorComponent: OpenwbChargePointCommandsFallback,

‎src/components/charge_points/openwb_pro/commands.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ export default {
3939
formData.append("data", '{"ip_address":"' + this.chargePoint.configuration.ip_address + '"}');
4040
const startedMessage = "Die Aktualisierung der openWB Pro wird gestartet...";
4141
this.$root.postClientMessage(startedMessage, "info");
42-
console.debug(location);
4342
this.axios
4443
.post(
4544
location.protocol +

0 commit comments

Comments
 (0)