From 81218eb21a8500631fc33e6e344c268b349025a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miha=20Frange=C5=BE?= Date: Fri, 1 Nov 2024 01:20:00 +0100 Subject: [PATCH] grafic desijn is my pashion --- frontend/vju_display/.env.development | 3 + frontend/vju_display/src/App.vue | 98 +++++++++---------- frontend/vju_display/src/assets/base.css | 78 +++------------ frontend/vju_display/src/assets/logo.svg | 1 - frontend/vju_display/src/assets/main.css | 18 ++-- .../vju_display/src/components/HelloWorld.vue | 41 -------- .../src/{ => components}/Platno.vue | 8 +- .../src/{ => components}/Projektor.vue | 82 ++++++++-------- .../vju_display/src/components/TheWelcome.vue | 88 ----------------- .../src/components/WelcomeItem.vue | 87 ---------------- .../src/components/icons/DownIcon.vue | 3 + .../src/components/icons/IconCommunity.vue | 7 -- .../components/icons/IconDocumentation.vue | 7 -- .../src/components/icons/IconEcosystem.vue | 7 -- .../src/components/icons/IconSupport.vue | 7 -- .../src/components/icons/IconTooling.vue | 19 ---- .../src/components/icons/UpIcon.vue | 3 + .../src/{ => components/pages}/MainPage.vue | 0 .../{ => components/pages}/ProjManualPage.vue | 11 +-- .../vju_display/src/components/tabs/Tab.vue | 37 +++++++ .../src/components/tabs/VerticalTabs.vue | 27 +++++ frontend/vju_display/src/main.ts | 5 +- 22 files changed, 195 insertions(+), 442 deletions(-) create mode 100644 frontend/vju_display/.env.development delete mode 100644 frontend/vju_display/src/assets/logo.svg delete mode 100644 frontend/vju_display/src/components/HelloWorld.vue rename frontend/vju_display/src/{ => components}/Platno.vue (91%) rename frontend/vju_display/src/{ => components}/Projektor.vue (52%) delete mode 100644 frontend/vju_display/src/components/TheWelcome.vue delete mode 100644 frontend/vju_display/src/components/WelcomeItem.vue create mode 100644 frontend/vju_display/src/components/icons/DownIcon.vue delete mode 100644 frontend/vju_display/src/components/icons/IconCommunity.vue delete mode 100644 frontend/vju_display/src/components/icons/IconDocumentation.vue delete mode 100644 frontend/vju_display/src/components/icons/IconEcosystem.vue delete mode 100644 frontend/vju_display/src/components/icons/IconSupport.vue delete mode 100644 frontend/vju_display/src/components/icons/IconTooling.vue create mode 100644 frontend/vju_display/src/components/icons/UpIcon.vue rename frontend/vju_display/src/{ => components/pages}/MainPage.vue (100%) rename frontend/vju_display/src/{ => components/pages}/ProjManualPage.vue (76%) create mode 100644 frontend/vju_display/src/components/tabs/Tab.vue create mode 100644 frontend/vju_display/src/components/tabs/VerticalTabs.vue 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 @@ 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 */ -: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 @@ - 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 @@ - - - - - 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)

platna {{ props.position }}

+ @click="publishMQTTMsg(publishPrefix + 'go', 'UP')"> + @click="publishMQTTMsg(publishPrefix + 'go', 'DOWN')">
Manual control