From eaa34f3359ff1ef42ecfbc544f4f6bb7c3b87143 Mon Sep 17 00:00:00 2001 From: Spythere Date: Sun, 26 Feb 2023 13:50:47 +0100 Subject: [PATCH 1/3] =?UTF-8?q?hotfix:=20dost=C4=99pno=C5=9B=C4=87=20grubo?= =?UTF-8?q?=C5=9Bci=20czcionki?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 7 ++++--- src/styles/global.scss | 15 +-------------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/index.html b/index.html index 98d4b80..f91f6da 100644 --- a/index.html +++ b/index.html @@ -5,8 +5,8 @@ - - + + Stacjownik @@ -24,7 +24,7 @@ - + @@ -32,3 +32,4 @@ + diff --git a/src/styles/global.scss b/src/styles/global.scss index 033831a..5d8daa0 100644 --- a/src/styles/global.scss +++ b/src/styles/global.scss @@ -45,6 +45,7 @@ body { margin: 0; padding: 0; font-family: 'Quicksand', sans-serif; + font-weight: 500; overflow-y: scroll; &.no-scroll { @@ -81,22 +82,9 @@ body { transition: opacity 0.3s; padding: 0.25em; - - // @include smallScreen() { - // right: 0; - // left: 0; - - // &::after { - // left: 75%; - // } - // } } &:hover > .content { - // @include smallScreen() { - // display: none; - // } - visibility: visible; opacity: 1; } @@ -105,7 +93,6 @@ body { button, input, select { - // font-family: "Open Sans", sans-serif; border: none; font-family: 'Quicksand', sans-serif; font-size: 1em; From b88a240ec1d34955d4b325fb77ffc687afe18b36 Mon Sep 17 00:00:00 2001 From: Spythere Date: Sun, 26 Feb 2023 14:14:32 +0100 Subject: [PATCH 2/3] =?UTF-8?q?feature:=20like=20count=20historii=20dy?= =?UTF-8?q?=C5=BCurnych?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JournalView/JournalDispatchersList.vue | 26 ++++++++++++++++--- .../interfaces/api/DispatchersAPIData.ts | 5 ++-- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/components/JournalView/JournalDispatchersList.vue b/src/components/JournalView/JournalDispatchersList.vue index 2b63c99..c3e3209 100644 --- a/src/components/JournalView/JournalDispatchersList.vue +++ b/src/components/JournalView/JournalDispatchersList.vue @@ -29,6 +29,10 @@ {{ item.dispatcherName }} • {{ item.stationName }}  #{{ item.stationHash }}  PL1 + @@ -55,6 +59,7 @@ import { defineComponent, PropType } from 'vue'; import dateMixin from '../../mixins/dateMixin'; import { DispatcherHistory } from '../../scripts/interfaces/api/DispatchersAPIData'; import styleMixin from '../../mixins/styleMixin'; +import imageMixin from '../../mixins/imageMixin'; export default defineComponent({ props: { @@ -64,7 +69,7 @@ export default defineComponent({ }, }, - mixins: [dateMixin, styleMixin], + mixins: [dateMixin, styleMixin, imageMixin], computed: { computedDispatcherHistory() { @@ -101,6 +106,7 @@ export default defineComponent({ @import '../../styles/responsive.scss'; @import '../../styles/badge.scss'; @import '../../styles/JournalSection.scss'; +@import '../../styles/variables.scss'; li.sticky { position: sticky; @@ -114,7 +120,7 @@ li.sticky { flex-wrap: wrap; text-align: left; - gap: 0.25em; + gap: 0.5em 1em; line-height: 1.7em; padding: 0.75em; @@ -134,11 +140,11 @@ li.sticky { .item-general { display: flex; + justify-content: center; align-items: center; gap: 0.25em; flex-wrap: wrap; - .level-badge { margin-right: 0.25em; } @@ -160,4 +166,18 @@ li.sticky { font-weight: bold; } } + +.like-count { + display: flex; + align-items: center; + gap: 0.25em; + font-size: 1.2em; + color: $accentCol; +} + +@include smallScreen { + .journal_item { + flex-direction: column; + } +} diff --git a/src/scripts/interfaces/api/DispatchersAPIData.ts b/src/scripts/interfaces/api/DispatchersAPIData.ts index 434f754..26e39ca 100644 --- a/src/scripts/interfaces/api/DispatchersAPIData.ts +++ b/src/scripts/interfaces/api/DispatchersAPIData.ts @@ -1,10 +1,11 @@ export interface DispatcherHistory { id: string; - + currentDuration: number; dispatcherId: number; dispatcherName: string; dispatcherLevel: number | null; + dispatcherRate: number; dispatcherIsSupporter: boolean; isOnline: boolean; lastOnlineTimestamp: number; @@ -13,4 +14,4 @@ export interface DispatcherHistory { stationName: string; timestampFrom: number; timestampTo?: number; -} \ No newline at end of file +} From 68934a89a4423af224044e5f10ff815830ca1e8e Mon Sep 17 00:00:00 2001 From: Spythere Date: Sun, 26 Feb 2023 14:16:13 +0100 Subject: [PATCH 3/3] bump: wersja 1.12.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4da46ce..a52bd3d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "stacjownik", - "version": "1.12.0", + "version": "1.12.1", "private": true, "scripts": { "dev": "vite",