From 84d0dd35d9346adf7ed21f5fc19f8b158e2ad173 Mon Sep 17 00:00:00 2001 From: Steven C Date: Fri, 12 Apr 2024 23:53:19 -0700 Subject: [PATCH] mockWS --- package.json | 3 +- pnpm-lock.yaml | 5 +- src/components/Camera.vue | 2 +- src/components/Greet.vue | 12 --- src/components/Navbar.vue | 2 +- src/components/mockWS.vue | 145 +++++++++++++++++++++++++++++ src/router/index.js | 4 +- src/views/{test.vue => mockWS.vue} | 5 +- 8 files changed, 158 insertions(+), 20 deletions(-) delete mode 100644 src/components/Greet.vue create mode 100644 src/components/mockWS.vue rename src/views/{test.vue => mockWS.vue} (62%) diff --git a/package.json b/package.json index f9988c8..9648c07 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,8 @@ "dependencies": { "@tauri-apps/api": "^1.4.0", "vue": "^3.2.45", - "vue-router": "^4.3.0" + "vue-router": "^4.3.0", + "ws": "^8.16.0" }, "devDependencies": { "@tauri-apps/cli": "^1.4.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 71f9dc2..89da9b3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -14,6 +14,9 @@ dependencies: vue-router: specifier: ^4.3.0 version: 4.3.0(vue@3.2.45) + ws: + specifier: ^8.16.0 + version: 8.16.0 devDependencies: '@tauri-apps/cli': @@ -8914,6 +8917,7 @@ packages: '@vue/devtools-api': 6.6.1 vue: 3.2.45 dev: false + /vue-style-loader@4.1.3: resolution: {integrity: sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg==} dependencies: @@ -9451,7 +9455,6 @@ packages: optional: true utf-8-validate: optional: true - dev: true /xtend@4.0.2: resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==} diff --git a/src/components/Camera.vue b/src/components/Camera.vue index d537daa..f935616 100644 --- a/src/components/Camera.vue +++ b/src/components/Camera.vue @@ -3,7 +3,7 @@ props: ['cameraID'], data() { return { - localIp: 'http://localhost', //maybe change accordingly .env? + localIp: 'http://192.168.1.65', //maybe change accordingly .env? port: '5000', //maybe change accordingly cameraUrls: { 1: 'video_feed', //cam url here diff --git a/src/components/Greet.vue b/src/components/Greet.vue deleted file mode 100644 index df3ae37..0000000 --- a/src/components/Greet.vue +++ /dev/null @@ -1,12 +0,0 @@ - diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue index a05f8d1..1870b08 100644 --- a/src/components/Navbar.vue +++ b/src/components/Navbar.vue @@ -80,7 +80,7 @@ export default {
  • Home
  • Link
  • -
  • Disabled
  • +
  • Disabled
  • diff --git a/src/components/mockWS.vue b/src/components/mockWS.vue new file mode 100644 index 0000000..c1b845c --- /dev/null +++ b/src/components/mockWS.vue @@ -0,0 +1,145 @@ + + + diff --git a/src/router/index.js b/src/router/index.js index 229d6be..59aa680 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -3,7 +3,7 @@ import HomeScreen from "../views/HomeScreen.vue"; import StaticScreen from "../views/StaticScreen.vue"; import Cam2Focus from "../views/Cam2Focus.vue"; import CamFocus from "../views/CamFocus.vue"; -import test from "../views/test.vue"; +import mockWS from "../views/mockWS.vue"; const routes = [ @@ -11,7 +11,7 @@ const routes = [ { path: '/1', component: StaticScreen }, { path: '/2', component: Cam2Focus }, { path: '/CamFocus/:id', component: CamFocus }, - { path: '/test', component: test }, + { path: '/test', component: mockWS }, ] const router = createRouter({ diff --git a/src/views/test.vue b/src/views/mockWS.vue similarity index 62% rename from src/views/test.vue rename to src/views/mockWS.vue index df09912..8a98e26 100644 --- a/src/views/test.vue +++ b/src/views/mockWS.vue @@ -1,5 +1,6 @@ @@ -7,7 +8,7 @@

    - TESTESTES +