-
- {{ page.title }}
+ {{ page.title }}13
@@ -96,4 +96,12 @@ ion-item
ion-menu
width: 300px
--width: 300px
+
+.unfinished-tasks
+ color: #fff
+ background: #B00020
+ border-radius: 50%
+ padding: 0 4px
+ margin-bottom: 15px
+ width: fit-content
\ No newline at end of file
diff --git a/app/src/plugins/app/_layout/app/app.layout.vue b/app/src/plugins/app/_layout/app/app.layout.vue
index 152685c..26ffa5d 100644
--- a/app/src/plugins/app/_layout/app/app.layout.vue
+++ b/app/src/plugins/app/_layout/app/app.layout.vue
@@ -33,7 +33,4 @@ export default {
.split-pane-right-side
width: calc(100vw - 300px) !important
max-width: calc(100vw - 300px) !important
-
- .main-content
- padding: 20px 15px
diff --git a/app/src/plugins/app/_layout/auth/_components/a-header.vue b/app/src/plugins/app/_layout/auth/_components/a-header.vue
index 57ec6e3..74b3161 100644
--- a/app/src/plugins/app/_layout/auth/_components/a-header.vue
+++ b/app/src/plugins/app/_layout/auth/_components/a-header.vue
@@ -1,12 +1,12 @@
- ![jandl-logo]()
+ ![jandl-logo]()
\ No newline at end of file
diff --git a/app/src/plugins/app/_theme/global.sass b/app/src/plugins/app/_theme/global.sass
index 4c0a842..85c450a 100644
--- a/app/src/plugins/app/_theme/global.sass
+++ b/app/src/plugins/app/_theme/global.sass
@@ -1,5 +1,21 @@
-span.highlight
- color: #7F39FB
+.task-action
+ .trash-icon
+ padding: 10px
+ background: rgba(0, 0, 0, 0.04)
+ margin-left: 12px
+ border-radius: 50%
+ cursor: pointer
+ .pencil-icon
+ padding: 10px
+ background: rgba(0, 0, 0, 0.04)
+ border-radius: 50%
+ cursor: pointer
-.cursor-pointer:hover
- cursor: pointer
\ No newline at end of file
+th
+ font-size: 16px !important
+
+.task-action
+ width: 50%
+
+.v-card
+ padding: 35px !important
\ No newline at end of file
diff --git a/app/src/plugins/lib@auth/_theme/auth.theme.sass b/app/src/plugins/lib@auth/_theme/auth.theme.sass
index a0c0354..2e65e70 100644
--- a/app/src/plugins/lib@auth/_theme/auth.theme.sass
+++ b/app/src/plugins/lib@auth/_theme/auth.theme.sass
@@ -59,11 +59,11 @@
right: 45px
input::-webkit-outer-spin-button,
-input::-webkit-inner-spin-button
+input::-webkit-inner-spin-button
-webkit-appearance: none
.error-message
- position: absolute
+ position: absolute
top: 50%
left: 30px
color: red
diff --git a/app/src/plugins/tm@dashboard/tasks/_components/_img/home-icon.svg b/app/src/plugins/tm@dashboard/tasks/_components/_img/home-icon.svg
new file mode 100644
index 0000000..358adbf
--- /dev/null
+++ b/app/src/plugins/tm@dashboard/tasks/_components/_img/home-icon.svg
@@ -0,0 +1,4 @@
+
diff --git a/app/src/plugins/tm@dashboard/tasks/_components/a-tasks-filter.vue b/app/src/plugins/tm@dashboard/tasks/_components/a-tasks-filter.vue
index 0597885..53eee87 100644
--- a/app/src/plugins/tm@dashboard/tasks/_components/a-tasks-filter.vue
+++ b/app/src/plugins/tm@dashboard/tasks/_components/a-tasks-filter.vue
@@ -8,8 +8,8 @@
variant="outlined"
>
\ No newline at end of file
diff --git a/app/src/plugins/tm@dashboard/tasks/_components/z-timeline.vue b/app/src/plugins/tm@dashboard/tasks/_components/z-timeline.vue
index b0ec85c..725d582 100644
--- a/app/src/plugins/tm@dashboard/tasks/_components/z-timeline.vue
+++ b/app/src/plugins/tm@dashboard/tasks/_components/z-timeline.vue
@@ -1,326 +1,220 @@
-
+
+
+ Názov
+ Akcia
+
+
+
+
+
+ {{ team.name }}
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/plugins/tm@overview/teams/teams.vue b/app/src/plugins/tm@overview/teams/teams.vue
index 68ac751..455e5f9 100644
--- a/app/src/plugins/tm@overview/teams/teams.vue
+++ b/app/src/plugins/tm@overview/teams/teams.vue
@@ -1,9 +1,29 @@
-
+
+
\ No newline at end of file
diff --git a/app/src/plugins/w/i18n/models/i18n.ts b/app/src/plugins/w/i18n/models/i18n.ts
index 07447c3..48a4757 100644
--- a/app/src/plugins/w/i18n/models/i18n.ts
+++ b/app/src/plugins/w/i18n/models/i18n.ts
@@ -2,7 +2,7 @@ import { Language, Options } from "../types"
import { Ref, ref } from 'vue'
import axios from 'axios'
import { createI18n, I18n as I18nType } from 'vue-i18n'
-import { Storage } from '@capacitor/storage'
+import { Preferences } from '@capacitor/preferences'
export class I18n {
@@ -30,7 +30,7 @@ export class I18n {
}
public async initCurrentLanguage() {
- const { value } = await Storage.get({ key: this.languageKey })
+ const { value } = await Preferences.get({ key: this.languageKey })
if (value) {
this.currentLanguage.value = JSON.parse(value)
@@ -58,7 +58,7 @@ export class I18n {
this.currentLanguage.value = language
this._addAxiosHeaders()
- Storage.set({
+ Preferences.set({
key: this.languageKey,
value: JSON.stringify(language)
})
{{ $route.name }}
+
+
+
+
\ No newline at end of file
diff --git a/app/src/plugins/app/_layout/app/_components/a-sidemenu.vue b/app/src/plugins/app/_layout/app/_components/a-sidemenu.vue
index 89c615a..b3c0884 100644
--- a/app/src/plugins/app/_layout/app/_components/a-sidemenu.vue
+++ b/app/src/plugins/app/_layout/app/_components/a-sidemenu.vue
@@ -6,7 +6,7 @@
{{ $route.name }}
- ![search-icon]()
-
- + Vytvoriť
+
+ ![search-icon]()
+
+
+
+ +Vytvoriť
+
+
+
+
+ MASTER TASK
+
+
+ SUB TASK
+
+
+ TÍM
+
+
+ BLOKER
+
+
+
+
+
+ + {{ + user.user.name.charAt(0) + + user.user.surname.charAt(0) + }} +
+
+
+
+
+ {{
+ `${user.user.name} ${user.user.surname}`
+ }}
+
+
+
+
+
+ Working hours
+
+
+ Odhlásiť sa
+
+
+
+
+
- ![]()
![]()
+ ![]()
![]()
-
-
- mdi-chevron-left
-
-
- mdi-chevron-right
-
-
-
-
-
-
-
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue b/app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue
index 04165b1..cef65fe 100644
--- a/app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue
+++ b/app/src/plugins/tm@overview/tasks-ongoing/_components/a-ongoing-table.vue
@@ -39,23 +39,9 @@ export default {
diff --git a/app/src/plugins/tm@overview/tasks-unscheduled/_components/a-unscheduled-table.vue b/app/src/plugins/tm@overview/tasks-unscheduled/_components/a-unscheduled-table.vue
index 0502082..2c6398b 100644
--- a/app/src/plugins/tm@overview/tasks-unscheduled/_components/a-unscheduled-table.vue
+++ b/app/src/plugins/tm@overview/tasks-unscheduled/_components/a-unscheduled-table.vue
@@ -37,24 +37,10 @@ export default {
\ No newline at end of file
diff --git a/app/src/plugins/tm@overview/teams/_components/a-teams-table.vue b/app/src/plugins/tm@overview/teams/_components/a-teams-table.vue
index e69de29..6babc53 100644
--- a/app/src/plugins/tm@overview/teams/_components/a-teams-table.vue
+++ b/app/src/plugins/tm@overview/teams/_components/a-teams-table.vue
@@ -0,0 +1,64 @@
+
+
-
-
-
-
- {{ nowTime }}
-
-
+
+
+
+ ![]()
+
+ Event end: {{ event.end.formatTime("h O'clock") }} + + +
-
+
diff --git a/app/src/plugins/tm@dashboard/tasks/tasks.vue b/app/src/plugins/tm@dashboard/tasks/tasks.vue
index c5993dc..a43c883 100644
--- a/app/src/plugins/tm@dashboard/tasks/tasks.vue
+++ b/app/src/plugins/tm@dashboard/tasks/tasks.vue
@@ -2,7 +2,7 @@
{{ getHeadingDate(heading.date) }}
+ + + + + +{{hours}}:{{String(minutes).padStart(2, '0')}}
+ + + + + + + + + Event start: {{ event.start.formatTime("h O'clock") }}+ Event end: {{ event.end.formatTime("h O'clock") }} + + +
+ ![pencil-icon]()
+ ![trash-icon]()
+
+