Compare commits

..

75 Commits

Author SHA1 Message Date
Spythere c2f7eef146 Merge pull request #153 from Spythere/development
v1.31.1
2026-01-16 22:27:16 +01:00
Spythere b34f8229cc bump(version): v1.31.1 2026-01-15 17:32:53 +01:00
Spythere f1eee97d46 chore(stations): added sorting by dispatcher language id 2026-01-15 17:30:35 +01:00
Spythere d93be0b9be fix(stations): fixed displaying dispatcher flag for inactive sceneries 2026-01-15 17:27:11 +01:00
Spythere 5190eed7ee fix(journal): restored bold font for journal dispatcher entry 2026-01-14 21:22:53 +01:00
Spythere a6f284270e chore(flags): adjusted flags styles 2026-01-14 21:21:09 +01:00
Spythere 08422caa96 chore(journal): added language flags to journal entries 2026-01-14 20:57:22 +01:00
Spythere 3a70d8f6a6 chore(index): changed some images from preloads to prefetches 2026-01-14 20:38:18 +01:00
Spythere e3e5eb3460 refactor: added language flag component 2026-01-14 20:29:02 +01:00
Spythere 1819569234 feat: user communication flags 2026-01-14 00:14:35 +01:00
Spythere 3c78af4dc0 Merge pull request #151 from Spythere/development
v1.31.0
2026-01-10 21:22:48 +01:00
Spythere 052ca08f01 fix(app): badges styling 2026-01-10 21:19:27 +01:00
Spythere b01b2f8360 fix(update card): minor style improvements 2026-01-10 21:09:13 +01:00
Spythere bda369d13b bump(version): v1.31.0 2026-01-10 20:51:29 +01:00
Spythere a8cac9ebe9 refactor(vehicles): replaced URL for fetching vehicles data; changed vehicle group finding 2026-01-05 22:45:30 +01:00
Spythere 0d55a10ec2 fix(journal): including timezone in date filters 2025-12-19 13:44:56 +01:00
Spythere fa7b1c1629 fix(journal): including timezone in date filters 2025-12-19 01:13:42 +01:00
Spythere c99b5df4aa refactor(sceneryinfo): styles scope 2025-12-18 01:14:56 +01:00
Spythere 0b435c95a0 feat(journal): added timetable filtering by included scenery 2025-12-18 00:46:18 +01:00
Spythere 5d32145f13 refactor(app): styles cleanup; minor code improvements 2025-12-18 00:39:17 +01:00
Spythere cb6ea1edb2 chore(icons): added heart icon 2025-12-16 20:42:27 +01:00
Spythere 6a3974f899 chore(dev): vite config adjustments 2025-12-16 20:42:02 +01:00
Spythere 2cbeef7611 feat(filters) filtering stations by real lines 2025-12-15 21:38:50 +01:00
Spythere 43be04826d chore(filters): removed authors propositions for hidden sceneries 2025-12-15 20:45:23 +01:00
Spythere d9986da354 refactor(filters): changed datalists to selecting options for authors & projects filters 2025-12-15 20:41:26 +01:00
Spythere ac2269c5a5 chore(update card): improved heading and list style, fixed github link 2025-12-15 15:00:14 +01:00
Spythere 6957120b3b chore(workflows): changed push branch from master to main 2025-12-15 13:18:55 +01:00
Spythere fc7a9be9dd Merge pull request #150 from Spythere/development
Fix for station statistics dropdown overflow
2025-12-13 02:21:19 +01:00
Spythere c0b892da97 fix(stations): replaced toolbar from overflow (bugging statistics dropdown) to flex wrap 2025-12-13 02:18:35 +01:00
Spythere 907b75f12b chore(workflows): replaced sending files via rsync instead of scp 2025-12-13 02:13:43 +01:00
Spythere 3c3a114a38 Merge pull request #149 from Spythere/development
Information about migration to the new domain
2025-12-13 00:20:13 +01:00
Spythere 47f824bef0 fix(migrate): translation correction 2025-12-13 00:19:20 +01:00
Spythere 2d3e830cf9 chore(migrate): migrate card toggle button visible only for old domain 2025-12-13 00:16:35 +01:00
Spythere c888b3d386 chore(translation): added missing translations; corrections 2025-12-13 00:11:15 +01:00
Spythere 645a70ef9c chore(app): added button for manual migration info card toggle 2025-12-12 18:24:51 +01:00
Spythere 1cd93f09c4 chore(migrate info): completed english translation; opening card on query 2025-12-12 15:07:08 +01:00
Spythere 6b4231496e chore(app): displaying migration card only on web.app domain 2025-12-11 01:53:10 +01:00
Spythere b72ee13bdb chore(workflow): added project name env to vps deploy 2025-12-11 01:43:01 +01:00
Spythere ce053a5a82 chore(app): added card with information about scheduled migration to new hosting 2025-12-11 01:37:16 +01:00
Spythere b08e39ae1a chore(workflow): separated job steps for ssh & scp commands 2025-12-10 13:59:16 +01:00
Spythere dc27500237 chore: updated regex for production host flag 2025-12-10 13:55:39 +01:00
Spythere fe6972c1f8 Merge pull request #148 from Spythere/development
Extended isChristmas check from 20th to 6th December
2025-12-05 21:28:04 +01:00
Spythere 47193181e5 chore: extended isChristmas check from 20th to 6th December 2025-12-05 21:25:43 +01:00
Spythere 08b9b72dcd Merge pull request #147 from Spythere/development
Hotfix for VPS deploy
2025-12-04 00:27:38 +01:00
Spythere 7bbabdd7bf hotfix: VPS deploy 2025-12-04 00:26:39 +01:00
Spythere c90be042e7 Merge pull request #146 from Spythere/development
Updated GitHub workflow for deploying files to dedicated VPS
2025-12-04 00:21:41 +01:00
Spythere 200318def7 chore: updated gh workflow for deploying files to VPS 2025-12-04 00:19:16 +01:00
Spythere 430a05ab38 Merge pull request #145 from Spythere/development
v1.30.7
2025-11-28 01:14:13 +01:00
Spythere f335ca8fc2 chore: updated welcome card english flag image 2025-11-28 00:58:19 +01:00
Spythere 15e599fe3c chore: moved language button to sceneries table top bar 2025-11-27 21:33:19 +01:00
Spythere bd25914ed4 fix: missing typings for hidden property 2025-11-27 21:30:32 +01:00
Spythere 01ea259381 fix: added hiding project filter propositions for hidden sceneries 2025-11-27 21:10:34 +01:00
Spythere aea26fa538 chore: groupped station filters inputs to the top of the card; added project filter 2025-11-27 21:04:55 +01:00
Spythere 28d78cd2bc chore: improved scenery timetables history router link style 2025-11-22 23:00:11 +01:00
Spythere a021deae96 refactor: scenery timetables history date parsing 2025-11-22 22:54:43 +01:00
Spythere 8840576796 chore: changed alignment and order of history mode buttons 2025-11-22 22:05:20 +01:00
Spythere 5018e21736 chore: updated locales 2025-11-22 22:04:57 +01:00
Spythere a7fa1dfb6d chore: added filter for fetching all scenery timetables 2025-11-22 22:04:37 +01:00
Spythere a3558c0b30 bump: v1.30.7 2025-11-22 01:30:48 +01:00
Spythere ee159fd582 fix: vehicle thumbnail overflowing text 2025-11-22 01:30:29 +01:00
Spythere 35c9fb7ef1 Merge pull request #142 from Spythere/development
hotfix: loading indicator for scenery history tabs
2025-10-25 19:40:33 +02:00
Spythere e24097c240 hotfix: loading indicator for scenery history tabs 2025-10-25 19:37:02 +02:00
Spythere 01cbebd019 Merge pull request #141 from Spythere/development
hotfix: preload & prefetch optimization
2025-10-07 22:36:59 +02:00
Spythere 3a5ef7e025 hotfix: preload & prefetch optimization 2025-10-07 18:37:27 +02:00
Spythere c78a5b4d67 Merge pull request #140 from Spythere/development
hotfix: checkpoints filtering for unknown sceneries
2025-09-17 20:06:19 +02:00
Spythere 023de9f7b8 fix: view caching & icons flicker 2025-09-16 22:32:04 +02:00
Spythere 1024e44cc0 hotfix: checkpoints filtering for unknown sceneries 2025-09-16 20:45:27 +02:00
Spythere 580d404d4a Merge pull request #139 from Spythere/development
v1.30.6
2025-09-15 14:23:43 +02:00
Spythere 6d1ef26ac1 chore: added a display of the timetable max speed in the active train info & tooltip 2025-09-14 15:10:48 +02:00
Spythere bf9799e0c3 bump: v1.30.6 2025-09-14 14:52:04 +02:00
Spythere 1d13e31d79 chore: restored station filtering by non-electric double track routes 2025-09-14 14:51:44 +02:00
Spythere 16f272bd7d chore: added SCS+SPK station filter 2025-09-14 14:43:20 +02:00
Spythere 23ca33264c chore: PWA caching 2025-09-14 14:38:56 +02:00
Spythere 324ca3de4d chore: config adjustments 2025-09-14 14:38:42 +02:00
Spythere e0548e593c fix: stats header font size 2025-09-14 14:38:17 +02:00
64 changed files with 1288 additions and 679 deletions
+23
View File
@@ -0,0 +1,23 @@
name: Build & Deploy to VPS
on:
push:
branches:
- main
env:
PROJECT_NAME: stacjownik-td2
jobs:
build_and_deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Build the app
run: yarn && yarn build
- name: Setup SSH key for connection with the server
run: |
mkdir -p ~/.ssh
echo "${{ secrets.VPS_SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa
- name: Send new files
run: rsync -avP -e "ssh -o StrictHostKeyChecking=no -i ~/.ssh/id_rsa -p 2022" ./dist/ ${{ secrets.VPS_USER }}@${{ secrets.VPS_HOST }}:/var/www/$PROJECT_NAME --delete
+2 -2
View File
@@ -15,8 +15,8 @@ app.get('/api/getSceneries', (_, res) => {
res.sendFile(path.join(cwd(), 'endpoints', 'getSceneries.json'));
});
app.get('/api/getVehicles', (_, res) => {
res.sendFile(path.join(cwd(), 'endpoints', 'getVehicles.json'));
app.get('/api/getVehiclesData', (_, res) => {
res.sendFile(path.join(cwd(), 'endpoints', 'getVehiclesData.json'));
});
app.get('/api/getDonators', (_, res) => {
+60 -4
View File
@@ -22,10 +22,64 @@
<link rel="icon" href="favicon.ico" />
<link rel="stylesheet" href="fa/css/fontawesome.css" />
<link rel="stylesheet" href="fa/css/brands.css" />
<link rel="stylesheet" href="fa/css/regular.css" />
<link rel="stylesheet" href="fa/css/solid.css" />
<link rel="stylesheet" href="/fa/css/fontawesome.css" />
<link rel="stylesheet" href="/fa/css/brands.css" />
<link rel="stylesheet" href="/fa/css/regular.css" />
<link rel="stylesheet" href="/fa/css/solid.css" />
<!-- Preloads -->
<link rel="preload" href="fonts/Quicksand-Bold.woff2" as="font" type="font/woff2" crossorigin />
<link
rel="preload"
href="/fonts/Quicksand-Light.woff2"
as="font"
type="font/woff2"
crossorigin
/>
<link
rel="preload"
href="/fonts/Quicksand-Medium.woff2"
as="font"
type="font/woff2"
crossorigin
/>
<link
rel="preload"
href="/fonts/Quicksand-Regular.woff2"
as="font"
type="font/woff2"
crossorigin
/>
<link
rel="preload"
href="/fonts/Quicksand-SemiBold.woff2"
as="font"
type="font/woff2"
crossorigin
/>
<link rel="preload" as="image" href="/images/stacjownik-header-logo.svg" />
<link rel="preload" as="image" href="/images/icon-dispatcher.svg" />
<link rel="preload" as="image" href="/images/icon-train.svg" />
<link rel="preload" as="image" href="/images/icon-arrow-desc.svg" />
<link rel="preload" as="image" href="/images/icon-pojazdownik.svg" />
<link rel="preload" as="image" href="/images/icon-stats.svg" />
<link rel="preload" as="image" href="/images/icon-filter2.svg" />
<link rel="preload" as="image" href="/images/icon-user.svg" />
<link rel="preload" as="image" href="/images/icon-like.svg" />
<link rel="preload" as="image" href="/images/icon-gnr.svg" />
<link rel="preload" as="image" href="/images/icon-spawn.svg" />
<link rel="preload" as="image" href="/images/icon-timetableAll.svg" />
<link rel="preload" as="image" href="/images/icon-timetableUnconfirmed.svg" />
<link rel="preload" as="image" href="/images/icon-timetableConfirmed.svg" />
<link rel="preload" as="image" href="/images/icon-discord.png" />
<link rel="prefetch" as="image" href="/images/icon-arrow-asc.svg" />
<link rel="prefetch" as="image" href="/images/icon-diamond.svg" />
<!-- Static OpenGraph meta -->
<meta name="description" content="Pomocnik maszynisty i dyżurnego symulatora Train Driver 2" />
@@ -36,10 +90,12 @@
property="og:description"
content="Pomocnik maszynisty i dyżurnego symulatora Train Driver 2"
/>
<meta
property="og:image"
content="https://raw.githubusercontent.com/Spythere/api/main/thumbnails/stacjownik.jpg"
/>
<meta property="og:image:width" content="1200" />
<meta property="og:image:height" content="630" />
<meta property="og:site_name" content="Stacjownik" />
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "stacjownik",
"version": "1.30.5",
"version": "1.31.1",
"private": true,
"type": "module",
"scripts": {
+5
View File
@@ -0,0 +1,5 @@
<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-cz" viewBox="0 0 640 480">
<path fill="#fff" d="M0 0h640v240H0z"/>
<path fill="#d7141a" d="M0 240h640v240H0z"/>
<path fill="#11457e" d="M360 240 0 0v480z"/>
</svg>

After

Width:  |  Height:  |  Size: 225 B

+5
View File
@@ -0,0 +1,5 @@
<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-de" viewBox="0 0 640 480">
<path fill="#fc0" d="M0 320h640v160H0z"/>
<path fill="#000001" d="M0 0h640v160H0z"/>
<path fill="red" d="M0 160h640v160H0z"/>
</svg>

After

Width:  |  Height:  |  Size: 221 B

+7
View File
@@ -0,0 +1,7 @@
<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-gb" viewBox="0 0 640 480">
<path fill="#012169" d="M0 0h640v480H0z"/>
<path fill="#FFF" d="m75 0 244 181L562 0h78v62L400 241l240 178v61h-80L320 301 81 480H0v-60l239-178L0 64V0z"/>
<path fill="#C8102E" d="m424 281 216 159v40L369 281zm-184 20 6 35L54 480H0zM640 0v3L391 191l2-44L590 0zM0 0l239 176h-60L0 42z"/>
<path fill="#FFF" d="M241 0v480h160V0zM0 160v160h640V160z"/>
<path fill="#C8102E" d="M0 193v96h640v-96zM273 0v480h96V0z"/>
</svg>

After

Width:  |  Height:  |  Size: 504 B

+7
View File
@@ -0,0 +1,7 @@
<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-it" viewBox="0 0 640 480">
<g fill-rule="evenodd" stroke-width="1pt">
<path fill="#fff" d="M0 0h640v480H0z"/>
<path fill="#009246" d="M0 0h213.3v480H0z"/>
<path fill="#ce2b37" d="M426.7 0H640v480H426.7z"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 289 B

+6
View File
@@ -0,0 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-pl" viewBox="0 0 640 480">
<g fill-rule="evenodd">
<path fill="#fff" d="M640 480H0V0h640z"/>
<path fill="#dc143c" d="M640 480H0V240h640z"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 219 B

+5
View File
@@ -0,0 +1,5 @@
<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-ru" viewBox="0 0 640 480">
<path fill="#fff" d="M0 0h640v160H0z"/>
<path fill="#0039a6" d="M0 160h640v160H0z"/>
<path fill="#d52b1e" d="M0 320h640v160H0z"/>
</svg>

After

Width:  |  Height:  |  Size: 225 B

+4
View File
@@ -0,0 +1,4 @@
<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-se" viewBox="0 0 640 480">
<path fill="#005293" d="M0 0h640v480H0z"/>
<path fill="#fecb00" d="M176 0v192H0v96h176v192h96V288h368v-96H272V0z"/>
</svg>

After

Width:  |  Height:  |  Size: 209 B

+9
View File
@@ -0,0 +1,9 @@
<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-sk" viewBox="0 0 640 480">
<path fill="#ee1c25" d="M0 0h640v480H0z"/>
<path fill="#0b4ea2" d="M0 0h640v320H0z"/>
<path fill="#fff" d="M0 0h640v160H0z"/>
<path fill="#fff" d="M233 370.8c-43-20.7-104.6-61.9-104.6-143.2 0-81.4 4-118.4 4-118.4h201.3s3.9 37 3.9 118.4S276 350 233 370.8"/>
<path fill="#ee1c25" d="M233 360c-39.5-19-96-56.8-96-131.4s3.6-108.6 3.6-108.6h184.8s3.5 34 3.5 108.6C329 303.3 272.5 341 233 360"/>
<path fill="#fff" d="M241.4 209c10.7.2 31.6.6 50.1-5.6 0 0-.4 6.7-.4 14.4s.5 14.4.5 14.4c-17-5.7-38.1-5.8-50.2-5.7v41.2h-16.8v-41.2c-12-.1-33.1 0-50.1 5.7 0 0 .5-6.7.5-14.4s-.5-14.4-.5-14.4c18.5 6.2 39.4 5.8 50 5.6v-25.9c-9.7 0-23.7.4-39.6 5.7 0 0 .5-6.6.5-14.4 0-7.7-.5-14.4-.5-14.4 15.9 5.3 29.9 5.8 39.6 5.7-.5-16.4-5.3-37-5.3-37s9.9.7 13.8.7 13.8-.7 13.8-.7-4.8 20.6-5.3 37c9.7.1 23.7-.4 39.6-5.7 0 0-.5 6.7-.5 14.4s.5 14.4.5 14.4a119 119 0 0 0-39.7-5.7v26z"/>
<path fill="#0b4ea2" d="M233 263.3c-19.9 0-30.5 27.5-30.5 27.5s-6-13-22.2-13c-11 0-19 9.7-24.2 18.8 20 31.7 51.9 51.3 76.9 63.4 25-12 57-31.7 76.9-63.4-5.2-9-13.2-18.8-24.2-18.8-16.2 0-22.2 13-22.2 13S253 263.3 233 263.3"/>
</svg>

After

Width:  |  Height:  |  Size: 1.2 KiB

+6
View File
@@ -0,0 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-ua" viewBox="0 0 640 480">
<g fill-rule="evenodd" stroke-width="1pt">
<path fill="gold" d="M0 0h640v480H0z"/>
<path fill="#0057b8" d="M0 0h640v240H0z"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 232 B

+15
View File
@@ -0,0 +1,15 @@
<svg
xmlns="http://www.w3.org/2000/svg"
width="24"
height="24"
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
stroke-width="2"
stroke-linecap="round"
stroke-linejoin="round"
>
<path d="m21.73 18-8-14a2 2 0 0 0-3.48 0l-8 14A2 2 0 0 0 4 21h16a2 2 0 0 0 1.73-3" />
<path d="M12 9v4" />
<path d="M12 17h.01" />
</svg>

After

Width:  |  Height:  |  Size: 345 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

+60
View File
@@ -0,0 +1,60 @@
<svg width="79" height="127" viewBox="0 0 79 127" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="icon-loading">
<g id="Rectangle 37">
<rect id="Rectangle 38" x="36.9999" y="79" width="6" height="16" fill="#FF0000"/>
<rect id="Rectangle 40" x="36.9999" y="111" width="6" height="16" fill="#FF0000"/>
<rect id="Rectangle 39" x="36.9999" y="95" width="6" height="16" fill="white"/>
</g>
<g id="Group 8">
<path id="Vector 15" d="M59.5018 41.0003H23.0018C-1.49817 41.0003 -0.498171 79.5003 23.0018 79.5003H59.5018C83.0018 79.5003 84.0018 41.0003 59.5018 41.0003Z" fill="#3F3E3E"/>
<g id="Group 51">
<circle id="light-left" cx="22.9999" cy="60" r="9" fill="#FF1313" fill-opacity="1"/>
<animate
attributeType="XML"
attributeName="opacity"
values="0.25;1;1;0.25;0.25"
dur="1s"
repeatCount="indefinite"
/>
</g>
<g id="Group 51">
<circle id="light-right" cx="57.9999" cy="60" r="9" fill="#FF1313" fill-opacity="1"/>
<animate
attributeType="XML"
attributeName="opacity"
values="1;0.25;0.25;1;1"
dur="1s"
repeatCount="indefinite"
/>
</g>
</g>
<g id="Group 52">
<rect id="Rectangle 36" x="37.9999" y="10" width="4" height="31" fill="#525252"/>
<g id="Vector 23">
<path id="Rectangle 28" d="M4.09756 32.3241L10.9579 29.2933L14.1908 36.611L7.33047 39.6418L3.42724 36.9932L4.09756 32.3241Z" fill="#FF0000"/>
<path id="Rectangle 30" d="M10.9579 29.2933L20.105 25.2522L23.3379 32.5698L14.1908 36.611L12.5743 32.9521L10.9579 29.2933Z" fill="white"/>
<path id="Rectangle 34" d="M20.105 25.2522L29.2521 21.211L32.485 28.5287L23.3379 32.5698L21.7214 28.911L20.105 25.2522Z" fill="#FF0000"/>
<path id="Rectangle 35" d="M47.5463 13.1288L56.6934 9.08762L59.9263 16.4053L50.7792 20.4464L49.1627 16.7876L47.5463 13.1288Z" fill="#FF0000"/>
<path id="Rectangle 31" d="M29.2521 21.211L38.3992 17.1699L41.6321 24.4876L32.485 28.5287L30.8685 24.8699L29.2521 21.211Z" fill="white"/>
<path id="Rectangle 32" d="M38.3992 17.1699L47.5463 13.1288L50.7792 20.4464L41.6321 24.4876L40.0156 20.8287L38.3992 17.1699Z" fill="white"/>
<path id="Rectangle 33" d="M56.6934 9.08762L65.8404 5.04649L69.0734 12.3642L59.9263 16.4053L58.3098 12.7465L56.6934 9.08762Z" fill="white"/>
<path id="Rectangle 29" d="M73.1581 1.81359L65.8405 5.04649L69.0734 12.3642L76.391 9.13126L76.604 4.6642L73.1581 1.81359Z" fill="#FF0000"/>
</g>
<g id="Vector 24">
<path id="Rectangle 28_2" d="M6.36567 3.47438L13.3598 6.18222L10.4714 13.6426L3.47731 10.9348L2.59012 6.30195L6.36567 3.47438Z" fill="#FF0000"/>
<path id="Rectangle 30_2" d="M13.3597 6.18222L22.6852 9.79268L19.7969 17.2531L10.4714 13.6426L11.9156 9.91241L13.3597 6.18222Z" fill="white"/>
<path id="Rectangle 34_2" d="M22.6853 9.79268L32.0108 13.4031L29.1224 20.8635L19.7969 17.2531L21.2411 13.5229L22.6853 9.79268Z" fill="#FF0000"/>
<path id="Rectangle 35_2" d="M50.6617 20.6241L59.9872 24.2345L57.0989 31.6949L47.7734 28.0844L49.2176 24.3542L50.6617 20.6241Z" fill="#FF0000"/>
<path id="Rectangle 31_2" d="M32.0107 13.4031L41.3362 17.0136L38.4479 24.474L29.1224 20.8635L30.5666 17.1333L32.0107 13.4031Z" fill="white"/>
<path id="Rectangle 32_2" d="M41.3363 17.0136L50.6618 20.6241L47.7734 28.0844L38.4479 24.474L39.8921 20.7438L41.3363 17.0136Z" fill="white"/>
<path id="Rectangle 33_2" d="M59.9872 24.2345L69.3127 27.845L66.4243 35.3054L57.0988 31.6949L58.543 27.9647L59.9872 24.2345Z" fill="white"/>
<path id="Rectangle 29_2" d="M76.7731 30.7333L69.3127 27.845L66.4243 35.3054L73.8847 38.1937L77.194 35.1856L76.7731 30.7333Z" fill="#FF0000"/>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 3.4 KiB

-4
View File
@@ -1,4 +0,0 @@
<svg width="39" height="23" viewBox="0 0 39 23" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="39" height="23" fill="#FF0F0F"/>
<rect width="39" height="11.5" fill="white"/>
</svg>

Before

Width:  |  Height:  |  Size: 199 B

+27 -9
View File
@@ -7,13 +7,18 @@
<AppWelcomeCard :is-card-open="isWelcomeCardOpen" @toggle-card="closeWelcomeCard" />
<MigrateInfoCard
:is-open="store.isMigrateInfoCardOpen"
@toggle-card="closeMigrateInfoCard"
></MigrateInfoCard>
<Tooltip />
<AppHeader :current-lang="store.currentLocale" @change-lang="changeLang" />
<AppHeader />
<main class="app_main">
<router-view v-slot="{ Component }">
<keep-alive exclude="SceneryView">
<keep-alive>
<component :is="Component" :key="$route.name" />
</keep-alive>
</router-view>
@@ -47,9 +52,11 @@ 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';
import MigrateInfoCard from './components/App/MigrateInfoCard.vue';
const STORAGE_VERSION_KEY = 'app_version';
const WELCOME_CARD_SEEN_KEY = 'welcome_card_seen';
const MIGRATE_INFO_CARD_SEEN_KEY = 'migrate_info_card_seen';
export default defineComponent({
components: {
@@ -59,6 +66,7 @@ export default defineComponent({
AppFooter,
UpdateCard,
AppWelcomeCard,
MigrateInfoCard,
Tooltip
},
@@ -71,7 +79,7 @@ export default defineComponent({
isUpdateCardOpen: false,
isWelcomeCardOpen: false,
isOnProductionHost: location.hostname == 'stacjownik-td2.web.app'
isOnProductionHost: /(stacjownik-td2)(\.web\.app|\.spythere\.eu)/.test(location.hostname)
}),
created() {
@@ -91,6 +99,7 @@ export default defineComponent({
this.setupOfflineHandling();
this.checkAppVersion();
this.handleQueries();
this.handleMigrateInfo();
this.apiStore.setupAPIData();
},
@@ -101,6 +110,10 @@ export default defineComponent({
if (query.get('welcomeCard') == '1') {
this.isWelcomeCardOpen = true;
}
if (query.get('migrateCard') == '1') {
this.store.isMigrateInfoCardOpen = true;
}
},
async checkAppVersion() {
@@ -159,18 +172,18 @@ export default defineComponent({
this.apiStore.connectToAPI();
},
changeLang(lang: string) {
this.$i18n.locale = lang;
this.store.currentLocale = lang;
handleMigrateInfo() {
if (location.hostname != 'stacjownik-td2.web.app') return;
if (StorageManager.getBooleanValue(MIGRATE_INFO_CARD_SEEN_KEY) === true) return;
StorageManager.setStringValue('lang', lang);
this.store.isMigrateInfoCardOpen = true;
},
loadLang() {
const storageLang = StorageManager.getStringValue('lang');
if (storageLang) {
this.changeLang(storageLang);
this.store.changeLocale(storageLang);
return;
}
@@ -179,7 +192,7 @@ export default defineComponent({
const naviLanguage = window.navigator.language.toString();
if (!naviLanguage.startsWith('pl')) {
this.changeLang('en');
this.store.changeLocale('en');
return;
}
},
@@ -187,6 +200,11 @@ export default defineComponent({
closeWelcomeCard() {
this.isWelcomeCardOpen = false;
StorageManager.setBooleanValue(WELCOME_CARD_SEEN_KEY, true);
},
closeMigrateInfoCard() {
this.store.isMigrateInfoCardOpen = false;
StorageManager.setBooleanValue(MIGRATE_INFO_CARD_SEEN_KEY, true);
}
}
});
+3 -38
View File
@@ -1,18 +1,6 @@
<template>
<header class="app_header">
<div class="header_container">
<div class="header_icons">
<span class="icons-top">
<img
src="/images/icon-pl.svg"
alt="icon-pl"
@click="changeLang('en')"
v-if="currentLang == 'pl'"
/>
<img src="/images/icon-en.jpg" alt="icon-en" @click="changeLang('pl')" v-else />
</span>
</div>
<div class="header_body">
<StatusIndicator />
@@ -76,27 +64,12 @@ import RegionDropdown from '../Global/RegionDropdown.vue';
export default defineComponent({
components: { StatusIndicator, Clock, RegionDropdown },
emits: ['changeLang'],
props: {
currentLang: {
type: String,
required: true
}
},
setup() {
return {
store: useMainStore()
};
},
methods: {
changeLang(lang: string) {
this.$emit('changeLang', lang);
}
},
computed: {
onlineTrainsCount() {
return this.store.trainList.filter((train) => train.region == this.store.region.id).length;
@@ -111,7 +84,7 @@ export default defineComponent({
isChristmas() {
const date = new Date();
return date.getUTCMonth() == 11 && date.getUTCDate() >= 20 && date.getUTCDate() <= 31;
return date.getUTCMonth() == 11 && date.getUTCDate() >= 6 && date.getUTCDate() <= 31;
}
}
});
@@ -141,7 +114,7 @@ export default defineComponent({
border-radius: 0 0 1em 1em;
@include responsive.smallScreen{
@include responsive.smallScreen {
position: relative;
margin-top: 0.5em;
}
@@ -180,20 +153,12 @@ export default defineComponent({
padding: 0.5em;
@include responsive.smallScreen{
@include responsive.smallScreen {
transform: translateX(85%);
}
}
}
// ICONS
.icons-top {
img {
width: 2.5em;
cursor: pointer;
}
}
// COUNTER
.info_counter {
display: flex;
+6 -15
View File
@@ -4,12 +4,12 @@
<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 :data-active="$i18n.locale == 'pl'" @click="store.changeLocale('pl')">
<FlagIcon :language-id="0" width="2.5em" />
</button>
<button :data-active="$i18n.locale == 'en'" @click="changeLang('en')">
<img src="/images/icon-en.jpg" alt="" width="45" />
<button :data-active="$i18n.locale == 'en'" @click="store.changeLocale('en')">
<FlagIcon :language-id="1" width="2.5em" />
</button>
</div>
@@ -114,12 +114,10 @@
</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';
import FlagIcon from '../Global/FlagIcon.vue';
const i18n = useI18n();
const store = useMainStore();
const emit = defineEmits(['toggleCard']);
@@ -130,13 +128,6 @@ const props = defineProps({
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>
@@ -167,7 +158,7 @@ a.link {
justify-content: center;
margin: 0.5em 0;
button[data-active='false'] img {
button[data-active='false'] ::v-deep(img) {
opacity: 0.5;
}
}
+94
View File
@@ -0,0 +1,94 @@
<template>
<Card :is-open="isOpen" @toggle-card="toggleCard">
<div class="body-content">
<div class="content-top">
<img src="/images/icon-loading.svg" alt="loading" height="125" />
<h1>{{ t('migrate-info.header-text') }}</h1>
</div>
<div>
<p v-html="t('migrate-info.paragraph-1-html')"></p>
<p>
<a class="new-link" href="https://stacjownik-td2.spythere.eu/" target="_blank">
{{ t('migrate-info.paragraph-2-link-text') }}
</a>
</p>
<p>
{{ t('migrate-info.paragraph-3-text') }}
</p>
<p class="info-bottom" v-html="t('migrate-info.paragraph-4-html')"></p>
</div>
<div class="content-actions">
<button class="btn btn--action" @click="toggleCard">PRZYJĄŁEM!</button>
</div>
</div>
</Card>
</template>
<script lang="ts" setup>
import { useI18n } from 'vue-i18n';
import Card from '../Global/Card.vue';
const { t } = useI18n();
defineProps({
isOpen: {
type: Boolean,
required: true
}
});
const emit = defineEmits(['toggleCard']);
function toggleCard() {
emit('toggleCard');
}
</script>
<style lang="scss" scoped>
.body-content {
max-width: 800px;
min-height: 500px;
padding: 1em 0.5em;
display: grid;
grid-template-rows: auto 1fr auto;
gap: 0.5em;
text-align: center;
font-size: 1.1em;
}
p {
padding: 0.5em 0;
}
a.new-link {
font-size: 1.2em;
color: var(--clr-primary);
color: transparent;
background: var(--clr-primary);
background: linear-gradient(90deg, var(--clr-primary), #ffffff);
background-clip: text;
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
text-shadow: var(--clr-primary) 0 0 10px;
}
.info-bottom {
font-size: 0.9em;
color: #ccc;
}
.content-actions {
display: flex;
justify-content: center;
font-size: 1.2em;
}
</style>
+20 -7
View File
@@ -1,6 +1,6 @@
<template>
<Card :is-open="isUpdateCardOpen" @toggle-card="toggleCard(false)">
<div class="content">
<div class="content" tabindex="0" ref="content">
<h1 style="margin-bottom: 0.5em">🚀 {{ $t('update.title') }}</h1>
<div class="features-body" v-if="htmlChangelog != ''" v-html="htmlChangelog"></div>
@@ -13,7 +13,14 @@
<p class="bottom-info">
{{ $t('update.info-1') }}
<br />
<span v-html="$t('update.info-2')"></span>
<i18n-t keypath="update.info-2">
<template v-slot:link>
<a href="https://github.com/Spythere/stacjownik" target="_blank">{{
$t('update.info-2-link-text')
}}</a>
</template>
</i18n-t>
</p>
</div>
</Card>
@@ -51,7 +58,7 @@ export default defineComponent({
watch: {
isUpdateCardOpen(val: boolean) {
this.$nextTick(() => {
if (val) (this.$refs['confirm-btn'] as HTMLElement).focus();
if (val) (this.$refs['content'] as HTMLElement).focus();
});
}
},
@@ -79,13 +86,18 @@ export default defineComponent({
}
::v-deep(h2) {
padding: 0.25em 0;
margin-top: 1em;
padding: 0.5em 0;
border-bottom: 1px solid #aaa;
}
::v-deep(h3) {
padding: 0.5em 0;
}
::v-deep(ul) {
list-style: initial;
padding: 1em;
list-style: disc;
padding: 0 1.5em;
line-height: 1.5em;
}
@@ -105,7 +117,7 @@ export default defineComponent({
}
button {
margin: 0 auto;
margin: 0.5em auto;
padding: 0.5em 0.75em;
font-size: 1.1em;
}
@@ -117,5 +129,6 @@ p.bottom-info {
a {
text-decoration: underline;
color: white;
}
</style>
@@ -205,7 +205,7 @@ const availableCategories = computed(() => {
for (const stockName of stockList) {
const [vehicleName, ...cargoList] = stockName.split(':');
const vehicleData = apiStore.vehiclesData?.find((v) => v.name == vehicleName);
const vehicleData = apiStore.vehiclesData?.vehicles.find((v) => v.name == vehicleName);
if (!vehicleData) continue;
-23
View File
@@ -1,23 +0,0 @@
<template>
<button class="action-btn btn--filled">
<div class="button_content">
<slot></slot>
</div>
</button>
</template>
<script lang="ts">
import { defineComponent } from 'vue';
export default defineComponent({});
</script>
<style lang="scss">
@use '../../styles/responsive';
.button_content {
display: flex;
justify-content: center;
align-items: center;
}
</style>
+1 -6
View File
@@ -81,13 +81,8 @@ export default defineComponent({
background-color: #1a1a1a;
box-shadow: 0 0 15px 10px #0e0e0e;
border-radius: 1em;
overflow: auto;
}
@include responsive.smallScreen{
.card {
align-items: flex-start;
}
}
</style>
+43
View File
@@ -0,0 +1,43 @@
<template>
<div class="flag-icon">
<img
:src="languageFlagSrc"
alt="language flag"
:style="{
width: width
}"
/>
</div>
</template>
<script lang="ts" setup>
import { computed } from 'vue';
import { getLanguageNameById } from '../../utils/languageUtils';
const props = defineProps({
languageId: {
type: Number,
required: true
},
width: {
type: String
}
});
const languageFlagSrc = computed(
() => `/images/flags/${getLanguageNameById(props.languageId)}.svg`
);
</script>
<style scoped>
.flag-icon {
display: flex;
justify-content: center;
align-items: center;
}
.flag-icon img {
vertical-align: middle;
}
</style>
+6 -5
View File
@@ -9,7 +9,7 @@
<img
v-for="(thumbnailImage, imageIndex) in images"
:src="`https://stacjownik.spythere.eu/static/thumbnails/${thumbnailImage}.png`"
height="60"
height="70"
loading="lazy"
data-tooltip-type="VehiclePreviewTooltip"
:data-tooltip-content="vehicleString"
@@ -20,7 +20,7 @@
</div>
</template>
<script setup lang="ts">
<script setup lang="ts">
import { computed, PropType, Ref, ref } from 'vue';
const props = defineProps({
@@ -56,16 +56,17 @@ function onImageLoad() {
transition: opacity 100ms ease-in-out;
&[data-load-status='loading'] {
min-height: 60px;
min-height: 70px;
min-width: 200px;
}
}
.stock-text {
max-width: 90%;
text-align: center;
color: #aaa;
font-size: 0.9em;
margin-bottom: 0.25em;
font-size: 0.85em;
margin: 0 auto;
padding: 0.25em 0;
}
@@ -1,23 +1,22 @@
<template>
<li class="dispatcher-history-entry">
<div class="entry-info">
<span>
<span>
<span class="entry-info-left">
<div class="station-info">
<router-link :to="`/journal/dispatchers?search-station=${entry.stationName}`">
<b>{{ entry.stationName }}</b>
</router-link>
<b class="text--grayed"> #{{ entry.stationHash }}</b>
</span>
&bull;
<b
v-if="entry.dispatcherLevel !== null"
class="level-badge dispatcher"
:style="calculateExpStyle(entry.dispatcherLevel, entry.dispatcherIsSupporter)"
>
{{ entry.dispatcherLevel >= 2 ? entry.dispatcherLevel : 'L' }}
</b>
<b style="margin-left: 5px">
&bull;
<b
v-if="entry.dispatcherLevel !== null"
class="level-badge dispatcher"
:style="calculateExpStyle(entry.dispatcherLevel, entry.dispatcherIsSupporter)"
>
{{ entry.dispatcherLevel >= 2 ? entry.dispatcherLevel : 'L' }}
</b>
<span
v-if="apiStore.donatorsData.includes(entry.dispatcherName)"
data-tooltip-type="DonatorTooltip"
@@ -37,7 +36,11 @@
>
{{ entry.dispatcherName }}
</router-link>
</b>
<span class="dispatcher-language" v-if="entry.dispatcherLanguageId != null">
<FlagIcon :language-id="entry.dispatcherLanguageId" width="1.75em" />
</span>
</div>
<div>
<span v-if="entry.timestampTo">
@@ -118,6 +121,7 @@ import dateMixin from '../../../mixins/dateMixin';
import styleMixin from '../../../mixins/styleMixin';
import { useApiStore } from '../../../store/apiStore';
import StationStatusBadge from '../../Global/StationStatusBadge.vue';
import FlagIcon from '../../Global/FlagIcon.vue';
export default defineComponent({
props: {
@@ -125,7 +129,7 @@ export default defineComponent({
showExtraInfo: { type: Boolean, required: true }
},
components: { StationStatusBadge },
components: { StationStatusBadge, FlagIcon },
mixins: [dateMixin, styleMixin],
emits: ['toggleShowExtraInfo'],
@@ -164,6 +168,11 @@ export default defineComponent({
padding: 1em;
}
.dispatcher-language {
display: inline-block;
vertical-align: middle;
}
.entry-info {
display: flex;
justify-content: space-between;
@@ -185,6 +194,15 @@ export default defineComponent({
margin-top: 1em;
}
.station-info {
display: flex;
flex-wrap: wrap;
text-align: center;
align-items: center;
gap: 0.25em;
font-weight: bold;
}
.status-list {
display: flex;
overflow: auto;
@@ -198,11 +216,15 @@ export default defineComponent({
border-radius: 1em;
}
@include responsive.smallScreen{
@include responsive.smallScreen {
.entry-info {
flex-direction: column;
justify-content: center;
text-align: center;
}
.station-info {
justify-content: center;
}
}
</style>
@@ -71,6 +71,10 @@
<router-link v-else :to="`/journal/timetables?search-driver=${timetable.driverName}`">
<strong>{{ timetable.driverName }}</strong>
</router-link>
<div v-if="timetable.driverLanguageId != null">
<FlagIcon :language-id="timetable.driverLanguageId" width="1.75em" />
</div>
</span>
<span class="general-time">
@@ -110,8 +114,10 @@ import dateMixin from '../../../mixins/dateMixin';
import styleMixin from '../../../mixins/styleMixin';
import { useApiStore } from '../../../store/apiStore';
import trainCategoryMixin from '../../../mixins/trainCategoryMixin';
import FlagIcon from '../../Global/FlagIcon.vue';
export default defineComponent({
components: { FlagIcon },
mixins: [dateMixin, styleMixin, trainCategoryMixin],
data() {
@@ -191,7 +197,7 @@ export default defineComponent({
}
}
@include responsive.smallScreen{
@include responsive.smallScreen {
.item-general {
flex-direction: column;
justify-content: center;
+1
View File
@@ -10,6 +10,7 @@ export namespace Journal {
| 'search-train'
| 'search-date-from'
| 'search-dispatcher'
| 'search-includesScenery'
| 'search-issuedFrom'
| 'search-terminatingAt'
| 'search-via'
@@ -96,6 +96,7 @@ export default defineComponent({
data() {
return {
historyList: [] as API.DispatcherHistory.Response,
lastStationName: '',
dataStatus: Status.Data.Loading,
DataStatus: Status.Data,
apiStore: useApiStore()
@@ -103,10 +104,10 @@ export default defineComponent({
},
async activated() {
// if (this.historyList.length == 0) {
this.historyList.length = 0;
const fetchedHistory = await this.fetchAPIData();
if (fetchedHistory) this.historyList = fetchedHistory;
// }
},
methods: {
@@ -150,6 +151,7 @@ export default defineComponent({
<style lang="scss" scoped>
@use '../../styles/responsive';
@use '../../styles/scenery-history-table';
@use '../../styles/badge';
.scenery-dispatchers-history {
height: 100%;
@@ -194,7 +196,7 @@ export default defineComponent({
color: springgreen;
}
@include responsive.smallScreen{
@include responsive.smallScreen {
.journal-list > div {
flex-direction: column;
justify-content: center;
+1 -13
View File
@@ -57,20 +57,8 @@ export default defineComponent({
});
</script>
<style lang="scss">
<style lang="scss" scoped>
@use '../../styles/responsive';
@use '../../styles/badge';
h3.section-header {
margin: 0.5em 0;
padding: 0.3em;
display: flex;
justify-content: center;
align-items: center;
font-size: 1.2em;
}
.info-lists {
display: flex;
@@ -21,6 +21,8 @@
</span>
<span v-else>{{ onlineScenery.dispatcherName }}</span>
</router-link>
<FlagIcon :languageId="onlineScenery.dispatcherLanguageId" width="1.25em" />
</div>
<div class="info-bottom">
@@ -51,9 +53,11 @@ import styleMixin from '../../../mixins/styleMixin';
import StationStatusBadge from '../../Global/StationStatusBadge.vue';
import { ActiveScenery } from '../../../typings/common';
import { useApiStore } from '../../../store/apiStore';
import FlagIcon from '../../Global/FlagIcon.vue';
export default defineComponent({
mixins: [styleMixin, dateMixin, routerMixin],
components: { StationStatusBadge, FlagIcon },
data() {
return {
@@ -66,8 +70,7 @@ export default defineComponent({
type: Object as PropType<ActiveScenery>,
required: false
}
},
components: { StationStatusBadge }
}
});
</script>
@@ -118,6 +118,7 @@ export default defineComponent({
align-items: center;
width: 3em;
height: 3em;
margin: 0.25em;
border: 2px solid #4e4e4e;
@@ -1,6 +1,6 @@
<template>
<section class="info-spawn-list">
<h3 class="spawn-header section-header">
<h3 class="spawn-header">
<img src="/images/icon-spawn.svg" alt="Open spawns icon" />
&nbsp;{{ $t('scenery.spawns') }} &nbsp;
<span class="text--primary">{{ onlineScenery?.spawns.length || '0' }}</span>
@@ -53,10 +53,23 @@ export default defineComponent({
</script>
<style lang="scss" scoped>
@use '../../../styles/badge';
ul {
position: relative;
}
h3.spawn-header {
margin: 0.5em 0;
padding: 0.3em;
display: flex;
justify-content: center;
align-items: center;
font-size: 1.2em;
}
.spawns-anim {
&-move,
&-enter-active,
@@ -1,6 +1,6 @@
<template>
<section class="info-user-list">
<h3 class="user-header section-header">
<h3 class="user-header">
<img src="/images/icon-user.svg" alt="Users icon" />
&nbsp;{{ $t('scenery.users') }} &nbsp;
<span class="text--primary">{{ onlineScenery?.stationTrains?.length || 0 }}</span
@@ -111,6 +111,8 @@ export default defineComponent({
</script>
<style lang="scss" scoped>
@use '../../../styles/badge';
$no-timetable: #aaa;
$departed: springgreen;
$stopped: #ffa600;
@@ -118,6 +120,17 @@ $online: gold;
$terminated: salmon;
$disconnected: slategray;
h3.user-header {
margin: 0.5em 0;
padding: 0.3em;
display: flex;
justify-content: center;
align-items: center;
font-size: 1.2em;
}
.info-user-list {
width: 100%;
}
@@ -40,36 +40,28 @@
<span>
{{ $t('scenery.timetable-issued-date') }}
<b>
{{
localeDateTime(
timetableHistory.createdAt > timetableHistory.beginDate
? timetableHistory.beginDate
: timetableHistory.createdAt,
$i18n.locale
)
}}
</b></span
>
<span v-if="timetableHistory.authorName">
{{ $t('scenery.timetable-issued-by') }}
<b>
<router-link
:to="`/journal/timetables?search-dispatcher=${timetableHistory.authorName}`"
>
{{ timetableHistory.authorName }}
</router-link>
{{ parseCreatedDate(timetableHistory, $i18n.locale) }}
</b>
</span>
<span>
{{ $t('scenery.timetable-issued-for') }}
<b>
<router-link
:to="`/journal/timetables?search-driver=${timetableHistory.driverName}`"
>
{{ timetableHistory.driverName }}
</router-link>
</b>
<router-link
class="journal-link"
:to="`/journal/timetables?search-driver=${timetableHistory.driverName}`"
>
{{ timetableHistory.driverName }}
</router-link>
</span>
<span v-if="timetableHistory.authorName">
{{ $t('scenery.timetable-issued-by') }}
<router-link
class="journal-link"
:to="`/journal/timetables?search-dispatcher=${timetableHistory.authorName}`"
>
{{ timetableHistory.authorName }}
</router-link>
</span>
</div>
</span>
@@ -106,7 +98,7 @@ import { useApiStore } from '../../store/apiStore';
import routerMixin from '../../mixins/routerMixin';
import { useMainStore } from '../../store/mainStore';
const historyModeList = ['via', 'issuedFrom', 'terminatingAt'] as const;
const historyModeList = ['includesScenery', 'issuedFrom', 'via', 'terminatingAt'] as const;
type HistoryMode = (typeof historyModeList)[number];
export default defineComponent({
@@ -131,17 +123,19 @@ export default defineComponent({
dataStatus: Status.Data.Loading,
DataStatus: Status.Data,
checkedHistoryMode: 'via' as HistoryMode
checkedHistoryMode: 'includesScenery' as HistoryMode
};
},
async activated() {
this.checkedHistoryMode = 'includesScenery';
this.fetchAPIData();
},
methods: {
async fetchAPIData() {
const stationName = this.$route.query['station'];
this.dataStatus = Status.Data.Loading;
if (!stationName) {
this.historyList = [];
@@ -152,6 +146,7 @@ export default defineComponent({
const requestFilters: Record<string, any> = {};
requestFilters[this.checkedHistoryMode] = stationName.toString();
requestFilters.countLimit = 30;
requestFilters['returnType'] = 'short';
try {
const response: API.TimetableHistory.Response = await (
@@ -165,12 +160,12 @@ export default defineComponent({
this.dataStatus = Status.Data.Loaded;
} catch (error) {
console.error(error);
this.dataStatus = Status.Data.Error;
}
},
checkHistoryMode(mode: HistoryMode) {
this.checkedHistoryMode = mode;
this.dataStatus = Status.Data.Loading;
this.fetchAPIData();
},
@@ -181,6 +176,18 @@ export default defineComponent({
[`search-${this.checkedHistoryMode}`]: this.station?.name || this.onlineScenery?.name
}
});
},
parseCreatedDate(timetable: API.TimetableHistory.Data, locale: string) {
const createdDate =
timetable.createdAt > timetable.beginDate
? new Date(timetable.beginDate)
: new Date(timetable.createdAt);
return createdDate.toLocaleString(locale == 'pl' ? 'pl-PL' : 'en-GB', {
timeStyle: 'short',
dateStyle: 'medium'
});
}
},
components: { Loading }
@@ -215,7 +222,15 @@ export default defineComponent({
button {
padding: 0.35em;
min-width: 120px;
}
}
.journal-link {
font-weight: bold;
color: #eee;
&:hover {
color: var(--clr-primary);
}
}
@@ -21,9 +21,7 @@
<template v-else>{{ $t('filters.no-changed-filters') }}</template>
</div>
<section class="card_sceneries-search">
<h3 class="section-header">{{ $t('filters.sceneries-search') }}</h3>
<section class="card_input-search">
<datalist id="sceneries">
<option
v-for="scenery in sortedStationList"
@@ -32,18 +30,59 @@
></option>
</datalist>
<form action="javascript:void(0);" @submit="handleSceneriesInput">
<input
v-model="chosenSearchScenery"
id="scenery-search"
list="sceneries"
:placeholder="$t('filters.sceneries-placeholder')"
@focus="preventKeyDown = true"
@blur="preventKeyDown = false"
/>
<input
v-model="chosenSearchScenery"
id="scenery-search"
list="sceneries"
:placeholder="$t('filters.sceneries-placeholder')"
@change="handleSceneriesInput"
@focus="preventKeyDown = true"
@blur="preventKeyDown = false"
/>
<button class="btn--action">{{ $t('filters.search-button-title') }}</button>
</form>
<button class="btn--action" @click="handleSceneriesInput">
{{ $t('filters.search-button-title') }}
</button>
</section>
<section class="card_input-search">
<input
v-model="filters['lines']"
id="line-numbers-search"
:placeholder="$t('filters.line-numbers-placeholder')"
@focus="preventKeyDown = true"
@blur="preventKeyDown = false"
/>
<button class="btn--action btn--image" @click="resetLineNumbersInput">
<img src="/images/icon-exit.svg" alt="reset line numbers search" />
</button>
</section>
<section class="card_input-search">
<select id="author" name="authors" v-model="filters['authors']">
<option value="">{{ $t('filters.authors-placeholder') }}</option>
<option v-for="(author, i) in authorsOptions" :key="i" :value="author">
{{ author }}
</option>
</select>
<button class="btn--action btn--image" @click="resetAuthorsInput">
<img src="/images/icon-exit.svg" alt="reset authors search" />
</button>
</section>
<section class="card_input-search">
<select id="projects" name="projects" v-model="filters['projects']">
<option value="">{{ $t('filters.projects-placeholder') }}</option>
<option v-for="(project, i) in projectsOptions" :key="i" :value="project">
{{ project }}
</option>
</select>
<button class="btn--action btn--image" @click="resetProjectsInput">
<img src="/images/icon-exit.svg" alt="reset projects search" />
</button>
</section>
<section class="card_options">
@@ -52,7 +91,7 @@
v-for="(sectionFilters, sectionKey) in filtersSections"
:key="sectionKey"
>
<h3 class="text--primary">
<h3 class="section-header">
<span class="active-indicator" v-if="!areSectionFiltersDefault(sectionKey)"></span>
{{ $t(`filters.sections.${sectionKey}`) }}
<button @click="resetSectionFilters(sectionKey)">RESET</button>
@@ -82,7 +121,7 @@
</section>
<section class="card_timestamp">
<h3 class="section-header">{{ $t('filters.minimum-hours-title') }}</h3>
<h3 class="hours-section-header">{{ $t('filters.minimum-hours-title') }}</h3>
<span class="clock">
<button class="btn--action" @click="subHour">-</button>
@@ -97,29 +136,6 @@
</span>
</section>
<section class="card_authors-search">
<h3 class="section-header">{{ $t('filters.authors-search') }}</h3>
<datalist id="authors" name="authors">
<option v-for="(author, i) in authorsHint" :key="i" :value="author"></option>
</datalist>
<form action="javascript:void(0);" @submit="handleAuthorsInput">
<input
type="text"
id="author"
list="authors"
name="authors"
v-model="authors"
:placeholder="$t('filters.authors-placeholder')"
@focus="preventKeyDown = true"
@blur="preventKeyDown = false"
/>
<button class="btn--action">{{ $t('filters.search-button-title') }}</button>
</form>
</section>
<section class="card_sliders">
<div class="slider" v-for="(slider, i) in sliderStates" :key="i">
<input
@@ -200,7 +216,6 @@ export default defineComponent({
sliderStates,
minimumHours: 0,
authors: '',
currentRegion: { id: '', value: '' },
@@ -255,13 +270,11 @@ export default defineComponent({
.sort((s1, s2) => (s1.name > s2.name ? 1 : -1));
},
currentOptionsActive() {
return true;
},
authorsHint() {
authorsOptions() {
return this.store.stationList
.reduce((acc, station) => {
if (station.generalInfo?.hidden === true) return acc;
station.generalInfo?.authors?.forEach((author) => {
if (author.trim() != '' && !acc.includes(author.toLocaleLowerCase()))
acc.push(author.toLocaleLowerCase());
@@ -270,6 +283,19 @@ export default defineComponent({
return acc;
}, [] as string[])
.sort((a, b) => a.localeCompare(b));
},
projectsOptions() {
return this.store.stationList
.reduce((acc, station) => {
if (!station.generalInfo || !station.generalInfo.project || station.generalInfo.hidden)
return acc;
if (!acc.includes(station.generalInfo.project.trim()))
acc.push(station.generalInfo.project.trim());
return acc;
}, [] as string[])
.sort((a, b) => a.localeCompare(b));
}
},
@@ -294,8 +320,16 @@ export default defineComponent({
this.scrollTop = (e.target as HTMLElement).scrollTop;
},
handleAuthorsInput() {
this.filters['authors'] = this.authors;
resetAuthorsInput() {
this.filters['authors'] = '';
},
resetProjectsInput() {
this.filters['projects'] = '';
},
resetLineNumbersInput() {
this.filters['lines'] = '';
},
handleSceneriesInput() {
@@ -340,7 +374,6 @@ export default defineComponent({
// Reset local model values
this.minimumHours = 0;
this.authors = '';
// Reset global filters
Object.keys(this.filters).forEach((filterKey) => {
@@ -384,6 +417,14 @@ export default defineComponent({
@use '../../styles/animations';
h3.section-header {
display: flex;
align-items: center;
margin-bottom: 0.25em;
gap: 0.5em;
color: var(--clr-primary);
}
h3.hours-section-header {
text-align: center;
margin: 0.5em 0;
}
@@ -456,27 +497,20 @@ h3.section-header {
}
}
.card_authors-search,
.card_sceneries-search {
margin: 1em 0;
.card_input-search {
display: flex;
flex-direction: column;
align-items: center;
gap: 0.5em;
form {
display: flex;
justify-content: center;
flex-wrap: wrap;
gap: 0.5em;
width: 100%;
margin-top: 1em;
button {
height: 100%;
}
input {
width: 70%;
max-width: 400px;
input,
select {
width: 100%;
padding: 0.5em;
outline: 1px solid white;
border: 1px solid #aaa;
}
}
@@ -548,12 +582,6 @@ h3.section-header {
}
.option-section h3 {
display: flex;
align-items: center;
margin-bottom: 0.25em;
gap: 0.5em;
button {
padding: 0.15em;
color: coral;
+4 -4
View File
@@ -14,10 +14,10 @@
<transition name="dropdown-anim">
<div class="dropdown_wrapper" v-if="showDropdown">
<div>
<h1 class="stats-title text--primary">
<h2 class="stats-title text--primary">
<img src="/images/icon-stats.svg" alt="Open filters icon" height="28" />
{{ $t('station-stats.title') }}
</h1>
</h2>
<hr style="margin: 0.5em 0" />
@@ -245,7 +245,7 @@ export default defineComponent({
@use '../../styles/badge';
@use '../../styles/responsive';
h1.stats-title img {
.stats-title img {
vertical-align: text-bottom;
}
@@ -279,7 +279,7 @@ h1.stats-title img {
}
@include responsive.smallScreen {
h1.stats-title {
.stats-title {
text-align: center;
}
+81 -68
View File
@@ -14,7 +14,7 @@
class="header-text"
:class="headerName"
>
<span class="header_wrapper">
<div class="header_wrapper">
<div v-html="$t(`sceneries.headers.${headerName}`)"></div>
<img
@@ -23,7 +23,7 @@
:src="`/images/icon-arrow-${activeSorter.dir == 1 ? 'asc' : 'desc'}.svg`"
alt="sort icon"
/>
</span>
</div>
</th>
<th
@@ -52,14 +52,14 @@
</thead>
<tbody>
<router-link
<tr
v-for="station in filteredStationList"
class="a-row"
role="row"
tabindex="0"
:key="station.name"
@click.right.prevent="openForumSite($event, station.generalInfo?.url)"
@keydown.space.prevent="openForumSite($event, station.generalInfo?.url)"
:to="getSceneryRoute(station)"
@click="getSceneryRoute(station)"
@keydown.enter="getSceneryRoute(station)"
>
<td class="station-name" :class="station.generalInfo?.availability">
<b v-if="station.generalInfo?.project" style="color: salmon">{{
@@ -146,6 +146,14 @@
</span>
</td>
<td class="station-dispatcher-lang">
<FlagIcon
v-if="station.onlineInfo && station.onlineInfo.dispatcherLanguageId != -1"
:language-id="station.onlineInfo.dispatcherLanguageId"
width="2.25em"
/>
</td>
<td class="station-dispatcher-exp">
<span
v-if="station.onlineInfo && station.onlineInfo?.dispatcherExp != -1"
@@ -314,7 +322,7 @@
>
{{ station.onlineInfo?.scheduledTrainCount.confirmed ?? '-' }}
</td>
</router-link>
</tr>
</tbody>
</table>
@@ -344,11 +352,13 @@ import { useTooltipStore } from '../../store/tooltipStore';
import { getChangedFilters } from '../../managers/stationFilterManager';
import { ActiveSorter, HeadIdsType, headIconsIds, headIds } from './typings';
import { filterStations, sortStations } from './utils';
import { getLanguageNameById } from '../../utils/languageUtils';
import FlagIcon from '../Global/FlagIcon.vue';
export default defineComponent({
emits: ['toggleDonationCard'],
components: { Loading, StationStatusBadge },
components: { Loading, StationStatusBadge, FlagIcon },
mixins: [styleMixin, dateMixin],
data: () => ({
@@ -384,15 +394,13 @@ export default defineComponent({
methods: {
getSceneryRoute(station: Station) {
// TODO: Hide tooltips when navigating away
return {
this.$router.push({
name: 'SceneryView',
query: {
station: station.name,
region: this.$route.query.region || undefined
}
};
});
},
openDonationCard(e: Event) {
@@ -459,78 +467,82 @@ table {
width: 100%;
min-width: 1250px;
white-space: wrap;
}
thead {
position: sticky;
top: 0;
thead {
position: sticky;
top: 0;
z-index: 50;
}
thead tr {
background-color: var(--clr-bg3);
}
thead th {
background-color: var(--clr-bg3);
white-space: pre-wrap;
padding: 0.5em 0.25em;
cursor: pointer;
user-select: none;
-moz-user-select: none;
-webkit-user-select: none;
&.station {
width: 12em;
}
thead tr {
background-color: var(--clr-bg3);
&.min-lvl {
width: 4em;
}
thead th {
&.station {
width: 12em;
}
&.status {
width: 10em;
}
&.min-lvl {
width: 4em;
}
&.dispatcher {
width: 12em;
}
&.status {
width: 10em;
}
&.dispatcher-lang {
width: 6em;
}
&.dispatcher {
width: 12em;
}
&.dispatcher-lvl {
width: 6em;
}
&.dispatcher-lvl {
width: 6em;
}
&.routes-double,
&.routes-single {
width: 7em;
}
&.routes-double,
&.routes-single {
width: 7em;
}
&.general {
width: 11em;
}
&.general {
width: 11em;
}
&.header-image {
width: 3.5em;
&.header-image {
width: 3.5em;
&.user {
width: 5em;
}
}
padding: 0.5em 0.25em;
background-color: var(--clr-bg3);
white-space: pre-wrap;
cursor: pointer;
user-select: none;
-moz-user-select: none;
-webkit-user-select: none;
span {
display: flex;
align-items: center;
justify-content: center;
img {
width: 1.5em;
vertical-align: middle;
}
&.user {
width: 5em;
}
}
}
tr,
.a-row {
thead th .header_wrapper {
display: flex;
align-items: center;
justify-content: center;
img {
width: 1.5em;
vertical-align: middle;
}
}
tbody tr {
background-color: $rowCol;
vertical-align: middle;
@@ -550,6 +562,7 @@ tr,
cursor: pointer;
overflow: hidden;
text-overflow: ellipsis;
height: 2.5em;
&.inactive {
opacity: 0.2;
+1
View File
@@ -10,6 +10,7 @@ export const headIds = [
'min-lvl',
'status',
'dispatcher',
'dispatcher-lang',
'dispatcher-lvl',
'routes-single',
'routes-double',
+36 -8
View File
@@ -132,23 +132,46 @@ function filterSliderValues(filters: Record<string, any>, generalInfo: StationGe
filters['minOneWayCatenary'] > routes.singleElectrifiedNames.length ||
filters['minOneWay'] > routes.singleOtherNames.length ||
filters['minTwoWayCatenary'] > routes.doubleElectrifiedNames.length ||
// filters['minTwoWay'] > routes.doubleOtherNames.length ||
filters['minTwoWay'] > routes.doubleOtherNames.length ||
filters['minOneWayCatenaryInt'] >
internalRoutes.filter((r) => r.routeTracks == 1 && r.isElectric == true).length ||
filters['minOneWayInt'] >
internalRoutes.filter((r) => r.routeTracks == 1 && r.isElectric == false).length ||
filters['minTwoWayCatenaryInt'] >
internalRoutes.filter((r) => r.routeTracks == 2 && r.isElectric == true).length
internalRoutes.filter((r) => r.routeTracks == 2 && r.isElectric == true).length ||
filters['minTwoWayInt'] >
internalRoutes.filter((r) => r.routeTracks == 2 && r.isElectric == false).length
);
}
function filterInputValues(filters: Record<string, any>, generalInfo: StationGeneralInfo) {
return (
if (
filters['authors'].length > 3 &&
!generalInfo.authors
?.map((a) => a.toLocaleLowerCase())
.includes(filters['authors'].toLocaleLowerCase())
);
generalInfo.authors &&
!generalInfo.authors.some(
(a) => a.toLocaleLowerCase() == filters['authors'].toLocaleLowerCase()
)
)
return true;
if (filters['projects'].length > 0 && generalInfo.project != filters['projects']) return true;
if (filters['lines'].length > 0) {
const linesNumbers = (filters['lines'] as string)
.split(',')
.map((l) => Number(l))
.filter((l) => !isNaN(l) && l != 0);
if (
!generalInfo.lines
?.split(',')
.map((l) => Number(l))
.some((l) => linesNumbers.includes(l))
)
return true;
}
return false;
}
export const sortStations = (a: Station, b: Station, sorter: ActiveSorter) => {
@@ -187,6 +210,11 @@ export const sortStations = (a: Station, b: Station, sorter: ActiveSorter) => {
diff = (a.onlineInfo?.dispatcherExp || 0) - (b.onlineInfo?.dispatcherExp || 0);
break;
case 'dispatcher-lang':
diff =
(a.onlineInfo?.dispatcherLanguageId ?? -1) - (b.onlineInfo?.dispatcherLanguageId ?? -1);
break;
case 'routes-single':
diff =
(a.generalInfo?.routes.single.filter((r) => !r.hidden && !r.isInternal).length ?? -1) -
@@ -243,7 +271,7 @@ export const sortStations = (a: Station, b: Station, sorter: ActiveSorter) => {
return a.name.localeCompare(b.name);
};
export const filterStations = (station: Station, filters: Record<string, any>) => {
export const filterStations = (station: Station, filters: Record<string, any>) => {
if (filters['free'] && (!station.onlineInfo || station.onlineInfo.dispatcherId == -1))
return false;
+12 -3
View File
@@ -9,6 +9,17 @@
<div class="text--primary">
<b>{{ trainInfo.stockList[0] }}</b> &bull; {{ trainInfo.length }}m &bull;
{{ (trainInfo.mass / 1000).toFixed(2) }}t
<span v-if="trainInfo.timetableData">
&bull; vRJ:
{{
trainInfo.timetableData?.trainMaxSpeed ||
getStockSpeedLimit(trainInfo.stockList, trainInfo.mass)
}}km/h
</span>
<span v-else class="text--grayed font--italic">
&bull; vMax:
{{ getStockSpeedLimit(trainInfo.stockList, trainInfo.mass) }}km/h
</span>
</div>
<div class="text--grayed">
@@ -46,9 +57,7 @@ export default defineComponent({
return this.mainStore.trainList.find((t) => t.id === this.tooltipStore.content);
},
lastSceneryStatus() {
}
lastSceneryStatus() {}
}
});
</script>
@@ -18,9 +18,9 @@
<span v-if="vehicleCargo">({{ vehicleCargo.id }})</span>
</div>
<div class="vehicle-props" v-if="vehicleData">
{{ vehicleData.group.speed }}km/h &bull; {{ vehicleData.group.length }}m &bull;
{{ (vehicleData.group.weight / 1000).toFixed(1) }}t
<div class="vehicle-props" v-if="vehicleGroup">
{{ vehicleGroup.speed }}km/h &bull; {{ vehicleGroup.length }}m &bull;
{{ (vehicleGroup.weight / 1000).toFixed(1) }}t
<span v-if="vehicleCargo">(+{{ (vehicleCargo.weight / 1000).toFixed(1) }}t)</span>
</div>
</div>
@@ -73,12 +73,18 @@ export default defineComponent({
return this.tooltipStore.content.split(':')[0];
},
vehicleData() {
return this.apiStore.vehiclesData?.find((v) => v.name == this.vehicleName);
vehicleGroup() {
if (!this.apiStore.vehiclesData) return null;
const vehicle = this.apiStore.vehiclesData.vehicles.find((v) => v.name == this.vehicleName);
if (!vehicle) return null;
return this.apiStore.vehiclesData.vehicleGroups.find((g) => g.id == vehicle?.vehicleGroupsId);
},
vehicleCargo() {
const x = this.vehicleData?.group.cargoTypes?.find(
const x = this.vehicleGroup?.cargoTypes?.find(
(c) => c.id == this.tooltipStore.content.split(':')[1]
);
+13 -52
View File
@@ -66,6 +66,10 @@
<span v-else>{{ train.driverName }}</span>
</div>
<div class="train-language-flag">
<FlagIcon :language-id="train.driverLanguageId" width="1.75em" />
</div>
</div>
</div>
@@ -135,7 +139,11 @@
<img src="/images/icon-speed.svg" alt="speed icon" />
{{ train.speed }} km/h
<span v-if="stockSpeedLimit != Infinity">
<span v-if="train.timetableData">
&bull; vRJ: {{ train.timetableData.trainMaxSpeed }} km/h
</span>
<span v-else-if="stockSpeedLimit != Infinity">
&bull;
<em
class="text--grayed"
@@ -195,10 +203,11 @@ import trainInfoMixin from '../../mixins/trainInfoMixin';
import trainCategoryMixin from '../../mixins/trainCategoryMixin';
import ProgressBar from '../Global/ProgressBar.vue';
import StockList from '../Global/StockList.vue';
import FlagIcon from '../Global/FlagIcon.vue';
export default defineComponent({
mixins: [trainInfoMixin, styleMixin, trainCategoryMixin],
components: { ProgressBar, StockList },
components: { ProgressBar, StockList, FlagIcon },
props: {
train: {
@@ -219,57 +228,9 @@ export default defineComponent({
computed: {
stockSpeedLimit() {
let isPassenger = true;
// Check the whole consist speed limit
const vehicleMaxSpeed = this.train.stockList.reduce((acc, stockName, i) => {
const [vehicleName, vehicleCargo] = stockName.split(':');
const vehicleData = this.apiStore.vehiclesData?.find((v) => v.name == vehicleName);
if (!vehicleData) return acc;
let vehicleSpeed = vehicleData.group.speed;
if (vehicleData.type == 'wagon-freight') {
isPassenger = false;
if (vehicleCargo !== undefined && vehicleData.group.speedLoaded) {
vehicleSpeed = vehicleData.group.speedLoaded;
}
}
return Math.min(vehicleSpeed, acc);
}, Infinity);
// Check the head vehicle speed limit
const headLocoName = this.train.stockList[0];
const headLocoVehicleData = this.apiStore.vehiclesData?.find((v) => v.name == headLocoName);
// Omit speed check for head vehicle if there's no data for it
if (!headLocoName || !headLocoVehicleData || !headLocoVehicleData.group.massSpeeds)
return vehicleMaxSpeed;
const massSpeeds =
headLocoVehicleData.group.massSpeeds[
this.train.stockList.length == 1 ? 'none' : isPassenger ? 'passenger' : 'cargo'
];
// Omit speed check if there's no data on mass speeds
if (!massSpeeds) return vehicleMaxSpeed;
// Number type for locomotives alone
if (typeof massSpeeds === 'number') return massSpeeds;
// 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 ? massSpeeds[massKey] : Infinity;
return Math.min(massMaxSpeed, vehicleMaxSpeed);
return this.getStockSpeedLimit(this.train.stockList, this.train.mass);
},
journalRouteLocation() {
return {
path: '/journal/timetables',
+4 -4
View File
@@ -13,10 +13,10 @@
<transition name="dropdown-anim">
<div class="dropdown_wrapper" v-if="showOptions">
<h1 class="text--primary">
<h2 class="stats-title text--primary">
<img src="/images/icon-stats.svg" alt="Open filters icon" height="28" />
{{ $t('train-stats.title') }}
</h1>
</h2>
<hr style="margin: 0.5em 0" />
@@ -229,7 +229,7 @@ export default defineComponent({
@use '../../styles/badge';
@use '../../styles/responsive';
h1 img {
.stats-title img {
vertical-align: text-bottom;
}
@@ -257,7 +257,7 @@ h3 {
text-align: center;
}
h1 {
.stats-title {
text-align: center;
}
}
+24 -9
View File
@@ -23,6 +23,15 @@
"bottom-text": "Enjoy!\n~Spythere",
"button-confirm": "Start using the app!"
},
"migrate-info": {
"tooltip-content": "Information about migration of\nStacjownik site!",
"header-text": "Attention!",
"paragraph-1-html": "Due to the growing interest in Stacjownik and other applications I have made, <b>as of January 1, 2026, Stacjownik will be <u>permanently moved</u> to a new dedicated domain:</b>",
"paragraph-2-link-text": "https://stacjownik-td2.spythere.eu",
"paragraph-3-text": "This website will no longer receive future updates and after the New Year it will only redirect to the address above.",
"paragraph-4-italic-text": "\"Why are you messing this up? It's been fine for so long!\"",
"paragraph-4-html": "<i>\"Why are you messing this up? It's been fine for so long!\"</i> <br /> The change is mainly caused by the growing website interest and exceeding the free limit plan of the current Google hosting, which forces additional fees for each use of the service above a certain threshold (or otherwise blocks access to it). By moving the site to a dedicated domain (which has already been purchased and is maintained with the financial help of <span class=\"text--donator\">Supporters</span>), I will get rid of unnecessary expenses for a large corporation that can shut down my application at any given time."
},
"donations": {
"button-title": "TOSS A COIN",
"header": "Toss a coin to Stacjownik!",
@@ -60,7 +69,8 @@
"confirm": "ROGER THAT!",
"no-data": "No data about the latest app update has been found",
"info-1": "This changelog will be available to see once again after clicking the version number in the footer",
"info-2": "The full app changelog available on <a href='https://github.com/Spythere/stacjownik' target='_blank'>the project's GitHub</a>"
"info-2": "The full app changelog available on {link}",
"info-2-link-text": "the project's GitHub page"
},
"app": {
"sceneries": "SCENERIES",
@@ -76,6 +86,7 @@
"tooltip-driver-offline": "Driver is offline",
"tooltip-scenery-offline": "Scenery is offline",
"pojazdownik-link-content": "POJAZDOWNIK",
"language-tooltip-content": "JĘZYK / LANGUAGE",
"gnr-link-content": "TRAIN ORDERS <br> GENERATOR"
},
"footer": {
@@ -189,6 +200,7 @@
"search-dispatcher": "Dispatcher name",
"search-station": "Scenery name / #",
"search-author": "Timetable author name",
"search-includesScenery": "Includes scenery name",
"search-issuedFrom": "Issuing scenery name",
"search-via": "Via scenery name",
"search-terminatingAt": "Terminating scenery name",
@@ -271,6 +283,7 @@
"SCS": "SCS",
"SCS-R": "SCS + MANUAL",
"SCS-M": "SCS + MECH.",
"SCS-SPK": "SCS + SPK",
"SPE": "SPE",
"manual": "MANUAL",
"mechanical": "MECHANICAL",
@@ -304,10 +317,10 @@
"minTwoWayCatenaryInt": "MIN. INTERNAL CATENARY DOUBLE TRACK ROUTES",
"minTwoWayInt": "MIN. INTERNAL OTHER DOUBLE TRACK ROUTES"
},
"sceneries-search": "SCENERY SEARCH:",
"sceneries-placeholder": "Enter scenery name...",
"authors-search": "SEARCH BY AUTHOR NAME (other filters apply):",
"authors-placeholder": "Enter the author nickname...",
"sceneries-placeholder": "Search for scenery",
"line-numbers-placeholder": "Line numbers (separated by commas)",
"authors-placeholder": "Scenery author",
"projects-placeholder": "Scenery project",
"search-button-title": "SEARCH",
"minimum-hours-title": "SHOW ONLY SCENERIES UNTIL:",
"now": "NOW",
@@ -324,6 +337,7 @@
"min-lvl": "Scenery\nlevel",
"status": "Status",
"dispatcher": "Dispatcher",
"dispatcher-lang": "Language",
"dispatcher-lvl": "Dispatcher\nlevel",
"routes-single": "1-track\nroutes",
"routes-double": "2-track\nroutes",
@@ -559,12 +573,13 @@
"option-active-timetables": "Active timetables",
"option-timetables-history": "Timetables history PL1",
"option-dispatchers-history": "Dispatchers history PL1",
"timetable-via": "ALL TIMETABLES",
"timetable-includesScenery": "ALL TIMETABLES",
"timetable-via": "PASSES THROUGH",
"timetable-issuedFrom": "BEGINS HERE",
"timetable-terminatingAt": "TERMINATES HERE",
"timetable-terminatingAt": "ENDS HERE",
"timetable-issued-date": "Issued",
"timetable-issued-by": " by:",
"timetable-issued-for": " for driver:",
"timetable-issued-for": " for:",
"dispatcher-rate": "Rate:",
"dispatcher-status-changes": "Status changes:",
"req-level": "all dispatcher levels | dispatcher level {lvl} required | dispatcher level {lvl} required",
@@ -609,4 +624,4 @@
"search-train": "Train no.",
"search-driver": "Driver name"
}
}
}
+23 -9
View File
@@ -23,6 +23,14 @@
"bottom-text": "Miłego korzystania\n~Spythere",
"button-confirm": "Zacznij korzystać z aplikacji!"
},
"migrate-info": {
"tooltip-content": "Informacja o migracji\nstrony Stacjownika!",
"header-text": "Uwaga!",
"paragraph-1-html": "Ze względu na coraz większe zainteresowanie Stacjownikiem oraz innymi aplikacjami mojego autorstwa <b>z dniem 1 stycznia 2026r. Stacjownik zostaje <u>permamentnie przeniesiony</u> na nową dedykowaną domenę:</b>",
"paragraph-2-link-text": "https://stacjownik-td2.spythere.eu",
"paragraph-3-text": "Obecna strona nie będzie otrzymywać już przyszłych aktualizacji, a po Nowym Roku będzie jedynie przenosić na powyższy adres.",
"paragraph-4-html": "<i>\"Po co psujesz? Przecież było dobrze tyle czasu!\"</i> <br /> Zmiana podyktowana jest głównie wzrostem zainteresowania stroną i przekraczaniem darmowego limitu obecnego hostingu Google'a, który wymusza płatność za każde użycie serwisu ponad określoną wartość (lub w przeciwnym wypadku blokuje do niego dostęp). Przenosząc stronę na dedykowaną domenę (która jest już wykupiona i utrzymywana dzięki pomocy <span class=\"text--donator\">Wspierających</span>), pozbędę się niepotrzebnego wydatku dla wielkiej korporacji, która w każdej chwili może mi wyłączyć aplikację."
},
"donations": {
"button-title": "GROSZA DAJ",
"header": "Grosza daj Stacjownikowi!",
@@ -60,7 +68,8 @@
"confirm": "PRZYJĄŁEM!",
"no-data": "Nie znaleziono informacji o ostatnich zmianach w aplikacji",
"info-1": "Ten changelog będzie zawsze dostępny po kliknięciu numeru wersji w stopce strony",
"info-2": "Pełny changelog dostępny na <a href='https://github.com/Spythere/stacjownik' target='_blank'>GitHubie projektu</a>"
"info-2": "Pełny changelog dostępny na {link}",
"info-2-link-text": "GitHubie projektu"
},
"app": {
"sceneries": "SCENERIE",
@@ -73,6 +82,7 @@
"tooltip-driver-offline": "Maszynista offline",
"tooltip-scenery-offline": "Sceneria offline",
"pojazdownik-link-content": "POJAZDOWNIK",
"language-tooltip-content": "JĘZYK / LANGUAGE",
"gnr-link-content": "GENERATOR <br> ROZKAZÓW PISEMNYCH"
},
"footer": {
@@ -186,6 +196,7 @@
"search-dispatcher": "Nick dyżurnego",
"search-station": "Nazwa scenerii / #",
"search-author": "Nick autora rozkładu jazdy",
"search-includesScenery": "Zawiera scenerię",
"search-issuedFrom": "Sceneria początkowa",
"search-via": "Przez scenerię",
"search-terminatingAt": "Sceneria końcowa",
@@ -269,6 +280,7 @@
"SCS": "SCS",
"SCS-R": "SCS + RĘCZNE",
"SCS-M": "SCS + MECH.",
"SCS-SPK": "SCS + SPK",
"SPE": "SPE",
"manual": "RĘCZNE",
"SUP": "SUP (RASP-UZK)",
@@ -302,10 +314,10 @@
"minTwoWayCatenaryInt": "SZLAKI DWUTOROWE ZELEKTR. WEWNĘTRZNE (MINIMUM)",
"minTwoWayInt": "SZLAKI DWUTOROWE NIEZELEKTR. WEWNĘTRZNE (MINIMUM)"
},
"sceneries-search": "WYSZUKAJ SCENERIĘ:",
"sceneries-placeholder": "Wpisz nazwę scenerii...",
"authors-search": "WYSZUKAJ AUTORA (uwzględnia inne filtry):",
"authors-placeholder": "Wpisz nick autora...",
"sceneries-placeholder": "Wyszukaj scenerię",
"line-numbers-placeholder": "Numery linii (oddzielone przecinkami)",
"authors-placeholder": "Autor scenerii",
"projects-placeholder": "Projekt scenerii",
"search-button-title": "SZUKAJ",
"minimum-hours-title": "POKAŻ TYLKO SCENERIE DOSTĘPNE MINIMUM DO:",
"now": "TERAZ",
@@ -322,6 +334,7 @@
"min-lvl": "Poziom\nscenerii",
"status": "Status",
"dispatcher": "Dyżurny",
"dispatcher-lang": "Język",
"dispatcher-lvl": "Poziom\ndyżurnego",
"routes-single": "Szlaki\n1-torowe",
"routes-double": "Szlaki\n2-torowe",
@@ -545,12 +558,13 @@
"option-active-timetables": "Aktywne rozkłady jazdy",
"option-timetables-history": "Historia rozkładów PL1",
"option-dispatchers-history": "Historia dyżurów PL1",
"timetable-via": "WSZYSTKIE RJ",
"timetable-includesScenery": "WSZYSTKIE RJ",
"timetable-via": "PRZEJEŻDŻA",
"timetable-issuedFrom": "ROZPOCZYNA BIEG",
"timetable-terminatingAt": "KOŃCZY BIEG",
"timetable-issued-date": "Wystawiony",
"timetable-issued-date": "Wystawiony: ",
"timetable-issued-by": " przez:",
"timetable-issued-for": " dla maszynisty:",
"timetable-issued-for": " dla:",
"dispatcher-rate": "Ocena:",
"dispatcher-status-changes": "Zmiany statusów:",
"req-level": "ogólnodostępna | minimum {lvl} poziom dyżurnego | minimum {lvl} poziom dyżurnego",
@@ -593,4 +607,4 @@
"history": {
"title": "DZIENNIK ROZKŁADÓW JAZDY"
}
}
}
+24 -9
View File
@@ -31,6 +31,7 @@ export const initFilters = {
mechanical: false,
'SPK-M': false,
'SCS-M': false,
'SCS-SPK': false,
modern: false,
semaphores: false,
historical: false,
@@ -61,12 +62,15 @@ export const initFilters = {
maxLevel: 20,
minOneWay: 0,
minOneWayCatenary: 0,
minTwoWayCatenary: 0,
minOneWayInt: 0,
minOneWayCatenaryInt: 0,
minTwoWay: 0,
minTwoWayCatenary: 0,
minTwoWayInt: 0,
minTwoWayCatenaryInt: 0,
// minTwoWay: 0,
authors: ''
authors: '',
projects: '',
lines: ''
};
export const sliderStates = [
@@ -76,12 +80,12 @@ export const sliderStates = [
{ id: 'maxLevel', minRange: 0, maxRange: 20, step: 1 },
{ id: 'minOneWay', minRange: 0, maxRange: 5, step: 1 },
{ id: 'minOneWayCatenary', minRange: 0, maxRange: 5, step: 1 },
{ id: 'minTwoWayCatenary', minRange: 0, maxRange: 5, step: 1 },
{ id: 'minOneWayInt', minRange: 0, maxRange: 5, step: 1 },
{ id: 'minOneWayCatenaryInt', minRange: 0, maxRange: 5, step: 1 },
{ id: 'minTwoWayCatenaryInt', minRange: 0, maxRange: 5, step: 1 },
// { id: 'minTwoWay', minRange: 0, maxRange: 5, step: 1 },
// { id: 'minTwoWayInt', minRange: 0, maxRange: 5, step: 1 }
{ id: 'minTwoWay', minRange: 0, maxRange: 5, step: 1 },
{ id: 'minTwoWayCatenary', minRange: 0, maxRange: 5, step: 1 },
{ id: 'minTwoWayInt', minRange: 0, maxRange: 5, step: 1 },
{ id: 'minTwoWayCatenaryInt', minRange: 0, maxRange: 5, step: 1 }
];
export type StationFilter = keyof typeof initFilters;
@@ -95,7 +99,18 @@ export const filtersSections: Record<StationFilterSection, StationFilter[]> = {
stationType: ['junction', 'nonJunction'],
access: ['nonPublic', 'unavailable', 'abandoned'],
addons: ['SUP', 'ASDEK', 'noSUP', 'noASDEK'],
control: ['SPK', 'SCS', 'SPE', 'SPK-M', 'SCS-M', 'mechanical', 'SPK-R', 'SCS-R', 'manual'],
control: [
'SPK',
'SCS',
'SPE',
'SCS-SPK',
'SPK-M',
'SCS-M',
'mechanical',
'SPK-R',
'SCS-R',
'manual'
],
blockades: ['SBL', 'PBL'],
signals: ['modern', 'semaphores', 'mixed', 'historical']
};
@@ -116,7 +131,7 @@ export function setupFilters(currentFilters: Record<string, any>) {
});
}
export function getChangedFilters(currentFilters: Record<string, any>): string[] {
export function getChangedFilters(currentFilters: Record<string, any>): string[] {
return (
Object.keys(currentFilters).filter(
(filterKey) =>
+70 -37
View File
@@ -1,45 +1,10 @@
import { defineComponent } from 'vue';
import { Train, TrainStop } from '../typings/common';
import { useApiStore } from '../store/apiStore';
export default defineComponent({
data: () => ({
STATS: {
main: [
{
name: 'speed',
unit: 'km/h'
},
{
name: 'length',
unit: 'm'
},
{
name: 'mass',
unit: 't',
multiplier: 0.001
}
],
position: [
{
name: 'scenery',
prop: 'currentStationName'
},
{
name: 'route',
prop: 'connectedTrack'
},
{
name: 'signal',
prop: 'signal'
},
{
name: 'distance',
prop: 'distance',
unit: 'm'
}
]
}
apiStore: useApiStore()
}),
methods: {
@@ -150,6 +115,74 @@ export default defineComponent({
if (distance < 1000) return `${distance}m`;
return `${(distance / 1000).toPrecision(2)}km`;
},
getStockSpeedLimit(stockList: string[], trainMass: number) {
let isPassenger = true;
// Check the whole consist speed limit
const vehicleMaxSpeed = stockList.reduce((acc, stockName, i) => {
if (!this.apiStore.vehiclesData) return acc;
const [vehicleName, vehicleCargo] = stockName.split(':');
const vehicle = this.apiStore.vehiclesData.vehicles.find((v) => v.name == vehicleName);
if (!vehicle) return acc;
const vehicleGroup = this.apiStore.vehiclesData.vehicleGroups.find(
(g) => g.id == vehicle.vehicleGroupsId
);
if (!vehicleGroup) return acc;
let vehicleSpeed = vehicleGroup.speed;
if (vehicle.type == 'wagon-freight') {
isPassenger = false;
if (vehicleCargo !== undefined && vehicleGroup.speedLoaded) {
vehicleSpeed = vehicleGroup.speedLoaded;
}
}
return Math.min(vehicleSpeed, acc);
}, Infinity);
// Check the head vehicle speed limit
const headLocoName = stockList[0];
const headLocoVehicle = this.apiStore.vehiclesData!.vehicles.find(
(v) => v.name == headLocoName
);
const headLocoVehicleGroup = this.apiStore.vehiclesData!.vehicleGroups.find(
(g) => g.id == headLocoVehicle?.vehicleGroupsId
);
if (!headLocoVehicleGroup) return vehicleMaxSpeed;
// Omit speed check for head vehicle if there's no data for it
if (!headLocoName || !headLocoVehicle || !headLocoVehicleGroup.massSpeeds)
return vehicleMaxSpeed;
const massSpeeds =
headLocoVehicleGroup.massSpeeds[
stockList.length == 1 ? 'none' : isPassenger ? 'passenger' : 'cargo'
];
// Omit speed check if there's no data on mass speeds
if (!massSpeeds) return vehicleMaxSpeed;
// Number type for locomotives alone
if (typeof massSpeeds === 'number') return massSpeeds;
// Record type for passenger or cargo, find the closest range
const massKey = Object.keys(massSpeeds).findLast((massKey) => trainMass >= Number(massKey));
const massMaxSpeed = massKey ? massSpeeds[massKey] : Infinity;
return Math.min(massMaxSpeed, vehicleMaxSpeed);
}
}
});
+2 -2
View File
@@ -13,7 +13,7 @@ export const useApiStore = defineStore('apiStore', {
},
activeData: undefined as API.ActiveData.Response | undefined,
vehiclesData: undefined as API.Vehicles.Response | undefined,
vehiclesData: undefined as API.VehiclesData.Response | undefined,
donatorsData: [] as API.Donators.Response,
sceneryData: [] as StationJSONData[],
@@ -111,7 +111,7 @@ export const useApiStore = defineStore('apiStore', {
async fetchVehiclesInfo() {
try {
const response = await this.client!.get<API.Vehicles.Response>('api/getVehicles');
const response = await this.client!.get<API.VehiclesData.Response>('api/getVehiclesData');
this.vehiclesData = response.data;
this.dataStatuses.vehicles = response.data ? Status.Data.Loaded : Status.Data.Warning;
+25 -5
View File
@@ -11,6 +11,8 @@ import {
} from '../typings/common';
import { useApiStore } from './apiStore';
import { MainStoreState } from './typings';
import i18n from '../i18n';
import StorageManager from '../managers/storageManager';
const checkpointsTrains: Map<string, CheckpointTrain[]> = new Map();
const unknownSceneryCheckpoints: Map<string, Set<string>> = new Map();
@@ -34,9 +36,21 @@ export const useMainStore = defineStore('mainStore', {
chosenModalTrainId: undefined,
modalLastClickedTarget: null,
currentLocale: 'pl'
currentLocale: 'pl',
isMigrateInfoCardOpen: false,
pinnedStationNames: []
}) as MainStoreState,
actions: {
changeLocale(localeName: string) {
(i18n.global.locale.value as any) = localeName;
this.currentLocale = localeName;
StorageManager.setStringValue('lang', localeName);
}
},
getters: {
trainList(): Train[] {
const apiStore = useApiStore();
@@ -73,6 +87,7 @@ export const useMainStore = defineStore('mainStore', {
online: Boolean(train.online),
driverId: train.driverId,
driverName: train.driverName,
driverLanguageId: train.driverLanguageId,
currentStationName: train.currentStationName,
currentStationHash: train.currentStationHash,
connectedTrack: train.connectedTrack,
@@ -244,6 +259,7 @@ export const useMainStore = defineStore('mainStore', {
dispatcherIsSupporter: false,
dispatcherStatus: Status.ActiveDispatcher.FREE,
dispatcherTimestamp: -1,
dispatcherLanguageId: -1,
isOnline: false,
@@ -290,6 +306,7 @@ export const useMainStore = defineStore('mainStore', {
dispatcherIsSupporter: scenery.dispatcherIsSupporter,
dispatcherStatus: scenery.dispatcherStatus,
dispatcherTimestamp: dispatcherTimestamp,
dispatcherLanguageId: scenery.dispatcherLanguageId,
isOnline: scenery.isOnline == 1,
@@ -333,8 +350,12 @@ export const useMainStore = defineStore('mainStore', {
const missingCheckpointsToAdd = unknownSceneryCheckpoints.get(scenery.name);
if (missingCheckpointsToAdd) {
checkpoints.push(...missingCheckpointsToAdd);
scenery.missingCheckpoints.push(...missingCheckpointsToAdd);
[...missingCheckpointsToAdd].forEach((cp) => {
if (cp.toLowerCase() == scenery.name.toLowerCase()) return;
checkpoints.push(cp);
scenery.missingCheckpoints.push(cp);
});
}
const uniqueTrainIds: string[] = [];
@@ -414,7 +435,6 @@ export const useMainStore = defineStore('mainStore', {
return {
name: scenery.name,
generalInfo: {
...scenery,
authors: scenery.authors?.split(',').map((a) => a.trim()),
@@ -429,7 +449,7 @@ export const useMainStore = defineStore('mainStore', {
},
allStationInfo(): Station[] {
const onlineUnsavedStations = this.activeSceneryList
const onlineUnsavedStations: Station[] = this.activeSceneryList
.filter(
(scenery) =>
this.stationList.findIndex((st) => st.name == scenery.name) == -1 &&
+2
View File
@@ -13,6 +13,7 @@ export interface MainStoreState {
chosenModalTrainId?: string;
modalLastClickedTarget: EventTarget | null;
currentLocale: string;
isMigrateInfoCardOpen: boolean;
}
export interface StationJSONData {
@@ -23,6 +24,7 @@ export interface StationJSONData {
project: string;
projectUrl: string;
hash: string;
hidden: boolean;
reqLevel: number;
+27 -1
View File
@@ -89,7 +89,8 @@ select {
font-size: 1em;
}
input {
input,
select {
background: none;
color: white;
font-size: 1em;
@@ -225,6 +226,12 @@ ul {
}
}
.font {
&--italic {
font-style: italic;
}
}
button,
a.a-button {
cursor: pointer;
@@ -352,3 +359,22 @@ a.a-button {
background-color: #aaa;
margin: 0.5em 0;
}
.g-checkbox {
position: relative;
display: inline-block;
user-select: none;
-webkit-user-select: none;
-moz-user-select: none;
display: flex;
justify-content: center;
align-items: center;
input {
position: absolute;
width: 1px;
height: 1px;
}
}
+1 -5
View File
@@ -61,8 +61,4 @@
top: 50%;
transform: translateY(-50%);
padding-right: 0.5em;
}
select.search-input {
}
}
+50 -3
View File
@@ -1,4 +1,4 @@
import { Status, VehicleData } from './common';
import { Status, Vehicle, VehicleGroup } from './common';
export enum APIDataStatus {
OK = 'OK',
@@ -38,6 +38,7 @@ export namespace API {
dispatcherLevel: number | null;
dispatcherRate: number;
dispatcherIsSupporter: boolean;
dispatcherLanguageId: number | null;
dispatcherStatus?: number;
isOnline: boolean;
lastOnlineTimestamp: number;
@@ -114,6 +115,7 @@ export namespace API {
dispatcherId: number;
dispatcherName: string;
dispatcherIsSupporter: boolean;
dispatcherLanguageId: number;
stationName: string;
stationHash: string;
region: string;
@@ -152,6 +154,7 @@ export namespace API {
driverId: number;
driverIsSupporter: boolean;
driverLevel?: number;
driverLanguageId: number;
currentStationName: string;
currentStationHash?: string;
@@ -221,6 +224,7 @@ export namespace API {
driverName: string;
driverLevel: number | null;
driverIsSupporter: boolean;
driverLanguageId: number | null;
route: string;
twr: number;
@@ -329,8 +333,51 @@ export namespace API {
export type Response = string[];
}
export namespace Vehicles {
export type Response = VehicleData[];
export namespace VehiclesData {
export interface VehicleObject {
id: number;
name: string;
type: string;
cabinName: string | null;
restrictions: Record<string, any> | null;
vehicleGroupsId: number;
}
export interface VehicleGroupObject {
id: number;
name: string;
speed: number;
speedLoaded?: number;
speedLoco?: number;
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 {
id: string;
weight: number;
}
export interface Data {
vehicles: VehicleObject[];
vehicleGroups: VehicleGroupObject[];
}
export type Response = Data;
}
}
+8 -43
View File
@@ -1,5 +1,6 @@
import { RouteLocationRaw } from 'vue-router';
import { StationJSONData } from '../store/typings';
import { API } from './api';
export type Availability = 'default' | 'unavailable' | 'nonPublic' | 'abandoned' | 'nonDefault';
export type ScenerySpawnType = 'passenger' | 'freight' | 'loco' | 'all';
@@ -59,6 +60,7 @@ export interface Train {
distance: number;
connectedTrack: string;
driverId: number;
driverLanguageId: number;
trainNo: number;
driverName: string;
driverLevel: number;
@@ -95,9 +97,7 @@ export interface TrainTimetableData {
export interface Station {
name: string;
generalInfo?: StationGeneralInfo;
onlineInfo?: ActiveScenery;
}
@@ -107,7 +107,7 @@ export interface StationGeneralInfo {
abbr: string;
hash?: string;
reqLevel: number;
lines: string;
lines?: string;
project: string;
projectUrl?: string;
signalType: string;
@@ -118,6 +118,7 @@ export interface StationGeneralInfo {
availability: Availability;
routes: StationRoutes;
checkpoints: string[];
hidden: boolean;
}
export interface StationRoutes {
@@ -162,6 +163,7 @@ export interface ActiveScenery {
dispatcherIsSupporter: boolean;
dispatcherStatus: Status.ActiveDispatcher | number;
dispatcherTimestamp: number | null;
dispatcherLanguageId: number;
isOnline: boolean;
stationTrains: Train[];
scheduledTrains: CheckpointTrain[];
@@ -170,7 +172,7 @@ export interface ActiveScenery {
confirmed: number;
unconfirmed: number;
};
missingCheckpoints: string[];
missingCheckpoints: string[];
}
export interface ScenerySpawn {
@@ -215,45 +217,8 @@ export interface CheckpointTrain {
}
// Vehicles Data
export interface VehicleData {
id: number;
name: string;
type: string;
cabinName: string | null;
restrictions: Record<string, any> | null;
vehicleGroupsId: number;
group: VehiclesGroup;
}
export interface VehiclesGroup {
id: number;
name: string;
speed: number;
speedLoaded?: number;
speedLoco?: number;
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 {
id: string;
weight: number;
}
export type Vehicle = API.VehiclesData.VehicleObject;
export type VehicleGroup = API.VehiclesData.VehicleGroupObject;
export interface TooltipUserTrain {
driverName: string;
+5
View File
@@ -0,0 +1,5 @@
export const languageFlagNames = ['pl', 'en', 'de', 'cz', 'sk', 'ru', 'se', 'ua', 'it'];
export function getLanguageNameById(languageId: number) {
return languageFlagNames[languageId] ?? 'pl';
}
+19 -3
View File
@@ -272,7 +272,7 @@ export default defineComponent({
this.scrollDataLoaded = true;
},
async fetchHistoryData() {
async fetchHistoryData() {
const queryParams: DispatchersQueryParams = {};
const dispatcherName = this.searchersValues['search-dispatcher'].trim() || undefined;
@@ -280,9 +280,25 @@ export default defineComponent({
const dateFromString = this.searchersValues['search-date-from'].trim() || undefined;
const dateToString = this.searchersValues['search-date-to'].trim() || undefined;
let dateFromISO: string | undefined = undefined;
let dateToISO: string | undefined = undefined;
if (dateFromString) {
let dateFrom = new Date(dateFromString);
dateFrom.setMinutes(dateFrom.getMinutes() + dateFrom.getTimezoneOffset());
dateFromISO = dateFrom.toISOString();
}
if (dateToString) {
let dateTo = new Date(dateToString);
dateTo.setMinutes(dateTo.getMinutes() + dateTo.getTimezoneOffset());
dateToISO = dateTo.toISOString();
}
queryParams['dispatcherName'] = dispatcherName;
queryParams['dateFrom'] = dateFromString;
queryParams['dateTo'] = dateToString ? `${dateToString}T23:00:00` : undefined;
queryParams['dateFrom'] = dateFromISO;
queryParams['dateTo'] = dateToISO;
queryParams['countLimit'] = 30;
+17 -8
View File
@@ -132,6 +132,7 @@ interface TimetablesQueryParams {
issuedFrom?: string;
terminatingAt?: string;
via?: string;
includesScenery?: string;
countFrom?: number;
countLimit?: number;
@@ -213,6 +214,7 @@ export default defineComponent({
'search-train': '',
'search-driver': '',
'search-dispatcher': '',
'search-includesScenery': '',
'search-issuedFrom': '',
'search-via': '',
'search-terminatingAt': '',
@@ -355,19 +357,25 @@ export default defineComponent({
const driverName = this.searchersValues['search-driver'].trim() || undefined;
const trainNo = this.searchersValues['search-train'].trim() || undefined;
const authorName = this.searchersValues['search-dispatcher'].trim() || undefined;
const dateFrom = this.searchersValues['search-date-from'].trim() || undefined;
const dateFromString = this.searchersValues['search-date-from'].trim() || undefined;
const includesScenery = this.searchersValues['search-includesScenery'].trim() || undefined;
const issuedFrom = this.searchersValues['search-issuedFrom'].trim() || undefined;
const via = this.searchersValues['search-via'].trim() || undefined;
const terminatingAt = this.searchersValues['search-terminatingAt'].trim() || undefined;
const categoryCode = this.searchersValues['select-categoryCode'].trim() || undefined;
let dateTo: string | undefined = undefined;
let dateFromISO: string | undefined = undefined;
let dateToISO: string | undefined = undefined;
if (dateFrom) {
const d = new Date(dateFrom);
d.setDate(d.getDate() + 1);
if (dateFromString) {
let dateFrom = new Date(dateFromString);
dateFrom.setMinutes(dateFrom.getMinutes() + dateFrom.getTimezoneOffset());
dateTo = d.toISOString().split('T')[0];
let dateTo = new Date(dateFrom);
dateTo.setDate(dateTo.getDate() + 1);
dateFromISO = dateFrom.toISOString();
dateToISO = dateTo.toISOString();
}
const queryParams: TimetablesQueryParams = {};
@@ -430,8 +438,9 @@ export default defineComponent({
queryParams['countLimit'] = undefined;
queryParams['authorName'] = authorName;
queryParams['dateFrom'] = dateFrom;
queryParams['dateTo'] = dateTo;
queryParams['dateFrom'] = dateFromISO;
queryParams['dateTo'] = dateToISO;
queryParams['includesScenery'] = includesScenery;
queryParams['issuedFrom'] = issuedFrom;
queryParams['terminatingAt'] = terminatingAt;
queryParams['via'] = via;
+48 -2
View File
@@ -13,6 +13,25 @@
</div>
<div class="topbar-links">
<button
v-if="isOldStacjownikDomain"
class="btn--image migrate-info-button"
@click="toggleMigrateInfoCard(true)"
data-tooltip-type="HtmlTooltip"
:data-tooltip-content="`<b>${$t('migrate-info.tooltip-content')}</b>`"
>
<img :src="`/images/icon-alert-triangle.svg`" alt="show migrate info card" />
</button>
<button
class="btn--image lang-button"
@click="toggleLocales()"
data-tooltip-type="HtmlTooltip"
:data-tooltip-content="`<b>${$t('app.language-tooltip-content')}</b>`"
>
<FlagIcon :language-id="mainStore.currentLocale == 'pl' ? 0 : 1" />
</button>
<a
class="a-button btn--image gnr-link"
href="https://generator-td2.web.app/"
@@ -63,6 +82,7 @@ import { reactive } from 'vue';
import { provide } from 'vue';
import { ActiveSorter } from '../components/StationsView/typings';
import { onMounted } from 'vue';
import FlagIcon from '../components/Global/FlagIcon.vue';
const filterInitStates = { ...initFilters };
@@ -71,7 +91,8 @@ export default defineComponent({
StationTable,
StationFilterCard,
StationStats,
DonationCard
DonationCard,
FlagIcon
},
data: () => ({
@@ -96,6 +117,20 @@ export default defineComponent({
methods: {
toggleDonationCard(value: boolean) {
this.isDonationCardOpen = value;
},
toggleMigrateInfoCard(value: boolean) {
this.mainStore.isMigrateInfoCardOpen = value;
},
toggleLocales() {
this.mainStore.changeLocale(this.mainStore.currentLocale == 'pl' ? 'en' : 'pl');
}
},
computed: {
isOldStacjownikDomain() {
return location.hostname == 'stacjownik-td2.web.app';
}
}
});
@@ -120,11 +155,12 @@ export default defineComponent({
.stations-topbar {
display: flex;
flex-wrap: wrap;
gap: 0.5em;
justify-content: space-between;
position: relative;
margin-bottom: 0.5em;
position: relative;
& > div {
display: flex;
@@ -149,6 +185,16 @@ button.donation-button {
}
}
button.lang-button {
padding: 0 0.5em;
background-color: #111;
}
button.migrate-info-button {
padding: 0 0.5em;
background-color: var(--clr-primary);
}
a.pojazdownik-link {
background-color: #1f263b;
+2 -2
View File
@@ -1,8 +1,8 @@
{
"compilerOptions": {
"composite": true,
"module": "ESNext",
"moduleResolution": "Node",
"module": "nodenext",
"moduleResolution": "nodenext",
"allowSyntheticDefaultImports": true
},
"include": ["vite.config.ts"]
+5 -16
View File
@@ -4,8 +4,8 @@ import { VitePWA } from 'vite-plugin-pwa';
import path from 'path';
export default defineConfig({
server: { port: 5123, open: true },
preview: { port: 4001, open: true },
server: { port: 5123, open: false },
preview: { port: 4001, open: false },
publicDir: 'public',
css: {
preprocessorOptions: {
@@ -21,16 +21,14 @@ export default defineConfig({
vue(),
VitePWA({
registerType: 'autoUpdate',
includeAssets: ['/images/*.{png,svg,jpg}', '/fonts/*.{woff,woff2}'],
workbox: {
disableDevLogs: true,
globPatterns: ['**/*.{js,css,html,png,svg,jpg}'],
globPatterns: ['**/*.{js,css,html,ico,woff,woff2,ttf}', '**/*.{png,jpg,jpeg,svg,webp,gif}'],
cleanupOutdatedCaches: true,
runtimeCaching: [
{
urlPattern:
/^https:\/\/stacjownik.spythere.eu\/api\/(getVehicles|getDonators|getSceneries)/i,
/^https:\/\/stacjownik.spythere.eu\/api\/(getVehiclesData|getDonators|getSceneries)/i,
handler: 'NetworkFirst',
options: {
cacheName: 'stacjownik-api-cache',
@@ -41,14 +39,5 @@ export default defineConfig({
},
devOptions: { enabled: true, suppressWarnings: true }
})
],
build: {
rollupOptions: {
output: {
entryFileNames: 'app-[name].js',
assetFileNames: 'app-[name].css',
chunkFileNames: 'chunk-[name].js'
}
}
}
]
});
+131 -131
View File
@@ -1401,110 +1401,110 @@
estree-walker "^2.0.2"
picomatch "^4.0.2"
"@rollup/rollup-android-arm-eabi@4.50.0":
version "4.50.0"
resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.50.0.tgz#939c1be9625d428d8513e4ab60d406fe8db23718"
integrity sha512-lVgpeQyy4fWN5QYebtW4buT/4kn4p4IJ+kDNB4uYNT5b8c8DLJDg6titg20NIg7E8RWwdWZORW6vUFfrLyG3KQ==
"@rollup/rollup-android-arm-eabi@4.50.1":
version "4.50.1"
resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.50.1.tgz#7d41dc45adcfcb272504ebcea9c8a5b2c659e963"
integrity sha512-HJXwzoZN4eYTdD8bVV22DN8gsPCAj3V20NHKOs8ezfXanGpmVPR7kalUHd+Y31IJp9stdB87VKPFbsGY3H/2ag==
"@rollup/rollup-android-arm64@4.50.0":
version "4.50.0"
resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.50.0.tgz#b74005775903f7a8f4e363d2840c1dcef3776ff3"
integrity sha512-2O73dR4Dc9bp+wSYhviP6sDziurB5/HCym7xILKifWdE9UsOe2FtNcM+I4xZjKrfLJnq5UR8k9riB87gauiQtw==
"@rollup/rollup-android-arm64@4.50.1":
version "4.50.1"
resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.50.1.tgz#6c708fae2c9755e994c42d56c34a94cb77020650"
integrity sha512-PZlsJVcjHfcH53mOImyt3bc97Ep3FJDXRpk9sMdGX0qgLmY0EIWxCag6EigerGhLVuL8lDVYNnSo8qnTElO4xw==
"@rollup/rollup-darwin-arm64@4.50.0":
version "4.50.0"
resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.50.0.tgz#8c04603cdcf1ec0cd6b27152b3827e49295f2962"
integrity sha512-vwSXQN8T4sKf1RHr1F0s98Pf8UPz7pS6P3LG9NSmuw0TVh7EmaE+5Ny7hJOZ0M2yuTctEsHHRTMi2wuHkdS6Hg==
"@rollup/rollup-darwin-arm64@4.50.1":
version "4.50.1"
resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.50.1.tgz#85ccf92ab114e434c83037a175923a525635cbb4"
integrity sha512-xc6i2AuWh++oGi4ylOFPmzJOEeAa2lJeGUGb4MudOtgfyyjr4UPNK+eEWTPLvmPJIY/pgw6ssFIox23SyrkkJw==
"@rollup/rollup-darwin-x64@4.50.0":
version "4.50.0"
resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.50.0.tgz#19ec976f1cc663def2692cd7ffb32981f2b0b733"
integrity sha512-cQp/WG8HE7BCGyFVuzUg0FNmupxC+EPZEwWu2FCGGw5WDT1o2/YlENbm5e9SMvfDFR6FRhVCBePLqj0o8MN7Vw==
"@rollup/rollup-darwin-x64@4.50.1":
version "4.50.1"
resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.50.1.tgz#0af089f3d658d05573208dabb3a392b44d7f4630"
integrity sha512-2ofU89lEpDYhdLAbRdeyz/kX3Y2lpYc6ShRnDjY35bZhd2ipuDMDi6ZTQ9NIag94K28nFMofdnKeHR7BT0CATw==
"@rollup/rollup-freebsd-arm64@4.50.0":
version "4.50.0"
resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.50.0.tgz#a96b4ad8346229f6fcbd9d57f1c53040b037c2da"
integrity sha512-UR1uTJFU/p801DvvBbtDD7z9mQL8J80xB0bR7DqW7UGQHRm/OaKzp4is7sQSdbt2pjjSS72eAtRh43hNduTnnQ==
"@rollup/rollup-freebsd-arm64@4.50.1":
version "4.50.1"
resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.50.1.tgz#46c22a16d18180e99686647543335567221caa9c"
integrity sha512-wOsE6H2u6PxsHY/BeFHA4VGQN3KUJFZp7QJBmDYI983fgxq5Th8FDkVuERb2l9vDMs1D5XhOrhBrnqcEY6l8ZA==
"@rollup/rollup-freebsd-x64@4.50.0":
version "4.50.0"
resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.50.0.tgz#fa565a282bc57967ee6668607b181678bdd74e4a"
integrity sha512-G/DKyS6PK0dD0+VEzH/6n/hWDNPDZSMBmqsElWnCRGrYOb2jC0VSupp7UAHHQ4+QILwkxSMaYIbQ72dktp8pKA==
"@rollup/rollup-freebsd-x64@4.50.1":
version "4.50.1"
resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.50.1.tgz#819ffef2f81891c266456952962a13110c8e28b5"
integrity sha512-A/xeqaHTlKbQggxCqispFAcNjycpUEHP52mwMQZUNqDUJFFYtPHCXS1VAG29uMlDzIVr+i00tSFWFLivMcoIBQ==
"@rollup/rollup-linux-arm-gnueabihf@4.50.0":
version "4.50.0"
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.50.0.tgz#dfc88f7295e1f98d77f25296be787e8a5d6ced75"
integrity sha512-u72Mzc6jyJwKjJbZZcIYmd9bumJu7KNmHYdue43vT1rXPm2rITwmPWF0mmPzLm9/vJWxIRbao/jrQmxTO0Sm9w==
"@rollup/rollup-linux-arm-gnueabihf@4.50.1":
version "4.50.1"
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.50.1.tgz#7fe283c14793e607e653a3214b09f8973f08262a"
integrity sha512-54v4okehwl5TaSIkpp97rAHGp7t3ghinRd/vyC1iXqXMfjYUTm7TfYmCzXDoHUPTTf36L8pr0E7YsD3CfB3ZDg==
"@rollup/rollup-linux-arm-musleabihf@4.50.0":
version "4.50.0"
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.50.0.tgz#32cd70c87455ca031f0361090cf17da5a2ef66d5"
integrity sha512-S4UefYdV0tnynDJV1mdkNawp0E5Qm2MtSs330IyHgaccOFrwqsvgigUD29uT+B/70PDY1eQ3t40+xf6wIvXJyg==
"@rollup/rollup-linux-arm-musleabihf@4.50.1":
version "4.50.1"
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.50.1.tgz#066e92eb22ea30560414ec800a6d119ba0b435ac"
integrity sha512-p/LaFyajPN/0PUHjv8TNyxLiA7RwmDoVY3flXHPSzqrGcIp/c2FjwPPP5++u87DGHtw+5kSH5bCJz0mvXngYxw==
"@rollup/rollup-linux-arm64-gnu@4.50.0":
version "4.50.0"
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.50.0.tgz#0e7e1fe7241e3384f6c6b4ccdbcfa8ad8c78b869"
integrity sha512-1EhkSvUQXJsIhk4msxP5nNAUWoB4MFDHhtc4gAYvnqoHlaL9V3F37pNHabndawsfy/Tp7BPiy/aSa6XBYbaD1g==
"@rollup/rollup-linux-arm64-gnu@4.50.1":
version "4.50.1"
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.50.1.tgz#480d518ea99a8d97b2a174c46cd55164f138cc37"
integrity sha512-2AbMhFFkTo6Ptna1zO7kAXXDLi7H9fGTbVaIq2AAYO7yzcAsuTNWPHhb2aTA6GPiP+JXh85Y8CiS54iZoj4opw==
"@rollup/rollup-linux-arm64-musl@4.50.0":
version "4.50.0"
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.50.0.tgz#5d421f2f3e4a84786c4dfd9ce97e595c9b59e7f4"
integrity sha512-EtBDIZuDtVg75xIPIK1l5vCXNNCIRM0OBPUG+tbApDuJAy9mKago6QxX+tfMzbCI6tXEhMuZuN1+CU8iDW+0UQ==
"@rollup/rollup-linux-arm64-musl@4.50.1":
version "4.50.1"
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.50.1.tgz#ed7db3b8999b60dd20009ddf71c95f3af49423c8"
integrity sha512-Cgef+5aZwuvesQNw9eX7g19FfKX5/pQRIyhoXLCiBOrWopjo7ycfB292TX9MDcDijiuIJlx1IzJz3IoCPfqs9w==
"@rollup/rollup-linux-loongarch64-gnu@4.50.0":
version "4.50.0"
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.50.0.tgz#a0fb5c7d0e88319e18acfd9436f19ee39354b027"
integrity sha512-BGYSwJdMP0hT5CCmljuSNx7+k+0upweM2M4YGfFBjnFSZMHOLYR0gEEj/dxyYJ6Zc6AiSeaBY8dWOa11GF/ppQ==
"@rollup/rollup-linux-loongarch64-gnu@4.50.1":
version "4.50.1"
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.50.1.tgz#16a6927a35f5dbc505ff874a4e1459610c0c6f46"
integrity sha512-RPhTwWMzpYYrHrJAS7CmpdtHNKtt2Ueo+BlLBjfZEhYBhK00OsEqM08/7f+eohiF6poe0YRDDd8nAvwtE/Y62Q==
"@rollup/rollup-linux-ppc64-gnu@4.50.0":
version "4.50.0"
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.50.0.tgz#a65b598af12f25210c3295da551a6e3616ea488d"
integrity sha512-I1gSMzkVe1KzAxKAroCJL30hA4DqSi+wGc5gviD0y3IL/VkvcnAqwBf4RHXHyvH66YVHxpKO8ojrgc4SrWAnLg==
"@rollup/rollup-linux-ppc64-gnu@4.50.1":
version "4.50.1"
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.50.1.tgz#a006700469be0041846c45b494c35754e6a04eea"
integrity sha512-eSGMVQw9iekut62O7eBdbiccRguuDgiPMsw++BVUg+1K7WjZXHOg/YOT9SWMzPZA+w98G+Fa1VqJgHZOHHnY0Q==
"@rollup/rollup-linux-riscv64-gnu@4.50.0":
version "4.50.0"
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.50.0.tgz#10ba776214ae2857c5bf4389690dabb2fbaf7d98"
integrity sha512-bSbWlY3jZo7molh4tc5dKfeSxkqnf48UsLqYbUhnkdnfgZjgufLS/NTA8PcP/dnvct5CCdNkABJ56CbclMRYCA==
"@rollup/rollup-linux-riscv64-gnu@4.50.1":
version "4.50.1"
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.50.1.tgz#0fcc45b2ec8a0e54218ca48849ea6d596f53649c"
integrity sha512-S208ojx8a4ciIPrLgazF6AgdcNJzQE4+S9rsmOmDJkusvctii+ZvEuIC4v/xFqzbuP8yDjn73oBlNDgF6YGSXQ==
"@rollup/rollup-linux-riscv64-musl@4.50.0":
version "4.50.0"
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.50.0.tgz#c2a46cbaa329d5f21e5808f5a66bb9c78cf68aac"
integrity sha512-LSXSGumSURzEQLT2e4sFqFOv3LWZsEF8FK7AAv9zHZNDdMnUPYH3t8ZlaeYYZyTXnsob3htwTKeWtBIkPV27iQ==
"@rollup/rollup-linux-riscv64-musl@4.50.1":
version "4.50.1"
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.50.1.tgz#d6e617eec9fe6f5859ee13fad435a16c42b469f2"
integrity sha512-3Ag8Ls1ggqkGUvSZWYcdgFwriy2lWo+0QlYgEFra/5JGtAd6C5Hw59oojx1DeqcA2Wds2ayRgvJ4qxVTzCHgzg==
"@rollup/rollup-linux-s390x-gnu@4.50.0":
version "4.50.0"
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.50.0.tgz#a07447be069d64462e30c66611be20c4513963ed"
integrity sha512-CxRKyakfDrsLXiCyucVfVWVoaPA4oFSpPpDwlMcDFQvrv3XY6KEzMtMZrA+e/goC8xxp2WSOxHQubP8fPmmjOQ==
"@rollup/rollup-linux-s390x-gnu@4.50.1":
version "4.50.1"
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.50.1.tgz#b147760d63c6f35b4b18e6a25a2a760dd3ea0c05"
integrity sha512-t9YrKfaxCYe7l7ldFERE1BRg/4TATxIg+YieHQ966jwvo7ddHJxPj9cNFWLAzhkVsbBvNA4qTbPVNsZKBO4NSg==
"@rollup/rollup-linux-x64-gnu@4.50.0":
version "4.50.0"
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.50.0.tgz#8887c58bd51242754ae9c56947d6e883332dcc74"
integrity sha512-8PrJJA7/VU8ToHVEPu14FzuSAqVKyo5gg/J8xUerMbyNkWkO9j2ExBho/68RnJsMGNJq4zH114iAttgm7BZVkA==
"@rollup/rollup-linux-x64-gnu@4.50.1":
version "4.50.1"
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.50.1.tgz#fc0be1da374f85e7e85dccaf1ff12d7cfc9fbe3d"
integrity sha512-MCgtFB2+SVNuQmmjHf+wfI4CMxy3Tk8XjA5Z//A0AKD7QXUYFMQcns91K6dEHBvZPCnhJSyDWLApk40Iq/H3tA==
"@rollup/rollup-linux-x64-musl@4.50.0":
version "4.50.0"
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.50.0.tgz#6403fda72a2b3b9fbbeeff93d14f1c45ef9775f3"
integrity sha512-SkE6YQp+CzpyOrbw7Oc4MgXFvTw2UIBElvAvLCo230pyxOLmYwRPwZ/L5lBe/VW/qT1ZgND9wJfOsdy0XptRvw==
"@rollup/rollup-linux-x64-musl@4.50.1":
version "4.50.1"
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.50.1.tgz#54c79932e0f9a3c992b034c82325be3bcde0d067"
integrity sha512-nEvqG+0jeRmqaUMuwzlfMKwcIVffy/9KGbAGyoa26iu6eSngAYQ512bMXuqqPrlTyfqdlB9FVINs93j534UJrg==
"@rollup/rollup-openharmony-arm64@4.50.0":
version "4.50.0"
resolved "https://registry.yarnpkg.com/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.50.0.tgz#52809afccaff47e731b965a0c16e5686be819d5f"
integrity sha512-PZkNLPfvXeIOgJWA804zjSFH7fARBBCpCXxgkGDRjjAhRLOR8o0IGS01ykh5GYfod4c2yiiREuDM8iZ+pVsT+Q==
"@rollup/rollup-openharmony-arm64@4.50.1":
version "4.50.1"
resolved "https://registry.yarnpkg.com/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.50.1.tgz#fc48e74d413623ac02c1d521bec3e5e784488fdc"
integrity sha512-RDsLm+phmT3MJd9SNxA9MNuEAO/J2fhW8GXk62G/B4G7sLVumNFbRwDL6v5NrESb48k+QMqdGbHgEtfU0LCpbA==
"@rollup/rollup-win32-arm64-msvc@4.50.0":
version "4.50.0"
resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.50.0.tgz#23fe00ddbb40b27a3889bc1e99e6310d97353ad5"
integrity sha512-q7cIIdFvWQoaCbLDUyUc8YfR3Jh2xx3unO8Dn6/TTogKjfwrax9SyfmGGK6cQhKtjePI7jRfd7iRYcxYs93esg==
"@rollup/rollup-win32-arm64-msvc@4.50.1":
version "4.50.1"
resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.50.1.tgz#8ce3d1181644406362cf1e62c90e88ab083e02bb"
integrity sha512-hpZB/TImk2FlAFAIsoElM3tLzq57uxnGYwplg6WDyAxbYczSi8O2eQ+H2Lx74504rwKtZ3N2g4bCUkiamzS6TQ==
"@rollup/rollup-win32-ia32-msvc@4.50.0":
version "4.50.0"
resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.50.0.tgz#520b588076b593413d919912d69dfd5728a1f305"
integrity sha512-XzNOVg/YnDOmFdDKcxxK410PrcbcqZkBmz+0FicpW5jtjKQxcW1BZJEQOF0NJa6JO7CZhett8GEtRN/wYLYJuw==
"@rollup/rollup-win32-ia32-msvc@4.50.1":
version "4.50.1"
resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.50.1.tgz#dd2dfc896eac4b2689d55f01c6d51c249263f805"
integrity sha512-SXjv8JlbzKM0fTJidX4eVsH+Wmnp0/WcD8gJxIZyR6Gay5Qcsmdbi9zVtnbkGPG8v2vMR1AD06lGWy5FLMcG7A==
"@rollup/rollup-win32-x64-msvc@4.50.0":
version "4.50.0"
resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.50.0.tgz#d81efe6a12060c7feddf9805e2a94c3ab0679f48"
integrity sha512-xMmiWRR8sp72Zqwjgtf3QbZfF1wdh8X2ABu3EaozvZcyHJeU0r+XAnXdKgs4cCAp6ORoYoCygipYP1mjmbjrsg==
"@rollup/rollup-win32-x64-msvc@4.50.1":
version "4.50.1"
resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.50.1.tgz#13f758c97b9fbbac56b6928547a3ff384e7cfb3e"
integrity sha512-StxAO/8ts62KZVRAm4JZYq9+NqNsV7RvimNK+YM7ry//zebEH6meuugqW/P5OFUCjyQgui+9fUxT6d5NShvMvA==
"@surma/rollup-plugin-off-main-thread@^2.2.3":
version "2.2.3"
@@ -1549,9 +1549,9 @@
integrity sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==
"@vite-pwa/assets-generator@^1.0.0":
version "1.0.0"
resolved "https://registry.yarnpkg.com/@vite-pwa/assets-generator/-/assets-generator-1.0.0.tgz#d5764f633464ce3a437d79d48f6f2e0680d35226"
integrity sha512-tWRF/tsqGkND5+dDVnJz7DzQkIRjtTRRYvA3y6l4FwTwK47OK72p1X7ResSz6T7PimIZMuFd+arsB8NRIG+Sww==
version "1.0.1"
resolved "https://registry.yarnpkg.com/@vite-pwa/assets-generator/-/assets-generator-1.0.1.tgz#89338aa471f8f2b3761cc21e4ba9c4f71ab7147f"
integrity sha512-p2KHvsyuv/njmLSwDjpok0CFYKmAdV5ckWjVSxktNXbKAuHX3+WCTy4X3LuwWl0RGsCWBPerSUVNvE/02D565w==
dependencies:
cac "^6.7.14"
colorette "^2.0.20"
@@ -2138,9 +2138,9 @@ ejs@^3.1.6:
jake "^10.8.5"
electron-to-chromium@^1.5.211:
version "1.5.214"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.214.tgz#f7bbdc0796124292d4b8a34a49e968c5e6430763"
integrity sha512-TpvUNdha+X3ybfU78NoQatKvQEm1oq3lf2QbnmCEdw+Bd9RuIAY+hJTvq1avzHM0f7EJfnH3vbCnbzKzisc/9Q==
version "1.5.215"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.215.tgz#200c8d69b1270af6126837b6b1f95077c3a347b1"
integrity sha512-TIvGp57UpeNetj/wV/xpFNpWGb0b/ROw372lHPx5Aafx02gjTBtWnEEcaSX3W2dLM3OSdGGyHX/cHl01JQsLaQ==
entities@^4.5.0:
version "4.5.0"
@@ -2310,7 +2310,7 @@ fast-uri@^3.0.1:
resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.1.0.tgz#66eecff6c764c0df9b762e62ca7edcfb53b4edfa"
integrity sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==
fdir@^6.4.4, fdir@^6.5.0:
fdir@^6.5.0:
version "6.5.0"
resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.5.0.tgz#ed2ab967a331ade62f18d077dae192684d50d350"
integrity sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==
@@ -2862,9 +2862,9 @@ magic-string@^0.25.0, magic-string@^0.25.7:
sourcemap-codec "^1.4.8"
magic-string@^0.30.18:
version "0.30.18"
resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.18.tgz#905bfbbc6aa5692703a93db26a9edcaa0007d2bb"
integrity sha512-yi8swmWbO17qHhwIBNeeZxTceJMeBvWJaId6dyvTSOwTipqeHhMhOrz6513r1sOKnpvQ7zkhlG8tPrpilwTxHQ==
version "0.30.19"
resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.19.tgz#cebe9f104e565602e5d2098c5f2e79a77cc86da9"
integrity sha512-2N21sPY9Ws53PZvsEpVtNuSW+ScYbQdp4b9qUaL+9QkHUrGFKo56Lg9Emg5s9V/qrtNBmiR01sYhUOwu3H+VOw==
dependencies:
"@jridgewell/sourcemap-codec" "^1.5.5"
@@ -3162,33 +3162,33 @@ rollup@^2.43.1:
fsevents "~2.3.2"
rollup@^4.43.0:
version "4.50.0"
resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.50.0.tgz#6f237f598b7163ede33ce827af8534c929aaa186"
integrity sha512-/Zl4D8zPifNmyGzJS+3kVoyXeDeT/GrsJM94sACNg9RtUE0hrHa1bNPtRSrfHTMH5HjRzce6K7rlTh3Khiw+pw==
version "4.50.1"
resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.50.1.tgz#6f0717c34aacc65cc727eeaaaccc2afc4e4485fd"
integrity sha512-78E9voJHwnXQMiQdiqswVLZwJIzdBKJ1GdI5Zx6XwoFKUIk09/sSrr+05QFzvYb8q6Y9pPV45zzDuYa3907TZA==
dependencies:
"@types/estree" "1.0.8"
optionalDependencies:
"@rollup/rollup-android-arm-eabi" "4.50.0"
"@rollup/rollup-android-arm64" "4.50.0"
"@rollup/rollup-darwin-arm64" "4.50.0"
"@rollup/rollup-darwin-x64" "4.50.0"
"@rollup/rollup-freebsd-arm64" "4.50.0"
"@rollup/rollup-freebsd-x64" "4.50.0"
"@rollup/rollup-linux-arm-gnueabihf" "4.50.0"
"@rollup/rollup-linux-arm-musleabihf" "4.50.0"
"@rollup/rollup-linux-arm64-gnu" "4.50.0"
"@rollup/rollup-linux-arm64-musl" "4.50.0"
"@rollup/rollup-linux-loongarch64-gnu" "4.50.0"
"@rollup/rollup-linux-ppc64-gnu" "4.50.0"
"@rollup/rollup-linux-riscv64-gnu" "4.50.0"
"@rollup/rollup-linux-riscv64-musl" "4.50.0"
"@rollup/rollup-linux-s390x-gnu" "4.50.0"
"@rollup/rollup-linux-x64-gnu" "4.50.0"
"@rollup/rollup-linux-x64-musl" "4.50.0"
"@rollup/rollup-openharmony-arm64" "4.50.0"
"@rollup/rollup-win32-arm64-msvc" "4.50.0"
"@rollup/rollup-win32-ia32-msvc" "4.50.0"
"@rollup/rollup-win32-x64-msvc" "4.50.0"
"@rollup/rollup-android-arm-eabi" "4.50.1"
"@rollup/rollup-android-arm64" "4.50.1"
"@rollup/rollup-darwin-arm64" "4.50.1"
"@rollup/rollup-darwin-x64" "4.50.1"
"@rollup/rollup-freebsd-arm64" "4.50.1"
"@rollup/rollup-freebsd-x64" "4.50.1"
"@rollup/rollup-linux-arm-gnueabihf" "4.50.1"
"@rollup/rollup-linux-arm-musleabihf" "4.50.1"
"@rollup/rollup-linux-arm64-gnu" "4.50.1"
"@rollup/rollup-linux-arm64-musl" "4.50.1"
"@rollup/rollup-linux-loongarch64-gnu" "4.50.1"
"@rollup/rollup-linux-ppc64-gnu" "4.50.1"
"@rollup/rollup-linux-riscv64-gnu" "4.50.1"
"@rollup/rollup-linux-riscv64-musl" "4.50.1"
"@rollup/rollup-linux-s390x-gnu" "4.50.1"
"@rollup/rollup-linux-x64-gnu" "4.50.1"
"@rollup/rollup-linux-x64-musl" "4.50.1"
"@rollup/rollup-openharmony-arm64" "4.50.1"
"@rollup/rollup-win32-arm64-msvc" "4.50.1"
"@rollup/rollup-win32-ia32-msvc" "4.50.1"
"@rollup/rollup-win32-x64-msvc" "4.50.1"
fsevents "~2.3.2"
safe-array-concat@^1.1.3:
@@ -3557,13 +3557,13 @@ terser@^5.17.4:
commander "^2.20.0"
source-map-support "~0.5.20"
tinyglobby@^0.2.10, tinyglobby@^0.2.14:
version "0.2.14"
resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.14.tgz#5280b0cf3f972b050e74ae88406c0a6a58f4079d"
integrity sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==
tinyglobby@^0.2.10, tinyglobby@^0.2.15:
version "0.2.15"
resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.15.tgz#e228dd1e638cea993d2fdb4fcd2d4602a79951c2"
integrity sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==
dependencies:
fdir "^6.4.4"
picomatch "^4.0.2"
fdir "^6.5.0"
picomatch "^4.0.3"
to-data-view@^1.1.0:
version "1.1.0"
@@ -3683,9 +3683,9 @@ unicode-match-property-ecmascript@^2.0.0:
unicode-property-aliases-ecmascript "^2.0.0"
unicode-match-property-value-ecmascript@^2.1.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.0.tgz#a0401aee72714598f739b68b104e4fe3a0cb3c71"
integrity sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg==
version "2.2.1"
resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.1.tgz#65a7adfad8574c219890e219285ce4c64ed67eaa"
integrity sha512-JQ84qTuMg4nVkx8ga4A16a1epI9H6uTXAknqxkGF/aFfRLw1xC/Bp24HNLaZhHSkWd3+84t8iXnp1J0kYcZHhg==
unicode-property-aliases-ecmascript@^2.0.0:
version "2.1.0"
@@ -3729,16 +3729,16 @@ vite-plugin-pwa@^1.0.0:
workbox-window "^7.3.0"
vite@^7.1.4:
version "7.1.4"
resolved "https://registry.yarnpkg.com/vite/-/vite-7.1.4.tgz#354944affb55e1aff0157406b74e0d0a3232df9a"
integrity sha512-X5QFK4SGynAeeIt+A7ZWnApdUyHYm+pzv/8/A57LqSGcI88U6R6ipOs3uCesdc6yl7nl+zNO0t8LmqAdXcQihw==
version "7.1.5"
resolved "https://registry.yarnpkg.com/vite/-/vite-7.1.5.tgz#4dbcb48c6313116689be540466fc80faa377be38"
integrity sha512-4cKBO9wR75r0BeIWWWId9XK9Lj6La5X846Zw9dFfzMRw38IlTk2iCcUt6hsyiDRcPidc55ZParFYDXi0nXOeLQ==
dependencies:
esbuild "^0.25.0"
fdir "^6.5.0"
picomatch "^4.0.3"
postcss "^8.5.6"
rollup "^4.43.0"
tinyglobby "^0.2.14"
tinyglobby "^0.2.15"
optionalDependencies:
fsevents "~2.3.3"