From 17bda9e6e73bdd2c116858013b57894936f78947 Mon Sep 17 00:00:00 2001 From: Spythere Date: Tue, 28 Jan 2025 14:23:57 +0100 Subject: [PATCH] chore: added scenery offline icon in active train schedule; icon improvements --- .../SceneryInfo/SceneryInfoUserList.vue | 6 +++--- src/components/TrainsView/StopLabel.vue | 15 ++++++++++----- src/components/TrainsView/TrainInfo.vue | 2 +- src/components/TrainsView/TrainSchedule.vue | 10 ++++++++-- src/components/TrainsView/typings.ts | 2 ++ src/locales/en.json | 2 +- src/locales/pl.json | 2 +- 7 files changed, 26 insertions(+), 13 deletions(-) diff --git a/src/components/SceneryView/SceneryInfo/SceneryInfoUserList.vue b/src/components/SceneryView/SceneryInfo/SceneryInfoUserList.vue index 866abeb..b1a0b69 100644 --- a/src/components/SceneryView/SceneryInfo/SceneryInfoUserList.vue +++ b/src/components/SceneryView/SceneryInfo/SceneryInfoUserList.vue @@ -29,11 +29,11 @@ data-tooltip-type="BaseTooltip" :data-tooltip-content="$t('app.tooltip-driver-offline')" > - + diff --git a/src/components/TrainsView/StopLabel.vue b/src/components/TrainsView/StopLabel.vue index edd7da5..9402e83 100644 --- a/src/components/TrainsView/StopLabel.vue +++ b/src/components/TrainsView/StopLabel.vue @@ -4,7 +4,16 @@ :data-minor="stop.isSBL || (stop.nameRaw.endsWith(', po') && !stop.duration)" > - {{ stop.nameRaw }} + + {{ stop.nameRaw }} + {{ stop.nameRaw }} @@ -118,10 +127,6 @@ s { &.misc { background: gray; } - - i { - display: none; - } } .date { diff --git a/src/components/TrainsView/TrainInfo.vue b/src/components/TrainsView/TrainInfo.vue index d6d7f9b..f61badb 100644 --- a/src/components/TrainsView/TrainInfo.vue +++ b/src/components/TrainsView/TrainInfo.vue @@ -106,7 +106,7 @@
- + {{ $t('trains.scenery-offline') }}
diff --git a/src/components/TrainsView/TrainSchedule.vue b/src/components/TrainsView/TrainSchedule.vue index 01f5307..568cc56 100644 --- a/src/components/TrainsView/TrainSchedule.vue +++ b/src/components/TrainsView/TrainSchedule.vue @@ -134,7 +134,7 @@ import StopLabel from './StopLabel.vue'; import StockList from '../Global/StockList.vue'; import { useMainStore } from '../../store/mainStore'; import { useApiStore } from '../../store/apiStore'; -import { StationRoutesInfo, Train } from '../../typings/common'; +import { Train } from '../../typings/common'; import { TrainScheduleStop } from './typings'; export default defineComponent({ @@ -173,6 +173,10 @@ export default defineComponent({ const sceneryName = timetablePath[currentPathIndex].stationName; const sceneryInfo = this.apiStore.sceneryData.find((st) => st.name == sceneryName); + const isSceneryOnline = + (this.apiStore.activeData?.activeSceneries?.find((sc) => sc.stationName == sceneryName) + ?.isOnline ?? 0) == 1; + const arrivalLineInfo = sceneryInfo?.routesInfo.find( (r) => r.routeName == stop.arrivalLine ); @@ -214,8 +218,10 @@ export default defineComponent({ isLastConfirmed: this.lastConfirmed === i && !stop.terminatesHere, isSBL: /sbl/gi.test(stop.stopName), position: stop.beginsHere ? 'begin' : stop.terminatesHere ? 'end' : 'en-route', + status: stop.confirmed ? 'confirmed' : stop.stopped ? 'stopped' : 'unconfirmed', + sceneryName, - status: stop.confirmed ? 'confirmed' : stop.stopped ? 'stopped' : 'unconfirmed' + isSceneryOnline }; }) ?? [] ); diff --git a/src/components/TrainsView/typings.ts b/src/components/TrainsView/typings.ts index 30de2b4..62c86f0 100644 --- a/src/components/TrainsView/typings.ts +++ b/src/components/TrainsView/typings.ts @@ -151,6 +151,8 @@ export interface TrainScheduleStop { isSBL: boolean; sceneryName: string | null; + isSceneryOnline: boolean; + distance: number; arrivalLine: string | null; diff --git a/src/locales/en.json b/src/locales/en.json index bdb3c22..db6c521 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -50,7 +50,7 @@ "migration-confirm": "Roger that!", "offline": "App is in the offline mode!", "tooltip-driver-offline": "Driver is offline", - "tooltip-scenery-offline": "Offline ride through the scenery" + "tooltip-scenery-offline": "Scenery is offline" }, "footer": { "discord": "Stacjownik Discord server" diff --git a/src/locales/pl.json b/src/locales/pl.json index 2dc36f4..4dd5aa3 100644 --- a/src/locales/pl.json +++ b/src/locales/pl.json @@ -47,7 +47,7 @@ "no-result": "Brak wyników o podanych kryteriach!", "offline": "Aplikacja w trybie offline!", "tooltip-driver-offline": "Maszynista offline", - "tooltip-scenery-offline": "Jazda offline przez scenerię" + "tooltip-scenery-offline": "Sceneria offline" }, "footer": { "discord": "Serwer Discord Stacjownika"