+
- {{ station.onlineInfo.dispatcherExp > 1 ? station.onlineInfo.dispatcherExp : 'L' }}
+ {{ onlineScenery.dispatcherExp > 1 ? onlineScenery.dispatcherExp : 'L' }}
- {{ station.onlineInfo.dispatcherName }}
+ {{ onlineScenery.dispatcherName }}
- ![icon-like]()
- {{ station.onlineInfo?.dispatcherRate || '0' }}
+ 
+ {{ onlineScenery?.dispatcherRate || '0' }}
@@ -98,4 +93,3 @@ export default defineComponent({
}
}
-
diff --git a/src/components/SceneryView/SceneryInfo/SceneryInfoIcons.vue b/src/components/SceneryView/SceneryInfo/SceneryInfoIcons.vue
index 9295c65..b3ac504 100644
--- a/src/components/SceneryView/SceneryInfo/SceneryInfoIcons.vue
+++ b/src/components/SceneryView/SceneryInfo/SceneryInfoIcons.vue
@@ -20,7 +20,7 @@
@@ -28,7 +28,7 @@
![]()
@@ -36,7 +36,7 @@
@@ -44,7 +44,7 @@
@@ -52,7 +52,7 @@
@@ -60,7 +60,7 @@
@@ -68,7 +68,7 @@
@@ -76,20 +76,19 @@
@@ -118,4 +117,3 @@ export default defineComponent({
}
}
-
diff --git a/src/components/SceneryView/SceneryInfo/SceneryInfoRoutes.vue b/src/components/SceneryView/SceneryInfo/SceneryInfoRoutes.vue
index bab7fbf..22a43be 100644
--- a/src/components/SceneryView/SceneryInfo/SceneryInfoRoutes.vue
+++ b/src/components/SceneryView/SceneryInfo/SceneryInfoRoutes.vue
@@ -1,129 +1,142 @@
-
-
-
-
{{ $t('scenery.one-way-routes') }}
-
-
- -
- {{ route.name }}
-
- {{ activeShowLength.includes(route.name) ? route.length + 'm' : route.speed }}
-
- SBL
-
-
-
-
{{ $t('scenery.two-way-routes') }}
-
-
- -
- {{ route.name }}
-
- {{ activeShowLength.includes(route.name) ? route.length + 'm' : route.speed }}
-
- SBL
-
-
-
-
-
-
-
+
+
+
+
{{ $t('scenery.one-way-routes') }}
+
+
+ -
+
+ {{ route.name }}
+
+ {{ activeShowLength.includes(route.name) ? route.length + 'm' : route.speed }}
+
+ SBL
+
+
+
+
{{ $t('scenery.two-way-routes') }}
+
+
+ -
+ {{
+ route.name
+ }}
+
+ {{ activeShowLength.includes(route.name) ? route.length + 'm' : route.speed }}
+
+ SBL
+
+
+
+
+
+
+
diff --git a/src/components/SceneryView/SceneryInfo/SceneryInfoSpawnList.vue b/src/components/SceneryView/SceneryInfo/SceneryInfoSpawnList.vue
index ea416d0..fdbecb3 100644
--- a/src/components/SceneryView/SceneryInfo/SceneryInfoSpawnList.vue
+++ b/src/components/SceneryView/SceneryInfo/SceneryInfoSpawnList.vue
@@ -1,65 +1,88 @@
-
-
-
-
-
-
- {{ spawn.spawnName }}
- {{ spawn.spawnLength }}m
-
-
-
- {{ $t('scenery.no-spawns') }}
-
-
-
-
-
-
-
+
+
+
+
+
+
+ {{ $t('scenery.no-spawns') }}
+
+
+
+ {{ spawn.spawnName }}
+ {{ spawn.spawnLength }}m
+
+
+
+
+
+
+
+
diff --git a/src/components/SceneryView/SceneryInfo/SceneryInfoStats.vue b/src/components/SceneryView/SceneryInfo/SceneryInfoStats.vue
index b52f33d..147cb88 100644
--- a/src/components/SceneryView/SceneryInfo/SceneryInfoStats.vue
+++ b/src/components/SceneryView/SceneryInfo/SceneryInfoStats.vue
@@ -1,29 +1,32 @@
- ![icon-like]()
+ 
{{ station.onlineInfo?.dispatcherRate || '0' }}
- ![icon-user]()
+ 
{{ station.onlineInfo?.currentUsers || '0' }}
/
{{ station.onlineInfo?.maxUsers || '0' }}
- ![icon-spawn]()
+ 
{{ station.onlineInfo?.spawns.length || '0' }}
- ![icon-timetable]()
+ 
{{ station.onlineInfo?.scheduledTrains?.length || '0' }}
/
{{ station.onlineInfo?.scheduledTrains?.filter((train) => train.stopInfo.confirmed).length || '0' }}
+ >{{
+ station.onlineInfo?.scheduledTrains?.filter((train) => train.stopInfo.confirmed)
+ .length || '0'
+ }}
@@ -31,18 +34,16 @@
diff --git a/src/components/SceneryView/SceneryInfo/SceneryInfoUserList.vue b/src/components/SceneryView/SceneryInfo/SceneryInfoUserList.vue
index a920397..e265079 100644
--- a/src/components/SceneryView/SceneryInfo/SceneryInfoUserList.vue
+++ b/src/components/SceneryView/SceneryInfo/SceneryInfoUserList.vue
@@ -1,131 +1,123 @@
-
-
-
-
-
- {{ train.trainNo }}
- {{ train.driverName }}
-
-
-
- {{ $t('scenery.no-users') }}
-
-
-
-
-
-
-
+
+
+
+
+
+
+ {{ $t('scenery.no-users') }}
+
+
+
+ {{ train.trainNo }}
+ {{ train.driverName }}
+
+
+
+
+
+
+
+
diff --git a/src/components/SceneryView/SceneryTimetable.vue b/src/components/SceneryView/SceneryTimetable.vue
index 2385167..6467354 100644
--- a/src/components/SceneryView/SceneryTimetable.vue
+++ b/src/components/SceneryView/SceneryTimetable.vue
@@ -1,457 +1,466 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/src/components/SceneryView/SceneryTimetablesHistory.vue b/src/components/SceneryView/SceneryTimetablesHistory.vue
index 186094d..be45b1d 100644
--- a/src/components/SceneryView/SceneryTimetablesHistory.vue
+++ b/src/components/SceneryView/SceneryTimetablesHistory.vue
@@ -1,110 +1,122 @@
-
-
-
- {{ $t('scenery.history-list-empty') }}
-
-
-
- | {{ $t('scenery.timetables-history-id') }} |
- {{ $t('scenery.timetables-history-number') }} |
- {{ $t('scenery.timetables-history-route') }} |
- {{ $t('scenery.timetables-history-driver') }} |
- {{ $t('scenery.timetables-history-author') }} |
- {{ $t('scenery.timetables-history-date') }} |
-
-
-
-
- |
- #{{ historyItem.id }}
- |
-
- {{ historyItem.trainCategoryCode }}
- {{ historyItem.trainNo }}
- |
- {{ historyItem.route.replace('|', ' -> ') }} |
- {{ historyItem.driverName }} |
-
- {{ historyItem.authorName }}
-
- {{ $t('scenery.timetable-author-unknown') }}
- |
-
- {{ localeDay(historyItem.beginDate, $i18n.locale) }}
- {{ localeTime(historyItem.beginDate, $i18n.locale) }}
- |
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ {{ $t('scenery.history-list-empty') }}
+
+
+
+
+ | {{ $t('scenery.timetables-history-id') }} |
+ {{ $t('scenery.timetables-history-number') }} |
+ {{ $t('scenery.timetables-history-route') }} |
+ {{ $t('scenery.timetables-history-driver') }} |
+ {{ $t('scenery.timetables-history-author') }} |
+ {{ $t('scenery.timetables-history-date') }} |
+
+
+
+
+ |
+ #{{ historyItem.id }}
+ |
+
+ {{ historyItem.trainCategoryCode }}
+ {{ historyItem.trainNo }}
+ |
+ {{ historyItem.route.replace('|', ' -> ') }} |
+ {{ historyItem.driverName }} |
+
+ {{ historyItem.authorName }}
+
+ {{ $t('scenery.timetable-author-unknown') }}
+ |
+
+ {{ localeDay(historyItem.beginDate, $i18n.locale) }}
+ {{ localeTime(historyItem.beginDate, $i18n.locale) }}
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/SceneryView/ScheduledTrainStatus.vue b/src/components/SceneryView/ScheduledTrainStatus.vue
index 73a8ba3..c376d7a 100644
--- a/src/components/SceneryView/ScheduledTrainStatus.vue
+++ b/src/components/SceneryView/ScheduledTrainStatus.vue
@@ -1,6 +1,9 @@
-
+
{{ computedScheduledTrain.stopStatusIndicator }}
@@ -19,16 +22,21 @@ export default defineComponent({
props: {
scheduledTrain: {
type: Object as PropType,
- required: true,
- },
+ required: true
+ }
},
computed: {
computedScheduledTrain(): ScheduledTrainComp {
- const { prevDepartureLine, prevStationName, stopStatus, nextArrivalLine, nextStationName } = this.scheduledTrain;
+ const { prevDepartureLine, prevStationName, stopStatus, nextArrivalLine, nextStationName } =
+ this.scheduledTrain;
- const prevDepartureIndicator = prevDepartureLine ? `(${prevDepartureLine}) ${prevStationName}` : '---';
- const nextArrivalIndicator = nextArrivalLine ? `(${nextArrivalLine}) ${nextStationName}` : '---';
+ const prevDepartureIndicator = prevDepartureLine
+ ? `(${prevDepartureLine}) ${prevStationName}`
+ : '---';
+ const nextArrivalIndicator = nextArrivalLine
+ ? `(${nextArrivalLine}) ${nextStationName}`
+ : '---';
let stopStatusDescription = '',
stopStatusIndicator = '';
@@ -36,7 +44,10 @@ export default defineComponent({
switch (stopStatus) {
case StopStatus.arriving:
stopStatusIndicator = `${this.$t('timetables.from')}: ${prevDepartureIndicator}`;
- stopStatusDescription = this.$t('timetables.desc-arriving', { prevStationName, prevDepartureLine });
+ stopStatusDescription = this.$t('timetables.desc-arriving', {
+ prevStationName,
+ prevDepartureLine
+ });
break;
case StopStatus.online:
@@ -51,12 +62,18 @@ export default defineComponent({
case StopStatus.departed:
stopStatusIndicator = `${this.$t('timetables.to')}: ${nextArrivalIndicator}`;
- stopStatusDescription = this.$t('timetables.desc-departed', { nextStationName, nextArrivalLine });
+ stopStatusDescription = this.$t('timetables.desc-departed', {
+ nextStationName,
+ nextArrivalLine
+ });
break;
case StopStatus['departed-away']:
stopStatusIndicator = `${this.$t('timetables.to')}: ${nextArrivalIndicator}`;
- stopStatusDescription = this.$t('timetables.desc-departed-away', { nextStationName, nextArrivalLine });
+ stopStatusDescription = this.$t('timetables.desc-departed-away', {
+ nextStationName,
+ nextArrivalLine
+ });
break;
case StopStatus.terminated:
@@ -70,10 +87,10 @@ export default defineComponent({
return {
...this.scheduledTrain,
stopStatusDescription,
- stopStatusIndicator,
+ stopStatusIndicator
};
- },
- },
+ }
+ }
});
@@ -110,4 +127,3 @@ export default defineComponent({
}
}
-
diff --git a/src/components/StationsView/FilterOption.vue b/src/components/StationsView/FilterOption.vue
index c924eb5..5376db0 100644
--- a/src/components/StationsView/FilterOption.vue
+++ b/src/components/StationsView/FilterOption.vue
@@ -1,6 +1,12 @@
diff --git a/src/components/TrainsView/TrainTable.vue b/src/components/TrainsView/TrainTable.vue
index 5b0ea3a..eb69fbf 100644
--- a/src/components/TrainsView/TrainTable.vue
+++ b/src/components/TrainsView/TrainTable.vue
@@ -1,207 +1,209 @@
-
-
-
-
-
- {{ $t('app.offline') }}
-
-
-
-
-
- {{ $t('trains.no-trains') }}
-
-
-
-
-
-
-
-
-
+
+
+
+ {{ $t('app.offline') }}
+
+
+
+
+
+ {{ $t('trains.no-trains') }}
+
+
+
+
+
+
+
+
+
The app is working in offline mode!",
- "S1a-connection": "S1a signal
Cannot connect with Stacjownik API service!",
- "S1a-sceneries": "S1a signal
Cannot load online stations data!",
- "S2": "S2 signal
All data loaded successfully!",
- "S3": "S3 signal
Loading data...",
- "S5-timetables": "S5 signal
Timetables might be incorrect or missing!",
- "S5-dispatchers": "S5 signal
Cannot load dispatchers status data!",
- "S5-trains": "S5 signal
Cannot load online trains data!"
- },
- "desc": {
- "control-type": "Control type: ",
- "signals-type": "Signals type: ",
- "SBL": "This scenery has automatic block signalling (ABS/SBL) system on following routes: ",
- "SUP": "Requires the SUP application (level crossing remote control simulator)",
- "TWB-all": "This scenery has two-way route blockade on all routes",
- "TWB-routes": "This scenery has two-way route blockade on following routes: ",
- "default": "This scenery is available by default",
- "non-public": "This scenery is not public",
- "unknown": "This scenery isn't recognizable right now",
- "unavailable": "This scenery is unavailable",
- "abandoned": "This scenery is no longer supported by its creators",
- "real": "Scenery with real lines: "
- },
- "signals": {
- "title": "Signal type",
- "współczesna": "modern",
- "mieszana": "mixed",
- "kształtowa": "mechanical",
- "historyczna": "historical"
- },
- "controls": {
- "title": "Control type",
- "SPK": "SPK",
- "SCS": "SCS",
- "SCS-SPK": "SCS/SPK",
- "SPE": "SPE",
- "ręczne": "manual",
- "ręczne+SPK": "manual + SPK",
- "ręczne+SCS": "manual + SCS",
- "mechaniczne": "levers (mechanical)",
- "mechaniczne+SPK": "levers + SPK",
- "mechaniczne+SCS": "levers + SCS"
- },
- "status": {
- "online": "UNTIL ",
- "free": "FREE",
- "ending": "ENDS SOON",
- "not-signed": "NOT SIGNED IN",
- "no-limit": "NO LIMIT",
- "unavailable": "UNAVAILABLE",
- "brb": "AFK",
- "no-space": "NO SPACE",
- "unknown": "UNKNOWN"
- },
- "options": {
- "filters": "FILTERS",
- "donate": "DONATE",
-
- "search-button": "Search",
- "reset-button": "Reset",
-
- "sort-title": "SORT BY:",
- "filter-title": "FILTER BY:",
- "search-title": "SEARCH:",
-
- "search-train-no": "Train no. / #",
- "search-train": "Train no.",
- "search-driver": "Driver name",
- "search-dispatcher": "Dispatcher name",
- "search-station": "Scenery name",
- "search-author": "Timetable author name",
- "search-issuedFrom": "Origin scenery name",
- "search-timetables-date": "Timetable date (UTC+2 / CEST)",
- "search-dispatchers-date": "Service date (UTC+2 / CEST)",
- "search-date": "Date (UTC+2 / CEST)",
-
- "sort-mass": "mass",
- "sort-speed": "speed",
- "sort-length": "length",
- "sort-routeDistance": "route distance",
- "sort-timetable": "train no.",
- "sort-progress": "route progress",
- "sort-delay": "current delay",
- "sort-id": "timetable id",
-
- "sort-allStopsCount": "total stops",
- "sort-beginDate": "date",
- "sort-timetableId": "timetable ID",
- "sort-timestampFrom": "date",
- "sort-duration": "duration",
-
- "filter-noComments": "NO COMMENTS",
- "filter-withComments": "COMMENTS",
- "filter-twr": "HIGH RISK CARGO",
- "filter-skr": "EXCEEDED GAUGE",
- "filter-twr-skr": "ALL TYPES",
- "filter-common": "NO WARNINGS",
- "filter-passenger": "PASSENGER",
- "filter-freight": "FREIGHT",
- "filter-other": "OTHER",
- "filter-noTimetable": "NO TIMETABLE",
- "filter-withTimetable": "TIMETABLE",
-
- "filter-reset": "RESET FILTERS",
- "filter-clear": "CLEAR FILTERS",
-
- "filter-section-timetable-status": "TIMETABLE STATUS",
- "filter-section-twrskr": "WARNINGS",
-
- "filter-all": "ALL ENTRIES",
- "filter-abandoned": "ABANDONED",
- "filter-fulfilled": "FULFILLED",
- "filter-active": "ACTIVE"
- },
- "filters": {
- "desc": " • Left mouse click: select / unselect chosen filter
• Double left click: unselect all filters but chosen from a group
• RESET: reset all filters from a group",
-
- "sections": {
- "quick": "QUICK FILTERS",
- "reality": "SCENERY REALITY",
- "package-access": "IN-GAME AVAILABILITY",
- "access": "GENERAL AVAILABILITY",
- "control": "CONTROLS",
- "signals": "SIGNALLING",
- "addons": "ADDITIONAL PROGRAMS",
- "blockades": "BLOCK SIGNALLING",
- "status": "ONLINE STATUS"
- },
-
- "all-available": "ALL AVAILABLE",
- "all-free": "CURRENTLY FREE",
-
- "endingStatus": "ENDS SOON",
- "afkStatus": "AFK",
- "noSpaceStatus": "NO SPACE",
- "unavailableStatus": "UNAVAILABLE",
-
- "title": "STATION FILTERS",
- "default": "IN-GAME",
- "not-default": "ADDITIONAL",
- "real": "REAL",
- "fictional": "FICTIONAL",
- "unavailable": "UNSUPPORTED",
- "non-public": "NON-PUBLIC",
- "abandoned": "ABANDONED",
-
- "SPK": "SPK",
- "SPK-R": "SPK + MANUAL",
- "SPK-M": "SPK + MECH.",
- "SCS": "SCS",
- "SCS-R": "SCS + MANUAL",
- "SCS-M": "SCS + MECH.",
- "SPE": "SPE",
-
- "manual": "MANUAL",
- "mechanical": "MECHANICAL",
-
- "SUP": "SUP (RASP-UZK)",
- "noSUP": "WITHOUT SUP",
-
- "SBL": "AUTOMATIC (SBL)",
- "PBL": "SEMIAUTOMATIC (PBL)",
-
- "modern": "MODERN",
- "semaphores": "SEMAPHORES",
- "mixed": "MIXED",
- "historical": "HISTORICAL",
- "free": "FREE",
- "occupied": "OCCUPIED",
- "sliders": {
- "min-lvl": "MIN. REQUIRED DISPATCHER LEVEL",
- "max-lvl": "MAX. REQUIRED DISPATCHER LEVEL",
- "routes-1t-cat": "MIN. CATENARY SINGLE TRACK ROUTES",
- "routes-1t-other": "MIN. OTHER SINGLE TRACK ROUTES",
- "routes-2t-cat": "MIN. CATENARY DOUBLE TRACK ROUTES",
- "routes-2t-other": "MIN. OTHER DOUBLE TRACK ROUTES"
- },
- "authors-search": "Search by author (other filters apply)",
- "minimum-hours-title": "SHOW ONLY SCENERIES UNTIL:",
- "now": "NOW",
- "hour": "h",
- "no-limit": "NO LIMIT",
- "include-selected": "INCLUDE SELECTED",
- "save": "REMEMBER FILTERS",
- "reset": "RESET FILTERS",
- "close": "CLOSE FILTERS"
- },
- "sceneries": {
- "station": "Station",
- "min-lvl": "Min. dispatcher\nlevel",
- "status": "Status",
- "dispatcher": "Dispatcher",
- "dispatcher-lvl": "Dispatcher\nlevel",
- "routes": "Routes\ndouble / single",
- "general": "General info",
- "user": "Drivers online",
- "spawn": "Spawns online",
- "timetableAll": "Active timetables",
- "timetableConfirmed": "Confirmed timetables",
- "timetableUnconfirmed": "Unconfirmed timetables",
- "no-stations": "No stations to show here!",
- "scenery-search": "Search for scenery..."
- },
- "trains": {
- "no-trains": "No trains to show here!",
- "loading": "Loading train data...",
- "offline": "Offline ride",
-
- "stats": "TRAFFIC STATISTICS",
- "stats-speed": "TRAINS SPEED (MIN, AVG, MAX) [km/h]",
- "stats-length": "TIMETABLES LENGTH (MIN, AVG, MAX) [km]",
- "stats-categories": "TIMETABLE CATEGORIES",
- "stats-special-twr": "HIGH RISK",
- "stats-special-skr": "EXCEEDED STRUCT. GAUGE",
- "stats-locos": "MOST COMMON UNITS",
-
- "current-scenery": "on scenery",
- "current-signal": "at signal",
- "current-track": "on track",
-
- "delayed": "Delayed: ",
- "preponed": "Ahead of schedule: ",
- "on-time": "On time",
-
- "route-progress": "Progress: ",
-
- "detailed-timetable": "Detailed timetable for train no. ",
- "via-title": "Via: ",
- "no-timetable": "no current timetable",
- "distance-exceeded": "Attention! Due to an internal error, timetables with route distance greater than 200km might be incorrect!",
- "cars": "Car count",
- "EZT": "EMU",
- "SZT": "DMU",
- "loco-electric": "Electric locomotive",
- "loco-diesel": "Diesel locomotive",
- "timetable-comments": "Exploitation comments available for this train",
- "comment": "Exploitation comments for: ",
- "table-limit": "For performance reasons there's a limit of 10 trains shown at the same time.",
-
- "last-seen-now": "since now",
- "last-seen-min": "since one minute",
- "last-seen-ago": "since {minutes} minutes",
-
- "scenery-offline": "Offline ride",
- "timeout": "An error occured while trying to refresh SWDR timetable data!"
- },
- "journal": {
- "title": "DISPATCHER HISTORY",
- "loading": "Loading dispatcher history data...",
- "no-history": "No dispatcher history found!",
- "data-refreshed-at": "Data refreshed at",
-
- "section-timetables": "TIMETABLES",
- "section-dispatchers": "DISPATCHERS",
-
- "no-further-data": "No further data for current parameters",
- "loading-further-data": "Loading...",
-
- "route-length": "Route length:",
- "station-count": "Stations:",
- "dispatcher-name": "Author",
- "timetable-day": "Timetable created at",
- "timetable-active": "ACTIVE",
- "timetable-fulfilled": "FULFILLED",
- "timetable-abandoned": "ABANDONED",
-
- "online-since": "ONLINE SINCE",
- "duty-lasted": "The duty lasted",
-
- "hours": "{value} hour | {value} hours",
- "minutes": "{value} min | {value} mins",
- "seconds": "{value} s",
-
- "stock-info": "EXTRA INFO",
- "stock-length": "Length",
- "stock-mass": "Mass",
- "stock-max-speed": "Max. speed",
-
- "load-data": "Load further data...",
-
- "last-seen-at": "Last seen at",
- "currently-at": "Currently at",
-
- "stats-title": "DRIVING STATISTICS OF",
-
- "stats-timetables": "TIMETABLES",
- "stats-longest-timetable": "LONGEST TIMETABLE",
- "stats-avg-timetable": "AVERAGE TIMETABLE LENGTH",
- "stats-distance": "DISTANCE",
- "stats-stations": "STATIONS",
-
- "timetable-stats-title": "Daily stats on {date}",
- "timetable-stats-total": "Issued timetables: {count} (total distance: {distance})",
- "timetable-stats-longest": "The longest timetable: #{id} (made by {author} for {driver}, distance: {distance})",
- "timetable-stats-most-active-dr": "The most active dispatcher: {dispatcher} (created {count})",
- "timetable-stats-most-active-dr-many": "The most active dispatchers: {dispatchers} (created {count} each)",
- "timetable-stats-most-active-driver": "The most active driver: {driver} (total driven distance: {distance})",
- "timetable-stats-longest-duties": "The longest service: {dispatcher} at {station} (duration: {duration})",
-
- "timetable-count": "timetable | timetables",
-
- "daily-stats-title": "DAILY STATS",
- "daily-stats-info": "Today's statistics are unavailable yet!",
-
- "driver-stats-title": "DRIVER STATS",
- "driver-stats-info": "Enter a proper nickname into filters [F] to see user's driving statistics!",
-
- "stats-loading": "Fetching statistics...",
- "stats-error": "Oops! An unexpected error occurred while trying to fetch statistics! :/",
-
- "timetable-location-signal": "signal:",
- "timetable-location-route": "route:",
-
- "history-name": "Scenery name",
- "history-hash": "Hash",
- "history-dispatcher": "Dispatcher",
- "history-level": "Level",
- "history-rate": "Rate",
- "history-region": "Region",
- "history-date": "Service date"
- },
- "scenery": {
- "users": "PLAYERS ONLINE",
- "spawns": "OPEN SPAWNS",
- "timetables": "ACTIVE TIMETABLES",
- "no-timetables": "No active timetables!",
- "offline": "Scenery is offline",
- "no-users": "NO ACTIVE PLAYERS",
- "no-spawns": "NO OPEN SPAWNS",
- "no-scenery": "Oops! This scenery doesn't exist!",
- "return-btn": "Return to main site",
- "history-btn": "View the dispatcher history",
- "info-btn": "Return to the scenery view",
- "authors-title": "Scenery author | Scenery authors",
- "abbrev": "Station symbol:",
- "lines-title": "Real lines",
- "project-title": "Project name",
- "one-way-routes": "One way routes",
- "two-way-routes": "Two way routes",
-
- "option-active-timetables": "Active timetables",
- "option-timetables-history": "Timetables history",
- "option-dispatchers-history": "Dispatchers history",
-
- "timetable-author-title": "Issued by",
- "timetable-author-unknown": "Author unknown",
-
- "timetables-history-id": "ID",
- "timetables-history-number": "Number",
- "timetables-history-route": "Route",
- "timetables-history-driver": "Driver",
- "timetables-history-author": "TT author",
- "timetables-history-date": "Date",
-
- "dispatchers-history-hash": "Hash",
- "dispatchers-history-dispatcher": "Dispatcher",
- "dispatchers-history-level": "Level",
- "dispatchers-history-rate": "Rate",
- "dispatchers-history-date": "Service date",
-
- "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",
-
- "pragotron-link": "Timetable pallet board (beta)",
- "tablice-link": "Timetable summary board (by Thundo)",
-
- "bottom-info": "Show full history in the Journal tab"
- },
- "availability": {
- "title": "Availability",
- "default": "in-game",
- "nonDefault": "additional",
- "unavailable": "unavailable",
- "nonPublic": "private",
- "abandoned": "abandoned"
- },
- "timetables": {
- "timetable-only": "Switch to timetable-only view",
- "end": "Timetable terminates here",
- "terminated": "Timetable terminated",
- "begins": "BEGINS HERE",
- "terminates": "TERMINATES\nHERE",
-
- "from": "FROM",
- "to": "TO",
-
- "desc-arriving": "The train is not here yet. It's going to come from: {prevStationName} (szlak {prevDepartureLine})",
- "desc-online": "The train is at the station. It's going to leave to: {nextStationName} (szlak {nextArrivalLine})",
- "desc-stopped": "The train is at the station and is stopped. It's going to leave towards: {nextStationName} (szlak {nextArrivalLine})",
- "desc-next-arrival": "Leaves towards: {nextStationName} (szlak {nextArrivalLine})",
- "desc-departed": "The train is at the station and it's been departed. Leaves towards: {nextStationName} (szlak {nextArrivalLine})",
- "desc-departed-away": "The train has been departed to: {nextStationName} (szlak {nextArrivalLine})",
- "desc-end": "The train terminates here",
- "desc-terminated": "The train has been terminated"
- },
- "history": {
- "title": "TIMETABLE JOURNAL",
- "search-train": "Train no.",
- "search-driver": "Driver name"
- }
-}
+{
+ "general": {
+ "and": " and ",
+ "refresh": "REFRESH",
+ "TWR": "High risk freight train",
+ "SKR": "Train with exceeded gauge"
+ },
+ "app": {
+ "sceneries": "SCENERIES",
+ "trains": "TRAINS",
+ "journal": "JOURNAL",
+ "loading": "Loading data...",
+ "support": "Support the project",
+ "error": "An error occured while loading data!",
+ "no-result": "No results for current search!",
+ "migration-warning": "Stacjownik services will be unavailable 2/06/2022 between 1-3am (CEST time) due to the migration of API hostings!",
+ "migration-confirm": "Roger that!",
+ "offline": "App is in the offline mode!"
+ },
+ "footer": {
+ "discord": "Stacjownik Discord server"
+ },
+ "update": {
+ "title": "New version of the app is available!",
+ "paragraph1": "Enjoy the application and may the green signal be with you!",
+ "release-link": "Click here to browse version changelog (GitHub)",
+ "confirm-button": "UPDATE NOW",
+ "later-button": "LATER"
+ },
+ "data-status": {
+ "S1-offline": "S1 signal
The app is working in offline mode!",
+ "S1a-connection": "S1a signal
Cannot connect with Stacjownik API service!",
+ "S1a-sceneries": "S1a signal
Cannot load online stations data!",
+ "S2": "S2 signal
All data loaded successfully!",
+ "S3": "S3 signal
Loading data...",
+ "S5-timetables": "S5 signal
Timetables might be incorrect or missing!",
+ "S5-dispatchers": "S5 signal
Cannot load dispatchers status data!",
+ "S5-trains": "S5 signal
Cannot load online trains data!"
+ },
+ "desc": {
+ "control-type": "Control type: ",
+ "signals-type": "Signals type: ",
+ "SBL": "This scenery has automatic block signalling (ABS/SBL) system on following routes: ",
+ "SUP": "Requires the SUP application (level crossing remote control simulator)",
+ "TWB-all": "This scenery has two-way route blockade on all routes",
+ "TWB-routes": "This scenery has two-way route blockade on following routes: ",
+ "default": "This scenery is available by default",
+ "non-public": "This scenery is not public",
+ "unknown": "This scenery isn't recognizable right now",
+ "unavailable": "This scenery is unavailable",
+ "abandoned": "This scenery is no longer supported by its creators",
+ "real": "Scenery with real lines: "
+ },
+ "signals": {
+ "title": "Signal type",
+ "współczesna": "modern",
+ "mieszana": "mixed",
+ "kształtowa": "mechanical",
+ "historyczna": "historical"
+ },
+ "controls": {
+ "title": "Control type",
+ "SPK": "SPK",
+ "SCS": "SCS",
+ "SCS-SPK": "SCS/SPK",
+ "SPE": "SPE",
+ "ręczne": "manual",
+ "ręczne+SPK": "manual + SPK",
+ "ręczne+SCS": "manual + SCS",
+ "mechaniczne": "levers (mechanical)",
+ "mechaniczne+SPK": "levers + SPK",
+ "mechaniczne+SCS": "levers + SCS"
+ },
+ "status": {
+ "online": "UNTIL ",
+ "free": "FREE",
+ "ending": "ENDS SOON",
+ "not-signed": "NOT SIGNED IN",
+ "no-limit": "NO LIMIT",
+ "unavailable": "UNAVAILABLE",
+ "brb": "AFK",
+ "no-space": "NO SPACE",
+ "unknown": "UNKNOWN"
+ },
+ "options": {
+ "filters": "FILTERS",
+ "donate": "DONATE",
+
+ "search-button": "Search",
+ "reset-button": "Reset",
+
+ "sort-title": "SORT BY:",
+ "filter-title": "FILTER BY:",
+ "search-title": "SEARCH:",
+
+ "search-train-no": "Train no. / #",
+ "search-train": "Train no.",
+ "search-driver": "Driver name",
+ "search-dispatcher": "Dispatcher name",
+ "search-station": "Scenery name",
+ "search-author": "Timetable author name",
+ "search-issuedFrom": "Origin scenery name",
+ "search-timetables-date": "Timetable date (UTC+2 / CEST)",
+ "search-dispatchers-date": "Service date (UTC+2 / CEST)",
+ "search-date": "Date (UTC+2 / CEST)",
+
+ "sort-mass": "mass",
+ "sort-speed": "speed",
+ "sort-length": "length",
+ "sort-routeDistance": "route distance",
+ "sort-timetable": "train no.",
+ "sort-progress": "route progress",
+ "sort-delay": "current delay",
+ "sort-id": "timetable id",
+
+ "sort-allStopsCount": "total stops",
+ "sort-beginDate": "date",
+ "sort-timetableId": "timetable ID",
+ "sort-timestampFrom": "date",
+ "sort-duration": "duration",
+
+ "filter-noComments": "NO COMMENTS",
+ "filter-withComments": "COMMENTS",
+ "filter-twr": "HIGH RISK CARGO",
+ "filter-skr": "EXCEEDED GAUGE",
+ "filter-twr-skr": "ALL TYPES",
+ "filter-common": "NO WARNINGS",
+ "filter-passenger": "PASSENGER",
+ "filter-freight": "FREIGHT",
+ "filter-other": "OTHER",
+ "filter-noTimetable": "NO TIMETABLE",
+ "filter-withTimetable": "TIMETABLE",
+
+ "filter-reset": "RESET FILTERS",
+ "filter-clear": "CLEAR FILTERS",
+
+ "filter-section-timetable-status": "TIMETABLE STATUS",
+ "filter-section-twrskr": "WARNINGS",
+
+ "filter-all": "ALL ENTRIES",
+ "filter-abandoned": "ABANDONED",
+ "filter-fulfilled": "FULFILLED",
+ "filter-active": "ACTIVE"
+ },
+ "filters": {
+ "desc": " • Left mouse click: select / unselect chosen filter
• Double left click: unselect all filters but chosen from a group
• RESET: reset all filters from a group",
+
+ "sections": {
+ "quick": "QUICK FILTERS",
+ "reality": "SCENERY REALITY",
+ "package-access": "IN-GAME AVAILABILITY",
+ "access": "GENERAL AVAILABILITY",
+ "control": "CONTROLS",
+ "signals": "SIGNALLING",
+ "addons": "ADDITIONAL PROGRAMS",
+ "blockades": "BLOCK SIGNALLING",
+ "status": "ONLINE STATUS"
+ },
+
+ "all-available": "ALL AVAILABLE",
+ "all-free": "CURRENTLY FREE",
+
+ "endingStatus": "ENDS SOON",
+ "afkStatus": "AFK",
+ "noSpaceStatus": "NO SPACE",
+ "unavailableStatus": "UNAVAILABLE",
+
+ "title": "STATION FILTERS",
+ "default": "IN-GAME",
+ "not-default": "ADDITIONAL",
+ "real": "REAL",
+ "fictional": "FICTIONAL",
+ "unavailable": "UNSUPPORTED",
+ "non-public": "NON-PUBLIC",
+ "abandoned": "ABANDONED",
+
+ "SPK": "SPK",
+ "SPK-R": "SPK + MANUAL",
+ "SPK-M": "SPK + MECH.",
+ "SCS": "SCS",
+ "SCS-R": "SCS + MANUAL",
+ "SCS-M": "SCS + MECH.",
+ "SPE": "SPE",
+
+ "manual": "MANUAL",
+ "mechanical": "MECHANICAL",
+
+ "SUP": "SUP (RASP-UZK)",
+ "noSUP": "WITHOUT SUP",
+
+ "SBL": "AUTOMATIC (SBL)",
+ "PBL": "SEMIAUTOMATIC (PBL)",
+
+ "modern": "MODERN",
+ "semaphores": "SEMAPHORES",
+ "mixed": "MIXED",
+ "historical": "HISTORICAL",
+ "free": "FREE",
+ "occupied": "OCCUPIED",
+ "sliders": {
+ "min-lvl": "MIN. REQUIRED DISPATCHER LEVEL",
+ "max-lvl": "MAX. REQUIRED DISPATCHER LEVEL",
+ "routes-1t-cat": "MIN. CATENARY SINGLE TRACK ROUTES",
+ "routes-1t-other": "MIN. OTHER SINGLE TRACK ROUTES",
+ "routes-2t-cat": "MIN. CATENARY DOUBLE TRACK ROUTES",
+ "routes-2t-other": "MIN. OTHER DOUBLE TRACK ROUTES"
+ },
+ "authors-search": "Search by author (other filters apply)",
+ "minimum-hours-title": "SHOW ONLY SCENERIES UNTIL:",
+ "now": "NOW",
+ "hour": "h",
+ "no-limit": "NO LIMIT",
+ "include-selected": "INCLUDE SELECTED",
+ "save": "REMEMBER FILTERS",
+ "reset": "RESET FILTERS",
+ "close": "CLOSE FILTERS"
+ },
+ "sceneries": {
+ "station": "Station",
+ "min-lvl": "Min. dispatcher\nlevel",
+ "status": "Status",
+ "dispatcher": "Dispatcher",
+ "dispatcher-lvl": "Dispatcher\nlevel",
+ "routes": "Routes\ndouble / single",
+ "general": "General info",
+ "user": "Drivers online",
+ "spawn": "Spawns online",
+ "timetableAll": "Active timetables",
+ "timetableConfirmed": "Confirmed timetables",
+ "timetableUnconfirmed": "Unconfirmed timetables",
+ "no-stations": "No stations to show here!",
+ "scenery-search": "Search for scenery..."
+ },
+ "trains": {
+ "no-trains": "No trains to show here!",
+ "loading": "Loading train data...",
+ "offline": "Offline ride",
+
+ "stats": "TRAFFIC STATISTICS",
+ "stats-speed": "TRAINS SPEED (MIN, AVG, MAX) [km/h]",
+ "stats-length": "TIMETABLES LENGTH (MIN, AVG, MAX) [km]",
+ "stats-categories": "TIMETABLE CATEGORIES",
+ "stats-special-twr": "HIGH RISK",
+ "stats-special-skr": "EXCEEDED STRUCT. GAUGE",
+ "stats-locos": "MOST COMMON UNITS",
+
+ "current-scenery": "on scenery",
+ "current-signal": "at signal",
+ "current-track": "on track",
+
+ "delayed": "Delayed: ",
+ "preponed": "Ahead of schedule: ",
+ "on-time": "On time",
+
+ "route-progress": "Progress: ",
+
+ "detailed-timetable": "Detailed timetable for train no. ",
+ "via-title": "Via: ",
+ "no-timetable": "no current timetable",
+ "distance-exceeded": "Attention! Due to an internal error, timetables with route distance greater than 200km might be incorrect!",
+ "cars": "Car count",
+ "EZT": "EMU",
+ "SZT": "DMU",
+ "loco-electric": "Electric locomotive",
+ "loco-diesel": "Diesel locomotive",
+ "timetable-comments": "Exploitation comments available for this train",
+ "comment": "Exploitation comments for: ",
+ "table-limit": "For performance reasons there's a limit of 10 trains shown at the same time.",
+
+ "last-seen-now": "since now",
+ "last-seen-min": "since one minute",
+ "last-seen-ago": "since {minutes} minutes",
+
+ "scenery-offline": "Offline ride",
+ "timeout": "An error occured while trying to refresh SWDR timetable data!"
+ },
+ "journal": {
+ "title": "DISPATCHER HISTORY",
+ "loading": "Loading dispatcher history data...",
+ "no-history": "No dispatcher history found!",
+ "data-refreshed-at": "Data refreshed at",
+
+ "section-timetables": "TIMETABLES",
+ "section-dispatchers": "DISPATCHERS",
+
+ "no-further-data": "No further data for current parameters",
+ "loading-further-data": "Loading...",
+
+ "route-length": "Route length:",
+ "station-count": "Stations:",
+ "dispatcher-name": "Author",
+ "timetable-day": "Timetable created at",
+ "timetable-active": "ACTIVE",
+ "timetable-fulfilled": "FULFILLED",
+ "timetable-abandoned": "ABANDONED",
+
+ "online-since": "ONLINE SINCE",
+ "duty-lasted": "The duty lasted",
+
+ "hours": "{value} hour | {value} hours",
+ "minutes": "{value} min | {value} mins",
+ "seconds": "{value} s",
+
+ "stock-info": "EXTRA INFO",
+ "stock-length": "Length",
+ "stock-mass": "Mass",
+ "stock-max-speed": "Max. speed",
+
+ "load-data": "Load further data...",
+
+ "last-seen-at": "Last seen at",
+ "currently-at": "Currently at",
+
+ "stats-title": "DRIVING STATISTICS OF",
+
+ "stats-timetables": "TIMETABLES",
+ "stats-longest-timetable": "LONGEST TIMETABLE",
+ "stats-avg-timetable": "AVERAGE TIMETABLE LENGTH",
+ "stats-distance": "DISTANCE",
+ "stats-stations": "STATIONS",
+
+ "timetable-stats-title": "Daily stats on {date}",
+ "timetable-stats-total": "Issued timetables: {count} (total distance: {distance})",
+ "timetable-stats-longest": "The longest timetable: #{id} (made by {author} for {driver}, distance: {distance})",
+ "timetable-stats-most-active-dr": "The most active dispatcher: {dispatcher} (created {count})",
+ "timetable-stats-most-active-dr-many": "The most active dispatchers: {dispatchers} (created {count} each)",
+ "timetable-stats-most-active-driver": "The most active driver: {driver} (total driven distance: {distance})",
+ "timetable-stats-longest-duties": "The longest service: {dispatcher} at {station} (duration: {duration})",
+
+ "timetable-count": "timetable | timetables",
+
+ "daily-stats-title": "DAILY STATS",
+ "daily-stats-info": "Today's statistics are unavailable yet!",
+
+ "driver-stats-title": "DRIVER STATS",
+ "driver-stats-info": "Enter a proper nickname into filters [F] to see user's driving statistics!",
+
+ "stats-loading": "Fetching statistics...",
+ "stats-error": "Oops! An unexpected error occurred while trying to fetch statistics! :/",
+
+ "timetable-location-signal": "signal:",
+ "timetable-location-route": "route:",
+
+ "history-name": "Scenery name",
+ "history-hash": "Hash",
+ "history-dispatcher": "Dispatcher",
+ "history-level": "Level",
+ "history-rate": "Rate",
+ "history-region": "Region",
+ "history-date": "Service date"
+ },
+ "scenery": {
+ "users": "PLAYERS ONLINE",
+ "spawns": "OPEN SPAWNS",
+ "timetables": "ACTIVE TIMETABLES",
+ "no-timetables": "No active timetables!",
+ "offline": "Scenery is offline",
+ "no-users": "NO ACTIVE PLAYERS",
+ "no-spawns": "NO OPEN SPAWNS",
+ "no-scenery": "Oops! This scenery doesn't exist!",
+ "return-btn": "Return to main site",
+ "history-btn": "View the dispatcher history",
+ "info-btn": "Return to the scenery view",
+ "authors-title": "Scenery author | Scenery authors",
+ "abbrev": "Station symbol:",
+ "lines-title": "Real lines",
+ "project-title": "Project name",
+ "one-way-routes": "One way routes",
+ "two-way-routes": "Two way routes",
+
+ "option-active-timetables": "Active timetables",
+ "option-timetables-history": "Timetables history",
+ "option-dispatchers-history": "Dispatchers history",
+
+ "timetable-author-title": "Issued by",
+ "timetable-author-unknown": "Author unknown",
+
+ "timetables-history-id": "ID",
+ "timetables-history-number": "Number",
+ "timetables-history-route": "Route",
+ "timetables-history-driver": "Driver",
+ "timetables-history-author": "TT author",
+ "timetables-history-date": "Date",
+
+ "dispatchers-history-hash": "Hash",
+ "dispatchers-history-dispatcher": "Dispatcher",
+ "dispatchers-history-level": "Level",
+ "dispatchers-history-rate": "Rate",
+ "dispatchers-history-date": "Service date",
+
+ "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",
+
+ "pragotron-link": "Timetable pallet board (beta)",
+ "tablice-link": "Timetable summary board (by Thundo)",
+
+ "bottom-info": "Show full history in the Journal tab"
+ },
+ "availability": {
+ "title": "Availability",
+ "default": "in-game",
+ "nonDefault": "additional",
+ "unavailable": "unavailable",
+ "nonPublic": "private",
+ "abandoned": "abandoned"
+ },
+ "timetables": {
+ "timetable-only": "Switch to timetable-only view",
+ "end": "Timetable terminates here",
+ "terminated": "Timetable terminated",
+ "begins": "BEGINS HERE",
+ "terminates": "TERMINATES\nHERE",
+
+ "from": "FROM",
+ "to": "TO",
+
+ "desc-arriving": "The train is not here yet. It's going to come from: {prevStationName} (szlak {prevDepartureLine})",
+ "desc-online": "The train is at the station. It's going to leave to: {nextStationName} (szlak {nextArrivalLine})",
+ "desc-stopped": "The train is at the station and is stopped. It's going to leave towards: {nextStationName} (szlak {nextArrivalLine})",
+ "desc-next-arrival": "Leaves towards: {nextStationName} (szlak {nextArrivalLine})",
+ "desc-departed": "The train is at the station and it's been departed. Leaves towards: {nextStationName} (szlak {nextArrivalLine})",
+ "desc-departed-away": "The train has been departed to: {nextStationName} (szlak {nextArrivalLine})",
+ "desc-end": "The train terminates here",
+ "desc-terminated": "The train has been terminated"
+ },
+ "history": {
+ "title": "TIMETABLE JOURNAL",
+ "search-train": "Train no.",
+ "search-driver": "Driver name"
+ }
+}
diff --git a/src/locales/pl-old.json b/src/locales/pl-old.json
new file mode 100644
index 0000000..42868ac
--- /dev/null
+++ b/src/locales/pl-old.json
@@ -0,0 +1,434 @@
+{
+ "general": {
+ "and": " oraz ",
+ "refresh": "ODŚWIEŻ",
+ "TWR": "Towar niebezpieczny wysokiego ryzyka",
+ "SKR": "Przekroczona skrajnia"
+ },
+ "app": {
+ "sceneries": "SCENERIE",
+ "trains": "POCIĄGI",
+ "journal": "DZIENNIK",
+ "loading": "Pobieranie danych...",
+ "support": "Wspomóż projekt",
+ "error": "Wystąpił problem z załadowaniem danych!",
+ "no-result": "Brak wyników o podanych kryteriach!",
+ "migration-warning": "Usługi Stacjownika będą niedostępne w godzinach 1:00-3:00 2 czerwca 2022r. z powodu migracji hostingów API!",
+ "migration-confirm": "Przyjąłem!",
+ "offline": "Aplikacja w trybie offline!"
+ },
+ "footer": {
+ "discord": "Serwer Discord Stacjownika"
+ },
+ "update": {
+ "title": "Nowa wersja Stacjownika jest dostępna!",
+ "paragraph1": "Miłego korzystania z aplikacji i niech S2 będzie z wami!",
+ "release-link": "Kliknij, aby przejrzeć listę zmian (GitHub)",
+ "confirm-button": "ZAKTUALIZUJ",
+ "later-button": "PÓŹNIEJ"
+ },
+ "data-status": {
+ "S1-offline": "Sygnał S1
Aplikacja działa w trybie offline!",
+ "S1a-connection": "Sygnał S1a
Błąd podczas próby połączenia się z API Stacjownika!",
+ "S1a-sceneries": "Sygnał S1a
Błąd podczas pobierania danych o sceneriach online!",
+ "S2": "Sygnał S2
Pomyślnie załadowano dane!",
+ "S3": "Sygnał S3
Pobieranie danych...",
+ "S5-timetables": "Sygnał S5
Rozkłady jazdy mogą być niekompletne!",
+ "S5-dispatchers": "Sygnał S5
Błąd podczas pobierania danych o statusach dyżurnych ruchu!",
+ "S5-trains": "Sygnał S5
Błąd podczas pobierania danych o pociągach online!"
+ },
+ "desc": {
+ "control-type": "Sterowanie: ",
+ "signals-type": "Sygnalizacja: ",
+ "SBL": "Sceneria posiada SBL na szlakach: ",
+ "SUP": "Wymaga programu SUP do kontroli systemu RASP-UZK",
+ "TWB-all": "Sceneria posiada blokadę dwukierunkową na wszystkich szlakach",
+ "TWB-routes": "Sceneria posiada blokadę dwukierunkową na szlakach: ",
+ "default": "Sceneria dostępna domyślnie w paczce z grą",
+ "non-public": "Sceneria niepubliczna",
+ "unavailable": "Sceneria niedostępna",
+ "unknown": "Nieznana sceneria",
+ "real": "Sceneria z realnymi liniami kolejowymi: ",
+ "abandoned": "Sceneria wycofana z rozgrywki"
+ },
+ "signals": {
+ "title": "Sygnalizacja",
+ "współczesna": "współczesna",
+ "mieszana": "mieszana",
+ "kształtowa": "kształtowa",
+ "historyczna": "historyczna"
+ },
+ "controls": {
+ "title": "Sterowanie",
+ "SPK": "SPK",
+ "SCS": "SCS",
+ "SCS-SPK": "SCS/SPK",
+ "SPE": "SPE",
+ "ręczne": "ręczne",
+ "ręczne+SPK": "ręczne z SPK",
+ "ręczne+SCS": "ręczne z SCS",
+ "mechaniczne": "mechaniczne",
+ "mechaniczne+SPK": "mechaniczne z SPK",
+ "mechaniczne+SCS": "mechaniczne z SCS"
+ },
+ "status": {
+ "online": "DO ",
+ "free": "WOLNA",
+ "ending": "KOŃCZY",
+ "not-signed": "NIEZALOGOWANY",
+ "no-limit": "BEZ LIMITU",
+ "unavailable": "NIEDOSTĘPNY",
+ "brb": "Z/W",
+ "no-space": "BRAK MIEJSCA",
+ "unknown": "NIEZNANY"
+ },
+ "options": {
+ "filters": "FILTRY",
+ "donate": "WESPRZYJ",
+
+ "search-button": "Szukaj",
+ "reset-button": "Zresetuj",
+
+ "sort-title": "SORTUJ WG:",
+ "filter-title": "FILTRUJ WG:",
+ "search-title": "SZUKAJ:",
+
+ "search-train-no": "Nr pociągu",
+ "search-train": "Nr pociągu / #",
+ "search-driver": "Nick maszynisty",
+ "search-dispatcher": "Nick dyżurnego",
+ "search-station": "Nazwa scenerii",
+ "search-author": "Nick autora rozkładu jazdy",
+ "search-issuedFrom": "Sceneria początkowa",
+ "search-timetables-date": "Data rozkładu jazdy (UTC+2 / CEST)",
+ "search-dispatchers-date": "Data służby (UTC+2 / CEST)",
+ "search-date": "Data (UTC+2 / CEST)",
+
+ "sort-routeDistance": "kilometraż",
+ "sort-allStopsCount": "stacje",
+ "sort-beginDate": "data",
+ "sort-timetableId": "ID rozkładu",
+ "sort-timestampFrom": "data",
+ "sort-duration": "czas dyżuru",
+ "sort-id": "id rozkładu",
+
+ "sort-mass": "masa",
+ "sort-speed": "prędkość",
+ "sort-length": "długość",
+ "sort-timetable": "nr pociągu",
+ "sort-progress": "przebyta trasa",
+ "sort-delay": "opóźnienie",
+ "sort-comments": "uwagi ekspl.",
+
+ "filter-withComments": "UWAGI EKSPLOATACYJNE",
+ "filter-noComments": "BEZ UWAG",
+ "filter-twr": "WYS. RYZYKA",
+ "filter-skr": "SKRAJNIA",
+ "filter-twr-skr": "WSZYSTKIE",
+ "filter-common": "ZWYKŁE",
+ "filter-passenger": "PASAŻERSKIE",
+ "filter-freight": "TOWAROWE",
+ "filter-other": "INNE",
+ "filter-noTimetable": "BEZ RJ",
+ "filter-withTimetable": "ROZKŁAD JAZDY",
+
+ "filter-reset": "ZRESETUJ FILTRY",
+ "filter-clear": "WYŁĄCZ FILTRY",
+
+ "filter-section-timetable-status": "STATUS ROZKŁADU JAZDY",
+ "filter-section-twrskr": "UWAGI",
+
+ "filter-all": "WSZYSTKIE",
+ "filter-abandoned": "PORZUCONE",
+ "filter-fulfilled": "WYPEŁNIONE",
+ "filter-active": "AKTYWNE"
+ },
+ "filters": {
+ "desc": " • Kliknięcie: zaznaczenie / odznaczenie filtru
• Podwójne kliknięcie: odznaczenie reszty filtrów z grupy
• RESET: zresetowanie filtrów z grupy",
+
+ "sections": {
+ "quick": "SZYBKIE FILTRY",
+ "reality": "FIKCYJNOŚĆ SCENERII",
+ "package-access": "DOSTĘPNOŚĆ W PACZCE",
+ "access": "DOSTĘPNOŚĆ OGÓLNA",
+ "control": "TYP STEROWANIA",
+ "signals": "TYP SYGNALIZACJI",
+ "addons": "DODATKOWE PROGRAMY",
+ "blockades": "BLOKADY LINIOWE",
+ "status": "STATUS ONLINE"
+ },
+
+ "all-available": "WSZYSTKIE DOSTĘPNE",
+ "all-free": "WSZYSTKIE WOLNE",
+
+ "endingStatus": "KOŃCZY",
+ "afkStatus": "Z/W",
+ "noSpaceStatus": "BRAK MIEJSCA",
+ "unavailableStatus": "NIEDOSTĘPNY",
+
+ "title": "FILTRUJ STACJE",
+ "default": "DOMYŚLNA",
+ "not-default": "POZA PACZKĄ",
+ "real": "REALNA",
+ "fictional": "FIKCYJNA",
+ "unavailable": "NIEDOSTĘPNA",
+ "non-public": "NIEPUBLICZNA",
+ "abandoned": "WYCOFANA",
+
+ "SPK": "SPK",
+ "SPK-R": "SPK + RĘCZNE",
+ "SPK-M": "SPK + MECH.",
+ "SCS": "SCS",
+ "SCS-R": "SCS + RĘCZNE",
+ "SCS-M": "SCS + MECH.",
+ "SPE": "SPE",
+ "manual": "RĘCZNE",
+
+ "SUP": "SUP (RASP-UZK)",
+ "noSUP": "BEZ SUP",
+
+ "SBL": "SAMOCZYNNA",
+ "PBL": "PÓŁSAMOCZYNNA",
+
+ "mechanical": "MECHANICZNE",
+ "modern": "WSPÓŁCZESNA",
+ "semaphores": "KSZTAŁTOWA",
+ "mixed": "MIESZANA",
+ "historical": "HISTORYCZNA",
+
+ "free": "WOLNA",
+ "occupied": "ZAJĘTA",
+
+ "sliders": {
+ "min-lvl": "MIN. WYMAGANY POZIOM DYŻURNEGO",
+ "max-lvl": "MAKS. WYMAGANY POZIOM DYŻURNEGO",
+ "routes-1t-cat": "SZLAKI JEDNOTOROWE ZELEKTR. (MINIMUM)",
+ "routes-1t-other": "SZLAKI JEDNOTOROWE NIEZELEKTR. (MINIMUM)",
+ "routes-2t-cat": "SZLAKI DWUTOROWE ZELEKTR. (MINIMUM)",
+ "routes-2t-other": "SZLAKI DWUTOROWE NIEZELEKTR. (MINIMUM)"
+ },
+
+ "authors-search": "Szukaj autora (uwzględnia inne filtry)",
+ "minimum-hours-title": "POKAŻ TYLKO SCENERIE DOSTĘPNE MINIMUM DO:",
+ "now": "TERAZ",
+ "hour": " godz.",
+ "no-limit": "BEZ LIMITU",
+ "include-selected": "POKAŻ ZAZNACZONE",
+ "save": "ZAPAMIĘTAJ FILTRY",
+ "reset": "RESETUJ FILTRY",
+ "close": "ZAMKNIJ FILTRY"
+ },
+ "sceneries": {
+ "station": "Stacja",
+ "abbr": "Skrót\nposterunku",
+ "min-lvl": "Min. poziom\ndyżurnego",
+ "status": "Status",
+ "dispatcher": "Dyżurny",
+ "dispatcher-lvl": "Poziom\ndyżurnego",
+ "routes": "Szlaki\n2tor / 1tor",
+ "general": "Informacje\nogólne",
+ "user": "Maszyniści online",
+ "spawn": "Otwarte spawny",
+ "timetableAll": "Aktywne rozkłady jazdy",
+ "timetableConfirmed": "Zatwierdzone rozkłady jazdy",
+ "timetableUnconfirmed": "Niezatwierdzone rozkłady jazdy",
+ "no-stations": "Brak stacji do wyświetlenia!",
+ "scenery-search": "Wyszukaj scenerię..."
+ },
+ "trains": {
+ "no-trains": "Brak pociągów do wyświetlenia!",
+ "loading": "Pobieranie danych o pociągach...",
+ "offline": "Przejazd offline",
+
+ "stats": "STATYSTYKI RUCHU",
+ "stats-speed": "PRĘDKOŚCI POCIĄGÓW (MIN, ŚR, MAX) [km/h]",
+ "stats-length": "DŁUGOŚCI ROZKŁADÓW (MIN, ŚR, MAX) [km]",
+ "stats-categories": "KATEGORIE RJ",
+ "stats-special-twr": "WYSOKIEGO RYZYKA",
+ "stats-special-skr": "PRZEKROCZONA SKRAJNIA",
+ "stats-locos": "NAJCZĘSTSZE JEDNOSTKI",
+
+ "current-scenery": "na scenerii",
+ "current-signal": "przy semaforze",
+ "current-track": "na szlaku",
+
+ "delayed": "Opóźniony: ",
+ "preponed": "Przed czasem: ",
+ "on-time": "Planowo",
+
+ "route-progress": "Postęp: ",
+
+ "detailed-timetable": "Szczegółowy rozkład jazdy pociągu ",
+ "via-title": "Przez: ",
+ "no-timetable": "brak rozkładu jazdy",
+ "distance-exceeded": "Uwaga! Z powodu wewnętrznego błędu serwera TD2, rozkłady jazdy o kilometrażu powyżej 200km mogą być niepoprawne!",
+ "cars": "Wagony",
+ "EZT": "EZT",
+ "SZT": "SZT",
+ "loco-electric": "Elektrowóz",
+ "loco-diesel": "Spalinowóz",
+ "timetable-comments": "Pociąg z uwagami eksploatacyjnymi",
+ "comment": "Uwagi eksploatacyjne dla: ",
+ "table-limit": "Dla płynności działania strony pokazanych jest tylko 10 pociągów zgodnie z wybranymi filtrami.",
+
+ "last-seen-now": "od niedawna",
+ "last-seen-min": "od minuty",
+ "last-seen-ago": "od {minutes} minut",
+
+ "scenery-offline": "Przejazd offline",
+
+ "timeout": "Wystąpił problem z aktualizacją rozkładów jazdy z SWDR"
+ },
+ "journal": {
+ "title": "HISTORIA DYŻURÓW",
+ "loading": "Ładowanie historii dyżurów...",
+ "no-history": "Brak historii dyżurów dla tej scenerii!",
+ "data-refreshed-at": "Dane odświeżone o",
+
+ "section-timetables": "ROZKŁADY JAZDY",
+ "section-dispatchers": "DYŻURNI",
+
+ "no-further-data": "Brak dalszych wyników dla podanych parametrów",
+ "loading-further-data": "Ładowanie...",
+
+ "online-since": "ONLINE OD",
+ "duty-lasted": "Dyżur trwał",
+ "hours": "{value} godz.",
+ "minutes": "{value} min.",
+ "seconds": "{value} sek.",
+
+ "route-length": "Kilometraż:",
+ "station-count": "Stacje:",
+ "dispatcher-name": "Autor",
+ "timetable-day": "Rozkład z dnia",
+ "timetable-active": "AKTYWNY",
+ "timetable-fulfilled": "WYPEŁNIONY",
+ "timetable-abandoned": "PORZUCONY",
+
+ "stock-info": "DODATKOWE INFORMACJE",
+ "stock-length": "Długość",
+ "stock-mass": "Masa",
+ "stock-max-speed": "Prędkość maks.",
+
+ "load-data": "Pobierz dalszą historię...",
+
+ "stats-title": "STATYSTYKI MASZYNISTY",
+
+ "last-seen-at": "Ostatnio widziany na: ",
+ "currently-at": "Obecnie na scenerii: ",
+
+ "stats-timetables": "ROZKŁADY JAZDY",
+ "stats-longest-timetable": "NAJDŁUŻSZY RJ",
+ "stats-avg-timetable": "ŚREDNIA DŁUGOŚĆ RJ",
+ "stats-distance": "DYSTANS",
+ "stats-stations": "STACJE",
+
+ "timetable-stats-total": "Stworzone rozkłady jazdy: {count} (łączny dystans: {distance})",
+ "timetable-stats-longest": "Najdłuższy rozkład jazdy: #{id} (stworzony przez dyżurnego {author} dla maszynisty {driver} o dystansie {distance})",
+ "timetable-stats-most-active-dr": "Najaktywniejszy dyżurny: {dispatcher} (stworzył {count})",
+ "timetable-stats-most-active-dr-many": "Najaktywniejsi dyżurni: {dispatchers} (stworzyli po {count})",
+ "timetable-stats-most-active-driver": "Najaktywniejszy maszynista: {driver} (łączny przejechany dystans: {distance})",
+ "timetable-stats-longest-duties": "Najdłuższa służba: {dispatcher} na scenerii {station} (czas trwania: {duration})",
+
+ "timetable-count": "rozkład jazdy | rozkładów jazdy",
+
+ "daily-stats-title": "STATYSTYKI DNIA",
+ "daily-stats-info": "Dzisiejsze statystyki nie są jeszcze dostępne!",
+
+ "driver-stats-title": "STATYSTYKI GRACZA",
+ "driver-stats-info": "Wpisz nazwę użytkownika w filtrach [F], aby zobaczyć jego statystyki maszynisty!",
+
+ "stats-loading": "Pobieranie statystyk...",
+ "stats-error": "Ups! Wystąpił błąd podczas próby pobrania statystyk! :/",
+
+ "timetable-location-signal": "semafor:",
+ "timetable-location-route": "szlak:",
+
+ "history-name": "Sceneria",
+ "history-hash": "Hash",
+ "history-dispatcher": "Dyżurny",
+ "history-level": "Poziom",
+ "history-rate": "Ocena",
+ "history-region": "Region",
+ "history-date": "Data służby"
+ },
+ "scenery": {
+ "users": "GRACZE ONLINE",
+ "spawns": "OTWARTE SPAWNY",
+ "timetables": "AKTYWNE ROZKŁADY JAZDY",
+ "no-timetables": "Brak aktywnych rozkładów!",
+ "offline": "Sceneria jest offline",
+ "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ą",
+ "history-btn": "Przejdź do widoku historii dyżurnych ruchu",
+ "info-btn": "Wróć do widoku scenerii",
+ "authors-title": "Autor scenerii | Autorzy scenerii",
+ "abbrev": "Skrót posterunku:",
+ "lines-title": "Rzeczywiste linie",
+ "project-title": "Projekt",
+ "one-way-routes": "Szlaki jednotorowe",
+ "two-way-routes": "Szlaki dwutorowe",
+
+ "option-active-timetables": "Aktywne rozkłady jazdy",
+ "option-timetables-history": "Historia rozkładów",
+ "option-dispatchers-history": "Historia dyżurów",
+
+ "timetable-author-title": "Wydany przez",
+ "timetable-author-unknown": "Autor nieznany",
+
+ "timetables-history-id": "ID",
+ "timetables-history-number": "Numer",
+ "timetables-history-route": "Trasa",
+ "timetables-history-driver": "Maszynista",
+ "timetables-history-author": "Autor RJ",
+ "timetables-history-date": "Data",
+
+ "dispatchers-history-hash": "Hash",
+ "dispatchers-history-dispatcher": "Dyżurny",
+ "dispatchers-history-level": "Poziom",
+ "dispatchers-history-rate": "Ocena",
+ "dispatchers-history-date": "Data służby",
+
+ "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}",
+
+ "pragotron-link": "Paletowa tablica informacyjna (beta)",
+ "tablice-link": "Tablica informacyjna zbiorcza (autorstwa Thundo)",
+
+ "bottom-info": "Pokaż pełną historię w zakładce Dziennika"
+ },
+ "availability": {
+ "title": "Dostępność",
+ "default": "w paczce",
+ "nonDefault": "poza paczką",
+ "unavailable": "niedostępna",
+ "nonPublic": "niepubliczna",
+ "abandoned": "wycofana"
+ },
+ "timetables": {
+ "timetable-only": "Wyodrębnij rozkłady jazdy",
+ "end": "Koniec rozkładu jazdy",
+ "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. Przyjedzie z: {prevStationName} (szlak {prevDepartureLine})",
+ "desc-online": "Pociąg jest na tej scenerii. Odjedzie do: {nextStationName} (szlak {nextArrivalLine})",
+ "desc-stopped": "Pociąg jest na tej scenerii i odbywa postój. Odjedzie do: {nextStationName} (szlak {nextArrivalLine})",
+ "desc-next-arrival": "Odjeżdża do: {nextStationName} (szlak {nextArrivalLine})",
+ "desc-departed": "Pociąg jest na tej scenerii i został odprawiony. Odjeżdża do: {nextStationName} (szlak {nextArrivalLine})",
+ "desc-departed-away": "Pociąg został odprawiony i odjechał do: {nextStationName} (szlak {nextArrivalLine})",
+ "desc-end": "Pociąg kończy bieg",
+ "desc-terminated": "Pociąg skończył bieg"
+ },
+ "history": {
+ "title": "DZIENNIK ROZKŁADÓW JAZDY"
+ }
+}
diff --git a/src/locales/pl.json b/src/locales/pl.json
index 7aaf23b..c9d2e2d 100644
--- a/src/locales/pl.json
+++ b/src/locales/pl.json
@@ -1,434 +1,412 @@
-{
- "general": {
- "and": " oraz ",
- "refresh": "ODŚWIEŻ",
- "TWR": "Towar niebezpieczny wysokiego ryzyka",
- "SKR": "Przekroczona skrajnia"
- },
- "app": {
- "sceneries": "SCENERIE",
- "trains": "POCIĄGI",
- "journal": "DZIENNIK",
- "loading": "Pobieranie danych...",
- "support": "Wspomóż projekt",
- "error": "Wystąpił problem z załadowaniem danych!",
- "no-result": "Brak wyników o podanych kryteriach!",
- "migration-warning": "Usługi Stacjownika będą niedostępne w godzinach 1:00-3:00 2 czerwca 2022r. z powodu migracji hostingów API!",
- "migration-confirm": "Przyjąłem!",
- "offline": "Aplikacja w trybie offline!"
- },
- "footer": {
- "discord": "Serwer Discord Stacjownika"
- },
- "update": {
- "title": "Nowa wersja Stacjownika jest dostępna!",
- "paragraph1": "Miłego korzystania z aplikacji i niech S2 będzie z wami!",
- "release-link": "Kliknij, aby przejrzeć listę zmian (GitHub)",
- "confirm-button": "ZAKTUALIZUJ",
- "later-button": "PÓŹNIEJ"
- },
- "data-status": {
- "S1-offline": "Sygnał S1
Aplikacja działa w trybie offline!",
- "S1a-connection": "Sygnał S1a
Błąd podczas próby połączenia się z API Stacjownika!",
- "S1a-sceneries": "Sygnał S1a
Błąd podczas pobierania danych o sceneriach online!",
- "S2": "Sygnał S2
Pomyślnie załadowano dane!",
- "S3": "Sygnał S3
Pobieranie danych...",
- "S5-timetables": "Sygnał S5
Rozkłady jazdy mogą być niekompletne!",
- "S5-dispatchers": "Sygnał S5
Błąd podczas pobierania danych o statusach dyżurnych ruchu!",
- "S5-trains": "Sygnał S5
Błąd podczas pobierania danych o pociągach online!"
- },
- "desc": {
- "control-type": "Sterowanie: ",
- "signals-type": "Sygnalizacja: ",
- "SBL": "Sceneria posiada SBL na szlakach: ",
- "SUP": "Wymaga programu SUP do kontroli systemu RASP-UZK",
- "TWB-all": "Sceneria posiada blokadę dwukierunkową na wszystkich szlakach",
- "TWB-routes": "Sceneria posiada blokadę dwukierunkową na szlakach: ",
- "default": "Sceneria dostępna domyślnie w paczce z grą",
- "non-public": "Sceneria niepubliczna",
- "unavailable": "Sceneria niedostępna",
- "unknown": "Nieznana sceneria",
- "real": "Sceneria z realnymi liniami kolejowymi: ",
- "abandoned": "Sceneria wycofana z rozgrywki"
- },
- "signals": {
- "title": "Sygnalizacja",
- "współczesna": "współczesna",
- "mieszana": "mieszana",
- "kształtowa": "kształtowa",
- "historyczna": "historyczna"
- },
- "controls": {
- "title": "Sterowanie",
- "SPK": "SPK",
- "SCS": "SCS",
- "SCS-SPK": "SCS/SPK",
- "SPE": "SPE",
- "ręczne": "ręczne",
- "ręczne+SPK": "ręczne z SPK",
- "ręczne+SCS": "ręczne z SCS",
- "mechaniczne": "mechaniczne",
- "mechaniczne+SPK": "mechaniczne z SPK",
- "mechaniczne+SCS": "mechaniczne z SCS"
- },
- "status": {
- "online": "DO ",
- "free": "WOLNA",
- "ending": "KOŃCZY",
- "not-signed": "NIEZALOGOWANY",
- "no-limit": "BEZ LIMITU",
- "unavailable": "NIEDOSTĘPNY",
- "brb": "Z/W",
- "no-space": "BRAK MIEJSCA",
- "unknown": "NIEZNANY"
- },
- "options": {
- "filters": "FILTRY",
- "donate": "WESPRZYJ",
-
- "search-button": "Szukaj",
- "reset-button": "Zresetuj",
-
- "sort-title": "SORTUJ WG:",
- "filter-title": "FILTRUJ WG:",
- "search-title": "SZUKAJ:",
-
- "search-train-no": "Nr pociągu",
- "search-train": "Nr pociągu / #",
- "search-driver": "Nick maszynisty",
- "search-dispatcher": "Nick dyżurnego",
- "search-station": "Nazwa scenerii",
- "search-author": "Nick autora rozkładu jazdy",
- "search-issuedFrom": "Sceneria początkowa",
- "search-timetables-date": "Data rozkładu jazdy (UTC+2 / CEST)",
- "search-dispatchers-date": "Data służby (UTC+2 / CEST)",
- "search-date": "Data (UTC+2 / CEST)",
-
- "sort-routeDistance": "kilometraż",
- "sort-allStopsCount": "stacje",
- "sort-beginDate": "data",
- "sort-timetableId": "ID rozkładu",
- "sort-timestampFrom": "data",
- "sort-duration": "czas dyżuru",
- "sort-id": "id rozkładu",
-
- "sort-mass": "masa",
- "sort-speed": "prędkość",
- "sort-length": "długość",
- "sort-timetable": "nr pociągu",
- "sort-progress": "przebyta trasa",
- "sort-delay": "opóźnienie",
- "sort-comments": "uwagi ekspl.",
-
- "filter-withComments": "UWAGI EKSPLOATACYJNE",
- "filter-noComments": "BEZ UWAG",
- "filter-twr": "WYS. RYZYKA",
- "filter-skr": "SKRAJNIA",
- "filter-twr-skr": "WSZYSTKIE",
- "filter-common": "ZWYKŁE",
- "filter-passenger": "PASAŻERSKIE",
- "filter-freight": "TOWAROWE",
- "filter-other": "INNE",
- "filter-noTimetable": "BEZ RJ",
- "filter-withTimetable": "ROZKŁAD JAZDY",
-
- "filter-reset": "ZRESETUJ FILTRY",
- "filter-clear": "WYŁĄCZ FILTRY",
-
- "filter-section-timetable-status": "STATUS ROZKŁADU JAZDY",
- "filter-section-twrskr": "UWAGI",
-
- "filter-all": "WSZYSTKIE",
- "filter-abandoned": "PORZUCONE",
- "filter-fulfilled": "WYPEŁNIONE",
- "filter-active": "AKTYWNE"
- },
- "filters": {
- "desc": " • Kliknięcie: zaznaczenie / odznaczenie filtru
• Podwójne kliknięcie: odznaczenie reszty filtrów z grupy
• RESET: zresetowanie filtrów z grupy",
-
- "sections": {
- "quick": "SZYBKIE FILTRY",
- "reality": "FIKCYJNOŚĆ SCENERII",
- "package-access": "DOSTĘPNOŚĆ W PACZCE",
- "access": "DOSTĘPNOŚĆ OGÓLNA",
- "control": "TYP STEROWANIA",
- "signals": "TYP SYGNALIZACJI",
- "addons": "DODATKOWE PROGRAMY",
- "blockades": "BLOKADY LINIOWE",
- "status": "STATUS ONLINE"
- },
-
- "all-available": "WSZYSTKIE DOSTĘPNE",
- "all-free": "WSZYSTKIE WOLNE",
-
- "endingStatus": "KOŃCZY",
- "afkStatus": "Z/W",
- "noSpaceStatus": "BRAK MIEJSCA",
- "unavailableStatus": "NIEDOSTĘPNY",
-
- "title": "FILTRUJ STACJE",
- "default": "DOMYŚLNA",
- "not-default": "POZA PACZKĄ",
- "real": "REALNA",
- "fictional": "FIKCYJNA",
- "unavailable": "NIEDOSTĘPNA",
- "non-public": "NIEPUBLICZNA",
- "abandoned": "WYCOFANA",
-
- "SPK": "SPK",
- "SPK-R": "SPK + RĘCZNE",
- "SPK-M": "SPK + MECH.",
- "SCS": "SCS",
- "SCS-R": "SCS + RĘCZNE",
- "SCS-M": "SCS + MECH.",
- "SPE": "SPE",
- "manual": "RĘCZNE",
-
- "SUP": "SUP (RASP-UZK)",
- "noSUP": "BEZ SUP",
-
- "SBL": "SAMOCZYNNA",
- "PBL": "PÓŁSAMOCZYNNA",
-
- "mechanical": "MECHANICZNE",
- "modern": "WSPÓŁCZESNA",
- "semaphores": "KSZTAŁTOWA",
- "mixed": "MIESZANA",
- "historical": "HISTORYCZNA",
-
- "free": "WOLNA",
- "occupied": "ZAJĘTA",
-
- "sliders": {
- "min-lvl": "MIN. WYMAGANY POZIOM DYŻURNEGO",
- "max-lvl": "MAKS. WYMAGANY POZIOM DYŻURNEGO",
- "routes-1t-cat": "SZLAKI JEDNOTOROWE ZELEKTR. (MINIMUM)",
- "routes-1t-other": "SZLAKI JEDNOTOROWE NIEZELEKTR. (MINIMUM)",
- "routes-2t-cat": "SZLAKI DWUTOROWE ZELEKTR. (MINIMUM)",
- "routes-2t-other": "SZLAKI DWUTOROWE NIEZELEKTR. (MINIMUM)"
- },
-
- "authors-search": "Szukaj autora (uwzględnia inne filtry)",
- "minimum-hours-title": "POKAŻ TYLKO SCENERIE DOSTĘPNE MINIMUM DO:",
- "now": "TERAZ",
- "hour": " godz.",
- "no-limit": "BEZ LIMITU",
- "include-selected": "POKAŻ ZAZNACZONE",
- "save": "ZAPAMIĘTAJ FILTRY",
- "reset": "RESETUJ FILTRY",
- "close": "ZAMKNIJ FILTRY"
- },
- "sceneries": {
- "station": "Stacja",
- "abbr": "Skrót\nposterunku",
- "min-lvl": "Min. poziom\ndyżurnego",
- "status": "Status",
- "dispatcher": "Dyżurny",
- "dispatcher-lvl": "Poziom\ndyżurnego",
- "routes": "Szlaki\n2tor / 1tor",
- "general": "Informacje\nogólne",
- "user": "Maszyniści online",
- "spawn": "Otwarte spawny",
- "timetableAll": "Aktywne rozkłady jazdy",
- "timetableConfirmed": "Zatwierdzone rozkłady jazdy",
- "timetableUnconfirmed": "Niezatwierdzone rozkłady jazdy",
- "no-stations": "Brak stacji do wyświetlenia!",
- "scenery-search": "Wyszukaj scenerię..."
- },
- "trains": {
- "no-trains": "Brak pociągów do wyświetlenia!",
- "loading": "Pobieranie danych o pociągach...",
- "offline": "Przejazd offline",
-
- "stats": "STATYSTYKI RUCHU",
- "stats-speed": "PRĘDKOŚCI POCIĄGÓW (MIN, ŚR, MAX) [km/h]",
- "stats-length": "DŁUGOŚCI ROZKŁADÓW (MIN, ŚR, MAX) [km]",
- "stats-categories": "KATEGORIE RJ",
- "stats-special-twr": "WYSOKIEGO RYZYKA",
- "stats-special-skr": "PRZEKROCZONA SKRAJNIA",
- "stats-locos": "NAJCZĘSTSZE JEDNOSTKI",
-
- "current-scenery": "na scenerii",
- "current-signal": "przy semaforze",
- "current-track": "na szlaku",
-
- "delayed": "Opóźniony: ",
- "preponed": "Przed czasem: ",
- "on-time": "Planowo",
-
- "route-progress": "Postęp: ",
-
- "detailed-timetable": "Szczegółowy rozkład jazdy pociągu ",
- "via-title": "Przez: ",
- "no-timetable": "brak rozkładu jazdy",
- "distance-exceeded": "Uwaga! Z powodu wewnętrznego błędu serwera TD2, rozkłady jazdy o kilometrażu powyżej 200km mogą być niepoprawne!",
- "cars": "Wagony",
- "EZT": "EZT",
- "SZT": "SZT",
- "loco-electric": "Elektrowóz",
- "loco-diesel": "Spalinowóz",
- "timetable-comments": "Pociąg z uwagami eksploatacyjnymi",
- "comment": "Uwagi eksploatacyjne dla: ",
- "table-limit": "Dla płynności działania strony pokazanych jest tylko 10 pociągów zgodnie z wybranymi filtrami.",
-
- "last-seen-now": "od niedawna",
- "last-seen-min": "od minuty",
- "last-seen-ago": "od {minutes} minut",
-
- "scenery-offline": "Przejazd offline",
-
- "timeout": "Wystąpił problem z aktualizacją rozkładów jazdy z SWDR"
- },
- "journal": {
- "title": "HISTORIA DYŻURÓW",
- "loading": "Ładowanie historii dyżurów...",
- "no-history": "Brak historii dyżurów dla tej scenerii!",
- "data-refreshed-at": "Dane odświeżone o",
-
- "section-timetables": "ROZKŁADY JAZDY",
- "section-dispatchers": "DYŻURNI",
-
- "no-further-data": "Brak dalszych wyników dla podanych parametrów",
- "loading-further-data": "Ładowanie...",
-
- "online-since": "ONLINE OD",
- "duty-lasted": "Dyżur trwał",
- "hours": "{value} godz.",
- "minutes": "{value} min.",
- "seconds": "{value} sek.",
-
- "route-length": "Kilometraż:",
- "station-count": "Stacje:",
- "dispatcher-name": "Autor",
- "timetable-day": "Rozkład z dnia",
- "timetable-active": "AKTYWNY",
- "timetable-fulfilled": "WYPEŁNIONY",
- "timetable-abandoned": "PORZUCONY",
-
- "stock-info": "DODATKOWE INFORMACJE",
- "stock-length": "Długość",
- "stock-mass": "Masa",
- "stock-max-speed": "Prędkość maks.",
-
- "load-data": "Pobierz dalszą historię...",
-
- "stats-title": "STATYSTYKI MASZYNISTY",
-
- "last-seen-at": "Ostatnio widziany na: ",
- "currently-at": "Obecnie na scenerii: ",
-
- "stats-timetables": "ROZKŁADY JAZDY",
- "stats-longest-timetable": "NAJDŁUŻSZY RJ",
- "stats-avg-timetable": "ŚREDNIA DŁUGOŚĆ RJ",
- "stats-distance": "DYSTANS",
- "stats-stations": "STACJE",
-
- "timetable-stats-total": "Stworzone rozkłady jazdy: {count} (łączny dystans: {distance})",
- "timetable-stats-longest": "Najdłuższy rozkład jazdy: #{id} (stworzony przez dyżurnego {author} dla maszynisty {driver} o dystansie {distance})",
- "timetable-stats-most-active-dr": "Najaktywniejszy dyżurny: {dispatcher} (stworzył {count})",
- "timetable-stats-most-active-dr-many": "Najaktywniejsi dyżurni: {dispatchers} (stworzyli po {count})",
- "timetable-stats-most-active-driver": "Najaktywniejszy maszynista: {driver} (łączny przejechany dystans: {distance})",
- "timetable-stats-longest-duties": "Najdłuższa służba: {dispatcher} na scenerii {station} (czas trwania: {duration})",
-
- "timetable-count": "rozkład jazdy | rozkładów jazdy",
-
- "daily-stats-title": "STATYSTYKI DNIA",
- "daily-stats-info": "Dzisiejsze statystyki nie są jeszcze dostępne!",
-
- "driver-stats-title": "STATYSTYKI GRACZA",
- "driver-stats-info": "Wpisz nazwę użytkownika w filtrach [F], aby zobaczyć jego statystyki maszynisty!",
-
- "stats-loading": "Pobieranie statystyk...",
- "stats-error": "Ups! Wystąpił błąd podczas próby pobrania statystyk! :/",
-
- "timetable-location-signal": "semafor:",
- "timetable-location-route": "szlak:",
-
- "history-name": "Sceneria",
- "history-hash": "Hash",
- "history-dispatcher": "Dyżurny",
- "history-level": "Poziom",
- "history-rate": "Ocena",
- "history-region": "Region",
- "history-date": "Data służby"
- },
- "scenery": {
- "users": "GRACZE ONLINE",
- "spawns": "OTWARTE SPAWNY",
- "timetables": "AKTYWNE ROZKŁADY JAZDY",
- "no-timetables": "Brak aktywnych rozkładów!",
- "offline": "Sceneria jest offline",
- "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ą",
- "history-btn": "Przejdź do widoku historii dyżurnych ruchu",
- "info-btn": "Wróć do widoku scenerii",
- "authors-title": "Autor scenerii | Autorzy scenerii",
- "abbrev": "Skrót posterunku:",
- "lines-title": "Rzeczywiste linie",
- "project-title": "Projekt",
- "one-way-routes": "Szlaki jednotorowe",
- "two-way-routes": "Szlaki dwutorowe",
-
- "option-active-timetables": "Aktywne rozkłady jazdy",
- "option-timetables-history": "Historia rozkładów",
- "option-dispatchers-history": "Historia dyżurów",
-
- "timetable-author-title": "Wydany przez",
- "timetable-author-unknown": "Autor nieznany",
-
- "timetables-history-id": "ID",
- "timetables-history-number": "Numer",
- "timetables-history-route": "Trasa",
- "timetables-history-driver": "Maszynista",
- "timetables-history-author": "Autor RJ",
- "timetables-history-date": "Data",
-
- "dispatchers-history-hash": "Hash",
- "dispatchers-history-dispatcher": "Dyżurny",
- "dispatchers-history-level": "Poziom",
- "dispatchers-history-rate": "Ocena",
- "dispatchers-history-date": "Data służby",
-
- "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}",
-
- "pragotron-link": "Paletowa tablica informacyjna (beta)",
- "tablice-link": "Tablica informacyjna zbiorcza (autorstwa Thundo)",
-
- "bottom-info": "Pokaż pełną historię w zakładce Dziennika"
- },
- "availability": {
- "title": "Dostępność",
- "default": "w paczce",
- "nonDefault": "poza paczką",
- "unavailable": "niedostępna",
- "nonPublic": "niepubliczna",
- "abandoned": "wycofana"
- },
- "timetables": {
- "timetable-only": "Wyodrębnij rozkłady jazdy",
- "end": "Koniec rozkładu jazdy",
- "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. Przyjedzie z: {prevStationName} (szlak {prevDepartureLine})",
- "desc-online": "Pociąg jest na tej scenerii. Odjedzie do: {nextStationName} (szlak {nextArrivalLine})",
- "desc-stopped": "Pociąg jest na tej scenerii i odbywa postój. Odjedzie do: {nextStationName} (szlak {nextArrivalLine})",
- "desc-next-arrival": "Odjeżdża do: {nextStationName} (szlak {nextArrivalLine})",
- "desc-departed": "Pociąg jest na tej scenerii i został odprawiony. Odjeżdża do: {nextStationName} (szlak {nextArrivalLine})",
- "desc-departed-away": "Pociąg został odprawiony i odjechał do: {nextStationName} (szlak {nextArrivalLine})",
- "desc-end": "Pociąg kończy bieg",
- "desc-terminated": "Pociąg skończył bieg"
- },
- "history": {
- "title": "DZIENNIK ROZKŁADÓW JAZDY"
- }
-}
+{
+ "general": {
+ "and": " oraz ",
+ "refresh": "ODŚWIEŻ",
+ "TWR": "Towar niebezpieczny wysokiego ryzyka",
+ "SKR": "Przekroczona skrajnia"
+ },
+ "app": {
+ "sceneries": "SCENERIE",
+ "trains": "POCIĄGI",
+ "journal": "DZIENNIK",
+ "loading": "Pobieranie danych...",
+ "error": "Wystąpił problem z załadowaniem danych!",
+ "no-result": "Brak wyników o podanych kryteriach!",
+ "offline": "Aplikacja w trybie offline!"
+ },
+ "footer": {
+ "discord": "Serwer Discord Stacjownika"
+ },
+ "data-status": {
+ "S1-offline": "Sygnał S1
Aplikacja działa w trybie offline!",
+ "S1a-connection": "Sygnał S1a
Błąd podczas próby połączenia się z API Stacjownika!",
+ "S1a-sceneries": "Sygnał S1a
Błąd podczas pobierania danych o sceneriach online!",
+ "S2": "Sygnał S2
Pomyślnie załadowano dane!",
+ "S3": "Sygnał S3
Pobieranie danych...",
+ "S5-timetables": "Sygnał S5
Rozkłady jazdy mogą być niekompletne!",
+ "S5-dispatchers": "Sygnał S5
Błąd podczas pobierania danych o statusach dyżurnych ruchu!",
+ "S5-trains": "Sygnał S5
Błąd podczas pobierania danych o pociągach online!"
+ },
+ "desc": {
+ "control-type": "Sterowanie:",
+ "signals-type": "Sygnalizacja:",
+ "SBL": "Sceneria posiada SBL na szlakach:",
+ "SUP": "Wymaga programu SUP do kontroli systemu RASP-UZK",
+ "default": "Sceneria dostępna domyślnie w paczce z grą",
+ "non-public": "Sceneria niepubliczna",
+ "unavailable": "Sceneria niedostępna",
+ "unknown": "Nieznana sceneria",
+ "real": "Sceneria z realnymi liniami kolejowymi:",
+ "abandoned": "Sceneria wycofana z rozgrywki"
+ },
+ "signals": {
+ "title": "Sygnalizacja",
+ "współczesna": "współczesna",
+ "mieszana": "mieszana",
+ "kształtowa": "kształtowa",
+ "historyczna": "historyczna"
+ },
+ "controls": {
+ "title": "Sterowanie",
+ "SPK": "SPK",
+ "SCS": "SCS",
+ "SCS-SPK": "SCS/SPK",
+ "SPE": "SPE",
+ "ręczne": "ręczne",
+ "ręczne+SPK": "ręczne z SPK",
+ "ręczne+SCS": "ręczne z SCS",
+ "mechaniczne": "mechaniczne",
+ "mechaniczne+SPK": "mechaniczne z SPK",
+ "mechaniczne+SCS": "mechaniczne z SCS"
+ },
+ "status": {
+ "online": "DO ",
+ "free": "WOLNA",
+ "ending": "KOŃCZY",
+ "not-signed": "NIEZALOGOWANY",
+ "no-limit": "BEZ LIMITU",
+ "unavailable": "NIEDOSTĘPNY",
+ "brb": "Z/W",
+ "no-space": "BRAK MIEJSCA",
+ "unknown": "NIEZNANY"
+ },
+ "options": {
+ "filters": "FILTRY",
+ "donate": "WESPRZYJ",
+
+ "search-button": "Szukaj",
+ "reset-button": "Zresetuj",
+
+ "sort-title": "SORTUJ WG:",
+ "filter-title": "FILTRUJ WG:",
+ "search-title": "SZUKAJ:",
+
+ "search-train-no": "Nr pociągu",
+ "search-train": "Nr pociągu / #",
+ "search-driver": "Nick maszynisty",
+ "search-dispatcher": "Nick dyżurnego",
+ "search-station": "Nazwa scenerii",
+ "search-author": "Nick autora rozkładu jazdy",
+ "search-issuedFrom": "Sceneria początkowa",
+ "search-timetables-date": "Data rozkładu jazdy (UTC+2 / CEST)",
+ "search-dispatchers-date": "Data służby (UTC+2 / CEST)",
+ "search-date": "Data (UTC+2 / CEST)",
+
+ "sort-routeDistance": "kilometraż",
+ "sort-allStopsCount": "stacje",
+ "sort-beginDate": "data",
+ "sort-timetableId": "ID rozkładu",
+ "sort-timestampFrom": "data",
+ "sort-duration": "czas dyżuru",
+ "sort-id": "id rozkładu",
+
+ "sort-mass": "masa",
+ "sort-speed": "prędkość",
+ "sort-length": "długość",
+ "sort-timetable": "nr pociągu",
+ "sort-progress": "przebyta trasa",
+ "sort-delay": "opóźnienie",
+ "sort-comments": "uwagi ekspl.",
+
+ "filter-withComments": "UWAGI EKSPLOATACYJNE",
+ "filter-noComments": "BEZ UWAG",
+ "filter-twr": "WYS. RYZYKA",
+ "filter-skr": "SKRAJNIA",
+ "filter-twr-skr": "WSZYSTKIE",
+ "filter-common": "ZWYKŁE",
+ "filter-passenger": "PASAŻERSKIE",
+ "filter-freight": "TOWAROWE",
+ "filter-other": "INNE",
+ "filter-noTimetable": "BEZ RJ",
+ "filter-withTimetable": "ROZKŁAD JAZDY",
+
+ "filter-reset": "ZRESETUJ FILTRY",
+ "filter-clear": "WYŁĄCZ FILTRY",
+
+ "filter-section-timetable-status": "STATUS ROZKŁADU JAZDY",
+ "filter-section-twrskr": "UWAGI",
+
+ "filter-all": "WSZYSTKIE",
+ "filter-abandoned": "PORZUCONE",
+ "filter-fulfilled": "WYPEŁNIONE",
+ "filter-active": "AKTYWNE"
+ },
+ "filters": {
+ "desc": " • Kliknięcie: zaznaczenie / odznaczenie filtru
• Podwójne kliknięcie: odznaczenie reszty filtrów z grupy
• RESET: zresetowanie filtrów z grupy",
+
+ "sections": {
+ "quick": "SZYBKIE FILTRY",
+ "reality": "FIKCYJNOŚĆ SCENERII",
+ "package-access": "DOSTĘPNOŚĆ W PACZCE",
+ "access": "DOSTĘPNOŚĆ OGÓLNA",
+ "control": "TYP STEROWANIA",
+ "signals": "TYP SYGNALIZACJI",
+ "addons": "DODATKOWE PROGRAMY",
+ "blockades": "BLOKADY LINIOWE",
+ "status": "STATUS ONLINE"
+ },
+
+ "all-available": "WSZYSTKIE DOSTĘPNE",
+ "all-free": "WSZYSTKIE WOLNE",
+
+ "endingStatus": "KOŃCZY",
+ "afkStatus": "Z/W",
+ "noSpaceStatus": "BRAK MIEJSCA",
+ "unavailableStatus": "NIEDOSTĘPNY",
+
+ "title": "FILTRUJ STACJE",
+ "default": "DOMYŚLNA",
+ "not-default": "POZA PACZKĄ",
+ "real": "REALNA",
+ "fictional": "FIKCYJNA",
+ "unavailable": "NIEDOSTĘPNA",
+ "non-public": "NIEPUBLICZNA",
+ "abandoned": "WYCOFANA",
+
+ "SPK": "SPK",
+ "SPK-R": "SPK + RĘCZNE",
+ "SPK-M": "SPK + MECH.",
+ "SCS": "SCS",
+ "SCS-R": "SCS + RĘCZNE",
+ "SCS-M": "SCS + MECH.",
+ "SPE": "SPE",
+ "manual": "RĘCZNE",
+
+ "SUP": "SUP (RASP-UZK)",
+ "noSUP": "BEZ SUP",
+
+ "SBL": "SAMOCZYNNA",
+ "PBL": "PÓŁSAMOCZYNNA",
+
+ "mechanical": "MECHANICZNE",
+ "modern": "WSPÓŁCZESNA",
+ "semaphores": "KSZTAŁTOWA",
+ "mixed": "MIESZANA",
+ "historical": "HISTORYCZNA",
+
+ "free": "WOLNA",
+ "occupied": "ZAJĘTA",
+
+ "sliders": {
+ "min-lvl": "MIN. WYMAGANY POZIOM DYŻURNEGO",
+ "max-lvl": "MAKS. WYMAGANY POZIOM DYŻURNEGO",
+ "routes-1t-cat": "SZLAKI JEDNOTOROWE ZELEKTR. (MINIMUM)",
+ "routes-1t-other": "SZLAKI JEDNOTOROWE NIEZELEKTR. (MINIMUM)",
+ "routes-2t-cat": "SZLAKI DWUTOROWE ZELEKTR. (MINIMUM)",
+ "routes-2t-other": "SZLAKI DWUTOROWE NIEZELEKTR. (MINIMUM)"
+ },
+
+ "authors-search": "Szukaj autora (uwzględnia inne filtry)",
+ "minimum-hours-title": "POKAŻ TYLKO SCENERIE DOSTĘPNE MINIMUM DO:",
+ "now": "TERAZ",
+ "hour": " godz.",
+ "no-limit": "BEZ LIMITU",
+ "include-selected": "POKAŻ ZAZNACZONE",
+ "save": "ZAPAMIĘTAJ FILTRY",
+ "reset": "RESETUJ FILTRY",
+ "close": "ZAMKNIJ FILTRY"
+ },
+ "sceneries": {
+ "station": "Stacja",
+ "abbr": "Skrót\nposterunku",
+ "min-lvl": "Min. poziom\ndyżurnego",
+ "status": "Status",
+ "dispatcher": "Dyżurny",
+ "dispatcher-lvl": "Poziom\ndyżurnego",
+ "routes": "Szlaki\n2tor / 1tor",
+ "general": "Informacje\nogólne",
+ "user": "Maszyniści online",
+ "spawn": "Otwarte spawny",
+ "timetableAll": "Aktywne rozkłady jazdy",
+ "timetableConfirmed": "Zatwierdzone rozkłady jazdy",
+ "timetableUnconfirmed": "Niezatwierdzone rozkłady jazdy",
+ "no-stations": "Brak stacji do wyświetlenia!",
+ "scenery-search": "Wyszukaj scenerię..."
+ },
+ "trains": {
+ "no-trains": "Brak pociągów do wyświetlenia!",
+ "loading": "Pobieranie danych o pociągach...",
+ "offline": "Przejazd offline",
+
+ "current-scenery": "na scenerii",
+ "current-signal": "przy semaforze",
+ "current-track": "na szlaku",
+
+ "delayed": "Opóźniony: ",
+ "preponed": "Przed czasem: ",
+ "on-time": "Planowo",
+
+ "route-progress": "Postęp: ",
+
+ "detailed-timetable": "Szczegółowy rozkład jazdy pociągu ",
+ "via-title": "Przez: ",
+ "no-timetable": "brak rozkładu jazdy",
+ "cars": "Wagony",
+ "EZT": "EZT",
+ "SZT": "SZT",
+ "loco-electric": "Elektrowóz",
+ "loco-diesel": "Spalinowóz",
+ "timetable-comments": "Pociąg z uwagami eksploatacyjnymi",
+ "comment": "Uwagi eksploatacyjne dla: ",
+
+ "last-seen-now": "od niedawna",
+ "last-seen-min": "od minuty",
+ "last-seen-ago": "od {minutes} minut",
+
+ "scenery-offline": "Przejazd offline",
+
+ "timeout": "Wystąpił problem z aktualizacją rozkładów jazdy z SWDR"
+ },
+ "journal": {
+ "title": "HISTORIA DYŻURÓW",
+ "loading": "Ładowanie historii dyżurów...",
+ "no-history": "Brak historii dyżurów dla tej scenerii!",
+ "data-refreshed-at": "Dane odświeżone o",
+
+ "section-timetables": "ROZKŁADY JAZDY",
+ "section-dispatchers": "DYŻURNI",
+
+ "no-further-data": "Brak dalszych wyników dla podanych parametrów",
+ "loading-further-data": "Ładowanie...",
+
+ "online-since": "ONLINE OD",
+ "duty-lasted": "Dyżur trwał",
+ "hours": "{value} godz.",
+ "minutes": "{value} min.",
+ "seconds": "{value} sek.",
+
+ "route-length": "Kilometraż:",
+ "station-count": "Stacje:",
+ "dispatcher-name": "Autor",
+ "timetable-day": "Rozkład z dnia",
+ "timetable-active": "AKTYWNY",
+ "timetable-fulfilled": "WYPEŁNIONY",
+ "timetable-abandoned": "PORZUCONY",
+
+ "stock-info": "DODATKOWE INFORMACJE",
+ "stock-length": "Długość",
+ "stock-mass": "Masa",
+ "stock-max-speed": "Prędkość maks.",
+
+ "load-data": "Pobierz dalszą historię...",
+
+ "stats-title": "STATYSTYKI MASZYNISTY",
+
+ "last-seen-at": "Ostatnio widziany na: ",
+ "currently-at": "Obecnie na scenerii: ",
+
+ "stats-timetables": "ROZKŁADY JAZDY",
+ "stats-longest-timetable": "NAJDŁUŻSZY RJ",
+ "stats-avg-timetable": "ŚREDNIA DŁUGOŚĆ RJ",
+ "stats-distance": "DYSTANS",
+ "stats-stations": "STACJE",
+
+ "timetable-stats-total": "Stworzone rozkłady jazdy: {count} (łączny dystans: {distance})",
+ "timetable-stats-longest": "Najdłuższy rozkład jazdy: #{id} (stworzony przez dyżurnego {author} dla maszynisty {driver} o dystansie {distance})",
+ "timetable-stats-most-active-dr": "Najaktywniejszy dyżurny: {dispatcher} (stworzył {count})",
+ "timetable-stats-most-active-dr-many": "Najaktywniejsi dyżurni: {dispatchers} (stworzyli po {count})",
+ "timetable-stats-most-active-driver": "Najaktywniejszy maszynista: {driver} (łączny przejechany dystans: {distance})",
+ "timetable-stats-longest-duties": "Najdłuższa służba: {dispatcher} na scenerii {station} (czas trwania: {duration})",
+
+ "timetable-count": "rozkład jazdy | rozkładów jazdy",
+
+ "daily-stats-title": "STATYSTYKI DNIA",
+ "daily-stats-info": "Dzisiejsze statystyki nie są jeszcze dostępne!",
+
+ "driver-stats-title": "STATYSTYKI GRACZA",
+ "driver-stats-info": "Wpisz nazwę użytkownika w filtrach [F], aby zobaczyć jego statystyki maszynisty!",
+
+ "stats-loading": "Pobieranie statystyk...",
+ "stats-error": "Ups! Wystąpił błąd podczas próby pobrania statystyk!",
+
+ "timetable-location-signal": "semafor:",
+ "timetable-location-route": "szlak:",
+
+ "history-name": "Sceneria",
+ "history-hash": "Hash",
+ "history-dispatcher": "Dyżurny",
+ "history-level": "Poziom",
+ "history-rate": "Ocena",
+ "history-region": "Region",
+ "history-date": "Data służby"
+ },
+ "scenery": {
+ "users": "GRACZE ONLINE",
+ "spawns": "OTWARTE SPAWNY",
+ "timetables": "AKTYWNE ROZKŁADY JAZDY",
+ "no-timetables": "Brak aktywnych rozkładów!",
+ "offline": "Sceneria jest offline",
+ "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ą",
+ "history-btn": "Przejdź do widoku historii dyżurnych ruchu",
+ "info-btn": "Wróć do widoku scenerii",
+ "authors-title": "Autor scenerii | Autorzy scenerii",
+ "abbrev": "Skrót posterunku:",
+ "lines-title": "Rzeczywiste linie",
+ "project-title": "Projekt",
+ "one-way-routes": "Szlaki jednotorowe",
+ "two-way-routes": "Szlaki dwutorowe",
+
+ "option-active-timetables": "Aktywne rozkłady jazdy",
+ "option-timetables-history": "Historia rozkładów",
+ "option-dispatchers-history": "Historia dyżurów",
+
+ "timetable-author-title": "Wydany przez",
+ "timetable-author-unknown": "Autor nieznany",
+
+ "timetables-history-id": "ID",
+ "timetables-history-number": "Numer",
+ "timetables-history-route": "Trasa",
+ "timetables-history-driver": "Maszynista",
+ "timetables-history-author": "Autor RJ",
+ "timetables-history-date": "Data",
+
+ "dispatchers-history-hash": "Hash",
+ "dispatchers-history-dispatcher": "Dyżurny",
+ "dispatchers-history-level": "Poziom",
+ "dispatchers-history-rate": "Ocena",
+ "dispatchers-history-date": "Data służby",
+
+ "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}",
+
+ "pragotron-link": "Paletowa tablica informacyjna (beta)",
+ "tablice-link": "Tablica informacyjna zbiorcza (autorstwa Thundo)",
+
+ "bottom-info": "Pokaż pełną historię w zakładce Dziennika"
+ },
+ "availability": {
+ "title": "Dostępność",
+ "default": "w paczce",
+ "nonDefault": "poza paczką",
+ "unavailable": "niedostępna",
+ "nonPublic": "niepubliczna",
+ "abandoned": "wycofana"
+ },
+ "timetables": {
+ "timetable-only": "Wyodrębnij rozkłady jazdy",
+ "end": "Koniec rozkładu jazdy",
+ "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. Przyjedzie z: {prevStationName} (szlak {prevDepartureLine})",
+ "desc-online": "Pociąg jest na tej scenerii. Odjedzie do: {nextStationName} (szlak {nextArrivalLine})",
+ "desc-stopped": "Pociąg jest na tej scenerii i odbywa postój. Odjedzie do: {nextStationName} (szlak {nextArrivalLine})",
+ "desc-next-arrival": "Odjeżdża do: {nextStationName} (szlak {nextArrivalLine})",
+ "desc-departed": "Pociąg jest na tej scenerii i został odprawiony. Odjeżdża do: {nextStationName} (szlak {nextArrivalLine})",
+ "desc-departed-away": "Pociąg został odprawiony i odjechał do: {nextStationName} (szlak {nextArrivalLine})",
+ "desc-end": "Pociąg kończy bieg",
+ "desc-terminated": "Pociąg skończył bieg"
+ },
+ "history": {
+ "title": "DZIENNIK ROZKŁADÓW JAZDY"
+ }
+}
diff --git a/src/main.ts b/src/main.ts
index ba5aebc..eec3e7f 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,41 +1,45 @@
-import { createApp, Directive, ref } from 'vue';
-import App from './App.vue';
-import router from './router';
-
-import enLang from './locales/en.json';
-import plLang from './locales/pl.json';
-
-import { createI18n } from 'vue-i18n';
-import { createPinia } from 'pinia';
-
-const i18n = createI18n({
- locale: 'pl',
- legacy: false,
- warnHtmlMessage: false,
- fallbackLocale: 'pl',
- messages: {
- en: enLang,
- pl: plLang,
- },
- enableLegacy: false,
-});
-
-const clickOutsideDirective: Directive = {
- mounted(el, binding) {
- el.clickOutsideEvent = (event: Event) => {
- if (!(el == event.target || el.contains(event.target))) {
- binding.value();
- }
- };
-
- document.addEventListener('click', el.clickOutsideEvent);
- },
-};
-
-createApp(App)
- .provide('isFilterCardVisible', ref(false))
- .use(createPinia())
- .use(router)
- .use(i18n)
- .directive('click-outside', clickOutsideDirective)
- .mount('#app');
+import { createApp, Directive, ref } from 'vue';
+import App from './App.vue';
+import router from './router';
+
+import enLang from './locales/en.json';
+import plLang from './locales/pl.json';
+
+import { createI18n } from 'vue-i18n';
+import { createPinia } from 'pinia';
+import useCustomSW from './mixins/useCustomSW';
+
+const i18n = createI18n({
+ locale: 'pl',
+ legacy: false,
+ warnHtmlMessage: false,
+ fallbackLocale: 'pl',
+ messages: {
+ en: enLang,
+ pl: plLang
+ },
+ enableLegacy: false
+});
+
+// SW
+useCustomSW();
+
+const clickOutsideDirective: Directive = {
+ mounted(el, binding) {
+ el.clickOutsideEvent = (event: Event) => {
+ if (!(el == event.target || el.contains(event.target))) {
+ binding.value();
+ }
+ };
+
+ document.addEventListener('click', el.clickOutsideEvent);
+ }
+};
+
+createApp(App)
+ .provide('isFilterCardVisible', ref(false))
+ .use(createPinia())
+ .use(router)
+ .use(i18n)
+ .directive('click-outside', clickOutsideDirective)
+ .mount('#app');
diff --git a/src/mixins/dateMixin.ts b/src/mixins/dateMixin.ts
index 49d6f9b..e9e5390 100644
--- a/src/mixins/dateMixin.ts
+++ b/src/mixins/dateMixin.ts
@@ -1,77 +1,77 @@
-import { defineComponent } from 'vue';
-
-export default defineComponent({
- methods: {
- localeDate(dateString: string, locale: string) {
- return new Date(dateString).toLocaleDateString(locale == 'pl' ? 'pl-PL' : 'en-GB', {
- weekday: 'long',
- day: 'numeric',
- month: '2-digit',
- year: 'numeric',
- hour: '2-digit',
- minute: '2-digit',
- });
- },
-
- localeDay(dateString: string, locale: string) {
- return new Date(dateString).toLocaleDateString(locale == 'pl' ? 'pl-PL' : 'en-GB', {
- day: 'numeric',
- month: '2-digit',
- year: 'numeric',
- });
- },
-
- localeDateTime(dateString: string, locale: string) {
- return new Date(dateString).toLocaleString(locale == 'pl' ? 'pl-PL' : 'en-GB', {
- timeStyle: 'short',
- dateStyle: 'medium'
- });
- },
-
- localeTime(dateString: string, locale: string) {
- return new Date(dateString).toLocaleTimeString(locale == 'pl' ? 'pl-PL' : 'en-GB', {
- hour: '2-digit',
- minute: '2-digit',
- });
- },
-
- stringToDate(dateString?: string) {
- return dateString ? new Date(dateString) : null;
- },
-
- parseDateToTimeString(date: Date | null) {
- return (
- date?.toLocaleTimeString('pl-PL', {
- hour: '2-digit',
- minute: '2-digit',
- }) || ''
- );
- },
-
- timestampToString(timestamp: number | null) {
- return timestamp
- ? new Date(timestamp).toLocaleTimeString('pl-PL', {
- hour: '2-digit',
- minute: '2-digit',
- })
- : '';
- },
-
- calculateDuration(timestampMs: number, showSeconds = false) {
- const secondsTotal = Math.floor(timestampMs / 1000);
- const minsTotal = Math.round(timestampMs / 60000);
- const hoursTotal = Math.floor(minsTotal / 60);
- const minsInHour = minsTotal % 60;
-
- return minsTotal >= 60
- ? `${this.$t('journal.hours', { value: hoursTotal }, hoursTotal)} ${this.$t(
- 'journal.minutes',
- { value: minsInHour },
- minsInHour
- )}`
- : showSeconds && secondsTotal <= 60
- ? this.$t('journal.seconds', { value: secondsTotal }, secondsTotal)
- : this.$t('journal.minutes', { value: minsTotal }, minsTotal);
- },
- },
-});
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+ methods: {
+ localeDate(dateString: string, locale: string) {
+ return new Date(dateString).toLocaleDateString(locale == 'pl' ? 'pl-PL' : 'en-GB', {
+ weekday: 'long',
+ day: 'numeric',
+ month: '2-digit',
+ year: 'numeric',
+ hour: '2-digit',
+ minute: '2-digit'
+ });
+ },
+
+ localeDay(dateString: string, locale: string) {
+ return new Date(dateString).toLocaleDateString(locale == 'pl' ? 'pl-PL' : 'en-GB', {
+ day: 'numeric',
+ month: '2-digit',
+ year: 'numeric'
+ });
+ },
+
+ localeDateTime(dateString: string, locale: string) {
+ return new Date(dateString).toLocaleString(locale == 'pl' ? 'pl-PL' : 'en-GB', {
+ timeStyle: 'short',
+ dateStyle: 'medium'
+ });
+ },
+
+ localeTime(dateString: string, locale: string) {
+ return new Date(dateString).toLocaleTimeString(locale == 'pl' ? 'pl-PL' : 'en-GB', {
+ hour: '2-digit',
+ minute: '2-digit'
+ });
+ },
+
+ stringToDate(dateString?: string) {
+ return dateString ? new Date(dateString) : null;
+ },
+
+ parseDateToTimeString(date: Date | null) {
+ return (
+ date?.toLocaleTimeString('pl-PL', {
+ hour: '2-digit',
+ minute: '2-digit'
+ }) || ''
+ );
+ },
+
+ timestampToString(timestamp: number | null) {
+ return timestamp
+ ? new Date(timestamp).toLocaleTimeString('pl-PL', {
+ hour: '2-digit',
+ minute: '2-digit'
+ })
+ : '';
+ },
+
+ calculateDuration(timestampMs: number, showSeconds = false) {
+ const secondsTotal = Math.floor(timestampMs / 1000);
+ const minsTotal = Math.round(timestampMs / 60000);
+ const hoursTotal = Math.floor(minsTotal / 60);
+ const minsInHour = minsTotal % 60;
+
+ return minsTotal >= 60
+ ? `${this.$t('journal.hours', { value: hoursTotal }, hoursTotal)} ${this.$t(
+ 'journal.minutes',
+ { value: minsInHour },
+ minsInHour
+ )}`
+ : showSeconds && secondsTotal <= 60
+ ? this.$t('journal.seconds', { value: secondsTotal }, secondsTotal)
+ : this.$t('journal.minutes', { value: minsTotal }, minsTotal);
+ }
+ }
+});
diff --git a/src/mixins/imageMixin.ts b/src/mixins/imageMixin.ts
deleted file mode 100644
index ce0605e..0000000
--- a/src/mixins/imageMixin.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { defineComponent } from 'vue';
-
-export default defineComponent({
- methods: {
- getIcon(name: string, ext = 'svg') {
- return new URL(`../assets/icon-${name}.${ext}`, import.meta.url).href;
- },
-
- getImage(name: string) {
- return new URL(`../assets/${name}`, import.meta.url).href;
- }
- },
-});
diff --git a/src/mixins/keyMixin.ts b/src/mixins/keyMixin.ts
index ce5922e..0416b3b 100644
--- a/src/mixins/keyMixin.ts
+++ b/src/mixins/keyMixin.ts
@@ -1,26 +1,27 @@
-import { defineComponent } from 'vue';
-
-export default defineComponent({
- data() {
- return {
- preventKeyDown: false,
- };
- },
-
- activated() {
- window.addEventListener('keydown', this.handleKeyDown);
- },
-
- deactivated() {
- window.removeEventListener('keydown', this.handleKeyDown);
- },
-
- methods: {
- onKeyDownFunction() {},
-
- handleKeyDown(e: KeyboardEvent) {
- if (!e.key) return;
- if (e.key.toLowerCase() == 'f' && !this.preventKeyDown && !e.ctrlKey && !e.altKey) this.onKeyDownFunction();
- },
- },
-});
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+ data() {
+ return {
+ preventKeyDown: false
+ };
+ },
+
+ activated() {
+ window.addEventListener('keydown', this.handleKeyDown);
+ },
+
+ deactivated() {
+ window.removeEventListener('keydown', this.handleKeyDown);
+ },
+
+ methods: {
+ onKeyDownFunction() {},
+
+ handleKeyDown(e: KeyboardEvent) {
+ if (!e.key) return;
+ if (e.key.toLowerCase() == 'f' && !this.preventKeyDown && !e.ctrlKey && !e.altKey)
+ this.onKeyDownFunction();
+ }
+ }
+});
diff --git a/src/mixins/listObserverMixin.ts b/src/mixins/listObserverMixin.ts
index 5a0286f..98ae7a8 100644
--- a/src/mixins/listObserverMixin.ts
+++ b/src/mixins/listObserverMixin.ts
@@ -1,26 +1,29 @@
-import { defineComponent } from 'vue';
-
-export default defineComponent({
- data: () => ({
- observer: null as IntersectionObserver | null,
- observerTarget: null as Element | null,
- }),
-
- methods: {
- mountObserver(actionFunction: () => void, target: Element) {
- this.observer = new IntersectionObserver((entries) => {
- console.log(entries);
-
- if (entries[0].intersectionRatio > 0.5) actionFunction();
- }, { threshold: 0.2 });
-
- this.observer.observe(target);
- },
-
- unmountObserver() {
- if (!this.observerTarget) return;
-
- this.observer?.unobserve(this.observerTarget);
- },
- },
-});
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+ data: () => ({
+ observer: null as IntersectionObserver | null,
+ observerTarget: null as Element | null
+ }),
+
+ methods: {
+ mountObserver(actionFunction: () => void, target: Element) {
+ this.observer = new IntersectionObserver(
+ (entries) => {
+ console.log(entries);
+
+ if (entries[0].intersectionRatio > 0.5) actionFunction();
+ },
+ { threshold: 0.2 }
+ );
+
+ this.observer.observe(target);
+ },
+
+ unmountObserver() {
+ if (!this.observerTarget) return;
+
+ this.observer?.unobserve(this.observerTarget);
+ }
+ }
+});
diff --git a/src/mixins/modalTrainMixin.ts b/src/mixins/modalTrainMixin.ts
index 352fbe3..50e4cde 100644
--- a/src/mixins/modalTrainMixin.ts
+++ b/src/mixins/modalTrainMixin.ts
@@ -1,33 +1,33 @@
-import { Ref, defineComponent } from 'vue';
-import { useStore } from '../store/store';
-
-export default defineComponent({
- data() {
- return {
- store: useStore(),
- };
- },
-
- computed: {
- chosenTrain() {
- return this.store.trainList.find((train) => train.trainId == this.store.chosenModalTrainId);
- },
- },
-
- methods: {
- selectModalTrain(trainId: string, target?: EventTarget | null) {
- this.store.chosenModalTrainId = trainId;
- document.body.classList.add('no-scroll');
- if (target) this.store.modalLastClickedTarget = target;
- },
-
- closeModal() {
- this.store.chosenModalTrainId = undefined;
-
- setTimeout(() => {
- (this.store.modalLastClickedTarget as any)?.focus();
- document.body.classList.remove('no-scroll');
- }, 150);
- },
- },
-});
+import { defineComponent } from 'vue';
+import { useStore } from '../store/store';
+
+export default defineComponent({
+ data() {
+ return {
+ store: useStore()
+ };
+ },
+
+ computed: {
+ chosenTrain() {
+ return this.store.trainList.find((train) => train.trainId == this.store.chosenModalTrainId);
+ }
+ },
+
+ methods: {
+ selectModalTrain(trainId: string, target?: EventTarget | null) {
+ this.store.chosenModalTrainId = trainId;
+ document.body.classList.add('no-scroll');
+ if (target) this.store.modalLastClickedTarget = target;
+ },
+
+ closeModal() {
+ this.store.chosenModalTrainId = undefined;
+
+ setTimeout(() => {
+ (this.store.modalLastClickedTarget as any)?.focus();
+ document.body.classList.remove('no-scroll');
+ }, 150);
+ }
+ }
+});
diff --git a/src/mixins/returnBtnMixin.ts b/src/mixins/returnBtnMixin.ts
deleted file mode 100644
index e47f459..0000000
--- a/src/mixins/returnBtnMixin.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { defineComponent, h } from 'vue';
-import imageMixin from './imageMixin';
-
-export default defineComponent({
- mixins: [imageMixin],
-
- data() {
- return {
- icons: {
- arrow: this.getIcon('arrow-asc'),
- },
-
- showReturnButton: false,
- };
- },
-
- methods: {
- scrollToTop() {
- window.scrollTo({ top: 0 });
- },
-
- handleScroll() {
- this.showReturnButton = window.scrollY > window.innerHeight * 0.35;
- },
- },
-
- activated() {
- window.addEventListener('wheel', this.handleScroll);
- },
-
- deactivated() {
- window.removeEventListener('wheel', this.handleScroll);
- },
-});
diff --git a/src/mixins/routerMixin.ts b/src/mixins/routerMixin.ts
index 2f383a1..40d6f44 100644
--- a/src/mixins/routerMixin.ts
+++ b/src/mixins/routerMixin.ts
@@ -2,12 +2,11 @@ import { defineComponent } from 'vue';
export default defineComponent({
methods: {
-
navigateTo(path: string, query?: {}) {
this.$router.push({
path,
- query,
+ query
});
- },
- },
+ }
+ }
});
diff --git a/src/mixins/stationInfoMixin.ts b/src/mixins/stationInfoMixin.ts
index 2fa829a..3f20d7b 100644
--- a/src/mixins/stationInfoMixin.ts
+++ b/src/mixins/stationInfoMixin.ts
@@ -1,25 +1,24 @@
import { defineComponent } from 'vue';
export default defineComponent({
- methods: {
- getControlTypeAbbrev(controlType: string) {
- switch (controlType) {
- case 'mechaniczne':
- return 'M';
- case 'SCS-SPK':
- return 'S/S';
- case 'ręczne':
- return 'R';
- case 'mechaniczne+SPK':
- return 'M';
- case 'ręczne+SPK':
- return 'R';
- case 'mechaniczne+SCS':
- return 'M';
- default:
- return controlType;
- }
-
- }
+ methods: {
+ getControlTypeAbbrev(controlType: string) {
+ switch (controlType) {
+ case 'mechaniczne':
+ return 'M';
+ case 'SCS-SPK':
+ return 'S/S';
+ case 'ręczne':
+ return 'R';
+ case 'mechaniczne+SPK':
+ return 'M';
+ case 'ręczne+SPK':
+ return 'R';
+ case 'mechaniczne+SCS':
+ return 'M';
+ default:
+ return controlType;
+ }
}
-})
+ }
+});
diff --git a/src/mixins/styleMixin.ts b/src/mixins/styleMixin.ts
index 0702eab..10a6a84 100644
--- a/src/mixins/styleMixin.ts
+++ b/src/mixins/styleMixin.ts
@@ -1,52 +1,54 @@
-import { defineComponent } from 'vue';
-
-export default defineComponent({
- methods: {
- calculateExpStyle(exp: number, isSupporter = false): string {
- const bgColor = exp > -1 ? (exp < 2 ? '#26B0D9' : `hsl(${-exp * 5 + 100}, 85%, 50%)`) : '#666';
-
- const fontColor = exp > 14 || exp == -1 ? 'white' : 'black';
- const boxShadow = isSupporter ? `box-shadow: 0 0 6px 2px ${bgColor};` : '';
-
- return `background-color: ${bgColor}; color: ${fontColor}; ${boxShadow};`;
- },
-
- calculateTextExpStyle(exp: number, isSupporter = false): string {
- const textColor = exp > -1 ? (exp < 2 ? '#26B0D9' : `hsl(${-exp * 5 + 100}, 75%, 50%)`) : '#666';
-
- return `color: ${textColor}; ${isSupporter ? 'text-shadow: 0 0 6px ' + textColor : ''};`;
- },
-
- statusClasses(occupiedTo: string) {
- let className = '';
-
- switch (occupiedTo) {
- case 'WOLNA':
- className = 'free';
- break;
- case 'KOŃCZY':
- className = 'ending';
- break;
- case 'NIEZALOGOWANY':
- className = 'not-signed';
- break;
- case 'BEZ LIMITU':
- className = 'no-limit';
- break;
- case 'NIEDOSTĘPNY':
- className = 'unavailable';
- break;
- case 'Z/W':
- className = 'brb';
- break;
- case 'BRAK MIEJSCA':
- className = 'no-space';
- break;
- default:
- break;
- }
-
- return className;
- },
- },
-});
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+ methods: {
+ calculateExpStyle(exp: number, isSupporter = false): string {
+ const bgColor =
+ exp > -1 ? (exp < 2 ? '#26B0D9' : `hsl(${-exp * 5 + 100}, 85%, 50%)`) : '#666';
+
+ const fontColor = exp > 14 || exp == -1 ? 'white' : 'black';
+ const boxShadow = isSupporter ? `box-shadow: 0 0 6px 2px ${bgColor};` : '';
+
+ return `background-color: ${bgColor}; color: ${fontColor}; ${boxShadow};`;
+ },
+
+ calculateTextExpStyle(exp: number, isSupporter = false): string {
+ const textColor =
+ exp > -1 ? (exp < 2 ? '#26B0D9' : `hsl(${-exp * 5 + 100}, 75%, 50%)`) : '#666';
+
+ return `color: ${textColor}; ${isSupporter ? 'text-shadow: 0 0 6px ' + textColor : ''};`;
+ },
+
+ statusClasses(occupiedTo: string) {
+ let className = '';
+
+ switch (occupiedTo) {
+ case 'WOLNA':
+ className = 'free';
+ break;
+ case 'KOŃCZY':
+ className = 'ending';
+ break;
+ case 'NIEZALOGOWANY':
+ className = 'not-signed';
+ break;
+ case 'BEZ LIMITU':
+ className = 'no-limit';
+ break;
+ case 'NIEDOSTĘPNY':
+ className = 'unavailable';
+ break;
+ case 'Z/W':
+ className = 'brb';
+ break;
+ case 'BRAK MIEJSCA':
+ className = 'no-space';
+ break;
+ default:
+ break;
+ }
+
+ return className;
+ }
+ }
+});
diff --git a/src/mixins/trainInfoMixin.ts b/src/mixins/trainInfoMixin.ts
index a18e064..b06dda2 100644
--- a/src/mixins/trainInfoMixin.ts
+++ b/src/mixins/trainInfoMixin.ts
@@ -1,49 +1,46 @@
import { defineComponent } from 'vue';
import Train from '../scripts/interfaces/Train';
import TrainStop from '../scripts/interfaces/TrainStop';
-import imageMixin from './imageMixin';
export default defineComponent({
- mixins: [imageMixin],
-
data: () => ({
STATS: {
main: [
{
name: 'speed',
- unit: 'km/h',
+ unit: 'km/h'
},
{
name: 'length',
- unit: 'm',
+ unit: 'm'
},
{
name: 'mass',
unit: 't',
- multiplier: 0.001,
- },
+ multiplier: 0.001
+ }
],
position: [
{
name: 'scenery',
- prop: 'currentStationName',
+ prop: 'currentStationName'
},
{
name: 'route',
- prop: 'connectedTrack',
+ prop: 'connectedTrack'
},
{
name: 'signal',
- prop: 'signal',
+ prop: 'signal'
},
{
name: 'distance',
prop: 'distance',
- unit: 'm',
- },
- ],
- },
+ unit: 'm'
+ }
+ ]
+ }
}),
methods: {
@@ -64,11 +61,15 @@ export default defineComponent({
positionString += this.$t('trains.current-scenery') + ' ';
if (train.currentStationHash) positionString += train.currentStationName + ' ';
- else positionString += train['currentStationName'].replace(/.[a-zA-Z0-9]+.sc/, '') + ' (offline) ';
+ else
+ positionString +=
+ train['currentStationName'].replace(/.[a-zA-Z0-9]+.sc/, '') + ' (offline) ';
- if (train.signal) positionString += this.$t('trains.current-signal') + ' ' + train.signal + ' ';
+ if (train.signal)
+ positionString += this.$t('trains.current-signal') + ' ' + train.signal + ' ';
- if (train.connectedTrack) positionString += this.$t('trains.current-track') + ' ' + train.connectedTrack + ' ';
+ if (train.connectedTrack)
+ positionString += this.$t('trains.current-track') + ' ' + train.connectedTrack + ' ';
if (train.distance) positionString += `(${this.displayDistance(train.distance)})`;
@@ -81,9 +82,17 @@ export default defineComponent({
return stops
.reduce((acc: string[], stop: TrainStop, i: number) => {
if (stop.stopType.includes('ph') && !stop.stopNameRAW.includes('po.'))
- acc.push(`${stop.stopName}`);
+ acc.push(
+ `${
+ stop.stopName
+ }`
+ );
else if (i > 0 && i < stops.length - 1 && !/po\.|sbl/gi.test(stop.stopNameRAW))
- acc.push(`${stop.stopName}`);
+ acc.push(
+ `${
+ stop.stopName
+ }`
+ );
return acc;
}, [])
.join(' > ');
@@ -94,16 +103,22 @@ export default defineComponent({
},
confirmedPercentage(stops: TrainStop[]) {
- return Number(((stops.filter((stop) => stop.confirmed).length / stops.length) * 100).toFixed(0));
+ return Number(
+ ((stops.filter((stop) => stop.confirmed).length / stops.length) * 100).toFixed(0)
+ );
},
currentDelay(stops: TrainStop[]) {
const delay =
- stops.find((stop, i) => (i == 0 && !stop.confirmed) || (i > 0 && stops[i - 1].confirmed && !stop.confirmed))
- ?.departureDelay || 0;
+ stops.find(
+ (stop, i) =>
+ (i == 0 && !stop.confirmed) || (i > 0 && stops[i - 1].confirmed && !stop.confirmed)
+ )?.departureDelay || 0;
- if (delay > 0) return `${this.$t('trains.delayed')} ${delay} min`;
- else if (delay < 0) return `${this.$t('trains.preponed')} ${delay} min`;
+ if (delay > 0)
+ return `${this.$t('trains.delayed')} ${delay} min`;
+ else if (delay < 0)
+ return `${this.$t('trains.preponed')} ${delay} min`;
else return this.$t('trains.on-time');
},
@@ -118,7 +133,7 @@ export default defineComponent({
getSceneriesWithComments(timetableData: Train['timetableData']) {
const commentList =
- timetableData?.followingStops.reduce((acc, stop, i) => {
+ timetableData?.followingStops.reduce((acc, stop) => {
if (stop.comments) acc.push(stop.stopNameRAW);
return acc;
@@ -137,7 +152,7 @@ export default defineComponent({
onImageError(e: Event) {
const imageEl = e.target as HTMLImageElement;
- imageEl.src = this.getImage('unknown.png');
- },
- },
+ imageEl.src = '/images/icon-unknown.png';
+ }
+ }
});
diff --git a/src/mixins/useCustomSW.ts b/src/mixins/useCustomSW.ts
index 287dd16..a8d03d0 100644
--- a/src/mixins/useCustomSW.ts
+++ b/src/mixins/useCustomSW.ts
@@ -2,12 +2,12 @@ import { useRegisterSW } from 'virtual:pwa-register/vue';
export default () => {
const { needRefresh, updateServiceWorker, offlineReady } = useRegisterSW({
- immediate: true,
+ immediate: true
});
return {
needRefresh,
updateServiceWorker,
- offlineReady,
+ offlineReady
};
};
diff --git a/src/router/index.ts b/src/router/index.ts
index 229f6f9..85573f5 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,58 +1,74 @@
-import { createRouter, createWebHistory, RouteRecordRaw } from 'vue-router';
-import JournalDispatchersVue from '../views/JournalDispatchers.vue';
-import JournalTimetablesVue from '../views/JournalTimetables.vue';
-
-const routes: Array = [
- {
- path: '/',
- name: 'StationsView',
- component: () => import('../views/StationsView.vue'),
- },
- {
- path: '/trains',
- name: 'TrainsView',
- component: () => import('../views/TrainsView.vue'),
- props: (route) => ({ train: route.query.train, driver: route.query.driver, trainId: route.query.trainId }),
- },
- {
- path: '/scenery',
- name: 'SceneryView',
- component: () => import('../views/SceneryView.vue'),
- },
- {
- path: '/journal',
- redirect: '/journal/timetables'
- },
- {
- path: '/journal/timetables',
- name: 'JournalTimetables',
- component: JournalTimetablesVue,
- props: (route) => ({
- trainNo: route.query.trainNo,
- driverName: route.query.driverName,
- timetableId: route.query.timetableId,
- }),
- },
- {
- path: '/journal/dispatchers',
- name: 'JournalDispatchers',
- component: JournalDispatchersVue,
- props: (route) => ({ sceneryName: route.query.sceneryName, dispatcherName: route.query.dispatcherName }),
- },
- {
- path: '/:catchAll(.*)',
- redirect: '/',
- },
-];
-
-const router = createRouter({
- scrollBehavior(to, from) {
- if (to.name == 'SceneryView' && from.name) return { el: `.app_main` };
-
- // if (from.name == 'SceneryView' && to.name == 'StationsView') return { el: `.last-selected`, top: 20 };
- },
- history: createWebHistory(),
- routes,
-});
-
-export default router;
+import { createRouter, createWebHistory, RouteRecordRaw } from 'vue-router';
+import JournalDispatchersVue from '../views/JournalDispatchers.vue';
+import JournalTimetablesVue from '../views/JournalTimetables.vue';
+
+const routes: Array = [
+ {
+ path: '/',
+ name: 'StationsView',
+ component: () => import('../views/StationsView.vue'),
+ props: (route) => ({
+ region: route.query.region
+ })
+ },
+ {
+ path: '/trains',
+ name: 'TrainsView',
+ component: () => import('../views/TrainsView.vue'),
+ props: (route) => ({
+ train: route.query.train,
+ driver: route.query.driver,
+ trainId: route.query.trainId
+ })
+ },
+ {
+ path: '/scenery',
+ name: 'SceneryView',
+ component: () => import('../views/SceneryView.vue'),
+ props: (route) => ({
+ region: route.query.region,
+ station: route.query.station
+ })
+ },
+ {
+ path: '/journal',
+ redirect: '/journal/timetables'
+ },
+ {
+ path: '/journal/timetables',
+ name: 'JournalTimetables',
+ component: JournalTimetablesVue,
+ props: (route) => ({
+ trainNo: route.query.trainNo,
+ driverName: route.query.driverName,
+ timetableId: route.query.timetableId
+ })
+ },
+ {
+ path: '/journal/dispatchers',
+ name: 'JournalDispatchers',
+ component: JournalDispatchersVue,
+ props: (route) => ({
+ sceneryName: route.query.sceneryName,
+ dispatcherName: route.query.dispatcherName
+ })
+ },
+ {
+ path: '/:catchAll(.*)',
+ redirect: '/'
+ }
+];
+
+const router = createRouter({
+ scrollBehavior(to, from, savedPosition) {
+ if (to.name == 'SceneryView' && from.name) return { el: `.app_main` };
+
+ if (savedPosition) return savedPosition;
+
+ // if (from.name == 'SceneryView' && to.name == 'StationsView') return { el: `.last-selected`, top: 20 };
+ },
+ history: createWebHistory(),
+ routes
+});
+
+export default router;
diff --git a/src/scripts/constants/stores/initFilterStates.ts b/src/scripts/constants/stores/initFilterStates.ts
index 2ce2e27..50e1db8 100644
--- a/src/scripts/constants/stores/initFilterStates.ts
+++ b/src/scripts/constants/stores/initFilterStates.ts
@@ -1,49 +1,49 @@
-import Filter from "../../interfaces/Filter";
-
-export const filterInitStates: Filter = {
- default: false,
- notDefault: false,
- real: false,
- fictional: false,
- SPK: false,
- SCS: false,
- SPE: false,
- SUP: false,
- noSUP: false,
- ręczne: false,
- 'ręczne+SPK': false,
- 'ręczne+SCS': false,
- mechaniczne: false,
- 'mechaniczne+SPK': false,
- 'mechaniczne+SCS': false,
- współczesna: false,
- kształtowa: false,
- historyczna: false,
- mieszana: false,
- SBL: false,
- PBL: false,
- minLevel: 0,
- maxLevel: 20,
- minOneWayCatenary: 0,
- minOneWay: 0,
- minTwoWayCatenary: 0,
- minTwoWay: 0,
- 'include-selected': false,
- 'no-1track': false,
- 'no-2track': false,
- free: true,
- occupied: false,
- ending: false,
- nonPublic: false,
- unavailable: true,
- abandoned: true,
- afkStatus: false,
- endingStatus: false,
- noSpaceStatus: false,
- unavailableStatus: false,
- unsignedStatus: false,
-
- authors: '',
-
- onlineFromHours: 0,
-};
+import Filter from '../../interfaces/Filter';
+
+export const filterInitStates: Filter = {
+ default: false,
+ notDefault: false,
+ real: false,
+ fictional: false,
+ SPK: false,
+ SCS: false,
+ SPE: false,
+ SUP: false,
+ noSUP: false,
+ ręczne: false,
+ 'ręczne+SPK': false,
+ 'ręczne+SCS': false,
+ mechaniczne: false,
+ 'mechaniczne+SPK': false,
+ 'mechaniczne+SCS': false,
+ współczesna: false,
+ kształtowa: false,
+ historyczna: false,
+ mieszana: false,
+ SBL: false,
+ PBL: false,
+ minLevel: 0,
+ maxLevel: 20,
+ minOneWayCatenary: 0,
+ minOneWay: 0,
+ minTwoWayCatenary: 0,
+ minTwoWay: 0,
+ 'include-selected': false,
+ 'no-1track': false,
+ 'no-2track': false,
+ free: true,
+ occupied: false,
+ ending: false,
+ nonPublic: false,
+ unavailable: true,
+ abandoned: true,
+ afkStatus: false,
+ endingStatus: false,
+ noSpaceStatus: false,
+ unavailableStatus: false,
+ unsignedStatus: false,
+
+ authors: '',
+
+ onlineFromHours: 0
+};
diff --git a/src/scripts/data/stationHeaderNames.ts b/src/scripts/data/stationHeaderNames.ts
index 0f954d6..7c018e4 100644
--- a/src/scripts/data/stationHeaderNames.ts
+++ b/src/scripts/data/stationHeaderNames.ts
@@ -1,5 +1,19 @@
-export const headIds = ['station', 'min-lvl', 'status', 'dispatcher', 'dispatcher-lvl', 'routes', 'general'] as const;
+export const headIds = [
+ 'station',
+ 'min-lvl',
+ 'status',
+ 'dispatcher',
+ 'dispatcher-lvl',
+ 'routes',
+ 'general'
+] as const;
-export const headIconsIds = ['user', 'spawn', 'timetableAll', 'timetableUnconfirmed', 'timetableConfirmed'] as const;
+export const headIconsIds = [
+ 'user',
+ 'spawn',
+ 'timetableAll',
+ 'timetableUnconfirmed',
+ 'timetableConfirmed'
+] as const;
-export type HeadIdsTypes = typeof headIds[number] | typeof headIconsIds[number];
+export type HeadIdsTypes = (typeof headIds)[number] | (typeof headIconsIds)[number];
diff --git a/src/scripts/enums/DataStatus.ts b/src/scripts/enums/DataStatus.ts
index 0eabbc2..33fd9a1 100644
--- a/src/scripts/enums/DataStatus.ts
+++ b/src/scripts/enums/DataStatus.ts
@@ -1,7 +1,7 @@
-export enum DataStatus {
- Initialized = -1,
- Loading = 0,
- Error = 1,
- Loaded = 2,
- Warning = 3
-}
+export enum DataStatus {
+ Initialized = -1,
+ Loading = 0,
+ Error = 1,
+ Loaded = 2,
+ Warning = 3
+}
diff --git a/src/scripts/enums/DispatcherStatus.ts b/src/scripts/enums/DispatcherStatus.ts
new file mode 100644
index 0000000..cc533bb
--- /dev/null
+++ b/src/scripts/enums/DispatcherStatus.ts
@@ -0,0 +1,11 @@
+export enum DispatcherStatusID {
+ Unknown = 'unknown',
+ Outdated = 'outdated',
+ Unauthorized = 'not-signed',
+ OnlineNoLimit = 'no-limit',
+ Afk = 'brb',
+ Ending = 'ending',
+ NoSpace = 'no-space',
+ Unavailable = 'unavailable',
+ OnlineWithHours = 'online'
+}
\ No newline at end of file
diff --git a/src/scripts/enums/JournalFilterType.ts b/src/scripts/enums/JournalFilterType.ts
index 95360ba..3628dbc 100644
--- a/src/scripts/enums/JournalFilterType.ts
+++ b/src/scripts/enums/JournalFilterType.ts
@@ -1,14 +1,14 @@
-export const enum JournalFilterType {
- ACTIVE = 'active',
- FULFILLED = 'fulfilled',
- ABANDONED = 'abandoned',
- ALL = 'all',
- TWR = 'twr',
- SKR = 'skr',
- TWR_SKR = 'twr-skr',
-}
-
-export enum JournalFilterSection {
- TIMETABLE_STATUS = 'timetable-status',
- TWRSKR = 'twrskr',
-}
+export const enum JournalFilterType {
+ ACTIVE = 'active',
+ FULFILLED = 'fulfilled',
+ ABANDONED = 'abandoned',
+ ALL = 'all',
+ TWR = 'twr',
+ SKR = 'skr',
+ TWR_SKR = 'twr-skr'
+}
+
+export enum JournalFilterSection {
+ TIMETABLE_STATUS = 'timetable-status',
+ TWRSKR = 'twrskr'
+}
diff --git a/src/scripts/enums/TrainFilterType.ts b/src/scripts/enums/TrainFilterType.ts
index efb2494..e438aea 100644
--- a/src/scripts/enums/TrainFilterType.ts
+++ b/src/scripts/enums/TrainFilterType.ts
@@ -2,7 +2,7 @@ export enum TrainFilterSection {
TRAIN_TYPE = 'TRAIN_TYPE',
TIMETABLE_TYPE = 'TIMETABLE_TYPE',
COMMENTS = 'COMMENTS',
- TIMETABLE = 'TIMETABLE',
+ TIMETABLE = 'TIMETABLE'
}
export const enum TrainFilterType {
@@ -17,5 +17,5 @@ export const enum TrainFilterType {
freight = 'freight',
other = 'other',
noTimetable = 'noTimetable',
- withTimetable = 'withTimetable',
+ withTimetable = 'withTimetable'
}
diff --git a/src/scripts/interfaces/Filter.ts b/src/scripts/interfaces/Filter.ts
index 441b69e..fdf2cc1 100644
--- a/src/scripts/interfaces/Filter.ts
+++ b/src/scripts/interfaces/Filter.ts
@@ -1,48 +1,48 @@
-export default interface Filter {
- [key: string]: boolean | number | string;
- default: boolean;
- notDefault: boolean;
- real: boolean;
- fictional: boolean;
- SPK: boolean;
- SCS: boolean;
- SPE: boolean;
- SUP: boolean;
- noSUP: boolean;
- ręczne: boolean;
- 'ręczne+SPK': boolean;
- 'ręczne+SCS': boolean;
- mechaniczne: boolean;
- 'mechaniczne+SPK': boolean;
- 'mechaniczne+SCS': boolean;
- SBL: boolean;
- PBL: boolean;
- współczesna: boolean;
- kształtowa: boolean;
- historyczna: boolean;
- mieszana: boolean;
- minLevel: number;
- maxLevel: number;
- minOneWayCatenary: number;
- minOneWay: number;
- minTwoWayCatenary: number;
- minTwoWay: number;
- 'no-1track': boolean;
- 'no-2track': boolean;
- 'include-selected': boolean;
- free: boolean;
- occupied: boolean;
- nonPublic: boolean;
- unavailable: boolean;
- abandoned: boolean;
-
- endingStatus: boolean;
- afkStatus: boolean;
- noSpaceStatus: boolean;
- unavailableStatus: boolean;
- unsignedStatus: boolean;
-
- authors: string;
-
- onlineFromHours: number;
-}
+export default interface Filter {
+ [key: string]: boolean | number | string;
+ default: boolean;
+ notDefault: boolean;
+ real: boolean;
+ fictional: boolean;
+ SPK: boolean;
+ SCS: boolean;
+ SPE: boolean;
+ SUP: boolean;
+ noSUP: boolean;
+ ręczne: boolean;
+ 'ręczne+SPK': boolean;
+ 'ręczne+SCS': boolean;
+ mechaniczne: boolean;
+ 'mechaniczne+SPK': boolean;
+ 'mechaniczne+SCS': boolean;
+ SBL: boolean;
+ PBL: boolean;
+ współczesna: boolean;
+ kształtowa: boolean;
+ historyczna: boolean;
+ mieszana: boolean;
+ minLevel: number;
+ maxLevel: number;
+ minOneWayCatenary: number;
+ minOneWay: number;
+ minTwoWayCatenary: number;
+ minTwoWay: number;
+ 'no-1track': boolean;
+ 'no-2track': boolean;
+ 'include-selected': boolean;
+ free: boolean;
+ occupied: boolean;
+ nonPublic: boolean;
+ unavailable: boolean;
+ abandoned: boolean;
+
+ endingStatus: boolean;
+ afkStatus: boolean;
+ noSpaceStatus: boolean;
+ unavailableStatus: boolean;
+ unsignedStatus: boolean;
+
+ authors: string;
+
+ onlineFromHours: number;
+}
diff --git a/src/scripts/interfaces/FilterOption.ts b/src/scripts/interfaces/FilterOption.ts
index 02e8c78..23a9ec8 100644
--- a/src/scripts/interfaces/FilterOption.ts
+++ b/src/scripts/interfaces/FilterOption.ts
@@ -1,6 +1,6 @@
export default interface FilterOption {
- id: string;
- name: string;
- value: boolean;
- defaultValue: boolean;
-}
\ No newline at end of file
+ id: string;
+ name: string;
+ value: boolean;
+ defaultValue: boolean;
+}
diff --git a/src/scripts/interfaces/Scenery.ts b/src/scripts/interfaces/Scenery.ts
index 307cce9..c2d73de 100644
--- a/src/scripts/interfaces/Scenery.ts
+++ b/src/scripts/interfaces/Scenery.ts
@@ -1,33 +1,38 @@
-interface Scenery {
- stationName: string;
- stationURL: string;
- stationLines: string;
- stationProject: string;
-
- reqLevel: string;
- supportersOnly: string;
- signalType: string;
- controlType: string;
- SBL: string;
- twoWayBlock: string;
-
- routesOneWayCatenary: number;
- routesOneWayOther: number;
- routesTwoWayCatenary: number;
- routesToWayOther: number;
-
- default: boolean;
- nonPublic: boolean;
- unavailable: boolean;
- hasData: boolean;
-
- stops: string[];
- checkpoints: string[];
-
- currentDispatcher: string;
- currentDispatcherId: number;
- currentDispatcherFrom: number;
- dispatcherHistory: { dispatcherName: string; dispatcherId: number; dispatcherFrom: number; dispatcherTo: number }[];
-}
-
-export default Scenery;
+interface Scenery {
+ stationName: string;
+ stationURL: string;
+ stationLines: string;
+ stationProject: string;
+
+ reqLevel: string;
+ supportersOnly: string;
+ signalType: string;
+ controlType: string;
+ SBL: string;
+ twoWayBlock: string;
+
+ routesOneWayCatenary: number;
+ routesOneWayOther: number;
+ routesTwoWayCatenary: number;
+ routesToWayOther: number;
+
+ default: boolean;
+ nonPublic: boolean;
+ unavailable: boolean;
+ hasData: boolean;
+
+ stops: string[];
+ checkpoints: string[];
+
+ currentDispatcher: string;
+ currentDispatcherId: number;
+ currentDispatcherFrom: number;
+ dispatcherHistory: {
+ dispatcherName: string;
+ dispatcherId: number;
+ dispatcherFrom: number;
+ dispatcherTo: number;
+ }[];
+}
+
+export default Scenery;
diff --git a/src/scripts/interfaces/ScheduledTrain.ts b/src/scripts/interfaces/ScheduledTrain.ts
index 3c537e8..1637eb4 100644
--- a/src/scripts/interfaces/ScheduledTrain.ts
+++ b/src/scripts/interfaces/ScheduledTrain.ts
@@ -1,41 +1,43 @@
-import TrainStop from './TrainStop';
-
-export enum StopStatus {
- 'arriving' = 'arriving',
- 'departed' = 'departed',
- 'departed-away' = 'departed-away',
- 'online' = 'online',
- 'stopped' = 'stopped',
- 'terminated' = 'terminated',
-}
-
-export interface ScheduledTrain {
- trainId: string;
- trainNo: number;
-
- driverName: string;
- driverId: number;
- currentStationName: string;
- currentStationHash: string;
- category: string;
- stopInfo: TrainStop;
-
- terminatesAt: string;
- beginsAt: string;
-
- prevStationName: string;
- nextStationName: string;
-
- arrivingLine: string | null;
- departureLine: string | null;
-
- prevDepartureLine: string | null;
- nextArrivalLine: string | null;
-
- signal: string;
- connectedTrack: string;
-
- stopLabel: string;
- stopStatus: StopStatus;
- stopStatusID: number;
-}
+import TrainStop from './TrainStop';
+
+export enum StopStatus {
+ 'arriving' = 'arriving',
+ 'departed' = 'departed',
+ 'departed-away' = 'departed-away',
+ 'online' = 'online',
+ 'stopped' = 'stopped',
+ 'terminated' = 'terminated'
+}
+
+export interface ScheduledTrain {
+ checkpointName: string;
+
+ trainId: string;
+ trainNo: number;
+
+ driverName: string;
+ driverId: number;
+ currentStationName: string;
+ currentStationHash: string;
+ category: string;
+ stopInfo: TrainStop;
+
+ terminatesAt: string;
+ beginsAt: string;
+
+ prevStationName: string;
+ nextStationName: string;
+
+ arrivingLine: string | null;
+ departureLine: string | null;
+
+ prevDepartureLine: string | null;
+ nextArrivalLine: string | null;
+
+ signal: string;
+ connectedTrack: string;
+
+ stopLabel: string;
+ stopStatus: StopStatus;
+ stopStatusID: number;
+}
diff --git a/src/scripts/interfaces/Station.ts b/src/scripts/interfaces/Station.ts
index 82e4e8b..8dfa96d 100644
--- a/src/scripts/interfaces/Station.ts
+++ b/src/scripts/interfaces/Station.ts
@@ -1,65 +1,36 @@
-import { Availability } from './store/storeTypes';
-import {ScheduledTrain} from './ScheduledTrain';
-import StationRoutes from './StationRoutes';
-
-export default interface Station {
- name: string;
-
- generalInfo?: {
- name: string;
- url: string;
- abbr: string;
-
- reqLevel: number;
- // supportersOnly: boolean;
-
-
- lines: string;
- project: string;
- projectUrl?: string;
-
- signalType: string;
- controlType: string;
-
- SUP: boolean;
- authors?: string[];
-
- availability: Availability;
- routes: StationRoutes;
-
- checkpoints: {
- checkpointName: string;
- scheduledTrains: ScheduledTrain[];
- }[];
- };
-
- onlineInfo?: {
- hash: string;
- name: string;
- region: string;
-
- maxUsers: number;
- currentUsers: number;
-
- spawns: { spawnName: string; spawnLength: number; isElectrified: boolean }[];
- dispatcherRate: number;
- dispatcherName: string;
- dispatcherExp: number;
- dispatcherId: number;
- dispatcherIsSupporter: boolean;
-
- statusTimestamp: number;
- // statusTimeString: string;
- statusID: string;
-
- stationTrains?: {
- driverName: string;
- driverId: number;
- trainNo: number;
- trainId: string;
- stopStatus?: string;
- }[];
-
- scheduledTrains?: ScheduledTrain[];
- };
-}
+import { Availability, OnlineScenery } from './store/storeTypes';
+import { ScheduledTrain } from './ScheduledTrain';
+import StationRoutes from './StationRoutes';
+
+export default interface Station {
+ name: string;
+
+ generalInfo?: {
+ name: string;
+ url: string;
+ abbr: string;
+
+ reqLevel: number;
+ // supportersOnly: boolean;
+
+ lines: string;
+ project: string;
+ projectUrl?: string;
+
+ signalType: string;
+ controlType: string;
+
+ SUP: boolean;
+ authors?: string[];
+
+ availability: Availability;
+ routes: StationRoutes;
+
+ checkpoints: {
+ checkpointName: string;
+ scheduledTrains: ScheduledTrain[];
+ }[];
+ };
+
+ onlineInfo?: OnlineScenery;
+}
diff --git a/src/scripts/interfaces/StationRoutes.ts b/src/scripts/interfaces/StationRoutes.ts
index b7587ac..2d8fffc 100644
--- a/src/scripts/interfaces/StationRoutes.ts
+++ b/src/scripts/interfaces/StationRoutes.ts
@@ -1,30 +1,30 @@
-export default interface StationRoutes {
- oneWay: {
- name: string;
- catenary: boolean;
- SBL: boolean;
- TWB: boolean;
- isInternal: boolean;
- tracks: number;
- speed: number;
- length: number;
- }[];
-
- twoWay: {
- name: string;
- catenary: boolean;
- SBL: boolean;
- TWB: boolean;
- isInternal: boolean;
- tracks: number;
- speed: number;
- length: number;
- }[];
-
- /* [catenary, noCatenary] */
- oneWayCatenaryRouteNames: string[];
- oneWayNoCatenaryRouteNames: string[];
- twoWayCatenaryRouteNames: string[];
- twoWayNoCatenaryRouteNames: string[];
- sblRouteNames: string[];
-}
+export default interface StationRoutes {
+ oneWay: {
+ name: string;
+ catenary: boolean;
+ SBL: boolean;
+ TWB: boolean;
+ isInternal: boolean;
+ tracks: number;
+ speed: number;
+ length: number;
+ }[];
+
+ twoWay: {
+ name: string;
+ catenary: boolean;
+ SBL: boolean;
+ TWB: boolean;
+ isInternal: boolean;
+ tracks: number;
+ speed: number;
+ length: number;
+ }[];
+
+ /* [catenary, noCatenary] */
+ oneWayCatenaryRouteNames: string[];
+ oneWayNoCatenaryRouteNames: string[];
+ twoWayCatenaryRouteNames: string[];
+ twoWayNoCatenaryRouteNames: string[];
+ sblRouteNames: string[];
+}
diff --git a/src/scripts/interfaces/StoreData.ts b/src/scripts/interfaces/StoreData.ts
index c4f9bd2..77f80cd 100644
--- a/src/scripts/interfaces/StoreData.ts
+++ b/src/scripts/interfaces/StoreData.ts
@@ -1,13 +1,13 @@
-import { DataStatus } from '../enums/DataStatus';
-import Station from './Station';
-import Train from './Train';
-
-export interface StoreData {
- stationList: Station[];
- trainList: Train[];
- dispatcherCount: number;
-
- sceneryDataStatus: DataStatus;
- dispatcherDataStatus: DataStatus;
- trainsDataStatus: DataStatus;
-}
+import { DataStatus } from '../enums/DataStatus';
+import Station from './Station';
+import Train from './Train';
+
+export interface StoreData {
+ stationList: Station[];
+ trainList: Train[];
+ dispatcherCount: number;
+
+ sceneryDataStatus: DataStatus;
+ dispatcherDataStatus: DataStatus;
+ trainsDataStatus: DataStatus;
+}
diff --git a/src/scripts/interfaces/Timetable.ts b/src/scripts/interfaces/Timetable.ts
index e010186..a78931e 100644
--- a/src/scripts/interfaces/Timetable.ts
+++ b/src/scripts/interfaces/Timetable.ts
@@ -1,23 +1,23 @@
-import TrainStop from "./TrainStop";
-
-export default interface Timetable {
- trainNo: number;
-
- success: boolean;
-
- data?: {
- trainNo: number;
- driverName: string;
- driverId: number;
- currentStationName: string;
- currentStationHash: string;
- timetableId: number;
- category: string;
- route: string;
- TWR: boolean;
- SKR: boolean;
- routeDistance: number;
- followingStops: TrainStop[];
- followingSceneries: string[];
- }
-}
+import TrainStop from './TrainStop';
+
+export default interface Timetable {
+ trainNo: number;
+
+ success: boolean;
+
+ data?: {
+ trainNo: number;
+ driverName: string;
+ driverId: number;
+ currentStationName: string;
+ currentStationHash: string;
+ timetableId: number;
+ category: string;
+ route: string;
+ TWR: boolean;
+ SKR: boolean;
+ routeDistance: number;
+ followingStops: TrainStop[];
+ followingSceneries: string[];
+ };
+}
diff --git a/src/scripts/interfaces/Train.ts b/src/scripts/interfaces/Train.ts
index f1a08f0..0aca1f1 100644
--- a/src/scripts/interfaces/Train.ts
+++ b/src/scripts/interfaces/Train.ts
@@ -1,37 +1,37 @@
-import TrainStop from './TrainStop';
-
-export default interface Train {
- trainId: string;
-
- mass: number;
- length: number;
- speed: number;
- signal: string;
- distance: number;
- connectedTrack: string;
- driverId: number;
- trainNo: number;
- driverName: string;
- driverLevel: number;
- currentStationName: string;
- currentStationHash: string;
- locoType: string;
- online: boolean;
- lastSeen: number;
- region: string;
- stockList: string[];
-
- isTimeout: boolean;
- isSupporter: boolean;
-
- timetableData?: {
- timetableId: number;
- category: string;
- route: string;
- followingStops: TrainStop[];
- TWR: boolean;
- SKR: boolean;
- routeDistance: number;
- sceneries: string[];
- };
-}
+import TrainStop from './TrainStop';
+
+export default interface Train {
+ trainId: string;
+
+ mass: number;
+ length: number;
+ speed: number;
+ signal: string;
+ distance: number;
+ connectedTrack: string;
+ driverId: number;
+ trainNo: number;
+ driverName: string;
+ driverLevel: number;
+ currentStationName: string;
+ currentStationHash: string;
+ locoType: string;
+ online: boolean;
+ lastSeen: number;
+ region: string;
+ stockList: string[];
+
+ isTimeout: boolean;
+ isSupporter: boolean;
+
+ timetableData?: {
+ timetableId: number;
+ category: string;
+ route: string;
+ followingStops: TrainStop[];
+ TWR: boolean;
+ SKR: boolean;
+ routeDistance: number;
+ sceneries: string[];
+ };
+}
diff --git a/src/scripts/interfaces/TrainStop.ts b/src/scripts/interfaces/TrainStop.ts
index 3572504..aaec51b 100644
--- a/src/scripts/interfaces/TrainStop.ts
+++ b/src/scripts/interfaces/TrainStop.ts
@@ -1,30 +1,30 @@
-export default interface TrainStop {
- stopName: string;
- stopNameRAW: string;
- stopType: string;
- stopDistance: number;
- mainStop: boolean;
-
- arrivalLine: string | null;
- // arrivalTimeString: string | null;
- arrivalTimestamp: number;
- // arrivalRealTimeString: string | null;
- arrivalRealTimestamp: number;
- arrivalDelay: number;
-
- departureLine: string | null;
- // departureTimeString: string | null;
- departureTimestamp: number;
- // departureRealTimeString: string | null;
- departureRealTimestamp: number;
- departureDelay: number;
- pointId: number;
-
- comments?: any;
-
- beginsHere: boolean;
- terminatesHere: boolean;
- confirmed: boolean;
- stopped: boolean;
- stopTime: number | null;
-}
+export default interface TrainStop {
+ stopName: string;
+ stopNameRAW: string;
+ stopType: string;
+ stopDistance: number;
+ mainStop: boolean;
+
+ arrivalLine: string | null;
+ // arrivalTimeString: string | null;
+ arrivalTimestamp: number;
+ // arrivalRealTimeString: string | null;
+ arrivalRealTimestamp: number;
+ arrivalDelay: number;
+
+ departureLine: string | null;
+ // departureTimeString: string | null;
+ departureTimestamp: number;
+ // departureRealTimeString: string | null;
+ departureRealTimestamp: number;
+ departureDelay: number;
+ pointId: number;
+
+ comments?: any;
+
+ beginsHere: boolean;
+ terminatesHere: boolean;
+ confirmed: boolean;
+ stopped: boolean;
+ stopTime: number | null;
+}
diff --git a/src/scripts/interfaces/Trains/TrainFilter.ts b/src/scripts/interfaces/Trains/TrainFilter.ts
index f27b380..1d68af3 100644
--- a/src/scripts/interfaces/Trains/TrainFilter.ts
+++ b/src/scripts/interfaces/Trains/TrainFilter.ts
@@ -1,7 +1,7 @@
-import { TrainFilterSection, TrainFilterType } from '../../enums/TrainFilterType'
-
-export interface TrainFilter {
- id: TrainFilterType;
- section: TrainFilterSection;
- isActive: boolean;
-}
+import { TrainFilterSection, TrainFilterType } from '../../enums/TrainFilterType';
+
+export interface TrainFilter {
+ id: TrainFilterType;
+ section: TrainFilterSection;
+ isActive: boolean;
+}
diff --git a/src/scripts/interfaces/api/DispatchersAPIData.ts b/src/scripts/interfaces/api/DispatchersAPIData.ts
index 5961188..506957f 100644
--- a/src/scripts/interfaces/api/DispatchersAPIData.ts
+++ b/src/scripts/interfaces/api/DispatchersAPIData.ts
@@ -1,18 +1,18 @@
-export interface DispatcherHistory {
- id: string;
-
- currentDuration: number;
- dispatcherId: number;
- dispatcherName: string;
- dispatcherLevel: number | null;
- dispatcherRate: number;
- dispatcherIsSupporter: boolean;
- dispatcherStatus?: number;
- isOnline: boolean;
- lastOnlineTimestamp: number;
- region: string;
- stationHash: string;
- stationName: string;
- timestampFrom: number;
- timestampTo?: number;
-}
+export interface DispatcherHistory {
+ id: string;
+
+ currentDuration: number;
+ dispatcherId: number;
+ dispatcherName: string;
+ dispatcherLevel: number | null;
+ dispatcherRate: number;
+ dispatcherIsSupporter: boolean;
+ dispatcherStatus?: number;
+ isOnline: boolean;
+ lastOnlineTimestamp: number;
+ region: string;
+ stationHash: string;
+ stationName: string;
+ timestampFrom: number;
+ timestampTo?: number;
+}
diff --git a/src/scripts/interfaces/api/StationAPIData.ts b/src/scripts/interfaces/api/StationAPIData.ts
index 6ddabe9..4de0180 100644
--- a/src/scripts/interfaces/api/StationAPIData.ts
+++ b/src/scripts/interfaces/api/StationAPIData.ts
@@ -1,18 +1,18 @@
-export default interface StationAPIData {
- dispatcherId: number;
- dispatcherName: string;
- dispatcherIsSupporter: boolean;
- stationName: string;
- stationHash: string;
- region: string;
- maxUsers: number;
- currentUsers: number;
- spawn: number;
- lastSeen: number;
- dispatcherExp: number;
- nameFromHeader: string;
- spawnString: string | null;
- networkConnectionString: string;
- isOnline: number;
- dispatcherRate: number;
-}
\ No newline at end of file
+export default interface StationAPIData {
+ dispatcherId: number;
+ dispatcherName: string;
+ dispatcherIsSupporter: boolean;
+ stationName: string;
+ stationHash: string;
+ region: string;
+ maxUsers: number;
+ currentUsers: number;
+ spawn: number;
+ lastSeen: number;
+ dispatcherExp: number;
+ nameFromHeader: string;
+ spawnString: string | null;
+ networkConnectionString: string;
+ isOnline: number;
+ dispatcherRate: number;
+}
diff --git a/src/scripts/interfaces/api/StatsAPIData.ts b/src/scripts/interfaces/api/StatsAPIData.ts
index bcb8596..4fea020 100644
--- a/src/scripts/interfaces/api/StatsAPIData.ts
+++ b/src/scripts/interfaces/api/StatsAPIData.ts
@@ -49,4 +49,3 @@ export interface ITimetablesDailyStatsResponse {
station: string;
}[];
}
-
diff --git a/src/scripts/interfaces/api/TimetablesAPIData.ts b/src/scripts/interfaces/api/TimetablesAPIData.ts
index e64a231..49e9bec 100644
--- a/src/scripts/interfaces/api/TimetablesAPIData.ts
+++ b/src/scripts/interfaces/api/TimetablesAPIData.ts
@@ -1,67 +1,67 @@
-export interface TimetableHistory {
- id: number;
- createdAt: string;
- updatedAt: string;
-
- timetableId: number;
- trainNo: number;
- trainCategoryCode: string;
-
- driverId: number;
- driverName: string;
- driverLevel: number | null;
- driverIsSupporter: boolean;
-
- route: string;
- twr: number;
- skr: number;
- sceneriesString: string;
- currentLocation: string[];
-
- routeDistance: number;
- currentDistance: number;
-
- confirmedStopsCount: number;
- allStopsCount: number;
-
- beginDate: string;
- endDate: string;
-
- scheduledBeginDate: string;
- scheduledEndDate: string;
-
- terminated: boolean;
- fulfilled: boolean;
-
- authorName?: string;
- authorId?: number;
-
- stopsString?: string;
-
- stockString?: string;
- stockHistory: string[];
-
- stockMass?: number;
- stockLength?: number;
- maxSpeed?: number;
-
- hashesString?: string;
- currentSceneryName?: string;
- currentSceneryHash?: string;
-
- routeSceneries?: string;
-
- checkpointArrivals?: string[];
- checkpointDepartures?: string[];
-
- checkpointArrivalsScheduled?: string[];
- checkpointDeparturesScheduled?: string[];
-
- checkpointStopTypes?: string[];
-}
-
-export interface SceneryTimetableHistory {
- timetables: TimetableHistory[];
- // totalCount: number;
- // sceneryName: string;
-}
+export interface TimetableHistory {
+ id: number;
+ createdAt: string;
+ updatedAt: string;
+
+ timetableId: number;
+ trainNo: number;
+ trainCategoryCode: string;
+
+ driverId: number;
+ driverName: string;
+ driverLevel: number | null;
+ driverIsSupporter: boolean;
+
+ route: string;
+ twr: number;
+ skr: number;
+ sceneriesString: string;
+ currentLocation: string[];
+
+ routeDistance: number;
+ currentDistance: number;
+
+ confirmedStopsCount: number;
+ allStopsCount: number;
+
+ beginDate: string;
+ endDate: string;
+
+ scheduledBeginDate: string;
+ scheduledEndDate: string;
+
+ terminated: boolean;
+ fulfilled: boolean;
+
+ authorName?: string;
+ authorId?: number;
+
+ stopsString?: string;
+
+ stockString?: string;
+ stockHistory: string[];
+
+ stockMass?: number;
+ stockLength?: number;
+ maxSpeed?: number;
+
+ hashesString?: string;
+ currentSceneryName?: string;
+ currentSceneryHash?: string;
+
+ routeSceneries?: string;
+
+ checkpointArrivals?: string[];
+ checkpointDepartures?: string[];
+
+ checkpointArrivalsScheduled?: string[];
+ checkpointDeparturesScheduled?: string[];
+
+ checkpointStopTypes?: string[];
+}
+
+export interface SceneryTimetableHistory {
+ timetables: TimetableHistory[];
+ // totalCount: number;
+ // sceneryName: string;
+}
diff --git a/src/scripts/interfaces/api/TimetablesQueryParams.ts b/src/scripts/interfaces/api/TimetablesQueryParams.ts
index 5b67c8f..56bad04 100644
--- a/src/scripts/interfaces/api/TimetablesQueryParams.ts
+++ b/src/scripts/interfaces/api/TimetablesQueryParams.ts
@@ -1,23 +1,23 @@
-import { JournalTimetableSorter } from '../../types/JournalTimetablesTypes';
-
-export interface TimetablesQueryParams {
- driverName?: string;
- trainNo?: string;
- timetableId?: string;
-
- authorName?: string;
- timestampFrom?: number;
- timestampTo?: number;
- issuedFrom?: string;
-
- countFrom?: number;
- countLimit?: number;
-
- fulfilled?: number;
- terminated?: number;
-
- twr?: number;
- skr?: number;
-
- sortBy?: JournalTimetableSorter['id'];
-}
+import { JournalTimetableSorter } from '../../types/JournalTimetablesTypes';
+
+export interface TimetablesQueryParams {
+ driverName?: string;
+ trainNo?: string;
+ timetableId?: string;
+
+ authorName?: string;
+ timestampFrom?: number;
+ timestampTo?: number;
+ issuedFrom?: string;
+
+ countFrom?: number;
+ countLimit?: number;
+
+ fulfilled?: number;
+ terminated?: number;
+
+ twr?: number;
+ skr?: number;
+
+ sortBy?: JournalTimetableSorter['id'];
+}
diff --git a/src/scripts/interfaces/api/TrainAPIData.ts b/src/scripts/interfaces/api/TrainAPIData.ts
index 8e2d97b..c7bbc0d 100644
--- a/src/scripts/interfaces/api/TrainAPIData.ts
+++ b/src/scripts/interfaces/api/TrainAPIData.ts
@@ -1,68 +1,68 @@
-export interface TimetableStop {
- stopName: string;
- stopNameRAW: string;
- stopType: string;
- stopDistance: number;
- pointId: number;
-
- mainStop: boolean;
-
- arrivalLine: string;
- arrivalTimestamp: number;
- arrivalRealTimestamp: number;
- arrivalDelay: number;
-
- departureLine: string;
- departureTimestamp: number;
- departureRealTimestamp: number;
- departureDelay: number;
-
- comments?: any;
-
- beginsHere: boolean;
- terminatesHere: boolean;
- confirmed: boolean;
- stopped: boolean;
- stopTime: number;
-}
-
-export interface TrainTimetable {
- timetableId: number;
- category: string;
- route: string;
-
- stopList: TimetableStop[];
-
- TWR: boolean;
- SKR: boolean;
- sceneries: string[];
-}
-
-export interface TrainAPIData {
- trainNo: number;
-
- mass: number;
- length: number;
- speed: number;
- stockString: string;
-
- signal: string;
- distance: number;
- connectedTrack: string;
-
- driverName: string;
- driverId: number;
- driverIsSupporter: boolean;
- driverLevel?: number;
-
- currentStationName: string;
- currentStationHash: string;
-
- online: boolean;
- lastSeen: number;
-
- region: string;
- isTimeout: boolean;
-
- timetable?: TrainTimetable;
-}
+export interface TimetableStop {
+ stopName: string;
+ stopNameRAW: string;
+ stopType: string;
+ stopDistance: number;
+ pointId: number;
+
+ mainStop: boolean;
+
+ arrivalLine: string;
+ arrivalTimestamp: number;
+ arrivalRealTimestamp: number;
+ arrivalDelay: number;
+
+ departureLine: string;
+ departureTimestamp: number;
+ departureRealTimestamp: number;
+ departureDelay: number;
+
+ comments?: any;
+
+ beginsHere: boolean;
+ terminatesHere: boolean;
+ confirmed: boolean;
+ stopped: boolean;
+ stopTime: number;
+}
+
+export interface TrainTimetable {
+ timetableId: number;
+ category: string;
+ route: string;
+
+ stopList: TimetableStop[];
+
+ TWR: boolean;
+ SKR: boolean;
+ sceneries: string[];
+}
+
+export interface TrainAPIData {
+ trainNo: number;
+
+ mass: number;
+ length: number;
+ speed: number;
+ stockString: string;
+
+ signal: string;
+ distance: number;
+ connectedTrack: string;
+
+ driverName: string;
+ driverId: number;
+ driverIsSupporter: boolean;
+ driverLevel?: number;
+
+ currentStationName: string;
+ currentStationHash: string;
+
+ online: boolean;
+ lastSeen: number;
+
+ region: string;
+ isTimeout: boolean;
+
+ timetable?: TrainTimetable;
+}
diff --git a/src/scripts/interfaces/store/storeTypes.ts b/src/scripts/interfaces/store/storeTypes.ts
index 61cbe85..7b6ea1b 100644
--- a/src/scripts/interfaces/store/storeTypes.ts
+++ b/src/scripts/interfaces/store/storeTypes.ts
@@ -1,93 +1,129 @@
-import { Socket } from 'socket.io-client';
-import { DataStatus } from '../../enums/DataStatus';
-import StationAPIData from '../api/StationAPIData';
-import { TrainAPIData } from '../api/TrainAPIData';
-import Station from '../Station';
-import Train from '../Train';
-import { DispatcherStatsAPIData } from '../api/DispatcherStatsAPIData';
-import { DriverStatsAPIData } from '../api/DriverStatsAPIData';
-import { RollingStockGithubData } from '../github_api/StockInfoGithubData';
-
-export type Availability = 'default' | 'unavailable' | 'nonPublic' | 'abandoned' | 'nonDefault';
-
-export interface StoreState {
- stationList: Station[];
- trainList: Train[];
- apiData: APIData;
- rollingStockData?: RollingStockGithubData;
-
- lastDispatcherStatuses: { hash: string; statusTimestamp: number; statusID: string }[];
-
- sceneryData: any[][];
-
- region: { id: string; value: string };
- trainCount: number;
- stationCount: number;
-
- webSocket?: Socket;
- isOffline: boolean;
-
- dispatcherStatsName: string;
- dispatcherStatsData?: DispatcherStatsAPIData;
-
- driverStatsName: string;
- driverStatsData?: DriverStatsAPIData;
- driverStatsStatus: DataStatus;
-
- chosenModalTrainId?: string;
-
- currentStatsTab: 'daily' | 'driver' | null;
-
- dataStatuses: {
- connection: DataStatus;
- sceneries: DataStatus;
- timetables: DataStatus;
- dispatchers: DataStatus;
- trains: DataStatus;
- };
-
- listenerLaunched: boolean;
- blockScroll: boolean;
- modalLastClickedTarget: EventTarget | null;
-}
-
-export interface APIData {
- stations?: StationAPIData[];
- dispatchers?: string[][];
- trains?: TrainAPIData[];
- connectedSocketCount: number;
-}
-
-export interface StationRoutesInfo {
- routeName: string;
- isElectric: boolean;
- isInternal: boolean;
- isRouteSBL: boolean;
- routeLength: number;
- routeSpeed: number;
- routeTracks: number;
-}
-
-export interface StationJSONData {
- name: string;
- abbr: string;
- url: string;
- lines: string;
- project: string;
- projectUrl: string;
-
- reqLevel: number;
-
- signalType: string;
- controlType: string;
-
- SUP: boolean;
-
- // routes: string;
- routesInfo: StationRoutesInfo[];
-
- checkpoints: string | null;
- authors?: string;
-
- availability: Availability;
-}
+import { Socket } from 'socket.io-client';
+import { DataStatus } from '../../enums/DataStatus';
+import StationAPIData from '../api/StationAPIData';
+import { TrainAPIData } from '../api/TrainAPIData';
+import { DispatcherStatsAPIData } from '../api/DispatcherStatsAPIData';
+import { DriverStatsAPIData } from '../api/DriverStatsAPIData';
+import { RollingStockGithubData } from '../github_api/StockInfoGithubData';
+import Station from '../Station';
+import { ScheduledTrain } from '../ScheduledTrain';
+import { DispatcherStatusID } from '../../enums/DispatcherStatus';
+
+export type Availability = 'default' | 'unavailable' | 'nonPublic' | 'abandoned' | 'nonDefault';
+
+export interface StoreState {
+ stationList: Station[];
+ apiData: APIData;
+ rollingStockData?: RollingStockGithubData;
+
+ lastDispatcherStatuses: { hash: string; statusTimestamp: number; statusID: DispatcherStatusID }[];
+
+ sceneryData: any[][];
+
+ region: { id: string; value: string };
+ trainCount: number;
+ stationCount: number;
+
+ webSocket?: Socket;
+ isOffline: boolean;
+
+ dispatcherStatsName: string;
+ dispatcherStatsData?: DispatcherStatsAPIData;
+
+ driverStatsName: string;
+ driverStatsData?: DriverStatsAPIData;
+ driverStatsStatus: DataStatus;
+
+ chosenModalTrainId?: string;
+
+ currentStatsTab: 'daily' | 'driver' | null;
+
+ dataStatuses: {
+ connection: DataStatus;
+ sceneries: DataStatus;
+ timetables: DataStatus;
+ dispatchers: DataStatus;
+ trains: DataStatus;
+ };
+
+ listenerLaunched: boolean;
+ blockScroll: boolean;
+ modalLastClickedTarget: EventTarget | null;
+}
+
+export interface APIData {
+ stations?: StationAPIData[];
+ dispatchers?: string[][];
+ trains?: TrainAPIData[];
+ connectedSocketCount: number;
+}
+
+export interface StationRoutesInfo {
+ routeName: string;
+ isElectric: boolean;
+ isInternal: boolean;
+ isRouteSBL: boolean;
+ routeLength: number;
+ routeSpeed: number;
+ routeTracks: number;
+}
+
+export interface StationJSONData {
+ name: string;
+ abbr: string;
+ url: string;
+ lines: string;
+ project: string;
+ projectUrl: string;
+
+ reqLevel: number;
+
+ signalType: string;
+ controlType: string;
+
+ SUP: boolean;
+
+ // routes: string;
+ routesInfo: StationRoutesInfo[];
+
+ checkpoints: string | null;
+ authors?: string;
+
+ availability: Availability;
+}
+
+export interface StationTrain {
+ driverName: string;
+ driverId: number;
+ trainNo: number;
+ trainId: string;
+ stopStatus: string;
+}
+
+export interface OnlineScenery {
+ name: string;
+ hash: string;
+ region: string;
+ maxUsers: number;
+ currentUsers: number;
+ spawns: { spawnName: string; spawnLength: number; isElectrified: boolean }[];
+ dispatcherName: string;
+ dispatcherRate: number;
+ dispatcherId: number;
+ dispatcherExp: number;
+ dispatcherIsSupporter: boolean;
+
+ statusTimestamp: number;
+ statusID: DispatcherStatusID;
+
+ isOnline: boolean;
+
+ stationTrains?: StationTrain[];
+ scheduledTrains?: ScheduledTrain[];
+
+ scheduledTrainCount: {
+ all: number;
+ confirmed: number;
+ unconfirmed: number;
+ }
+}
diff --git a/src/scripts/managers/storageManager.ts b/src/scripts/managers/storageManager.ts
index 600193e..38a5071 100644
--- a/src/scripts/managers/storageManager.ts
+++ b/src/scripts/managers/storageManager.ts
@@ -1,49 +1,49 @@
-export default class StorageManager {
- static registerStorage(name: string) {
- window.localStorage.setItem(name, '1');
- }
-
- static unregisterStorage(name: string) {
- window.localStorage.removeItem(name);
- }
-
- static isRegistered(name: string) {
- return window.localStorage.getItem(name) ? true : false;
- }
-
- static setBooleanValue(key: string, val: boolean) {
- window.localStorage.setItem(key, val.toString());
- }
-
- static setNumericValue(key: string, val: number) {
- window.localStorage.setItem(key, val.toString());
- }
-
- static setStringValue(key: string, val: string) {
- window.localStorage.setItem(key, val);
- }
-
- static setValue(key: string, val: any) {
- if (typeof val == 'boolean') this.setBooleanValue(key, val);
- else if (typeof val == 'number') this.setNumericValue(key, val);
- else if (typeof val == 'string') this.setStringValue(key, val);
- else this.setStringValue(key, val);
- }
-
- static removeValue(key: string) {
- window.localStorage.removeItem(key);
- }
-
- static getBooleanValue(key: string): boolean {
- return window.localStorage.getItem(key) === 'true' ? true : false;
- }
-
- static getStringValue(key: string): string {
- return window.localStorage.getItem(key) || '';
- }
-
- static getNumericValue(key: string): number {
- const itemValue = window.localStorage.getItem(key);
- return itemValue ? parseInt(itemValue) : 0;
- }
-}
+export default class StorageManager {
+ static registerStorage(name: string) {
+ window.localStorage.setItem(name, '1');
+ }
+
+ static unregisterStorage(name: string) {
+ window.localStorage.removeItem(name);
+ }
+
+ static isRegistered(name: string) {
+ return window.localStorage.getItem(name) ? true : false;
+ }
+
+ static setBooleanValue(key: string, val: boolean) {
+ window.localStorage.setItem(key, val.toString());
+ }
+
+ static setNumericValue(key: string, val: number) {
+ window.localStorage.setItem(key, val.toString());
+ }
+
+ static setStringValue(key: string, val: string) {
+ window.localStorage.setItem(key, val);
+ }
+
+ static setValue(key: string, val: any) {
+ if (typeof val == 'boolean') this.setBooleanValue(key, val);
+ else if (typeof val == 'number') this.setNumericValue(key, val);
+ else if (typeof val == 'string') this.setStringValue(key, val);
+ else this.setStringValue(key, val);
+ }
+
+ static removeValue(key: string) {
+ window.localStorage.removeItem(key);
+ }
+
+ static getBooleanValue(key: string): boolean {
+ return window.localStorage.getItem(key) === 'true' ? true : false;
+ }
+
+ static getStringValue(key: string): string {
+ return window.localStorage.getItem(key) || '';
+ }
+
+ static getNumericValue(key: string): number {
+ const itemValue = window.localStorage.getItem(key);
+ return itemValue ? parseInt(itemValue) : 0;
+ }
+}
diff --git a/src/scripts/managers/trainFilterManager.ts b/src/scripts/managers/trainFilterManager.ts
index 89ddab6..bb8225c 100644
--- a/src/scripts/managers/trainFilterManager.ts
+++ b/src/scripts/managers/trainFilterManager.ts
@@ -1,130 +1,147 @@
-import { TrainFilter } from '../interfaces/Trains/TrainFilter';
-import { TrainFilterType } from '../enums/TrainFilterType';
-import Train from '../interfaces/Train';
-import TrainStop from '../interfaces/TrainStop';
-
-function confirmedPercentage(stops: TrainStop[] | undefined) {
- if (!stops) return -1;
-
- return Number(((stops.filter((stop) => stop.confirmed).length / stops.length) * 100).toFixed(0));
-}
-
-function currentDelay(stops: TrainStop[] | undefined) {
- if (!stops) return -Infinity;
-
- const delay =
- stops.find((stop, i) => (i == 0 && !stop.confirmed) || (i > 0 && stops[i - 1].confirmed && !stop.confirmed))
- ?.departureDelay || 0;
-
- return delay;
-}
-
-function filterTrainList(trainList: Train[], searchedTrain: string, searchedDriver: string, filters: TrainFilter[]) {
- return trainList.filter((train) => {
- const isFiltered = filters.every((f) => {
- if (f.isActive) return true;
-
- switch (f.id) {
- case TrainFilterType.noTimetable:
- return train.timetableData;
-
- case TrainFilterType.withTimetable:
- return !train.timetableData;
-
- case TrainFilterType.withComments:
- return !train.timetableData?.followingStops.some((stop) => stop.comments);
-
- case TrainFilterType.noComments:
- return train.timetableData?.followingStops.some((stop) => stop.comments);
-
- case TrainFilterType.twr:
- return !train.timetableData?.TWR;
-
- case TrainFilterType.skr:
- return !train.timetableData?.SKR;
-
- case TrainFilterType.common:
- return train.timetableData?.SKR || train.timetableData?.TWR;
-
- case TrainFilterType.passenger:
- return !/^[AMRE]\D{2}$/.test(train.timetableData?.category || '');
-
- case TrainFilterType.freight:
- return !train.timetableData?.category.startsWith('T');
-
- case TrainFilterType.other:
- return !/^[PXZL]\D{2}$/.test(train.timetableData?.category || '');
-
- default:
- return true;
- }
- });
-
- return (
- (searchedTrain.length > 0 ? train.trainNo.toString().startsWith(searchedTrain) : true) &&
- (searchedDriver.length > 0 ? train.driverName.toLowerCase().startsWith(searchedDriver.toLowerCase()) : true) &&
- (!train.timetableData ? train.online : train.timetableData) &&
- isFiltered
- );
- });
-}
-
-function sortTrainList(trainList: Train[], sorterActive: { id: string; dir: number }) {
- return trainList.sort((a: Train, b: Train) => {
- switch (sorterActive.id) {
- case 'id':
- if ((a.timetableData?.timetableId || -1) > (b.timetableData?.timetableId || -1)) return sorterActive.dir;
-
- return -sorterActive.dir;
-
- case 'mass':
- if (a.mass > b.mass) return sorterActive.dir;
- return -sorterActive.dir;
-
- case 'routeDistance':
- if ((a.timetableData?.routeDistance || -1) > (b.timetableData?.routeDistance || -1)) return sorterActive.dir;
-
- return -sorterActive.dir;
-
- case 'progress':
- if (confirmedPercentage(a.timetableData?.followingStops) > confirmedPercentage(b.timetableData?.followingStops))
- return sorterActive.dir;
-
- return -sorterActive.dir;
-
- case 'delay':
- if (currentDelay(a.timetableData?.followingStops) > currentDelay(b.timetableData?.followingStops))
- return sorterActive.dir;
-
- return -sorterActive.dir;
-
- case 'speed':
- if (a.speed > b.speed) return sorterActive.dir;
- return -sorterActive.dir;
-
- case 'timetable':
- if (a.trainNo > b.trainNo) return sorterActive.dir;
- return -sorterActive.dir;
-
- case 'length':
- if (a.length > b.length) return sorterActive.dir;
- return -sorterActive.dir;
-
- default:
- break;
- }
-
- return 0;
- });
-}
-
-export function filteredTrainList(
- trainList: Train[],
- searchedTrain: string,
- searchedDriver: string,
- sorterActive: { id: string; dir: number },
- filters: TrainFilter[]
-) {
- const filtered = filterTrainList(trainList, searchedTrain, searchedDriver, filters);
- return [...sortTrainList(filtered, sorterActive)];
-}
+import { TrainFilter } from '../interfaces/Trains/TrainFilter';
+import { TrainFilterType } from '../enums/TrainFilterType';
+import Train from '../interfaces/Train';
+import TrainStop from '../interfaces/TrainStop';
+
+function confirmedPercentage(stops: TrainStop[] | undefined) {
+ if (!stops) return -1;
+
+ return Number(((stops.filter((stop) => stop.confirmed).length / stops.length) * 100).toFixed(0));
+}
+
+function currentDelay(stops: TrainStop[] | undefined) {
+ if (!stops) return -Infinity;
+
+ const delay =
+ stops.find(
+ (stop, i) =>
+ (i == 0 && !stop.confirmed) || (i > 0 && stops[i - 1].confirmed && !stop.confirmed)
+ )?.departureDelay || 0;
+
+ return delay;
+}
+
+function filterTrainList(
+ trainList: Train[],
+ searchedTrain: string,
+ searchedDriver: string,
+ filters: TrainFilter[]
+) {
+ return trainList.filter((train) => {
+ const isFiltered = filters.every((f) => {
+ if (f.isActive) return true;
+
+ switch (f.id) {
+ case TrainFilterType.noTimetable:
+ return train.timetableData;
+
+ case TrainFilterType.withTimetable:
+ return !train.timetableData;
+
+ case TrainFilterType.withComments:
+ return !train.timetableData?.followingStops.some((stop) => stop.comments);
+
+ case TrainFilterType.noComments:
+ return train.timetableData?.followingStops.some((stop) => stop.comments);
+
+ case TrainFilterType.twr:
+ return !train.timetableData?.TWR;
+
+ case TrainFilterType.skr:
+ return !train.timetableData?.SKR;
+
+ case TrainFilterType.common:
+ return train.timetableData?.SKR || train.timetableData?.TWR;
+
+ case TrainFilterType.passenger:
+ return !/^[AMRE]\D{2}$/.test(train.timetableData?.category || '');
+
+ case TrainFilterType.freight:
+ return !train.timetableData?.category.startsWith('T');
+
+ case TrainFilterType.other:
+ return !/^[PXZL]\D{2}$/.test(train.timetableData?.category || '');
+
+ default:
+ return true;
+ }
+ });
+
+ return (
+ (searchedTrain.length > 0 ? train.trainNo.toString().startsWith(searchedTrain) : true) &&
+ (searchedDriver.length > 0
+ ? train.driverName.toLowerCase().startsWith(searchedDriver.toLowerCase())
+ : true) &&
+ (!train.timetableData ? train.online : train.timetableData) &&
+ isFiltered
+ );
+ });
+}
+
+function sortTrainList(trainList: Train[], sorterActive: { id: string; dir: number }) {
+ return trainList.sort((a: Train, b: Train) => {
+ switch (sorterActive.id) {
+ case 'id':
+ if ((a.timetableData?.timetableId || -1) > (b.timetableData?.timetableId || -1))
+ return sorterActive.dir;
+
+ return -sorterActive.dir;
+
+ case 'mass':
+ if (a.mass > b.mass) return sorterActive.dir;
+ return -sorterActive.dir;
+
+ case 'routeDistance':
+ if ((a.timetableData?.routeDistance || -1) > (b.timetableData?.routeDistance || -1))
+ return sorterActive.dir;
+
+ return -sorterActive.dir;
+
+ case 'progress':
+ if (
+ confirmedPercentage(a.timetableData?.followingStops) >
+ confirmedPercentage(b.timetableData?.followingStops)
+ )
+ return sorterActive.dir;
+
+ return -sorterActive.dir;
+
+ case 'delay':
+ if (
+ currentDelay(a.timetableData?.followingStops) >
+ currentDelay(b.timetableData?.followingStops)
+ )
+ return sorterActive.dir;
+
+ return -sorterActive.dir;
+
+ case 'speed':
+ if (a.speed > b.speed) return sorterActive.dir;
+ return -sorterActive.dir;
+
+ case 'timetable':
+ if (a.trainNo > b.trainNo) return sorterActive.dir;
+ return -sorterActive.dir;
+
+ case 'length':
+ if (a.length > b.length) return sorterActive.dir;
+ return -sorterActive.dir;
+
+ default:
+ break;
+ }
+
+ return 0;
+ });
+}
+
+export function filteredTrainList(
+ trainList: Train[],
+ searchedTrain: string,
+ searchedDriver: string,
+ sorterActive: { id: string; dir: number },
+ filters: TrainFilter[]
+) {
+ const filtered = filterTrainList(trainList, searchedTrain, searchedDriver, filters);
+ return [...sortTrainList(filtered, sorterActive)];
+}
diff --git a/src/scripts/types/JournalDispatcherTypes.ts b/src/scripts/types/JournalDispatcherTypes.ts
index 2c101e4..d2d67bd 100644
--- a/src/scripts/types/JournalDispatcherTypes.ts
+++ b/src/scripts/types/JournalDispatcherTypes.ts
@@ -1,8 +1,8 @@
-export type JournalDispatcherSearcher = {
- [key in 'search-dispatcher' | 'search-station' | 'search-date']: string;
-};
-
-export interface JournalDispatcherSorter {
- id: 'timestampFrom' | 'duration';
- dir: -1 | 1;
-}
\ No newline at end of file
+export type JournalDispatcherSearcher = {
+ [key in 'search-dispatcher' | 'search-station' | 'search-date']: string;
+};
+
+export interface JournalDispatcherSorter {
+ id: 'timestampFrom' | 'duration';
+ dir: -1 | 1;
+}
diff --git a/src/scripts/types/JournalTimetablesTypes.ts b/src/scripts/types/JournalTimetablesTypes.ts
index be5519b..2a698d4 100644
--- a/src/scripts/types/JournalTimetablesTypes.ts
+++ b/src/scripts/types/JournalTimetablesTypes.ts
@@ -1,25 +1,25 @@
-import { JournalFilterType } from '../../scripts/enums/JournalFilterType';
-
-export type JournalTimetableSearchKey =
- | 'search-driver'
- | 'search-train'
- | 'search-date'
- | 'search-dispatcher'
- | 'search-issuedFrom';
-
-export type JournalTimetableSorterKey = 'timetableId' | 'beginDate' | 'distance' | 'total-stops';
-
-export type JournalTimetableSearchType = {
- [key in JournalTimetableSearchKey]: string;
-};
-
-export interface JournalFilter {
- id: JournalFilterType;
- filterSection: string;
- isActive: boolean;
-}
-
-export interface JournalTimetableSorter {
- id: JournalTimetableSorterKey;
- dir: 'asc' | 'desc';
-}
+import { JournalFilterType } from '../../scripts/enums/JournalFilterType';
+
+export type JournalTimetableSearchKey =
+ | 'search-driver'
+ | 'search-train'
+ | 'search-date'
+ | 'search-dispatcher'
+ | 'search-issuedFrom';
+
+export type JournalTimetableSorterKey = 'timetableId' | 'beginDate' | 'distance' | 'total-stops';
+
+export type JournalTimetableSearchType = {
+ [key in JournalTimetableSearchKey]: string;
+};
+
+export interface JournalFilter {
+ id: JournalFilterType;
+ filterSection: string;
+ isActive: boolean;
+}
+
+export interface JournalTimetableSorter {
+ id: JournalTimetableSorterKey;
+ dir: 'asc' | 'desc';
+}
diff --git a/src/scripts/utils/apiURLs.ts b/src/scripts/utils/apiURLs.ts
index 35d88c9..c8ddcec 100644
--- a/src/scripts/utils/apiURLs.ts
+++ b/src/scripts/utils/apiURLs.ts
@@ -1,7 +1,7 @@
-export const URLs = {
- stacjownikAPI:
- import.meta.env.VITE_APP_API_DEV === "1" && !import.meta.env.PROD
- ? 'http://localhost:3001'
- : 'https://stacjownik.spythere.pl',
- stacjownikAPIDev: 'localhost:3000',
-};
+export const URLs = {
+ stacjownikAPI:
+ import.meta.env.VITE_APP_API_DEV === '1' && !import.meta.env.PROD
+ ? 'http://localhost:3001'
+ : 'https://stacjownik.spythere.pl',
+ stacjownikAPIDev: 'localhost:3000'
+};
diff --git a/src/scripts/utils/filterUtils.ts b/src/scripts/utils/filterUtils.ts
index 9ffde9b..c55c3ae 100644
--- a/src/scripts/utils/filterUtils.ts
+++ b/src/scripts/utils/filterUtils.ts
@@ -1,156 +1,183 @@
-import { HeadIdsTypes } from '../data/stationHeaderNames';
-import Filter from '../interfaces/Filter';
-import Station from '../interfaces/Station';
-
-export const sortStations = (a: Station, b: Station, sorter: { headerName: HeadIdsTypes; dir: number }) => {
- let diff = 0;
-
- switch (sorter.headerName) {
- case 'station':
- return sorter.dir == 1 ? a.name.localeCompare(b.name) : b.name.localeCompare(a.name);
-
- case 'min-lvl':
- diff = (a.generalInfo?.reqLevel || 0) - (b.generalInfo?.reqLevel || 0);
- break;
-
- case 'status':
- diff = (a.onlineInfo?.statusTimestamp || 0) - (b.onlineInfo?.statusTimestamp || 0);
- break;
-
- case 'dispatcher':
- if ((a.onlineInfo?.dispatcherName.toLowerCase() || '') > (b.onlineInfo?.dispatcherName.toLowerCase() || ''))
- return sorter.dir;
- if ((a.onlineInfo?.dispatcherName.toLowerCase() || '') < (b.onlineInfo?.dispatcherName.toLowerCase() || ''))
- return -sorter.dir;
- break;
-
- case 'dispatcher-lvl':
- diff = (a.onlineInfo?.dispatcherExp || 0) - (b.onlineInfo?.dispatcherExp || 0);
- break;
-
- case 'user':
- diff = (b.onlineInfo ? b.onlineInfo.currentUsers : -1) - (a.onlineInfo ? a.onlineInfo.currentUsers : -1);
- break;
-
- case 'spawn':
- diff = (a.onlineInfo ? a.onlineInfo.spawns.length : -1) - (b.onlineInfo ? b.onlineInfo.spawns.length : -1);
- break;
-
- case 'timetableConfirmed':
- diff =
- (a.onlineInfo?.scheduledTrains
- ? a.onlineInfo.scheduledTrains.filter((train) => train.stopInfo.confirmed).length
- : -1) -
- (b.onlineInfo?.scheduledTrains
- ? b.onlineInfo.scheduledTrains.filter((train) => train.stopInfo.confirmed).length
- : -1);
- break;
-
- case 'timetableUnconfirmed':
- diff =
- (a.onlineInfo?.scheduledTrains
- ? a.onlineInfo.scheduledTrains.filter((train) => !train.stopInfo.confirmed).length
- : -1) -
- (b.onlineInfo?.scheduledTrains
- ? b.onlineInfo.scheduledTrains.filter((train) => !train.stopInfo.confirmed).length
- : -1);
- break;
-
- case 'timetableAll':
- diff =
- (a.onlineInfo?.scheduledTrains ? a.onlineInfo.scheduledTrains.length : -1) -
- (b.onlineInfo?.scheduledTrains ? b.onlineInfo.scheduledTrains.length : -1);
- break;
-
- default:
- break;
- }
-
- if (diff != 0) return Math.sign(diff) * sorter.dir;
- return a.name.localeCompare(b.name);
-};
-
-export const filterStations = (station: Station, filters: Filter) => {
- if (!station.onlineInfo && filters['free']) return false;
-
- if (station.onlineInfo) {
- const { statusID, statusTimestamp } = station.onlineInfo;
-
- const isEnding = statusID == 'ending' && filters['endingStatus'];
- const isNotSigned = (statusID == 'not-signed' || statusID == 'unavailable') && filters['unavailableStatus'];
- const isAFK = statusID == 'brb' && filters['afkStatus'];
- const isNoSpace = statusID == 'no-space' && filters['noSpaceStatus'];
- const isOccupied = station.onlineInfo && filters['occupied'];
-
- const isOnlineInBounds =
- (filters['onlineFromHours'] < 8 &&
- statusTimestamp > 0 &&
- statusTimestamp <= Date.now() + filters['onlineFromHours'] * 3600000) ||
- (filters['onlineFromHours'] > 0 && statusTimestamp <= 0) ||
- (filters['onlineFromHours'] == 8 && statusID != 'no-limit');
-
- if (isEnding || isOnlineInBounds || isNotSigned || isAFK || isNoSpace || isOccupied) return false;
- }
-
- if ((station.generalInfo?.availability == 'nonPublic' || !station.generalInfo) && filters['nonPublic']) return false;
-
- if (station.generalInfo) {
- const { routes, availability, controlType, lines, reqLevel, signalType, SUP, authors } = station.generalInfo;
-
- if (availability == 'unavailable' && filters['unavailable'] && !station.onlineInfo) return false;
- if (availability == 'abandoned' && filters['abandoned'] && !station.onlineInfo) return false;
- if (availability == 'default' && filters['default']) return false;
-
- if (
- availability != 'default' &&
- filters['notDefault'] &&
- !(availability == 'abandoned' || availability == 'unavailable')
- )
- return false;
-
- if (filters['real'] && lines) return false;
- if (filters['fictional'] && !lines) return false;
-
- const otherAvailability =
- availability == 'nonPublic' || availability == 'unavailable' || availability == 'abandoned';
-
- if (reqLevel + (otherAvailability ? 1 : 0) < filters['minLevel']) return false;
-
- if (reqLevel + (otherAvailability ? 1 : 0) > filters['maxLevel']) return false;
-
- if (
- filters['no-1track'] &&
- (routes.oneWayCatenaryRouteNames.length != 0 || routes.oneWayNoCatenaryRouteNames.length != 0)
- )
- return false;
-
- if (
- filters['no-2track'] &&
- (routes.twoWayCatenaryRouteNames.length != 0 || routes.twoWayNoCatenaryRouteNames.length != 0)
- )
- return false;
-
- if (routes.oneWayCatenaryRouteNames.length < filters['minOneWayCatenary']) return false;
- if (routes.oneWayNoCatenaryRouteNames.length < filters['minOneWay']) return false;
-
- if (routes.twoWayCatenaryRouteNames.length < filters['minTwoWayCatenary']) return false;
- if (routes.twoWayNoCatenaryRouteNames.length < filters['minTwoWay']) return false;
-
- if (filters[controlType]) return false;
- if (filters[signalType]) return false;
-
- if (filters['SUP'] && SUP) return false;
- if (filters['noSUP'] && !SUP) return false;
-
- if (filters['SBL'] && routes.sblRouteNames.length > 0) return false;
- if (filters['PBL'] && routes.sblRouteNames.length == 0) return false;
-
- if (
- filters['authors'].length > 3 &&
- !authors?.map((a) => a.toLocaleLowerCase()).includes(filters['authors'].toLocaleLowerCase())
- )
- return false;
- }
-
- return true;
-};
+import { HeadIdsTypes } from '../data/stationHeaderNames';
+import { DispatcherStatusID } from '../enums/DispatcherStatus';
+import Filter from '../interfaces/Filter';
+import Station from '../interfaces/Station';
+
+export const sortStations = (
+ a: Station,
+ b: Station,
+ sorter: { headerName: HeadIdsTypes; dir: number }
+) => {
+ let diff = 0;
+
+ switch (sorter.headerName) {
+ case 'station':
+ return sorter.dir == 1 ? a.name.localeCompare(b.name) : b.name.localeCompare(a.name);
+
+ case 'min-lvl':
+ diff = (a.generalInfo?.reqLevel || 0) - (b.generalInfo?.reqLevel || 0);
+ break;
+
+ case 'status':
+ diff = (a.onlineInfo?.statusTimestamp || 0) - (b.onlineInfo?.statusTimestamp || 0);
+ break;
+
+ case 'dispatcher':
+ if (
+ (a.onlineInfo?.dispatcherName.toLowerCase() || '') >
+ (b.onlineInfo?.dispatcherName.toLowerCase() || '')
+ )
+ return sorter.dir;
+ if (
+ (a.onlineInfo?.dispatcherName.toLowerCase() || '') <
+ (b.onlineInfo?.dispatcherName.toLowerCase() || '')
+ )
+ return -sorter.dir;
+ break;
+
+ case 'dispatcher-lvl':
+ diff = (a.onlineInfo?.dispatcherExp || 0) - (b.onlineInfo?.dispatcherExp || 0);
+ break;
+
+ case 'user':
+ diff =
+ (b.onlineInfo ? b.onlineInfo.currentUsers : -1) -
+ (a.onlineInfo ? a.onlineInfo.currentUsers : -1);
+ break;
+
+ case 'spawn':
+ diff =
+ (a.onlineInfo ? a.onlineInfo.spawns.length : -1) -
+ (b.onlineInfo ? b.onlineInfo.spawns.length : -1);
+ break;
+
+ case 'timetableConfirmed':
+ diff =
+ (a.onlineInfo?.scheduledTrains
+ ? a.onlineInfo.scheduledTrains.filter((train) => train.stopInfo.confirmed).length
+ : -1) -
+ (b.onlineInfo?.scheduledTrains
+ ? b.onlineInfo.scheduledTrains.filter((train) => train.stopInfo.confirmed).length
+ : -1);
+ break;
+
+ case 'timetableUnconfirmed':
+ diff =
+ (a.onlineInfo?.scheduledTrains
+ ? a.onlineInfo.scheduledTrains.filter((train) => !train.stopInfo.confirmed).length
+ : -1) -
+ (b.onlineInfo?.scheduledTrains
+ ? b.onlineInfo.scheduledTrains.filter((train) => !train.stopInfo.confirmed).length
+ : -1);
+ break;
+
+ case 'timetableAll':
+ diff =
+ (a.onlineInfo?.scheduledTrains ? a.onlineInfo.scheduledTrains.length : -1) -
+ (b.onlineInfo?.scheduledTrains ? b.onlineInfo.scheduledTrains.length : -1);
+ break;
+
+ default:
+ break;
+ }
+
+ if (diff != 0) return Math.sign(diff) * sorter.dir;
+ return a.name.localeCompare(b.name);
+};
+
+export const filterStations = (station: Station, filters: Filter) => {
+ if (!station.onlineInfo && filters['free']) return false;
+
+ if (station.onlineInfo) {
+ const { statusID, statusTimestamp } = station.onlineInfo;
+
+ const isEnding = statusID == DispatcherStatusID.Ending && filters['endingStatus'];
+
+ const isNotSigned =
+ (statusID == 'not-signed' || statusID == 'unavailable') && filters['unavailableStatus'];
+
+ const isAFK = statusID == 'brb' && filters['afkStatus'];
+
+ const isNoSpace = statusID == 'no-space' && filters['noSpaceStatus'];
+
+ const isOccupied = station.onlineInfo && filters['occupied'];
+
+ const isOnlineInBounds =
+ (filters['onlineFromHours'] < 8 &&
+ statusTimestamp > 0 &&
+ statusTimestamp <= Date.now() + filters['onlineFromHours'] * 3600000) ||
+ (filters['onlineFromHours'] > 0 && statusTimestamp <= 0) ||
+ (filters['onlineFromHours'] == 8 && statusID != 'no-limit');
+
+ if (isEnding || isOnlineInBounds || isNotSigned || isAFK || isNoSpace || isOccupied)
+ return false;
+ }
+
+ if (
+ (station.generalInfo?.availability == 'nonPublic' || !station.generalInfo) &&
+ filters['nonPublic']
+ )
+ return false;
+
+ if (station.generalInfo) {
+ const { routes, availability, controlType, lines, reqLevel, signalType, SUP, authors } =
+ station.generalInfo;
+
+ if (availability == 'unavailable' && filters['unavailable'] && !station.onlineInfo)
+ return false;
+ if (availability == 'abandoned' && filters['abandoned'] && !station.onlineInfo) return false;
+ if (availability == 'default' && filters['default']) return false;
+
+ if (
+ availability != 'default' &&
+ filters['notDefault'] &&
+ !(availability == 'abandoned' || availability == 'unavailable')
+ )
+ return false;
+
+ if (filters['real'] && lines) return false;
+ if (filters['fictional'] && !lines) return false;
+
+ const otherAvailability =
+ availability == 'nonPublic' || availability == 'unavailable' || availability == 'abandoned';
+
+ if (reqLevel + (otherAvailability ? 1 : 0) < filters['minLevel']) return false;
+
+ if (reqLevel + (otherAvailability ? 1 : 0) > filters['maxLevel']) return false;
+
+ if (
+ filters['no-1track'] &&
+ (routes.oneWayCatenaryRouteNames.length != 0 || routes.oneWayNoCatenaryRouteNames.length != 0)
+ )
+ return false;
+
+ if (
+ filters['no-2track'] &&
+ (routes.twoWayCatenaryRouteNames.length != 0 || routes.twoWayNoCatenaryRouteNames.length != 0)
+ )
+ return false;
+
+ if (routes.oneWayCatenaryRouteNames.length < filters['minOneWayCatenary']) return false;
+ if (routes.oneWayNoCatenaryRouteNames.length < filters['minOneWay']) return false;
+
+ if (routes.twoWayCatenaryRouteNames.length < filters['minTwoWayCatenary']) return false;
+ if (routes.twoWayNoCatenaryRouteNames.length < filters['minTwoWay']) return false;
+
+ if (filters[controlType]) return false;
+ if (filters[signalType]) return false;
+
+ if (filters['SUP'] && SUP) return false;
+ if (filters['noSUP'] && !SUP) return false;
+
+ if (filters['SBL'] && routes.sblRouteNames.length > 0) return false;
+ if (filters['PBL'] && routes.sblRouteNames.length == 0) return false;
+
+ if (
+ filters['authors'].length > 3 &&
+ !authors?.map((a) => a.toLocaleLowerCase()).includes(filters['authors'].toLocaleLowerCase())
+ )
+ return false;
+ }
+
+ return true;
+};
diff --git a/src/scripts/utils/storeUtils.ts b/src/scripts/utils/storeUtils.ts
index 4dea77e..38520f7 100644
--- a/src/scripts/utils/storeUtils.ts
+++ b/src/scripts/utils/storeUtils.ts
@@ -1,197 +1,332 @@
-import { ScheduledTrain, StopStatus } from '../interfaces/ScheduledTrain';
-import Train from '../interfaces/Train';
-import TrainStop from '../interfaces/TrainStop';
-
-export const getLocoURL = (locoType: string): string => `https://rj.td2.info.pl/dist/img/thumbnails/${locoType.includes('EN') ? locoType + 'rb' : locoType}.png`;
-
-export const getStatusID = (stationStatus: any): string => {
- if (!stationStatus) return 'unknown';
- if (stationStatus == -1) return 'not-signed';
-
- const statusCode = stationStatus[2];
- const statusTimestamp = stationStatus[3];
-
- switch (statusCode) {
- case 0:
- if (statusTimestamp - Date.now() > 21000000) return 'no-limit';
-
- return 'online';
-
- case 1:
- return 'brb';
-
- case 2:
- if (statusTimestamp == 0) return 'ending';
- break;
-
- case 3:
- return 'no-space';
-
- default:
- break;
- }
-
- return 'unavailable';
-};
-
-export const getStatusTimestamp = (stationStatus: any): number => {
- if (!stationStatus) return -2;
-
- const statusCode = stationStatus[2];
- const statusTimestamp = stationStatus[3];
-
- switch (statusCode) {
- case 0:
- case 1:
- case 3:
- return statusTimestamp;
-
- case 2:
- if (statusTimestamp == 0) return 0;
- break;
-
- default:
- break;
- }
-
- return -1;
-};
-
-export const parseSpawns = (spawnString: string | null) => {
- if (!spawnString) return [];
- if (spawnString === 'NO_SPAWN') return [];
-
- return spawnString.split(';').map((spawn) => {
- const spawnArray = spawn.split(',');
- const spawnName = spawnArray[6] ? spawnArray[6] : spawnArray[0];
- const spawnLength = parseInt(spawnArray[2]);
- const isElectrified = spawnArray[3] == 'True';
-
- return { spawnName, spawnLength, isElectrified };
- });
-};
-
-export const getTimestamp = (date: string | null): number => (date ? new Date(date).getTime() : 0);
-
-export const getTrainStopStatus = (stopInfo: TrainStop, currentStationName: string, stationName: string) => {
- let stopStatus = StopStatus['arriving'],
- stopLabel = '',
- stopStatusID = -1;
-
- if (stopInfo.terminatesHere && stopInfo.confirmed) {
- stopStatus = StopStatus['terminated'];
- stopLabel = 'Skończył bieg';
- stopStatusID = 5;
- } else if (!stopInfo.terminatesHere && stopInfo.confirmed && currentStationName == stationName) {
- stopStatus = StopStatus['departed'];
- stopLabel = 'Odprawiony';
- stopStatusID = 2;
- } else if (!stopInfo.terminatesHere && stopInfo.confirmed && currentStationName != stationName) {
- stopStatus = StopStatus['departed-away'];
- stopLabel = 'Odjechał';
- stopStatusID = 4;
- } else if (currentStationName == stationName && !stopInfo.stopped) {
- stopStatus = StopStatus['online'];
- stopLabel = 'Na stacji';
- stopStatusID = 0;
- } else if (currentStationName == stationName && stopInfo.stopped) {
- stopStatus = StopStatus['stopped'];
- stopLabel = 'Postój';
- stopStatusID = 1;
- } else if (currentStationName != stationName) {
- stopStatus = StopStatus['arriving'];
- stopLabel = 'W drodze';
- stopStatusID = 3;
- }
-
- return { stopStatus, stopLabel, stopStatusID };
-};
-
-export function getScheduledTrain(train: Train, trainStopIndex: number, stationName: string): ScheduledTrain {
- const timetable = train.timetableData!;
- const followingStops = timetable.followingStops;
- const trainStop = followingStops[trainStopIndex];
-
- const trainStopStatus = getTrainStopStatus(trainStop, train.currentStationName, stationName);
-
- let prevStationName = '',
- nextStationName = '';
-
- let prevDepartureLine: string | null = null,
- nextArrivalLine: string | null = null;
-
- for (let i = trainStopIndex - 1; i >= 0; i--) {
- if (/strong|podg/g.test(followingStops[i].stopName)) {
- prevStationName = followingStops[i].stopNameRAW.replace(/,.*/g, '');
-
- break;
- }
- }
-
- for (let i = trainStopIndex + 1; i < followingStops.length; i++) {
- if (/strong|podg/g.test(followingStops[i].stopName)) {
- nextStationName = followingStops[i].stopNameRAW.replace(/,.*/g, '');
-
- break;
- }
- }
-
- let departureLine: string | null = null;
- let arrivingLine: string | null = null;
-
- for (let i = trainStopIndex; i < followingStops.length; i++) {
- const currentStop = followingStops[i];
-
- if (currentStop.departureLine == null) continue;
-
- if (!/-|_|it|sbl/gi.test(currentStop.departureLine)) {
- departureLine = currentStop.departureLine;
- nextArrivalLine = followingStops[i + 1]?.arrivalLine || null;
-
- break;
- }
- }
-
- for (let i = trainStopIndex; i >= 0; i--) {
- const currentStop = followingStops[i];
-
- if (currentStop.arrivalLine == null) continue;
-
- if (!/-|_|it|sbl/gi.test(currentStop.arrivalLine)) {
- arrivingLine = currentStop.arrivalLine;
- prevDepartureLine = followingStops[i - 1]?.departureLine || null;
-
- break;
- }
- }
-
- return {
- trainNo: train.trainNo,
- trainId: train.trainId,
-
- signal: train.signal,
- connectedTrack: train.connectedTrack,
-
- driverName: train.driverName,
- driverId: train.driverId,
- currentStationName: train.currentStationName,
- currentStationHash: train.currentStationHash,
- category: timetable.category,
- beginsAt: timetable.followingStops[0].stopNameRAW,
- terminatesAt: timetable.followingStops[timetable.followingStops.length - 1].stopNameRAW,
-
- nextStationName,
- prevStationName,
-
- stopInfo: trainStop,
- stopLabel: trainStopStatus.stopLabel,
- stopStatus: trainStopStatus.stopStatus,
- stopStatusID: trainStopStatus.stopStatusID,
-
- arrivingLine,
- departureLine,
-
- nextArrivalLine,
- prevDepartureLine,
- };
-}
+import { DispatcherStatusID } from '../enums/DispatcherStatus';
+import { ScheduledTrain, StopStatus } from '../interfaces/ScheduledTrain';
+import Station from '../interfaces/Station';
+import Train from '../interfaces/Train';
+import TrainStop from '../interfaces/TrainStop';
+import StationAPIData from '../interfaces/api/StationAPIData';
+import { StationTrain, StoreState } from '../interfaces/store/storeTypes';
+
+export const getLocoURL = (locoType: string): string =>
+ `https://rj.td2.info.pl/dist/img/thumbnails/${
+ locoType.includes('EN') ? locoType + 'rb' : locoType
+ }.png`;
+
+export const getStatusID = (
+ stationStatus: any[] | undefined,
+ isSWDROnline: boolean
+): DispatcherStatusID => {
+ if (isSWDROnline && !stationStatus) return DispatcherStatusID.Unauthorized;
+ if (!stationStatus) return DispatcherStatusID.Unknown;
+
+ // if (stationStatus == -1) return DispatcherStatusID.Unauthorized;
+
+ const statusCode = stationStatus[2];
+ const statusTimestamp = stationStatus[3];
+
+ switch (statusCode) {
+ case 0:
+ if (statusTimestamp - Date.now() > 21000000) return DispatcherStatusID.OnlineNoLimit;
+
+ return DispatcherStatusID.OnlineWithHours;
+
+ case 1:
+ return DispatcherStatusID.Afk;
+
+ case 2:
+ if (statusTimestamp == 0) return DispatcherStatusID.Ending;
+ break;
+
+ case 3:
+ return DispatcherStatusID.NoSpace;
+
+ default:
+ break;
+ }
+
+ return DispatcherStatusID.Unavailable;
+};
+
+export const getStatusTimestamp = (stationStatus: any): number => {
+ if (!stationStatus) return -2;
+
+ const statusCode = stationStatus[2];
+ const statusTimestamp = stationStatus[3];
+
+ switch (statusCode) {
+ case 0:
+ case 1:
+ case 3:
+ return statusTimestamp;
+
+ case 2:
+ if (statusTimestamp == 0) return 0;
+ break;
+
+ default:
+ break;
+ }
+
+ return -1;
+};
+
+export const parseSpawns = (spawnString: string | null) => {
+ if (!spawnString) return [];
+ if (spawnString === 'NO_SPAWN') return [];
+
+ return spawnString.split(';').map((spawn) => {
+ const spawnArray = spawn.split(',');
+ const spawnName = spawnArray[6] ? spawnArray[6] : spawnArray[0];
+ const spawnLength = parseInt(spawnArray[2]);
+ const isElectrified = spawnArray[3] == 'True';
+
+ return { spawnName, spawnLength, isElectrified };
+ });
+};
+
+export const getTimestamp = (date: string | null): number => (date ? new Date(date).getTime() : 0);
+
+export const getTrainStopStatus = (
+ stopInfo: TrainStop,
+ currentStationName: string,
+ sceneryName: string
+) => {
+ let stopStatus = StopStatus['arriving'],
+ stopLabel = '',
+ stopStatusID = -1;
+
+ if (stopInfo.terminatesHere && stopInfo.confirmed) {
+ stopStatus = StopStatus['terminated'];
+ stopLabel = 'Skończył bieg';
+ stopStatusID = 5;
+ } else if (!stopInfo.terminatesHere && stopInfo.confirmed && currentStationName == sceneryName) {
+ stopStatus = StopStatus['departed'];
+ stopLabel = 'Odprawiony';
+ stopStatusID = 2;
+ } else if (!stopInfo.terminatesHere && stopInfo.confirmed && currentStationName != sceneryName) {
+ stopStatus = StopStatus['departed-away'];
+ stopLabel = 'Odjechał';
+ stopStatusID = 4;
+ } else if (currentStationName == sceneryName && !stopInfo.stopped) {
+ stopStatus = StopStatus['online'];
+ stopLabel = 'Na stacji';
+ stopStatusID = 0;
+ } else if (currentStationName == sceneryName && stopInfo.stopped) {
+ stopStatus = StopStatus['stopped'];
+ stopLabel = 'Postój';
+ stopStatusID = 1;
+ } else if (currentStationName != sceneryName) {
+ stopStatus = StopStatus['arriving'];
+ stopLabel = 'W drodze';
+ stopStatusID = 3;
+ }
+
+ return { stopStatus, stopLabel, stopStatusID };
+};
+
+export function getCheckpointTrain(
+ train: Train,
+ trainStopIndex: number,
+ sceneryName: string
+): ScheduledTrain {
+ const timetable = train.timetableData!;
+ const followingStops = timetable.followingStops;
+ const trainStop = followingStops[trainStopIndex];
+
+ const trainStopStatus = getTrainStopStatus(trainStop, train.currentStationName, sceneryName);
+
+ let prevStationName = '',
+ nextStationName = '';
+
+ let prevDepartureLine: string | null = null,
+ nextArrivalLine: string | null = null;
+
+ for (let i = trainStopIndex - 1; i >= 0; i--) {
+ if (/strong|podg/g.test(followingStops[i].stopName)) {
+ prevStationName = followingStops[i].stopNameRAW.replace(/,.*/g, '');
+
+ break;
+ }
+ }
+
+ for (let i = trainStopIndex + 1; i < followingStops.length; i++) {
+ if (/strong|podg/g.test(followingStops[i].stopName)) {
+ nextStationName = followingStops[i].stopNameRAW.replace(/,.*/g, '');
+
+ break;
+ }
+ }
+
+ let departureLine: string | null = null;
+ let arrivingLine: string | null = null;
+
+ for (let i = trainStopIndex; i < followingStops.length; i++) {
+ const currentStop = followingStops[i];
+
+ if (currentStop.departureLine == null) continue;
+
+ if (!/-|_|it|sbl/gi.test(currentStop.departureLine)) {
+ departureLine = currentStop.departureLine;
+ nextArrivalLine = followingStops[i + 1]?.arrivalLine || null;
+
+ break;
+ }
+ }
+
+ for (let i = trainStopIndex; i >= 0; i--) {
+ const currentStop = followingStops[i];
+
+ if (currentStop.arrivalLine == null) continue;
+
+ if (!/-|_|it|sbl/gi.test(currentStop.arrivalLine)) {
+ arrivingLine = currentStop.arrivalLine;
+ prevDepartureLine = followingStops[i - 1]?.departureLine || null;
+
+ break;
+ }
+ }
+
+ return {
+ checkpointName: trainStop.stopNameRAW,
+
+ trainNo: train.trainNo,
+ trainId: train.trainId,
+
+ signal: train.signal,
+ connectedTrack: train.connectedTrack,
+
+ driverName: train.driverName,
+ driverId: train.driverId,
+ currentStationName: train.currentStationName,
+ currentStationHash: train.currentStationHash,
+ category: timetable.category,
+ beginsAt: timetable.followingStops[0].stopNameRAW,
+ terminatesAt: timetable.followingStops[timetable.followingStops.length - 1].stopNameRAW,
+
+ nextStationName,
+ prevStationName,
+
+ stopInfo: trainStop,
+ stopLabel: trainStopStatus.stopLabel,
+ stopStatus: trainStopStatus.stopStatus,
+ stopStatusID: trainStopStatus.stopStatusID,
+
+ arrivingLine,
+ departureLine,
+
+ nextArrivalLine,
+ prevDepartureLine
+ };
+}
+
+export function getDispatcherStatus(state: StoreState, onlineStationData: StationAPIData) {
+ const { dispatchers } = state.apiData;
+
+ const prevDispatcherStatus = state.lastDispatcherStatuses.find(
+ (dispatcher) => dispatcher.hash === onlineStationData.stationHash
+ );
+
+ const stationStatus = dispatchers?.find(
+ (status: string[]) => status[0] == onlineStationData.stationHash && status[1] == state.region.id
+ );
+
+ const statusTimestamp =
+ prevDispatcherStatus && !dispatchers
+ ? prevDispatcherStatus.statusTimestamp
+ : getStatusTimestamp(stationStatus);
+
+ const statusID =
+ prevDispatcherStatus && !dispatchers
+ ? prevDispatcherStatus.statusID
+ : getStatusID(stationStatus, onlineStationData.isOnline === 1);
+
+ return {
+ hash: onlineStationData.stationHash,
+ statusID,
+ statusTimestamp
+ };
+}
+
+export function getScheduledTrains(
+ trainList: Train[],
+ stationAPIData: StationAPIData,
+ stationGeneralInfo: Station['generalInfo']
+): ScheduledTrain[] {
+ const stationName = stationAPIData.stationName.toLocaleLowerCase();
+
+ stationGeneralInfo?.checkpoints.forEach((cp) => (cp.scheduledTrains.length = 0));
+
+ return trainList.reduce((acc: ScheduledTrain[], train) => {
+ if (!train.timetableData) return acc;
+
+ const timetable = train.timetableData;
+ if (!timetable.sceneries.includes(stationAPIData.stationHash)) return acc;
+
+ const stopInfoIndex = timetable.followingStops.findIndex((stop) => {
+ const stopName = stop.stopNameRAW.toLowerCase();
+
+ return (
+ stationName == stopName ||
+ (!/(po\.|podg\.)/.test(stopName) && stopName.includes(stationName)) ||
+ (!/(po\.|podg\.)/.test(stationName) && stationName.includes(stopName)) ||
+ (stopName.split(', podg.')[0] !== undefined &&
+ stationName.startsWith(stopName.split(', podg.')[0]))
+ );
+ });
+
+ const checkpointScheduledTrains: ScheduledTrain[] = [];
+
+ if (stopInfoIndex != -1) {
+ checkpointScheduledTrains.push(
+ getCheckpointTrain(train, stopInfoIndex, stationAPIData.stationName)
+ );
+ }
+
+ stationGeneralInfo?.checkpoints?.forEach((checkpoint) => {
+ if (checkpoint.checkpointName.toLocaleLowerCase() == stationName) return;
+
+ if (
+ checkpointScheduledTrains.findIndex(
+ (cpTrain) =>
+ cpTrain.checkpointName.toLocaleLowerCase() ==
+ checkpoint.checkpointName.toLocaleLowerCase()
+ ) != -1
+ )
+ return;
+
+ const index = timetable.followingStops.findIndex(
+ (stop) => stop.stopNameRAW.toLowerCase() == checkpoint.checkpointName.toLowerCase()
+ );
+
+ if (index > -1)
+ checkpointScheduledTrains.push(
+ getCheckpointTrain(train, index, stationAPIData.stationName)
+ );
+ });
+
+ acc.push(...checkpointScheduledTrains);
+ return acc;
+ }, []) as ScheduledTrain[];
+}
+
+export function getStationTrains(
+ trainList: Train[],
+ scheduledTrainList: ScheduledTrain[],
+ region: string,
+ apiStation: StationAPIData
+): StationTrain[] {
+ return trainList
+ .filter(
+ (train) =>
+ train?.region === region &&
+ train.online &&
+ train.currentStationName === apiStation.stationName
+ )
+ .map((train) => ({
+ driverName: train.driverName,
+ driverId: train.driverId,
+ trainNo: train.trainNo,
+ trainId: train.trainId,
+ stopStatus:
+ scheduledTrainList.find((st) => st.trainNo === train.trainNo)?.stopStatus || 'no-timetable'
+ }));
+}
diff --git a/src/store/stationFiltersStore.ts b/src/store/stationFiltersStore.ts
index d1a9bf4..e778449 100644
--- a/src/store/stationFiltersStore.ts
+++ b/src/store/stationFiltersStore.ts
@@ -1,116 +1,93 @@
-import { defineStore } from 'pinia';
-import inputData from '../data/options.json';
-import Station from '../scripts/interfaces/Station';
-import StorageManager from '../scripts/managers/storageManager';
-import { useStore } from './store';
-import { filterInitStates } from '../scripts/constants/stores/initFilterStates';
-import { filterStations, sortStations } from '../scripts/utils/filterUtils';
-import { HeadIdsTypes } from '../scripts/data/stationHeaderNames';
-
-export const useStationFiltersStore = defineStore('stationFiltersStore', {
- state() {
- return {
- inputs: inputData,
- filters: { ...filterInitStates },
- sorterActive: { headerName: 'station' as HeadIdsTypes, dir: 1 },
- store: useStore(),
- lastClickedFilterId: '',
- };
- },
-
- getters: {
- areFiltersAtDefault(state) {
- return Object.keys(state.filters).every((f) => state.filters[f] === filterInitStates[f]);
- },
- },
-
- actions: {
- getFilteredStationList(stationList: Station[], region: string): Station[] {
- return stationList
- .map((station) => {
- if (station.onlineInfo && station.onlineInfo.region != region) {
- delete station.onlineInfo;
- }
-
- return station;
- })
- .filter((station) => filterStations(station, this.filters))
- .sort((a, b) => sortStations(a, b, this.sorterActive));
- },
-
- setupFilters() {
- if (!StorageManager.isRegistered('options_saved')) return;
-
- this.inputs.options.forEach((option) => {
- if (!StorageManager.isRegistered(option.name)) return;
- const savedValue = StorageManager.getBooleanValue(option.name);
-
- this.filters[option.name] = savedValue;
- option.value = !savedValue;
- });
-
- this.inputs.sliders.forEach((slider) => {
- if (!StorageManager.isRegistered(slider.name)) return;
- const savedValue = StorageManager.getNumericValue(slider.name);
-
- this.filters[slider.name] = savedValue;
- slider.value = savedValue;
- });
- },
-
- // Quick actions (TODO)
- handleQuickAction(actionName: string) {
- // switch (actionName) {
- // case 'all-available':
- // this.resetFilters();
- // this.inputs.options
- // .filter((option) => /^(free|non-public)/.test(option.id))
- // .forEach((option) => (option.value = !option.defaultValue));
- // break;
- // case 'all-free':
- // this.resetFilters();
- // this.inputs.options
- // .filter((option) => /^(free|occupied)/.test(option.id))
- // .forEach((option) => (option.value = !option.defaultValue));
- // break;
- // default:
- // break;
- // }
- },
-
- changeFilterValue(name: string, value: any) {
- this.filters[name] = value;
- if (StorageManager.isRegistered('options_saved')) StorageManager.setValue(name, value);
- },
-
- resetFilters() {
- this.filters = { ...filterInitStates };
-
- this.inputs.options.forEach((option) => {
- option.value = option.defaultValue;
- StorageManager.setBooleanValue(option.name, !option.defaultValue);
- });
-
- this.inputs.sliders.forEach((slider) => {
- slider.value = slider.defaultValue;
- StorageManager.setNumericValue(slider.name, slider.defaultValue);
- });
- },
-
- resetSectionOptions(section: string) {
- this.inputs.options
- .filter((option) => option.section == section)
- .forEach((option) => {
- option.value = option.defaultValue;
- StorageManager.setBooleanValue(option.name, !option.defaultValue);
- });
- },
-
- changeSorter(headerName: HeadIdsTypes) {
- if (headerName == this.sorterActive.headerName) this.sorterActive.dir = -1 * this.sorterActive.dir;
- else this.sorterActive.dir = 1;
-
- this.sorterActive.headerName = headerName;
- },
- },
-});
+import { defineStore } from 'pinia';
+import inputData from '../data/options.json';
+import StorageManager from '../scripts/managers/storageManager';
+import { useStore } from './store';
+import { filterInitStates } from '../scripts/constants/stores/initFilterStates';
+import { filterStations, sortStations } from '../scripts/utils/filterUtils';
+import { HeadIdsTypes } from '../scripts/data/stationHeaderNames';
+
+export const useStationFiltersStore = defineStore('stationFiltersStore', {
+ state() {
+ return {
+ inputs: inputData,
+ filters: { ...filterInitStates },
+ sorterActive: { headerName: 'station' as HeadIdsTypes, dir: 1 },
+ lastClickedFilterId: ''
+ };
+ },
+
+ getters: {
+ areFiltersAtDefault: (state) => {
+ return Object.keys(state.filters).every((f) => state.filters[f] === filterInitStates[f]);
+ },
+
+ filteredStationList: (state) => {
+ const store = useStore();
+ return store.stationList
+ .map((station) => ({
+ ...station,
+ onlineInfo: store.onlineSceneryList.find((os) => os.name == station.name)
+ }))
+ .filter((station) => filterStations(station, state.filters))
+ .sort((a, b) => sortStations(a, b, state.sorterActive));
+ }
+ },
+
+ actions: {
+ setupFilters() {
+ if (!StorageManager.isRegistered('options_saved')) return;
+
+ this.inputs.options.forEach((option) => {
+ if (!StorageManager.isRegistered(option.name)) return;
+ const savedValue = StorageManager.getBooleanValue(option.name);
+
+ this.filters[option.name] = savedValue;
+ option.value = !savedValue;
+ });
+
+ this.inputs.sliders.forEach((slider) => {
+ if (!StorageManager.isRegistered(slider.name)) return;
+ const savedValue = StorageManager.getNumericValue(slider.name);
+
+ this.filters[slider.name] = savedValue;
+ slider.value = savedValue;
+ });
+ },
+
+ changeFilterValue(name: string, value: any) {
+ this.filters[name] = value;
+ if (StorageManager.isRegistered('options_saved')) StorageManager.setValue(name, value);
+ },
+
+ resetFilters() {
+ this.filters = { ...filterInitStates };
+
+ this.inputs.options.forEach((option) => {
+ option.value = option.defaultValue;
+ StorageManager.setBooleanValue(option.name, !option.defaultValue);
+ });
+
+ this.inputs.sliders.forEach((slider) => {
+ slider.value = slider.defaultValue;
+ StorageManager.setNumericValue(slider.name, slider.defaultValue);
+ });
+ },
+
+ resetSectionOptions(section: string) {
+ this.inputs.options
+ .filter((option) => option.section == section)
+ .forEach((option) => {
+ option.value = option.defaultValue;
+ StorageManager.setBooleanValue(option.name, !option.defaultValue);
+ });
+ },
+
+ changeSorter(headerName: HeadIdsTypes) {
+ if (headerName == this.sorterActive.headerName)
+ this.sorterActive.dir = -1 * this.sorterActive.dir;
+ else this.sorterActive.dir = 1;
+
+ this.sorterActive.headerName = headerName;
+ }
+ }
+});
diff --git a/src/store/store.ts b/src/store/store.ts
index a67375b..cb5434f 100644
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@ -1,392 +1,339 @@
-import axios from 'axios';
-import { defineStore } from 'pinia';
-import { io } from 'socket.io-client';
-import { DataStatus } from '../scripts/enums/DataStatus';
-import StationAPIData from '../scripts/interfaces/api/StationAPIData';
-import { ScheduledTrain } from '../scripts/interfaces/ScheduledTrain';
-import Station from '../scripts/interfaces/Station';
-import StationRoutes from '../scripts/interfaces/StationRoutes';
-import Train from '../scripts/interfaces/Train';
-import { URLs } from '../scripts/utils/apiURLs';
-import { getStatusTimestamp, getStatusID, getScheduledTrain, parseSpawns } from '../scripts/utils/storeUtils';
-import { APIData, StationJSONData, StoreState } from '../scripts/interfaces/store/storeTypes';
-import packageInfo from '../../package.json';
-import { RollingStockInfo, RollingStockGithubData } from '../scripts/interfaces/github_api/StockInfoGithubData';
-
-export const useStore = defineStore('store', {
- state: () =>
- ({
- apiData: {} as unknown,
- rollingStockData: undefined,
-
- stationList: [],
- trainList: [],
- routesList: [],
-
- sceneryData: [],
- lastDispatcherStatuses: [],
-
- region: { id: 'eu', value: 'PL1' },
-
- trainCount: 0,
- stationCount: 0,
-
- webSocket: undefined,
- isOffline: false,
-
- dispatcherStatsName: '',
- dispatcherStatsData: undefined,
-
- driverStatsName: '',
- driverStatsData: undefined,
- driverStatsStatus: DataStatus.Initialized,
-
- chosenModalTrainId: undefined,
-
- dataStatuses: {
- connection: DataStatus.Loading,
- sceneries: DataStatus.Loading,
- timetables: DataStatus.Loading,
- dispatchers: DataStatus.Loading,
- trains: DataStatus.Loading,
- },
-
- currentStatsTab: null,
-
- blockScroll: false,
- listenerLaunched: false,
- modalLastClickedTarget: null,
- } as StoreState),
-
- actions: {
- setTrainsOnlineData() {
- const { trains } = this.apiData;
-
- if (!trains) return [];
-
- this.trainList = trains
- .filter((train) => train.region === this.region.id && (train.online || train.timetable || train.lastSeen > Date.now() - 180000))
- .map((train) => {
- const stock = train.stockString.split(';');
- const locoType = stock ? stock[0] : train.stockString;
-
- const timetable = train.timetable;
-
- return {
- trainId: train.driverName + train.trainNo.toString(),
-
- trainNo: train.trainNo,
- mass: train.mass,
- length: train.length,
- speed: train.speed,
- region: train.region,
-
- distance: train.distance,
- signal: train.signal,
- online: train.online,
- driverId: train.driverId,
- driverName: train.driverName,
- currentStationName: train.currentStationName,
- currentStationHash: train.currentStationHash,
- connectedTrack: train.connectedTrack,
- stockList: stock,
- locoType,
-
- lastSeen: train.lastSeen,
- isTimeout: train.isTimeout,
-
- isSupporter: train.driverIsSupporter,
- driverLevel: train.driverLevel,
-
- timetableData: timetable
- ? {
- timetableId: timetable.timetableId,
- SKR: timetable.SKR,
- TWR: timetable.TWR,
- route: timetable.route,
- category: timetable.category,
- followingStops: timetable.stopList,
- routeDistance: timetable.stopList[timetable.stopList.length - 1].stopDistance,
- sceneries: timetable.sceneries,
- }
- : undefined,
- } as Train;
- });
- },
-
- getDispatcherStatus(onlineStationData: StationAPIData) {
- const { dispatchers } = this.apiData;
-
- const prevDispatcherStatus = this.lastDispatcherStatuses.find((dispatcher) => dispatcher.hash === onlineStationData.stationHash);
-
- const stationStatus = !dispatchers ? undefined : dispatchers.find((status: string[]) => status[0] == onlineStationData.stationHash && status[1] == this.region.id) || -1;
-
- const statusTimestamp = prevDispatcherStatus && !dispatchers ? prevDispatcherStatus.statusTimestamp : getStatusTimestamp(stationStatus);
- const statusID = prevDispatcherStatus && !dispatchers ? prevDispatcherStatus.statusID : getStatusID(stationStatus);
-
- return {
- hash: onlineStationData.stationHash,
- statusID,
- statusTimestamp,
- };
- },
-
- getScheduledTrains(stationGeneralInfo: Station['generalInfo'], stationAPIData: StationAPIData) {
- const stationName = stationAPIData.stationName.toLowerCase();
-
- stationGeneralInfo?.checkpoints.forEach((cp) => (cp.scheduledTrains.length = 0));
-
- return this.trainList.reduce((acc: ScheduledTrain[], train) => {
- if (!train.timetableData) return acc;
-
- const timetable = train.timetableData;
- if (!timetable.sceneries.includes(stationAPIData.stationHash)) return acc;
-
- const stopInfoIndex = timetable.followingStops.findIndex((stop) => {
- const stopName = stop.stopNameRAW.toLowerCase();
-
- if (stationName === stopName) return true;
- if (stopName.includes(stationName) && !stop.stopName.includes('po.') && !stop.stopName.includes('podg.')) return true;
-
- if (stationName.includes(stopName) && !stop.stopName.includes('po.') && !stop.stopName.includes('podg.')) return true;
-
- if (stopName.includes('podg.') && stopName.split(', podg.')[0] && stationName.includes(stopName.split(', podg.')[0])) return true;
-
- if (
- stationGeneralInfo &&
- stationGeneralInfo.checkpoints &&
- stationGeneralInfo.checkpoints.length > 0 &&
- stationGeneralInfo.checkpoints.some((cp) => cp.checkpointName.toLowerCase().includes(stop.stopNameRAW.toLowerCase()))
- )
- return true;
-
- return false;
- });
-
- if (stopInfoIndex == -1) return acc;
-
- const scheduledStopTrain = getScheduledTrain(train, stopInfoIndex, stationAPIData.stationName);
-
- if (stationGeneralInfo?.checkpoints) {
- for (const checkpoint of stationGeneralInfo.checkpoints) {
- const index = timetable.followingStops.findIndex((stop) => stop.stopNameRAW.toLowerCase() == checkpoint.checkpointName.toLowerCase());
-
- if (index == -1) continue;
-
- const scheduledCheckpointTrain = getScheduledTrain(train, index, stationAPIData.stationName);
- checkpoint.scheduledTrains.push(scheduledCheckpointTrain);
- }
- }
-
- acc.push(scheduledStopTrain);
- return acc;
- }, []) as ScheduledTrain[];
- },
-
- getStationTrains(stationAPIData: StationAPIData) {
- return this.trainList
- .filter((train) => train?.region === this.region.id && train.online && train.currentStationName === stationAPIData.stationName)
- .map((train) => ({
- driverName: train.driverName,
- driverId: train.driverId,
- trainNo: train.trainNo,
- trainId: train.trainId,
- }));
- },
-
- setStationsOnlineInfo() {
- const onlineStationNames: string[] = [];
- const prevDispatcherStatuses: StoreState['lastDispatcherStatuses'] = [];
-
- if (this.isOffline) {
- this.stationList.forEach((station) => {
- station.onlineInfo = undefined;
- });
-
- return;
- }
-
- this.apiData.stations?.forEach((stationAPIData) => {
- if (stationAPIData.region !== this.region.id || !stationAPIData.isOnline) return;
- const station = this.stationList.find((s) => s.name === stationAPIData.stationName);
-
- onlineStationNames.push(stationAPIData.stationName);
-
- const dispatcherStatus = this.getDispatcherStatus(stationAPIData);
- prevDispatcherStatuses.push(dispatcherStatus);
-
- const stationTrains = this.getStationTrains(stationAPIData);
- const scheduledTrains = this.getScheduledTrains(station?.generalInfo, stationAPIData);
-
- const onlineInfo = {
- name: stationAPIData.stationName,
- hash: stationAPIData.stationHash,
- region: stationAPIData.region,
- maxUsers: stationAPIData.maxUsers,
- currentUsers: stationAPIData.currentUsers,
- spawns: parseSpawns(stationAPIData.spawnString),
- dispatcherName: stationAPIData.dispatcherName,
- dispatcherRate: stationAPIData.dispatcherRate,
- dispatcherId: stationAPIData.dispatcherId,
- dispatcherExp: stationAPIData.dispatcherExp,
- dispatcherIsSupporter: stationAPIData.dispatcherIsSupporter,
- stationTrains,
- statusTimestamp: dispatcherStatus.statusTimestamp,
- statusID: dispatcherStatus.statusID,
- scheduledTrains,
- };
-
- if (!station) {
- this.stationList.push({
- name: stationAPIData.stationName,
- onlineInfo,
- });
-
- return;
- }
-
- station.onlineInfo = { ...onlineInfo };
-
- this.stationList
- .filter((station) => !onlineStationNames.includes(station.name) && station.onlineInfo)
- .forEach((offlineStation) => {
- offlineStation.onlineInfo = undefined;
- });
- });
-
- if (this.apiData.dispatchers != null) this.lastDispatcherStatuses = prevDispatcherStatuses;
- },
-
- async fetchStationsGeneralInfo() {
- const sceneryData: StationJSONData[] = await (await axios.get(`${URLs.stacjownikAPI}/api/getSceneries`)).data;
-
- if (!sceneryData) {
- this.dataStatuses.sceneries = DataStatus.Error;
- return;
- }
-
- this.stationList = sceneryData.map((scenery) => {
- return {
- name: scenery.name,
-
- generalInfo: {
- ...scenery,
- authors: scenery.authors?.split(',').map((a) => a.trim()),
- routes:
- scenery.routesInfo.reduce(
- (acc, route) => {
- const propName: keyof StationRoutes = `${route.routeTracks == 2 ? 'twoWay' : 'oneWay'}${route.isElectric ? '' : 'No'}CatenaryRouteNames`;
-
- acc[route.routeTracks == 2 ? 'twoWay' : 'oneWay'].push({
- name: route.routeName,
- SBL: route.isRouteSBL,
- TWB: false,
- catenary: route.isElectric,
- isInternal: route.isInternal,
- tracks: route.routeTracks,
- length: route.routeLength,
- speed: route.routeSpeed,
- });
-
- if (!route.isInternal) acc[propName].push(route.routeName);
-
- if (route.isRouteSBL) acc['sblRouteNames'].push(route.routeName);
-
- return acc;
- },
- {
- oneWay: [],
- twoWay: [],
- sblRouteNames: [],
- oneWayCatenaryRouteNames: [],
- oneWayNoCatenaryRouteNames: [],
- twoWayCatenaryRouteNames: [],
- twoWayNoCatenaryRouteNames: [],
- } as StationRoutes
- ) || {},
- checkpoints: scenery.checkpoints ? scenery.checkpoints.split(';').map((sub) => ({ checkpointName: sub, scheduledTrains: [] })) : [],
- },
- };
- });
- },
-
- async connectToWebsocket() {
- if (import.meta.env.VITE_APP_WS_DEV === '1') {
- const mockWebsocketData = await import('../data/mockWebsocketData.json');
- this.dataStatuses.connection = DataStatus.Loaded;
- this.apiData = mockWebsocketData as any;
- this.setOnlineData();
-
- console.warn('Stacjownik działa w trybie mockowania danych z WS');
-
- return;
- }
-
- const socket = io(URLs.stacjownikAPI, {
- // transports: ['websocket', 'polling'],
- rememberUpgrade: true,
- reconnection: true,
- extraHeaders: {
- version: packageInfo.version,
- },
- });
-
- socket.on('connect_error', (err) => {
- this.dataStatuses.connection = DataStatus.Error;
- });
-
- socket.on('UPDATE', (data: APIData) => {
- this.apiData = data;
- this.dataStatuses.connection = DataStatus.Loaded;
- this.setOnlineData();
- });
-
- socket.emit('FETCH_DATA', { version: packageInfo.version }, (data: APIData) => {
- this.dataStatuses.connection = DataStatus.Loaded;
-
- this.apiData = data;
- this.setOnlineData();
- });
-
- this.webSocket = socket;
- },
-
- async connectToAPI() {
- await this.fetchStationsGeneralInfo();
- await this.fetchStockInfoData();
-
- this.connectToWebsocket();
- },
-
- async changeRegion(region: StoreState['region']) {
- this.region = region;
-
- await this.setOnlineData();
- },
-
- async fetchStockInfoData() {
- try {
- this.rollingStockData = (await axios.get('https://raw.githubusercontent.com/Spythere/api/main/td2/data/stockInfo.json')).data;
- } catch (error) {
- console.error('Ups! Wystąpił błąd podczas pobierania informacji o taborze z API:', error);
- }
- },
-
- async setOnlineData() {
- if (!this.apiData.stations) {
- this.dataStatuses.sceneries = DataStatus.Error;
- this.dataStatuses.trains = DataStatus.Error;
- this.dataStatuses.dispatchers = DataStatus.Error;
-
- return;
- }
-
- this.dataStatuses.sceneries = DataStatus.Loaded;
- this.dataStatuses.trains = !this.apiData.trains ? DataStatus.Warning : DataStatus.Loaded;
- this.dataStatuses.dispatchers = !this.apiData.dispatchers ? DataStatus.Warning : DataStatus.Loaded;
-
- this.setTrainsOnlineData();
- this.setStationsOnlineInfo();
- },
- },
-});
+import axios from 'axios';
+import { defineStore } from 'pinia';
+import { io } from 'socket.io-client';
+import { DataStatus } from '../scripts/enums/DataStatus';
+import StationRoutes from '../scripts/interfaces/StationRoutes';
+import Train from '../scripts/interfaces/Train';
+import { URLs } from '../scripts/utils/apiURLs';
+import {
+ getDispatcherStatus,
+ parseSpawns,
+ getScheduledTrains,
+ getStationTrains
+} from '../scripts/utils/storeUtils';
+
+import {
+ APIData,
+ OnlineScenery,
+ StationJSONData,
+ StoreState
+} from '../scripts/interfaces/store/storeTypes';
+
+import packageInfo from '../../package.json';
+import { RollingStockGithubData } from '../scripts/interfaces/github_api/StockInfoGithubData';
+import { ScheduledTrain } from '../scripts/interfaces/ScheduledTrain';
+import { DispatcherStatusID } from '../scripts/enums/DispatcherStatus';
+
+export const useStore = defineStore('store', {
+ state: () =>
+ ({
+ apiData: {} as unknown,
+ rollingStockData: undefined,
+
+ stationList: [],
+
+ routesList: [],
+
+ sceneryData: [],
+ lastDispatcherStatuses: [],
+
+ region: { id: 'eu', value: 'PL1' },
+
+ trainCount: 0,
+ stationCount: 0,
+
+ webSocket: undefined,
+ isOffline: false,
+
+ dispatcherStatsName: '',
+ dispatcherStatsData: undefined,
+
+ driverStatsName: '',
+ driverStatsData: undefined,
+ driverStatsStatus: DataStatus.Initialized,
+
+ chosenModalTrainId: undefined,
+
+ dataStatuses: {
+ connection: DataStatus.Loading,
+ sceneries: DataStatus.Loading,
+ timetables: DataStatus.Loading,
+ dispatchers: DataStatus.Loading,
+ trains: DataStatus.Loading
+ },
+
+ currentStatsTab: null,
+
+ blockScroll: false,
+ listenerLaunched: false,
+ modalLastClickedTarget: null
+ }) as StoreState,
+
+ getters: {
+ trainList(): Train[] {
+ return (this.apiData?.trains ?? [])
+ .filter(
+ (train) =>
+ train.region === this.region.id &&
+ (train.online || train.timetable || train.lastSeen > Date.now() - 180000)
+ )
+ .map((train) => {
+ const stock = train.stockString.split(';');
+ const locoType = stock ? stock[0] : train.stockString;
+
+ const timetable = train.timetable;
+
+ return {
+ trainId: train.driverName + train.trainNo.toString(),
+
+ trainNo: train.trainNo,
+ mass: train.mass,
+ length: train.length,
+ speed: train.speed,
+ region: train.region,
+
+ distance: train.distance,
+ signal: train.signal,
+ online: train.online,
+ driverId: train.driverId,
+ driverName: train.driverName,
+ currentStationName: train.currentStationName,
+ currentStationHash: train.currentStationHash,
+ connectedTrack: train.connectedTrack,
+ stockList: stock,
+ locoType,
+
+ lastSeen: train.lastSeen,
+ isTimeout: train.isTimeout,
+
+ isSupporter: train.driverIsSupporter,
+ driverLevel: train.driverLevel,
+
+ timetableData: timetable
+ ? {
+ timetableId: timetable.timetableId,
+ SKR: timetable.SKR,
+ TWR: timetable.TWR,
+ route: timetable.route,
+ category: timetable.category,
+ followingStops: timetable.stopList,
+ routeDistance: timetable.stopList[timetable.stopList.length - 1].stopDistance,
+ sceneries: timetable.sceneries
+ }
+ : undefined
+ } as Train;
+ });
+ },
+
+ onlineSceneryList(state): OnlineScenery[] {
+ if (state.isOffline) return [];
+ if (!state.apiData?.stations) return [];
+
+ return (
+ state.apiData?.stations
+ // ?.filter((apiStation) => apiStation.region == state.region.id)
+ .reduce((list, apiStation) => {
+ if (apiStation.region != state.region.id) return list;
+
+ const dispatcherStatus = getDispatcherStatus(state as StoreState, apiStation);
+
+ if (dispatcherStatus.statusID == DispatcherStatusID.Unknown) return list;
+
+ const station = this.stationList.find((s) => s.name === apiStation.stationName);
+
+ const scheduledTrains = getScheduledTrains(
+ this.trainList,
+ apiStation,
+ station?.generalInfo
+ );
+
+ const stationTrains = getStationTrains(
+ this.trainList,
+ scheduledTrains,
+ this.region.id,
+ apiStation
+ );
+
+ // Remove checkpoint duplicates
+ const uniqueScheduledTrains = scheduledTrains.reduce(
+ (uniqueList, sTrain) =>
+ uniqueList.find((v) => v.trainId === sTrain.trainId)
+ ? uniqueList
+ : [...uniqueList, sTrain],
+ [] as ScheduledTrain[]
+ );
+
+ list.push({
+ name: apiStation.stationName,
+ hash: apiStation.stationHash,
+ region: apiStation.region,
+ maxUsers: apiStation.maxUsers,
+ currentUsers: apiStation.currentUsers,
+ spawns: parseSpawns(apiStation.spawnString),
+ dispatcherName: apiStation.dispatcherName,
+ dispatcherRate: apiStation.dispatcherRate,
+ dispatcherId: apiStation.dispatcherId,
+ dispatcherExp: apiStation.dispatcherExp,
+ dispatcherIsSupporter: apiStation.dispatcherIsSupporter,
+ scheduledTrains: scheduledTrains,
+ stationTrains: stationTrains,
+ statusTimestamp: dispatcherStatus.statusTimestamp,
+ statusID: dispatcherStatus.statusID,
+
+ isOnline: apiStation.isOnline == 1,
+
+ scheduledTrainCount: {
+ all: uniqueScheduledTrains.length,
+ confirmed: uniqueScheduledTrains.filter((train) => train.stopInfo.confirmed).length,
+ unconfirmed: uniqueScheduledTrains.filter((train) => !train.stopInfo.confirmed).length
+ }
+ });
+
+ return list;
+ }, [] as OnlineScenery[])
+ );
+ }
+ },
+ actions: {
+ async fetchStationsGeneralInfo() {
+ const sceneryData: StationJSONData[] = await (
+ await axios.get(`${URLs.stacjownikAPI}/api/getSceneries`)
+ ).data;
+
+ if (!sceneryData) {
+ this.dataStatuses.sceneries = DataStatus.Error;
+ return;
+ }
+
+ this.stationList = sceneryData.map((scenery) => {
+ return {
+ name: scenery.name,
+
+ generalInfo: {
+ ...scenery,
+ authors: scenery.authors?.split(',').map((a) => a.trim()),
+ routes:
+ scenery.routesInfo.reduce(
+ (acc, route) => {
+ const propName: keyof StationRoutes = `${
+ route.routeTracks == 2 ? 'twoWay' : 'oneWay'
+ }${route.isElectric ? '' : 'No'}CatenaryRouteNames`;
+
+ acc[route.routeTracks == 2 ? 'twoWay' : 'oneWay'].push({
+ name: route.routeName,
+ SBL: route.isRouteSBL,
+ TWB: false,
+ catenary: route.isElectric,
+ isInternal: route.isInternal,
+ tracks: route.routeTracks,
+ length: route.routeLength,
+ speed: route.routeSpeed
+ });
+
+ if (!route.isInternal) acc[propName].push(route.routeName);
+
+ if (route.isRouteSBL) acc['sblRouteNames'].push(route.routeName);
+
+ return acc;
+ },
+ {
+ oneWay: [],
+ twoWay: [],
+ sblRouteNames: [],
+ oneWayCatenaryRouteNames: [],
+ oneWayNoCatenaryRouteNames: [],
+ twoWayCatenaryRouteNames: [],
+ twoWayNoCatenaryRouteNames: []
+ } as StationRoutes
+ ) || {},
+ checkpoints: scenery.checkpoints
+ ? scenery.checkpoints
+ .split(';')
+ .map((sub) => ({ checkpointName: sub, scheduledTrains: [] }))
+ : []
+ }
+ };
+ });
+ },
+
+ async connectToWebsocket() {
+ if (import.meta.env.VITE_APP_WS_DEV === '1') {
+ const mockWebsocketData = await import('../data/mockWebsocketData.json');
+ this.dataStatuses.connection = DataStatus.Loaded;
+ this.apiData = mockWebsocketData as any;
+ this.setStatuses();
+
+ console.warn('Stacjownik działa w trybie mockowania danych z WS');
+
+ return;
+ }
+
+ const socket = io(URLs.stacjownikAPI, {
+ transports: ['websocket', 'polling'],
+ rememberUpgrade: true,
+ reconnection: true,
+ extraHeaders: {
+ version: packageInfo.version
+ }
+ });
+
+ socket.on('connect_error', () => {
+ this.dataStatuses.connection = DataStatus.Error;
+ });
+
+ socket.on('UPDATE', (data: APIData) => {
+ this.apiData = data;
+ this.dataStatuses.connection = DataStatus.Loaded;
+ this.setStatuses();
+ });
+
+ socket.emit('FETCH_DATA', { version: packageInfo.version }, (data: APIData) => {
+ this.dataStatuses.connection = DataStatus.Loaded;
+ this.apiData = data;
+ this.setStatuses();
+ });
+
+ this.webSocket = socket;
+ },
+
+ async connectToAPI() {
+ this.connectToWebsocket();
+ this.fetchStockInfoData();
+ this.fetchStationsGeneralInfo();
+ },
+
+ async changeRegion(region: StoreState['region']) {
+ this.region = region;
+ },
+
+ async fetchStockInfoData() {
+ try {
+ this.rollingStockData = (
+ await axios.get(
+ 'https://raw.githubusercontent.com/Spythere/api/main/td2/data/stockInfo.json'
+ )
+ ).data;
+ } catch (error) {
+ console.error('Ups! Wystąpił błąd podczas pobierania informacji o taborze z API:', error);
+ }
+ },
+
+ async setStatuses() {
+ if (!this.apiData.stations) {
+ this.dataStatuses.sceneries = DataStatus.Error;
+ this.dataStatuses.trains = DataStatus.Error;
+ this.dataStatuses.dispatchers = DataStatus.Error;
+
+ return;
+ }
+
+ this.dataStatuses.sceneries = DataStatus.Loaded;
+ this.dataStatuses.trains = !this.apiData.trains ? DataStatus.Warning : DataStatus.Loaded;
+ this.dataStatuses.dispatchers = !this.apiData.dispatchers
+ ? DataStatus.Warning
+ : DataStatus.Loaded;
+
+ // if (this.apiData.dispatchers != null) this.lastDispatcherStatuses = prevDispatcherStatuses;
+ }
+ }
+});
diff --git a/src/styles/JournalSection.scss b/src/styles/JournalSection.scss
index a4ef81a..eadc5b7 100644
--- a/src/styles/JournalSection.scss
+++ b/src/styles/JournalSection.scss
@@ -1,78 +1,78 @@
-@import 'responsive.scss';
-@import 'animations.scss';
-
-.list_wrapper {
- overflow-y: auto;
- height: 90vh;
- min-height: 550px;
-
- padding-right: 0.2em;
-}
-
-.journal_wrapper {
- max-width: 1350px;
- width: 100%;
-
- margin: 0 auto;
-
- padding: 1em 0;
-}
-
-.journal_refreshed-date {
- background-color: #333;
- color: #ddd;
- text-align: end;
-
- padding: 0.25em;
- margin: 0.5em 0;
-}
-
-.journal_warning {
- text-align: center;
- font-size: 1.3em;
-
- &.error {
- background-color: var(--clr-error);
- }
-}
-
-.journal_item {
- cursor: pointer;
-}
-
-.journal_item,
-.journal_warning {
- background-color: #1a1a1a;
- padding: 1em;
- margin-bottom: 1em;
- cursor: pointer;
-}
-
-.journal_top-bar {
- display: flex;
- justify-content: space-between;
- align-items: center;
- gap: 0.5em;
-
- position: relative;
- margin-bottom: 0.5em;
-}
-
-.btn--load-data {
- padding: 0.5em 1em;
- display: flex;
- margin: 0 auto;
-
- font-size: 1.2em;
-}
-
-@include smallScreen() {
- .journal_top-bar {
- justify-content: center;
- flex-wrap: wrap;
- }
-
- .journal_refreshed-date {
- text-align: center;
- }
-}
+@import 'responsive.scss';
+@import 'animations.scss';
+
+.list_wrapper {
+ overflow-y: auto;
+ height: 90vh;
+ min-height: 550px;
+
+ padding-right: 0.2em;
+}
+
+.journal_wrapper {
+ max-width: 1350px;
+ width: 100%;
+
+ margin: 0 auto;
+
+ padding: 1em 0;
+}
+
+.journal_refreshed-date {
+ background-color: #333;
+ color: #ddd;
+ text-align: end;
+
+ padding: 0.25em;
+ margin: 0.5em 0;
+}
+
+.journal_warning {
+ text-align: center;
+ font-size: 1.3em;
+
+ &.error {
+ background-color: var(--clr-error);
+ }
+}
+
+.journal_item {
+ cursor: pointer;
+}
+
+.journal_item,
+.journal_warning {
+ background-color: #1a1a1a;
+ padding: 1em;
+ margin-bottom: 1em;
+ cursor: pointer;
+}
+
+.journal_top-bar {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ gap: 0.5em;
+
+ position: relative;
+ margin-bottom: 0.5em;
+}
+
+.btn--load-data {
+ padding: 0.5em 1em;
+ display: flex;
+ margin: 0 auto;
+
+ font-size: 1.2em;
+}
+
+@include smallScreen() {
+ .journal_top-bar {
+ justify-content: center;
+ flex-wrap: wrap;
+ }
+
+ .journal_refreshed-date {
+ text-align: center;
+ }
+}
diff --git a/src/styles/JournalStats.scss b/src/styles/JournalStats.scss
index e6c198e..d9752bd 100644
--- a/src/styles/JournalStats.scss
+++ b/src/styles/JournalStats.scss
@@ -47,4 +47,3 @@
justify-content: center;
}
}
-
diff --git a/src/styles/animations.scss b/src/styles/animations.scss
index 27b3d9a..28c0d21 100644
--- a/src/styles/animations.scss
+++ b/src/styles/animations.scss
@@ -28,4 +28,4 @@
&-leave-active {
transition: all 100ms ease-out;
}
-}
\ No newline at end of file
+}
diff --git a/src/styles/badge.scss b/src/styles/badge.scss
index bd260ea..2329d38 100644
--- a/src/styles/badge.scss
+++ b/src/styles/badge.scss
@@ -1,99 +1,99 @@
-.badge {
- font-weight: 600;
-
- display: inline-block;
- padding: 0;
-
- margin: 0.25em;
-
- span {
- display: inline-block;
- background: #585858;
- padding: 0.2em 0.4em;
- }
-
- &-none {
- font-weight: 600;
-
- padding: 0.2em 0.4em;
- background: firebrick;
-
- text-align: center;
-
- @include smallScreen() {
- font-size: 1em;
- }
- }
-}
-
-.level-badge {
- display: flex;
- justify-content: center;
- align-items: center;
-
- &.driver {
- border-radius: 50%;
- width: 1.7em;
- height: 1.7em;
- }
-
- &.dispatcher {
- border-radius: 0.25em;
-
- width: 1.6em;
- height: 1.6em;
- }
-}
-
-.region-badge {
- padding: 0.25em 0.5em;
- border-radius: 0.5em;
- font-weight: bold;
- color: white;
-
- &[aria-describedby='eu'] {
- background-color: forestgreen;
- }
-
- &[aria-describedby='cae'] {
- background-color: lightcoral;
- color: black;
- }
-
- &[aria-describedby='usw'] {
- background-color: lightblue;
- color: black;
- }
-
- &[aria-describedby='us'] {
- background-color: lightblue;
- color: black;
- }
-
- &[aria-describedby='ru'] {
- background-color: lightslategray;
- }
-}
-
-.train-badge {
- padding: 0.1em 0.2em;
- border-radius: 0.2em;
- font-weight: bold;
-
- font-size: 0.9em;
-
- &.twr {
- background-color: var(--clr-twr);
- box-shadow: 0 0 5px 1px var(--clr-twr);
- color: black;
- }
-
- &.skr {
- background-color: var(--clr-skr);
- box-shadow: 0 0 5px 1px var(--clr-skr);
- }
-
- &.offline {
- background-color: #be3728;
- }
-}
+.badge {
+ font-weight: 600;
+
+ display: inline-block;
+ padding: 0;
+
+ margin: 0.25em;
+
+ span {
+ display: inline-block;
+ background: #585858;
+ padding: 0.2em 0.4em;
+ }
+
+ &-none {
+ font-weight: 600;
+
+ padding: 0.2em 0.4em;
+ background: firebrick;
+
+ text-align: center;
+
+ @include smallScreen() {
+ font-size: 1em;
+ }
+ }
+}
+
+.level-badge {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+
+ &.driver {
+ border-radius: 50%;
+ width: 1.7em;
+ height: 1.7em;
+ }
+
+ &.dispatcher {
+ border-radius: 0.25em;
+
+ width: 1.6em;
+ height: 1.6em;
+ }
+}
+
+.region-badge {
+ padding: 0.25em 0.5em;
+ border-radius: 0.5em;
+ font-weight: bold;
+ color: white;
+
+ &[aria-describedby='eu'] {
+ background-color: forestgreen;
+ }
+
+ &[aria-describedby='cae'] {
+ background-color: lightcoral;
+ color: black;
+ }
+
+ &[aria-describedby='usw'] {
+ background-color: lightblue;
+ color: black;
+ }
+
+ &[aria-describedby='us'] {
+ background-color: lightblue;
+ color: black;
+ }
+
+ &[aria-describedby='ru'] {
+ background-color: lightslategray;
+ }
+}
+
+.train-badge {
+ padding: 0.1em 0.2em;
+ border-radius: 0.2em;
+ font-weight: bold;
+
+ font-size: 0.9em;
+
+ &.twr {
+ background-color: var(--clr-twr);
+ box-shadow: 0 0 5px 1px var(--clr-twr);
+ color: black;
+ }
+
+ &.skr {
+ background-color: var(--clr-skr);
+ box-shadow: 0 0 5px 1px var(--clr-skr);
+ }
+
+ &.offline {
+ background-color: #be3728;
+ }
+}
diff --git a/src/styles/card.scss b/src/styles/card.scss
index 9739d44..2302136 100644
--- a/src/styles/card.scss
+++ b/src/styles/card.scss
@@ -1,53 +1,53 @@
-@import './variables.scss';
-@import './responsive.scss';
-
-.card-dimmer {
- position: fixed;
- top: 0;
- left: 0;
- width: 100vw;
- height: 100vh;
-
- z-index: 100;
-
- background: rgba(black, 0.65);
-}
-
-.card {
- position: fixed;
- top: 50%;
- left: 50%;
- z-index: 100;
-
- transform: translate(-50%, -50%);
-
- overflow: hidden;
- background: #202020e8;
-
- box-shadow: 0 0 15px 0 black;
- border: 1px solid #202020e8;
-
- width: 95%;
- max-width: 700px;
-
- max-height: 95vh;
-
- &-exit {
- position: absolute;
- top: 0;
- right: 0;
- margin: 0.5em 0.5em;
-
- img {
- width: 2em;
- }
-
- cursor: pointer;
- }
-}
-
-@include smallScreen {
- .card {
- max-height: 85vh;
- }
-}
+@import './variables.scss';
+@import './responsive.scss';
+
+.card-dimmer {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100vw;
+ height: 100vh;
+
+ z-index: 100;
+
+ background: rgba(black, 0.65);
+}
+
+.card {
+ position: fixed;
+ top: 50%;
+ left: 50%;
+ z-index: 100;
+
+ transform: translate(-50%, -50%);
+
+ overflow: hidden;
+ background: #202020e8;
+
+ box-shadow: 0 0 15px 0 black;
+ border: 1px solid #202020e8;
+
+ width: 95%;
+ max-width: 700px;
+
+ max-height: 95vh;
+
+ &-exit {
+ position: absolute;
+ top: 0;
+ right: 0;
+ margin: 0.5em 0.5em;
+
+ img {
+ width: 2em;
+ }
+
+ cursor: pointer;
+ }
+}
+
+@include smallScreen {
+ .card {
+ max-height: 85vh;
+ }
+}
diff --git a/src/styles/filters_options.scss b/src/styles/filters_options.scss
index 6aa716c..3fd0976 100644
--- a/src/styles/filters_options.scss
+++ b/src/styles/filters_options.scss
@@ -1,161 +1,161 @@
-@import 'responsive.scss';
-@import 'variables.scss';
-@import 'search_box.scss';
-
-.filters-options {
- margin-bottom: 0.5em;
-}
-
-.actions-bar {
- display: flex;
- gap: 0.5em;
-}
-
-h1.option-title {
- position: relative;
- font-size: 1.1em;
- margin: 0.7em 0 0.25em 0;
-
- &::before {
- content: '';
- position: absolute;
- top: -4px;
-
- width: 50%;
- height: 2px;
- background-color: white;
- border-radius: 2px;
- }
-}
-
-.options-anim {
- &-enter-from,
- &-leave-to {
- opacity: 0;
- transform: translateY(10px);
- }
-
- &-enter-active,
- &-leave-active {
- transition: all 150ms ease;
- }
-}
-
-.bg {
- position: fixed;
- top: 0;
- left: 0;
- width: 100vw;
- height: 100vh;
-
- z-index: 10;
-}
-
-.options_wrapper {
- position: absolute;
-
- background-color: $bgCol;
- box-shadow: 0 5px 10px 2px #0f0f0f;
-
- width: 97%;
- max-width: 550px;
-
- padding: 1em;
- z-index: 100;
-}
-
-.options_sorters {
- display: flex;
- align-items: center;
- flex-wrap: wrap;
- gap: 0.5em;
-
- padding: 0.25em 0.25em 0 0;
-}
-
-.options_filter-sections section {
- margin: 0.5em 0;
-}
-
-.options_filters {
- display: flex;
- flex-wrap: wrap;
-
- gap: 0.5em;
- margin: 0.25em 0;
-}
-
-.sort-option,
-.filter-option {
- padding: 0.25em 0.5em;
-}
-
-.sort-option[data-selected='true'] {
- color: $accentCol;
-}
-
-.filter-option {
- &#abandoned {
- color: salmon;
- }
-
- &#fulfilled {
- color: lightgreen;
- }
-
- &#active {
- color: lightblue;
- }
-}
-
-.search_content {
- .search {
- margin: 0.5em auto;
- }
-
- .search-box {
- .search-exit {
- position: absolute;
- transform: translateY(-50%);
- top: 50%;
- right: 0;
- }
- }
-}
-
-.options_actions {
- display: flex;
- gap: 0.5em;
- width: 100%;
- margin-top: 1em;
-
- button {
- width: 100%;
- }
-}
-
-@include smallScreen() {
- h1 {
- text-align: center;
-
- &::before {
- width: 75%;
- left: 50%;
- transform: translateX(-50%);
- }
- }
-
- .options_wrapper {
- font-size: 1.1em;
- max-width: 100%;
- }
-
- .options_filters,
- .options_sorters {
- justify-content: center;
- }
-
- .filter-section {
- text-align: center;
- }
-}
+@import 'responsive.scss';
+@import 'variables.scss';
+@import 'search_box.scss';
+
+.filters-options {
+ margin-bottom: 0.5em;
+}
+
+.actions-bar {
+ display: flex;
+ gap: 0.5em;
+}
+
+h1.option-title {
+ position: relative;
+ font-size: 1.1em;
+ margin: 0.7em 0 0.25em 0;
+
+ &::before {
+ content: '';
+ position: absolute;
+ top: -4px;
+
+ width: 50%;
+ height: 2px;
+ background-color: white;
+ border-radius: 2px;
+ }
+}
+
+.options-anim {
+ &-enter-from,
+ &-leave-to {
+ opacity: 0;
+ transform: translateY(10px);
+ }
+
+ &-enter-active,
+ &-leave-active {
+ transition: all 150ms ease;
+ }
+}
+
+.bg {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100vw;
+ height: 100vh;
+
+ z-index: 10;
+}
+
+.options_wrapper {
+ position: absolute;
+
+ background-color: $bgCol;
+ box-shadow: 0 5px 10px 2px #0f0f0f;
+
+ width: 97%;
+ max-width: 550px;
+
+ padding: 1em;
+ z-index: 100;
+}
+
+.options_sorters {
+ display: flex;
+ align-items: center;
+ flex-wrap: wrap;
+ gap: 0.5em;
+
+ padding: 0.25em 0.25em 0 0;
+}
+
+.options_filter-sections section {
+ margin: 0.5em 0;
+}
+
+.options_filters {
+ display: flex;
+ flex-wrap: wrap;
+
+ gap: 0.5em;
+ margin: 0.25em 0;
+}
+
+.sort-option,
+.filter-option {
+ padding: 0.25em 0.5em;
+}
+
+.sort-option[data-selected='true'] {
+ color: $accentCol;
+}
+
+.filter-option {
+ &#abandoned {
+ color: salmon;
+ }
+
+ &#fulfilled {
+ color: lightgreen;
+ }
+
+ &#active {
+ color: lightblue;
+ }
+}
+
+.search_content {
+ .search {
+ margin: 0.5em auto;
+ }
+
+ .search-box {
+ .search-exit {
+ position: absolute;
+ transform: translateY(-50%);
+ top: 50%;
+ right: 0;
+ }
+ }
+}
+
+.options_actions {
+ display: flex;
+ gap: 0.5em;
+ width: 100%;
+ margin-top: 1em;
+
+ button {
+ width: 100%;
+ }
+}
+
+@include smallScreen() {
+ h1 {
+ text-align: center;
+
+ &::before {
+ width: 75%;
+ left: 50%;
+ transform: translateX(-50%);
+ }
+ }
+
+ .options_wrapper {
+ font-size: 1.1em;
+ max-width: 100%;
+ }
+
+ .options_filters,
+ .options_sorters {
+ justify-content: center;
+ }
+
+ .filter-section {
+ text-align: center;
+ }
+}
diff --git a/src/styles/global.scss b/src/styles/global.scss
index 383c3a0..ec69dd7 100644
--- a/src/styles/global.scss
+++ b/src/styles/global.scss
@@ -1,312 +1,308 @@
-:root {
- --clr-primary: #ffc014;
- --clr-secondary: #2f2f2f;
-
- --clr-bg: #4d4d4d;
- --clr-bg2: #1b1b1b;
-
- --clr-accent: #1085b3;
- --clr-accent2: #ff3d5d;
-
- --clr-skr: #ff5100;
- --clr-twr: #ffbb00;
-
- --clr-error: #df3e3e;
- --clr-warning: #c59429;
-
- font-size: 16px;
-}
-
-::-webkit-scrollbar {
- width: 15px;
- height: 15px;
- background-color: transparent;
-
- &-track {
- background-color: #333;
- }
-
- &-thumb {
- background-color: #666;
- }
-
- &-corner {
- background-color: #333;
- }
-}
-
-html {
- scroll-behavior: smooth;
-}
-
-body {
- background: var(--clr-bg);
-
- margin: 0;
- padding: 0;
- font-family: 'Quicksand', sans-serif;
- font-weight: 500;
- overflow-y: scroll;
-
- &.no-scroll {
- overflow-y: hidden;
- padding-right: 15px;
-
- @include smallScreen() {
- padding: 0;
- }
- }
-}
-
-.g-tooltip {
- position: relative;
-
- display: inline-block;
- vertical-align: middle;
-
- .content {
- position: absolute;
- left: 0;
-
- z-index: 100;
-
- visibility: hidden;
- opacity: 0;
-
- min-width: 250px;
-
- background-color: #202020;
- text-align: center;
-
- border-radius: 0.5em;
-
- transition: opacity 0.3s;
- padding: 0.25em;
- }
-
- &:hover > .content {
- visibility: visible;
- opacity: 1;
- }
-}
-
-button,
-input,
-select {
- border: none;
- font-family: 'Quicksand', sans-serif;
- font-size: 1em;
-}
-
-input {
- background: none;
- color: white;
- font-size: 1em;
-
- background-color: #333;
- padding: 0.15em 0.5em;
-
- outline: none;
-
- &::placeholder {
- color: #cfcfcf;
- }
-}
-
-*,
-*::before,
-*::after {
- box-sizing: border-box;
- padding: 0;
- margin: 0;
-
- -webkit-tap-highlight-color: transparent;
-}
-
-*:focus {
- outline: none;
-}
-
-*:focus-visible {
- outline: 1px solid $accentCol;
-}
-
-.title {
- color: $accentCol;
- font-weight: 600;
-
- padding: 0.35em 0;
-}
-
-.active-indicator {
- width: 7px;
- height: 7px;
- background-color: lightgreen;
- border-radius: 50%;
-
- margin-left: 10px;
-}
-
-a {
- display: inline-block;
-
- color: white;
- text-decoration: none;
-
- transition: color 0.3s;
-
- &:hover,
- &:focus {
- color: $accentCol;
- border: none;
- }
-}
-
-ul {
- padding: 0;
- list-style: none;
-}
-
-.flex {
- display: flex;
- align-items: center;
- justify-content: center;
-
- width: 100%;
-
- &-spaced {
- justify-content: space-between;
- }
-
- &-column {
- flex-direction: column;
- }
-}
-
-.text {
- &--primary {
- color: var(--clr-primary);
- }
-
- &--grayed {
- color: #ccc;
- }
-}
-
-button {
- cursor: pointer;
- color: white;
- background: none;
-
- display: flex;
- align-items: center;
- justify-content: center;
-
- padding: 0.25em 0.5em;
-
- transition: all 100ms ease;
-
- &[data-disabled='true'] {
- user-select: none;
- pointer-events: none;
- opacity: 0.85;
- }
-}
-
-button.btn--filled {
- background-color: #1a1a1a;
- border-radius: 0.25em;
-
- &:hover {
- background-color: #2a2a2a;
- }
-}
-
-button.btn--action {
- background-color: #424242;
- border-radius: 0.25em;
-
- &:hover {
- background-color: #555;
- }
-}
-
-button.btn--option {
- color: white;
- background-color: #333;
-
- &.checked {
- color: var(--clr-primary);
- font-weight: bold;
-
- background-color: #3c3c3c;
- }
-}
-
-button.btn--image {
- font-weight: bold;
- padding: 0.35em 0.75em;
-
- img {
- width: 1.5em;
- margin-right: 0.5em;
- vertical-align: middle;
- }
-}
-
-.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 smallScreen() {
- bottom: 1em;
- right: 0;
- left: 50%;
-
- width: 1em;
- height: 1em;
-
- transform: translateX(-50%);
- }
-}
-
-@include smallScreen {
- ::-webkit-scrollbar {
- width: 0.5em;
- height: 0.5em;
-
- &-track {
- background-color: #222;
- }
-
- &-thumb {
- background-color: #777;
- }
- }
-}
+:root {
+ --clr-primary: #ffc014;
+ --clr-secondary: #2f2f2f;
+
+ --clr-bg: #4d4d4d;
+ --clr-bg2: #1b1b1b;
+
+ --clr-accent: #1085b3;
+ --clr-accent2: #ff3d5d;
+
+ --clr-skr: #ff5100;
+ --clr-twr: #ffbb00;
+
+ --clr-error: #df3e3e;
+ --clr-warning: #c59429;
+
+ font-size: 16px;
+}
+
+::-webkit-scrollbar {
+ width: 15px;
+ height: 15px;
+ background-color: transparent;
+
+ &-track {
+ background-color: #333;
+ }
+
+ &-thumb {
+ background-color: #666;
+ }
+
+ &-corner {
+ background-color: #333;
+ }
+}
+
+body {
+ background: var(--clr-bg);
+
+ margin: 0;
+ padding: 0;
+ font-family: 'Quicksand', sans-serif;
+ font-weight: 500;
+ overflow-y: scroll;
+
+ &.no-scroll {
+ overflow-y: hidden;
+ padding-right: 15px;
+
+ @include smallScreen() {
+ padding: 0;
+ }
+ }
+}
+
+.g-tooltip {
+ position: relative;
+
+ display: inline-block;
+ vertical-align: middle;
+
+ .content {
+ position: absolute;
+ left: 0;
+
+ z-index: 100;
+
+ visibility: hidden;
+ opacity: 0;
+
+ min-width: 250px;
+
+ background-color: #202020;
+ text-align: center;
+
+ border-radius: 0.5em;
+
+ transition: opacity 0.3s;
+ padding: 0.25em;
+ }
+
+ &:hover > .content {
+ visibility: visible;
+ opacity: 1;
+ }
+}
+
+button,
+input,
+select {
+ border: none;
+ font-family: 'Quicksand', sans-serif;
+ font-size: 1em;
+}
+
+input {
+ background: none;
+ color: white;
+ font-size: 1em;
+
+ background-color: #333;
+ padding: 0.15em 0.5em;
+
+ outline: none;
+
+ &::placeholder {
+ color: #cfcfcf;
+ }
+}
+
+*,
+*::before,
+*::after {
+ box-sizing: border-box;
+ padding: 0;
+ margin: 0;
+
+ -webkit-tap-highlight-color: transparent;
+}
+
+*:focus {
+ outline: none;
+}
+
+*:focus-visible {
+ outline: 1px solid $accentCol;
+}
+
+.title {
+ color: $accentCol;
+ font-weight: 600;
+
+ padding: 0.35em 0;
+}
+
+.active-indicator {
+ width: 7px;
+ height: 7px;
+ background-color: lightgreen;
+ border-radius: 50%;
+
+ margin-left: 10px;
+}
+
+a {
+ display: inline-block;
+
+ color: white;
+ text-decoration: none;
+
+ transition: color 0.3s;
+
+ &:hover,
+ &:focus {
+ color: $accentCol;
+ border: none;
+ }
+}
+
+ul {
+ padding: 0;
+ list-style: none;
+}
+
+.flex {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+
+ width: 100%;
+
+ &-spaced {
+ justify-content: space-between;
+ }
+
+ &-column {
+ flex-direction: column;
+ }
+}
+
+.text {
+ &--primary {
+ color: var(--clr-primary);
+ }
+
+ &--grayed {
+ color: #ccc;
+ }
+}
+
+button {
+ cursor: pointer;
+ color: white;
+ background: none;
+
+ display: flex;
+ align-items: center;
+ justify-content: center;
+
+ padding: 0.25em 0.5em;
+
+ transition: all 100ms ease;
+
+ &[data-disabled='true'] {
+ user-select: none;
+ pointer-events: none;
+ opacity: 0.85;
+ }
+}
+
+button.btn--filled {
+ background-color: #1a1a1a;
+ border-radius: 0.25em;
+
+ &:hover {
+ background-color: #2a2a2a;
+ }
+}
+
+button.btn--action {
+ background-color: #424242;
+ border-radius: 0.25em;
+
+ &:hover {
+ background-color: #555;
+ }
+}
+
+button.btn--option {
+ color: white;
+ background-color: #333;
+
+ &.checked {
+ color: var(--clr-primary);
+ font-weight: bold;
+
+ background-color: #3c3c3c;
+ }
+}
+
+button.btn--image {
+ font-weight: bold;
+ padding: 0.35em 0.75em;
+
+ img {
+ width: 1.5em;
+ margin-right: 0.5em;
+ vertical-align: middle;
+ }
+}
+
+.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 smallScreen() {
+ bottom: 1em;
+ right: 0;
+ left: 50%;
+
+ width: 1em;
+ height: 1em;
+
+ transform: translateX(-50%);
+ }
+}
+
+@include smallScreen {
+ ::-webkit-scrollbar {
+ width: 0.5em;
+ height: 0.5em;
+
+ &-track {
+ background-color: #222;
+ }
+
+ &-thumb {
+ background-color: #777;
+ }
+ }
+}
diff --git a/src/styles/option.scss b/src/styles/option.scss
index c0de3d5..c9a42f0 100644
--- a/src/styles/option.scss
+++ b/src/styles/option.scss
@@ -1,41 +1,40 @@
+.option {
+ font-size: 1em;
-.option {
- font-size: 1em;
-
- input {
- display: none;
+ input {
+ display: none;
+ }
+
+ span {
+ // user-select: none;
+ // -moz-user-select: none;
+ // -webkit-user-select: none;
+
+ width: 100%;
+ text-align: center;
+
+ cursor: pointer;
+
+ padding: 0.5em 0.55em;
+
+ display: inline-block;
+ position: relative;
+
+ transition: all 0.2s;
+
+ border-radius: 0.5em;
+
+ &:not(.checked) {
+ background-color: #585858;
+
+ &::before {
+ box-shadow: none;
+ }
}
-
- span {
- // user-select: none;
- // -moz-user-select: none;
- // -webkit-user-select: none;
+ }
- width: 100%;
- text-align: center;
-
- cursor: pointer;
-
- padding: 0.5em 0.55em;
-
- display: inline-block;
- position: relative;
-
- transition: all 0.2s;
-
- border-radius: 0.5em;
-
- &:not(.checked) {
- background-color: #585858;
-
- &::before {
- box-shadow: none;
- }
- }
- }
-
- &:focus span {
- // outline: 1px solid white;
- border: none;
- }
+ &:focus span {
+ // outline: 1px solid white;
+ border: none;
+ }
}
diff --git a/src/styles/responsive.scss b/src/styles/responsive.scss
index ee26fa7..f876f43 100644
--- a/src/styles/responsive.scss
+++ b/src/styles/responsive.scss
@@ -1,23 +1,23 @@
-@mixin smallScreen() {
- @media only screen and (max-width: 700px) {
- @content;
- }
-}
-
-@mixin midScreen() {
- @media only screen and (max-width: 1150px) {
- @content;
- }
-}
-
-@mixin screenLandscape() {
- @media only screen and (orientation: landscape) and (max-device-height: 450px) {
- @content;
- }
-}
-
-@mixin bigScreen() {
- @media only screen and (min-width: 2000px) {
- @content;
- }
-}
+@mixin smallScreen() {
+ @media only screen and (max-width: 700px) {
+ @content;
+ }
+}
+
+@mixin midScreen() {
+ @media only screen and (max-width: 1150px) {
+ @content;
+ }
+}
+
+@mixin screenLandscape() {
+ @media only screen and (orientation: landscape) and (max-device-height: 450px) {
+ @content;
+ }
+}
+
+@mixin bigScreen() {
+ @media only screen and (min-width: 2000px) {
+ @content;
+ }
+}
diff --git a/src/styles/sceneryViewTables.scss b/src/styles/sceneryViewTables.scss
index e6c668e..2e3f435 100644
--- a/src/styles/sceneryViewTables.scss
+++ b/src/styles/sceneryViewTables.scss
@@ -1,46 +1,46 @@
-.scenery-table-section {
- position: relative;
- height: 100%;
- overflow-y: scroll;
-}
-
-table.scenery-history-table {
- width: 100%;
- border-collapse: collapse;
-
- thead {
- position: sticky;
- top: 0;
- background-color: #222222;
- }
-
- th {
- padding: 0.5em;
- }
-
- tr {
- background-color: #353535;
- border: none;
- }
-
- td {
- padding: 0.75em;
- border-bottom: solid 5px #111;
- }
-}
-
-.no-history {
- padding: 1em 0.5em;
- background-color: #444;
- font-size: 1.2em;
- color: #ccc;
-}
-
-.bottom-info {
- display: flex;
- justify-content: center;
-
- button {
- padding: 0.5em;
- }
-}
+.scenery-table-section {
+ position: relative;
+ height: 100%;
+ overflow-y: scroll;
+}
+
+table.scenery-history-table {
+ width: 100%;
+ border-collapse: collapse;
+
+ thead {
+ position: sticky;
+ top: 0;
+ background-color: #222222;
+ }
+
+ th {
+ padding: 0.5em;
+ }
+
+ tr {
+ background-color: #353535;
+ border: none;
+ }
+
+ td {
+ padding: 0.75em;
+ border-bottom: solid 5px #111;
+ }
+}
+
+.no-history {
+ padding: 1em 0.5em;
+ background-color: #444;
+ font-size: 1.2em;
+ color: #ccc;
+}
+
+.bottom-info {
+ display: flex;
+ justify-content: center;
+
+ button {
+ padding: 0.5em;
+ }
+}
diff --git a/src/styles/search_box.scss b/src/styles/search_box.scss
index 8254e1a..f391296 100644
--- a/src/styles/search_box.scss
+++ b/src/styles/search_box.scss
@@ -1,52 +1,52 @@
-@import 'responsive.scss';
-
-.search {
- label {
- display: block;
- color: #ccc;
- margin-bottom: 0.25em;
- }
-
- &-box {
- position: relative;
-
- display: flex;
-
- border-radius: 0.5em;
- min-width: 200px;
- margin-right: 0.25em;
- }
-
- &-input {
- border: none;
- background-color: #424242;
-
- padding: 0.35em 0.5em;
- width: 100%;
- }
-
- &-exit {
- background-color: #424242;
-
- img {
- vertical-align: middle;
- height: 1.3em;
- }
- }
-
- &-button {
- width: 80%;
- max-width: 300px;
- }
-
- @include smallScreen {
- &-box,
- &-button {
- margin: 0.5em 0 0 0;
- }
-
- &-box {
- width: 100%;
- }
- }
-}
+@import 'responsive.scss';
+
+.search {
+ label {
+ display: block;
+ color: #ccc;
+ margin-bottom: 0.25em;
+ }
+
+ &-box {
+ position: relative;
+
+ display: flex;
+
+ border-radius: 0.5em;
+ min-width: 200px;
+ margin-right: 0.25em;
+ }
+
+ &-input {
+ border: none;
+ background-color: #424242;
+
+ padding: 0.35em 0.5em;
+ width: 100%;
+ }
+
+ &-exit {
+ background-color: #424242;
+
+ img {
+ vertical-align: middle;
+ height: 1.3em;
+ }
+ }
+
+ &-button {
+ width: 80%;
+ max-width: 300px;
+ }
+
+ @include smallScreen {
+ &-box,
+ &-button {
+ margin: 0.5em 0 0 0;
+ }
+
+ &-box {
+ width: 100%;
+ }
+ }
+}
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index 8b8884f..5e02d87 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -1,17 +1,17 @@
-$primaryCol: #2c2c2c;
-$secondaryCol: #01e733;
-
-$bgCol: #1d1d1d;
-$bgLigtherCol: #5b5b5b;
-
-$errorCol: #ff1919;
-$warningCol: #ffe15b;
-
-$accentCol: #ffc014;
-$accent2Col: #ff3d5d;
-
-$skr: #ff5100;
-$twr: #ffbb00;
-
-$animDuration: 150ms;
-$animType: ease-in-out;
\ No newline at end of file
+$primaryCol: #2c2c2c;
+$secondaryCol: #01e733;
+
+$bgCol: #1d1d1d;
+$bgLigtherCol: #5b5b5b;
+
+$errorCol: #ff1919;
+$warningCol: #ffe15b;
+
+$accentCol: #ffc014;
+$accent2Col: #ff3d5d;
+
+$skr: #ff5100;
+$twr: #ffbb00;
+
+$animDuration: 150ms;
+$animType: ease-in-out;
diff --git a/src/views/ErrorView.vue b/src/views/ErrorView.vue
deleted file mode 100644
index 05844c1..0000000
--- a/src/views/ErrorView.vue
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
![error]()
-
Z powodu błędu w zapisywaniu rozkładów jazdy w tej zakładce można do odwołania nacieszyć się animacją sygnału S1a. Jak naprawię to będzie :)
-
-
-
-
-
- {{ $t('journal.data-refreshed-at') }}: {{ dataRefreshedAt.toLocaleString($i18n.locale) }}
-
-
-
-
-
-
+
+
+
+ {{ $t('journal.data-refreshed-at') }}: {{ dataRefreshedAt.toLocaleString($i18n.locale) }}
+
+
+
+
+
+
-
-
{{ $t('scenery.no-scenery') }}
-
-
- {{ $t('scenery.return-btn') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
{{ $t('scenery.no-scenery') }}
+
+
+ {{ $t('scenery.return-btn') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+ 
+ 
+ 
+ 
\ No newline at end of file
+
diff --git a/src/components/Global/SelectBox.vue b/src/components/Global/SelectBox.vue
index 7331c63..4e1395e 100644
--- a/src/components/Global/SelectBox.vue
+++ b/src/components/Global/SelectBox.vue
@@ -1,217 +1,235 @@
-
- 
+ {{ $t('scenery.spawns') }}
+ 
+ {{ $t('scenery.users') }}
+ 
+ 
+ 
+ 
+