diff --git a/package.json b/package.json index 6380c3f..940a51f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "stacjownik", - "version": "1.30.0", + "version": "1.30.1", "private": true, "type": "module", "scripts": { @@ -16,26 +16,26 @@ "format": "prettier --write src/" }, "dependencies": { - "core-js": "^3.32.2", - "dotenv": "^16.3.1", - "pinia": "^2.1.6", - "sass": "^1.67.0", + "core-js": "^3.42.0", + "dotenv": "^16.5.0", + "pinia": "^3.0.2", + "sass": "^1.87.0", "showdown": "^2.1.0", "vue": "^3.3.4", - "vue-i18n": "^9.4.1", + "vue-i18n": "^11.1.3", "vue-router": "^4.4.0" }, "devDependencies": { - "@types/node": "^22.13.13", + "@types/node": "^22.15.15", "@types/showdown": "^2.0.6", - "@vite-pwa/assets-generator": "^0.2.4", + "@vite-pwa/assets-generator": "^1.0.0", "@vitejs/plugin-vue": "^5.1.0", - "@vue/tsconfig": "^0.5.1", - "axios": "^1.7.2", + "@vue/tsconfig": "^0.7.0", + "axios": "^1.9.0", "prettier": "^3.3.3", "typescript": "^5.5.4", - "vite": "^5.3.4", - "vite-plugin-pwa": "^0.20.0", + "vite": "^6.3.5", + "vite-plugin-pwa": "^1.0.0", "vue-tsc": "^2.0.28" }, "browserslist": [ diff --git a/public/images/icon-gnr.svg b/public/images/icon-gnr.svg new file mode 100644 index 0000000..f1d6b83 --- /dev/null +++ b/public/images/icon-gnr.svg @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/images/icon-pojazdownik.svg b/public/images/icon-pojazdownik.svg new file mode 100644 index 0000000..9c15565 --- /dev/null +++ b/public/images/icon-pojazdownik.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/Global/DonationCard.vue b/src/components/Global/DonationCard.vue index 5c9eb11..1574d75 100644 --- a/src/components/Global/DonationCard.vue +++ b/src/components/Global/DonationCard.vue @@ -9,7 +9,7 @@ donator diamond icon - {{ displayingName }} + {{ displayingName }} @@ -45,7 +45,7 @@
diff --git a/src/components/SceneryView/SceneryInfo.vue b/src/components/SceneryView/SceneryInfo.vue index c2ba46d..eb726ae 100644 --- a/src/components/SceneryView/SceneryInfo.vue +++ b/src/components/SceneryView/SceneryInfo.vue @@ -6,8 +6,7 @@ - -
+
@@ -32,7 +31,7 @@ import SceneryInfoUserList from './SceneryInfo/SceneryInfoUserList.vue'; import SceneryInfoSpawnList from './SceneryInfo/SceneryInfoSpawnList.vue'; import SceneryInfoRoutes from './SceneryInfo/SceneryInfoRoutes.vue'; import SceneryInfoGeneral from './SceneryInfo/SceneryInfoGeneral.vue'; -import SceneryInfoAuthors from "./SceneryInfo/SceneryInfoAuthors.vue"; +import SceneryInfoAuthors from './SceneryInfo/SceneryInfoAuthors.vue'; import { ActiveScenery, Station } from '../../typings/common'; @@ -44,7 +43,7 @@ export default defineComponent({ SceneryInfoAuthors, SceneryInfoUserList, SceneryInfoSpawnList, - SceneryInfoRoutes, + SceneryInfoRoutes }, props: { station: { diff --git a/src/components/SceneryView/SceneryInfo/SceneryInfoRoutes.vue b/src/components/SceneryView/SceneryInfo/SceneryInfoRoutes.vue index c440ed4..6f0f78b 100644 --- a/src/components/SceneryView/SceneryInfo/SceneryInfoRoutes.vue +++ b/src/components/SceneryView/SceneryInfo/SceneryInfoRoutes.vue @@ -118,7 +118,8 @@ export default defineComponent({ diff --git a/src/components/StationsView/StationStats.vue b/src/components/StationsView/StationStats.vue index d55d625..d693e3b 100644 --- a/src/components/StationsView/StationStats.vue +++ b/src/components/StationsView/StationStats.vue @@ -8,14 +8,14 @@

- Open filters icon + Open filters icon {{ $t('station-stats.title') }}

@@ -282,5 +282,9 @@ h1.stats-title img { h1.stats-title { text-align: center; } + + .filter-button > span { + display: none; + } } diff --git a/src/components/StationsView/StationTable.vue b/src/components/StationsView/StationTable.vue index 7801640..3390b4b 100644 --- a/src/components/StationsView/StationTable.vue +++ b/src/components/StationsView/StationTable.vue @@ -124,8 +124,8 @@ data-tooltip-type="DonatorTooltip" :data-tooltip-content="$t('donations.dispatcher-message')" > - - {{ station.onlineInfo.dispatcherName }} + donator diamond icon +  {{ station.onlineInfo.dispatcherName }}
@@ -525,7 +525,7 @@ tr, opacity: 0.2; } - @include responsive.smallScreen{ + @include responsive.smallScreen { margin: 0; padding: 0.3em 0.5em; font-size: 1em; diff --git a/src/components/Tooltip/DonatorTooltip.vue b/src/components/Tooltip/DonatorTooltip.vue index 7357d1c..fdbb7db 100644 --- a/src/components/Tooltip/DonatorTooltip.vue +++ b/src/components/Tooltip/DonatorTooltip.vue @@ -1,6 +1,6 @@ @@ -20,7 +20,10 @@ export default defineComponent({ diff --git a/src/components/TrainsView/TrainInfo.vue b/src/components/TrainsView/TrainInfo.vue index 6decd91..c18ac77 100644 --- a/src/components/TrainsView/TrainInfo.vue +++ b/src/components/TrainsView/TrainInfo.vue @@ -60,7 +60,7 @@ data-tooltip-type="DonatorTooltip" :data-tooltip-content="$t('donations.driver-message')" > - {{ train.driverName }} + {{ train.driverName }}  donator diamond icon @@ -192,7 +192,6 @@ import trainInfoMixin from '../../mixins/trainInfoMixin'; import trainCategoryMixin from '../../mixins/trainCategoryMixin'; import ProgressBar from '../Global/ProgressBar.vue'; import StockList from '../Global/StockList.vue'; -import { speedLimits } from '../../data/speedLimits'; export default defineComponent({ mixins: [trainInfoMixin, styleMixin, trainCategoryMixin], @@ -219,6 +218,7 @@ export default defineComponent({ stockSpeedLimit() { let isPassenger = true; + // Check the whole consist speed limit const vehicleMaxSpeed = this.train.stockList.reduce((acc, stockName, i) => { const [vehicleName, vehicleCargo] = stockName.split(':'); @@ -239,22 +239,31 @@ export default defineComponent({ return Math.min(vehicleSpeed, acc); }, Infinity); - const headLoco = this.train.stockList[0].slice(0, this.train.stockList[0].indexOf('-')); + // Check the head vehicle speed limit + const headLocoName = this.train.stockList[0]; + const headLocoVehicleData = this.apiStore.vehiclesData?.find((v) => v.name == headLocoName); - if (speedLimits[headLoco] === undefined) return vehicleMaxSpeed; + // Omit speed check for head vehicle if there's no data for it + if (!headLocoName || !headLocoVehicleData || !headLocoVehicleData.group.massSpeeds) + return vehicleMaxSpeed; - if (this.train.stockList.length == 1) return speedLimits[headLoco]['none']; + const massSpeeds = + headLocoVehicleData.group.massSpeeds[ + this.train.stockList.length == 1 ? 'none' : isPassenger ? 'passenger' : 'cargo' + ]; - const speedTable: Record = - speedLimits[headLoco][isPassenger ? 'passenger' : 'cargo']; + // Omit speed check if there's no data on mass speeds + if (!massSpeeds) return vehicleMaxSpeed; - if (!speedTable) return vehicleMaxSpeed; + // Number type for locomotives alone + if (typeof massSpeeds === 'number') return massSpeeds; - const massKey = Object.keys(speedTable).findLast( + // Record type for passenger or cargo, find the closest range + const massKey = Object.keys(massSpeeds).findLast( (massKey) => this.train.mass >= Number(massKey) ); - const massMaxSpeed = massKey ? speedTable[massKey] : Infinity; + const massMaxSpeed = massKey ? massSpeeds[massKey] : Infinity; return Math.min(massMaxSpeed, vehicleMaxSpeed); }, diff --git a/src/components/TrainsView/TrainStats.vue b/src/components/TrainsView/TrainStats.vue index c83118d..1f76a7d 100644 --- a/src/components/TrainsView/TrainStats.vue +++ b/src/components/TrainsView/TrainStats.vue @@ -14,7 +14,7 @@

- Open filters icon + Open filters icon {{ $t('train-stats.title') }}

@@ -256,5 +256,9 @@ h3 { .no-data { text-align: center; } + + h1 { + text-align: center; + } } diff --git a/src/data/speedLimits.ts b/src/data/speedLimits.ts deleted file mode 100644 index 961499f..0000000 --- a/src/data/speedLimits.ts +++ /dev/null @@ -1,168 +0,0 @@ -export const speedLimits: Record = { - EU07: { - passenger: { - '650000': 125 - }, - cargo: { - '750000': 100, - '1000000': 90, - '1500000': 80, - '2000000': 70 - }, - none: 110 - }, - '4E': { - passenger: { - '650000': 125 - }, - cargo: { - '750000': 100, - '1000000': 90, - '1500000': 80, - '2000000': 70 - }, - none: 110 - }, - EU07E: { - passenger: { - '650000': 125 - }, - cargo: { - '750000': 100, - '1000000': 90, - '1500000': 80, - '2000000': 70 - }, - none: 110 - }, - EP07: { - passenger: { - '650000': 125 - }, - cargo: null, - none: 110 - }, - EP08: { - passenger: { - '650000': 140 - }, - cargo: null, - none: 110 - }, - EP09: { - passenger: { - '650000': 160 - }, - cargo: null, - none: 160 - }, - ET22: { - passenger: { - '650000': 125 - }, - cargo: { - '1200000': 100, - '1800000': 90, - '2500000': 80, - '3100000': 70 - }, - none: 100 - }, - '201E': { - passenger: { - '650000': 125 - }, - cargo: { - '1200000': 100, - '2000000': 80, - '3100000': 70 - }, - none: 125 - }, - ET41: { - passenger: { - '700000': 125 - }, - cargo: { - '4000000': 70, - '3500000': 80, - '2500000': 90, - '2000000': 100 - }, - none: 110 - }, - SM42: { - passenger: { - '95000': 90, - '200000': 80, - '300000': 70, - '450000': 60, - '750000': 50, - '1130000': 40, - '1720000': 30, - '2400000': 20 - }, - cargo: { - '95000': 90, - '200000': 80, - '300000': 70, - '450000': 60, - '750000': 50, - '1130000': 40, - '1720000': 30, - '2400000': 20 - }, - none: 90 - }, - M62: { - passenger: { - '500000': 100, - '800000': 80, - '1200000': 60, - '2000000': 40, - '3000000': 20 - }, - cargo: { - '500000': 100, - '800000': 80, - '1200000': 60, - '2000000': 40, - '3000000': 20 - }, - none: 100 - }, - ST44: { - passenger: { - '500000': 100, - '800000': 80, - '1200000': 60, - '2000000': 40, - '3000000': 20 - }, - cargo: { - '500000': 100, - '800000': 80, - '1200000': 60, - '2000000': 40, - '3000000': 20 - }, - none: 100 - }, - CTLR4C: { - passenger: { - '500000': 100, - '800000': 80, - '1200000': 60, - '2000000': 40, - '3000000': 20 - }, - cargo: { - '500000': 100, - '800000': 80, - '1200000': 60, - '2000000': 40, - '3000000': 20 - }, - none: 100 - } -}; diff --git a/src/locales/en.json b/src/locales/en.json index 4f6cdba..7666117 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -50,7 +50,9 @@ "migration-confirm": "Roger that!", "offline": "App is in the offline mode!", "tooltip-driver-offline": "Driver is offline", - "tooltip-scenery-offline": "Scenery is offline" + "tooltip-scenery-offline": "Scenery is offline", + "pojazdownik-link-content": "POJAZDOWNIK", + "gnr-link-content": "TRAIN ORDERS
GENERATOR" }, "footer": { "discord": "Stacjownik Discord server" @@ -388,18 +390,17 @@ "timeout": "An error occured while trying to refresh SWDR timetable data!", "driver-journal-link": "DRIVER JOURNAL", "driver-srjp-link": "SRJP", - "driver-return-link": "GO BACK", + "driver-return-link": "RETURN", "driver-not-found-header": "Train not found! :/", "driver-not-found-desc-1": "This train has already been terminated, changed its number or is offline.", "driver-not-found-desc-2": "You can browse timetable history in the", "driver-not-found-journal": "TIMETABLES JOURNAL", "driver-not-found-others": "Player {driver} is online as:", - "driver-not-found-return": "GO BACK TO THE MAIN SITE", + "driver-not-found-return": "RETURN TO THE MAIN SITE", "stock-copy": "COPY THE STOCK", "number-propositions": "PROPOSE NUMBER", "stock-clipboard-success": "Successfully copied the railway stock in a text form to your clipboard!", "stock-clipboard-failure": "Oops! Something happened and the railway stock couldn't be copied to your clipboard! :/", - "number-propositions-header": "Generate number examples for selected category:", "number-propositions-third-number": "Third digit:", "number-propositions-last-nums": "{count} last digits from the range of:", @@ -518,7 +519,7 @@ "no-users": "NO ACTIVE PLAYERS", "no-spawns": "NO OPEN SPAWNS", "no-scenery": "Oops! This scenery doesn't exist!", - "return-btn": "Return to main site", + "return-btn": "Return", "history-btn": "View the dispatcher history", "info-btn": "Return to the scenery view", "authors-title": "Scenery author | Scenery authors", @@ -543,8 +544,9 @@ "req-level": "all dispatcher levels | dispatcher level {lvl} required | dispatcher level {lvl} required", "history-list-empty": "No recorded scenery history!", "forum-topic": "Official {name} forum topic", + "gnr-link": "Train orders generator", "pragotron-link": "Timetable pallet board", - "tablice-link": "Timetable summary board (by Thundo)", + "tablice-link": "Timetable summary board
(by Thundo)", "bottom-info": "Show full history in the Journal tab", "btn-show-internal-routes": "Show internal routes", "btn-hide-internal-routes": "Hide internal routes" diff --git a/src/locales/pl.json b/src/locales/pl.json index 76b5a44..65bce7f 100644 --- a/src/locales/pl.json +++ b/src/locales/pl.json @@ -47,7 +47,9 @@ "no-result": "Brak wyników o podanych kryteriach!", "offline": "Aplikacja w trybie offline!", "tooltip-driver-offline": "Maszynista offline", - "tooltip-scenery-offline": "Sceneria offline" + "tooltip-scenery-offline": "Sceneria offline", + "pojazdownik-link-content": "POJAZDOWNIK", + "gnr-link-content": "GENERATOR
ROZKAZÓW PISEMNYCH" }, "footer": { "discord": "Serwer Discord Stacjownika" @@ -386,13 +388,11 @@ "number-propositions": "ZAPROPONUJ NUMER", "stock-clipboard-success": "Pomyślnie skopiowano skład w postaci tekstowej do schowka!", "stock-clipboard-failure": "Ups! Nie udało się skopiować składu do schowka! :/", - "number-propositions-header": "Wygeneruj propozycje numerów dla kategorii pociągu:", "number-propositions-third-number": "Trzecia cyfra:", "number-propositions-last-nums": "{count} ostatnie cyfry z przedziału:", "number-propositions-title": "Propozycje:", "number-propositions-empty": "Brak propozycji dla wybranej kategorii! :/" - }, "train-stats": { "stats-button": "STATYSTYKI", @@ -505,7 +505,7 @@ "no-users": "BRAK AKTYWNYCH GRACZY", "no-spawns": "BRAK OTWARTYCH SPAWNÓW", "no-scenery": "Ups! Ta sceneria nie istnieje!", - "return-btn": "Wróć na stronę główną", + "return-btn": "Powrót", "history-btn": "Przejdź do widoku historii dyżurnych ruchu", "info-btn": "Wróć do widoku scenerii", "authors-title": "Autor scenerii | Autorzy scenerii", @@ -530,8 +530,9 @@ "req-level": "ogólnodostępna | minimum {lvl} poziom dyżurnego | minimum {lvl} poziom dyżurnego", "history-list-empty": "Brak historii dla tej scenerii!", "forum-topic": "Oficjalny wątek scenerii {name}", + "gnr-link": "Generator rozkazów pisemnych", "pragotron-link": "Paletowa tablica informacyjna", - "tablice-link": "Tablica informacyjna zbiorcza (autorstwa Thundo)", + "tablice-link": "Tablica informacyjna zbiorcza
(autorstwa Thundo)", "bottom-info": "Pokaż pełną historię w zakładce Dziennika", "btn-show-internal-routes": "Pokazuj szlaki wewnętrzne", "btn-hide-internal-routes": "Ukrywaj szlaki wewnętrzne" @@ -565,4 +566,4 @@ "history": { "title": "DZIENNIK ROZKŁADÓW JAZDY" } -} \ No newline at end of file +} diff --git a/src/router/index.ts b/src/router/index.ts index 90de42b..56aa21d 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -72,7 +72,7 @@ const router = createRouter({ from.query['view'] === undefined && !savedPosition ) - return { el: `.app_main`, top: -15 }; + return { el: `.scenery-left`, behavior: 'instant', top: 3 }; if (savedPosition) return savedPosition; }, diff --git a/src/styles/_global.scss b/src/styles/_global.scss index 58c9a47..6880c22 100644 --- a/src/styles/_global.scss +++ b/src/styles/_global.scss @@ -201,7 +201,15 @@ ul { &--donator { color: var(--clr-donator); - text-shadow: var(--clr-donator) 0 0 10px; + color: transparent; + + background: var(--clr-donator); + background: linear-gradient(90deg, #ff88db 30%, #ffffff 70%); + background-clip: text; + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + + text-shadow: #f050ff 0 0 10px; } } @@ -271,7 +279,7 @@ a.a-button { padding: 0.35em 0.75em; img { - width: 1.35em; + height: 1.35em; vertical-align: middle; } } diff --git a/src/typings/common.ts b/src/typings/common.ts index a3784c2..850ab28 100644 --- a/src/typings/common.ts +++ b/src/typings/common.ts @@ -234,10 +234,19 @@ export interface VehiclesGroup { length: number; weight: number; cargoTypes: VehicleCargo[] | null; + locoProps: { coldStart: boolean; doubleManned: boolean; } | null; + + massSpeeds: VehicleGroupMassSpeeds | null; +} + +export interface VehicleGroupMassSpeeds { + passenger: Record | null; + cargo: Record | null; + none: number | null; } export interface VehicleCargo { diff --git a/src/views/SceneryView.vue b/src/views/SceneryView.vue index 9e1a2f9..66164a5 100644 --- a/src/views/SceneryView.vue +++ b/src/views/SceneryView.vue @@ -3,8 +3,8 @@
-
@@ -167,6 +167,10 @@ export default defineComponent({ if (!this.stationInfo?.generalInfo?.checkpoints) return; if (this.stationInfo.generalInfo.checkpoints.length == 0) return; this.selectedCheckpoint = this.stationInfo.generalInfo.checkpoints[0]; + }, + + onReturnButtonClick() { + this.$router.back(); } } }); @@ -299,11 +303,11 @@ button.back-btn { .scenery-right { border-radius: 1em; - height: auto; + height: 100vh; } } -@include responsive.smallScreen{ +@include responsive.smallScreen { .scenery-left { max-height: 100vh; } diff --git a/src/views/StationsView.vue b/src/views/StationsView.vue index c7ade83..2c9bb6a 100644 --- a/src/views/StationsView.vue +++ b/src/views/StationsView.vue @@ -1,24 +1,48 @@