From 4af856b833950e6b5f3754297f2c7d66ce537caf Mon Sep 17 00:00:00 2001 From: Spythere Date: Wed, 2 Jul 2025 18:50:11 +0200 Subject: [PATCH 01/10] chore(scenery): changed appearance of the return button --- src/components/SceneryView/SceneryHeader.vue | 64 +++++++++++++++----- src/locales/en.json | 2 +- src/locales/pl.json | 2 +- src/styles/_global.scss | 42 ------------- src/views/SceneryView.vue | 23 ------- yarn.lock | 2 +- 6 files changed, 51 insertions(+), 84 deletions(-) diff --git a/src/components/SceneryView/SceneryHeader.vue b/src/components/SceneryView/SceneryHeader.vue index babcb09..90a63f2 100644 --- a/src/components/SceneryView/SceneryHeader.vue +++ b/src/components/SceneryView/SceneryHeader.vue @@ -1,5 +1,13 @@ - diff --git a/src/locales/en.json b/src/locales/en.json index e2254de..329a9ac 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -543,7 +543,7 @@ "no-users": "NO ACTIVE PLAYERS", "no-spawns": "NO OPEN SPAWNS", "no-scenery": "Oops! This scenery doesn't exist!", - "return-btn": "Return", + "return-btn": "BACK TO THE LAST SITE", "history-btn": "View the dispatcher history", "info-btn": "Return to the scenery view", "authors-title": "Scenery author | Scenery authors", diff --git a/src/locales/pl.json b/src/locales/pl.json index b60238f..e79c60b 100644 --- a/src/locales/pl.json +++ b/src/locales/pl.json @@ -529,7 +529,7 @@ "no-users": "BRAK AKTYWNYCH GRACZY", "no-spawns": "BRAK OTWARTYCH SPAWNÓW", "no-scenery": "Ups! Ta sceneria nie istnieje!", - "return-btn": "Powrót", + "return-btn": "POWRÓT DO POPRZEDNIEJ STRONY", "history-btn": "Przejdź do widoku historii dyżurnych ruchu", "info-btn": "Wróć do widoku scenerii", "authors-title": "Autor scenerii | Autorzy scenerii", diff --git a/src/styles/_global.scss b/src/styles/_global.scss index 6e94677..a9a2d64 100644 --- a/src/styles/_global.scss +++ b/src/styles/_global.scss @@ -297,48 +297,6 @@ a.a-button { } } -.return-btn { - display: none; - justify-content: center; - align-items: center; - - position: fixed; - right: 2.5rem; - bottom: 4rem; - - z-index: 100; - - width: 3.5rem; - - font-size: 3rem; - - background-color: #555; - outline: 3px solid #222; - color: white; - - border-radius: 50%; - cursor: pointer; - - &:hover { - background-color: #3c3c3c; - } - - img { - width: 1.3em; - } - - @include responsive.smallScreen { - bottom: 1em; - right: 0; - left: 50%; - - width: 1em; - height: 1em; - - transform: translateX(-50%); - } -} - // Basic tooltip [data-tooltip] { cursor: help; diff --git a/src/views/SceneryView.vue b/src/views/SceneryView.vue index 32d5140..c4cef30 100644 --- a/src/views/SceneryView.vue +++ b/src/views/SceneryView.vue @@ -2,12 +2,6 @@
-
- -
- { - prevPath.value = (route.meta['prevPath'] as string) ?? '/'; -}); - const currentMode = computed(() => { return route.query.view?.toString() ?? 'SceneryTimetable'; }); @@ -139,21 +126,11 @@ function setViewMode(componentName: string) { } }); } - -function onReturnButtonClick() { - router.push(prevPath.value); -} diff --git a/src/locales/en.json b/src/locales/en.json index 329a9ac..0c8f1d2 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -589,15 +589,15 @@ "terminated": "Timetable terminated", "begins": "BEGINS HERE", "terminates": "TERMINATES\nHERE", - "from": "FROM", - "to": "TO", - "desc-arriving": "The train is not here yet.\nIt's going to come from: {prevStationName} (route {prevDepartureLine})", - "desc-online": "The train is at the station.\nIt's going to leave to: {nextStationName} (route {nextArrivalLine})", - "desc-stopped": "The train is at the station and is stopped.\nIt's going to leave towards: {nextStationName} (route {nextArrivalLine})", - "desc-next-arrival": "Leaves towards: {nextStationName} (route {nextArrivalLine})", - "desc-departed": "The train is at the station and it's been departed.\nLeaves towards: {nextStationName} (route {nextArrivalLine})", - "desc-departed-ends": "The train is at the station and it's been departed.\nLeaves towards station: {nextStationName}", - "desc-departed-away": "The train has been departed to:\n{nextStationName} (route {nextArrivalLine})", + "from": "Arrives from", + "to": "Departs to", + "desc-arriving": "Arrives from: {prevStationName} ({prevDepartureLine})", + "desc-online": "On scenery / direction: {nextStationName} ({nextArrivalLine})", + "desc-stopped": "On scenery - stopped / direction: {nextStationName} ({nextArrivalLine})", + "desc-next-arrival": "On scenery / direction: {nextStationName} ({nextArrivalLine})", + "desc-departed": "On scenery / departed to: {nextStationName} ({nextArrivalLine})", + "desc-departed-ends": "On scenery / departed to: {nextStationName}", + "desc-departed-away": "Departed to: {nextStationName} ({nextArrivalLine})", "desc-end": "The train terminates here", "desc-terminated": "The train has been terminated" }, diff --git a/src/locales/pl.json b/src/locales/pl.json index e79c60b..350a6bf 100644 --- a/src/locales/pl.json +++ b/src/locales/pl.json @@ -575,17 +575,17 @@ "terminated": "Rozkład jazdy zakończony", "begins": "ROZPOCZYNA\nBIEG", "terminates": "KOŃCZY BIEG", - "from": "Z", - "to": "DO", - "desc-arriving": "Pociągu nie ma jeszcze na tej scenerii.\nPrzyjedzie z: {prevStationName} (szlak {prevDepartureLine})", - "desc-online": "Pociąg jest na tej scenerii.\nOdjedzie w kierunku: {nextStationName} (szlak {nextArrivalLine})", - "desc-stopped": "Pociąg jest na tej scenerii i odbywa postój.\nOdjedzie w kierunku: {nextStationName} (szlak {nextArrivalLine})", - "desc-next-arrival": "Odjeżdża do:\n{nextStationName} (szlak {nextArrivalLine})", - "desc-departed": "Pociąg jest na tej scenerii i został odprawiony.\nOdjeżdża w kierunku: {nextStationName} (szlak {nextArrivalLine})", - "desc-departed-ends": "Pociąg jest na tej scenerii i został odprawiony.\nOdjechał w kierunku stacji: {nextStationName}", - "desc-departed-away": "Pociąg został odprawiony i odjechał do:\n{nextStationName} (szlak {nextArrivalLine})", + "from": "Przyjedzie z", + "to": "Odjeżdża do", + "desc-arriving": "Przyjedzie z: {prevStationName} ({prevDepartureLine})", + "desc-online": "Na scenerii / kierunek: {nextStationName} ({nextArrivalLine})", + "desc-stopped": "Na scenerii - postój / kierunek: {nextStationName} ({nextArrivalLine})", + "desc-next-arrival": "Na scenerii / kierunek: {nextStationName} ({nextArrivalLine})", + "desc-departed": "Na scenerii / odprawiony do: {nextStationName} ({nextArrivalLine})", + "desc-departed-ends": "Na scenerii / odprawiony do: {nextStationName}", + "desc-departed-away": "Odprawiony do: {nextStationName} ({nextArrivalLine})", "desc-end": "Pociąg kończy bieg", - "desc-terminated": "Pociąg skończył bieg" + "desc-terminated": "Pociąg zaskończył bieg" }, "history": { "title": "DZIENNIK ROZKŁADÓW JAZDY" From 0b4ad679b32674d6485a7f8a56b6c13eeb322d30 Mon Sep 17 00:00:00 2001 From: Spythere Date: Fri, 4 Jul 2025 17:16:08 +0200 Subject: [PATCH 04/10] chore: adjusted scenery view return button appearance --- src/components/SceneryView/SceneryHeader.vue | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/components/SceneryView/SceneryHeader.vue b/src/components/SceneryView/SceneryHeader.vue index 90a63f2..c295d04 100644 --- a/src/components/SceneryView/SceneryHeader.vue +++ b/src/components/SceneryView/SceneryHeader.vue @@ -1,7 +1,7 @@