From de6611f32a7e7b44e92c9373e7c6192fc80f75ba Mon Sep 17 00:00:00 2001 From: DynamikArray Date: Mon, 24 Jan 2022 20:31:46 -0500 Subject: [PATCH] basic speedtestcard component, needs refactoring for store to hold each event type --- client/package-lock.json | 10 ++ client/package.json | 3 +- client/socket.config.js | 3 + client/src/App.vue | 2 +- client/src/components/Layout/Header.vue | 2 +- client/src/components/Socket/SocketStatus.vue | 2 +- .../Speedtest/SpeedtestPastResults.vue | 13 ++ .../Speedtest/SpeedtestProgressCard.vue | 47 +++++++ .../Speedtest/SpeedtestResultsCard.vue | 123 ++++++++++++++++++ .../components/Speedtest/SpeedtestWrapper.vue | 59 ++++++++- client/src/main.js | 6 + client/src/plugins/vueSocketIo.js | 2 +- client/src/store/index.js | 45 ++++++- client/vue.config.js | 3 - server/controllers/v1/logs/logsController.js | 3 +- server/routes/socket/index.js | 12 +- server/routes/socket/liveTest/liveTest.js | 17 +++ server/routes/socket/logStream/logStream.js | 3 - server/routes/v1/logs/logsController.js | 7 - server/services/speedtestService.js | 37 +++++- 20 files changed, 371 insertions(+), 28 deletions(-) create mode 100644 client/socket.config.js create mode 100644 client/src/components/Speedtest/SpeedtestPastResults.vue create mode 100644 client/src/components/Speedtest/SpeedtestProgressCard.vue create mode 100644 client/src/components/Speedtest/SpeedtestResultsCard.vue create mode 100644 server/routes/socket/liveTest/liveTest.js delete mode 100644 server/routes/socket/logStream/logStream.js delete mode 100644 server/routes/v1/logs/logsController.js diff --git a/client/package-lock.json b/client/package-lock.json index 1f3eb9d..4c891dc 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -11436,6 +11436,11 @@ "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.14.tgz", "integrity": "sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==" }, + "vue-canvas-gauges": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/vue-canvas-gauges/-/vue-canvas-gauges-0.0.0.tgz", + "integrity": "sha1-0GhVYS+AgqsmLPwiRrO/7QVfTvc=" + }, "vue-cli-plugin-vuetify": { "version": "2.4.5", "resolved": "https://registry.npmjs.org/vue-cli-plugin-vuetify/-/vue-cli-plugin-vuetify-2.4.5.tgz", @@ -11500,6 +11505,11 @@ } } }, + "vue-gauge": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/vue-gauge/-/vue-gauge-1.0.3.tgz", + "integrity": "sha512-hIjjDxAjJ5NRKeEVUpwZQ7IA+LONfNE7C51Z5TeEvIEl3jqu2aLE5RnIGQaLdLBYzbK807AiCvYt1nM0m4D6Cw==" + }, "vue-hot-reload-api": { "version": "2.3.4", "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz", diff --git a/client/package.json b/client/package.json index 2a72389..c203e0d 100644 --- a/client/package.json +++ b/client/package.json @@ -10,9 +10,10 @@ "dependencies": { "@fortawesome/fontawesome-free": "5.15.3", "core-js": "^3.6.5", - "socket.io-client": "2.3.1", "roboto-fontface": "*", + "socket.io-client": "2.3.1", "vue": "^2.6.11", + "vue-canvas-gauges": "0.0.0", "vue-router": "^3.2.0", "vue-socket.io-extended": "^4.1.0", "vuetify": "^2.4.0", diff --git a/client/socket.config.js b/client/socket.config.js new file mode 100644 index 0000000..8f840f7 --- /dev/null +++ b/client/socket.config.js @@ -0,0 +1,3 @@ +module.exports = { + socketUrl: "http://localhost:8080", +}; diff --git a/client/src/App.vue b/client/src/App.vue index 81239a1..843cb9b 100644 --- a/client/src/App.vue +++ b/client/src/App.vue @@ -24,7 +24,7 @@ export default { .shadow { text-shadow: #000 2px 2px 1px; } -.shadow-small { +.shadow-sm { text-shadow: #000 1px 1px 0px; } diff --git a/client/src/components/Layout/Header.vue b/client/src/components/Layout/Header.vue index abc0378..94da5c2 100644 --- a/client/src/components/Layout/Header.vue +++ b/client/src/components/Layout/Header.vue @@ -1,6 +1,6 @@