diff --git a/frontend/vju_display/.env.development b/frontend/vju_display/.env.development
new file mode 100644
index 0000000..9499533
--- /dev/null
+++ b/frontend/vju_display/.env.development
@@ -0,0 +1,3 @@
+VITE_MQTT_HOST=localhost
+VITE_MQTT_PORT=8080
+VITE_MQTT_SSL=false
\ No newline at end of file
diff --git a/frontend/vju_display/src/App.vue b/frontend/vju_display/src/App.vue
index 3f311ca..cab6535 100644
--- a/frontend/vju_display/src/App.vue
+++ b/frontend/vju_display/src/App.vue
@@ -1,14 +1,13 @@
<script setup lang="ts">
-//import HelloWorld from './components/HelloWorld.vue'
-//import TheWelcome from './components/TheWelcome.vue'
-import {ref, onMounted } from 'vue'
-//import { $mqtt } from 'vue-paho-mqtt'
-import Projektor from './Projektor.vue'
-import Platno from './Platno.vue'
-import MainPage from './MainPage.vue';
-import ProjManualPage from './ProjManualPage.vue';
+import { ref, onMounted } from 'vue'
+import MainPage from './components/pages/MainPage.vue';
+import ProjManualPage from './components/pages/ProjManualPage.vue';
+import VerticalTabs from './components/tabs/VerticalTabs.vue';
+import Tab from './components/tabs/Tab.vue';
-const _p1_room = ref('p1')
+let urlParams = new URLSearchParams(window.location.search);
+
+const currentRoom = ref(urlParams.get('room') || 'p01')
const pageNum = ref(0) // TODO spremen na 0
@@ -18,57 +17,52 @@ const pageNum = ref(0) // TODO spremen na 0
</script>
<template>
- <header>
- <!-- <img alt="Vue logo" class="logo" src="./assets/logo.svg" width="125" height="125" /> -->
+ <div id="wrapper">
+ <header class="sidebar">
- <div class="wrapper">
- <!-- <HelloWorld msg="You did it!" /> -->
- <h2>turbo odličen super mega kontrol panel</h2>
- <h3>Predavalnica {{ _p1_room }}</h3>
- </div>
- <div>
- <button @click="pageNum = 0">Page 1</button>
- <button @click="pageNum = 1">Page 2</button>
- <button @click="pageNum = 2">Page 3</button>
- </div>
- </header>
+ <img class="logo" src="https://fri.uni-lj.si/sites/all/themes/fri_theme/images/fri_logo.png" />
+ <h1>{{ currentRoom.toUpperCase() }}</h1>
- <main>
- <div v-if="pageNum == 0">
- <MainPage />
- </div>
- <div v-else-if="pageNum == 1">
- <ProjManualPage :room="_p1_room" />
- </div>
- <div v-else-if="pageNum == 2">temp</div>
- </main>
+ <VerticalTabs id="nav">
+ <Tab @click="pageNum=0" :selected="pageNum==0">Priprava</Tab>
+ <Tab @click="pageNum=1" :selected="pageNum==1">Video</Tab>
+ <Tab @click="pageNum=2" :selected="pageNum==2">Zvok</Tab>
+ <Tab @click="pageNum=3" :selected="pageNum==3">Servis</Tab>
+ </VerticalTabs>
+ <small>turbo odličen super mega kontrol panel</small>
+ </header>
+
+ <main>
+ <MainPage v-if="pageNum == 0" />
+ <ProjManualPage v-else-if="pageNum == 1" :room="currentRoom" />
+
+ </main>
+ </div>
</template>
<style scoped>
-header {
- line-height: 1.5;
+
+#wrapper {
+ width: 100%;
+ height: 100%;
+ display: flex;
}
+main {
+ flex: 1;
+ padding: 1rem;
+}
+
+h1 {
+ text-align: center;
+}
+
+.sidebar {
+ max-width: 20vw;
+}
.logo {
- display: block;
- margin: 0 auto 2rem;
+ max-width: 100%;
+ padding: .4rem;
}
-@media (min-width: 1024px) {
- header {
- display: flex;
- place-items: center;
- padding-right: calc(var(--section-gap) / 2);
- }
-
- .logo {
- margin: 0 2rem 0 0;
- }
-
- header .wrapper {
- display: flex;
- place-items: flex-start;
- flex-wrap: wrap;
- }
-}
</style>
diff --git a/frontend/vju_display/src/assets/base.css b/frontend/vju_display/src/assets/base.css
index 8816868..8ea68d2 100644
--- a/frontend/vju_display/src/assets/base.css
+++ b/frontend/vju_display/src/assets/base.css
@@ -1,55 +1,3 @@
-/* color palette from <https://github.com/vuejs/theme> */
-:root {
- --vt-c-white: #ffffff;
- --vt-c-white-soft: #f8f8f8;
- --vt-c-white-mute: #f2f2f2;
-
- --vt-c-black: #181818;
- --vt-c-black-soft: #222222;
- --vt-c-black-mute: #282828;
-
- --vt-c-indigo: #2c3e50;
-
- --vt-c-divider-light-1: rgba(60, 60, 60, 0.29);
- --vt-c-divider-light-2: rgba(60, 60, 60, 0.12);
- --vt-c-divider-dark-1: rgba(84, 84, 84, 0.65);
- --vt-c-divider-dark-2: rgba(84, 84, 84, 0.48);
-
- --vt-c-text-light-1: var(--vt-c-indigo);
- --vt-c-text-light-2: rgba(60, 60, 60, 0.66);
- --vt-c-text-dark-1: var(--vt-c-white);
- --vt-c-text-dark-2: rgba(235, 235, 235, 0.64);
-}
-
-/* semantic color variables for this project */
-:root {
- --color-background: var(--vt-c-white);
- --color-background-soft: var(--vt-c-white-soft);
- --color-background-mute: var(--vt-c-white-mute);
-
- --color-border: var(--vt-c-divider-light-2);
- --color-border-hover: var(--vt-c-divider-light-1);
-
- --color-heading: var(--vt-c-text-light-1);
- --color-text: var(--vt-c-text-light-1);
-
- --section-gap: 160px;
-}
-
-@media (prefers-color-scheme: dark) {
- :root {
- --color-background: var(--vt-c-black);
- --color-background-soft: var(--vt-c-black-soft);
- --color-background-mute: var(--vt-c-black-mute);
-
- --color-border: var(--vt-c-divider-dark-2);
- --color-border-hover: var(--vt-c-divider-dark-1);
-
- --color-heading: var(--vt-c-text-dark-1);
- --color-text: var(--vt-c-text-dark-2);
- }
-}
-
*,
*::before,
*::after {
@@ -58,6 +6,16 @@
font-weight: normal;
}
+:root {
+ --color-text: #000;
+ --color-background: #EEE;
+
+ --color-brand-ul-red: #e03127;
+ --color-brand-ul-light-grey: #E6E7E8;
+ --color-brand-ul-medium-grey: #A7A8AA;
+ --color-brand-ul-dark-grey: #58595b;
+}
+
body {
min-height: 100vh;
color: var(--color-text);
@@ -66,20 +24,8 @@ body {
color 0.5s,
background-color 0.5s;
line-height: 1.6;
- font-family:
- Inter,
- -apple-system,
- BlinkMacSystemFont,
- 'Segoe UI',
- Roboto,
- Oxygen,
- Ubuntu,
- Cantarell,
- 'Fira Sans',
- 'Droid Sans',
- 'Helvetica Neue',
- sans-serif;
- font-size: 15px;
+ font-family: sans-serif;
+ font-size: 17px;
text-rendering: optimizeLegibility;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
diff --git a/frontend/vju_display/src/assets/logo.svg b/frontend/vju_display/src/assets/logo.svg
deleted file mode 100644
index 7565660..0000000
--- a/frontend/vju_display/src/assets/logo.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 261.76 226.69"><path d="M161.096.001l-30.225 52.351L100.647.001H-.005l130.877 226.688L261.749.001z" fill="#41b883"/><path d="M161.096.001l-30.225 52.351L100.647.001H52.346l78.526 136.01L209.398.001z" fill="#34495e"/></svg>
diff --git a/frontend/vju_display/src/assets/main.css b/frontend/vju_display/src/assets/main.css
index 36fb845..13c87d0 100644
--- a/frontend/vju_display/src/assets/main.css
+++ b/frontend/vju_display/src/assets/main.css
@@ -3,8 +3,6 @@
#app {
max-width: 1280px;
margin: 0 auto;
- padding: 2rem;
- font-weight: normal;
}
a,
@@ -26,10 +24,14 @@ a,
display: flex;
place-items: center;
}
-
- #app {
- display: grid;
- grid-template-columns: 1fr 1fr;
- padding: 0 2rem;
- }
+}
+
+button {
+ border: none;
+ background-color: #aaa;
+ cursor: pointer;
+}
+
+button:hover, button:focus, button:active {
+ background-color: #ccc;
}
diff --git a/frontend/vju_display/src/components/HelloWorld.vue b/frontend/vju_display/src/components/HelloWorld.vue
deleted file mode 100644
index a2eabd1..0000000
--- a/frontend/vju_display/src/components/HelloWorld.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<script setup lang="ts">
-defineProps<{
- msg: string
-}>()
-</script>
-
-<template>
- <div class="greetings">
- <h1 class="green">{{ msg }}</h1>
- <h3>
- You’ve successfully created a project with
- <a href="https://vite.dev/" target="_blank" rel="noopener">Vite</a> +
- <a href="https://vuejs.org/" target="_blank" rel="noopener">Vue 3</a>.
- </h3>
- </div>
-</template>
-
-<style scoped>
-h1 {
- font-weight: 500;
- font-size: 2.6rem;
- position: relative;
- top: -10px;
-}
-
-h3 {
- font-size: 1.2rem;
-}
-
-.greetings h1,
-.greetings h3 {
- text-align: center;
-}
-
-@media (min-width: 1024px) {
- .greetings h1,
- .greetings h3 {
- text-align: left;
- }
-}
-</style>
diff --git a/frontend/vju_display/src/Platno.vue b/frontend/vju_display/src/components/Platno.vue
similarity index 91%
rename from frontend/vju_display/src/Platno.vue
rename to frontend/vju_display/src/components/Platno.vue
index 72d0c81..a069e4b 100644
--- a/frontend/vju_display/src/Platno.vue
+++ b/frontend/vju_display/src/components/Platno.vue
@@ -3,6 +3,8 @@
//import TheWelcome from './components/TheWelcome.vue'
import {ref, onMounted, reactive } from 'vue'
import { $mqtt } from 'vue-paho-mqtt'
+import DownIcon from './icons/DownIcon.vue';
+import UpIcon from './icons/UpIcon.vue';
const props = defineProps({
room: String,
@@ -90,11 +92,9 @@ const platnoStatus = ref(platnoState.UNKNOWN)
<!-- TODO lepš -->
<h4>platna {{ props.position }}</h4>
<button
- @click="publishMQTTMsg(publishPrefix + 'go', 'UP')">
- Go UP</button>
+ @click="publishMQTTMsg(publishPrefix + 'go', 'UP')"><UpIcon/></button>
<button
- @click="publishMQTTMsg(publishPrefix + 'go', 'DOWN')">
- Go DOWN</button>
+ @click="publishMQTTMsg(publishPrefix + 'go', 'DOWN')"><DownIcon/></button>
<div>
<h5>Manual control</h5>
<button
diff --git a/frontend/vju_display/src/Projektor.vue b/frontend/vju_display/src/components/Projektor.vue
similarity index 52%
rename from frontend/vju_display/src/Projektor.vue
rename to frontend/vju_display/src/components/Projektor.vue
index f92c5c9..94e29cc 100644
--- a/frontend/vju_display/src/Projektor.vue
+++ b/frontend/vju_display/src/components/Projektor.vue
@@ -1,12 +1,12 @@
<script setup lang="ts">
//import HelloWorld from './components/HelloWorld.vue'
//import TheWelcome from './components/TheWelcome.vue'
-import {ref, onMounted, reactive } from 'vue'
+import { ref, onMounted, reactive } from 'vue'
import { $mqtt } from 'vue-paho-mqtt'
const props = defineProps({
- room: String,
- position: String
+ room: String,
+ position: String
})
const topicstrs = [ //TODO everything else
@@ -15,14 +15,14 @@ const topicstrs = [ //TODO everything else
props.room + '/projectors/' + props.position + '/status/freeze',
]
-const subscriptions =
-topicstrs.map(topic => {
- // console.log('subbing to', topic)
- $mqtt.subscribe(topic, (msg) => {
- // console.log('received:', topic, msg)
- handleIncomingMQTT(topic, msg)
+const subscriptions =
+ topicstrs.map(topic => {
+ // console.log('subbing to', topic)
+ $mqtt.subscribe(topic, (msg) => {
+ // console.log('received:', topic, msg)
+ handleIncomingMQTT(topic, msg)
+ })
})
-})
function handleIncomingMQTT(topic: string, msg: string) {
console.log('Received on', topic, 'with message', msg)
@@ -36,15 +36,15 @@ function handleIncomingMQTT(topic: string, msg: string) {
function handleProjectorStatus(typ: string, msg: string) {
console.log('handling status')
//console.log(projStatus)
- if (typ == 'power') {projStatus.power = msg == '1'}
- else if (typ == 'shutter') {projStatus.shutter = msg == '1'}
- else if (typ == 'freeze') {projStatus.freeze = msg == '1'}
+ if (typ == 'power') { projStatus.power = msg == '1' }
+ else if (typ == 'shutter') { projStatus.shutter = msg == '1' }
+ else if (typ == 'freeze') { projStatus.freeze = msg == '1' }
}
onMounted(() => {
// console.log('test')
//$mqtt.publish('peepee', 'poopoo', 'Qr') // dela
-
+
})
function publishMQTTMsg(topic: string, msg: string) {
@@ -61,41 +61,43 @@ const publishPrefix = ref(props.room + '/projectors/' + props.position + '/comma
//TODO organize better, binds, etc.
const projStatus = reactive({
- power : false,
- shutter : false,
- freeze : false,
+ power: false,
+ shutter: false,
+ freeze: false,
})
</script>
<template>
+ <div>
+ <!-- TODO lepš -->
<div>
- <!-- <h3>{{ props.room }}</h3> -->
- <!-- <form> -->
- <!-- TODO lepš -->
- <h4>barko {{ props.position }}</h4>
- <div>
<h5>Power: {{ (projStatus.power ? "ON" : "OFF") }}</h5>
- <button
- @click="publishMQTTMsg(publishPrefix + 'power', (!projStatus.power ? '1' : '0'))">
- Turn power {{ projStatus.power ? 'OFF' : 'ON' }}</button>
- </div>
- <div>
- <h5>Shutter: {{ (projStatus.shutter ? "ON" : "OFF") }}</h5>
- <button
- @click="publishMQTTMsg(publishPrefix + 'shutter', (!projStatus.shutter ? '1' : '0'))">
- Turn shutter {{ projStatus.shutter ? 'OFF' : 'ON' }}</button>
- </div>
- <div>
- <h5>Freeze image: {{ (projStatus.freeze ? "ON" : "OFF") }}</h5>
- <button
- @click="publishMQTTMsg(publishPrefix + 'freeze', (!projStatus.freeze ? '1' : '0'))">
- Turn freeze {{ projStatus.freeze ? 'OFF' : 'ON' }}</button>
- </div>
- <!-- </form> -->
+ <button @click="publishMQTTMsg(publishPrefix + 'power', (!projStatus.power ? '1' : '0'))">
+ Turn {{ projStatus.power ? 'OFF' : 'ON' }}</button>
</div>
+ <div :class="{ disabled: !projStatus.power }">
+ <div>
+ <h5>Shutter: {{ (projStatus.shutter ? "ON" : "OFF") }}</h5>
+ <button @click="publishMQTTMsg(publishPrefix + 'shutter', (!projStatus.shutter ? '1' : '0'))">
+ Turn {{ projStatus.shutter ? 'OFF' : 'ON' }}</button>
+ </div>
+ <div>
+ <h5>Freeze image: {{ (projStatus.freeze ? "ON" : "OFF") }}</h5>
+ <button @click="publishMQTTMsg(publishPrefix + 'freeze', (!projStatus.freeze ? '1' : '0'))">
+ Turn {{ projStatus.freeze ? 'OFF' : 'ON' }}</button>
+ </div>
+ </div>
+ </div>
</template>
<style scoped>
-
+.disabled {
+ opacity: .8;
+ pointer-events: none;
+}
+button {
+ padding: 1rem;
+ width: 100%;
+}
</style>
diff --git a/frontend/vju_display/src/components/TheWelcome.vue b/frontend/vju_display/src/components/TheWelcome.vue
deleted file mode 100644
index e65a66b..0000000
--- a/frontend/vju_display/src/components/TheWelcome.vue
+++ /dev/null
@@ -1,88 +0,0 @@
-<script setup lang="ts">
-import WelcomeItem from './WelcomeItem.vue'
-import DocumentationIcon from './icons/IconDocumentation.vue'
-import ToolingIcon from './icons/IconTooling.vue'
-import EcosystemIcon from './icons/IconEcosystem.vue'
-import CommunityIcon from './icons/IconCommunity.vue'
-import SupportIcon from './icons/IconSupport.vue'
-</script>
-
-<template>
- <WelcomeItem>
- <template #icon>
- <DocumentationIcon />
- </template>
- <template #heading>Documentation</template>
-
- Vue’s
- <a href="https://vuejs.org/" target="_blank" rel="noopener">official documentation</a>
- provides you with all information you need to get started.
- </WelcomeItem>
-
- <WelcomeItem>
- <template #icon>
- <ToolingIcon />
- </template>
- <template #heading>Tooling</template>
-
- This project is served and bundled with
- <a href="https://vite.dev/guide/features.html" target="_blank" rel="noopener">Vite</a>. The
- recommended IDE setup is
- <a href="https://code.visualstudio.com/" target="_blank" rel="noopener">VSCode</a> +
- <a href="https://github.com/johnsoncodehk/volar" target="_blank" rel="noopener">Volar</a>. If
- you need to test your components and web pages, check out
- <a href="https://www.cypress.io/" target="_blank" rel="noopener">Cypress</a> and
- <a href="https://on.cypress.io/component" target="_blank" rel="noopener"
- >Cypress Component Testing</a
- >.
-
- <br />
-
- More instructions are available in <code>README.md</code>.
- </WelcomeItem>
-
- <WelcomeItem>
- <template #icon>
- <EcosystemIcon />
- </template>
- <template #heading>Ecosystem</template>
-
- Get official tools and libraries for your project:
- <a href="https://pinia.vuejs.org/" target="_blank" rel="noopener">Pinia</a>,
- <a href="https://router.vuejs.org/" target="_blank" rel="noopener">Vue Router</a>,
- <a href="https://test-utils.vuejs.org/" target="_blank" rel="noopener">Vue Test Utils</a>, and
- <a href="https://github.com/vuejs/devtools" target="_blank" rel="noopener">Vue Dev Tools</a>. If
- you need more resources, we suggest paying
- <a href="https://github.com/vuejs/awesome-vue" target="_blank" rel="noopener">Awesome Vue</a>
- a visit.
- </WelcomeItem>
-
- <WelcomeItem>
- <template #icon>
- <CommunityIcon />
- </template>
- <template #heading>Community</template>
-
- Got stuck? Ask your question on
- <a href="https://chat.vuejs.org" target="_blank" rel="noopener">Vue Land</a>, our official
- Discord server, or
- <a href="https://stackoverflow.com/questions/tagged/vue.js" target="_blank" rel="noopener"
- >StackOverflow</a
- >. You should also subscribe to
- <a href="https://news.vuejs.org" target="_blank" rel="noopener">our mailing list</a> and follow
- the official
- <a href="https://twitter.com/vuejs" target="_blank" rel="noopener">@vuejs</a>
- twitter account for latest news in the Vue world.
- </WelcomeItem>
-
- <WelcomeItem>
- <template #icon>
- <SupportIcon />
- </template>
- <template #heading>Support Vue</template>
-
- As an independent project, Vue relies on community backing for its sustainability. You can help
- us by
- <a href="https://vuejs.org/sponsor/" target="_blank" rel="noopener">becoming a sponsor</a>.
- </WelcomeItem>
-</template>
diff --git a/frontend/vju_display/src/components/WelcomeItem.vue b/frontend/vju_display/src/components/WelcomeItem.vue
deleted file mode 100644
index 6d7086a..0000000
--- a/frontend/vju_display/src/components/WelcomeItem.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
- <div class="item">
- <i>
- <slot name="icon"></slot>
- </i>
- <div class="details">
- <h3>
- <slot name="heading"></slot>
- </h3>
- <slot></slot>
- </div>
- </div>
-</template>
-
-<style scoped>
-.item {
- margin-top: 2rem;
- display: flex;
- position: relative;
-}
-
-.details {
- flex: 1;
- margin-left: 1rem;
-}
-
-i {
- display: flex;
- place-items: center;
- place-content: center;
- width: 32px;
- height: 32px;
-
- color: var(--color-text);
-}
-
-h3 {
- font-size: 1.2rem;
- font-weight: 500;
- margin-bottom: 0.4rem;
- color: var(--color-heading);
-}
-
-@media (min-width: 1024px) {
- .item {
- margin-top: 0;
- padding: 0.4rem 0 1rem calc(var(--section-gap) / 2);
- }
-
- i {
- top: calc(50% - 25px);
- left: -26px;
- position: absolute;
- border: 1px solid var(--color-border);
- background: var(--color-background);
- border-radius: 8px;
- width: 50px;
- height: 50px;
- }
-
- .item:before {
- content: ' ';
- border-left: 1px solid var(--color-border);
- position: absolute;
- left: 0;
- bottom: calc(50% + 25px);
- height: calc(50% - 25px);
- }
-
- .item:after {
- content: ' ';
- border-left: 1px solid var(--color-border);
- position: absolute;
- left: 0;
- top: calc(50% + 25px);
- height: calc(50% - 25px);
- }
-
- .item:first-of-type:before {
- display: none;
- }
-
- .item:last-of-type:after {
- display: none;
- }
-}
-</style>
diff --git a/frontend/vju_display/src/components/icons/DownIcon.vue b/frontend/vju_display/src/components/icons/DownIcon.vue
new file mode 100644
index 0000000..e46350a
--- /dev/null
+++ b/frontend/vju_display/src/components/icons/DownIcon.vue
@@ -0,0 +1,3 @@
+<template>
+ 🢃
+</template>
\ No newline at end of file
diff --git a/frontend/vju_display/src/components/icons/IconCommunity.vue b/frontend/vju_display/src/components/icons/IconCommunity.vue
deleted file mode 100644
index 2dc8b05..0000000
--- a/frontend/vju_display/src/components/icons/IconCommunity.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template>
- <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor">
- <path
- d="M15 4a1 1 0 1 0 0 2V4zm0 11v-1a1 1 0 0 0-1 1h1zm0 4l-.707.707A1 1 0 0 0 16 19h-1zm-4-4l.707-.707A1 1 0 0 0 11 14v1zm-4.707-1.293a1 1 0 0 0-1.414 1.414l1.414-1.414zm-.707.707l-.707-.707.707.707zM9 11v-1a1 1 0 0 0-.707.293L9 11zm-4 0h1a1 1 0 0 0-1-1v1zm0 4H4a1 1 0 0 0 1.707.707L5 15zm10-9h2V4h-2v2zm2 0a1 1 0 0 1 1 1h2a3 3 0 0 0-3-3v2zm1 1v6h2V7h-2zm0 6a1 1 0 0 1-1 1v2a3 3 0 0 0 3-3h-2zm-1 1h-2v2h2v-2zm-3 1v4h2v-4h-2zm1.707 3.293l-4-4-1.414 1.414 4 4 1.414-1.414zM11 14H7v2h4v-2zm-4 0c-.276 0-.525-.111-.707-.293l-1.414 1.414C5.42 15.663 6.172 16 7 16v-2zm-.707 1.121l3.414-3.414-1.414-1.414-3.414 3.414 1.414 1.414zM9 12h4v-2H9v2zm4 0a3 3 0 0 0 3-3h-2a1 1 0 0 1-1 1v2zm3-3V3h-2v6h2zm0-6a3 3 0 0 0-3-3v2a1 1 0 0 1 1 1h2zm-3-3H3v2h10V0zM3 0a3 3 0 0 0-3 3h2a1 1 0 0 1 1-1V0zM0 3v6h2V3H0zm0 6a3 3 0 0 0 3 3v-2a1 1 0 0 1-1-1H0zm3 3h2v-2H3v2zm1-1v4h2v-4H4zm1.707 4.707l.586-.586-1.414-1.414-.586.586 1.414 1.414z"
- />
- </svg>
-</template>
diff --git a/frontend/vju_display/src/components/icons/IconDocumentation.vue b/frontend/vju_display/src/components/icons/IconDocumentation.vue
deleted file mode 100644
index 6d4791c..0000000
--- a/frontend/vju_display/src/components/icons/IconDocumentation.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template>
- <svg xmlns="http://www.w3.org/2000/svg" width="20" height="17" fill="currentColor">
- <path
- d="M11 2.253a1 1 0 1 0-2 0h2zm-2 13a1 1 0 1 0 2 0H9zm.447-12.167a1 1 0 1 0 1.107-1.666L9.447 3.086zM1 2.253L.447 1.42A1 1 0 0 0 0 2.253h1zm0 13H0a1 1 0 0 0 1.553.833L1 15.253zm8.447.833a1 1 0 1 0 1.107-1.666l-1.107 1.666zm0-14.666a1 1 0 1 0 1.107 1.666L9.447 1.42zM19 2.253h1a1 1 0 0 0-.447-.833L19 2.253zm0 13l-.553.833A1 1 0 0 0 20 15.253h-1zm-9.553-.833a1 1 0 1 0 1.107 1.666L9.447 14.42zM9 2.253v13h2v-13H9zm1.553-.833C9.203.523 7.42 0 5.5 0v2c1.572 0 2.961.431 3.947 1.086l1.107-1.666zM5.5 0C3.58 0 1.797.523.447 1.42l1.107 1.666C2.539 2.431 3.928 2 5.5 2V0zM0 2.253v13h2v-13H0zm1.553 13.833C2.539 15.431 3.928 15 5.5 15v-2c-1.92 0-3.703.523-5.053 1.42l1.107 1.666zM5.5 15c1.572 0 2.961.431 3.947 1.086l1.107-1.666C9.203 13.523 7.42 13 5.5 13v2zm5.053-11.914C11.539 2.431 12.928 2 14.5 2V0c-1.92 0-3.703.523-5.053 1.42l1.107 1.666zM14.5 2c1.573 0 2.961.431 3.947 1.086l1.107-1.666C18.203.523 16.421 0 14.5 0v2zm3.5.253v13h2v-13h-2zm1.553 12.167C18.203 13.523 16.421 13 14.5 13v2c1.573 0 2.961.431 3.947 1.086l1.107-1.666zM14.5 13c-1.92 0-3.703.523-5.053 1.42l1.107 1.666C11.539 15.431 12.928 15 14.5 15v-2z"
- />
- </svg>
-</template>
diff --git a/frontend/vju_display/src/components/icons/IconEcosystem.vue b/frontend/vju_display/src/components/icons/IconEcosystem.vue
deleted file mode 100644
index c3a4f07..0000000
--- a/frontend/vju_display/src/components/icons/IconEcosystem.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template>
- <svg xmlns="http://www.w3.org/2000/svg" width="18" height="20" fill="currentColor">
- <path
- d="M11.447 8.894a1 1 0 1 0-.894-1.789l.894 1.789zm-2.894-.789a1 1 0 1 0 .894 1.789l-.894-1.789zm0 1.789a1 1 0 1 0 .894-1.789l-.894 1.789zM7.447 7.106a1 1 0 1 0-.894 1.789l.894-1.789zM10 9a1 1 0 1 0-2 0h2zm-2 2.5a1 1 0 1 0 2 0H8zm9.447-5.606a1 1 0 1 0-.894-1.789l.894 1.789zm-2.894-.789a1 1 0 1 0 .894 1.789l-.894-1.789zm2 .789a1 1 0 1 0 .894-1.789l-.894 1.789zm-1.106-2.789a1 1 0 1 0-.894 1.789l.894-1.789zM18 5a1 1 0 1 0-2 0h2zm-2 2.5a1 1 0 1 0 2 0h-2zm-5.447-4.606a1 1 0 1 0 .894-1.789l-.894 1.789zM9 1l.447-.894a1 1 0 0 0-.894 0L9 1zm-2.447.106a1 1 0 1 0 .894 1.789l-.894-1.789zm-6 3a1 1 0 1 0 .894 1.789L.553 4.106zm2.894.789a1 1 0 1 0-.894-1.789l.894 1.789zm-2-.789a1 1 0 1 0-.894 1.789l.894-1.789zm1.106 2.789a1 1 0 1 0 .894-1.789l-.894 1.789zM2 5a1 1 0 1 0-2 0h2zM0 7.5a1 1 0 1 0 2 0H0zm8.553 12.394a1 1 0 1 0 .894-1.789l-.894 1.789zm-1.106-2.789a1 1 0 1 0-.894 1.789l.894-1.789zm1.106 1a1 1 0 1 0 .894 1.789l-.894-1.789zm2.894.789a1 1 0 1 0-.894-1.789l.894 1.789zM8 19a1 1 0 1 0 2 0H8zm2-2.5a1 1 0 1 0-2 0h2zm-7.447.394a1 1 0 1 0 .894-1.789l-.894 1.789zM1 15H0a1 1 0 0 0 .553.894L1 15zm1-2.5a1 1 0 1 0-2 0h2zm12.553 2.606a1 1 0 1 0 .894 1.789l-.894-1.789zM17 15l.447.894A1 1 0 0 0 18 15h-1zm1-2.5a1 1 0 1 0-2 0h2zm-7.447-5.394l-2 1 .894 1.789 2-1-.894-1.789zm-1.106 1l-2-1-.894 1.789 2 1 .894-1.789zM8 9v2.5h2V9H8zm8.553-4.894l-2 1 .894 1.789 2-1-.894-1.789zm.894 0l-2-1-.894 1.789 2 1 .894-1.789zM16 5v2.5h2V5h-2zm-4.553-3.894l-2-1-.894 1.789 2 1 .894-1.789zm-2.894-1l-2 1 .894 1.789 2-1L8.553.106zM1.447 5.894l2-1-.894-1.789-2 1 .894 1.789zm-.894 0l2 1 .894-1.789-2-1-.894 1.789zM0 5v2.5h2V5H0zm9.447 13.106l-2-1-.894 1.789 2 1 .894-1.789zm0 1.789l2-1-.894-1.789-2 1 .894 1.789zM10 19v-2.5H8V19h2zm-6.553-3.894l-2-1-.894 1.789 2 1 .894-1.789zM2 15v-2.5H0V15h2zm13.447 1.894l2-1-.894-1.789-2 1 .894 1.789zM18 15v-2.5h-2V15h2z"
- />
- </svg>
-</template>
diff --git a/frontend/vju_display/src/components/icons/IconSupport.vue b/frontend/vju_display/src/components/icons/IconSupport.vue
deleted file mode 100644
index 7452834..0000000
--- a/frontend/vju_display/src/components/icons/IconSupport.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template>
- <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="currentColor">
- <path
- d="M10 3.22l-.61-.6a5.5 5.5 0 0 0-7.666.105 5.5 5.5 0 0 0-.114 7.665L10 18.78l8.39-8.4a5.5 5.5 0 0 0-.114-7.665 5.5 5.5 0 0 0-7.666-.105l-.61.61z"
- />
- </svg>
-</template>
diff --git a/frontend/vju_display/src/components/icons/IconTooling.vue b/frontend/vju_display/src/components/icons/IconTooling.vue
deleted file mode 100644
index 660598d..0000000
--- a/frontend/vju_display/src/components/icons/IconTooling.vue
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- This icon is from <https://github.com/Templarian/MaterialDesign>, distributed under Apache 2.0 (https://www.apache.org/licenses/LICENSE-2.0) license-->
-<template>
- <svg
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- aria-hidden="true"
- role="img"
- class="iconify iconify--mdi"
- width="24"
- height="24"
- preserveAspectRatio="xMidYMid meet"
- viewBox="0 0 24 24"
- >
- <path
- d="M20 18v-4h-3v1h-2v-1H9v1H7v-1H4v4h16M6.33 8l-1.74 4H7v-1h2v1h6v-1h2v1h2.41l-1.74-4H6.33M9 5v1h6V5H9m12.84 7.61c.1.22.16.48.16.8V18c0 .53-.21 1-.6 1.41c-.4.4-.85.59-1.4.59H4c-.55 0-1-.19-1.4-.59C2.21 19 2 18.53 2 18v-4.59c0-.32.06-.58.16-.8L4.5 7.22C4.84 6.41 5.45 6 6.33 6H7V5c0-.55.18-1 .57-1.41C7.96 3.2 8.44 3 9 3h6c.56 0 1.04.2 1.43.59c.39.41.57.86.57 1.41v1h.67c.88 0 1.49.41 1.83 1.22l2.34 5.39z"
- fill="currentColor"
- ></path>
- </svg>
-</template>
diff --git a/frontend/vju_display/src/components/icons/UpIcon.vue b/frontend/vju_display/src/components/icons/UpIcon.vue
new file mode 100644
index 0000000..40869f4
--- /dev/null
+++ b/frontend/vju_display/src/components/icons/UpIcon.vue
@@ -0,0 +1,3 @@
+<template>
+ 🢁
+</template>
\ No newline at end of file
diff --git a/frontend/vju_display/src/MainPage.vue b/frontend/vju_display/src/components/pages/MainPage.vue
similarity index 100%
rename from frontend/vju_display/src/MainPage.vue
rename to frontend/vju_display/src/components/pages/MainPage.vue
diff --git a/frontend/vju_display/src/ProjManualPage.vue b/frontend/vju_display/src/components/pages/ProjManualPage.vue
similarity index 76%
rename from frontend/vju_display/src/ProjManualPage.vue
rename to frontend/vju_display/src/components/pages/ProjManualPage.vue
index 03f1e1d..d3eb983 100644
--- a/frontend/vju_display/src/ProjManualPage.vue
+++ b/frontend/vju_display/src/components/pages/ProjManualPage.vue
@@ -3,8 +3,8 @@
//import TheWelcome from './components/TheWelcome.vue'
import {ref, onMounted, reactive } from 'vue'
import { $mqtt } from 'vue-paho-mqtt'
-import Projektor from './Projektor.vue'
-import Platno from './Platno.vue'
+import Projektor from '../Projektor.vue'
+import Platno from '../Platno.vue'
const props = defineProps({
room: String,
@@ -15,15 +15,14 @@ const _stranski_position = ref('stranski')
</script>
<template>
- <div>
+ <div style="display: flex; gap: 1rem">
<div>
- <!-- <h3>{{ _p1_room }} (prestavi to na levo verjetno)</h3> -->
- <!-- <h4>Glavni</h4> -->
+ <h4>Glavni</h4>
<Projektor :room="props.room" :position="_glavni_position" />
<Platno :room="props.room" :position="_glavni_position" />
</div>
<div>
- <!-- <h4>Stranski</h4> -->
+ <h4>Stranski</h4>
<Projektor :room="props.room" :position="_stranski_position" />
<Platno :room="props.room" :position="_stranski_position" />
</div>
diff --git a/frontend/vju_display/src/components/tabs/Tab.vue b/frontend/vju_display/src/components/tabs/Tab.vue
new file mode 100644
index 0000000..239c705
--- /dev/null
+++ b/frontend/vju_display/src/components/tabs/Tab.vue
@@ -0,0 +1,37 @@
+<script setup lang="ts">
+const props = defineProps({
+ selected: Boolean
+})
+</script>
+<template>
+ <div class="tab" :class="{selected: props.selected}">
+ <slot/>
+ </div>
+</template>
+
+<style scoped>
+.tab {
+ background-color: var(--color-brand-ul-medium-grey);
+ border: none;
+ font-weight: bold;
+}
+.tab:hover {
+ cursor: pointer;
+
+}
+
+.tab.selected {
+ background-color: var(--color-brand-ul-red);
+}
+
+.vertical-tabs .tab {
+ width: 100%;
+ padding: 1rem;
+ text-align: right;
+}
+
+.vertical-tabs .tab:not(:last-child) {
+ margin-bottom: .3rem;
+}
+
+</style>
diff --git a/frontend/vju_display/src/components/tabs/VerticalTabs.vue b/frontend/vju_display/src/components/tabs/VerticalTabs.vue
new file mode 100644
index 0000000..1f64f09
--- /dev/null
+++ b/frontend/vju_display/src/components/tabs/VerticalTabs.vue
@@ -0,0 +1,27 @@
+
+
+<template>
+ <div class="vertical-tabs">
+ <slot />
+ </div>
+ </template>
+
+ <style scoped>
+ .tab:hover {
+ cursor: pointer;
+
+ }
+
+ .vertical-tabs .tab {
+ width: 100%;
+ padding: 1rem 2rem;
+ }
+
+ .vertical-tabs .tab:not(:last-child) {
+ margin-bottom: 1rem;
+ }
+
+
+
+ </style>
+
\ No newline at end of file
diff --git a/frontend/vju_display/src/main.ts b/frontend/vju_display/src/main.ts
index 54667eb..dd0fbfa 100644
--- a/frontend/vju_display/src/main.ts
+++ b/frontend/vju_display/src/main.ts
@@ -13,8 +13,9 @@ createApp(App)
},
MqttOptions: {
- host: 'localhost',
- port: 8080,
+ host: import.meta.env.VITE_MQTT_HOST,
+ port: parseInt(import.meta.env.VITE_MQTT_PORT),
+ useSSL: ["1", "true", "True"].includes(import.meta.env.VITE_MQTT_SSL),
clientId: `vju-${Math.random() * 9999}`,
//mainTopic: '',
enableMainTopic: false