From f9b25ec884ff030b3b0d0e094221340e0d803e72 Mon Sep 17 00:00:00 2001 From: Lars Baunwall Date: Thu, 22 Feb 2024 21:06:50 +0100 Subject: [PATCH] Clean up components and views. Make sure everything uses the Vue Composition API --- src/ui/src/components/AnglePointer.vue | 74 +++++++ src/ui/src/components/DebugOverlay.vue | 23 ++ .../components/{default.vue => Default.vue} | 6 +- src/ui/src/components/MainArc.vue | 37 ++++ src/ui/src/components/VolumeArc.vue | 30 +++ src/ui/src/components/debug-overlay.vue | 35 ---- src/ui/src/components/main-circle-arc.vue | 50 ----- src/ui/src/components/volume-arc.vue | 48 ----- src/ui/src/main.ts | 10 +- src/ui/src/views/DeviceSimulator.vue | 2 +- src/ui/src/views/MainMenuShell.vue | 133 ++++++++++++ .../{components/music.vue => views/Music.vue} | 0 .../{components/radio.vue => views/Radio.vue} | 0 src/ui/src/views/Shell.vue | 4 +- src/ui/src/views/bs5.vue | 197 ------------------ 15 files changed, 308 insertions(+), 341 deletions(-) create mode 100644 src/ui/src/components/AnglePointer.vue create mode 100644 src/ui/src/components/DebugOverlay.vue rename src/ui/src/components/{default.vue => Default.vue} (100%) create mode 100644 src/ui/src/components/MainArc.vue create mode 100644 src/ui/src/components/VolumeArc.vue delete mode 100644 src/ui/src/components/debug-overlay.vue delete mode 100644 src/ui/src/components/main-circle-arc.vue delete mode 100644 src/ui/src/components/volume-arc.vue create mode 100644 src/ui/src/views/MainMenuShell.vue rename src/ui/src/{components/music.vue => views/Music.vue} (100%) rename src/ui/src/{components/radio.vue => views/Radio.vue} (100%) delete mode 100644 src/ui/src/views/bs5.vue diff --git a/src/ui/src/components/AnglePointer.vue b/src/ui/src/components/AnglePointer.vue new file mode 100644 index 0000000..bd52962 --- /dev/null +++ b/src/ui/src/components/AnglePointer.vue @@ -0,0 +1,74 @@ + + + + + \ No newline at end of file diff --git a/src/ui/src/components/DebugOverlay.vue b/src/ui/src/components/DebugOverlay.vue new file mode 100644 index 0000000..5c6d520 --- /dev/null +++ b/src/ui/src/components/DebugOverlay.vue @@ -0,0 +1,23 @@ + + + + + \ No newline at end of file diff --git a/src/ui/src/components/default.vue b/src/ui/src/components/Default.vue similarity index 100% rename from src/ui/src/components/default.vue rename to src/ui/src/components/Default.vue index 64d7214..63445cf 100644 --- a/src/ui/src/components/default.vue +++ b/src/ui/src/components/Default.vue @@ -1,12 +1,12 @@ + + - - \ No newline at end of file diff --git a/src/ui/src/components/MainArc.vue b/src/ui/src/components/MainArc.vue new file mode 100644 index 0000000..d9c0590 --- /dev/null +++ b/src/ui/src/components/MainArc.vue @@ -0,0 +1,37 @@ + + + + + \ No newline at end of file diff --git a/src/ui/src/components/VolumeArc.vue b/src/ui/src/components/VolumeArc.vue new file mode 100644 index 0000000..dfe1372 --- /dev/null +++ b/src/ui/src/components/VolumeArc.vue @@ -0,0 +1,30 @@ + + + + + \ No newline at end of file diff --git a/src/ui/src/components/debug-overlay.vue b/src/ui/src/components/debug-overlay.vue deleted file mode 100644 index 5c96ce7..0000000 --- a/src/ui/src/components/debug-overlay.vue +++ /dev/null @@ -1,35 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/ui/src/components/main-circle-arc.vue b/src/ui/src/components/main-circle-arc.vue deleted file mode 100644 index 78cc0db..0000000 --- a/src/ui/src/components/main-circle-arc.vue +++ /dev/null @@ -1,50 +0,0 @@ - - - - -../utils/arcs \ No newline at end of file diff --git a/src/ui/src/components/volume-arc.vue b/src/ui/src/components/volume-arc.vue deleted file mode 100644 index 1147ddc..0000000 --- a/src/ui/src/components/volume-arc.vue +++ /dev/null @@ -1,48 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/ui/src/main.ts b/src/ui/src/main.ts index d0e6d25..4b53c7b 100644 --- a/src/ui/src/main.ts +++ b/src/ui/src/main.ts @@ -7,14 +7,14 @@ import App from "./App.vue"; import {Subject, filter, bufferCount} from "rxjs"; -import DefaultView from "./components/default.vue"; -import MusicView from "./components/music.vue"; -import RadioView from "./components/radio.vue"; +import DefaultView from "./components/Default.vue"; +import MusicView from "./views/Music.vue"; +import RadioView from "./views/Radio.vue"; import { listen } from "@tauri-apps/api/event"; import { useUIStore } from "./stores/ui"; import { translateToRange } from "./utils/arcs"; import DeviceSim from "./views/DeviceSimulator.vue"; -import Bs5Shell from "./views/bs5.vue"; +import MainMenuShell from "./views/MainMenuShell.vue"; import Shell from "./views/Shell.vue"; const router = createRouter({ @@ -29,7 +29,7 @@ const router = createRouter({ if(shell === 'sim') { return { component: DeviceSim, shell: 'sim' }; } else { - return { component: Bs5Shell, shell: 'default' }; + return { component: MainMenuShell, shell: 'default' }; } }, children: [ diff --git a/src/ui/src/views/DeviceSimulator.vue b/src/ui/src/views/DeviceSimulator.vue index 1b22971..1b4d5e5 100644 --- a/src/ui/src/views/DeviceSimulator.vue +++ b/src/ui/src/views/DeviceSimulator.vue @@ -1,5 +1,5 @@ + + \ No newline at end of file diff --git a/src/ui/src/components/music.vue b/src/ui/src/views/Music.vue similarity index 100% rename from src/ui/src/components/music.vue rename to src/ui/src/views/Music.vue diff --git a/src/ui/src/components/radio.vue b/src/ui/src/views/Radio.vue similarity index 100% rename from src/ui/src/components/radio.vue rename to src/ui/src/views/Radio.vue diff --git a/src/ui/src/views/Shell.vue b/src/ui/src/views/Shell.vue index fae5143..13f4ab7 100644 --- a/src/ui/src/views/Shell.vue +++ b/src/ui/src/views/Shell.vue @@ -1,12 +1,12 @@ - - \ No newline at end of file