Compare commits

..

40 Commits

Author SHA1 Message Date
Spythere af6eb35b67 Merge pull request #134 from Spythere/development
v1.30.3
2025-07-05 02:20:55 +02:00
Spythere 1e6ab1c2d1 fix: status messages 2025-07-04 23:37:59 +02:00
Spythere fd4849bd5e bump: v1.30.3 2025-07-04 18:29:00 +02:00
Spythere bc0f4c5d3f chore: added head unit information in scenery active timetables 2025-07-04 18:28:41 +02:00
Spythere 8909a0cd40 fix: added timetable status for beginning offline 2025-07-04 18:22:41 +02:00
Spythere a2602aeefe chore: added displaying exit route speed limits in scenery view 2025-07-04 18:13:47 +02:00
Spythere 37ad9b2787 refactor: left & right track speed limits for routes in active train's timetable 2025-07-04 18:09:18 +02:00
Spythere 0b4ad679b3 chore: adjusted scenery view return button appearance 2025-07-04 17:16:08 +02:00
Spythere dd0d7897cf chore: better descriptions for active timetables statuses in scenery view 2025-07-04 17:12:38 +02:00
Spythere 1453dbda01 chore(scenery): added TWR/TN/PN badges to active timetables 2025-07-02 19:05:38 +02:00
Spythere 4af856b833 chore(scenery): changed appearance of the return button 2025-07-02 18:50:11 +02:00
Spythere 182b46a377 Merge pull request #133 from Spythere/development
hotfixes: v1.30.2
2025-06-02 01:39:13 +02:00
Spythere bb5fc395d2 chore: added LPS category to journal timetables filters 2025-06-02 01:38:01 +02:00
Spythere a91a00f88a refactor: scenery view back button routing; component setup script 2025-06-02 01:35:09 +02:00
Spythere c8d481a952 hotfix: EN category desc typo 2025-06-02 00:44:23 +02:00
Spythere 03ff4d8648 Merge pull request #132 from Spythere/development
v1.30.2
2025-05-27 17:47:28 +02:00
Spythere 23767801d5 chore: added timeout for welcome card appearance 2025-05-27 17:42:31 +02:00
Spythere 310261fb59 chore: queries handling 2025-05-27 17:38:53 +02:00
Spythere 742754ceef bump: v1.30.2 2025-05-27 17:19:48 +02:00
Spythere b9bb9dc201 refactor: globalized current locale, translation improvements 2025-05-27 17:19:32 +02:00
Spythere 611927f96f feat: added welcome card for new incoming users 2025-05-27 16:55:58 +02:00
Spythere 2e191f355e Merge pull request #131 from Spythere/development
fix: english typo
2025-05-24 14:42:22 +02:00
Spythere f974643e37 fix: english typo 2025-05-14 13:59:07 +02:00
Spythere 02afe2bf33 Merge pull request #130 from Spythere/development
hotfix: twr detection
2025-05-12 21:23:49 +02:00
Spythere ebdffc6241 hotfix: twr detection 2025-05-12 21:18:50 +02:00
Spythere 911c051af3 Merge pull request #129 from Spythere/development
v1.30.1
2025-05-07 22:53:53 +02:00
Spythere 7ab16960ca chore: removed obsolete logs 2025-05-07 22:42:36 +02:00
Spythere 43c7b8b024 fix: scroll behavior positioning 2025-05-07 22:32:39 +02:00
Spythere 32cf7745e8 refactor: scenery return button navigates back instead of jumping to main view 2025-05-07 22:23:00 +02:00
Spythere a68c5020d9 chore: improved responsiveness of stats headers 2025-05-07 21:03:44 +02:00
Spythere bf88caa704 fix: translation 2025-05-07 20:56:59 +02:00
Spythere ea5d681943 fix: donator text gradient placement 2025-05-07 20:51:39 +02:00
Spythere d346e049e0 chore: updated packages 2025-05-07 20:48:15 +02:00
Spythere feb2027c16 bump: v1.30.1 2025-05-07 20:45:27 +02:00
Spythere 06d0fabc99 chore: added new text style for donators 2025-05-07 20:45:13 +02:00
Spythere 3c74580bed refactor: changed position of generaTOR link; added missing tooltips 2025-05-07 20:06:37 +02:00
Spythere 02d234a21b chore: added missing translations; minor style fixes 2025-05-07 19:07:01 +02:00
Spythere d9dc44063f chore: added tooltips to external app links 2025-05-07 18:22:05 +02:00
Spythere 5929bbdccb refactor: moved speed limits from local to api 2025-05-07 18:18:34 +02:00
Spythere f73c3f4aec chore: added links to other external tools; changed design of the donation button 2025-05-02 02:36:19 +02:00
34 changed files with 1338 additions and 1205 deletions
+12 -12
View File
@@ -1,6 +1,6 @@
{
"name": "stacjownik",
"version": "1.30.0",
"version": "1.30.3",
"private": true,
"type": "module",
"scripts": {
@@ -16,26 +16,26 @@
"format": "prettier --write src/"
},
"dependencies": {
"core-js": "^3.32.2",
"dotenv": "^16.3.1",
"pinia": "^2.1.6",
"sass": "^1.67.0",
"core-js": "^3.42.0",
"dotenv": "^16.5.0",
"pinia": "^3.0.2",
"sass": "^1.87.0",
"showdown": "^2.1.0",
"vue": "^3.3.4",
"vue-i18n": "^9.4.1",
"vue-i18n": "^11.1.3",
"vue-router": "^4.4.0"
},
"devDependencies": {
"@types/node": "^22.13.13",
"@types/node": "^22.15.15",
"@types/showdown": "^2.0.6",
"@vite-pwa/assets-generator": "^0.2.4",
"@vite-pwa/assets-generator": "^1.0.0",
"@vitejs/plugin-vue": "^5.1.0",
"@vue/tsconfig": "^0.5.1",
"axios": "^1.7.2",
"@vue/tsconfig": "^0.7.0",
"axios": "^1.9.0",
"prettier": "^3.3.3",
"typescript": "^5.5.4",
"vite": "^5.3.4",
"vite-plugin-pwa": "^0.20.0",
"vite": "^6.3.5",
"vite-plugin-pwa": "^1.0.0",
"vue-tsc": "^2.0.28"
},
"browserslist": [
+47
View File
@@ -0,0 +1,47 @@
<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="512" height="512" rx="256" fill="black"/>
<rect x="329.454" y="340.498" width="7.7497" height="147.239" rx="3.87485" transform="rotate(90 329.454 340.498)" fill="white"/>
<rect x="308" y="320" width="5" height="103" rx="2.5" transform="rotate(90 308 320)" fill="white"/>
<rect x="366.263" y="367.622" width="11.6246" height="213.496" rx="5.81228" transform="rotate(90 366.263 367.622)" fill="white"/>
<g filter="url(#filter0_d_1067_42)">
<rect width="18.2931" height="124.137" rx="9.14654" transform="matrix(0.688736 0.725012 -0.688736 0.725012 212.498 294)" fill="white"/>
</g>
<g filter="url(#filter1_d_1067_42)">
<rect width="19.6916" height="124.137" rx="9.84578" transform="matrix(-0.688736 0.725012 0.688736 0.725012 303.502 294)" fill="white"/>
</g>
<g filter="url(#filter2_d_1067_42)">
<path d="M147.893 304.935H121.015C109.69 304.935 101.233 302.498 95.6422 297.624C90.195 292.607 87.4713 285.01 87.4713 274.832V194.628C87.4713 184.307 90.195 176.71 95.6422 171.836C101.233 166.962 109.69 164.525 121.015 164.525H178.856V187.318H115.854C114.134 187.318 113.274 188.178 113.274 189.898V279.562C113.274 281.283 114.134 282.143 115.854 282.143H154.559C156.279 282.143 157.139 281.283 157.139 279.562V245.589L159.719 249.674H138.002V228.387H181.436V274.832C181.436 285.01 178.641 292.607 173.051 297.624C167.603 302.498 159.217 304.935 147.893 304.935ZM282.921 265.371V166.46H304.853V303H287.006L222.284 204.734L226.585 203.874V303H204.867V166.46H222.499L287.006 264.511L282.921 265.371ZM358.59 303H333.218V166.46L391.059 165.6C402.527 165.313 411.199 167.894 417.077 173.341C423.097 178.788 426.108 186.672 426.108 196.994V218.711C426.108 227.025 423.814 233.978 419.227 239.568C414.783 245.159 408.189 248.671 399.445 250.104V245.159C403.889 246.019 407.401 247.739 409.981 250.319C412.561 252.9 414.783 256.842 416.647 262.146L431.053 303H405.68L389.339 254.19C388.909 253.043 388.479 252.255 388.049 251.824C387.762 251.251 386.973 250.964 385.683 250.964H354.505L358.59 246.879V303ZM358.59 183.232V233.117L354.935 229.247H397.295C399.301 229.247 400.305 228.315 400.305 226.452V190.328C400.305 188.464 399.301 187.533 397.295 187.533H354.935L358.59 183.232Z" fill="white"/>
</g>
<defs>
<filter id="filter0_d_1067_42" x="101.768" y="268.962" width="148.561" height="153.339" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
<feOffset/>
<feGaussianBlur stdDeviation="14.4611"/>
<feComposite in2="hardAlpha" operator="out"/>
<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_1067_42"/>
<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_1067_42" result="shape"/>
</filter>
<filter id="filter1_d_1067_42" x="264.99" y="269.259" width="148.96" height="153.759" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
<feOffset/>
<feGaussianBlur stdDeviation="14.4611"/>
<feComposite in2="hardAlpha" operator="out"/>
<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_1067_42"/>
<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_1067_42" result="shape"/>
</filter>
<filter id="filter2_d_1067_42" x="85.2844" y="161.245" width="352.33" height="149.158" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
<feOffset dx="2.18692" dy="1.09346"/>
<feGaussianBlur stdDeviation="2.18692"/>
<feComposite in2="hardAlpha" operator="out"/>
<feColorMatrix type="matrix" values="0 0 0 0 0.5375 0 0 0 0 0.5375 0 0 0 0 0.5375 0 0 0 1 0"/>
<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_1067_42"/>
<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_1067_42" result="shape"/>
</filter>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 4.3 KiB

+24
View File
@@ -0,0 +1,24 @@
<svg width="500" height="500" viewBox="0 0 500 500" fill="none" xmlns="http://www.w3.org/2000/svg">
<mask id="path-1-inside-1_102_63" fill="white">
<path d="M0 250C0 111.929 111.929 6.10352e-05 250 6.10352e-05C388.071 6.10352e-05 500 111.929 500 250C500 388.071 388.071 500 250 500C111.929 500 0 388.071 0 250Z"/>
</mask>
<path d="M0 250C0 111.929 111.929 6.10352e-05 250 6.10352e-05C388.071 6.10352e-05 500 111.929 500 250C500 388.071 388.071 500 250 500C111.929 500 0 388.071 0 250Z" fill="#242424"/>
<path d="M0 222.821C0 84.7503 111.929 -27.1785 250 -27.1785C388.071 -27.1785 500 84.7503 500 222.821V250C500 126.939 388.071 27.1787 250 27.1787C111.929 27.1787 0 126.939 0 250V222.821ZM500 277.179C500 415.25 388.071 527.179 250 527.179C111.929 527.179 0 415.25 0 277.179V250C0 373.061 111.929 472.821 250 472.821C388.071 472.821 500 373.061 500 250V277.179ZM0 500V6.10352e-05V500ZM500 6.10352e-05V500V6.10352e-05Z" fill="#FFD600" mask="url(#path-1-inside-1_102_63)"/>
<path d="M210.369 301.604C210.369 301.604 210.369 341.807 210.369 364.846C210.369 387.885 202.798 417.491 171.591 417.491C140.385 417.491 132.813 417.491 132.813 417.491L132.812 78.125L250.754 78.125C274.312 78.125 294.504 80.9665 311.331 86.6494C328.311 92.1788 342.232 99.8585 353.093 109.689C364.107 119.519 372.214 131.115 377.415 144.478C382.616 157.84 385.217 172.278 385.217 187.791C385.217 204.533 382.54 219.892 377.186 233.869C371.832 247.846 363.648 259.827 352.634 269.81C341.62 279.794 327.623 287.627 310.643 293.31C293.816 298.839 273.853 301.604 250.754 301.604L210.369 301.604ZM210.369 242.854L250.754 242.854C270.946 242.854 285.479 238.016 294.351 228.34C303.224 218.663 307.66 205.147 307.66 187.791C307.66 180.111 306.512 173.123 304.218 166.825C301.923 160.528 298.405 155.152 293.663 150.698C289.074 146.09 283.184 142.558 275.995 140.1C268.958 137.643 260.544 136.414 250.754 136.414L210.369 136.414L210.369 242.854Z" fill="url(#paint0_linear_102_63)"/>
<path d="M239.215 301.604C239.215 301.604 239.215 341.807 239.215 364.846C239.215 387.885 231.643 417.491 200.437 417.491C169.231 417.491 161.659 417.491 161.659 417.491L161.658 78.125L279.6 78.125C303.158 78.125 323.35 80.9665 340.177 86.6494C357.157 92.1788 371.077 99.8585 381.938 109.689C392.952 119.519 401.06 131.115 406.261 144.478C411.462 157.84 414.062 172.278 414.062 187.791C414.062 204.533 411.385 219.892 406.031 233.869C400.677 247.846 392.493 259.827 381.479 269.81C370.465 279.794 356.468 287.627 339.488 293.31C322.662 298.839 302.699 301.604 279.6 301.604L239.215 301.604ZM239.215 242.854L279.6 242.854C299.792 242.854 314.325 238.016 323.197 228.34C332.069 218.663 336.505 205.147 336.505 187.791C336.505 180.111 335.358 173.123 333.064 166.825C330.769 160.528 327.251 155.152 322.509 150.698C317.919 146.09 312.03 142.558 304.84 140.1C297.804 137.643 289.39 136.414 279.6 136.414L239.215 136.414L239.215 242.854Z" fill="url(#paint1_linear_102_63)"/>
<path d="M210.685 301.604C210.685 301.604 210.685 341.807 210.685 364.846C210.685 387.885 203.082 417.491 171.749 417.491C140.416 417.491 132.813 417.491 132.813 417.491L132.812 78.125L251.233 78.125C274.887 78.125 295.161 80.9665 312.057 86.6494C329.105 92.1788 343.083 99.8585 353.988 109.689C365.046 119.519 373.187 131.115 378.409 144.478C383.631 157.84 386.242 172.278 386.242 187.791C386.242 204.533 383.555 219.892 378.179 233.869C372.803 247.846 364.586 259.827 353.527 269.81C342.468 279.794 328.414 287.627 311.365 293.31C294.47 298.839 274.426 301.604 251.233 301.604L210.685 301.604ZM210.685 242.854L251.233 242.854C271.508 242.854 286.099 238.016 295.008 228.34C303.916 218.663 308.37 205.147 308.37 187.791C308.37 180.111 307.218 173.123 304.914 166.825C302.611 160.528 299.078 155.152 294.316 150.698C289.709 146.09 283.795 142.558 276.576 140.1C269.511 137.643 261.063 136.414 251.233 136.414L210.685 136.414L210.685 242.854Z" fill="url(#paint2_radial_102_63)"/>
<defs>
<linearGradient id="paint0_linear_102_63" x1="259.015" y1="78.125" x2="259.015" y2="417.491" gradientUnits="userSpaceOnUse">
<stop offset="0.135417" stop-color="#FFD600"/>
<stop offset="1"/>
</linearGradient>
<linearGradient id="paint1_linear_102_63" x1="287.86" y1="78.125" x2="287.86" y2="417.491" gradientUnits="userSpaceOnUse">
<stop offset="0.135417" stop-color="#FFD600"/>
<stop offset="1"/>
</linearGradient>
<radialGradient id="paint2_radial_102_63" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(259.527 247.808) rotate(0.36307) scale(345.948 325.206)">
<stop offset="0.484375" stop-color="white"/>
<stop offset="1"/>
</radialGradient>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 4.5 KiB

+31 -5
View File
@@ -5,9 +5,11 @@
@toggle-card="() => (isUpdateCardOpen = false)"
/>
<AppWelcomeCard :is-card-open="isWelcomeCardOpen" @toggle-card="closeWelcomeCard" />
<Tooltip />
<AppHeader :current-lang="currentLang" @change-lang="changeLang" />
<AppHeader :current-lang="store.currentLocale" @change-lang="changeLang" />
<main class="app_main">
<router-view v-slot="{ Component }">
@@ -44,8 +46,10 @@ import UpdateCard from './components/App/UpdateCard.vue';
import StorageManager from './managers/storageManager';
import AppFooter from './components/App/AppFooter.vue';
import AppWelcomeCard from './components/App/AppWelcomeCard.vue';
const STORAGE_VERSION_KEY = 'app_version';
const WELCOME_CARD_SEEN_KEY = 'welcome_card_seen';
export default defineComponent({
components: {
@@ -54,6 +58,7 @@ export default defineComponent({
AppHeader,
AppFooter,
UpdateCard,
AppWelcomeCard,
Tooltip
},
@@ -64,8 +69,8 @@ export default defineComponent({
tooltipStore: useTooltipStore(),
isUpdateCardOpen: false,
isWelcomeCardOpen: false,
currentLang: 'pl',
isOnProductionHost: location.hostname == 'stacjownik-td2.web.app'
}),
@@ -85,13 +90,29 @@ export default defineComponent({
this.loadLang();
this.setupOfflineHandling();
this.checkAppVersion();
this.handleQueries();
this.apiStore.setupAPIData();
},
handleQueries() {
const query = new URLSearchParams(window.location.search);
if (query.get('welcomeCard') == '1') {
this.isWelcomeCardOpen = true;
}
},
async checkAppVersion() {
const isWelcomeCardSeen = StorageManager.getBooleanValue(WELCOME_CARD_SEEN_KEY);
const storageVersion = StorageManager.getStringValue(STORAGE_VERSION_KEY);
if (isWelcomeCardSeen == false && storageVersion == '') {
setTimeout(() => {
this.isWelcomeCardOpen = true;
}, 1500);
}
try {
const releaseData = await (
await axios.get('https://api.github.com/repos/Spythere/stacjownik/releases/latest')
@@ -140,7 +161,7 @@ export default defineComponent({
changeLang(lang: string) {
this.$i18n.locale = lang;
this.currentLang = lang;
this.store.currentLocale = lang;
StorageManager.setStringValue('lang', lang);
},
@@ -157,10 +178,15 @@ export default defineComponent({
const naviLanguage = window.navigator.language.toString();
if (naviLanguage.startsWith('en')) {
if (!naviLanguage.startsWith('pl')) {
this.changeLang('en');
return;
}
},
closeWelcomeCard() {
this.isWelcomeCardOpen = false;
StorageManager.setBooleanValue(WELCOME_CARD_SEEN_KEY, true);
}
}
});
+4 -2
View File
@@ -9,7 +9,9 @@
<br />
<a href="https://discord.gg/x2mpNN3svk">
<img src="/images/icon-discord.png" alt="" />&nbsp;<b>{{ $t('footer.discord') }}</b>
<img src="/images/icon-discord.png" alt="discord logo icon" />&nbsp;<b class="text--discord">
{{ $t('footer.discord') }}
</b>
</a>
<div style="display: none">&int; ukryta taktyczna całka do programowania w HTMLu</div>
@@ -36,4 +38,4 @@ export default defineComponent({
}
}
});
</script>
</script>
+246
View File
@@ -0,0 +1,246 @@
<template>
<Card :is-open="props.isCardOpen">
<div class="body-content">
<h1>{{ $t('welcome.title') }}</h1>
<div class="language-select">
<button :data-active="$i18n.locale == 'pl'" @click="changeLang('pl')">
<img src="/images/icon-pl.svg" alt="" width="45" />
</button>
<button :data-active="$i18n.locale == 'en'" @click="changeLang('en')">
<img src="/images/icon-en.jpg" alt="" width="45" />
</button>
</div>
<section class="app-description">
<i18n-t keypath="welcome.app-desc" tag="p">
<template v-slot:b1>
<b>{{ $t('welcome.app-desc-b1') }}</b>
</template>
<template v-slot:link>
<a href="https://td2.info.pl/" class="link" target="_blank">Train Driver 2</a>
</template>
</i18n-t>
</section>
<section class="tabs">
<div class="tab-description">
<h2 class="text--primary">{{ $t('welcome.sceneries-header') }}</h2>
<hr />
<i18n-t keypath="welcome.sceneries-desc" tag="p">
<template v-slot:b1>
<b>{{ $t('welcome.sceneries-desc-b1') }}</b>
</template>
</i18n-t>
</div>
<div class="tab-description">
<h2 class="text--primary">{{ $t('welcome.trains-header') }}</h2>
<hr />
<i18n-t keypath="welcome.trains-desc" tag="p">
<template v-slot:b1>
<b>{{ $t('welcome.trains-desc-b1') }}</b>
</template>
</i18n-t>
</div>
<div class="tab-description">
<h2 class="text--primary">{{ $t('welcome.journal-header') }}</h2>
<hr />
<i18n-t keypath="welcome.journal-desc" tag="p">
<template v-slot:b1>
<b>{{ $t('welcome.journal-desc-b1') }}</b>
</template>
</i18n-t>
</div>
</section>
<section class="other-apps">
<b class="text--primary">
{{ $t('welcome.other-apps') }}
</b>
<div class="apps-grid">
<a class="app-item" href="https://pojazdownik-td2.web.app/" target="_blank">
<img src="/images/icon-pojazdownik.svg" alt="pojazdownik app logo" />
<h3 class="text--primary">Pojazdownik</h3>
<p>{{ $t('welcome.pojazdownik-desc') }}</p>
</a>
<a class="app-item" href="https://generator-td2.web.app/" target="_blank">
<img src="/images/icon-gnr.svg" alt="generator app logo" />
<h3 class="text--primary">GeneraTOR</h3>
<p>{{ $t('welcome.generator-desc') }}</p>
</a>
<a class="app-item" href="https://srjp-td2.web.app/" target="_blank">
<img src="/images/icon-srjp.svg" alt="srjp app logo" />
<h3 class="text--primary">Rozkładownik</h3>
<p>{{ $t('welcome.srjp-desc') }}</p>
</a>
</div>
</section>
<section class="bottom-info">
<i18n-t keypath="welcome.donation-info" tag="div" class="donation-info">
<template v-slot:icon1>
<img src="/images/icon-diamond.svg" alt="diamond icon" width="25" />
<span class="text--donator">&nbsp;{{ $t('welcome.donation-info-icon1-text') }}</span>
</template>
</i18n-t>
<i18n-t keypath="welcome.discord-info" tag="div" class="discord-info">
<template v-slot:discord>
<a href="https://discord.gg/x2mpNN3svk" class="link" target="_blank">
<b class="text--discord">{{ $t('welcome.discord-info-link-text') }}</b>
</a>
</template>
</i18n-t>
<div class="bottom-text">
<i>{{ $t('welcome.bottom-text') }}</i>
</div>
<div class="bottom-actions">
<button class="btn btn--action" @click="toggleCard(false)">
{{ $t('welcome.button-confirm') }}
</button>
</div>
</section>
</div>
</Card>
</template>
<script setup lang="ts">
import { useI18n } from 'vue-i18n';
import Card from '../Global/Card.vue';
import { useMainStore } from '../../store/mainStore';
import StorageManager from '../../managers/storageManager';
const i18n = useI18n();
const store = useMainStore();
const emit = defineEmits(['toggleCard']);
const props = defineProps({
isCardOpen: Boolean
});
function toggleCard(state: boolean) {
emit('toggleCard', state);
}
function changeLang(localeName: string) {
i18n.locale.value = localeName;
store.currentLocale = localeName;
StorageManager.setStringValue('lang', localeName);
}
</script>
<style lang="scss" scoped>
.body-content {
max-width: 800px;
min-height: 900px;
padding: 1em 0.5em;
text-align: center;
font-size: 1.1em;
}
hr {
margin-bottom: 0.5em;
}
a.link {
text-decoration: underline;
img {
vertical-align: middle;
margin-right: 0.2em;
}
}
.language-select {
display: flex;
justify-content: center;
margin: 0.5em 0;
button[data-active='false'] img {
opacity: 0.5;
}
}
.app-description {
margin: 1em 0;
}
.tab-description {
margin-top: 0.5em;
}
.other-apps {
font-weight: bold;
margin: 1em 0;
font-size: 1.1em;
}
.apps-grid {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
gap: 1em;
padding: 1em;
}
.apps-grid > a.app-item {
display: flex;
flex-direction: column;
align-items: center;
gap: 0.5em;
padding: 1em;
background-color: #2b2b2b;
transition: background-color 100ms ease-in-out;
border-radius: 0.5em;
&:hover {
background-color: #3b3b3b;
}
img {
width: 2.5em;
}
}
.donation-info {
font-weight: bold;
font-size: 1.1em;
img {
vertical-align: middle;
}
}
.discord-info {
margin-top: 1em;
font-weight: bold;
img {
vertical-align: middle;
}
}
.bottom-text {
margin: 1em 0;
font-weight: bold;
font-size: 1.2em;
}
.bottom-actions {
display: flex;
justify-content: center;
margin-top: 1em;
font-size: 1.25em;
}
</style>
+2 -2
View File
@@ -9,7 +9,7 @@
<transition mode="out-in" name="slider-anim" class="current-name">
<span :key="displayingName">
<img src="/images/icon-diamond.svg" alt="donator diamond icon" />
{{ displayingName }}
<span class="text--donator">{{ displayingName }}</span>
</span>
</transition>
</div>
@@ -45,7 +45,7 @@
</template>
<template v-slot:b2>
<b>{{ $t('donations.p4-b2') }}</b>
<b class="text--donator">{{ $t('donations.p4-b2') }}</b>
</template>
</i18n-t>
<br />
+55 -16
View File
@@ -1,5 +1,13 @@
<template>
<section class="info-header">
<button
class="btn btn-return"
:title="$t('scenery.return-btn')"
@click="onReturnButtonClick"
>
<img src="/images/icon-back.svg" alt="return button" />
</button>
<a class="scenery-name" :href="station?.generalInfo?.url" target="_blank">
{{ stationName.replace(/_/g, ' ') }}
</a>
@@ -12,39 +20,64 @@
</section>
</template>
<script lang="ts">
import { PropType, defineComponent } from 'vue';
<script lang="ts" setup>
import { onMounted, PropType, ref } from 'vue';
import { ActiveScenery, Station } from '../../typings/common';
import { useRoute, useRouter } from 'vue-router';
export default defineComponent({
props: {
station: {
type: Object as PropType<Station>
},
const route = useRoute();
const router = useRouter();
stationName: {
type: String,
required: true
},
const prevPath = ref('/');
onlineScenery: {
type: Object as PropType<ActiveScenery>
}
onMounted(() => {
prevPath.value = (route.meta['prevPath'] as string) ?? '/';
});
defineProps({
station: {
type: Object as PropType<Station>
},
stationName: {
type: String,
required: true
},
onlineScenery: {
type: Object as PropType<ActiveScenery>
}
});
function onReturnButtonClick() {
router.push(prevPath.value);
}
</script>
<style lang="scss" scoped>
@use '../../styles/responsive';
@use 'sass:color';
.info-header {
margin-top: 1em;
.btn-return {
$bgColor: #2b2b2b;
background-color: $bgColor;
margin-bottom: 0.5em;
img {
width: 2em;
}
&:hover {
background-color: color.adjust($color: $bgColor, $lightness: 15%);
}
}
.scenery-name {
font-weight: bold;
font-size: 3em;
text-align: center;
text-transform: uppercase;
}
@@ -58,4 +91,10 @@ export default defineComponent({
color: #aaa;
font-size: 1.2em;
}
@include responsive.smallScreen {
.scenery-name {
font-size: 2.5em;
}
}
</style>
+3 -4
View File
@@ -6,8 +6,7 @@
<SceneryInfoRoutes v-if="station" :station="station" />
<SceneryInfoAuthors :station="station" />
<div style="margin: 2em 0; height: 2px; background-color: white"></div>
<div style="margin: 1em 0; height: 2px; background-color: white"></div>
<!-- info dispatcher -->
<SceneryInfoDispatcher :onlineScenery="onlineScenery" />
@@ -32,7 +31,7 @@ import SceneryInfoUserList from './SceneryInfo/SceneryInfoUserList.vue';
import SceneryInfoSpawnList from './SceneryInfo/SceneryInfoSpawnList.vue';
import SceneryInfoRoutes from './SceneryInfo/SceneryInfoRoutes.vue';
import SceneryInfoGeneral from './SceneryInfo/SceneryInfoGeneral.vue';
import SceneryInfoAuthors from "./SceneryInfo/SceneryInfoAuthors.vue";
import SceneryInfoAuthors from './SceneryInfo/SceneryInfoAuthors.vue';
import { ActiveScenery, Station } from '../../typings/common';
@@ -44,7 +43,7 @@ export default defineComponent({
SceneryInfoAuthors,
SceneryInfoUserList,
SceneryInfoSpawnList,
SceneryInfoRoutes,
SceneryInfoRoutes
},
props: {
station: {
@@ -44,6 +44,7 @@
{{ route.routeName }}
</span>
<span v-if="route.routeSpeed" class="speed">{{ route.routeSpeed }}</span>
<span v-if="route.routeSpeedExit" class="speed">| {{ route.routeSpeedExit }}</span>
<span v-if="route.routeLength" class="length">
{{ (route.routeLength / 1000).toFixed(1) + 'km' }}
</span>
@@ -118,7 +119,8 @@ export default defineComponent({
<style lang="scss" scoped>
.info-routes {
display: flex;
display: grid;
grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
justify-content: center;
flex-direction: column;
+98 -26
View File
@@ -13,12 +13,31 @@
</span>
</span>
<span class="header_links" v-if="station">
<a :href="pragotronHref" target="_blank" :title="$t('scenery.pragotron-link')">
<span class="header_links" v-if="station && onlineScenery">
<a
:href="generatorHref"
target="_blank"
data-tooltip-type="HtmlTooltip"
:data-tooltip-content="`<b>${$t('scenery.gnr-link')}</b>`"
>
<img src="/images/icon-gnr.svg" alt="GeneraTOR app icon" />
</a>
<a
:href="pragotronHref"
target="_blank"
data-tooltip-type="HtmlTooltip"
:data-tooltip-content="`<b>${$t('scenery.pragotron-link')}</b>`"
>
<img src="/images/icon-pragotron.svg" alt="icon-pragotron" />
</a>
<a :href="tabliceZbiorczeHref" target="_blank" :title="$t('scenery.tablice-link')">
<a
:href="tabliceZbiorczeHref"
target="_blank"
data-tooltip-type="HtmlTooltip"
:data-tooltip-content="`<b>${$t('scenery.tablice-link')}</b>`"
>
<img src="/images/icon-tablice.ico" alt="icon-tablice" />
</a>
</span>
@@ -74,18 +93,56 @@
<span class="timetable-general">
<span class="general-info">
<div class="info-train">
<b
data-tooltip-type="BaseTooltip"
:data-tooltip-content="getCategoryExplanation(row.train.timetableData!.category)"
class="text--primary tooltip-help"
>
{{ row.train.timetableData!.category }}
</b>
<span>&nbsp;</span>
<b>{{ row.train.trainNo }}</b>
<span>&nbsp;&bull;&nbsp;</span>
<span>{{ row.train.driverName }}</span>
<!-- Cargo warnings & details badges -->
<span
class="train-badge twr"
v-if="row.train.timetableData!.twr"
data-tooltip-type="BaseTooltip"
:data-tooltip-content="$t('warnings.TWR')"
>
TWR
</span>
<span
class="train-badge tn"
v-if="row.train.timetableData!.hasDangerousCargo"
data-tooltip-type="BaseTooltip"
:data-tooltip-content="$t('warnings.TN')"
>
TN
</span>
<span
class="train-badge pn"
v-if="row.train.timetableData!.hasExtraDeliveries"
data-tooltip-type="BaseTooltip"
:data-tooltip-content="$t('warnings.PN')"
>
PN
</span>
<!-- Train info -->
<span>
<b
data-tooltip-type="BaseTooltip"
:data-tooltip-content="
getCategoryExplanation(row.train.timetableData!.category)
"
class="text--primary tooltip-help"
>
{{ row.train.timetableData!.category }}
</b>
<b>&nbsp;{{ row.train.trainNo }}</b>
</span>
<span>&bull;</span>
<span>{{ row.train.driverName }}</span>
<span>&bull;</span>
<b style="color: #ddd">{{ row.train.stockList[0] }}</b>
<!-- Train stop comments -->
<span
class="stop-comments-icon"
v-if="row.checkpointStop.comments"
data-tooltip-type="BaseTooltip"
:data-tooltip-content="row.checkpointStop.comments"
@@ -256,6 +313,10 @@ export default defineComponent({
return url;
},
generatorHref() {
return `https://generator-td2.web.app/?sceneryId=${this.onlineScenery!.name}|${this.onlineScenery!.region}`;
},
sceneryTimetables(): SceneryTimetableRow[] {
if (!this.onlineScenery) return [];
@@ -329,6 +390,7 @@ export default defineComponent({
<style lang="scss" scoped>
@use '../../styles/responsive';
@use '../../styles/animations';
@use '../../styles/badge';
.scenery-timetable {
height: 100%;
@@ -363,7 +425,7 @@ export default defineComponent({
.header_links {
display: flex;
gap: 0.5em;
gap: 0.25em;
margin-left: 0.5em;
}
@@ -445,21 +507,31 @@ export default defineComponent({
.general-info {
display: flex;
flex-direction: column;
flex-wrap: wrap;
}
.info-number {
color: var(--clr-primary);
}
.info-train {
display: flex;
flex-wrap: wrap;
gap: 0.25em;
}
.info-route {
width: 100%;
}
.info-train > .train-badge {
font-size: 0.85em;
}
img {
height: 0.9em;
vertical-align: middle;
margin: 0 0.25em;
}
.info-number {
color: var(--clr-primary);
}
.info-route {
width: 100%;
}
.stop-comments-icon > img {
width: 1.2em;
vertical-align: middle;
}
.schedule {
@@ -2,11 +2,9 @@
<div class="general-status">
<span
:class="computedScheduledTrain.status"
data-tooltip-type="HtmlTooltip"
:data-tooltip-content="computedScheduledTrain.stopStatusDescription"
@click.prevent="() => {}"
v-html="computedScheduledTrain.stopStatusIndicator"
>
{{ computedScheduledTrain.stopStatusIndicator }}
</span>
</div>
</template>
@@ -28,48 +26,37 @@ export default defineComponent({
computedScheduledTrain() {
const { status, prevElement, currentElement, nextElement } = this.sceneryTimetableRow;
const prevDepartureIndicator = prevElement?.departureRouteExt
? `(${prevElement.departureRouteExt}) ${prevElement.stationName}`
: '---';
const nextArrivalIndicator = nextElement?.arrivalRouteExt
? `(${nextElement.arrivalRouteExt}) ${nextElement.stationName}`
: `${currentElement.stationName}`;
let stopStatusDescription = '',
stopStatusIndicator = '';
let stopStatusIndicator = '';
switch (status) {
case StopStatus.ARRIVING:
stopStatusIndicator = `${this.$t('timetables.from')}: ${prevDepartureIndicator}`;
stopStatusDescription = this.$t('timetables.desc-arriving', {
prevStationName: prevElement?.stationName ?? '',
prevDepartureLine: prevElement?.departureRouteExt ?? ''
});
if (prevElement) {
stopStatusIndicator = this.$t('timetables.desc-arriving', {
prevStationName: prevElement?.stationName ?? '',
prevDepartureLine: prevElement?.departureRouteExt ?? ''
});
} else {
stopStatusIndicator = this.$t('timetables.desc-beginning');
}
break;
case StopStatus.ONLINE:
case StopStatus.STOPPED:
stopStatusIndicator = nextElement?.arrivalRouteExt
? `${this.$t('timetables.to')}: ${nextArrivalIndicator}`
: `${this.$t('timetables.desc-end')}`;
stopStatusDescription = nextElement?.arrivalRouteExt
? this.$t(`timetables.desc-${status}`, {
nextStationName: nextElement?.stationName,
nextArrivalLine: nextElement?.arrivalRouteExt
})
: '';
: this.$t(`timetables.desc-end`);
break;
case StopStatus.DEPARTED:
stopStatusIndicator = `${this.$t('timetables.to')}: ${nextArrivalIndicator}`;
if (!nextElement?.stationName) {
stopStatusDescription = this.$t('timetables.desc-departed-ends', {
stopStatusIndicator = this.$t('timetables.desc-departed-ends', {
nextStationName: currentElement.stationName
});
} else {
stopStatusDescription = this.$t('timetables.desc-departed', {
stopStatusIndicator = this.$t('timetables.desc-departed', {
nextStationName: nextElement?.stationName ?? currentElement.stationName,
nextArrivalLine: nextElement?.arrivalRouteExt
});
@@ -78,16 +65,14 @@ export default defineComponent({
break;
case StopStatus.DEPARTED_AWAY:
stopStatusIndicator = `${this.$t('timetables.to')}: ${nextArrivalIndicator}`;
stopStatusDescription = this.$t('timetables.desc-departed-away', {
stopStatusIndicator = this.$t('timetables.desc-departed-away', {
nextStationName: nextElement?.stationName,
nextArrivalLine: nextElement?.arrivalRouteExt
});
break;
case StopStatus.TERMINATED:
stopStatusIndicator = `X ${this.$t('timetables.desc-terminated')}`;
stopStatusDescription = this.$t('timetables.desc-terminated');
stopStatusIndicator = this.$t('timetables.desc-terminated');
break;
default:
@@ -95,7 +80,6 @@ export default defineComponent({
}
return {
...this.sceneryTimetableRow,
stopStatusDescription,
stopStatusIndicator
};
}
@@ -106,7 +90,6 @@ export default defineComponent({
<style lang="scss" scoped>
.general-status {
margin-top: 0.5em;
cursor: help;
span.arriving {
color: #ccc;
@@ -114,17 +97,14 @@ export default defineComponent({
span.departed {
color: lime;
font-weight: bold;
&-away {
font-weight: bold;
color: #5ecc5e;
}
}
span.stopped {
color: #ffa600;
font-weight: bold;
}
span.online {
@@ -133,7 +113,6 @@ export default defineComponent({
span.terminated {
color: salmon;
font-weight: bold;
}
}
</style>
@@ -411,11 +411,6 @@ h3.section-header {
.card_controls {
display: flex;
gap: 0.5em;
input {
border-radius: 0.5em 0.5em 0 0;
height: 100%;
}
}
.card_content {
@@ -606,7 +601,7 @@ h3.section-header {
border: 3px solid var(--clr-primary);
background-color: #333;
@include responsive.smallScreen{
@include responsive.smallScreen {
width: 15px;
height: 15px;
margin-top: -5px;
@@ -625,7 +620,7 @@ h3.section-header {
cursor: pointer;
@include responsive.smallScreen{
@include responsive.smallScreen {
width: 1em;
height: 1em;
border: 3px solid var(--clr-primary);
@@ -658,7 +653,7 @@ h3.section-header {
}
}
@include responsive.smallScreen{
@include responsive.smallScreen {
.slider {
display: flex;
flex-wrap: wrap;
@@ -672,5 +667,9 @@ h3.section-header {
text-align: center;
}
}
.card_controls > button > p {
display: none;
}
}
</style>
+6 -2
View File
@@ -8,14 +8,14 @@
<button class="filter-button btn--filled btn--image" @click="toggleDropdown" ref="button">
<img src="/images/icon-stats.svg" alt="Open filters icon" />
{{ $t('station-stats.stats-button') }}
<span>{{ $t('station-stats.stats-button') }}</span>
</button>
<transition name="dropdown-anim">
<div class="dropdown_wrapper" v-if="showDropdown">
<div>
<h1 class="stats-title text--primary">
<img src="/images/icon-stats.svg" alt="Open filters icon" />
<img src="/images/icon-stats.svg" alt="Open filters icon" height="28" />
{{ $t('station-stats.title') }}
</h1>
@@ -282,5 +282,9 @@ h1.stats-title img {
h1.stats-title {
text-align: center;
}
.filter-button > span {
display: none;
}
}
</style>
+3 -3
View File
@@ -124,8 +124,8 @@
data-tooltip-type="DonatorTooltip"
:data-tooltip-content="$t('donations.dispatcher-message')"
>
<img src="/images/icon-diamond.svg" alt="" />
{{ station.onlineInfo.dispatcherName }}
<img src="/images/icon-diamond.svg" alt="donator diamond icon" />
<span class="text--donator">&nbsp;{{ station.onlineInfo.dispatcherName }}</span>
</b>
<div v-else>
@@ -525,7 +525,7 @@ tr,
opacity: 0.2;
}
@include responsive.smallScreen{
@include responsive.smallScreen {
margin: 0;
padding: 0.3em 0.5em;
font-size: 1em;
+4 -2
View File
@@ -1,6 +1,6 @@
<template>
<div class="tooltip-content">
<img src="/images/icon-diamond.svg" alt="" />
<img src="/images/icon-diamond.svg" alt="donator diamond icon" />
<span>{{ tooltipStore.content }}</span>
</div>
</template>
@@ -20,7 +20,10 @@ export default defineComponent({
<style lang="scss" scoped>
.tooltip-content {
display: flex;
align-items: center;
gap: 0.5em;
flex-wrap: wrap;
padding: 0.5em;
border-radius: 0.25em;
@@ -34,6 +37,5 @@ export default defineComponent({
img {
vertical-align: middle;
height: 1em;
margin-right: 0.5em;
}
</style>
+21 -12
View File
@@ -9,7 +9,7 @@
<span
class="train-badge twr"
v-if="train.timetableData?.TWR"
v-if="train.timetableData?.twr"
data-tooltip-type="BaseTooltip"
:data-tooltip-content="$t('warnings.TWR')"
>
@@ -60,7 +60,7 @@
data-tooltip-type="DonatorTooltip"
:data-tooltip-content="$t('donations.driver-message')"
>
{{ train.driverName }}
<span class="text--donator">{{ train.driverName }}&nbsp;</span>
<img src="/images/icon-diamond.svg" alt="donator diamond icon" />
</b>
@@ -156,7 +156,7 @@
v-if="extended && train.timetableData && train.timetableData.warningNotes"
>
<div class="dangers-badges">
<div v-if="train.timetableData?.TWR">
<div v-if="train.timetableData?.twr">
<div class="train-badge twr">TWR</div>
- {{ $t('warnings.TWR') }}
</div>
@@ -192,7 +192,6 @@ import trainInfoMixin from '../../mixins/trainInfoMixin';
import trainCategoryMixin from '../../mixins/trainCategoryMixin';
import ProgressBar from '../Global/ProgressBar.vue';
import StockList from '../Global/StockList.vue';
import { speedLimits } from '../../data/speedLimits';
export default defineComponent({
mixins: [trainInfoMixin, styleMixin, trainCategoryMixin],
@@ -219,6 +218,7 @@ export default defineComponent({
stockSpeedLimit() {
let isPassenger = true;
// Check the whole consist speed limit
const vehicleMaxSpeed = this.train.stockList.reduce((acc, stockName, i) => {
const [vehicleName, vehicleCargo] = stockName.split(':');
@@ -239,22 +239,31 @@ export default defineComponent({
return Math.min(vehicleSpeed, acc);
}, Infinity);
const headLoco = this.train.stockList[0].slice(0, this.train.stockList[0].indexOf('-'));
// Check the head vehicle speed limit
const headLocoName = this.train.stockList[0];
const headLocoVehicleData = this.apiStore.vehiclesData?.find((v) => v.name == headLocoName);
if (speedLimits[headLoco] === undefined) return vehicleMaxSpeed;
// Omit speed check for head vehicle if there's no data for it
if (!headLocoName || !headLocoVehicleData || !headLocoVehicleData.group.massSpeeds)
return vehicleMaxSpeed;
if (this.train.stockList.length == 1) return speedLimits[headLoco]['none'];
const massSpeeds =
headLocoVehicleData.group.massSpeeds[
this.train.stockList.length == 1 ? 'none' : isPassenger ? 'passenger' : 'cargo'
];
const speedTable: Record<string, number> =
speedLimits[headLoco][isPassenger ? 'passenger' : 'cargo'];
// Omit speed check if there's no data on mass speeds
if (!massSpeeds) return vehicleMaxSpeed;
if (!speedTable) return vehicleMaxSpeed;
// Number type for locomotives alone
if (typeof massSpeeds === 'number') return massSpeeds;
const massKey = Object.keys(speedTable).findLast(
// Record type for passenger or cargo, find the closest range
const massKey = Object.keys(massSpeeds).findLast(
(massKey) => this.train.mass >= Number(massKey)
);
const massMaxSpeed = massKey ? speedTable[massKey] : Infinity;
const massMaxSpeed = massKey ? massSpeeds[massKey] : Infinity;
return Math.min(massMaxSpeed, vehicleMaxSpeed);
},
+31 -14
View File
@@ -57,7 +57,14 @@
<span>{{ stop.departureLine }}</span>
<span v-if="stop.departureLineInfo">
<span> | {{ stop.departureLineInfo.routeSpeed }}</span>
<span>
|
{{
stop.departureLineInfo.routeSpeedExit
? `${stop.departureLineInfo.routeSpeedExit} (${stop.departureLineInfo.routeSpeed})`
: stop.departureLineInfo.routeSpeed
}}</span
>
<img
:src="
@@ -85,13 +92,13 @@
</div>
<div
v-if="stop.sceneryName != scheduleStops[i + 1]?.sceneryName"
v-if="stop.nextPointRef && stop.sceneryName != stop.nextPointRef.sceneryName"
class="scenery-change-name"
>
<span>{{ scheduleStops[i + 1].sceneryName }}</span>
<span>{{ stop.nextPointRef.sceneryName }}</span>
<i
v-if="!scheduleStops[i + 1].isSceneryOnline"
v-if="!stop.nextPointRef.isSceneryOnline"
class="fa-solid fa-ban fa-sm"
data-tooltip-type="BaseTooltip"
:data-tooltip-content="$t('app.tooltip-scenery-offline')"
@@ -101,30 +108,33 @@
<div
class="scenery-route"
v-if="stop.sceneryName != scheduleStops[i + 1]?.sceneryName"
v-if="stop.nextPointRef && stop.sceneryName != stop.nextPointRef.sceneryName"
>
<span> {{ scheduleStops[i + 1].arrivalLine }}</span>
<span> {{ stop.nextPointRef.arrivalLine }}</span>
<span v-if="scheduleStops[i + 1].arrivalLineInfo">
<span> | {{ scheduleStops[i + 1].arrivalLineInfo!.routeSpeed }} </span>
<span v-if="stop.nextPointRef.arrivalLineInfo">
<span> | {{ stop.nextPointRef.arrivalLineInfo!.routeSpeed }}</span>
<span v-if="stop.nextPointRef.arrivalLineInfo!.routeSpeedExit"
>({{ stop.nextPointRef.arrivalLineInfo!.routeSpeedExit }})</span
>
<img
:src="
scheduleStops[i + 1].arrivalLineInfo?.isElectric
stop.nextPointRef.arrivalLineInfo?.isElectric
? '/images/icon-catenary.svg'
: '/images/icon-we4a.png'
"
data-tooltip-type="BaseTooltip"
:data-tooltip-content="
$t(
`trains.${!scheduleStops[i + 1].arrivalLineInfo?.isElectric ? 'no-' : ''}catenary-tooltip`
`trains.${!stop.nextPointRef.arrivalLineInfo?.isElectric ? 'no-' : ''}catenary-tooltip`
)
"
width="14"
/>
<img
v-if="scheduleStops[i + 1].arrivalLineInfo!.isRouteSBL"
v-if="stop.nextPointRef.arrivalLineInfo!.isRouteSBL"
src="/images/icon-sbl-transparent.svg"
width="14"
data-tooltip-type="BaseTooltip"
@@ -228,7 +238,7 @@ export default defineComponent({
departureLineInfo = pathData.departureLineData;
}
for (const stop of followingStops) {
followingStops.forEach((stop, i) => {
let isExternal = false;
if (stop.arrivalLine === currentPath.arrivalRouteExt) {
@@ -287,7 +297,9 @@ export default defineComponent({
status: stop.confirmed ? 'confirmed' : stop.stopped ? 'stopped' : 'unconfirmed',
sceneryName: currentPath.stationName,
isSceneryOnline: pathData?.isOnline ?? false
isSceneryOnline: pathData?.isOnline ?? false,
nextPointRef: null
};
if (internalRouteInfo) {
@@ -309,6 +321,11 @@ export default defineComponent({
stopRows.push(rowData);
// Assign this row data object to the last one as reference
if (i != 0) {
stopRows[i - 1].nextPointRef = rowData;
}
if (stop.departureLine === currentPath.departureRouteExt) {
// Reverse search for last scenery checkpoint
if (pathData?.departureLineData) {
@@ -328,7 +345,7 @@ export default defineComponent({
currentPath = timetablePath[++currentPathIndex];
pathData = this.getPathSceneryData(currentPath);
}
}
});
return stopRows;
},
+5 -1
View File
@@ -14,7 +14,7 @@
<transition name="dropdown-anim">
<div class="dropdown_wrapper" v-if="showOptions">
<h1 class="text--primary">
<img src="/images/icon-stats.svg" alt="Open filters icon" />
<img src="/images/icon-stats.svg" alt="Open filters icon" height="28" />
{{ $t('train-stats.title') }}
</h1>
@@ -256,5 +256,9 @@ h3 {
.no-data {
text-align: center;
}
h1 {
text-align: center;
}
}
</style>
+2
View File
@@ -196,4 +196,6 @@ export interface TrainSchedulePoint {
isSBL: boolean;
sceneryName: string | null;
isSceneryOnline: boolean;
nextPointRef: TrainSchedulePoint | null;
}
-168
View File
@@ -1,168 +0,0 @@
export const speedLimits: Record<string, any> = {
EU07: {
passenger: {
'650000': 125
},
cargo: {
'750000': 100,
'1000000': 90,
'1500000': 80,
'2000000': 70
},
none: 110
},
'4E': {
passenger: {
'650000': 125
},
cargo: {
'750000': 100,
'1000000': 90,
'1500000': 80,
'2000000': 70
},
none: 110
},
EU07E: {
passenger: {
'650000': 125
},
cargo: {
'750000': 100,
'1000000': 90,
'1500000': 80,
'2000000': 70
},
none: 110
},
EP07: {
passenger: {
'650000': 125
},
cargo: null,
none: 110
},
EP08: {
passenger: {
'650000': 140
},
cargo: null,
none: 110
},
EP09: {
passenger: {
'650000': 160
},
cargo: null,
none: 160
},
ET22: {
passenger: {
'650000': 125
},
cargo: {
'1200000': 100,
'1800000': 90,
'2500000': 80,
'3100000': 70
},
none: 100
},
'201E': {
passenger: {
'650000': 125
},
cargo: {
'1200000': 100,
'2000000': 80,
'3100000': 70
},
none: 125
},
ET41: {
passenger: {
'700000': 125
},
cargo: {
'4000000': 70,
'3500000': 80,
'2500000': 90,
'2000000': 100
},
none: 110
},
SM42: {
passenger: {
'95000': 90,
'200000': 80,
'300000': 70,
'450000': 60,
'750000': 50,
'1130000': 40,
'1720000': 30,
'2400000': 20
},
cargo: {
'95000': 90,
'200000': 80,
'300000': 70,
'450000': 60,
'750000': 50,
'1130000': 40,
'1720000': 30,
'2400000': 20
},
none: 90
},
M62: {
passenger: {
'500000': 100,
'800000': 80,
'1200000': 60,
'2000000': 40,
'3000000': 20
},
cargo: {
'500000': 100,
'800000': 80,
'1200000': 60,
'2000000': 40,
'3000000': 20
},
none: 100
},
ST44: {
passenger: {
'500000': 100,
'800000': 80,
'1200000': 60,
'2000000': 40,
'3000000': 20
},
cargo: {
'500000': 100,
'800000': 80,
'1200000': 60,
'2000000': 40,
'3000000': 20
},
none: 100
},
CTLR4C: {
passenger: {
'500000': 100,
'800000': 80,
'1200000': 60,
'2000000': 40,
'3000000': 20
},
cargo: {
'500000': 100,
'800000': 80,
'1200000': 60,
'2000000': 40,
'3000000': 20
},
none: 100
}
};
+1 -1
View File
@@ -22,7 +22,7 @@
"TRE", "TRS",
"TSE", "TSS",
"THE", "THS",
"LPE",
"LPE", "LPS",
"LTE", "LTS",
"LSS",
"LZE", "LZS",
+44 -17
View File
@@ -1,4 +1,28 @@
{
"welcome": {
"title": "Welcome to Stacjownik!",
"app-desc": "{b1} is a web tool made for {link}, which main goal is to assist in-game dispatchers and drivers on their duties. Here you can find who is currently online and on what scenery, find a train driver or browse the journal, which contains a history of past timetables and dispatcher duty.",
"app-desc-b1": "Stacjownik",
"sceneries-header": "Sceneries",
"sceneries-desc": "Under the {b1} tab, you will find information about the dispatchers and sceneries they currently occupy. You can also browse all available sceneries in the simulator (in the filters, check the “Free” option to show the rest of the unoccupied ones) and filter them by various aspects, such as control types, additional software, signaling types, required duty level or types of routes. Click on the corresponding scenery in the table to show its details.",
"sceneries-desc-b1": "Sceneries",
"trains-header": "Trains",
"trains-desc": "The {b1} tab contains a list of active drivers and timetables that are currently realized on the selected server (server selection is at the top of the page, next to the counters). The list can be filtered and sorted, taking into account the most important criteria, such as driver name, train number or timetable details. You can also click on the train to show additional information.",
"trains-desc-b1": "Trains",
"journal-header": "Journal",
"journal-desc": "The {b1} is a tab where you can find dispatcher duty and timetables history (currently only from the main PL1 game server). You can also search for a particular player's history using additional filters.",
"journal-desc-b1": "Journal",
"other-apps": "Also check out other apps designed to make TD2 gameplay easier:",
"pojazdownik-desc": "online rolling stock editor",
"generator-desc": "graphical manager of train orders",
"srjp-desc": "Polish working train timetable",
"donation-info": "If you appreciate the Stacjownik project as well as other applications, please consider supporting it financially - click the button with {icon1} to learn more!",
"donation-info-icon1-text": "the diamond icon",
"discord-info": "I also invite you to the official {discord}, where you will find a dedicated Stacjobot, with which you can search for additional data from the simulator, unavailable on this site!",
"discord-info-link-text": "Stacjownik Discord server",
"bottom-text": "Enjoy!\n~Spythere",
"button-confirm": "Start using the app!"
},
"donations": {
"button-title": "TOSS A COIN",
"header": "Toss a coin to Stacjownik!",
@@ -50,7 +74,9 @@
"migration-confirm": "Roger that!",
"offline": "App is in the offline mode!",
"tooltip-driver-offline": "Driver is offline",
"tooltip-scenery-offline": "Scenery is offline"
"tooltip-scenery-offline": "Scenery is offline",
"pojazdownik-link-content": "POJAZDOWNIK",
"gnr-link-content": "TRAIN ORDERS <br> GENERATOR"
},
"footer": {
"discord": "Stacjownik Discord server"
@@ -58,7 +84,7 @@
"categories": {
"EI": "domestic express",
"EC": "international express",
"EN": "domestic night express",
"EN": "international night express",
"MP": "intervoivodeship bullet",
"MO": "intervoivodeship regio",
"MM": "international bullet",
@@ -388,18 +414,17 @@
"timeout": "An error occured while trying to refresh SWDR timetable data!",
"driver-journal-link": "DRIVER JOURNAL",
"driver-srjp-link": "SRJP",
"driver-return-link": "GO BACK",
"driver-return-link": "RETURN",
"driver-not-found-header": "Train not found! :/",
"driver-not-found-desc-1": "This train has already been terminated, changed its number or is offline.",
"driver-not-found-desc-2": "You can browse timetable history in the",
"driver-not-found-journal": "TIMETABLES JOURNAL",
"driver-not-found-others": "Player {driver} is online as:",
"driver-not-found-return": "GO BACK TO THE MAIN SITE",
"driver-not-found-return": "RETURN TO THE MAIN SITE",
"stock-copy": "COPY THE STOCK",
"number-propositions": "PROPOSE NUMBER",
"stock-clipboard-success": "Successfully copied the railway stock in a text form to your clipboard!",
"stock-clipboard-failure": "Oops! Something happened and the railway stock couldn't be copied to your clipboard! :/",
"number-propositions-header": "Generate number examples for selected category:",
"number-propositions-third-number": "Third digit:",
"number-propositions-last-nums": "{count} last digits from the range of:",
@@ -518,7 +543,7 @@
"no-users": "NO ACTIVE PLAYERS",
"no-spawns": "NO OPEN SPAWNS",
"no-scenery": "Oops! This scenery doesn't exist!",
"return-btn": "Return to main site",
"return-btn": "BACK TO THE LAST SITE",
"history-btn": "View the dispatcher history",
"info-btn": "Return to the scenery view",
"authors-title": "Scenery author | Scenery authors",
@@ -526,7 +551,7 @@
"lines-title": "Real lines",
"project-title": "Project name",
"additional-tools-title": "Additional tools",
"one-way-routes": "Signle track routes",
"one-way-routes": "Single track routes",
"two-way-routes": "Double track routes",
"no-data": "No available data about this scenery",
"option-active-timetables": "Active timetables",
@@ -543,8 +568,9 @@
"req-level": "all dispatcher levels | dispatcher level {lvl} required | dispatcher level {lvl} required",
"history-list-empty": "No recorded scenery history!",
"forum-topic": "Official {name} forum topic",
"gnr-link": "Train orders generator",
"pragotron-link": "Timetable pallet board",
"tablice-link": "Timetable summary board (by Thundo)",
"tablice-link": "Timetable summary board <br> (by Thundo)",
"bottom-info": "Show full history in the Journal tab",
"btn-show-internal-routes": "Show internal routes",
"btn-hide-internal-routes": "Hide internal routes"
@@ -563,15 +589,16 @@
"terminated": "Timetable terminated",
"begins": "BEGINS HERE",
"terminates": "TERMINATES\nHERE",
"from": "FROM",
"to": "TO",
"desc-arriving": "The train is not here yet.\nIt's going to come from: <b>{prevStationName} (route {prevDepartureLine})</b>",
"desc-online": "The train is at the station.\nIt's going to leave to: <b>{nextStationName} (route {nextArrivalLine})</b>",
"desc-stopped": "The train is at the station and is stopped.\nIt's going to leave towards: <b>{nextStationName} (route {nextArrivalLine})</b>",
"desc-next-arrival": "Leaves towards: <b>{nextStationName} (route {nextArrivalLine})</b>",
"desc-departed": "The train is at the station and it's been departed.\nLeaves towards: <b>{nextStationName} (route {nextArrivalLine})</b>",
"desc-departed-ends": "The train is at the station and it's been departed.\nLeaves towards station: <b>{nextStationName}</b>",
"desc-departed-away": "The train has been departed to:\n<b>{nextStationName} (route {nextArrivalLine})</b>",
"from": "Arrives from",
"to": "Departs to",
"desc-beginning": "The train begins here",
"desc-arriving": "<i>Arrives from: <b>{prevStationName} ({prevDepartureLine})</b></i>",
"desc-online": "On scenery / <i>direction: <b>{nextStationName} ({nextArrivalLine})</b></i>",
"desc-stopped": "On scenery - stopped / <i>direction: <b>{nextStationName} ({nextArrivalLine})</b></i>",
"desc-next-arrival": "On scenery / <i>direction: <b>{nextStationName} ({nextArrivalLine})</b></i>",
"desc-departed": "On scenery / <i>departed to: <b>{nextStationName} ({nextArrivalLine})</b></i>",
"desc-departed-ends": "On scenery / <i>departed to: <b>{nextStationName}</b></i>",
"desc-departed-away": "<i>Departed to: <b>{nextStationName} ({nextArrivalLine})</b></i>",
"desc-end": "The train terminates here",
"desc-terminated": "The train has been terminated"
},
+42 -16
View File
@@ -1,4 +1,28 @@
{
"welcome": {
"title": "Witaj na Stacjowniku!",
"app-desc": "{b1} to aplikacja stworzona dla symulatora {link}, której celem jest wspomaganie dyżurnego ruchu i maszynisty. Możesz sprawdzić tutaj kto i na jakiej scenerii obecnie pełni służbę, znaleźć maszynistę lub przejrzeć dziennik, który zawiera historię przeszłych dyżurów i rozkładów jazdy.",
"app-desc-b1": "Stacjownik",
"sceneries-header": "Scenerie",
"sceneries-desc": "W zakładce {b1} znajdziesz informacje o dyżurnych ruchu pełniących służby na wybranych sceneriach. Możesz również przeglądać wszystkie dostępne scenerie w symulatorze (w filtrach należy zaznaczyć opcję \"Wolna\", aby pokazać resztę niezajętych) i filtrować je pod względem wielu kryteriów, takich jak sterowanie, dodatkowe oprogramowanie, sygnalizacja, wymagany poziom dyżurnego czy szlaki. Aby wyświetlić detale danej scenerii, kliknij na nią w tabelce.",
"sceneries-desc-b1": "Scenerie",
"trains-header": "Pociągi",
"trains-desc": " Zakładka {b1} zawiera listę aktywnych maszynistów i rozkładów jazdy, które są obecnie realizowane na wybranym serwerze (wybór serwera znajduje się na górze strony). Listę można filtrować i sortować uwzględniając najważniejsze kryteria, takie jak nazwa maszynisty, numer pociągu lub detale rozkładu jazdy. Możesz również kliknąć na dany pociąg, aby wyświetlić dodatkowe informacje.",
"trains-desc-b1": "Pociągi",
"journal-header": "Dziennik",
"journal-desc": "{b1} to zakładka, w której znajdziesz historię dyżurów i rozkładów jazdy, obecnie jedynie z głównego serwera rozgrywki PL1. Możesz także wyszukać historię danego użytkownika używając dodatkowych filtrów.",
"journal-desc-b1": "Dziennik",
"other-apps": "Sprawdź także inne aplikacje stworzone z myślą ułatwienia rozgrywki w TD2:",
"pojazdownik-desc": "edytor składów online",
"generator-desc": "graficzny menadżer rozkazów pisemnych",
"srjp-desc": "służbowy rozkład jazdy pociągu",
"donation-info": "Jeśli doceniasz projekt Stacjownika jak i inne aplikacje mojego autorstwa, rozważ jego wsparcie finansowe - kliknij przycisk z {icon1}, aby dowiedzieć się więcej!",
"donation-info-icon1-text": "ikoną diamentu",
"discord-info": "Zapraszam także na oficjalnego {discord}, gdzie znajdziesz dedykowanego Stacjobota, za pomocą którego możesz wyszukiwać dodatkowe dane z symulatora niedostępne na tej stronie",
"discord-info-link-text": "Discorda Stacjownika",
"bottom-text": "Miłego korzystania\n~Spythere",
"button-confirm": "Zacznij korzystać z aplikacji!"
},
"donations": {
"button-title": "GROSZA DAJ",
"header": "Grosza daj Stacjownikowi!",
@@ -47,7 +71,9 @@
"no-result": "Brak wyników o podanych kryteriach!",
"offline": "Aplikacja w trybie offline!",
"tooltip-driver-offline": "Maszynista offline",
"tooltip-scenery-offline": "Sceneria offline"
"tooltip-scenery-offline": "Sceneria offline",
"pojazdownik-link-content": "POJAZDOWNIK",
"gnr-link-content": "GENERATOR <br> ROZKAZÓW PISEMNYCH"
},
"footer": {
"discord": "Serwer Discord Stacjownika"
@@ -55,7 +81,7 @@
"categories": {
"EI": "ekspres krajowy",
"EC": "ekspres międzynarodowy",
"EN": "ekspres krajowy nocny",
"EN": "ekspres międzynarodowy nocny",
"MP": "międzywojewódzki pospieszny",
"MO": "międzywojewódzki osobowy",
"MM": "międzynarodowy pospieszny",
@@ -386,13 +412,11 @@
"number-propositions": "ZAPROPONUJ NUMER",
"stock-clipboard-success": "Pomyślnie skopiowano skład w postaci tekstowej do schowka!",
"stock-clipboard-failure": "Ups! Nie udało się skopiować składu do schowka! :/",
"number-propositions-header": "Wygeneruj propozycje numerów dla kategorii pociągu:",
"number-propositions-third-number": "Trzecia cyfra:",
"number-propositions-last-nums": "{count} ostatnie cyfry z przedziału:",
"number-propositions-title": "Propozycje:",
"number-propositions-empty": "Brak propozycji dla wybranej kategorii! :/"
},
"train-stats": {
"stats-button": "STATYSTYKI",
@@ -505,7 +529,7 @@
"no-users": "BRAK AKTYWNYCH GRACZY",
"no-spawns": "BRAK OTWARTYCH SPAWNÓW",
"no-scenery": "Ups! Ta sceneria nie istnieje!",
"return-btn": "Wróć na stronę główną",
"return-btn": "POWRÓT DO POPRZEDNIEJ STRONY",
"history-btn": "Przejdź do widoku historii dyżurnych ruchu",
"info-btn": "Wróć do widoku scenerii",
"authors-title": "Autor scenerii | Autorzy scenerii",
@@ -530,8 +554,9 @@
"req-level": "ogólnodostępna | minimum {lvl} poziom dyżurnego | minimum {lvl} poziom dyżurnego",
"history-list-empty": "Brak historii dla tej scenerii!",
"forum-topic": "Oficjalny wątek scenerii {name}",
"gnr-link": "Generator rozkazów pisemnych",
"pragotron-link": "Paletowa tablica informacyjna",
"tablice-link": "Tablica informacyjna zbiorcza (autorstwa Thundo)",
"tablice-link": "Tablica informacyjna zbiorcza <br> (autorstwa Thundo)",
"bottom-info": "Pokaż pełną historię w zakładce Dziennika",
"btn-show-internal-routes": "Pokazuj szlaki wewnętrzne",
"btn-hide-internal-routes": "Ukrywaj szlaki wewnętrzne"
@@ -550,17 +575,18 @@
"terminated": "Rozkład jazdy zakończony",
"begins": "ROZPOCZYNA\nBIEG",
"terminates": "KOŃCZY BIEG",
"from": "Z",
"to": "DO",
"desc-arriving": "Pociągu nie ma jeszcze na tej scenerii.\nPrzyjedzie z: <b>{prevStationName} (szlak {prevDepartureLine})</b>",
"desc-online": "Pociąg jest na tej scenerii.\nOdjedzie w kierunku: <b>{nextStationName} (szlak {nextArrivalLine})</b>",
"desc-stopped": "Pociąg jest na tej scenerii i odbywa postój.\nOdjedzie w kierunku: <b>{nextStationName} (szlak {nextArrivalLine})</b>",
"desc-next-arrival": "Odjeżdża do:\n<b>{nextStationName} (szlak {nextArrivalLine})</b>",
"desc-departed": "Pociąg jest na tej scenerii i został odprawiony.\nOdjeżdża w kierunku: <b>{nextStationName} (szlak {nextArrivalLine})</b>",
"desc-departed-ends": "Pociąg jest na tej scenerii i został odprawiony.\nOdjechał w kierunku stacji: <b>{nextStationName}</b>",
"desc-departed-away": "Pociąg został odprawiony i odjechał do:\n<b>{nextStationName} (szlak {nextArrivalLine})</b>",
"from": "Przyjedzie z",
"to": "Odjeżdża do",
"desc-beginning": "Pociąg rozpoczyna bieg",
"desc-arriving": "<i>Przyjedzie z: <b>{prevStationName} ({prevDepartureLine})</b></i>",
"desc-online": "Na scenerii / <i>kierunek: <b>{nextStationName} ({nextArrivalLine})</b></i>",
"desc-stopped": "Na scenerii - postój / <i>kierunek: <b>{nextStationName} ({nextArrivalLine})</b></i>",
"desc-next-arrival": "Na scenerii / <i>kierunek: <b>{nextStationName} ({nextArrivalLine})</b></i>",
"desc-departed": "Na scenerii / <i>odprawiony do: <b>{nextStationName} ({nextArrivalLine})</b></i>",
"desc-departed-ends": "Na scenerii / <i>odprawiony do: <b>{nextStationName}</b></i>",
"desc-departed-away": "<i>Odprawiony do: <b>{nextStationName} ({nextArrivalLine})</b></i>",
"desc-end": "Pociąg kończy bieg",
"desc-terminated": "Pociąg skończył bieg"
"desc-terminated": "Pociąg zakończył bieg"
},
"history": {
"title": "DZIENNIK ROZKŁADÓW JAZDY"
+2 -2
View File
@@ -43,7 +43,7 @@ function filterTrainList(
return train.timetableData?.followingStops.some((stop) => stop.comments);
case TrainFilterId.twr:
return !train.timetableData?.TWR;
return !train.timetableData?.twr;
case TrainFilterId.pn:
return !train.timetableData?.hasExtraDeliveries;
@@ -52,7 +52,7 @@ function filterTrainList(
return !train.timetableData?.hasDangerousCargo;
case TrainFilterId.common:
return train.timetableData?.SKR || train.timetableData?.TWR;
return train.timetableData?.twr;
case TrainFilterId.passenger:
return !/^[AMRE]\D{2}$/.test(train.timetableData?.category || '');
+5 -2
View File
@@ -36,7 +36,10 @@ const routes: Array<RouteRecordRaw> = [
props: (route) => ({
region: route.query.region,
station: route.query.station
})
}),
beforeEnter: (to, from) => {
to.meta['prevPath'] = from.fullPath;
}
},
{
path: '/journal',
@@ -72,7 +75,7 @@ const router = createRouter({
from.query['view'] === undefined &&
!savedPosition
)
return { el: `.app_main`, top: -15 };
return { el: `.app_main`, behavior: 'instant', top: -13 };
if (savedPosition) return savedPosition;
},
+3 -3
View File
@@ -32,7 +32,8 @@ export const useMainStore = defineStore('mainStore', {
chosenModalTrainId: undefined,
modalLastClickedTarget: null
modalLastClickedTarget: null,
currentLocale: 'pl'
}) as MainStoreState,
getters: {
@@ -97,8 +98,7 @@ export const useMainStore = defineStore('mainStore', {
followingStops: timetable.stopList,
routeDistance: timetable.stopList[timetable.stopList.length - 1].stopDistance,
sceneries: timetable.sceneries,
TWR: timetable.TWR,
SKR: timetable.SKR,
twr: timetable.twr,
warningNotes: timetable.warningNotes,
hasDangerousCargo: timetable.hasDangerousCargo,
hasExtraDeliveries: timetable.hasExtraDeliveries,
+1
View File
@@ -12,6 +12,7 @@ export interface MainStoreState {
driverStatsStatus: Status.Data;
chosenModalTrainId?: string;
modalLastClickedTarget: EventTarget | null;
currentLocale: string;
}
export interface StationJSONData {
+23 -45
View File
@@ -23,7 +23,6 @@
--clr-donator: #f7a4ff;
--no-scroll-padding: 17px;
--max-container-width: 1700px;
@@ -201,7 +200,28 @@ ul {
&--donator {
color: var(--clr-donator);
text-shadow: var(--clr-donator) 0 0 10px;
color: transparent;
background: var(--clr-donator);
background: linear-gradient(90deg, #ff88db 30%, #ffffff 70%);
background-clip: text;
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
text-shadow: #f050ff 0 0 10px;
}
&--discord {
color: var(--clr-donator);
color: transparent;
background: var(--clr-donator);
background: linear-gradient(90deg, #7fb6ff 0%, #60ecff 70%);
background-clip: text;
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
text-shadow: #88ddff 0 0 10px;
}
}
@@ -271,54 +291,12 @@ a.a-button {
padding: 0.35em 0.75em;
img {
width: 1.35em;
height: 1.35em;
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 responsive.smallScreen {
bottom: 1em;
right: 0;
left: 50%;
width: 1em;
height: 1em;
transform: translateX(-50%);
}
}
// Basic tooltip
[data-tooltip] {
cursor: help;
+1 -2
View File
@@ -197,8 +197,7 @@ export namespace API {
category: string;
route: string;
stopList: TimetableStop[];
TWR: boolean;
SKR: boolean;
twr: boolean;
hasDangerousCargo: boolean;
hasExtraDeliveries: boolean;
warningNotes: string | null;
+11 -2
View File
@@ -83,8 +83,7 @@ export interface TrainTimetableData {
category: string;
route: string;
followingStops: TrainStop[];
TWR: boolean;
SKR: boolean;
twr: boolean;
hasDangerousCargo: boolean;
hasExtraDeliveries: boolean;
warningNotes: string | null;
@@ -143,6 +142,7 @@ export interface StationRoutesInfo {
isRouteSBL: boolean;
routeLength: number;
routeSpeed: number;
routeSpeedExit?: number;
routeTracks: number;
hidden?: boolean;
realLineNo?: number;
@@ -234,10 +234,19 @@ export interface VehiclesGroup {
length: number;
weight: number;
cargoTypes: VehicleCargo[] | null;
locoProps: {
coldStart: boolean;
doubleManned: boolean;
} | null;
massSpeeds: VehicleGroupMassSpeeds | null;
}
export interface VehicleGroupMassSpeeds {
passenger: Record<string, number> | null;
cargo: Record<string, number> | null;
none: number | null;
}
export interface VehicleCargo {
+76 -126
View File
@@ -2,12 +2,6 @@
<div class="scenery-view">
<div class="scenery-wrapper" ref="card-wrapper">
<div class="scenery-left">
<div class="scenery-actions">
<button class="back-btn btn" :title="$t('scenery.return-btn')" @click="navigateTo('/')">
<img src="/images/icon-back.svg" alt="Back to scenery" />
</button>
</div>
<SceneryHeader
:stationName="station"
:station="stationInfo"
@@ -23,8 +17,8 @@
v-for="(viewMode, i) in viewModes"
:key="i"
class="btn btn--option"
:class="{ checked: currentMode == viewMode.component }"
@click="setViewMode(viewMode.component)"
:class="{ checked: currentMode == viewMode.component.name }"
@click="setViewMode(viewMode.component.name!)"
>
{{ $t(viewMode.id) }}
</button>
@@ -32,17 +26,17 @@
<div
v-if="
apiStore.dataStatuses.sceneries == Status.Loading ||
apiStore.dataStatuses.connection == Status.Loading
apiStore.dataStatuses.sceneries == Status.Data.Loading ||
apiStore.dataStatuses.connection == Status.Data.Loading
"
></div>
<keep-alive v-else>
<component
:is="currentMode"
:is="currentViewComponent"
:onlineScenery="onlineSceneryInfo"
:station="stationInfo"
:key="currentMode"
:key="currentViewComponent.name"
></component>
</keep-alive>
</div>
@@ -50,137 +44,93 @@
</div>
</template>
<script lang="ts">
import { computed, defineComponent } from 'vue';
import { useRoute } from 'vue-router';
import routerMixin from '../mixins/routerMixin';
<script lang="ts" setup>
import { computed, onMounted } from 'vue';
import { useRoute, useRouter } from 'vue-router';
import { useMainStore } from '../store/mainStore';
import SceneryInfo from '../components/SceneryView/SceneryInfo.vue';
import SceneryHeader from '../components/SceneryView/SceneryHeader.vue';
import SceneryTimetable from '../components/SceneryView/SceneryTimetable.vue';
import SceneryTimetablesHistory from '../components/SceneryView/SceneryTimetablesHistory.vue';
import SceneryDispatchersHistory from '../components/SceneryView/SceneryDispatchersHistory.vue';
import ActionButton from '../components/Global/ActionButton.vue';
import { Status } from '../typings/common';
import { useApiStore } from '../store/apiStore';
import { Status } from '../typings/common';
enum SceneryViewMode {
'TIMETABLES_ACTIVE',
'TIMETABLES_HISTORY',
'SCENERY_HISTORY'
}
const route = useRoute();
const router = useRouter();
export default defineComponent({
name: 'SceneryView',
components: {
SceneryInfo,
SceneryTimetable,
ActionButton,
SceneryHeader,
SceneryTimetablesHistory,
SceneryDispatchersHistory
const props = defineProps({
region: {
type: String,
required: false
},
props: {
region: {
type: String,
required: false
},
station: {
type: String,
required: true
}
},
mixins: [routerMixin],
data: () => ({
store: useMainStore(),
apiStore: useApiStore(),
viewModes: [
{
id: 'scenery.option-active-timetables',
component: 'SceneryTimetable'
},
{
id: 'scenery.option-timetables-history',
component: 'SceneryTimetablesHistory'
},
{
id: 'scenery.option-dispatchers-history',
component: 'SceneryDispatchersHistory'
}
],
sceneryViewMode: SceneryViewMode,
selectedCheckpoint: '',
currentViewCompontent: 'SceneryTimetable',
onlineFrom: -1,
Status: Status.Data
}),
setup() {
const route = useRoute();
const isComponentVisible = computed(() => route.path === '/scenery');
return {
isComponentVisible
};
},
computed: {
currentMode() {
return this.$route.query.view?.toString() ?? 'SceneryTimetable';
},
stationInfo() {
return this.store.stationList.find(
(station) => station.name === this.station?.toString().replace(/_/g, ' ')
);
},
onlineSceneryInfo() {
return this.store.activeSceneryList.find(
(scenery) =>
scenery.name === this.station?.toString().replace(/_/g, ' ') &&
scenery.region == this.store.region.id
);
}
},
methods: {
setViewMode(componentName: string) {
this.$router.push({
path: this.$route.path,
query: {
...this.$route.query,
view: componentName
}
});
},
loadSelectedCheckpoint() {
if (!this.stationInfo?.generalInfo?.checkpoints) return;
if (this.stationInfo.generalInfo.checkpoints.length == 0) return;
this.selectedCheckpoint = this.stationInfo.generalInfo.checkpoints[0];
}
station: {
type: String,
required: true
}
});
const store = useMainStore();
const apiStore = useApiStore();
const viewModes = [
{
id: 'scenery.option-active-timetables',
component: SceneryTimetable
},
{
id: 'scenery.option-timetables-history',
component: SceneryTimetablesHistory
},
{
id: 'scenery.option-dispatchers-history',
component: SceneryDispatchersHistory
}
];
const currentMode = computed(() => {
return route.query.view?.toString() ?? 'SceneryTimetable';
});
const currentViewComponent = computed(() => {
return (
viewModes.find((mode) => mode.component.name == currentMode.value)?.component ??
SceneryTimetable
);
});
const stationInfo = computed(() => {
return store.stationList.find(
(station) => station.name === props.station?.toString().replace(/_/g, ' ')
);
});
const onlineSceneryInfo = computed(() => {
return store.activeSceneryList.find(
(scenery) =>
scenery.name === props.station?.toString().replace(/_/g, ' ') &&
scenery.region == store.region.id
);
});
function setViewMode(componentName: string) {
router.push({
path: route.path,
query: {
...route.query,
view: componentName
}
});
}
</script>
<style lang="scss" scoped>
@use '../styles/responsive';
button.back-btn {
img {
width: 2em;
}
}
.scenery {
&-view {
display: flex;
@@ -299,11 +249,11 @@ button.back-btn {
.scenery-right {
border-radius: 1em;
height: auto;
height: 100vh;
}
}
@include responsive.smallScreen{
@include responsive.smallScreen {
.scenery-left {
max-height: 100vh;
}
+78 -30
View File
@@ -1,24 +1,48 @@
<template>
<section class="stations-view">
<div class="wrapper">
<div class="stations-options">
<StationFilterCard
:showCard="filterCardOpen"
:exit="filterCardOpen = false"
ref="filterCardRef"
/>
<div class="stations-topbar">
<div class="topbar-cards">
<StationFilterCard
:showCard="filterCardOpen"
:exit="filterCardOpen = false"
ref="filterCardRef"
/>
<StationStats />
<StationStats />
</div>
<button
class="btn-donation btn--image"
ref="btn"
@click="isDonationCardOpen = true"
@focus="isDonationCardOpen = false"
>
<img src="/images/icon-dollar.svg" alt="dollar donation icon" />
<span>{{ $t('donations.button-title') }}</span>
</button>
<div class="topbar-links">
<a
class="a-button btn--image gnr-link"
href="https://generator-td2.web.app/"
target="_blank"
data-tooltip-type="HtmlTooltip"
:data-tooltip-content="`<b>${$t('app.gnr-link-content')}</b>`"
>
<img src="/images/icon-gnr.svg" alt="GeneraTOR app icon" />
</a>
<a
class="a-button btn--image pojazdownik-link"
href="https://pojazdownik-td2.web.app/"
target="_blank"
data-tooltip-type="HtmlTooltip"
:data-tooltip-content="`<b>${$t('app.pojazdownik-link-content')}</b>`"
>
<img src="/images/icon-pojazdownik.svg" alt="Pojazdownik app icon" />
</a>
<button
class="btn--image donation-button"
ref="btn"
@click="isDonationCardOpen = true"
@focus="isDonationCardOpen = false"
>
<img src="/images/icon-diamond.svg" alt="donator diamond icon" />
<span>&nbsp;{{ $t('donations.button-title') }}</span>
</button>
</div>
</div>
<DonationCard :is-card-open="isDonationCardOpen" @toggle-card="toggleDonationCard" />
@@ -94,32 +118,56 @@ export default defineComponent({
width: var(--max-container-width);
}
.stations-options {
.stations-topbar {
display: flex;
flex-wrap: wrap;
gap: 0.5em;
justify-content: space-between;
position: relative;
margin-bottom: 0.5em;
& > div {
display: flex;
gap: 0.5em;
}
}
button.btn-donation {
button.donation-button {
margin-left: auto;
background-color: #254069;
background: #833ab4;
background: linear-gradient(
120deg,
rgba(131, 58, 180, 1) 0%,
rgba(253, 29, 29, 1) 50%,
rgba(131, 58, 180, 1) 100%
);
transition: background 300ms;
background-size: 300%;
&:hover {
background-color: #2e4f81;
}
@include responsive.smallScreen {
span {
display: none;
}
background-size: 100%;
}
}
.count {
padding: 0.5em;
a.pojazdownik-link {
background-color: #1f263b;
&:hover {
background-color: #2e3958;
}
}
a.gnr-link {
background-color: #141414;
&:hover {
background-color: #222222;
}
}
@media only screen and (max-width: 900px) {
.topbar-links > * > span {
display: none;
}
}
</style>
+432 -645
View File
File diff suppressed because it is too large Load Diff