From a8b81a903759467bef112cd2c059360f969fdca5 Mon Sep 17 00:00:00 2001 From: Lutz Bender Date: Tue, 11 Jan 2022 14:58:15 +0100 Subject: [PATCH] add log files on debugging page --- package-lock.json | 159 +++++++++++++++++++++++++------------- package.json | 6 +- src/main.js | 5 +- src/views/DebugConfig.vue | 117 ++++++++++++++++++++++++++++ 4 files changed, 229 insertions(+), 58 deletions(-) diff --git a/package-lock.json b/package-lock.json index c7e1c79f..3f5be9b2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,21 +5,23 @@ "requires": true, "packages": { "": { - "version": "0.0.1", + "version": "0.0.2", "dependencies": { "@fortawesome/fontawesome-svg-core": "^1.2.36", "@fortawesome/free-brands-svg-icons": "^5.15.4", "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", "@fortawesome/vue-fontawesome": "^3.0.0-5", - "@popperjs/core": "^2.11.0", + "@popperjs/core": "^2.11.2", + "axios": "^0.24.0", "bootstrap": "^4.6.1", "core-js": "^3.20.2", "jquery": "^3.6.0", "lodash": "^4.17.21", - "mqtt": "^4.3.2", + "mqtt": "^4.3.4", "popper.js": "^1.16.1", "vue": "^3.2.26", + "vue-axios": "^3.4.0", "vue-loader": "^15.9.8", "vue-router": "^4.0.12", "vuedraggable": "^4.1.0", @@ -2766,9 +2768,13 @@ } }, "node_modules/@popperjs/core": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.0.tgz", - "integrity": "sha512-zrsUxjLOKAzdewIDRWy9nsV1GQsKBCWaGwsZQlCgr6/q+vjyZhFgqedLfFBuI9anTPEUT4APq9Mu0SZBTzIcGQ==" + "version": "2.11.2", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.2.tgz", + "integrity": "sha512-92FRmppjjqz29VMJ2dn+xdyXZBrMlE42AV6Kq6BwjWV7CNUW1hs2FtxSNLQE+gJhaZ6AAmYuO9y8dshhcBl7vA==", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/popperjs" + } }, "node_modules/@soda/friendly-errors-webpack-plugin": { "version": "1.8.1", @@ -5137,6 +5143,14 @@ "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==", "dev": true }, + "node_modules/axios": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz", + "integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==", + "dependencies": { + "follow-redirects": "^1.14.4" + } + }, "node_modules/babel-code-frame": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", @@ -6606,14 +6620,6 @@ "node": ">=0.10.0" } }, - "node_modules/collections": { - "version": "5.1.13", - "resolved": "https://registry.npmjs.org/collections/-/collections-5.1.13.tgz", - "integrity": "sha512-SCb6Qd+d3Z02corWQ7/mqXiXeeTdHvkP6TeFSYfGYdCFp1WrjSNZ3j6y8Y3T/7osGEe0iOcU2g1d346l99m4Lg==", - "dependencies": { - "weak-map": "~1.0.x" - } - }, "node_modules/color": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz", @@ -12441,6 +12447,11 @@ "node": ">=1.0.0" } }, + "node_modules/js-sdsl": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-2.1.4.tgz", + "integrity": "sha512-/Ew+CJWHNddr7sjwgxaVeIORIH4AMVC9dy0hPf540ZGMVgS9d3ajwuVdyhDt6/QUvT8ATjR3yuYBKsS79F+H4A==" + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -13307,20 +13318,20 @@ } }, "node_modules/mqtt": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-4.3.2.tgz", - "integrity": "sha512-cSmPOvTL9diVV7nZVHobwFR//fLZw8c1Yw04z49sLwJx45ooiiqcg2soFLYdjI4iXlkw49lP6BZ2ZRv9kGpOyw==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-4.3.4.tgz", + "integrity": "sha512-yAVDfVHz3Cjn6K68z54mf7fTni/AWsPhiEsRwZSvet2wO47R6NFUn2psWxYIph2JxWtL3ZKa/da8pjJKSaXPdQ==", "dependencies": { - "collections": "^5.1.13", "commist": "^1.0.0", "concat-stream": "^2.0.0", "debug": "^4.1.1", "duplexify": "^4.1.1", "help-me": "^3.0.0", "inherits": "^2.0.3", + "lru-cache": "^6.0.0", "minimist": "^1.2.5", "mqtt-packet": "^6.8.0", - "number-allocator": "^1.0.8", + "number-allocator": "^1.0.9", "pump": "^3.0.0", "readable-stream": "^3.6.0", "reinterval": "^1.1.0", @@ -13373,6 +13384,17 @@ "stream-shift": "^1.0.0" } }, + "node_modules/mqtt/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/mqtt/node_modules/readable-stream": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", @@ -13394,6 +13416,11 @@ "node": ">=8.3.0" } }, + "node_modules/mqtt/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, "node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -13718,12 +13745,12 @@ "dev": true }, "node_modules/number-allocator": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/number-allocator/-/number-allocator-1.0.8.tgz", - "integrity": "sha512-5lhaurSl3Kvn6j47S2ELzyv5X7b+UvvcZONUjL5/bFGNiOU7GkG/HUmtqef9ayEzS2i6BtsqB0FTTyu+8QrRrg==", + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/number-allocator/-/number-allocator-1.0.9.tgz", + "integrity": "sha512-sIIF0dZKMs3roPUD7rLreH8H3x47QKV9dHZ+PeSnH24gL0CxKxz/823woGZC0hLBSb2Ar/rOOeHiNbnPBum/Mw==", "dependencies": { - "collections": "^5.1.13", - "debug": "^4.3.1" + "debug": "^4.3.1", + "js-sdsl": "^2.1.2" } }, "node_modules/nwsapi": { @@ -18126,6 +18153,15 @@ "@vue/shared": "3.2.26" } }, + "node_modules/vue-axios": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/vue-axios/-/vue-axios-3.4.0.tgz", + "integrity": "sha512-S3YTCJeEndzmtaYzyz919Z54wY1D2OftWEhioGbHED3VUSta8ti0OHjDipTPkb1StxOzQLAAO2hSUq830i14KA==", + "peerDependencies": { + "axios": ">= 0.20.0", + "vue": "^3.0.0 || ^2.0.0" + } + }, "node_modules/vue-eslint-parser": { "version": "7.11.0", "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz", @@ -18446,11 +18482,6 @@ "defaults": "^1.0.3" } }, - "node_modules/weak-map": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/weak-map/-/weak-map-1.0.5.tgz", - "integrity": "sha1-eWkVhNmGB/UHC9O3CkDmuyLkAes=" - }, "node_modules/webidl-conversions": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", @@ -21532,9 +21563,9 @@ "dev": true }, "@popperjs/core": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.0.tgz", - "integrity": "sha512-zrsUxjLOKAzdewIDRWy9nsV1GQsKBCWaGwsZQlCgr6/q+vjyZhFgqedLfFBuI9anTPEUT4APq9Mu0SZBTzIcGQ==" + "version": "2.11.2", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.2.tgz", + "integrity": "sha512-92FRmppjjqz29VMJ2dn+xdyXZBrMlE42AV6Kq6BwjWV7CNUW1hs2FtxSNLQE+gJhaZ6AAmYuO9y8dshhcBl7vA==" }, "@soda/friendly-errors-webpack-plugin": { "version": "1.8.1", @@ -23620,6 +23651,14 @@ "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==", "dev": true }, + "axios": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz", + "integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==", + "requires": { + "follow-redirects": "^1.14.4" + } + }, "babel-code-frame": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", @@ -24902,14 +24941,6 @@ "object-visit": "^1.0.0" } }, - "collections": { - "version": "5.1.13", - "resolved": "https://registry.npmjs.org/collections/-/collections-5.1.13.tgz", - "integrity": "sha512-SCb6Qd+d3Z02corWQ7/mqXiXeeTdHvkP6TeFSYfGYdCFp1WrjSNZ3j6y8Y3T/7osGEe0iOcU2g1d346l99m4Lg==", - "requires": { - "weak-map": "~1.0.x" - } - }, "color": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz", @@ -29720,6 +29751,11 @@ "easy-stack": "^1.0.1" } }, + "js-sdsl": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-2.1.4.tgz", + "integrity": "sha512-/Ew+CJWHNddr7sjwgxaVeIORIH4AMVC9dy0hPf540ZGMVgS9d3ajwuVdyhDt6/QUvT8ATjR3yuYBKsS79F+H4A==" + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -30457,20 +30493,20 @@ } }, "mqtt": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-4.3.2.tgz", - "integrity": "sha512-cSmPOvTL9diVV7nZVHobwFR//fLZw8c1Yw04z49sLwJx45ooiiqcg2soFLYdjI4iXlkw49lP6BZ2ZRv9kGpOyw==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/mqtt/-/mqtt-4.3.4.tgz", + "integrity": "sha512-yAVDfVHz3Cjn6K68z54mf7fTni/AWsPhiEsRwZSvet2wO47R6NFUn2psWxYIph2JxWtL3ZKa/da8pjJKSaXPdQ==", "requires": { - "collections": "^5.1.13", "commist": "^1.0.0", "concat-stream": "^2.0.0", "debug": "^4.1.1", "duplexify": "^4.1.1", "help-me": "^3.0.0", "inherits": "^2.0.3", + "lru-cache": "^6.0.0", "minimist": "^1.2.5", "mqtt-packet": "^6.8.0", - "number-allocator": "^1.0.8", + "number-allocator": "^1.0.9", "pump": "^3.0.0", "readable-stream": "^3.6.0", "reinterval": "^1.1.0", @@ -30502,6 +30538,14 @@ "stream-shift": "^1.0.0" } }, + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "requires": { + "yallist": "^4.0.0" + } + }, "readable-stream": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", @@ -30516,6 +30560,11 @@ "version": "7.5.6", "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz", "integrity": "sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==" + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" } } }, @@ -30807,12 +30856,12 @@ "dev": true }, "number-allocator": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/number-allocator/-/number-allocator-1.0.8.tgz", - "integrity": "sha512-5lhaurSl3Kvn6j47S2ELzyv5X7b+UvvcZONUjL5/bFGNiOU7GkG/HUmtqef9ayEzS2i6BtsqB0FTTyu+8QrRrg==", + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/number-allocator/-/number-allocator-1.0.9.tgz", + "integrity": "sha512-sIIF0dZKMs3roPUD7rLreH8H3x47QKV9dHZ+PeSnH24gL0CxKxz/823woGZC0hLBSb2Ar/rOOeHiNbnPBum/Mw==", "requires": { - "collections": "^5.1.13", - "debug": "^4.3.1" + "debug": "^4.3.1", + "js-sdsl": "^2.1.2" } }, "nwsapi": { @@ -34527,6 +34576,11 @@ "@vue/shared": "3.2.26" } }, + "vue-axios": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/vue-axios/-/vue-axios-3.4.0.tgz", + "integrity": "sha512-S3YTCJeEndzmtaYzyz919Z54wY1D2OftWEhioGbHED3VUSta8ti0OHjDipTPkb1StxOzQLAAO2hSUq830i14KA==" + }, "vue-eslint-parser": { "version": "7.11.0", "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz", @@ -34828,11 +34882,6 @@ "defaults": "^1.0.3" } }, - "weak-map": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/weak-map/-/weak-map-1.0.5.tgz", - "integrity": "sha1-eWkVhNmGB/UHC9O3CkDmuyLkAes=" - }, "webidl-conversions": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", diff --git a/package.json b/package.json index 43b81380..ae13d17d 100644 --- a/package.json +++ b/package.json @@ -16,14 +16,16 @@ "@fortawesome/free-regular-svg-icons": "^5.15.4", "@fortawesome/free-solid-svg-icons": "^5.15.4", "@fortawesome/vue-fontawesome": "^3.0.0-5", - "@popperjs/core": "^2.11.0", + "@popperjs/core": "^2.11.2", + "axios": "^0.24.0", "bootstrap": "^4.6.1", "core-js": "^3.20.2", "jquery": "^3.6.0", "lodash": "^4.17.21", - "mqtt": "^4.3.2", + "mqtt": "^4.3.4", "popper.js": "^1.16.1", "vue": "^3.2.26", + "vue-axios": "^3.4.0", "vue-loader": "^15.9.8", "vue-router": "^4.0.12", "vuedraggable": "^4.1.0", diff --git a/src/main.js b/src/main.js index 109386ed..8e8da6b8 100644 --- a/src/main.js +++ b/src/main.js @@ -9,8 +9,11 @@ import camelCase from "lodash/camelCase"; import "bootstrap"; import "bootstrap/dist/css/bootstrap.min.css"; +import axios from "axios"; +import VueAxios from "vue-axios"; + const vApp = createApp(App); -vApp.use(store).use(router); +vApp.use(store).use(router).use(VueAxios, axios); // automatic global registering of our base components const requireComponent = require.context( diff --git a/src/views/DebugConfig.vue b/src/views/DebugConfig.vue index bed2d786..da4821b8 100644 --- a/src/views/DebugConfig.vue +++ b/src/views/DebugConfig.vue @@ -40,22 +40,139 @@ @defaults="$emit('defaults')" /> + + +
{{ mainLog }}
+
+ + +
{{ mqttLog }}
+