From 74984ad6535b6cc480bfdadfdb8b730c31ff27d0 Mon Sep 17 00:00:00 2001 From: Spythere Date: Sat, 2 Dec 2023 16:11:29 +0100 Subject: [PATCH] =?UTF-8?q?dodano=20wyr=C3=B3=C5=BCnienie=20nicku=20wspier?= =?UTF-8?q?aj=C4=85cego=20w=20Dzienniku?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JournalView/JournalDispatchersList.vue | 15 +++++++++++++-- .../JournalTimetables/TimetableGeneral.vue | 17 ++++++++++++++--- .../JournalTimetables/TimetableHistoryList.vue | 6 +++--- src/mixins/donatorMixin.ts | 16 ++++++++++++++++ src/styles/global.scss | 8 ++++---- 5 files changed, 50 insertions(+), 12 deletions(-) create mode 100644 src/mixins/donatorMixin.ts diff --git a/src/components/JournalView/JournalDispatchersList.vue b/src/components/JournalView/JournalDispatchersList.vue index 2051229..04ead90 100644 --- a/src/components/JournalView/JournalDispatchersList.vue +++ b/src/components/JournalView/JournalDispatchersList.vue @@ -43,7 +43,17 @@ - {{ historyItem.dispatcherName }} + + {{ historyItem.dispatcherName }} + + + + {{ historyItem.dispatcherName }} + @@ -121,11 +131,12 @@ import { regions } from '../../data/options.json'; import AddDataButton from '../Global/AddDataButton.vue'; import { API } from '../../typings/api'; import { Status } from '../../typings/common'; +import donatorMixin from '../../mixins/donatorMixin'; export default defineComponent({ components: { Loading, AddDataButton }, - mixins: [dateMixin, styleMixin], + mixins: [dateMixin, styleMixin, donatorMixin], props: { dispatcherHistory: { diff --git a/src/components/JournalView/JournalTimetables/TimetableGeneral.vue b/src/components/JournalView/JournalTimetables/TimetableGeneral.vue index 15535f7..4a0a44a 100644 --- a/src/components/JournalView/JournalTimetables/TimetableGeneral.vue +++ b/src/components/JournalView/JournalTimetables/TimetableGeneral.vue @@ -28,7 +28,17 @@ {{ timetable.driverLevel < 2 ? 'L' : `${timetable.driverLevel}` }} - {{ timetable.driverName }} + + {{ timetable.driverName }} + + + + {{ timetable.driverName }} + @@ -63,13 +73,14 @@ diff --git a/src/mixins/donatorMixin.ts b/src/mixins/donatorMixin.ts new file mode 100644 index 0000000..c174157 --- /dev/null +++ b/src/mixins/donatorMixin.ts @@ -0,0 +1,16 @@ +import { defineComponent } from 'vue'; +import { useStore } from '../store/mainStore'; + +export default defineComponent({ + data() { + return { + store: useStore() + }; + }, + + methods: { + isDonator(name: string) { + return this.store.donatorsData.includes(name); + } + } +}); diff --git a/src/styles/global.scss b/src/styles/global.scss index f749bf9..e08f06f 100644 --- a/src/styles/global.scss +++ b/src/styles/global.scss @@ -14,7 +14,7 @@ --clr-error: #df3e3e; --clr-warning: #c59429; - --clr-honorable: #f47fff; + --clr-donator: #f7a4ff; font-size: 16px; } @@ -158,9 +158,9 @@ ul { color: #ccc; } - &--honorable { - color: var(--clr-honorable); - text-shadow: var(--clr-honorable) 0 0 10px; + &--donator { + color: var(--clr-donator); + text-shadow: var(--clr-donator) 0 0 10px; } }