diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 60c1c28..4271997 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -711,6 +711,7 @@ "integrity": "sha512-vOTpLduLkZXePLxHiHsBLp98mHGnl8RptV4YAO3HfKO5UHjDvySGbxKtpYfy8Sx5+WKcgc45qNreJJRVM3L6mw==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "undici-types": "~6.19.2" } @@ -1384,6 +1385,7 @@ "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==", "devOptional": true, "license": "Apache-2.0", + "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -1405,6 +1407,7 @@ "integrity": "sha512-EK5cY7Q1D8JNhSaPKVK4pwBFvaTmZxEnoKXLG/U9gmdDcihQGNzFlgIvaxezFR4glP1LsuiedwMBqCXH3wZccA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "esbuild": "^0.21.3", "postcss": "^8.4.43", @@ -1471,6 +1474,7 @@ "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.12.tgz", "integrity": "sha512-CLVZtXtn2ItBIi/zHZ0Sg1Xkb7+PU32bJJ8Bmy7ts3jxXTcbfsEfBivFYYWz1Hur+lalqGAh65Coin0r+HRUfg==", "license": "MIT", + "peer": true, "dependencies": { "@vue/compiler-dom": "3.5.12", "@vue/compiler-sfc": "3.5.12", diff --git a/frontend/src/App.vue b/frontend/src/App.vue index d69ac95..31eb338 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -8,6 +8,8 @@ import LightingPage from './components/pages/LightingPage.vue'; import ServisPage from './components/pages/ServisPage.vue'; import {$mqtt} from "vue-paho-mqtt" import AudioPage from "@/components/pages/AudioPage.vue"; +import HomeIcon from "@/components/icons/HomeIcon.vue"; +import LightbulbIcon from "@/components/icons/LightbulbIcon.vue"; document.addEventListener('contextmenu', event => event.preventDefault()); @@ -46,10 +48,12 @@ watch(pageNum, (_, newState) => {

{{ currentRoom.toUpperCase() }}

- Priprava + + +
+

NAPREDNO

Video Audio - Lučke Servis
{{ $mqtt.status()?.toUpperCase() }}
diff --git a/frontend/src/components/Lift.vue b/frontend/src/components/Lift.vue index 9b3951c..3e9aa34 100644 --- a/frontend/src/components/Lift.vue +++ b/frontend/src/components/Lift.vue @@ -5,6 +5,8 @@ import {ref, onMounted, reactive} from 'vue' import {$mqtt} from 'vue-paho-mqtt' import DownIcon from './icons/DownIcon.vue'; import UpIcon from './icons/UpIcon.vue'; +import ChevronUpIcon from "@/components/icons/ChevronUpIcon.vue"; +import ChevronDownIcon from "@/components/icons/ChevronDownIcon.vue"; const props = defineProps({ room: String, @@ -45,14 +47,14 @@ TODO: NE HARDCODANO @touchstart="publishMQTTMsg(publishPrefix + 'manual/up', '1')" @mouseup="publishMQTTMsg(publishPrefix + 'manual/up', '0')" @touchend="publishMQTTMsg(publishPrefix + 'manual/up', '0')"> - +
@@ -63,14 +65,14 @@ TODO: NE HARDCODANO @touchstart="publishMQTTMsg(publishPrefix + 'manual/service_up', '1')" @mouseup="publishMQTTMsg(publishPrefix + 'manual/service_up', '0')" @touchend="publishMQTTMsg(publishPrefix + 'manual/service_up', '0')"> - +
@@ -80,11 +82,11 @@ TODO: NE HARDCODANO diff --git a/frontend/src/components/Platno.vue b/frontend/src/components/Platno.vue index 95aebdd..11a3c4b 100644 --- a/frontend/src/components/Platno.vue +++ b/frontend/src/components/Platno.vue @@ -5,6 +5,8 @@ import {ref, onMounted, reactive} from 'vue' import {$mqtt} from 'vue-paho-mqtt' import DownIcon from './icons/DownIcon.vue'; import UpIcon from './icons/UpIcon.vue'; +import ChevronUpIcon from "@/components/icons/ChevronUpIcon.vue"; +import ChevronDownIcon from "@/components/icons/ChevronDownIcon.vue"; const props = defineProps({ room: String, @@ -92,11 +94,11 @@ const platnoStatus = ref(platnoState.UNKNOWN)
@@ -108,14 +110,14 @@ const platnoStatus = ref(platnoState.UNKNOWN) @touchstart="publishMQTTMsg(publishPrefix + 'move', 'UP')" @mouseup="publishMQTTMsg(publishPrefix + 'move', 'STOP')" @touchend="publishMQTTMsg(publishPrefix + 'move', 'STOP')"> - +
diff --git a/frontend/src/components/icons/ChevronDownIcon.vue b/frontend/src/components/icons/ChevronDownIcon.vue new file mode 100644 index 0000000..03286bb --- /dev/null +++ b/frontend/src/components/icons/ChevronDownIcon.vue @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/frontend/src/components/icons/ChevronUpIcon.vue b/frontend/src/components/icons/ChevronUpIcon.vue new file mode 100644 index 0000000..9089dca --- /dev/null +++ b/frontend/src/components/icons/ChevronUpIcon.vue @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/frontend/src/components/icons/FloppyIcon.vue b/frontend/src/components/icons/FloppyIcon.vue new file mode 100644 index 0000000..f51e759 --- /dev/null +++ b/frontend/src/components/icons/FloppyIcon.vue @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/frontend/src/components/icons/HomeIcon.vue b/frontend/src/components/icons/HomeIcon.vue new file mode 100644 index 0000000..9c9844c --- /dev/null +++ b/frontend/src/components/icons/HomeIcon.vue @@ -0,0 +1,3 @@ + diff --git a/frontend/src/components/icons/LightbulbIcon.vue b/frontend/src/components/icons/LightbulbIcon.vue new file mode 100644 index 0000000..756bb53 --- /dev/null +++ b/frontend/src/components/icons/LightbulbIcon.vue @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/frontend/src/components/icons/ProjectorIcon.vue b/frontend/src/components/icons/ProjectorIcon.vue new file mode 100644 index 0000000..e3cdabd --- /dev/null +++ b/frontend/src/components/icons/ProjectorIcon.vue @@ -0,0 +1,3 @@ + diff --git a/frontend/src/components/pages/LightingPage.vue b/frontend/src/components/pages/LightingPage.vue index 1d439af..4b6348e 100644 --- a/frontend/src/components/pages/LightingPage.vue +++ b/frontend/src/components/pages/LightingPage.vue @@ -6,6 +6,9 @@ import {$mqtt} from 'vue-paho-mqtt' import DownIcon from '../icons/DownIcon.vue'; import UpIcon from '../icons/UpIcon.vue'; import LightControl from '../LightControl.vue'; +import ChevronUpIcon from "@/components/icons/ChevronUpIcon.vue"; +import ChevronDownIcon from "@/components/icons/ChevronDownIcon.vue"; +import FloppyIcon from "@/components/icons/FloppyIcon.vue"; const props = defineProps({ room: String, @@ -146,7 +149,7 @@ const lights = [ v-if="showCustom"> CUSTOM 5 - + @@ -163,7 +166,7 @@ const lights = [ v-if="showCustom"> CUSTOM 6 - + @@ -182,7 +185,7 @@ const lights = [ @touchstart="publishMQTTMsg(publishPrefix + 'shades/move', 'MOVE_UP')" @mouseup="publishMQTTMsg(publishPrefix + 'shades/move', 'STOP')" @touchend="publishMQTTMsg(publishPrefix + 'shades/move', 'STOP')"> - +