From 22b6177560b54d200310fa543671ce238de130ad Mon Sep 17 00:00:00 2001 From: Spythere Date: Wed, 26 Mar 2025 18:04:00 +0100 Subject: [PATCH 1/8] restruct: updated sass version and rules --- package.json | 2 +- src/App.vue | 15 +- src/components/App/AppFooter.vue | 4 +- src/components/App/AppHeader.vue | 10 +- src/components/App/Clock.vue | 6 +- src/components/App/StatusIndicator.vue | 6 +- src/components/App/UpdateCard.vue | 4 +- src/components/Global/ActionButton.vue | 3 +- src/components/Global/AddDataButton.vue | 2 - src/components/Global/Card.vue | 4 +- src/components/Global/DonationCard.vue | 2 - src/components/Global/RegionDropdown.vue | 4 +- src/components/Global/SearchBox.vue | 36 +- src/components/Global/StationStatusBadge.vue | 12 +- src/components/Global/StockList.vue | 15 +- src/components/Global/VehicleThumbnail.vue | 1 - .../JournalView/JournalDailyStats.vue | 8 +- .../JournalDispatcherEntry.vue | 21 +- .../JournalDispatcherStats.vue | 2 +- .../JournalDispatchersList.vue | 3 +- src/components/JournalView/JournalOptions.vue | 4 +- src/components/JournalView/JournalStats.vue | 6 +- .../JournalTimetables/EntryDetails.vue | 11 +- .../JournalTimetables/EntryGeneral.vue | 6 +- .../JournalTimetables/EntryStatus.vue | 4 +- .../JournalTimetables/EntryStops.vue | 2 +- .../JournalTimetables/JournalDriverStats.vue | 2 +- .../JournalTimetableEntry.vue | 23 +- .../JournalTimetablesList.vue | 7 +- .../SceneryView/SceneryDispatchersHistory.vue | 6 +- src/components/SceneryView/SceneryHeader.vue | 3 +- src/components/SceneryView/SceneryInfo.vue | 4 +- .../SceneryInfo/SceneryInfoAuthors.vue | 4 +- .../SceneryInfo/SceneryInfoIcons.vue | 2 +- .../SceneryInfo/SceneryInfoSpawnList.vue | 2 - .../SceneryInfo/SceneryInfoUserList.vue | 2 +- .../SceneryView/SceneryTimetable.vue | 15 +- .../SceneryView/SceneryTimetablesHistory.vue | 4 +- src/components/StationsView/FilterOption.vue | 4 +- .../StationsView/StationFilterCard.vue | 29 +- src/components/StationsView/StationStats.vue | 7 +- src/components/StationsView/StationTable.vue | 13 +- src/components/TrainsView/TrainInfo.vue | 3 +- src/components/TrainsView/TrainOptions.vue | 4 +- src/components/TrainsView/TrainSchedule.vue | 2 +- src/components/TrainsView/TrainStats.vue | 14 +- src/components/TrainsView/TrainTable.vue | 10 +- src/components/TrainsView/TrainTableItem.vue | 39 +- .../{animations.scss => _animations.scss} | 0 src/styles/{badge.scss => _badge.scss} | 7 +- src/styles/{card.scss => _card.scss} | 5 +- ...wn_filters.scss => _dropdown-filters.scss} | 9 +- src/styles/{dropdown.scss => _dropdown.scss} | 9 +- src/styles/{fonts.scss => _fonts.scss} | 0 src/styles/{global.scss => _global.scss} | 46 +- src/styles/{icons.scss => _icons.scss} | 0 ...rnalSection.scss => _journal-section.scss} | 8 +- ...{JournalStats.scss => _journal-stats.scss} | 9 +- src/styles/{option.scss => _option.scss} | 0 .../{responsive.scss => _responsive.scss} | 0 ...ables.scss => _scenery-history-table.scss} | 0 .../{search_box.scss => _search-box.scss} | 4 +- src/styles/variables.scss | 11 - src/views/DriverView.vue | 4 +- src/views/JournalDispatchers.vue | 2 +- src/views/JournalTimetables.vue | 2 +- src/views/SceneryView.vue | 13 +- src/views/StationsView.vue | 7 +- src/views/TrainsView.vue | 4 +- vite.config.ts | 32 +- yarn.lock | 4390 +++++++++-------- 71 files changed, 2447 insertions(+), 2507 deletions(-) rename src/styles/{animations.scss => _animations.scss} (100%) rename src/styles/{badge.scss => _badge.scss} (94%) rename src/styles/{card.scss => _card.scss} (88%) rename src/styles/{dropdown_filters.scss => _dropdown-filters.scss} (91%) rename src/styles/{dropdown.scss => _dropdown.scss} (79%) rename src/styles/{fonts.scss => _fonts.scss} (100%) rename src/styles/{global.scss => _global.scss} (88%) rename src/styles/{icons.scss => _icons.scss} (100%) rename src/styles/{JournalSection.scss => _journal-section.scss} (91%) rename src/styles/{JournalStats.scss => _journal-stats.scss} (77%) rename src/styles/{option.scss => _option.scss} (100%) rename src/styles/{responsive.scss => _responsive.scss} (100%) rename src/styles/{sceneryViewTables.scss => _scenery-history-table.scss} (100%) rename src/styles/{search_box.scss => _search-box.scss} (91%) delete mode 100644 src/styles/variables.scss diff --git a/package.json b/package.json index cb11cca..3c2ea85 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "vue-router": "^4.4.0" }, "devDependencies": { - "@types/node": "^20.14.12", + "@types/node": "^22.13.13", "@types/showdown": "^2.0.6", "@vite-pwa/assets-generator": "^0.2.4", "@vitejs/plugin-vue": "^5.1.0", diff --git a/src/App.vue b/src/App.vue index cfcd70a..1015ec3 100644 --- a/src/App.vue +++ b/src/App.vue @@ -167,15 +167,14 @@ export default defineComponent({ + \ No newline at end of file diff --git a/src/components/App/AppHeader.vue b/src/components/App/AppHeader.vue index 0b8d75b..850a097 100644 --- a/src/components/App/AppHeader.vue +++ b/src/components/App/AppHeader.vue @@ -116,9 +116,9 @@ export default defineComponent({ } }); + diff --git a/src/components/Global/Card.vue b/src/components/Global/Card.vue index 25fff68..1244ab7 100644 --- a/src/components/Global/Card.vue +++ b/src/components/Global/Card.vue @@ -43,7 +43,7 @@ export default defineComponent({ diff --git a/src/components/JournalView/JournalDispatchers/JournalDispatchersList.vue b/src/components/JournalView/JournalDispatchers/JournalDispatchersList.vue index 979a407..7006fbc 100644 --- a/src/components/JournalView/JournalDispatchers/JournalDispatchersList.vue +++ b/src/components/JournalView/JournalDispatchers/JournalDispatchersList.vue @@ -104,6 +104,5 @@ export default defineComponent({ diff --git a/src/components/JournalView/JournalOptions.vue b/src/components/JournalView/JournalOptions.vue index cabc030..cdb434b 100644 --- a/src/components/JournalView/JournalOptions.vue +++ b/src/components/JournalView/JournalOptions.vue @@ -300,6 +300,6 @@ export default defineComponent({ diff --git a/src/components/JournalView/JournalStats.vue b/src/components/JournalView/JournalStats.vue index a72b0d0..6c71d0b 100644 --- a/src/components/JournalView/JournalStats.vue +++ b/src/components/JournalView/JournalStats.vue @@ -79,14 +79,12 @@ export default defineComponent({ diff --git a/src/components/JournalView/JournalTimetables/EntryDetails.vue b/src/components/JournalView/JournalTimetables/EntryDetails.vue index aed9f53..996fbdb 100644 --- a/src/components/JournalView/JournalTimetables/EntryDetails.vue +++ b/src/components/JournalView/JournalTimetables/EntryDetails.vue @@ -225,9 +225,8 @@ export default defineComponent({ diff --git a/src/components/JournalView/JournalTimetables/JournalTimetableEntry.vue b/src/components/JournalView/JournalTimetables/JournalTimetableEntry.vue index f68f9bc..584db44 100644 --- a/src/components/JournalView/JournalTimetables/JournalTimetableEntry.vue +++ b/src/components/JournalView/JournalTimetables/JournalTimetableEntry.vue @@ -3,14 +3,14 @@ + +
+ {{ timetableEntry.route.replace('|', ' - ') }} +
+ +
+
- -
- {{ timetableEntry.route.replace('|', ' - ') }} -
- -
-
@@ -134,15 +134,20 @@ export default defineComponent({ + \ No newline at end of file diff --git a/src/components/SceneryView/SceneryInfo/SceneryInfoIcons.vue b/src/components/SceneryView/SceneryInfo/SceneryInfoIcons.vue index db65761..01e5372 100644 --- a/src/components/SceneryView/SceneryInfo/SceneryInfoIcons.vue +++ b/src/components/SceneryView/SceneryInfo/SceneryInfoIcons.vue @@ -102,7 +102,7 @@ export default defineComponent({ diff --git a/src/views/JournalTimetables.vue b/src/views/JournalTimetables.vue index 40ea3aa..0f3e0da 100644 --- a/src/views/JournalTimetables.vue +++ b/src/views/JournalTimetables.vue @@ -482,5 +482,5 @@ export default defineComponent({ diff --git a/src/views/SceneryView.vue b/src/views/SceneryView.vue index a1a3441..9e1a2f9 100644 --- a/src/views/SceneryView.vue +++ b/src/views/SceneryView.vue @@ -13,7 +13,7 @@ :station="stationInfo" :onlineScenery="onlineSceneryInfo" /> - + @@ -173,8 +173,7 @@ export default defineComponent({ diff --git a/src/components/StationsView/StationTable.vue b/src/components/StationsView/StationTable.vue index 770c80c..7801640 100644 --- a/src/components/StationsView/StationTable.vue +++ b/src/components/StationsView/StationTable.vue @@ -403,6 +403,8 @@ export default defineComponent({ @use '../../styles/responsive'; @use '../../styles/icons'; +@use 'sass:color'; + $rowCol: #424242; .station_table { @@ -503,13 +505,13 @@ tr, vertical-align: middle; &:nth-child(even) { - background-color: lighten($rowCol, 5); + background-color: color.adjust($rowCol, $lightness: 5%); color: white; } &:hover, &:focus { - background-color: lighten($rowCol, 20); + background-color: color.adjust($rowCol, $lightness: 15%); } td { diff --git a/src/styles/_global.scss b/src/styles/_global.scss index aec8919..d4dadc7 100644 --- a/src/styles/_global.scss +++ b/src/styles/_global.scss @@ -140,18 +140,27 @@ a { color: inherit; } +a.a-row { + display: table-row; +} + a:focus-visible { outline: 1px solid var(--clr-primary); } -.route-active, -.route[data-active='true'] { - color: #ffc014; - font-weight: 700; -} +.route-link { + margin: 0 0.2em; + transition: color 100ms; -a.a-row { - display: table-row; + &-active, + &[data-active='true'] { + color: var(--clr-primary); + font-weight: bold; + } + + &:hover { + color: var(--clr-primary); + } } ul { diff --git a/src/views/DriverView.vue b/src/views/DriverView.vue index 88cedbf..94daf32 100644 --- a/src/views/DriverView.vue +++ b/src/views/DriverView.vue @@ -148,6 +148,7 @@ function copyStockToClipboard() { diff --git a/src/locales/en.json b/src/locales/en.json index 6ee0c7e..0824002 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -331,13 +331,19 @@ "active-filters": "Attention! You got active filters!" }, "station-stats": { + "title": "ONLINE SCENERIES STATS", + "stats-button": "STATISTICS", "u-factor": "U-factor", "u-factor-tooltip": "(?) Current server traffic factor (driver count divided by dispatcher count)", - "avg-timetable-count": "Average count of scenery timetables:", + "avg-timetable-count": "TT average:", "single-track-count": "Single track routes:", "double-track-count": "Double track routes:", - "cross-sceneries": "Cross-track sceneries (1-track <-> 2-track)", - "open-spawns": "Open spawns:" + "cross-sceneries": "Cross-track sceneries", + "open-spawns-all": "Spawns (ALL):", + "open-spawns-pas": "Spawns (PAS):", + "open-spawns-freight": "Spawns (TOW):", + "open-spawns-loco": "Spawns (LOK):", + "no-stats": "No statistics available for the current region!" }, "trains": { "no-trains": "No trains to show here!", @@ -393,7 +399,7 @@ }, "train-stats": { "stats-button": "STATISTICS", - "title": "STATISTICS ONLINE", + "title": "ONLINE TRAINS STATS", "timetable-count": "ACTIVE TIMETABLES", "avg-speed": "AVG SPEED", "avg-timetable": "AVG TIMETABLE", diff --git a/src/locales/pl.json b/src/locales/pl.json index 0168d5d..7ba777f 100644 --- a/src/locales/pl.json +++ b/src/locales/pl.json @@ -327,13 +327,19 @@ "active-filters": "Uwaga! Masz obecnie aktywne filtry!" }, "station-stats": { + "title": "STATYSTYKI AKTYWNYCH SCENERII", + "stats-button": "STATYSTYKI", "u-factor": "Współczynnik Ugla", "u-factor-tooltip": "(?) Współczynnik ruchu na serwerze (liczba maszynistów online dzielona na liczbę dyżurnych ruchu)", - "avg-timetable-count": "Średnia liczba rozkładów jazdy na sceneriach:", + "avg-timetable-count": "Średnia RJ:", "single-track-count": "Szlaki jednotorowe:", "double-track-count": "Szlaki dwutorowe:", - "cross-sceneries": "Scenerie przejściowe (1-tor <-> 2-tor):", - "open-spawns": "Otwarte spawny:" + "cross-sceneries": "Scenerie przejściowe:", + "open-spawns-all": "Spawny (ALL):", + "open-spawns-pas": "Spawny (PAS):", + "open-spawns-freight": "Spawny (TOW):", + "open-spawns-loco": "Spawny (LOK):", + "no-stats": "Brak statystyk online dla wybranego serwera!" }, "trains": { "no-trains": "Brak pociągów do wyświetlenia!", @@ -380,7 +386,7 @@ }, "train-stats": { "stats-button": "STATYSTYKI", - "title": "STATYSTYKI ONLINE", + "title": "STATYSTYKI AKTYWNYCH POCIĄGÓW", "timetable-count": "AKTYWNE RJ", "avg-speed": "ŚREDNIA PRĘDKOŚĆ", "avg-timetable": "ŚREDNI RJ", From 93e242c0f5d6f8664d6b2a2f7fdd8961d25d73f4 Mon Sep 17 00:00:00 2001 From: Spythere Date: Tue, 15 Apr 2025 01:10:31 +0200 Subject: [PATCH 8/8] chore: additional styles --- src/components/StationsView/StationStats.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/components/StationsView/StationStats.vue b/src/components/StationsView/StationStats.vue index e6c0f2f..d55d625 100644 --- a/src/components/StationsView/StationStats.vue +++ b/src/components/StationsView/StationStats.vue @@ -107,7 +107,7 @@ -
{{ $t('station-stats.no-stats') }}
+
{{ $t('station-stats.no-stats') }}
@@ -273,6 +273,11 @@ h1.stats-title img { } } +.no-data { + font-size: 1.1em; + color: #ccc; +} + @include responsive.smallScreen { h1.stats-title { text-align: center;