Merge pull request #92 from Spythere/development

v1.24.4
hotfix: detecting user timetable status at checkpoints
2026-05-03 13:28:11 +00:00 · 2024-05-30 14:38:04 +02:00 · 2024-05-30 14:29:09 +02:00 · 2024-05-30 14:24:18 +02:00 · 2024-05-26 01:44:45 +02:00 · 2024-05-25 18:06:01 +02:00
164 changed files with 25098 additions and 34410 deletions
@@ -0,0 +1,17 @@
+on:
+  release:
+    types: [published]
+
+jobs:
+  github-releases-to-discord:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Github Releases To Discord
+        uses: SethCohen/github-releases-to-discord@v1.13.1
+        with:
+          webhook_url: ${{ secrets.WEBHOOK_URL }}
+          color: "15844367"
+          footer_title: "Changelog - Stacjownik"
+          footer_timestamp: true
@@ -1,11 +1,14 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="pl">
  <head>
    <meta charset="utf-8" />
    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
    <meta name="viewport" content="width=device-width,initial-scale=1.0" />

-    <meta name="keywords" content="Stacjownik, TD2, Train Driver 2, stacjownik-td2, stacjownik, td2.info.pl" />
+    <meta
+      name="keywords"
+      content="Stacjownik, TD2, Train Driver 2, stacjownik-td2, stacjownik, td2.info.pl"
+    />
    <meta name="description" content="Pomocnik maszynisty i dyżurnego symulatora Train Driver 2" />

    <title>Stacjownik</title>
@@ -18,10 +21,6 @@
    <meta name="msapplication-TileColor" content="#da532c" />
    <meta name="theme-color" content="#222222" />

-    <link rel="icon" href="favicon-64.png" sizes="64x64" type="image/png" />
-    <link rel="icon" href="favicon-62.png" sizes="62x62" type="image/png" />
-    <link rel="icon" href="favicon-32.png" sizes="32x32" type="image/png" />
-    <link rel="icon" href="favicon-16.png" sizes="16x16" type="image/png" />
    <link rel="icon" href="favicon.ico" />

    <!-- Static OpenGraph meta -->
@@ -29,18 +28,28 @@
    <meta property="og:url" content="https://stacjownik-td2.web.app/" />
    <meta property="og:type" content="website" />
    <meta property="og:title" content="Stacjownik" />
-    <meta 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: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" />

    <meta name="twitter:card" content="summary_large_image" />
    <meta name="twitter:title" content="Stacjownik" />
-    <meta name="twitter:description" content="Pomocnik maszynisty i dyżurnego symulatora Train Driver 2" />
-    <meta name="twitter:image" content="https://raw.githubusercontent.com/Spythere/api/main/thumbnails/stacjownik.jpg" />
-
-    <link href="https://fonts.googleapis.com/css2?family=Quicksand:wght@500;700&display=swap" rel="stylesheet" />
+    <meta
+      name="twitter:description"
+      content="Pomocnik maszynisty i dyżurnego symulatora Train Driver 2"
+    />
+    <meta
+      name="twitter:image"
+      content="https://raw.githubusercontent.com/Spythere/api/main/thumbnails/stacjownik.jpg"
+    />
  </head>

  <body>
@@ -1,6 +1,6 @@
 {
  "name": "stacjownik",
-  "version": "1.18.1",
+  "version": "1.24.4",
  "private": true,
  "scripts": {
    "dev": "vite",
@@ -14,31 +14,30 @@
  "dependencies": {
    "core-js": "^3.32.2",
    "dotenv": "^16.3.1",
-    "firebase": "^10.4.0",
-    "howler": "^2.2.4",
    "pinia": "^2.1.6",
    "sass": "^1.67.0",
-    "socket.io-client": "^4.7.2",
+    "showdown": "^2.1.0",
    "vue": "^3.3.4",
    "vue-i18n": "^9.4.1",
    "vue-router": "^4.2.4"
  },
  "devDependencies": {
+    "@rushstack/eslint-patch": "^1.3.3",
    "@types/node": "^20.6.2",
-    "@vite-pwa/assets-generator": "^0.0.10",
+    "@types/showdown": "^2.0.6",
+    "@vite-pwa/assets-generator": "^0.2.4",
    "@vitejs/plugin-vue": "^4.3.4",
-    "axios": "^1.5.0",
-    "prettier": "^3.0.3",
-    "typescript": "^5.2.2",
-    "vite": "^4.4.9",
-    "vite-plugin-pwa": "^0.16.5",
-    "vue-tsc": "^1.8.11",
    "@vue/eslint-config-prettier": "^8.0.0",
    "@vue/eslint-config-typescript": "^12.0.0",
    "@vue/tsconfig": "^0.4.0",
+    "axios": "^1.5.0",
    "eslint": "^8.49.0",
    "eslint-plugin-vue": "^9.17.0",
-    "@rushstack/eslint-patch": "^1.3.3"
+    "prettier": "^3.0.3",
+    "typescript": "^5.2.2",
+    "vite": "^4.4.9",
+    "vite-plugin-pwa": "^0.20.0",
+    "vue-tsc": "^1.8.11"
  },
  "browserslist": [
    "> 1%",
@@ -0,0 +1,4 @@
+<svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="60" height="60" fill="#898989"/>
+<path d="M10.5573 31.3793L9.43741 28.0694C9.35445 27.8592 9.26596 27.6131 9.17195 27.3311C9.07793 27.0435 8.98391 26.7338 8.8899 26.402C8.80694 26.7393 8.71845 27.0518 8.62444 27.3394C8.53042 27.6269 8.44193 27.8758 8.35898 28.086L7.24736 31.3793H10.5573ZM15.0121 36H12.8386C12.5953 36 12.3989 35.9447 12.2496 35.8341C12.1003 35.7179 11.9869 35.5714 11.9095 35.3944L11.1961 33.2873H6.6003L5.88688 35.3944C5.82604 35.5493 5.71544 35.6903 5.55505 35.8175C5.4002 35.9392 5.20664 36 4.97436 36H2.78431L7.46305 23.9133H10.3333L15.0121 36ZM22.643 26.3688C22.5601 26.5015 22.4716 26.6011 22.3775 26.6674C22.2891 26.7338 22.1729 26.767 22.0291 26.767C21.9019 26.767 21.7637 26.7283 21.6143 26.6508C21.4706 26.5679 21.3046 26.4766 21.1166 26.3771C20.9341 26.2775 20.724 26.189 20.4861 26.1116C20.2483 26.0287 19.9773 25.9872 19.6732 25.9872C19.1478 25.9872 18.7551 26.1006 18.4952 26.3273C18.2408 26.5485 18.1136 26.8499 18.1136 27.2315C18.1136 27.4749 18.191 27.6767 18.3459 27.8371C18.5007 27.9975 18.7026 28.1357 18.9515 28.2519C19.2059 28.368 19.4934 28.4759 19.8142 28.5754C20.1405 28.6694 20.4723 28.7773 20.8097 28.8989C21.147 29.0151 21.4761 29.1533 21.7969 29.3137C22.1231 29.4741 22.4107 29.6787 22.6596 29.9276C22.914 30.1765 23.1186 30.4806 23.2735 30.8401C23.4283 31.1941 23.5058 31.6227 23.5058 32.1259C23.5058 32.6845 23.409 33.2071 23.2154 33.6938C23.0218 34.1805 22.7398 34.6063 22.3693 34.9713C22.0042 35.3308 21.5508 35.6156 21.0088 35.8258C20.4723 36.0304 19.8612 36.1327 19.1754 36.1327C18.7994 36.1327 18.415 36.094 18.0223 36.0166C17.6352 35.9392 17.2591 35.8313 16.8941 35.6931C16.5291 35.5493 16.1862 35.3806 15.8655 35.187C15.5447 34.9935 15.2654 34.7778 15.0276 34.54L15.8572 33.2293C15.9235 33.1352 16.0093 33.0578 16.1143 32.997C16.225 32.9306 16.3439 32.8974 16.4711 32.8974C16.637 32.8974 16.8029 32.95 16.9688 33.0551C17.1402 33.1601 17.331 33.2763 17.5412 33.4035C17.7569 33.5307 18.003 33.6468 18.2795 33.7519C18.556 33.857 18.8823 33.9095 19.2584 33.9095C19.7672 33.9095 20.1626 33.7989 20.4447 33.5777C20.7267 33.3509 20.8677 32.9942 20.8677 32.5075C20.8677 32.2255 20.7903 31.996 20.6355 31.819C20.4806 31.642 20.276 31.4955 20.0216 31.3793C19.7727 31.2632 19.4879 31.1609 19.1671 31.0724C18.8464 30.9839 18.5173 30.8871 18.18 30.7821C17.8426 30.6714 17.5135 30.5387 17.1928 30.3839C16.872 30.2235 16.5844 30.0161 16.33 29.7617C16.0812 29.5018 15.8793 29.181 15.7245 28.7994C15.5696 28.4123 15.4922 27.9367 15.4922 27.3725C15.4922 26.9191 15.5834 26.4766 15.7659 26.0452C15.9484 25.6139 16.2167 25.2295 16.5706 24.8922C16.9246 24.5548 17.3587 24.2866 17.873 24.0875C18.3874 23.8829 18.9763 23.7805 19.64 23.7805C20.0105 23.7805 20.37 23.811 20.7184 23.8718C21.0724 23.9271 21.407 24.0128 21.7222 24.129C22.0374 24.2396 22.3305 24.3751 22.6015 24.5354C22.8781 24.6903 23.1242 24.8673 23.3398 25.0664L22.643 26.3688ZM36.1186 29.9525C36.1186 30.8263 35.9665 31.6337 35.6623 32.3748C35.3637 33.1104 34.9406 33.7491 34.3931 34.2911C33.8456 34.8276 33.1847 35.2479 32.4105 35.552C31.6417 35.8507 30.7873 36 29.8471 36H25.1518V23.9133H29.8471C30.7873 23.9133 31.6417 24.0654 32.4105 24.3695C33.1847 24.6737 33.8456 25.094 34.3931 25.6305C34.9406 26.1669 35.3637 26.8057 35.6623 27.5468C35.9665 28.2823 36.1186 29.0842 36.1186 29.9525ZM33.2483 29.9525C33.2483 29.3552 33.1709 28.816 33.016 28.3348C32.8612 27.8537 32.6372 27.4472 32.3441 27.1154C32.0565 26.778 31.7026 26.5209 31.2823 26.3439C30.8619 26.1614 30.3836 26.0701 29.8471 26.0701H27.9723V33.8431H29.8471C30.3836 33.8431 30.8619 33.7547 31.2823 33.5777C31.7026 33.3952 32.0565 33.138 32.3441 32.8062C32.6372 32.4688 32.8612 32.0596 33.016 31.5784C33.1709 31.0973 33.2483 30.5553 33.2483 29.9525ZM40.594 26.0701V28.8906H44.3934V30.9646H40.594V33.8431H45.5547V36H37.7735V23.9133H45.5547V26.0701H40.594ZM50.0882 28.8077H50.5361C50.9509 28.8077 51.2496 28.6777 51.4321 28.4178L54.153 24.4691C54.3134 24.2589 54.4849 24.1151 54.6674 24.0377C54.8554 23.9547 55.0877 23.9133 55.3642 23.9133H57.8031L54.2194 28.7994C53.965 29.1368 53.6912 29.3801 53.3981 29.5294C53.6083 29.6068 53.7991 29.7147 53.9705 29.8529C54.142 29.9912 54.3024 30.1709 54.4517 30.3922L58.1018 36H55.5965C55.4361 36 55.2978 35.9889 55.1817 35.9668C55.0711 35.9447 54.9743 35.9115 54.8913 35.8673C54.8084 35.823 54.7365 35.7705 54.6757 35.7097C54.6148 35.6433 54.5568 35.5686 54.5015 35.4857L51.7639 31.2798C51.6643 31.1249 51.5371 31.0171 51.3823 30.9563C51.233 30.8899 51.0284 30.8567 50.7684 30.8567H50.0882V36H47.2843V23.9133H50.0882V28.8077Z" fill="white"/>
+</svg>
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Warstwa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 159 38.8" style="enable-background:new 0 0 159 38.8;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#00A962;}
+	.st1{enable-background:new    ;}
+	.st2{fill:#FFFFFF;}
+	.st3{fill:#1E3A33;}
+	.st4{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+</style>
+<path class="st0" d="M139.6,38.7H19.4C8.7,38.7,0,30.1,0,19.3l0,0C0,8.6,8.7-0.1,19.4-0.1h120.2c10.7,0,19.4,8.7,19.4,19.4l0,0
+	C159,30.1,150.3,38.7,139.6,38.7z"/>
+<g class="st1">
+	<path class="st2" d="M48.9,23.7c0,0.5-0.4,0.9-0.9,0.9c-0.5,0-0.9-0.4-0.9-0.9v-9.9c0-0.6,0.4-1,1-1h3.7c2.5,0,3.6,1.9,3.6,3.7
+		s-1,3.7-3.6,3.7h-2.9V23.7z M48.9,14.5v4.1h2.8c1.3,0,1.9-1,1.9-2c0-1-0.5-2.1-1.8-2.1H48.9z"/>
+	<path class="st2" d="M56.3,20.5c0-2.5,1.9-4.1,4.1-4.1c2.3,0,4.2,1.6,4.2,4.1c0,2.5-1.9,4.2-4.2,4.2C58.2,24.7,56.3,23,56.3,20.5z
+		 M62.9,20.5c0-1.5-1.1-2.4-2.4-2.4c-1.3,0-2.4,1-2.4,2.4c0,1.5,1.1,2.5,2.4,2.5C61.8,23,62.9,22,62.9,20.5z"/>
+	<path class="st2" d="M66.6,21.9c0.4-0.2,0.7,0.1,0.9,0.3c0.3,0.6,0.9,1,1.7,1c0.8,0,1.4-0.4,1.4-1c0-0.5-0.5-0.7-1.1-0.9l-1.1-0.3
+		c-1.7-0.5-2.3-1.4-2.2-2.7c0.1-1.2,1.4-2.1,2.8-2.1c1.1,0,2,0.3,2.5,1.2c0.2,0.4,0.1,0.8-0.2,1c-0.3,0.2-0.6,0.2-1-0.1
+		c-0.4-0.4-1-0.5-1.4-0.5c-0.4,0-0.9,0.2-1.1,0.4c-0.1,0.2-0.2,0.4-0.1,0.7c0.1,0.3,0.6,0.5,1,0.6l1.2,0.3c1.7,0.4,2.1,1.5,2.1,2.3
+		c0,1.5-1.3,2.4-3.2,2.4c-1.2,0-2.5-0.6-2.9-1.8C66,22.5,66.2,22.1,66.6,21.9z"/>
+	<path class="st2" d="M74.6,18h-0.8c-0.4,0-0.7-0.3-0.7-0.7c0-0.4,0.3-0.7,0.7-0.7h0.8v-2.2c0-0.5,0.4-0.9,0.9-0.9
+		c0.5,0,0.9,0.4,0.9,0.9v2.2h1c0.4,0,0.7,0.3,0.7,0.7c0,0.4-0.3,0.7-0.7,0.7h-1v5.7c0,0.5-0.4,0.9-0.9,0.9c-0.5,0-0.9-0.4-0.9-0.9
+		V18z"/>
+	<path class="st2" d="M85.7,23.4c-0.5,0.9-1.7,1.3-2.7,1.3c-2.1,0-4-1.6-4-4.1c0-2.5,1.9-4.1,4-4.1c1,0,2.1,0.4,2.7,1.3v-0.3
+		c0-0.5,0.4-0.9,0.9-0.9c0.5,0,0.9,0.4,0.9,0.9v6.3c0,0.5-0.4,0.9-0.9,0.9c-0.5,0-0.9-0.4-0.9-0.9V23.4z M83.2,23
+		c1.3,0,2.4-0.9,2.4-2.5c0-1.6-1.3-2.4-2.4-2.4c-1.3,0-2.4,1-2.4,2.4C80.8,22,81.9,23,83.2,23z"/>
+	<path class="st2" d="M95.1,16.6c0.5,0,0.9,0.3,1,0.8l1.6,4.6l1.7-4.8c0.2-0.5,0.6-0.7,1.1-0.6c0.5,0.1,0.7,0.6,0.6,1.1l-2.4,6.3
+		c-0.2,0.5-0.5,0.7-0.9,0.7h-0.1c-0.4,0-0.7-0.2-0.9-0.7L95.1,19l-1.7,4.9c-0.2,0.5-0.5,0.7-0.9,0.7h-0.1c-0.4,0-0.7-0.2-0.9-0.7
+		l-2.4-6.3c-0.2-0.4,0.1-1,0.6-1.1c0.5-0.1,0.9,0.1,1.1,0.6l1.7,4.8l1.6-4.6C94.2,16.8,94.6,16.6,95.1,16.6L95.1,16.6z"/>
+	<path class="st2" d="M112.9,23.2c0.3,0.3,0.3,0.9,0,1.2c-0.4,0.3-0.9,0.3-1.2,0l-3.2-3.5v2.9c0,0.5-0.4,0.9-0.9,0.9
+		c-0.5,0-0.8-0.4-0.8-0.9V13.1c0-0.5,0.4-0.9,0.8-0.9c0.5,0,0.9,0.4,0.9,0.9v6.1l2.4-2.4c0.3-0.3,0.9-0.3,1.2,0
+		c0.3,0.4,0.3,0.9,0,1.2l-2,2.1L112.9,23.2z"/>
+	<path class="st2" d="M120.8,23.4c-0.5,0.9-1.7,1.3-2.7,1.3c-2.1,0-4-1.6-4-4.1c0-2.5,1.9-4.1,4-4.1c1,0,2.1,0.4,2.7,1.3v-0.3
+		c0-0.5,0.4-0.9,0.8-0.9c0.5,0,0.9,0.4,0.9,0.9v6.3c0,0.5-0.4,0.9-0.9,0.9c-0.5,0-0.8-0.4-0.8-0.9V23.4z M118.4,23
+		c1.3,0,2.4-0.9,2.4-2.5c0-1.6-1.3-2.4-2.4-2.4c-1.3,0-2.4,1-2.4,2.4C115.9,22,117,23,118.4,23z"/>
+	<path class="st2" d="M130.3,16.6c0.5,0,0.9,0.3,1,0.8l1.6,4.6l1.7-4.8c0.2-0.5,0.6-0.7,1.1-0.6c0.5,0.1,0.7,0.6,0.6,1.1l-2.4,6.3
+		c-0.2,0.5-0.5,0.7-0.9,0.7h-0.1c-0.4,0-0.7-0.2-0.9-0.7l-1.7-4.9l-1.7,4.9c-0.2,0.5-0.5,0.7-0.9,0.7h-0.1c-0.4,0-0.7-0.2-0.9-0.7
+		l-2.4-6.3c-0.2-0.4,0.1-1,0.6-1.1c0.5-0.1,0.9,0.1,1.1,0.6l1.7,4.8l1.6-4.6C129.3,16.8,129.7,16.6,130.3,16.6L130.3,16.6z"/>
+	<path class="st2" d="M143.6,26.1c0,0.2,0.2,0.5,0.6,0.5c0.1,0,0.4,0,0.5-0.4c0.1-0.4,0.3-0.5,0.7-0.5c0.4,0.1,0.6,0.4,0.5,0.8
+		c-0.2,0.8-0.9,1.4-1.7,1.4c-1.3,0-1.9-0.8-1.9-1.7c0-0.2,0.1-0.6,0.2-0.8l0.5-1c-0.5,0.2-1,0.3-1.6,0.3c-2.3,0-4.1-1.6-4.1-4.2
+		c0-2.5,1.8-4.1,4.1-4.1c2.2,0,3.9,1.5,4,4c0,0.5-0.4,0.8-0.8,0.8h-5.5c0.2,1.2,1.2,2,2.4,2c0.8,0,1.3-0.3,1.9-0.8
+		c0.3-0.2,0.8-0.4,1.1-0.1c0.3,0.3,0.2,0.7,0,1.1C143.5,25.9,143.6,26.1,143.6,26.1z M143.7,19.9c-0.2-1.2-1.1-2-2.3-2
+		c-1.2,0-2.2,0.7-2.3,2H143.7z"/>
+</g>
+<g>
+	<path class="st3" d="M21.6,26.7c-4.9,0-7.4-2.6-8.5-4.9c-1.2-2.4-1.4-5-1.4-6c0-2.2,1.8-3.8,4.3-3.8h7c0.7,0,1.3,0.6,1.3,1.3
+		c0,0.7-0.6,1.3-1.3,1.3h-7c-0.5,0-1,0.1-1.3,0.4c-0.3,0.2-0.4,0.4-0.4,0.8c0,1.9,0.5,8.3,7.3,8.3c5.8,0,7.3-4.6,7.9-8.1
+		c0-0.2,0-0.3,0.1-0.4c0.2-0.9,0.4-1.7,0.8-2.3C31,12.4,31.9,12,33,12c0.5,0,0.9,0.2,1.2,0.5c0.5,0.4,0.9,1.3,1.2,4.1
+		c0.1,1.4,0.1,2.6,0.1,2.7c0,0.7-0.6,1.3-1.3,1.3l0,0c-0.7,0-1.3-0.6-1.3-1.3c0,0,0-1.1-0.1-2.3c-0.1-1-0.2-1.7-0.3-2.1
+		c-0.1,0.3-0.2,0.9-0.3,1.1c0,0.1,0,0.2-0.1,0.4c-0.2,1.2-0.7,3.7-2.1,5.9c-0.8,1.3-1.9,2.3-3.2,3.1C25.4,26.3,23.6,26.7,21.6,26.7z
+		"/>
+	<ellipse class="st4" cx="26.7" cy="13.3" rx="1.3" ry="1.3"/>
+</g>
+</svg>
@@ -0,0 +1,18 @@
+<svg width="256" height="213" viewBox="0 0 256 213" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_1571_41)">
+<path d="M217.048 55.9333L238 80.4039L128 194.6L18 80.4039L38.9524 55.9333L71.6905 18.6H128H184.31L217.048 55.9333Z" fill="#F47FFF"/>
+<path d="M238 80.4039L217.048 55.9333L184.31 18.6M238 80.4039L128 194.6M238 80.4039H164.536M128 194.6L18 80.4039M128 194.6L91.4641 80.4039M128 194.6L164.536 80.4039M184.31 18.6H128M184.31 18.6L164.536 80.4039M18 80.4039L38.9524 55.9333L71.6905 18.6M18 80.4039H91.4641M71.6905 18.6L91.4641 80.4039M71.6905 18.6H128M91.4641 80.4039H128H164.536M91.4641 80.4039L128 18.6M128 18.6L164.536 80.4039" stroke="#ECECEC" stroke-width="7.45763" stroke-linejoin="round"/>
+</g>
+<defs>
+<filter id="filter0_d_1571_41" x="0.367179" y="0.967155" width="255.266" height="211.266" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="6.952"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.956863 0 0 0 0 0.498039 0 0 0 0 1 0 0 0 1 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_1571_41"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_1571_41" result="shape"/>
+</filter>
+</defs>
+</svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="white" width="18px" height="18px"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1.41 16.09V20h-2.67v-1.93c-1.71-.36-3.16-1.46-3.27-3.4h1.96c.1 1.05.82 1.87 2.65 1.87 1.96 0 2.4-.98 2.4-1.59 0-.83-.44-1.61-2.67-2.14-2.48-.6-4.18-1.62-4.18-3.67 0-1.72 1.39-2.84 3.11-3.21V4h2.67v1.95c1.86.45 2.79 1.86 2.85 3.39H14.3c-.05-1.11-.64-1.87-2.22-1.87-1.5 0-2.4.68-2.4 1.64 0 .84.65 1.39 2.67 1.91s4.18 1.39 4.18 3.91c-.01 1.83-1.38 2.83-3.12 3.16z"/></svg>
@@ -1,3 +1 @@
-<svg width="144" height="144" viewBox="0 0 144 144" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M67.4283 9.79351L67.8252 31.2232H79.5983L79.8628 9.79351H67.4283ZM67.8252 110.989L67.4283 132.816H79.8628L79.466 110.989H67.8252ZM91.6359 51.33L103.938 43.7899C102.439 40.527 100.322 37.3963 97.5886 34.3979C94.9429 31.3995 91.5918 28.9303 87.5352 26.9901C83.5667 25.05 78.8046 24.0799 73.2487 24.0799C67.6929 24.0799 62.7103 25.1382 58.3009 27.2547C53.8915 29.3712 50.4081 32.1932 47.8506 35.7207C45.3814 39.2483 44.1467 43.1726 44.1467 47.4938C44.1467 51.9032 44.9404 55.6512 46.5278 58.7378C48.1152 61.8243 50.1435 64.47 52.6128 66.6747C55.082 68.7912 57.6836 70.5549 60.4174 71.9659C63.2394 73.2888 65.7969 74.347 68.0897 75.1407C71.6173 76.4635 74.9243 77.8745 78.0109 79.3737C81.1856 80.8729 83.7431 82.7249 85.6832 84.9296C87.7115 87.0461 88.7257 89.824 88.7257 93.2633C88.7257 95.9089 88.1966 98.2018 87.1383 100.142C86.1683 101.994 84.625 103.405 82.5085 104.375C80.4801 105.345 77.8786 105.83 74.7038 105.83C71.0881 105.83 67.8693 105.08 65.0473 103.581C62.3134 102.082 59.8001 99.9215 57.5072 97.0995C55.2143 94.2775 53.0978 90.8381 51.1577 86.7815L39.12 94.5861C41.0602 99.3483 43.7499 103.581 47.1892 107.285C50.6286 110.989 54.6411 113.943 59.2269 116.148C63.8126 118.265 68.7512 119.323 74.0424 119.323C80.6565 119.323 86.2564 118.265 90.8422 116.148C95.428 113.943 98.9555 110.813 101.425 106.756C103.894 102.699 105.129 97.9814 105.129 92.6019C105.129 88.4571 104.423 84.8414 103.012 81.7548C101.601 78.6682 99.7492 76.0667 97.4563 73.9502C95.1634 71.7455 92.606 69.8935 89.784 68.3943C87.0501 66.8951 84.3604 65.6605 81.7148 64.6904C78.0109 63.2794 74.5275 61.8684 71.2645 60.4574C68.0016 59.0464 65.3559 57.3709 63.3276 55.4307C61.2993 53.4906 60.2851 51.0213 60.2851 48.0229C60.2851 45.7301 60.7261 43.7899 61.6079 42.2025C62.578 40.527 64.0331 39.2483 65.9732 38.3664C68.0016 37.4845 70.559 37.0436 73.6456 37.0436C76.644 37.0436 79.2455 37.705 81.4502 39.0278C83.6549 40.3506 85.5509 42.1144 87.1383 44.319C88.8139 46.4356 90.3131 48.7725 91.6359 51.33Z" fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="white" width="18px" height="18px"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1.41 16.09V20h-2.67v-1.93c-1.71-.36-3.16-1.46-3.27-3.4h1.96c.1 1.05.82 1.87 2.65 1.87 1.96 0 2.4-.98 2.4-1.59 0-.83-.44-1.61-2.67-2.14-2.48-.6-4.18-1.62-4.18-3.67 0-1.72 1.39-2.84 3.11-3.21V4h2.67v1.95c1.86.45 2.79 1.86 2.85 3.39H14.3c-.05-1.11-.64-1.87-2.22-1.87-1.5 0-2.4.68-2.4 1.64 0 .84.65 1.39 2.67 1.91s4.18 1.39 4.18 3.91c-.01 1.83-1.38 2.83-3.12 3.16z"/></svg>
@@ -1,4 +1,4 @@
 <svg width="160" height="150" viewBox="0 0 160 150" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10.163 139L80 12.4204L149.837 139H80H10.163Z" stroke="white" stroke-width="12"/>
-<path d="M85.4488 50.3354V80.6619C85.4488 83.8784 85.2898 87.0418 84.9717 90.1522C84.6536 93.2273 84.2294 96.4968 83.6992 99.9606H74.8451C74.315 96.4968 73.8908 93.2273 73.5727 90.1522C73.2546 87.0418 73.0955 83.8784 73.0955 80.6619V50.3354H85.4488ZM71.0808 119.789C71.0808 118.694 71.2752 117.651 71.664 116.661C72.0882 115.672 72.6537 114.823 73.3606 114.117C74.1029 113.41 74.9689 112.844 75.9585 112.42C76.9482 111.996 78.0086 111.784 79.1396 111.784C80.2354 111.784 81.278 111.996 82.2677 112.42C83.2574 112.844 84.1057 113.41 84.8126 114.117C85.5195 114.823 86.085 115.672 86.5092 116.661C86.9333 117.651 87.1454 118.694 87.1454 119.789C87.1454 120.921 86.9333 121.981 86.5092 122.971C86.085 123.925 85.5195 124.756 84.8126 125.462C84.1057 126.169 83.2574 126.717 82.2677 127.106C81.278 127.53 80.2354 127.742 79.1396 127.742C78.0086 127.742 76.9482 127.53 75.9585 127.106C74.9689 126.717 74.1029 126.169 73.3606 125.462C72.6537 124.756 72.0882 123.925 71.664 122.971C71.2752 121.981 71.0808 120.921 71.0808 119.789Z" fill="#FFFBFB"/>
+<path d="M10.163 139L80 12.4204L149.837 139H80H10.163Z" stroke="salmon" stroke-width="15"/>
+<path d="M85.4488 50.3354V80.6619C85.4488 83.8784 85.2898 87.0418 84.9717 90.1522C84.6536 93.2273 84.2294 96.4968 83.6992 99.9606H74.8451C74.315 96.4968 73.8908 93.2273 73.5727 90.1522C73.2546 87.0418 73.0955 83.8784 73.0955 80.6619V50.3354H85.4488ZM71.0808 119.789C71.0808 118.694 71.2752 117.651 71.664 116.661C72.0882 115.672 72.6537 114.823 73.3606 114.117C74.1029 113.41 74.9689 112.844 75.9585 112.42C76.9482 111.996 78.0086 111.784 79.1396 111.784C80.2354 111.784 81.278 111.996 82.2677 112.42C83.2574 112.844 84.1057 113.41 84.8126 114.117C85.5195 114.823 86.085 115.672 86.5092 116.661C86.9333 117.651 87.1454 118.694 87.1454 119.789C87.1454 120.921 86.9333 121.981 86.5092 122.971C86.085 123.925 85.5195 124.756 84.8126 125.462C84.1057 126.169 83.2574 126.717 82.2677 127.106C81.278 127.53 80.2354 127.742 79.1396 127.742C78.0086 127.742 76.9482 127.53 75.9585 127.106C74.9689 126.717 74.1029 126.169 73.3606 125.462C72.6537 124.756 72.0882 123.925 71.664 122.971C71.2752 121.981 71.0808 120.921 71.0808 119.789Z" fill="white"/>
 </svg>
@@ -0,0 +1,48 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="512" height="512" rx="256" fill="#121212"/>
+<rect x="325.818" y="405.665" width="7.11086" height="143.867" rx="3.55543" transform="rotate(90 325.818 405.665)" fill="white"/>
+<rect x="361.785" y="430.553" width="10.6663" height="208.608" rx="5.33314" transform="rotate(90 361.785 430.553)" fill="white"/>
+<g filter="url(#filter0_d_272_208)">
+<rect width="25.0328" height="117.468" rx="12.5164" transform="matrix(0.711174 0.703016 -0.711174 0.703016 211.54 363)" fill="white"/>
+</g>
+<g filter="url(#filter1_d_272_208)">
+<rect width="25.0328" height="117.468" rx="12.5164" transform="matrix(-0.711174 0.703016 0.711174 0.703016 300.46 363)" fill="white"/>
+</g>
+<g filter="url(#filter2_d_272_208)">
+<rect x="139.352" y="65.4912" width="232.66" height="325.893" rx="41.5866" stroke="#7A7A7A" stroke-width="8.31733"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M135.193 107.078C135.193 81.8134 155.674 61.3325 180.938 61.3325H330.425C355.69 61.3325 376.171 81.8134 376.171 107.078V349.797C376.171 375.062 355.69 395.543 330.426 395.543H180.938C155.674 395.543 135.193 375.062 135.193 349.797V107.078ZM208.217 338.656C208.217 352.401 196.774 363.544 182.659 363.544C168.543 363.544 157.1 352.401 157.1 338.656C157.1 324.91 168.543 313.768 182.659 313.768C196.774 313.768 208.217 324.91 208.217 338.656ZM328.706 363.544C342.821 363.544 354.264 352.401 354.264 338.656C354.264 324.91 342.821 313.768 328.706 313.768C314.591 313.768 303.148 324.91 303.148 338.656C303.148 352.401 314.591 363.544 328.706 363.544ZM248.38 136.323C248.38 132.07 244.932 128.622 240.679 128.622H164.802C160.549 128.622 157.101 132.07 157.101 136.323V203.223C157.101 207.476 160.549 210.924 164.802 210.924H240.679C244.932 210.924 248.38 207.476 248.38 203.223V136.323ZM346.563 128.622C350.817 128.622 354.265 132.07 354.265 136.323V203.223C354.265 207.476 350.817 210.924 346.563 210.924H270.686C266.433 210.924 262.985 207.476 262.985 203.223V136.323C262.985 132.07 266.433 128.622 270.686 128.622H346.563Z" fill="white"/>
+<ellipse cx="255.682" cy="64.888" rx="25.5582" ry="24.888" fill="#F3F1F1"/>
+</g>
+<defs>
+<filter id="filter0_d_272_208" x="106.676" y="341.617" width="143.99" height="142.947" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="13.269"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_272_208"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_272_208" result="shape"/>
+</filter>
+<filter id="filter1_d_272_208" x="261.334" y="341.617" width="143.99" height="142.947" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="13.269"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_272_208"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_272_208" result="shape"/>
+</filter>
+<filter id="filter2_d_272_208" x="110.241" y="15.048" width="290.882" height="405.446" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="12.476"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_272_208"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_272_208" result="shape"/>
+</filter>
+</defs>
+</svg>
@@ -1,106 +0,0 @@
-@import './styles/responsive.scss';
-@import './styles/variables.scss';
-@import './styles/global.scss';
-
-// VUE ROUTE CHANGE ANIMATION
-.view-anim {
-  &-enter-from,
-  &-leave-to {
-    opacity: 0.02;
-  }
-
-  &-enter-active,
-  &-leave-active {
-    transition: all $animDuration $animType;
-    min-height: 100%;
-  }
-}
-
-.modal-anim {
-  &-enter-active,
-  &-leave-active {
-    transition: all $animDuration $animType;
-  }
-
-  &-enter-from,
-  &-leave-to {
-    transform: translateY(-25%);
-    opacity: 0;
-  }
-}
-
-.route {
-  margin: 0 0.2em;
-
-  &-active,
-  &[data-active='true'] {
-    color: $accentCol;
-    font-weight: bold;
-  }
-}
-
-// APP
-#app {
-  color: white;
-  font-size: 1rem;
-  overflow-x: hidden;
-
-  @include smallScreen() {
-    font-size: calc(0.65rem + 0.8vw);
-  }
-
-  @include screenLandscape() {
-    font-size: calc(0.45rem + 0.8vw);
-  }
-}
-
-// CONTAINER
-.app_container {
-  display: flex;
-  flex-flow: column;
-
-  min-height: 100vh;
-
-  header {
-    flex: 0 0 auto;
-  }
-
-  main {
-    flex: 1 1 auto;
-
-    padding: 0 0.5em;
-  }
-
-  footer {
-    flex: 0 1 0.2em;
-  }
-}
-
-.warning {
-  background-color: firebrick;
-  text-align: center;
-  padding: 0.5em 0.4em;
-  max-width: 1100px;
-  margin: 0 auto;
-
-  border-radius: 0 0 1em 1em;
-}
-
-// FOOTER
-footer.app_footer {
-  max-width: 100%;
-  padding: 0.5em;
-
-  img {
-    width: 1.1em;
-    vertical-align: text-bottom;
-  }
-
-  z-index: 10;
-
-  background: #111;
-  color: white;
-
-  text-align: center;
-  vertical-align: middle;
-}
@@ -1,8 +1,15 @@
 <template>
  <div class="app_container">
+    <UpdateCard
+      :is-update-card-open="isUpdateCardOpen"
+      @toggle-card="() => (isUpdateCardOpen = false)"
+    />
+
+    <Tooltip />
+
    <transition name="modal-anim">
      <keep-alive>
-        <TrainModal v-if="store.chosenModalTrainId" />
+        <TrainModal />
      </keep-alive>
    </transition>

@@ -10,7 +17,7 @@

    <main class="app_main">
      <router-view v-slot="{ Component }">
-        <keep-alive exclude="JournalView">
+        <keep-alive exclude="SceneryView">
          <component :is="Component" :key="$route.name" />
        </keep-alive>
      </router-view>
@@ -20,7 +27,10 @@
      &copy;
      <a href="https://td2.info.pl/profile/?u=20777" target="_blank">Spythere</a>
      {{ new Date().getUTCFullYear() }} |
-      <a :href="releaseURL" target="_blank">v{{ VERSION }}{{ isOnProductionHost ? '' : 'dev' }}</a>
+      <button class="btn--text" @click="() => (isUpdateCardOpen = true)">
+        v{{ VERSION }}{{ isOnProductionHost ? '' : 'dev' }}
+      </button>
+
      <br />
      <a href="https://discord.gg/x2mpNN3svk">
        <img src="/images/icon-discord.png" alt="" />&nbsp;<b>{{ $t('footer.discord') }}</b>
@@ -32,98 +42,81 @@
 </template>

 <script lang="ts">
-import { defineComponent, watch } from 'vue';
+import { defineComponent } from 'vue';
+import axios from 'axios';
+
+import { version } from '.././package.json';
+import { Status } from './typings/common';
+import { useMainStore } from './store/mainStore';
+import { useApiStore } from './store/apiStore';
+import { useTooltipStore } from './store/tooltipStore';

 import Clock from './components/App/Clock.vue';
-
-import packageInfo from '.././package.json';
-import { regions } from './data/options.json';
-
-import { useStore } from './store/store';
 import StatusIndicator from './components/App/StatusIndicator.vue';
-import TrainModal from './components/Global/TrainModal.vue';
-import StorageManager from './scripts/managers/storageManager';
 import AppHeader from './components/App/AppHeader.vue';
-import axios from 'axios';
+import TrainModal from './components/TrainsView/TrainModal.vue';
+import Tooltip from './components/Tooltip/Tooltip.vue';
+import UpdateCard from './components/App/UpdateCard.vue';
+
+import StorageManager from './managers/storageManager';
+
+const STORAGE_VERSION_KEY = 'app_version';

 export default defineComponent({
  components: {
    Clock,
    StatusIndicator,
+    AppHeader,
    TrainModal,
-    AppHeader
+    UpdateCard,
+    Tooltip
  },

  data: () => ({
-    VERSION: packageInfo.version,
-    store: useStore(),
+    VERSION: version,
+    store: useMainStore(),
+    apiStore: useApiStore(),
+    tooltipStore: useTooltipStore(),
+
+    isUpdateCardOpen: false,

    currentLang: 'pl',
-    releaseURL: '',
-    isOnProductionHost: location.hostname == 'stacjownik-td2.web.app'
+    isOnProductionHost: location.hostname == 'stacjownik-td2.web.app',
+
+    nextUpdateTime: 0
  }),

  created() {
-    this.loadLang();
-    this.store.connectToAPI();
-
-    this.store.isOffline = !window.navigator.onLine;
-
-    window.addEventListener('offline', () => {
-      this.store.isOffline = true;
-
-      this.store.apiData = {
-        stations: [],
-        dispatchers: [],
-        trains: [],
-        connectedSocketCount: 0
-      };
-
-      this.store.setStatuses();
-    });
-
-    window.addEventListener('online', () => {
-      this.store.isOffline = false;
-    });
+    this.init();
  },

  async mounted() {
-    this.setReleaseURL();
-
-    watch(
-      () => this.store.blockScroll,
-      (value) => {
-        if (value) document.body.classList.add('no-scroll');
-        else document.body.classList.remove('no-scroll');
-      }
-    );
-  },
-
-  watch: {
-    '$route.query.region': {
-      immediate: true,
-      handler(regionQuery: string) {
-        if (regionQuery) {
-          this.store.region.id =
-            regions.find(
-              (reg) =>
-                reg.id == regionQuery.toLocaleLowerCase() ||
-                reg.value.toLocaleLowerCase() == regionQuery.toLocaleLowerCase()
-            )?.id || 'eu';
-        }
-      }
-    }
+    window.addEventListener('mousemove', (e: MouseEvent) => this.tooltipStore.handle(e));
  },

  methods: {
-    changeLang(lang: string) {
-      this.$i18n.locale = lang;
-      this.currentLang = lang;
+    init() {
+      this.loadLang();
+      this.setupOfflineHandling();
+      this.checkAppVersion();

-      StorageManager.setStringValue('lang', lang);
+      this.apiStore.setupAPIData();
+      window.requestAnimationFrame(this.update);
+
+      if (!this.isOnProductionHost) document.title = 'Stacjownik Dev';
    },

-    async setReleaseURL() {
+    update(t: number) {
+      if (t >= this.nextUpdateTime) {
+        this.apiStore.fetchActiveData();
+        this.nextUpdateTime = t + 20000;
+      }
+      window.requestAnimationFrame(this.update);
+    },
+
+    async checkAppVersion() {
+      const storageVersion = StorageManager.getStringValue(STORAGE_VERSION_KEY);
+
      try {
        const releaseData = await (
          await axios.get('https://api.github.com/repos/Spythere/stacjownik/releases/latest')
@@ -131,11 +124,48 @@ export default defineComponent({

        if (!releaseData) return;

-        this.releaseURL = releaseData.html_url;
+        this.store.appUpdate = {
+          version,
+          changelog: releaseData.body,
+          releaseURL: releaseData.html_url
+        };
+
+        this.isUpdateCardOpen =
+          storageVersion != version || import.meta.env.VITE_UPDATE_TEST === 'test';
      } catch (error) {
        console.error(`Wystąpił błąd podczas pobierania danych z API GitHuba: ${error}`);
-        return;
      }
+
+      StorageManager.setStringValue(STORAGE_VERSION_KEY, version);
+    },
+
+    setupOfflineHandling() {
+      this.store.isOffline = !window.navigator.onLine;
+
+      if (this.store.isOffline) this.handleOfflineMode();
+
+      window.addEventListener('offline', this.handleOfflineMode);
+      window.addEventListener('online', this.handleOnlineMode);
+    },
+
+    handleOfflineMode() {
+      this.store.isOffline = true;
+
+      this.apiStore.activeData = undefined;
+      this.apiStore.dataStatuses.connection = Status.Data.Offline;
+    },
+
+    handleOnlineMode() {
+      this.store.isOffline = false;
+
+      this.apiStore.connectToAPI();
+    },
+
+    changeLang(lang: string) {
+      this.$i18n.locale = lang;
+      this.currentLang = lang;
+
+      StorageManager.setStringValue('lang', lang);
    },

    loadLang() {
@@ -159,4 +189,80 @@ export default defineComponent({
 });
 </script>

-<style lang="scss" src="./App.scss"></style>
+<style lang="scss">
+@import './styles/global';
+@import './styles/animations';
+
+.route {
+  margin: 0 0.2em;
+
+  &-active,
+  &[data-active='true'] {
+    color: $accentCol;
+    font-weight: bold;
+  }
+}
+
+// APP
+#app {
+  color: white;
+  font-size: 1rem;
+  overflow-x: hidden;
+
+  @include smallScreen() {
+    font-size: calc(0.65rem + 0.85vw);
+  }
+
+  @include screenLandscape() {
+    font-size: calc(0.45rem + 0.8vw);
+  }
+}
+
+// CONTAINER
+.app_container {
+  display: grid;
+  grid-template-rows: auto 1fr auto;
+  grid-template-columns: 100%;
+
+  min-height: 100vh;
+  overflow: hidden;
+}
+
+.app_main {
+  padding: 0 0.5em;
+}
+
+.warning {
+  background-color: firebrick;
+  text-align: center;
+  padding: 0.5em 0.4em;
+  max-width: 1100px;
+  margin: 0 auto;
+
+  border-radius: 0 0 1em 1em;
+}
+
+// FOOTER
+.app_footer {
+  max-width: 100%;
+  padding: 0.5em;
+
+  button {
+    display: inline-block;
+    padding: 0.1em;
+  }
+
+  img {
+    width: 1.1em;
+    vertical-align: text-bottom;
+  }
+
+  z-index: 10;
+
+  background: #111;
+  color: white;
+
+  text-align: center;
+  vertical-align: middle;
+}
+</style>
@@ -29,11 +29,6 @@
            <img src="/images/icon-dispatcher.svg" alt="icon dispatcher" />
            <span class="text--primary">{{ onlineDispatchersCount }}</span>

-            <!-- <span class="g-tooltip">
-              <b class="text--primary">{{ factorU }}U</b>
-              <div class="content">Test</div>
-            </span> -->
-
            <span class="text--grayed"> / </span>
            <span class="text--primary">{{ onlineTrainsCount }}</span>
            <img src="/images/icon-train.svg" alt="icon train" />
@@ -68,7 +63,7 @@
 </template>
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { useStore } from '../../store/store';
+import { useMainStore } from '../../store/mainStore';
 import StatusIndicator from './StatusIndicator.vue';
 import Clock from './Clock.vue';
 import RegionDropdown from '../Global/RegionDropdown.vue';
@@ -84,7 +79,7 @@ export default defineComponent({

  setup() {
    return {
-      store: useStore()
+      store: useMainStore()
    };
  },

@@ -96,17 +91,13 @@ export default defineComponent({

  computed: {
    onlineTrainsCount() {
-      return this.store.trainList.filter((train) => train.online).length;
+      return this.store.trainList.filter((train) => train.region == this.store.region.id).length;
    },

    onlineDispatchersCount() {
-      return this.store.onlineSceneryList.length;
-    },
-
-    factorU() {
-      return this.onlineDispatchersCount == 0
-        ? '-'
-        : (this.onlineTrainsCount / this.onlineDispatchersCount).toFixed(2);
+      return this.store.activeSceneryList.filter(
+        (scenery) => scenery.region == this.store.region.id && scenery.dispatcherId != -1
+      ).length;
    }
  },
  components: { StatusIndicator, Clock, RegionDropdown }
@@ -36,11 +36,11 @@
            <circle id="Ellipse 18" cx="15" cy="17" r="7" fill="#393838" />
          </g>

-          <g v-if="greenLight" filter="url(#filter0_d_843_28)">
+          <g v-if="indicator.lights.greenLight" filter="url(#filter0_d_843_28)">
            <circle cx="15" cy="17" r="7" fill="#00FF0A" />
          </g>

-          <g v-if="greenBlinkLight" filter="url(#filter0_d_843_28)">
+          <g v-if="indicator.lights.greenBlinkLight" filter="url(#filter0_d_843_28)">
            <circle cx="15" cy="17" r="7" fill="#00FF0A" />

            <animate
@@ -52,14 +52,14 @@
            />
          </g>

-          <g v-if="redTopLight" filter="url(#filter1_d_843_28)">
+          <g v-if="indicator.lights.redTopLight" filter="url(#filter1_d_843_28)">
            <circle cx="15" cy="36" r="7" fill="#F40000" />
          </g>

-          <g v-if="orangeLight" filter="url(#filter2_d_843_28)">
+          <g v-if="indicator.lights.orangeLight" filter="url(#filter2_d_843_28)">
            <circle cx="15" cy="55" r="7" fill="#FFB800" />
          </g>
-          <g v-if="redBottomLight" filter="url(#filter3_d_843_28)">
+          <g v-if="indicator.lights.redBottomLight" filter="url(#filter3_d_843_28)">
            <circle cx="15" cy="74" r="7" fill="#F40000" />

            <animate
@@ -186,7 +186,11 @@
      </svg>

      <transition name="tooltip-anim">
-        <div v-html="$t(indicator.message)" class="indicator-tooltip" v-if="tooltipActive"></div>
+        <div
+          v-html="$t('data-status.' + indicator.message)"
+          class="indicator-tooltip"
+          v-if="tooltipActive"
+        ></div>
      </transition>
    </div>
  </div>
@@ -194,124 +198,112 @@

 <script lang="ts">
 import { defineComponent } from 'vue';
-import { DataStatus } from '../../scripts/enums/DataStatus';
-import { useStore } from '../../store/store';
-import { StoreState } from '../../scripts/interfaces/store/storeTypes';
+import { Status } from '../../typings/common';
+import { useApiStore } from '../../store/apiStore';
+import { APIDataStatus } from '../../typings/api';
+
+interface Indicator {
+  // status: Status.Data;
+  message: string;
+
+  lights: {
+    greenLight: boolean;
+    greenBlinkLight: boolean;
+    redTopLight: boolean;
+    orangeLight: boolean;
+    redBottomLight: boolean;
+  };
+}

 export default defineComponent({
  data() {
    return {
      tooltipActive: false,
-      indicator: {
-        offline: false,
-        status: DataStatus.Loading,
-        message: 'data-status.S3'
-      },
-
-      greenLight: false,
-      greenBlinkLight: false,
-      redTopLight: false,
-      orangeLight: false,
-      redBottomLight: false
+      apiStore: useApiStore()
    };
  },

-  mounted() {
-    this.setSignalStatus(DataStatus.Loading);
-  },
-
-  setup() {
-    const store = useStore();
-
-    return {
-      dataStatus: store.dataStatuses,
-      store
-    };
-  },
-
-  watch: {
-    dataStatus: {
-      deep: true,
-
-      handler(statuses: StoreState['dataStatuses']) {
-        const connectionStatus = statuses.connection;
-        const sceneryDataStatus = statuses.sceneries;
-        const trainsDataStatus = statuses.trains;
-        const dispatcherDataStatus = statuses.dispatchers;
-
-        if (this.store.isOffline) {
-          this.setSignalStatus(DataStatus.Initialized);
-          this.indicator.status = DataStatus.Initialized;
-          this.indicator.message = 'data-status.S1-offline';
-          return;
-        }
-
-        if (connectionStatus == DataStatus.Error) {
-          this.setSignalStatus(connectionStatus);
-          this.indicator.status = connectionStatus;
-          this.indicator.message = 'data-status.S1a-connection';
-          return;
-        }
-
-        if (sceneryDataStatus == DataStatus.Error) {
-          this.setSignalStatus(sceneryDataStatus);
-          this.indicator.status = sceneryDataStatus;
-          this.indicator.message = 'data-status.S1a-sceneries';
-          return;
-        }
-
-        if (trainsDataStatus == DataStatus.Warning) {
-          this.setSignalStatus(trainsDataStatus);
-          this.indicator.status = trainsDataStatus;
-          this.indicator.message = 'data-status.S5-trains';
-          return;
-        }
-
-        if (dispatcherDataStatus == DataStatus.Warning) {
-          this.setSignalStatus(dispatcherDataStatus);
-          this.indicator.status = dispatcherDataStatus;
-          this.indicator.message = 'data-status.S5-dispatchers';
-          return;
-        }
-
-        if (sceneryDataStatus == DataStatus.Loaded) {
-          this.setSignalStatus(DataStatus.Loaded);
-
-          this.indicator.status = DataStatus.Loaded;
-          this.indicator.message = 'data-status.S2';
-        }
-      }
-    }
-  },
-
  methods: {
-    setSignalStatus(status: DataStatus) {
-      this.greenLight = false;
-      this.greenBlinkLight = false;
-      this.redTopLight = false;
-      this.orangeLight = false;
-      this.redBottomLight = false;
+    setLights(message: string) {
+      let lights = {
+        greenBlinkLight: false,
+        greenLight: false,
+        orangeLight: false,
+        redBottomLight: false,
+        redTopLight: false
+      };

-      if (status == DataStatus.Initialized) {
-        this.redTopLight = true;
+      switch (message) {
+        case 'S3':
+          lights.greenBlinkLight = true;
+          break;
+
+        case 'S2':
+          lights.greenLight = true;
+          break;
+
+        case 'S1-offline':
+          lights.redTopLight = true;
+          break;
+
+        case 'S1a-connection':
+        case 'S1a-sceneries':
+          lights.redTopLight = true;
+          lights.redBottomLight = true;
+          break;
+
+        case 'S5-dispatchers':
+        case 'S5-trains':
+          lights.orangeLight = true;
+          break;
+        default:
+          break;
      }

-      if (status == DataStatus.Loaded) {
-        this.greenLight = true;
+      return lights;
+    }
+  },
+
+  computed: {
+    indicator(): Indicator {
+      const dataStatuses = this.apiStore.dataStatuses;
+      const swdrStatuses = this.apiStore.activeData?.apiStatuses;
+
+      let message = 'S3';
+
+      switch (dataStatuses.connection) {
+        case Status.Data.Loading:
+          message = 'S3';
+          break;
+        case Status.Data.Loaded:
+          message = 'S2';
+          break;
+        case Status.Data.Offline:
+          message = 'S1-offline';
+          break;
+        case Status.Data.Error:
+          message = 'S1a-connection';
+          break;
+        default:
+          break;
      }

-      if (status == DataStatus.Warning) {
-        this.orangeLight = true;
+      if (swdrStatuses?.dispatchersAPI == APIDataStatus.WARNING) {
+        message = 'S5-dispatchers';
      }

-      if (status == DataStatus.Error) {
-        this.redTopLight = true;
-        this.redBottomLight = true;
+      if (swdrStatuses?.trainsAPI == APIDataStatus.WARNING) {
+        message = 'S5-trains';
      }

-      if (status == DataStatus.Loading) {
-        this.greenBlinkLight = true;
+      if (swdrStatuses?.stationsAPI == APIDataStatus.WARNING) {
+        message = 'S1a-sceneries';
      }
+
+      return {
+        lights: this.setLights(message),
+        message
+      };
    }
  }
 });
@@ -0,0 +1,123 @@
+<template>
+  <Card :is-open="isUpdateCardOpen" @toggle-card="toggleCard(false)">
+    <div class="content">
+      <h1 style="margin-bottom: 0.5em">🚀 {{ $t('update.title') }}</h1>
+
+      <div class="features-body" v-if="htmlChangelog != ''" v-html="htmlChangelog"></div>
+      <div class="no-features" v-else>{{ $t('update.no-data') }}</div>
+
+      <button class="btn btn--action" ref="confirm-btn" @click="toggleCard(false)">
+        {{ $t('update.confirm') }}
+      </button>
+
+      <p class="bottom-info">
+        {{ $t('update.info-1') }}
+        <br />
+        <span v-html="$t('update.info-2')"></span>
+      </p>
+    </div>
+  </Card>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { useMainStore } from '../../store/mainStore';
+import { version } from '../../../package.json';
+import { Converter } from 'showdown';
+
+import Card from '../Global/Card.vue';
+
+const converter = new Converter();
+
+export default defineComponent({
+  components: { Card },
+
+  props: {
+    isUpdateCardOpen: {
+      type: Boolean,
+      required: true
+    }
+  },
+
+  emits: ['toggleCard'],
+
+  data() {
+    return {
+      mainStore: useMainStore(),
+      version: version
+    };
+  },
+
+  watch: {
+    isUpdateCardOpen(val: boolean) {
+      this.$nextTick(() => {
+        if (val) (this.$refs['confirm-btn'] as HTMLElement).focus();
+      });
+    }
+  },
+
+  computed: {
+    htmlChangelog() {
+      if (this.mainStore.appUpdate == null) return '';
+
+      return converter.makeHtml(this.mainStore.appUpdate.changelog);
+    }
+  },
+
+  methods: {
+    toggleCard(value: boolean) {
+      this.$emit('toggleCard', value);
+    }
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+@import '../../styles/variables';
+
+::v-deep(h1) {
+  text-align: center;
+  color: $accentCol;
+}
+
+::v-deep(h2) {
+  padding: 0.25em 0;
+  border-bottom: 1px solid #aaa;
+}
+
+::v-deep(ul) {
+  list-style: initial;
+  padding: 1em;
+  line-height: 1.5em;
+}
+
+.content {
+  display: grid;
+  grid-template-rows: auto 1fr auto;
+  gap: 0.5em;
+  padding: 1em;
+  min-height: 700px;
+  overflow: auto;
+  text-align: justify;
+  max-width: 700px;
+}
+
+.no-features {
+  text-align: center;
+}
+
+button {
+  margin: 0 auto;
+  padding: 0.5em 0.75em;
+  font-size: 1.1em;
+}
+
+p.bottom-info {
+  text-align: center;
+  color: #ccc;
+}
+
+a {
+  text-decoration: underline;
+}
+</style>
@@ -0,0 +1,93 @@
+<template>
+  <transition name="modal-anim" tag="div">
+    <div class="card" v-if="isOpen">
+      <div class="card-background" @click="toggleCard(false)"></div>
+      <div class="card-body" tabindex="0">
+        <slot></slot>
+      </div>
+    </div>
+  </transition>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { useMainStore } from '../../store/mainStore';
+
+export default defineComponent({
+  emits: ['toggleCard'],
+
+  props: {
+    isOpen: Boolean
+  },
+
+  data() {
+    return {
+      store: useMainStore()
+    };
+  },
+
+  watch: {
+    isOpen(v) {
+      this.$nextTick(() => {
+        if (v == false) (this.store.modalLastClickedTarget as HTMLElement)?.focus();
+      });
+    }
+  },
+
+  methods: {
+    toggleCard(value: boolean) {
+      this.$emit('toggleCard', value);
+    }
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+@import '../../styles/responsive.scss';
+
+.card {
+  position: fixed;
+  top: 0;
+  left: 0;
+
+  width: 100%;
+  height: 100%;
+  z-index: 200;
+
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.card-background {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100vw;
+  height: 100vh;
+
+  cursor: pointer;
+
+  background-color: rgba(0, 0, 0, 0.55);
+}
+
+.card-body {
+  position: relative;
+
+  margin: 1em;
+
+  max-height: 95vh;
+  max-height: 95dvh;
+
+  background-color: #1a1a1a;
+  box-shadow: 0 0 15px 10px #0e0e0e;
+
+  overflow: auto;
+}
+
+@include smallScreen {
+  .card {
+    align-items: flex-start;
+  }
+}
+</style>
@@ -0,0 +1,256 @@
+<template>
+  <Card :isOpen="isCardOpen" @toggleCard="toggleCard" @keydown.esc="toggleCard(false)">
+    <div class="body">
+      <div class="content">
+        <h1 v-html="$t('donations.header')"></h1>
+        <div class="donators-slider" v-if="donatorList.length != 0">
+          <span v-html="$t('donations.donator-title', { count: donatorList.length })"></span>
+
+          <transition mode="out-in" name="slider-anim" class="current-name">
+            <span :key="displayingName">
+              <img src="/images/icon-diamond.svg" alt="donator diamond icon" />
+              {{ displayingName }}
+            </span>
+          </transition>
+        </div>
+        <br />
+        <p v-html="$t('donations.p1')"></p>
+        <br />
+        <i18n-t keypath="donations.p2" tag="p">
+          <template v-slot:b1>
+            <b>{{ $t('donations.p2-b1') }}</b>
+          </template>
+          <template v-slot:b2>
+            <b>{{ $t('donations.p2-b2') }}</b>
+          </template>
+          <template v-slot:b3>
+            <b>{{ $t('donations.p2-b3') }}</b>
+          </template>
+          <template v-slot:link>
+            <a class="discord" href="https://discord.gg/x2mpNN3svk" target="_blank">
+              {{ $t('donations.p2-a1') }}
+            </a>
+          </template>
+        </i18n-t>
+        <br />
+        <p v-html="$t('donations.p3')"></p>
+        <br />
+        <i18n-t keypath="donations.p4" tag="p">
+          <template v-slot:img>
+            <img src="/images/icon-diamond.svg" alt="donator diamond icon" />
+          </template>
+
+          <template v-slot:b1>
+            <b>{{ $t('donations.p4-b1') }}</b>
+          </template>
+
+          <template v-slot:b2>
+            <b>{{ $t('donations.p4-b2') }}</b>
+          </template>
+        </i18n-t>
+        <br />
+        <i
+          v-html="$t('donations.p5')"
+          style="display: flex; justify-content: flex-end; text-align: right"
+        >
+        </i>
+      </div>
+
+      <div class="actions">
+        <a
+          class="action a-button btn--image coffee"
+          href="https://buycoffee.to/spythere"
+          target="_blank"
+          ref="action"
+        >
+          <img src="/images/icon-coffee.png" width="20" alt="buycoffee.to donation" />
+          {{ $t('donations.action-buycoffee') }}
+        </a>
+
+        <a
+          class="action a-button btn--image paypal"
+          href="https://www.paypal.com/donate/?hosted_button_id=EDB3SKFAHXFTW"
+          target="_blank"
+        >
+          <img src="/images/icon-dollar.svg" alt="paypal donation" />
+          {{ $t('donations.action-paypal') }}
+        </a>
+
+        <button class="action btn--image exit" @click="toggleCard(false)">
+          <img src="/images/icon-exit.svg" alt="dollar donation icon" />
+          {{ $t('donations.action-exit') }}
+        </button>
+      </div>
+    </div>
+  </Card>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { useApiStore } from '../../store/apiStore';
+import Card from './Card.vue';
+
+export default defineComponent({
+  components: { Card },
+  props: {
+    isCardOpen: Boolean
+  },
+
+  emits: ['toggleCard'],
+
+  watch: {
+    isCardOpen(val: boolean) {
+      this.running = val;
+      this.lastUpdate = Date.now();
+
+      this.$nextTick(() => {
+        if (val) (this.$refs['action'] as HTMLElement).focus();
+      });
+    }
+  },
+
+  created() {
+    this.runUpdate();
+  },
+
+  data() {
+    return {
+      apiStore: useApiStore(),
+      displayingIndex: 0,
+      lastUpdate: 0,
+      running: false
+    };
+  },
+
+  computed: {
+    displayingName() {
+      return this.donatorList[this.displayingIndex];
+    },
+
+    donatorList() {
+      return this.apiStore.donatorsData.slice().sort(() => Math.sign(Math.random() * -2 + 1));
+    }
+  },
+
+  methods: {
+    toggleCard(value: boolean) {
+      this.$emit('toggleCard', value);
+    },
+
+    runUpdate() {
+      if (Date.now() >= this.lastUpdate + 2000 && this.running) {
+        this.displayingIndex = (this.displayingIndex + 1) % this.donatorList.length;
+        this.lastUpdate = Date.now();
+      }
+
+      window.requestAnimationFrame(this.runUpdate);
+    }
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+@import '../../styles/responsive.scss';
+
+.body {
+  display: grid;
+  grid-template-rows: 1fr auto;
+  gap: 1em;
+
+  font-size: 1.1em;
+
+  max-width: 820px;
+}
+
+.content {
+  overflow: auto;
+  overflow-x: hidden;
+  padding: 1em;
+}
+
+img {
+  max-height: 20px;
+  margin-right: 5px;
+  vertical-align: text-bottom;
+}
+
+h1 {
+  font-size: 1.95em;
+  text-align: center;
+}
+
+p {
+  text-align: justify;
+}
+
+a.discord {
+  text-decoration: underline;
+}
+
+.actions {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
+  gap: 0.5em;
+  padding: 1em;
+
+  form button {
+    width: 100%;
+  }
+}
+
+.actions > .action {
+  &.paypal {
+    $btnColor: #254069;
+
+    background-color: $btnColor;
+
+    &:hover {
+      background-color: lighten($btnColor, 5%);
+    }
+  }
+
+  &.coffee {
+    $btnColor: #009255;
+    background-color: $btnColor;
+
+    &:hover {
+      background-color: lighten($btnColor, 5%);
+    }
+  }
+
+  &.exit {
+    $btnColor: #686868;
+    background-color: $btnColor;
+
+    &:hover {
+      background-color: lighten($btnColor, 5%);
+    }
+  }
+}
+
+.donators-slider {
+  text-align: center;
+  line-height: 30px;
+
+  .current-name {
+    backface-visibility: hidden;
+    display: block;
+    font-weight: bold;
+    word-wrap: break-word;
+    color: var(--clr-donator);
+  }
+}
+
+.slider-anim {
+  &-move,
+  &-enter-active,
+  &-leave-active {
+    transition: all 150ms ease-in-out;
+  }
+
+  &-enter-from,
+  &-leave-to {
+    opacity: 0;
+  }
+}
+</style>
@@ -29,8 +29,8 @@

 <script lang="ts">
 import { defineComponent, Ref, ref } from 'vue';
-import { useStore } from '../../store/store';
 import { regions as regionsJSON } from '../../data/options.json';
+import { useMainStore } from '../../store/mainStore';

 interface Item {
  id: string;
@@ -41,7 +41,7 @@ interface Item {
 export default defineComponent({
  data() {
    return {
-      store: useStore(),
+      store: useMainStore(),
      selectedItemIndex: 0,
      listOpen: false
    };
@@ -60,6 +60,19 @@ export default defineComponent({
      handler(regionId) {
        this.selectedItemIndex = this.regionList.findIndex((reg) => reg.id == regionId);
      }
+    },
+    '$route.query.region': {
+      immediate: true,
+      handler(regionQuery: string) {
+        if (regionQuery) {
+          this.store.region =
+            regionsJSON.find(
+              (reg) =>
+                reg.id == regionQuery.toLocaleLowerCase() ||
+                reg.value.toLocaleLowerCase() == regionQuery.toLocaleLowerCase()
+            ) ?? regionsJSON[0];
+        }
+      }
    }
  },

@@ -67,16 +80,15 @@ export default defineComponent({
    selectedItem() {
      return this.regionList[this.selectedItemIndex] || null;
    },
+
    regionList() {
      return regionsJSON.map((region) => {
-        const regionStationCount =
-          this.store.apiData.stations?.filter(
-            (station) => station.region == region.id && station.isOnline
-          ).length || 0;
+        const regionStationCount = this.store.activeSceneryList.filter(
+          (scenery) => scenery.region == region.id && scenery.dispatcherId != -1
+        ).length;

        const regionTrainCount =
-          this.store.apiData.trains?.filter((train) => train.region == region.id && train.online)
-            .length || 0;
+          this.store.trainList.filter((train) => train.region == region.id).length || 0;

        return {
          id: region.id,
@@ -127,15 +139,10 @@ button.selected-region {
  color: paleturquoise;

  font-weight: bold;
-  padding: 0.1em 0.5em;

  &:focus {
    background-color: #262626;
  }
-
-  span {
-    margin-right: 10px;
-  }
 }

 .content {
@@ -185,6 +192,8 @@ li.option {
  }

  label {
+    width: 100%;
+    padding: 0.5em 0;
    position: relative;

    display: inline-block;
@@ -195,10 +204,6 @@ li.option {
      background-color: #333333f2;
    }

-    padding: 0.5em 0;
-
-    width: 100%;
-
    cursor: pointer;
  }
 }
@@ -1,7 +1,11 @@
 <template>
-  <span class="status-badge" :class="statusID" v-if="isOnline">
-    {{ $t(`status.${statusID}`) }}
-    {{ statusID == 'online' ? timestampToString(statusTimestamp!) : '' }}
+  <span class="status-badge" :class="statusName" v-if="isOnline">
+    {{ $t(`status.${statusName}`) }}
+    {{
+      statusName == 'online' && dispatcherStatus && dispatcherStatus > 5
+        ? timestampToString(dispatcherStatus)
+        : ''
+    }}
  </span>

  <span class="status-badge free" v-else>
@@ -10,22 +14,64 @@
 </template>

 <script lang="ts">
-import { defineComponent } from 'vue';
+import { PropType, defineComponent } from 'vue';
 import dateMixin from '../../mixins/dateMixin';
+import { Status } from '../../typings/common';

 export default defineComponent({
  props: {
-    statusID: {
-      type: String
+    dispatcherStatus: {
+      type: Number as PropType<Status.ActiveDispatcher | number>
    },
-    statusTimestamp: {
-      type: Number
+    dispatcherTimestamp: {
+      type: Number as PropType<number | null>
    },
    isOnline: {
      type: Boolean
    }
  },
-  mixins: [dateMixin]
+  mixins: [dateMixin],
+
+  computed: {
+    statusName() {
+      if (this.dispatcherStatus === undefined) return 'free';
+
+      switch (this.dispatcherStatus) {
+        case Status.ActiveDispatcher.AFK:
+          return 'afk';
+
+        case Status.ActiveDispatcher.NO_LIMIT:
+          return 'no-limit';
+
+        case Status.ActiveDispatcher.ENDING:
+          return 'ending';
+
+        case Status.ActiveDispatcher.INVALID:
+          return 'invalid';
+
+        case Status.ActiveDispatcher.NOT_LOGGED_IN:
+          return 'not-signed';
+
+        case Status.ActiveDispatcher.NO_SPACE:
+          return 'no-space';
+
+        case Status.ActiveDispatcher.UNAVAILABLE:
+          return 'unavailable';
+
+        case Status.ActiveDispatcher.UNKNOWN:
+          return 'unknown';
+
+        case Status.ActiveDispatcher.FREE:
+          return 'free';
+
+        default:
+          if (this.dispatcherTimestamp != null && this.dispatcherStatus >= Date.now() + 25500000)
+            return 'no-limit';
+
+          return 'online';
+      }
+    }
+  }
 });
 </script>

@@ -34,13 +80,13 @@ $free: #8a8a8a;
 $ending: #e6c300;
 $no-limit: #117fc9;
 $unav: #ff3d5d;
-$brb: #e6a100;
+$afk: #e6a100;
 $no-space: #222;
 $online: #09a116;
-$unknown: rgb(185, 60, 60);
+$unknown: #b93c3c;

 .status-badge {
-  border-radius: 1rem;
+  border-radius: 1em;
  font-weight: 500;

  padding: 0.2em 0.55em;
@@ -69,8 +115,8 @@ $unknown: rgb(185, 60, 60);
    font-size: 0.85em;
  }

-  &.brb {
-    background-color: $brb;
+  &.afk {
+    background-color: $afk;
    color: black;
    font-size: 0.95em;
  }
@@ -82,7 +128,8 @@ $unknown: rgb(185, 60, 60);
    font-size: 0.85em;
  }

-  &.unknown {
+  &.unknown,
+  &.invalid {
    background-color: $unknown;
    font-size: 0.95em;
  }
@@ -1,7 +1,27 @@
 <template>
  <div class="stock-list">
-    <ul>
-      <li v-for="(stockName, i) in trainStockList" :key="i">
+    <div v-if="tractionOnly">
+      <p>
+        {{ computedStockList[0].split(':')[0].split('_').splice(0, 2).join(' ') }}
+        {{ computedStockList[0].split(':')[1] }}
+      </p>
+
+      <img
+        class="traction-only"
+        :src="
+          getVehicleThumbnailURL(
+            computedStockList[0].split(':')[0],
+            /^EN/.test(computedStockList[0]) ? 'rb' : ''
+          )
+        "
+        @error="onImageError($event, computedStockList[0])"
+        width="300"
+        height="60"
+      />
+    </div>
+
+    <ul v-else>
+      <li v-for="(stockName, i) in computedStockList" :key="i">
        <p>
          {{ stockName.split(':')[0].split('_').splice(0, 2).join(' ') }}
          {{ stockName.split(':')[1] }}
@@ -9,39 +29,55 @@

        <span>
          <img
-            :src="`https://rj.td2.info.pl/dist/img/thumbnails/${stockName.split(':')[0]}${
-              /^EN/.test(stockName) ? 'rb' : ''
-            }.png`"
+            :data-mouseover="stockName"
+            data-tooltip-type="VehiclePreviewTooltip"
+            :data-tooltip-content="stockName.split(':')[0]"
+            :src="
+              getVehicleThumbnailURL(stockName.split(':')[0], /^EN/.test(stockName) ? 'rb' : '')
+            "
            @error="onImageError($event, stockName)"
+            @click.stop="() => {}"
            width="400"
            height="60"
          />

+          <!-- /// Manualne dodawanie miniaturek członów dla kibelków /// -->
          <img
+            :data-mouseover="stockName"
+            data-tooltip-type="VehiclePreviewTooltip"
+            :data-tooltip-content="stockName.split(':')[0]"
            v-if="/^(EN|2EN)/.test(stockName)"
-            :src="`https://rj.td2.info.pl/dist/img/thumbnails/${stockName.split(':')[0]}s.png`"
+            :src="getVehicleThumbnailURL(stockName, 's')"
            @error="
              (event) => ((event.target as HTMLImageElement).src = '/images/icon-loco-ezt-s.png')
            "
+            @click.stop="() => {}"
          />

          <img
-            class="train-thumbnail"
+            :data-mouseover="stockName"
+            data-tooltip-type="VehiclePreviewTooltip"
+            :data-tooltip-content="stockName.split(':')[0]"
            v-if="/^EN71/.test(stockName)"
-            :src="`https://rj.td2.info.pl/dist/img/thumbnails/${stockName.split(':')[0]}s.png`"
+            :src="getVehicleThumbnailURL(stockName, 's')"
            @error="
              (event) => ((event.target as HTMLImageElement).src = '/images/icon-loco-ezt-s.png')
            "
+            @click.stop="() => {}"
          />

          <img
-            class="train-thumbnail"
+            :data-mouseover="stockName"
+            data-tooltip-type="VehiclePreviewTooltip"
+            :data-tooltip-content="stockName.split(':')[0]"
            v-if="/^(EN|2EN)/.test(stockName)"
-            :src="`https://rj.td2.info.pl/dist/img/thumbnails/${stockName.split(':')[0]}ra.png`"
+            :src="getVehicleThumbnailURL(stockName, 'ra')"
            @error="
              (event) => ((event.target as HTMLImageElement).src = '/images/icon-loco-ezt-ra.png')
            "
+            @click.stop="() => {}"
          />
+          <!-- ///  -->
        </span>
      </li>
    </ul>
@@ -50,31 +86,53 @@

 <script lang="ts">
 import { PropType, defineComponent } from 'vue';
-import { useStore } from '../../store/store';
-import { RollingStockInfo } from '../../scripts/interfaces/github_api/StockInfoGithubData';
+import { useApiStore } from '../../store/apiStore';

 export default defineComponent({
  props: {
    trainStockList: {
      type: Array as PropType<string[]>,
      required: true
+    },
+    tractionOnly: {
+      type: Boolean,
+      required: false
    }
  },

  data() {
    return {
-      store: useStore()
+      apiStore: useApiStore()
    };
  },

+  computed: {
+    computedStockList() {
+      return this.tractionOnly ? this.trainStockList.slice(0, 1) : this.trainStockList;
+    }
+  },
+
  methods: {
+    getVehicleThumbnailURL(locoType: string, suffix?: string) {
+      return `https://static.spythere.eu/thumbnails/${locoType}${suffix}.png`;
+    },
+
    onImageError(event: Event, stockName: string) {
-      const fallbackName =
-        Object.keys(this.store.rollingStockData!.info).find((type) => {
-          return this.store.rollingStockData!.info[type as keyof RollingStockInfo].find(
-            (v) => v[0] === stockName.split(':')[0]
-          );
-        }) || 'vehicle-unknown';
+      let fallbackName = '';
+
+      const isLoco = /.-\d{3}/.test(stockName);
+
+      if (isLoco) {
+        if (/^\d?EN\d{2}/.test(stockName)) fallbackName = 'loco-ezt';
+        else if (/^SN\d{2}/.test(stockName)) fallbackName = 'loco-szt';
+        else if (/^\d{0,}?E/.test(stockName)) fallbackName = 'loco-e';
+        else fallbackName = 'loco-s';
+      } else {
+        const isCarPassenger = /(\d{3}a|(Bau|Gor)\d{2}|304C)_/.test(stockName);
+
+        fallbackName += 'car-';
+        fallbackName += isCarPassenger ? 'passenger' : 'cargo';
+      }

      (event.target as HTMLImageElement).src = `/images/icon-${fallbackName}.png`;
    }
@@ -99,6 +157,7 @@ export default defineComponent({
 ul > li > span {
  display: flex;
  align-items: flex-end;
+  cursor: crosshair;
 }

 img {
@@ -107,10 +166,14 @@ img {
  height: auto;
 }

+img.traction-only {
+  max-width: 100%;
+}
+
 p {
  text-align: center;
  color: #aaa;
-  font-size: 0.9em;
+  font-size: 0.95em;
  margin-bottom: 1em;
 }
 </style>
@@ -1,123 +0,0 @@
-<template>
-  <span class="stop-date">
-    <span
-      class="date arrival"
-      v-if="!stop.beginsHere"
-      :class="{
-        delayed: stop.arrivalDelay > 0 && (stop.confirmed || stop.stopped),
-        preponed: stop.arrivalDelay < 0 && (stop.confirmed || stop.stopped),
-        'on-time': stop.arrivalDelay == 0 && stop.confirmed
-      }"
-    >
-      <span v-if="stop.arrivalDelay != 0 && (stop.confirmed || stop.stopped)">
-        <s>{{ timestampToString(stop.arrivalTimestamp) }}</s>
-        {{ timestampToString(stop.arrivalRealTimestamp) }}
-        ({{ stop.arrivalDelay > 0 ? '+' : '' }}{{ stop.arrivalDelay }})
-      </span>
-
-      <span v-else>
-        {{ timestampToString(stop.arrivalTimestamp) }}
-      </span>
-    </span>
-
-    <span
-      class="date stop"
-      v-if="stop.stopTime || stop.stopped"
-      :class="stop.stopType.replace(', ', '-')"
-    >
-      {{ stop.stopTime }} {{ stop.stopType == '' ? 'pt' : stop.stopType }}
-    </span>
-
-    <span
-      class="date departure"
-      v-if="!stop.terminatesHere && (stop.stopTime != 0 || stop.stopped)"
-      :class="{
-        delayed: stop.departureDelay > 0 && stop.confirmed,
-        preponed: stop.departureDelay < 0 && stop.confirmed
-      }"
-    >
-      <span v-if="stop.departureDelay != 0 && stop.confirmed">
-        <s>{{ timestampToString(stop.departureTimestamp) }}</s>
-        {{ timestampToString(stop.departureRealTimestamp) }}
-
-        ({{ stop.departureDelay > 0 ? '+' : '' }}{{ stop.departureDelay }})
-      </span>
-
-      <span v-else>
-        {{ timestampToString(stop.departureTimestamp) }}
-      </span>
-    </span>
-  </span>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-import dateMixin from '../../mixins/dateMixin';
-import TrainStop from '../../scripts/interfaces/TrainStop';
-
-export default defineComponent({
-  mixins: [dateMixin],
-
-  props: {
-    stop: {
-      type: Object as () => TrainStop,
-      required: true
-    }
-  },
-
-  setup() {
-    return {};
-  }
-});
-</script>
-
-<style lang="scss" scoped>
-$preponedClr: lime;
-$delayedClr: salmon;
-$dateClr: #525151;
-$stopExchangeClr: #db8e29;
-$stopDefaultClr: #252525;
-
-.stop-date {
-  display: flex;
-  align-items: center;
-
-  .date {
-    background: $dateClr;
-    padding: 0.3em 0.5em;
-  }
-
-  .stop {
-    &.ph,
-    &.ph-pm,
-    &.pm {
-      background: $stopExchangeClr;
-    }
-
-    background: $stopDefaultClr;
-  }
-
-  .arrival,
-  .departure {
-    &.delayed {
-      s {
-        color: #999;
-      }
-
-      span {
-        color: $delayedClr;
-      }
-    }
-
-    &.preponed {
-      s {
-        color: #999;
-      }
-
-      span {
-        color: $preponedClr;
-      }
-    }
-  }
-}
-</style>
@@ -1,152 +0,0 @@
-<template>
-  <div class="train-modal" v-if="chosenTrain" @keydown.esc="closeModal">
-    <div class="modal_background" @click="closeModal"></div>
-    <div class="modal_content" ref="content" tabindex="0">
-      <button class="btn exit" @click="closeModal">
-        <img src="/images/icon-exit.svg" alt="close card" />
-      </button>
-
-      <TrainInfo :train="chosenTrain" :extended="false" ref="trainInfo" />
-      <TrainSchedule :train="chosenTrain" tabindex="0" />
-    </div>
-  </div>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-import modalTrainMixin from '../../mixins/modalTrainMixin';
-import trainInfoMixin from '../../mixins/trainInfoMixin';
-import { useStore } from '../../store/store';
-import TrainInfo from '../TrainsView/TrainInfo.vue';
-import TrainSchedule from '../TrainsView/TrainSchedule.vue';
-
-export default defineComponent({
-  components: { TrainInfo, TrainSchedule },
-  mixins: [trainInfoMixin, modalTrainMixin],
-
-  data() {
-    return {
-      isTopBarVisible: false
-    };
-  },
-
-  setup() {
-    const store = useStore();
-
-    return {
-      store
-    };
-  },
-
-  activated() {
-    const contentEl = this.$refs['content'] as HTMLElement;
-
-    this.$nextTick(() => {
-      contentEl.focus();
-    });
-  },
-
-  methods: {
-    handleContentScroll(e: Event) {
-      const trainInfoCompHeight: number = (
-        this.$refs['trainInfo'] as any
-      ).$el.getBoundingClientRect().height;
-
-      const posTop = (e.target as HTMLElement).scrollTop;
-      this.isTopBarVisible = posTop > trainInfoCompHeight;
-    }
-  }
-});
-</script>
-
-<style lang="scss" scoped>
-@import '../../styles/responsive.scss';
-@import '../../styles/card.scss';
-
-.top-info-bar-anim {
-  &-enter-active,
-  &-leave-active {
-    transition: all 150ms ease-in-out;
-  }
-
-  &-enter-from,
-  &-leave-to {
-    transform: translate(-50%, -50%) scale(0.8);
-    opacity: 0;
-  }
-}
-
-.exit {
-  position: absolute;
-  top: 0;
-  right: 0;
-
-  margin: 0.5em 1em;
-
-  padding: 0.25em;
-
-  z-index: 201;
-
-  img {
-    width: 1.5rem;
-    vertical-align: middle;
-  }
-}
-
-.train-modal {
-  position: fixed;
-  top: 0;
-  left: 0;
-
-  width: 100%;
-
-  color: white;
-  z-index: 200;
-
-  display: flex;
-  justify-content: center;
-
-  text-align: left;
-}
-
-.modal_background {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100vw;
-  height: 100vh;
-
-  cursor: pointer;
-
-  background-color: rgba(0, 0, 0, 0.55);
-}
-
-.modal_content {
-  position: relative;
-  overflow-y: scroll;
-
-  margin-top: 1em;
-
-  width: 95vw;
-  max-height: 96vh;
-
-  background-color: #1a1a1a;
-  box-shadow: 0 0 15px 10px #0e0e0e;
-}
-
-@include midScreen {
-  .exit {
-    margin: 0.5em;
-
-    img {
-      width: 1.75rem;
-    }
-  }
-}
-
-@include smallScreen {
-  .modal_content {
-    max-height: 85vh;
-  }
-}
-</style>
@@ -1,85 +0,0 @@
-<template>
-  <img class="train-thumbnail" :src="placeholderUrl" v-if="isNotFound" />
-
-  <img
-    class="train-thumbnail"
-    v-else
-    :src="`https://rj.td2.info.pl/dist/img/thumbnails/${name.split(':')[0]}${
-      stockType == 'loco-ezt' ? 'rb' : ''
-    }.png`"
-    @error="onImageError"
-    @load="onImageLoad"
-    width="220"
-    height="60"
-  />
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-import { useStore } from '../../store/store';
-import { RollingStockInfo } from '../../scripts/interfaces/github_api/StockInfoGithubData';
-
-export default defineComponent({
-  props: {
-    name: {
-      type: String,
-      required: true
-    },
-
-    onlyFirstSegment: {
-      type: Boolean,
-      default: false
-    }
-  },
-
-  data() {
-    return {
-      store: useStore(),
-      isNotFound: false,
-      isLoaded: false
-    };
-  },
-
-  computed: {
-    url() {
-      return `https://rj.td2.info.pl/dist/img/thumbnails/${this.name.split(':')[0]}.png`;
-    },
-
-    placeholderUrl() {
-      return `/images/icon-${this.stockType}.png`;
-    },
-
-    stockType() {
-      if (!this.store.rollingStockData) return 'vehicle-unknown';
-
-      return (
-        Object.keys(this.store.rollingStockData.info).find((type) => {
-          return this.store.rollingStockData?.info[type as keyof RollingStockInfo].find(
-            (v) => v[0] === this.name.split(':')[0]
-          );
-        }) || 'vehicle-unknown'
-      );
-    }
-  },
-
-  methods: {
-    onImageError() {
-      this.isNotFound = true;
-      this.isLoaded = false;
-    },
-
-    onImageLoad() {
-      this.isNotFound = false;
-      this.isLoaded = true;
-    }
-  }
-});
-</script>
-
-<style lang="scss" scoped>
-.train-thumbnail {
-  width: auto;
-  height: auto;
-  max-height: 60px;
-}
-</style>
@@ -1,250 +0,0 @@
-<template>
-  <section class="daily-stats">
-    <span :data-active="statsStatus">
-      <b v-if="statsStatus == DataStatus.Loading">
-        {{ $t('app.loading') }}
-      </b>
-
-      <b v-else-if="stats.distanceSum == null">
-        {{ $t('journal.daily-stats-info') }}
-      </b>
-
-      <span class="stats-list" v-else>
-        <h3>
-          {{ $t('journal.daily-stats-title') }}
-          <b class="text--primary">{{ new Date().toLocaleDateString($i18n.locale) }}</b>
-        </h3>
-        <hr style="margin-bottom: 0.5em" />
-
-        <div v-if="stats.totalTimetables">
-          &bull;
-          <i18n-t keypath="journal.timetable-stats-total">
-            <template #count>
-              <b class="text--primary">
-                {{ stats.totalTimetables }}
-                {{ $t('journal.timetable-count', stats.totalTimetables) }}
-              </b>
-            </template>
-
-            <template #distance>
-              <b class="text--primary"> {{ stats.distanceSum?.toFixed(2) }} km</b>
-            </template>
-          </i18n-t>
-        </div>
-
-        <div v-if="stats.timetableId">
-          &bull;
-          <i18n-t keypath="journal.timetable-stats-longest">
-            <template #id>
-              <router-link :to="`/journal/timetables?timetableId=${stats.timetableId}`">
-                <b>{{ stats.timetableId }}</b>
-              </router-link>
-            </template>
-            <template #author>
-              <router-link :to="`/journal/dispatchers?dispatcherName=${stats.timetableAuthor}`">
-                <b>{{ stats.timetableAuthor }}</b>
-              </router-link>
-            </template>
-            <template #driver>
-              <b class="text--primary">{{ stats.timetableDriver }}</b>
-            </template>
-            <template #distance>
-              <b class="text--primary">{{ stats.timetableRouteDistance }} km</b>
-            </template>
-          </i18n-t>
-        </div>
-
-        <div v-if="topDispatchers.length == 1">
-          &bull;
-          <i18n-t keypath="journal.timetable-stats-most-active-dr">
-            <template #dispatcher>
-              <router-link :to="`/journal/dispatchers?dispatcherName=${topDispatchers[0].name}`">
-                <b>{{ topDispatchers[0].name }}</b>
-              </router-link>
-            </template>
-            <template #count>
-              <b class="text--primary">
-                {{ topDispatchers[0].count }}
-                {{ $t('journal.timetable-count', topDispatchers[0].count) }}
-              </b>
-            </template>
-          </i18n-t>
-        </div>
-
-        <div v-if="topDispatchers.length > 1">
-          &bull;
-          <i18n-t keypath="journal.timetable-stats-most-active-dr-many">
-            <template #dispatchers>
-              <span v-for="(disp, i) in topDispatchers" :key="i">
-                <span v-if="i == topDispatchers.length - 1"> {{ $t('general.and') }} </span>
-
-                <router-link :to="`/journal/dispatchers?dispatcherName=${disp.name}`">
-                  <b>{{ disp.name }}</b>
-                </router-link>
-
-                <span v-if="i < topDispatchers.length - 2">, </span>
-              </span>
-            </template>
-
-            <template #count>
-              <b class="text--primary">
-                {{ topDispatchers[0].count }}
-                {{ $t('journal.timetable-count', topDispatchers[0].count) }}
-              </b>
-            </template>
-          </i18n-t>
-        </div>
-
-        <div v-if="stats.longestDuties.length > 0">
-          &bull;
-          <i18n-t keypath="journal.timetable-stats-longest-duties">
-            <template #dispatcher>
-              <router-link
-                :to="`/journal/dispatchers?dispatcherName=${stats.longestDuties[0].name}`"
-              >
-                <b>{{ stats.longestDuties[0].name }}</b>
-              </router-link>
-            </template>
-
-            <template #station>{{ stats.longestDuties[0].station }}</template>
-
-            <template #duration>
-              {{ calculateDuration(stats.longestDuties[0].duration) }}
-            </template>
-          </i18n-t>
-        </div>
-
-        <div v-if="stats.mostActiveDrivers.length > 0">
-          &bull;
-          <i18n-t keypath="journal.timetable-stats-most-active-driver">
-            <template #driver>
-              <b class="text--primary">{{ stats.mostActiveDrivers[0].name }}</b>
-            </template>
-            <template #distance>
-              <b class="text--primary">{{ stats.mostActiveDrivers[0].distance.toFixed(2) }} km</b>
-            </template>
-          </i18n-t>
-        </div>
-      </span>
-    </span>
-  </section>
-</template>
-
-<script lang="ts">
-import axios from 'axios';
-import { defineComponent } from 'vue';
-import dateMixin from '../../mixins/dateMixin';
-import { DataStatus } from '../../scripts/enums/DataStatus';
-import {
-  ITimetablesDailyStats,
-  ITimetablesDailyStatsResponse
-} from '../../scripts/interfaces/api/StatsAPIData';
-import { URLs } from '../../scripts/utils/apiURLs';
-
-export default defineComponent({
-  mixins: [dateMixin],
-  emits: ['toggleStatsOpen'],
-
-  data() {
-    return {
-      DataStatus,
-      statsStatus: DataStatus.Loading,
-      intervalId: -1,
-
-      stats: {
-        totalTimetables: 0,
-        distanceSum: 0,
-        distanceAvg: 0,
-        timetableAuthor: '',
-        timetableDriver: '',
-        timetableId: 0,
-        timetableRouteDistance: 0,
-        longestDuties: [],
-        mostActiveDrivers: [],
-        mostActiveDispatchers: []
-      } as ITimetablesDailyStats
-    };
-  },
-
-  activated() {
-    this.startFetchingDailyStats();
-    this.$emit('toggleStatsOpen', true);
-  },
-
-  deactivated() {
-    this.stopFetchingDailyStats();
-  },
-
-  computed: {
-    topDispatchers() {
-      if (this.stats.mostActiveDispatchers.length == 0) return [];
-      const maxCount = this.stats.mostActiveDispatchers[0].count;
-
-      return this.stats.mostActiveDispatchers.filter((disp) => disp.count === maxCount);
-    }
-  },
-
-  methods: {
-    async fetchDailyTimetableStats() {
-      try {
-        const res: ITimetablesDailyStatsResponse = await (
-          await axios.get(`${URLs.stacjownikAPI}/api/getDailyTimetableStats`)
-        ).data;
-
-        this.stats = {
-          totalTimetables: res.totalTimetables,
-          distanceSum: res.distanceSum,
-          distanceAvg: res.distanceAvg,
-          timetableAuthor: res.maxTimetable?.authorName || '',
-          timetableDriver: res.maxTimetable?.driverName || '',
-          timetableId: res.maxTimetable?.id || 0,
-          timetableRouteDistance: res.maxTimetable?.routeDistance || 0,
-
-          mostActiveDispatchers: res.mostActiveDispatchers,
-          mostActiveDrivers: res.mostActiveDrivers,
-          longestDuties: res.longestDuties
-        };
-
-        this.statsStatus = DataStatus.Loaded;
-      } catch (error) {
-        console.error('Ups! Wystąpił błąd podczas pobierania statystyk rozkładów jazdy...');
-        this.statsStatus = DataStatus.Error;
-      }
-    },
-
-    startFetchingDailyStats() {
-      this.fetchDailyTimetableStats();
-
-      if (this.intervalId != -1) return;
-
-      this.intervalId = setInterval(this.fetchDailyTimetableStats, 60000);
-    },
-
-    stopFetchingDailyStats() {
-      clearInterval(this.intervalId);
-      this.intervalId = -1;
-    }
-  }
-});
-</script>
-
-<style lang="scss" scoped>
-@import '../../styles/responsive.scss';
-
-.daily-stats {
-  text-align: left;
-}
-.daily-stats > span[data-active='0'] {
-  opacity: 0.75;
-}
-
-.stats-list a {
-  text-decoration: underline;
-}
-
-@include smallScreen {
-  h3 {
-    text-align: center;
-  }
-}
-</style>
@@ -1,166 +0,0 @@
-<template>
-  <div class="stats_container" v-click-outside="() => (cardVisible = false)">
-    <button class="stats_button" @click="toggleCard">
-      Statystyki dyżurnego {{ store.dispatcherStatsName }}
-    </button>
-
-    <div class="stats_card" v-if="store.dispatcherStatsName && cardVisible">
-      <div>
-        <Loading v-if="!store.dispatcherStatsData" />
-
-        <div class="loading" v-else-if="!store.dispatcherStatsData._count._all">
-          Ten dyżurny nie ma jeszcze szczegółowych statystyk!
-        </div>
-
-        <div v-else>
-          <h3>STATYSTYKI WYSTAWIONYCH ROZKŁADÓW</h3>
-
-          <div class="info-stats" v-if="store.dispatcherStatsData._count._all">
-            <span class="stat-badge">
-              <span>LICZBA</span>
-              <span>{{ store.dispatcherStatsData._count._all }}</span>
-            </span>
-            <span class="stat-badge">
-              <span>SUMA (KM)</span>
-              <span>{{ store.dispatcherStatsData._sum.routeDistance.toFixed(2) }}km</span>
-            </span>
-            <span class="stat-badge">
-              <span>NAJDŁUŻSZY</span>
-              <span>{{ store.dispatcherStatsData._max.routeDistance.toFixed(2) }}km</span>
-            </span>
-            <span class="stat-badge">
-              <span>ŚREDNIO</span>
-              <span>{{ store.dispatcherStatsData._avg.routeDistance.toFixed(2) }}km</span>
-            </span>
-          </div>
-
-          <h3>OSTATNIE WYSTAWIONE ROZKŁADY</h3>
-          <div class="last-timetables">
-            <div class="timetable-row" v-for="timetable in timetables" :key="timetable.id">
-              #{{ timetable.timetableId }} |
-              <b>{{ timetable.trainCategoryCode }} {{ timetable.trainNo }}</b> |
-              {{ timetable.driverName }} ({{ timetable.routeDistance }}km)
-              <div>{{ timetable.route.replace('|', ' > ') }}</div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script lang="ts">
-import axios from 'axios';
-import { defineComponent } from 'vue';
-import { DispatcherStatsAPIData } from '../../scripts/interfaces/api/DispatcherStatsAPIData';
-import { TimetableHistory } from '../../scripts/interfaces/api/TimetablesAPIData';
-import { URLs } from '../../scripts/utils/apiURLs';
-import { useStore } from '../../store/store';
-import Loading from '../Global/Loading.vue';
-
-export default defineComponent({
-  components: { Loading },
-
-  setup() {
-    const store = useStore();
-
-    return {
-      store
-    };
-  },
-
-  data() {
-    return {
-      cardVisible: false,
-      lastDispatcherName: '',
-      timetables: [] as TimetableHistory[]
-    };
-  },
-
-  methods: {
-    toggleCard() {
-      if (!this.store.dispatcherStatsName) return;
-
-      this.cardVisible = !this.cardVisible;
-      if (this.cardVisible) this.fetchDispatcherStats();
-    },
-
-    async fetchDispatcherStats() {
-      if (this.lastDispatcherName != this.store.dispatcherStatsName) {
-        this.store.dispatcherStatsData = undefined;
-      }
-
-      const statsData: DispatcherStatsAPIData = await (
-        await axios.get(
-          `${URLs.stacjownikAPI}/api/getDispatcherInfo?name=${this.store.dispatcherStatsName}`
-        )
-      ).data;
-
-      const timetables: TimetableHistory[] = await (
-        await axios.get(
-          `${URLs.stacjownikAPI}/api/getTimetables?authorName=${this.store.dispatcherStatsName}`
-        )
-      ).data;
-
-      this.timetables = timetables;
-      this.store.dispatcherStatsData = statsData;
-      this.lastDispatcherName = this.store.dispatcherStatsName;
-    }
-  }
-});
-</script>
-
-<style lang="scss" scoped>
-@import '../../styles/responsive.scss';
-@import '../../styles/variables.scss';
-
-.stats_container {
-  position: relative;
-}
-
-.stats_card {
-  position: absolute;
-  z-index: 999;
-  top: 120%;
-  right: 0;
-  width: 500px;
-  max-width: 97vw;
-  min-height: 100px;
-  overflow: auto;
-
-  border-radius: 1em 0 1em 1em;
-  background-color: #222222f1;
-  box-shadow: 0 3px 10px 5px #131313;
-  padding: 1em 0.5em;
-}
-
-.last-timetables {
-  max-height: 400px;
-  margin: 0.5em 0;
-}
-
-.timetable-row {
-  width: 95%;
-  margin: 0.5em auto;
-  padding: 0.5em;
-
-  background-color: #4d4d4d;
-}
-
-h2.card-title {
-  font-size: 1.8em;
-}
-
-h3 {
-  margin-top: 1em;
-}
-
-h2,
-h3 {
-  text-align: center;
-}
-
-.last-timetables {
-  overflow-y: auto;
-}
-</style>
@@ -0,0 +1,271 @@
+<template>
+  <section class="daily-stats">
+    <span :data-active="statsStatus">
+      <span class="stats-list">
+        <h3>
+          {{ $t('journal.daily-stats.title') }}
+          <b class="text--primary">{{ new Date().toLocaleDateString($i18n.locale) }}</b>
+        </h3>
+
+        <hr class="header-separator" />
+
+        <b v-if="statsStatus == Status.Data.Loading">
+          {{ $t('app.loading') }}
+        </b>
+
+        <b class="text--error" v-else-if="statsStatus == Status.Data.Error">
+          {{ $t('journal.stats-error') }}
+        </b>
+
+        <b v-else-if="topDispatchers.length == 0">
+          {{ $t('journal.daily-stats.info') }}
+        </b>
+
+        <div v-else>
+          <div v-if="stats.totalTimetables">
+            &bull;
+            <i18n-t keypath="journal.daily-stats.total">
+              <template #count>
+                <b class="text--primary">
+                  {{ stats.totalTimetables }}
+                  {{ $t('journal.daily-stats.count', stats.totalTimetables) }}
+                </b>
+              </template>
+
+              <template #distance>
+                <b class="text--primary"> {{ stats.distanceSum?.toFixed(2) }} km</b>
+              </template>
+            </i18n-t>
+          </div>
+
+          <div v-if="stats.maxTimetable">
+            &bull;
+            <i18n-t keypath="journal.daily-stats.longest">
+              <template #id>
+                <router-link :to="`/journal/timetables?search-train=%23${stats.maxTimetable.id}`">
+                  <b>{{ stats.maxTimetable.id }}</b>
+                </router-link>
+              </template>
+              <template #author>
+                <router-link
+                  :to="`/journal/timetables?search-dispatcher=${stats.maxTimetable.authorName}`"
+                >
+                  <b>{{ stats.maxTimetable.authorName }}</b>
+                </router-link>
+              </template>
+              <template #driver>
+                <b class="text--primary">{{ stats.maxTimetable.driverName }}</b>
+              </template>
+              <template #distance>
+                <b class="text--primary">{{ stats.maxTimetable.routeDistance }} km</b>
+              </template>
+            </i18n-t>
+          </div>
+
+          <div v-if="topDispatchers.length == 1">
+            &bull;
+            <i18n-t keypath="journal.daily-stats.most-active-dr">
+              <template #dispatcher>
+                <router-link
+                  :to="`/journal/dispatchers?search-dispatcher=${topDispatchers[0].name}`"
+                >
+                  <b>{{ topDispatchers[0].name }}</b>
+                </router-link>
+              </template>
+              <template #count>
+                <b class="text--primary">
+                  {{ topDispatchers[0].count }}
+                  {{ $t('journal.daily-stats.count', topDispatchers[0].count) }}
+                </b>
+              </template>
+            </i18n-t>
+          </div>
+
+          <div v-if="topDispatchers.length > 1">
+            &bull;
+            <i18n-t keypath="journal.daily-stats.most-active-dr-many">
+              <template #dispatchers>
+                <span v-for="(disp, i) in topDispatchers" :key="i">
+                  <span v-if="i == topDispatchers.length - 1"> {{ $t('general.and') }} </span>
+
+                  <router-link :to="`/journal/dispatchers?search-dispatcher=${disp.name}`">
+                    <b>{{ disp.name }}</b>
+                  </router-link>
+
+                  <span v-if="i < topDispatchers.length - 2">, </span>
+                </span>
+              </template>
+
+              <template #count>
+                <b class="text--primary">
+                  {{ topDispatchers[0].count }}
+                  {{ $t('journal.daily-stats.count', topDispatchers[0].count) }}
+                </b>
+              </template>
+            </i18n-t>
+          </div>
+
+          <div v-if="stats.longestDuties.length > 0">
+            &bull;
+            <i18n-t keypath="journal.daily-stats.longest-duties">
+              <template #dispatcher>
+                <router-link
+                  :to="`/journal/dispatchers?search-dispatcher=${stats.longestDuties[0].name}`"
+                >
+                  <b>{{ stats.longestDuties[0].name }}</b>
+                </router-link>
+              </template>
+
+              <template #station>{{ stats.longestDuties[0].station }}</template>
+
+              <template #duration>
+                {{ calculateDuration(stats.longestDuties[0].duration) }}
+              </template>
+            </i18n-t>
+          </div>
+
+          <div v-if="stats.mostActiveDrivers.length > 0">
+            &bull;
+            <i18n-t keypath="journal.daily-stats.most-active-driver">
+              <template #driver>
+                <router-link
+                  :to="`/journal/timetables?search-driver=${stats.mostActiveDrivers[0].name}`"
+                >
+                  <b>{{ stats.mostActiveDrivers[0].name }}</b>
+                </router-link>
+              </template>
+              <template #distance>
+                <b class="text--primary">{{ stats.mostActiveDrivers[0].distance.toFixed(2) }} km</b>
+              </template>
+            </i18n-t>
+          </div>
+
+          <hr class="section-separator" />
+
+          <div class="stats-badges">
+            <span
+              class="stat-badge"
+              v-for="key in [
+                'rippedSwitches',
+                'derailments',
+                'skippedStopSignals',
+                'radioStops',
+                'kills'
+              ]"
+              :key="key"
+            >
+              <span>{{ $t(`journal.daily-stats.${key}`) }}</span>
+              <span>{{
+                Object.entries(stats.globalDiff).find(([k, v]) => k == key)?.[1] || '--'
+              }}</span>
+            </span>
+          </div>
+        </div>
+      </span>
+    </span>
+  </section>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import dateMixin from '../../mixins/dateMixin';
+
+import { API } from '../../typings/api';
+import { Status } from '../../typings/common';
+import { useApiStore } from '../../store/apiStore';
+
+export default defineComponent({
+  name: 'journal-daily-stats',
+
+  mixins: [dateMixin],
+  // emits: ['toggleStatsOpen'],
+
+  data() {
+    return {
+      Status,
+      statsStatus: Status.Data.Loading,
+      intervalId: -1,
+
+      stats: {} as API.DailyStats.Response,
+      apiStore: useApiStore()
+    };
+  },
+
+  activated() {
+    this.startFetchingDailyStats();
+    // this.$emit('toggleStatsOpen', true);
+  },
+
+  deactivated() {
+    this.stopFetchingDailyStats();
+  },
+
+  computed: {
+    topDispatchers() {
+      if (this.stats.mostActiveDispatchers.length == 0) return [];
+      const maxCount = this.stats.mostActiveDispatchers[0].count;
+
+      return this.stats.mostActiveDispatchers.filter((disp) => disp.count === maxCount);
+    }
+  },
+
+  methods: {
+    async fetchDailyTimetableStats() {
+      try {
+        const res: API.DailyStats.Response = await (
+          await this.apiStore.client!.get('api/getDailyStats')
+        ).data;
+
+        this.stats = res;
+
+        this.statsStatus = Status.Data.Loaded;
+      } catch (error) {
+        console.error('Ups! Wystąpił błąd podczas pobierania statystyk rozkładów jazdy...');
+        this.statsStatus = Status.Data.Error;
+      }
+    },
+
+    startFetchingDailyStats() {
+      this.fetchDailyTimetableStats();
+
+      if (this.intervalId != -1) return;
+
+      this.intervalId = window.setInterval(this.fetchDailyTimetableStats, 60000);
+    },
+
+    stopFetchingDailyStats() {
+      clearInterval(this.intervalId);
+      this.intervalId = -1;
+    }
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+@import '../../styles/responsive.scss';
+@import '../../styles/JournalStats.scss';
+@import '../../styles/badge.scss';
+
+.daily-stats {
+  text-align: left;
+}
+.daily-stats > span[data-active='0'] {
+  opacity: 0.75;
+}
+
+.stats-list a {
+  text-decoration: underline;
+}
+
+.stats-badges {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 0.5em;
+}
+
+@include smallScreen {
+  h3 {
+    text-align: center;
+  }
+}
+</style>
@@ -0,0 +1,85 @@
+<template>
+  <div class="journal-stats dispatcher" v-if="dispatcherName && stats">
+    <span class="loading" v-if="!stats.issuedTimetables && !stats.services">
+      {{ $t('journal.dispatcher-stats.empty') }}
+    </span>
+
+    <span v-else>
+      <h3>
+        <i18n-t keypath="journal.dispatcher-stats.title">
+          <template #name>
+            <span class="text--primary">{{ dispatcherName.toUpperCase() }}</span>
+          </template>
+        </i18n-t>
+      </h3>
+
+      <hr class="header-separator" />
+
+      <div class="info-stats">
+        <span class="stat-badge" v-if="stats.services">
+          <span>{{ $t('journal.dispatcher-stats.services-count') }}</span>
+          <span>{{ stats.services.count }}</span>
+        </span>
+
+        <span class="stat-badge" v-if="stats.services">
+          <span>{{ $t('journal.dispatcher-stats.service-max') }}</span>
+          <span>{{ calculateDuration(stats.services.durationMax) }}</span>
+        </span>
+
+        <span class="stat-badge" v-if="stats.services">
+          <span>{{ $t('journal.dispatcher-stats.service-avg') }}</span>
+          <span>{{ calculateDuration(stats.services.durationAvg) }}</span>
+        </span>
+      </div>
+
+      <hr class="section-separator" />
+
+      <div class="info-stats">
+        <span class="stat-badge" v-if="stats.issuedTimetables">
+          <span>{{ $t('journal.dispatcher-stats.timetables-count') }}</span>
+          <span>{{ stats.issuedTimetables.count }}</span>
+        </span>
+
+        <span class="stat-badge" v-if="stats.issuedTimetables">
+          <span>{{ $t('journal.dispatcher-stats.timetables-sum') }}</span>
+          <span>{{ stats.issuedTimetables.distanceSum.toFixed(2) }}km</span>
+        </span>
+
+        <span class="stat-badge" v-if="stats.issuedTimetables">
+          <span>{{ $t('journal.dispatcher-stats.timetables-max') }}</span>
+          <span>{{ stats.issuedTimetables.distanceMax.toFixed(2) }}km</span>
+        </span>
+
+        <span class="stat-badge" v-if="stats.issuedTimetables">
+          <span>{{ $t('journal.dispatcher-stats.timetables-avg') }}</span>
+          <span>{{ stats.issuedTimetables.distanceAvg.toFixed(2) }}km</span>
+        </span>
+      </div>
+    </span>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import dateMixin from '../../../mixins/dateMixin';
+import { useMainStore } from '../../../store/mainStore';
+
+export default defineComponent({
+  name: 'journal-dispatcher-stats',
+
+  mixins: [dateMixin],
+
+  setup() {
+    const store = useMainStore();
+
+    return {
+      stats: store.dispatcherStatsData,
+      dispatcherName: store.dispatcherStatsName
+    };
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+@import '../../../styles/JournalStats.scss';
+</style>
@@ -0,0 +1,257 @@
+<template>
+  <transition name="status-anim" mode="out-in">
+    <div :key="dataStatus">
+      <div class="journal_warning" v-if="store.isOffline">
+        {{ $t('app.offline') }}
+      </div>
+
+      <Loading v-else-if="dataStatus == Status.Data.Loading" />
+
+      <div v-else-if="dataStatus == Status.Data.Error" class="journal_warning error">
+        {{ $t('app.error') }}
+      </div>
+
+      <div class="journal_warning" v-else-if="dispatcherHistory.length == 0">
+        {{ $t('app.no-result') }}
+      </div>
+
+      <div v-else>
+        <table class="dispatchers-table">
+          <thead>
+            <th>{{ $t('journal.history-name') }}</th>
+            <th>{{ $t('journal.history-hash') }}</th>
+            <th>{{ $t('journal.history-dispatcher') }}</th>
+            <th>{{ $t('journal.history-level') }}</th>
+            <th>{{ $t('journal.history-rate') }}</th>
+            <th>{{ $t('journal.history-region') }}</th>
+            <th>{{ $t('journal.history-date') }}</th>
+          </thead>
+
+          <tbody>
+            <transition-group name="list-anim">
+              <tr v-for="historyItem in dispatcherHistory" :key="historyItem.id">
+                <td>
+                  <router-link
+                    :to="`/journal/dispatchers?search-station=${historyItem.stationName}`"
+                  >
+                    <b>{{ historyItem.stationName }}</b>
+                  </router-link>
+                </td>
+                <td>#{{ historyItem.stationHash }}</td>
+                <td>
+                  <router-link
+                    :to="`/journal/dispatchers?search-dispatcher=${historyItem.dispatcherName}`"
+                  >
+                    <b
+                      v-if="apiStore.donatorsData.includes(historyItem.dispatcherName)"
+                      class="text--donator"
+                      :title="$t('donations.dispatcher-message')"
+                    >
+                      {{ historyItem.dispatcherName }}
+                    </b>
+
+                    <b v-else>
+                      {{ historyItem.dispatcherName }}
+                    </b>
+                  </router-link>
+                </td>
+                <td>
+                  <b
+                    v-if="historyItem.dispatcherLevel !== null"
+                    class="level-badge dispatcher"
+                    :style="
+                      calculateExpStyle(
+                        historyItem.dispatcherLevel,
+                        historyItem.dispatcherIsSupporter
+                      )
+                    "
+                  >
+                    {{ historyItem.dispatcherLevel >= 2 ? historyItem.dispatcherLevel : 'L' }}
+                  </b>
+                </td>
+                <td class="text--primary">
+                  <b>{{ historyItem.dispatcherRate }}</b>
+                </td>
+                <td>
+                  <b class="region-badge" :aria-describedby="historyItem.region">{{
+                    regions.find((r) => r.id == historyItem.region)?.value || '???'
+                  }}</b>
+                </td>
+                <td style="min-width: 200px" class="time">
+                  <span v-if="historyItem.timestampTo" class="text--offline">
+                    <b>{{ $d(historyItem.timestampFrom) }}</b>
+                    {{ timestampToString(historyItem.timestampFrom) }}
+                    - {{ timestampToString(historyItem.timestampTo) }} ({{
+                      calculateDuration(historyItem.currentDuration)
+                    }})
+                  </span>
+                  <span class="dispatcher-online" v-else>
+                    <b class="text--online">
+                      <router-link :to="`/scenery?station=${historyItem.stationName}`">{{
+                        $t('journal.online-since')
+                      }}</router-link>
+                      {{ timestampToString(historyItem.timestampFrom) }}
+                    </b>
+                    ({{ calculateDuration(historyItem.currentDuration) }})
+                  </span>
+                </td>
+              </tr>
+            </transition-group>
+          </tbody>
+        </table>
+
+        <AddDataButton
+          :list="dispatcherHistory"
+          :scrollDataLoaded="scrollDataLoaded"
+          :scrollNoMoreData="scrollNoMoreData"
+          @addHistoryData="addHistoryData"
+        />
+      </div>
+
+      <div class="journal_warning" v-if="scrollNoMoreData">
+        {{ $t('journal.no-further-data') }}
+      </div>
+
+      <div class="journal_warning" v-else-if="!scrollDataLoaded">
+        {{ $t('journal.loading-further-data') }}
+      </div>
+    </div>
+  </transition>
+</template>
+
+<script lang="ts">
+import { defineComponent, PropType } from 'vue';
+import { regions } from '../../../data/options.json';
+import { useMainStore } from '../../../store/mainStore';
+import { API } from '../../../typings/api';
+import { Status } from '../../../typings/common';
+import Loading from '../../Global/Loading.vue';
+import AddDataButton from '../../Global/AddDataButton.vue';
+import dateMixin from '../../../mixins/dateMixin';
+import styleMixin from '../../../mixins/styleMixin';
+import { useApiStore } from '../../../store/apiStore';
+
+export default defineComponent({
+  components: { Loading, AddDataButton },
+
+  mixins: [dateMixin, styleMixin],
+
+  props: {
+    dispatcherHistory: {
+      type: Array as PropType<API.DispatcherHistory.Response>,
+      required: true
+    },
+    scrollNoMoreData: {
+      type: Boolean
+    },
+    scrollDataLoaded: {
+      type: Boolean
+    },
+    addHistoryData: {
+      type: Function as PropType<() => void>
+    },
+    dataStatus: {
+      type: Number as PropType<Status.Data>
+    }
+  },
+
+  data() {
+    return {
+      Status,
+      store: useMainStore(),
+      apiStore: useApiStore(),
+      regions
+    };
+  },
+
+  computed: {
+    computedDispatcherHistory() {
+      return this.dispatcherHistory.reduce(
+        (acc, historyItem, i) => {
+          if (this.isAnotherDay(i - 1, i))
+            acc.push(new Date(historyItem.timestampFrom).toLocaleDateString('pl-PL'));
+          acc.push(historyItem);
+
+          return acc;
+        },
+        [] as (API.DispatcherHistory.Data | string)[]
+      );
+    }
+  },
+
+  methods: {
+    navigateToScenery(name: string, isOnline: boolean) {
+      if (!isOnline) return;
+
+      this.$router.push(`/scenery?station=${name.trim().replace(/ /g, '_')}`);
+    },
+
+    isAnotherDay(prevIndex: number, currIndex: number) {
+      if (currIndex == 0) return true;
+
+      return (
+        new Date(this.dispatcherHistory[prevIndex].timestampFrom).getDate() !=
+        new Date(this.dispatcherHistory[currIndex].timestampFrom).getDate()
+      );
+    }
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+@import '../../../styles/animations.scss';
+@import '../../../styles/responsive.scss';
+@import '../../../styles/badge.scss';
+@import '../../../styles/variables.scss';
+@import '../../../styles/JournalSection.scss';
+
+table.dispatchers-table {
+  --_bg-table: #111;
+  --_bg-head: #101010;
+  --_bg-row: #2f2f2f;
+
+  width: 100%;
+  border-collapse: collapse;
+  position: relative;
+  text-align: center;
+
+  margin-bottom: 1em;
+
+  thead {
+    position: sticky;
+    top: 0;
+    background-color: var(--_bg-head);
+  }
+
+  th {
+    padding: 0.5em;
+  }
+
+  tr {
+    background-color: var(--_bg-row);
+    border-bottom: 2px solid black;
+
+    &:last-child {
+      border: none;
+    }
+  }
+
+  td {
+    padding: 0.75em;
+
+    .level-badge {
+      margin: 0 auto;
+    }
+  }
+}
+
+.text {
+  &--online {
+    color: springgreen;
+  }
+
+  &--offline {
+    color: #ddd;
+  }
+}
+</style>
@@ -1,253 +0,0 @@
-<template>
-  <div>
-    <transition name="status-anim" mode="out-in">
-      <div :key="dataStatus">
-        <div class="journal_warning" v-if="store.isOffline">
-          {{ $t('app.offline') }}
-        </div>
-
-        <Loading v-else-if="dataStatus == DataStatus.Loading" />
-
-        <div v-else-if="dataStatus == DataStatus.Error" class="journal_warning error">
-          {{ $t('app.error') }}
-        </div>
-
-        <div class="journal_warning" v-else-if="dispatcherHistory.length == 0">
-          {{ $t('app.no-result') }}
-        </div>
-
-        <div v-else>
-          <table class="scenery-history-table">
-            <thead>
-              <th>{{ $t('journal.history-name') }}</th>
-              <th>{{ $t('journal.history-hash') }}</th>
-              <th>{{ $t('journal.history-dispatcher') }}</th>
-              <th>{{ $t('journal.history-level') }}</th>
-              <th>{{ $t('journal.history-rate') }}</th>
-              <th>{{ $t('journal.history-region') }}</th>
-              <th>{{ $t('journal.history-date') }}</th>
-            </thead>
-
-            <tbody>
-              <transition-group name="list-anim">
-                <tr v-for="historyItem in dispatcherHistory" :key="historyItem.id">
-                  <td>
-                    <router-link
-                      :to="`/journal/dispatchers?sceneryName=${historyItem.stationName}`"
-                    >
-                      <b>{{ historyItem.stationName }}</b>
-                    </router-link>
-                  </td>
-                  <td>#{{ historyItem.stationHash }}</td>
-                  <td>
-                    <router-link
-                      :to="`/journal/dispatchers?dispatcherName=${historyItem.dispatcherName}`"
-                    >
-                      <b>{{ historyItem.dispatcherName }}</b>
-                    </router-link>
-                  </td>
-                  <td>
-                    <b
-                      v-if="historyItem.dispatcherLevel !== null"
-                      class="level-badge dispatcher"
-                      :style="
-                        calculateExpStyle(
-                          historyItem.dispatcherLevel,
-                          historyItem.dispatcherIsSupporter
-                        )
-                      "
-                    >
-                      {{ historyItem.dispatcherLevel >= 2 ? historyItem.dispatcherLevel : 'L' }}
-                    </b>
-                  </td>
-                  <td class="text--primary">
-                    <b>{{ historyItem.dispatcherRate }}</b>
-                  </td>
-                  <td>
-                    <b class="region-badge" :aria-describedby="historyItem.region">{{
-                      regions.find((r) => r.id == historyItem.region)?.value || '???'
-                    }}</b>
-                  </td>
-                  <td style="min-width: 200px" class="time">
-                    <span v-if="historyItem.timestampTo" class="text--offline">
-                      <b>{{ $d(historyItem.timestampFrom) }}</b>
-                      {{ timestampToString(historyItem.timestampFrom) }}
-                      - {{ timestampToString(historyItem.timestampTo) }} ({{
-                        calculateDuration(historyItem.currentDuration)
-                      }})
-                    </span>
-                    <span class="dispatcher-online" v-else>
-                      <b class="text--online">
-                        <router-link :to="`/scenery?station=${historyItem.stationName}`">{{
-                          $t('journal.online-since')
-                        }}</router-link>
-                        {{ timestampToString(historyItem.timestampFrom) }}
-                      </b>
-                      ({{ calculateDuration(historyItem.currentDuration) }})
-                    </span>
-                  </td>
-                </tr>
-              </transition-group>
-            </tbody>
-          </table>
-
-          <AddDataButton
-            :list="dispatcherHistory"
-            :scrollDataLoaded="scrollDataLoaded"
-            :scrollNoMoreData="scrollNoMoreData"
-            @addHistoryData="addHistoryData"
-          />
-        </div>
-      </div>
-    </transition>
-
-    <div class="journal_warning" v-if="scrollNoMoreData">
-      {{ $t('journal.no-further-data') }}
-    </div>
-
-    <div class="journal_warning" v-else-if="!scrollDataLoaded">
-      {{ $t('journal.loading-further-data') }}
-    </div>
-  </div>
-</template>
-
-<script lang="ts">
-import { defineComponent, PropType } from 'vue';
-import dateMixin from '../../mixins/dateMixin';
-import { DispatcherHistory } from '../../scripts/interfaces/api/DispatchersAPIData';
-import styleMixin from '../../mixins/styleMixin';
-import { DataStatus } from '../../scripts/enums/DataStatus';
-import { useStore } from '../../store/store';
-import Loading from '../Global/Loading.vue';
-import { regions } from '../../data/options.json';
-import AddDataButton from '../Global/AddDataButton.vue';
-
-export default defineComponent({
-  components: { Loading, AddDataButton },
-
-  mixins: [dateMixin, styleMixin],
-
-  props: {
-    dispatcherHistory: {
-      type: Array as PropType<DispatcherHistory[]>,
-      required: true
-    },
-    scrollNoMoreData: {
-      type: Boolean
-    },
-    scrollDataLoaded: {
-      type: Boolean
-    },
-    addHistoryData: {
-      type: Function as PropType<() => void>
-    },
-    dataStatus: {
-      type: Number as PropType<DataStatus>
-    }
-  },
-
-  data() {
-    return {
-      DataStatus,
-      store: useStore(),
-      regions
-    };
-  },
-
-  computed: {
-    computedDispatcherHistory() {
-      console.log(this.dispatcherHistory.length);
-
-      return this.dispatcherHistory.reduce(
-        (acc, historyItem, i) => {
-          if (this.isAnotherDay(i - 1, i))
-            acc.push(new Date(historyItem.timestampFrom).toLocaleDateString('pl-PL'));
-          acc.push(historyItem);
-
-          return acc;
-        },
-        [] as (DispatcherHistory | string)[]
-      );
-    }
-  },
-
-  methods: {
-    navigateToScenery(name: string, isOnline: boolean) {
-      if (!isOnline) return;
-
-      this.$router.push(`/scenery?station=${name.trim().replace(/ /g, '_')}`);
-    },
-
-    isAnotherDay(prevIndex: number, currIndex: number) {
-      if (currIndex == 0) return true;
-
-      return (
-        new Date(this.dispatcherHistory[prevIndex].timestampFrom).getDate() !=
-        new Date(this.dispatcherHistory[currIndex].timestampFrom).getDate()
-      );
-    }
-  }
-});
-</script>
-
-<style lang="scss" scoped>
-@import '../../styles/animations.scss';
-@import '../../styles/responsive.scss';
-@import '../../styles/badge.scss';
-@import '../../styles/variables.scss';
-@import '../../styles/JournalSection.scss';
-
-table.scenery-history-table {
-  --_bg-table: #111;
-  --_bg-head: #101010;
-  --_bg-row: #2f2f2f;
-
-  width: 100%;
-  border-collapse: collapse;
-  position: relative;
-  text-align: center;
-
-  margin-bottom: 1em;
-
-  thead {
-    position: sticky;
-    top: 0;
-    background-color: var(--_bg-head);
-  }
-
-  th {
-    padding: 0.5em;
-  }
-
-  tr {
-    background-color: var(--_bg-row);
-    border-bottom: 2px solid black;
-
-    &:last-child {
-      border: none;
-    }
-  }
-
-  td {
-    padding: 0.75em;
-
-    .level-badge {
-      margin: 0 auto;
-    }
-  }
-
-  @media screen and (max-width: 550px) {
-    font-size: 0.9em;
-  }
-}
-
-.text {
-  &--online {
-    color: springgreen;
-  }
-
-  &--offline {
-    color: #ddd;
-  }
-}
-</style>
@@ -1,6 +1,6 @@
 <template>
-  <div class="filters-options" @keydown.esc="showOptions = false">
-    <div class="bg" v-if="showOptions" @click="showOptions = false"></div>
+  <div class="filters-options dropdown" @keydown.esc="showOptions = false">
+    <div class="dropdown_background" v-if="showOptions" @click="showOptions = false"></div>

    <div class="actions-bar">
      <button
@@ -9,7 +9,7 @@
        ref="button"
      >
        <img src="/images/icon-filter2.svg" alt="Open filters" />
-        {{ $t('options.filters') }} [F]
+        [F] {{ $t('options.filters') }}
        <span class="active-indicator" v-if="currentOptionsActive"></span>
      </button>

@@ -27,13 +27,13 @@
      <option v-for="(sugg, i) in dispatcherSuggestions" :key="i" :value="sugg"></option>
    </datalist>

-    <transition name="options-anim">
-      <div class="options_wrapper" v-if="showOptions">
+    <transition name="dropdown-anim">
+      <div class="dropdown_wrapper" v-if="showOptions">
        <div class="options_content">
          <h1 class="option-title">{{ $t('options.search-title') }}</h1>
          <div class="search_content">
            <div class="search" v-for="(_, propName) in searchersValues" :key="propName">
-              <label v-if="propName == 'search-date'" for="date">{{
+              <label v-if="propName == 'search-date'" for="search-date">{{
                $t(`options.search-${optionsType}-date`)
              }}</label>

@@ -41,12 +41,13 @@
                <input
                  class="search-input"
                  v-model="searchersValues[propName]"
-                  @keydown.enter="onSearchConfirm"
+                  @keydown.enter="searchConfirm"
                  @focus="preventKeyDown = true"
                  @blur="preventKeyDown = false"
                  :placeholder="$t(`options.${propName}`)"
                  :type="propName == 'search-date' ? 'date' : 'text'"
                  :min="propName == 'search-date' ? '2022-02-01' : undefined"
+                  :id="`${propName}`"
                  :list="propName.toString()"
                />

@@ -110,15 +111,12 @@
 </template>

 <script lang="ts">
-import axios from 'axios';
 import { defineComponent, inject, PropType } from 'vue';
 import keyMixin from '../../mixins/keyMixin';
-import { DataStatus } from '../../scripts/enums/DataStatus';
-import { DriverStatsAPIData } from '../../scripts/interfaces/api/DriverStatsAPIData';
-import { URLs } from '../../scripts/utils/apiURLs';
-import { useStore } from '../../store/store';
-import { JournalFilterSection } from '../../scripts/enums/JournalFilterType';
-import { JournalFilter } from '../../scripts/types/JournalTimetablesTypes';
+import { useMainStore } from '../../store/mainStore';
+import { Journal } from './typings';
+import { Status } from '../../typings/common';
+import { useApiStore } from '../../store/apiStore';

 export default defineComponent({
  emits: ['onSearchConfirm', 'onOptionsReset', 'onRefreshData'],
@@ -131,13 +129,13 @@ export default defineComponent({
    },

    filters: {
-      type: Array as PropType<JournalFilter[]>,
+      type: Array as PropType<Journal.TimetableFilter[]>,
      default: () => []
    },

    dataStatus: {
-      type: Number as PropType<DataStatus>,
-      default: DataStatus.Initialized
+      type: Number as PropType<Status.Data>,
+      default: -1
    },

    currentOptionsActive: {
@@ -154,15 +152,15 @@ export default defineComponent({
  data() {
    return {
      showOptions: false,
-      JournalFilterSection,

      driverSuggestions: [] as string[],
      dispatcherSuggestions: [] as string[],

      searchTimeout: 0,
-      store: useStore(),
+      store: useMainStore(),
+      apiStore: useApiStore(),

-      DataStatus
+      JournalFilterSection: Journal.FilterSection
    };
  },

@@ -170,7 +168,7 @@ export default defineComponent({
    return {
      searchersValues: inject('searchersValues') as { [key: string]: string },
      sorterActive: inject('sorterActive') as { id: string | number; dir: number },
-      filterList: inject('filterList') as JournalFilter[] | undefined
+      filterList: inject('filterList') as Journal.TimetableFilter[] | undefined
    };
  },

@@ -184,12 +182,6 @@ export default defineComponent({
  },

  watch: {
-    async 'store.driverStatsName'() {
-      await this.fetchDriverStats();
-
-      // if (value) this.store.currentStatsTab = 'driver';
-    },
-
    async 'searchersValues.search-driver'(value: string | undefined) {
      clearTimeout(this.searchTimeout);

@@ -208,29 +200,34 @@ export default defineComponent({
  },

  methods: {
-    async fetchDriverStats() {
-      this.store.driverStatsData = undefined;
+    // filters & sorters from URL params
+    handleRouteParams() {
+      this.$router.push({
+        query: {
+          ...this.$route.query,
+          'sorter-active':
+            this.sorterOptionIds.indexOf(`${this.sorterActive.id}`) != 0
+              ? this.sorterActive.id
+              : undefined,
+          ...Object.keys(this.searchersValues).reduce(
+            (acc, k) => {
+              const searchVal = this.searchersValues[k as Journal.TimetableSearchKey];

-      if (!this.store.driverStatsName) {
-        this.store.driverStatsStatus = DataStatus.Initialized;
-        return;
-      }
+              acc[k] = searchVal || undefined;

-      try {
-        this.store.driverStatsStatus = DataStatus.Loading;
-
-        const statsData: DriverStatsAPIData = await (
-          await axios.get(
-            `${URLs.stacjownikAPI}/api/getDriverInfo?name=${this.store.driverStatsName}`
+              return acc;
+            },
+            {} as { [k: string]: string | undefined }
+          ),
+          ...this.filterList?.reduce(
+            (acc, f) => {
+              if (f.isActive) acc[f.filterSection] = f.default ? undefined : f.id;
+              return acc;
+            },
+            {} as { [k: string]: string | undefined }
          )
-        ).data;
-
-        this.store.driverStatsData = statsData;
-        this.store.driverStatsStatus = DataStatus.Loaded;
-      } catch (error) {
-        this.store.driverStatsStatus = DataStatus.Error;
-        console.error('Ups! Wystąpił błąd przy próbie pobrania statystyk maszynisty! :/');
-      }
+        }
+      });
    },

    refreshData() {
@@ -242,17 +239,17 @@ export default defineComponent({

      window.clearTimeout(this.searchTimeout);

-      this.searchTimeout = setTimeout(async () => {
+      this.searchTimeout = window.setTimeout(async () => {
        try {
          const suggestions: string[] = await (
-            await axios.get(`${URLs.stacjownikAPI}/api/get${type}Suggestions?name=${value}`)
+            await this.apiStore.client!.get(`api/get${type}Suggestions?name=${value}`)
          ).data;

          this[`${type}Suggestions`] = suggestions;
        } catch (error) {
          this[`${type}Suggestions`] = [];
        }
-      }, 450);
+      }, 250);
    },

    // Override keyMixin function
@@ -267,40 +264,43 @@ export default defineComponent({
    onSorterChange(item: { id: string | number; value: string }) {
      this.sorterActive.id = item.id;
      this.sorterActive.dir = -1;
-      this.$emit('onSearchConfirm');
+      this.searchConfirm();
    },

-    onFilterChange(filter: JournalFilter) {
+    onFilterChange(filter: Journal.TimetableFilter) {
      // this.journalFilterActive = filter;
      this.filterList
        ?.filter((f) => f.filterSection === filter.filterSection)
        .forEach((f) => (f.isActive = false));
      filter.isActive = true;

-      this.$emit('onSearchConfirm');
+      this.searchConfirm();
    },

    onInputClear(id: any) {
      this.searchersValues[id] = '';
-      this.$emit('onSearchConfirm');
+      this.searchConfirm();
    },

-    onSearchConfirm() {
+    searchConfirm() {
      this.$emit('onSearchConfirm');
+      this.handleRouteParams();
    },

    onSearchButtonConfirm() {
      this.showOptions = false;
-      this.$emit('onSearchConfirm');
+      this.searchConfirm();
    },

    onResetButtonClick() {
      this.$emit('onOptionsReset');
+      this.handleRouteParams();
    }
  }
 });
 </script>

 <style lang="scss" scoped>
-@import '../../styles/filters_options.scss';
+@import '../../styles/dropdown';
+@import '../../styles/dropdown_filters';
 </style>
@@ -1,121 +1,85 @@
 <template>
-  <div class="journal-stats" v-if="!store.isOffline">
-    <div class="tabs">
+  <div
+    class="journal-stats dropdown"
+    v-if="!mainStore.isOffline"
+    @keydown.esc="currentStatsTab = null"
+  >
+    <div
+      class="dropdown_background"
+      v-if="currentStatsTab !== null"
+      @click="currentStatsTab = null"
+    ></div>
+
+    <div class="actions-bar">
      <button
-        v-for="tab in data.tabs"
-        :key="tab.name"
-        class="btn--filled"
-        :data-selected="tab.name == store.currentStatsTab && areStatsOpen"
-        :data-inactive="tab.inactive"
-        :data-disabled="tab.inactive"
-        :disabled="tab.inactive"
-        @click="onTabButtonClick(tab.name)"
+        v-for="button in statsButtons"
+        :key="button.tab"
+        class="btn--filled btn--image"
+        :data-selected="button.tab == currentStatsTab"
+        :data-disabled="button.disabled"
+        :disabled="button.disabled"
+        @click="onTabButtonClick(button.tab)"
      >
-        {{ $t(tab.titlePath) }}
+        <img
+          v-if="button.iconName"
+          :src="`/images/icon-${button.iconName}.svg`"
+          :alt="button.iconName"
+        />
+        {{ $t(button.localeKey) }}
      </button>
    </div>

-    <div class="stats-tab" v-show="areStatsOpen">
-      <keep-alive>
-        <JournalDailyStats
-          v-if="store.currentStatsTab == 'daily'"
-          @toggleStatsOpen="toggleStatsOpen"
-        />
-        <JournalDriverStats v-else-if="store.currentStatsTab == 'driver'" />
-      </keep-alive>
-    </div>
+    <transition name="dropdown-anim">
+      <div class="dropdown_wrapper" v-if="currentStatsTab !== null">
+        <keep-alive>
+          <component :is="currentStatsTab" :key="currentStatsTab"></component>
+        </keep-alive>
+      </div>
+    </transition>
  </div>
 </template>

-<script setup lang="ts">
-import { computed, onMounted, reactive, Ref, ref, watch } from 'vue';
-import { useStore } from '../../store/store';
-import JournalDailyStats from './DailyStats.vue';
-import JournalDriverStats from './JournalDriverStats.vue';
-import StorageManager from '../../scripts/managers/storageManager';
+<script lang="ts">
+import { defineComponent, PropType } from 'vue';
+import { useMainStore } from '../../store/mainStore';
+import StorageManager from '../../managers/storageManager';
+import { Journal } from './typings';
+import JournalDailyStats from './JournalDailyStats.vue';
+import JournalDispatcherStats from '../JournalView/JournalDispatchers/JournalDispatcherStats.vue';
+import JournalDriverStats from '../JournalView/JournalTimetables/JournalDriverStats.vue';

-// Types
-type TStatTab = 'daily' | 'driver';
-
-// Variables
-const store = useStore();
-
-const lastDailyStatsOpen = ref(false);
-const areStatsOpen = ref(false);
-const lastClickedTab: Ref<'daily' | 'driver' | null> = ref(null);
-
-let data = reactive({
-  tabs: [
-    {
-      name: 'daily',
-      titlePath: 'journal.daily-stats-title'
-    },
-    {
-      name: 'driver',
-      titlePath: 'journal.driver-stats-title'
-      // inactive: true,
+export default defineComponent({
+  components: { JournalDailyStats, JournalDriverStats, JournalDispatcherStats },
+  props: {
+    statsButtons: {
+      type: Array as PropType<Journal.StatsButton[]>,
+      required: true
    }
-  ] as { name: TStatTab; titlePath: string; inactive?: boolean }[]
-});
+  },
+  data() {
+    return {
+      Journal,
+      mainStore: useMainStore(),
+      currentStatsTab: null as Journal.StatsTab | null
+    };
+  },

-// Methods
-function onTabButtonClick(tab: TStatTab) {
-  if (lastClickedTab.value == tab || !lastClickedTab.value || !areStatsOpen.value) areStatsOpen.value = !areStatsOpen.value;
+  methods: {
+    onTabButtonClick(tab: Journal.StatsTab) {
+      this.currentStatsTab = tab == this.currentStatsTab ? null : tab;

-  if (tab == 'daily') {
-    StorageManager.setBooleanValue('dailyStatsOpen', areStatsOpen.value);
-    lastDailyStatsOpen.value = areStatsOpen.value;
-  }
-
-  store.currentStatsTab = tab;
-  lastClickedTab.value = tab;
-
-  if (areStatsOpen.value == false) store.currentStatsTab = null;
-}
-
-function toggleStatsOpen(open: boolean) {
-  areStatsOpen.value = open;
-}
-
-watch(
-  computed(() => store.driverStatsData),
-  (statsData) => {
-    store.currentStatsTab = statsData ? 'driver' : lastClickedTab.value;
-    areStatsOpen.value = statsData ? true : lastClickedTab.value !== null;
-  }
-);
-
-onMounted(() => {
-  if (StorageManager.getBooleanValue('dailyStatsOpen')) {
-    areStatsOpen.value = true;
-    store.currentStatsTab = 'daily';
+      StorageManager.setStringValue('journalStatsTab', this.currentStatsTab ?? '');
+    }
  }
 });
 </script>

 <style lang="scss" scoped>
-@import '../../styles/JournalStats.scss';
+@import '../../styles/dropdown.scss';
+@import '../../styles/dropdown_filters.scss';
@import '../../styles/variables.scss';

-.tabs {
-  position: relative;
-
-  display: flex;
-  gap: 0.5em;
-
-  margin-bottom: 0.5em;
-
-  button {
-    font-weight: bold;
-    padding: 0.5em 0.75em;
-
-    &[data-inactive='true'] {
-      color: gray;
-    }
-
-    &[data-selected='true'] {
-      color: $accentCol;
-    }
-  }
+.dropdown_wrapper {
+  max-width: 100%;
 }
 </style>
@@ -1,14 +1,19 @@
 <template>
-  <div class="journal-stats">
-    <span v-if="store.driverStatsData">
+  <div class="journal-stats driver" v-if="store.driverStatsData">
+    <span>
      <h3>
-        {{ $t('journal.stats-title') }}
-        <span class="text--primary">{{ store.driverStatsName.toUpperCase() }}</span>
+        <i18n-t keypath="journal.driver-stats.title">
+          <template #name>
+            <span class="text--primary">{{ store.driverStatsName.toUpperCase() }}</span>
+          </template>
+        </i18n-t>
      </h3>

+      <hr class="header-separator" />
+
      <div class="info-stats">
        <span class="stat-badge">
-          <span>{{ $t('journal.stats-timetables') }}</span>
+          <span>{{ $t('journal.driver-stats.timetables') }}</span>
          <span
            >{{ store.driverStatsData._count.fulfilled }} /
            {{ store.driverStatsData._count._all }}</span
@@ -16,17 +21,17 @@
        </span>

        <span class="stat-badge">
-          <span>{{ $t('journal.stats-longest-timetable') }}</span>
+          <span>{{ $t('journal.driver-stats.longest-timetable') }}</span>
          <span> {{ store.driverStatsData._max.routeDistance.toFixed(2) }}km </span>
        </span>

        <span class="stat-badge">
-          <span>{{ $t('journal.stats-avg-timetable') }}</span>
+          <span>{{ $t('journal.driver-stats.avg-timetable') }}</span>
          <span> {{ store.driverStatsData._avg.routeDistance.toFixed(2) }}km </span>
        </span>

        <span class="stat-badge">
-          <span>{{ $t('journal.stats-distance') }}</span>
+          <span>{{ $t('journal.driver-stats.distance') }}</span>
          <span>
            {{ store.driverStatsData._sum.currentDistance.toFixed(2) }} /
            {{ store.driverStatsData._sum.routeDistance.toFixed(2) }}km
@@ -34,7 +39,7 @@
        </span>

        <span class="stat-badge">
-          <span>{{ $t('journal.stats-stations') }}</span>
+          <span>{{ $t('journal.driver-stats.stations') }}</span>
          <span>
            {{ store.driverStatsData._sum.confirmedStopsCount }} /
            {{ store.driverStatsData._sum.allStopsCount }}
@@ -42,32 +47,26 @@
        </span>
      </div>
    </span>
-
-    <b v-else-if="store.driverStatsStatus == DataStatus.Loading">{{
-      $t('journal.stats-loading')
-    }}</b>
-    <b v-else-if="store.driverStatsStatus == DataStatus.Error">
-      {{ $t('journal.stats-error ') }}
-    </b>
-    <b v-else>{{ $t('journal.driver-stats-info') }}</b>
  </div>
 </template>

 <script lang="ts">
 import { defineComponent } from 'vue';
-import { DataStatus } from '../../scripts/enums/DataStatus';
-import { useStore } from '../../store/store';
+import { useMainStore } from '../../../store/mainStore';
+import { Status } from '../../../typings/common';

 export default defineComponent({
+  name: 'journal-driver-stats',
+
  data() {
    return {
-      store: useStore(),
-      DataStatus
+      store: useMainStore(),
+      Status: Status
    };
  }
 });
 </script>

 <style lang="scss" scoped>
-@import '../../styles/JournalStats.scss';
+@import '../../../styles/JournalStats.scss';
 </style>
@@ -6,9 +6,9 @@
          {{ $t('app.offline') }}
        </div>

-        <Loading v-else-if="dataStatus == DataStatus.Loading" />
+        <Loading v-else-if="dataStatus == Status.Data.Loading" />

-        <div v-else-if="dataStatus == DataStatus.Error" class="journal_warning error">
+        <div v-else-if="dataStatus == Status.Data.Error" class="journal_warning error">
          {{ $t('app.error') }}
        </div>

@@ -17,7 +17,34 @@
        </div>

        <div v-else>
-          <TimetableHistoryList :timetableHistory="timetableHistory" />
+          <ul class="journal-list">
+            <transition-group name="list-anim">
+              <li
+                v-for="{ timetable, showExtraInfo } in computedTimetableHistory"
+                class="journal_item"
+                :key="timetable.id"
+                @click="showExtraInfo.value = !showExtraInfo.value"
+              >
+                <div class="journal_item-info">
+                  <!-- General -->
+                  <TimetableGeneral :timetable="timetable" />
+                  <!-- Route -->
+                  <span class="item-route">
+                    <b>{{ timetable.route.replace('|', ' - ') }}</b>
+                  </span>
+
+                  <hr />
+                  <!-- Stops -->
+                  <TimetableStops :timetable="timetable" :showExtraInfo="showExtraInfo.value" />
+                  <!-- Status -->
+                  <TimetableStatus :timetable="timetable" />
+
+                  <!-- Extra -->
+                  <TimetableDetails :timetable="timetable" :showExtraInfo="showExtraInfo.value" />
+                </div>
+              </li>
+            </transition-group>
+          </ul>

          <AddDataButton
            :list="timetableHistory"
@@ -37,21 +64,33 @@
 </template>

 <script lang="ts">
-import { defineComponent, PropType } from 'vue';
-import { DataStatus } from '../../../scripts/enums/DataStatus';
-import { TimetableHistory } from '../../../scripts/interfaces/api/TimetablesAPIData';
-import { useStore } from '../../../store/store';
+import { defineComponent, PropType, ref } from 'vue';

 import Loading from '../../Global/Loading.vue';
 import AddDataButton from '../../Global/AddDataButton.vue';
-import TimetableHistoryList from './TimetableHistoryList.vue';
+
+import { useMainStore } from '../../../store/mainStore';
+import { Status } from '../../../typings/common';
+import { API } from '../../../typings/api';
+
+import TimetableGeneral from './TimetableGeneral.vue';
+import TimetableStops from './TimetableStops.vue';
+import TimetableStatus from './TimetableStatus.vue';
+import TimetableDetails from './TimetableDetails.vue';

 export default defineComponent({
-  components: { Loading, AddDataButton, TimetableHistoryList },
+  components: {
+    Loading,
+    AddDataButton,
+    TimetableDetails,
+    TimetableGeneral,
+    TimetableStatus,
+    TimetableStops
+  },

  props: {
    timetableHistory: {
-      type: Array as PropType<TimetableHistory[]>,
+      type: Array as PropType<API.TimetableHistory.Response>,
      required: true
    },
    scrollNoMoreData: {
@@ -64,15 +103,24 @@ export default defineComponent({
      type: Function as PropType<() => void>
    },
    dataStatus: {
-      type: Number as PropType<DataStatus>
+      type: Number as PropType<Status.Data>
    }
  },

  data() {
    return {
-      DataStatus,
-      store: useStore()
+      Status,
+      store: useMainStore()
    };
+  },
+
+  computed: {
+    computedTimetableHistory() {
+      return this.timetableHistory.map((timetable) => ({
+        timetable,
+        showExtraInfo: ref(false)
+      }));
+    }
  }
 });
 </script>
@@ -80,4 +128,15 @@ export default defineComponent({
 <style lang="scss" scoped>
@import '../../../styles/JournalSection.scss';
@import '../../../styles/animations.scss';
+
+@include smallScreen {
+  .journal_item-info {
+    text-align: center;
+  }
+
+  .item-route {
+    display: flex;
+    justify-content: center;
+  }
+}
 </style>
@@ -0,0 +1,195 @@
+<template>
+  <div>
+    <div class="details-actions">
+      <button class="btn--action">
+        <b>{{ $t('journal.stock-info') }}</b>
+        <img :src="`/images/icon-arrow-${showExtraInfo ? 'asc' : 'desc'}.svg`" alt="Arrow icon" />
+      </button>
+    </div>
+
+    <div class="details-body" v-if="timetable.stockString && timetable.stockMass && showExtraInfo">
+      <hr />
+
+      <div class="stock-specs">
+        <span class="badge">
+          <span>{{ $t('journal.dispatcher-name') }}</span>
+          <span>{{ timetable.authorName }}</span>
+        </span>
+      </div>
+
+      <div class="stock-specs">
+        <span class="badge">
+          <span>{{ $t('journal.stock-max-speed') }}</span>
+          <span>{{ timetable.maxSpeed }}km/h</span>
+        </span>
+
+        <span class="badge">
+          <span>{{ $t('journal.stock-length') }}</span>
+          <span>
+            {{
+              currentHistoryIndex == 0
+                ? timetable.stockLength
+                : stockHistory[currentHistoryIndex].stockLength || timetable.stockLength
+            }}m
+          </span>
+        </span>
+
+        <span class="badge">
+          <span>{{ $t('journal.stock-mass') }}</span>
+          <span>
+            {{
+              Math.floor(
+                (currentHistoryIndex == 0
+                  ? timetable.stockMass!
+                  : stockHistory[currentHistoryIndex].stockMass || timetable.stockMass) / 1000
+              )
+            }}t
+          </span>
+        </span>
+      </div>
+
+      <!-- Historia zmian w składzie -->
+      <div class="stock-history" v-if="stockHistory.length > 1">
+        <button
+          v-for="(sh, i) in stockHistory"
+          :key="i"
+          class="btn--action"
+          :data-checked="i == currentHistoryIndex"
+          @click.stop="currentHistoryIndex = i"
+        >
+          {{ sh.updatedAt }}
+        </button>
+      </div>
+
+      <StockList
+        :trainStockList="
+          (currentHistoryIndex == 0
+            ? timetable.stockString
+            : stockHistory[currentHistoryIndex].stockString
+          ).split(';')
+        "
+      />
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { PropType, defineComponent } from 'vue';
+import StockList from '../../Global/StockList.vue';
+import { API } from '../../../typings/api';
+
+export default defineComponent({
+  components: { StockList },
+  props: {
+    showExtraInfo: {
+      type: Boolean,
+      required: true
+    },
+    timetable: {
+      type: Object as PropType<API.TimetableHistory.Data>,
+      required: true
+    }
+  },
+  data() {
+    return {
+      currentHistoryIndex: 0
+    };
+  },
+  computed: {
+    stockHistory() {
+      return this.timetable.stockHistory
+        .slice()
+        .reverse()
+        .map((h) => {
+          const historyData = h.split('@');
+          return {
+            updatedAt: new Date(Number(historyData[0])).toLocaleTimeString(this.$i18n.locale, {
+              hour: '2-digit',
+              minute: '2-digit'
+            }),
+            stockString: historyData[1],
+            stockMass: Number(historyData[2]) || undefined,
+            stockLength: Number(historyData[3]) || undefined
+          };
+        });
+    }
+  },
+  methods: {
+    onImageError(e: Event) {
+      const imageEl = e.target as HTMLImageElement;
+      imageEl.src = '/images/icon-unknown.png';
+    }
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+@import '../../../styles/variables.scss';
+@import '../../../styles/responsive.scss';
+@import '../../../styles/badge.scss';
+
+.details-body {
+  margin-top: 0.5em;
+}
+
+.details-actions {
+  display: flex;
+
+  button img {
+    height: 1.25em;
+  }
+}
+
+.stock-history {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 0.5em;
+  margin-top: 1em;
+
+  button[data-checked='true'] {
+    color: $accentCol;
+  }
+}
+
+.stock-specs {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 0.5em;
+  margin-top: 0.5em;
+
+  .badge {
+    margin: 0;
+
+    span:last-child {
+      color: black;
+      background-color: $accentCol;
+    }
+  }
+}
+
+ul.stock-list {
+  display: flex;
+  align-items: flex-end;
+  overflow: auto;
+
+  padding-bottom: 0.5em;
+
+  li > div {
+    margin: 1em 0;
+
+    text-align: center;
+    color: #aaa;
+    font-size: 0.9em;
+  }
+}
+
+@include smallScreen() {
+  .stock-specs {
+    justify-content: center;
+  }
+
+  .details-actions {
+    justify-content: center;
+  }
+}
+</style>
@@ -1,183 +0,0 @@
-<template>
-  <div class="item-extra" v-if="timetable.stockString && timetable.stockMass && showExtraInfo">
-    <hr />
-
-    <div class="stock-specs">
-      <span class="badge">
-        <span>{{ $t('journal.dispatcher-name') }}</span>
-        <span>{{ timetable.authorName }}</span>
-      </span>
-    </div>
-
-    <div class="stock-specs">
-      <span class="badge">
-        <span>{{ $t('journal.stock-max-speed') }}</span>
-        <span>{{ timetable.maxSpeed }}km/h</span>
-      </span>
-
-      <span class="badge">
-        <span>{{ $t('journal.stock-length') }}</span>
-        <span>
-          {{
-            currentHistoryIndex == 0
-              ? timetable.stockLength
-              : stockHistory[currentHistoryIndex].stockLength || timetable.stockLength
-          }}m
-        </span>
-      </span>
-
-      <span class="badge">
-        <span>{{ $t('journal.stock-mass') }}</span>
-        <span>
-          {{
-            Math.floor(
-              (currentHistoryIndex == 0
-                ? timetable.stockMass!
-                : stockHistory[currentHistoryIndex].stockMass || timetable.stockMass) / 1000
-            )
-          }}t
-        </span>
-      </span>
-    </div>
-
-    <!-- Historia zmian w składzie -->
-    <div class="stock-history" v-if="stockHistory.length > 1">
-      <button
-        v-for="(sh, i) in stockHistory"
-        :key="i"
-        class="btn--action"
-        :data-checked="i == currentHistoryIndex"
-        @click.stop="currentHistoryIndex = i"
-      >
-        {{ sh.updatedAt }}
-      </button>
-    </div>
-
-    <!-- <StockList :trainStockList="currentHistoryIndex == 0 ? timetable.stockString : stockHistory[currentHistoryIndex].stockString).split(';')" /> -->
-    <StockList
-      :trainStockList="
-        (currentHistoryIndex == 0
-          ? timetable.stockString
-          : stockHistory[currentHistoryIndex].stockString
-        ).split(';')
-      "
-    />
-
-    <!-- <ul class="stock-list">
-      <li
-        v-for="(stockName, i) in (currentHistoryIndex == 0 ? timetable.stockString : stockHistory[currentHistoryIndex].stockString).split(';')"
-        :key="i"
-      >
-        <div>{{ stockName.split(':')[0].split('_').splice(0, 2).join(' ') }} {{ stockName.split(':')[1] }}</div>
-        <TrainThumbnail :name="stockName" />
-      </li>
-    </ul> -->
-  </div>
-</template>
-
-<script lang="ts">
-import { PropType, defineComponent } from 'vue';
-import { TimetableHistory } from '../../../scripts/interfaces/api/TimetablesAPIData';
-import StockList from '../../Global/StockList.vue';
-
-export default defineComponent({
-  components: { StockList },
-  props: {
-    showExtraInfo: {
-      type: Boolean,
-      required: true
-    },
-    timetable: {
-      type: Object as PropType<TimetableHistory>,
-      required: true
-    }
-  },
-  data() {
-    return {
-      currentHistoryIndex: 0
-    };
-  },
-  computed: {
-    stockHistory() {
-      return this.timetable.stockHistory
-        .slice()
-        .reverse()
-        .map((h) => {
-          const historyData = h.split('@');
-          return {
-            updatedAt: new Date(Number(historyData[0])).toLocaleTimeString(this.$i18n.locale, {
-              hour: '2-digit',
-              minute: '2-digit'
-            }),
-            stockString: historyData[1],
-            stockMass: Number(historyData[2]) || undefined,
-            stockLength: Number(historyData[3]) || undefined
-          };
-        });
-    }
-  },
-  methods: {
-    onImageError(e: Event) {
-      const imageEl = e.target as HTMLImageElement;
-      imageEl.src = '/images/icon-unknown.png';
-    }
-  }
-});
-</script>
-
-<style lang="scss" scoped>
-@import '../../../styles/variables.scss';
-@import '../../../styles/responsive.scss';
-@import '../../../styles/badge.scss';
-
-.item-extra {
-  margin-top: 0.5em;
-}
-
-.stock-history {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 0.5em;
-  margin-top: 1em;
-
-  button[data-checked='true'] {
-    color: $accentCol;
-  }
-}
-
-.stock-specs {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 0.5em;
-  margin-top: 0.5em;
-
-  .badge {
-    margin: 0;
-
-    span:last-child {
-      color: black;
-      background-color: $accentCol;
-    }
-  }
-
-  @include smallScreen() {
-    justify-content: center;
-  }
-}
-
-ul.stock-list {
-  display: flex;
-  align-items: flex-end;
-  overflow: auto;
-
-  padding-bottom: 0.5em;
-
-  li > div {
-    margin: 1em 0;
-
-    text-align: center;
-    color: #aaa;
-    font-size: 0.9em;
-  }
-}
-</style>
@@ -1,11 +1,6 @@
 <template>
  <div class="item-general">
-    <span
-      class="general-train"
-      tabindex="0"
-      @click.stop="showTimetable(timetable, $event.currentTarget)"
-      @keydown.enter="showTimetable(timetable, $event.currentTarget)"
-    >
+    <span class="general-train">
      <span class="text--grayed">#{{ timetable.id }}</span>

      <span class="badges" v-if="timetable.skr || timetable.twr">
@@ -28,7 +23,17 @@
        {{ timetable.driverLevel < 2 ? 'L' : `${timetable.driverLevel}` }}
      </strong>

-      <strong>{{ timetable.driverName }}</strong>
+      <strong
+        v-if="apiStore.donatorsData.includes(timetable.driverName)"
+        class="text--donator"
+        :title="$t('donations.driver-message')"
+      >
+        {{ timetable.driverName }}
+      </strong>
+
+      <strong v-else>
+        {{ timetable.driverName }}
+      </strong>
    </span>

    <span class="general-time">
@@ -52,45 +57,61 @@
          !timetable.terminated
            ? $t('journal.timetable-active')
            : timetable.fulfilled
-            ? $t('journal.timetable-fulfilled')
-            : `${$t('journal.timetable-abandoned')} ${localeTime(timetable.endDate, $i18n.locale)}`
+              ? $t('journal.timetable-fulfilled')
+              : `${$t('journal.timetable-abandoned')} ${localeTime(timetable.endDate, $i18n.locale)}`
        }}
      </b>
+
+      <button
+        v-if="timetable.terminated == false"
+        class="btn--action btn-timetable"
+        @click.stop="showTimetable(timetable, $event.currentTarget)"
+      >
+        <img src="/images/icon-train.svg" alt="train icon" />
+        <b>{{ $t('journal.timetable-online-button') }}</b>
+      </button>
    </span>
  </div>
 </template>

 <script lang="ts">
 import { PropType, defineComponent } from 'vue';
-import { TimetableHistory } from '../../../scripts/interfaces/api/TimetablesAPIData';

+import { API } from '../../../typings/api';
 import dateMixin from '../../../mixins/dateMixin';
 import modalTrainMixin from '../../../mixins/modalTrainMixin';
 import styleMixin from '../../../mixins/styleMixin';
+import { useApiStore } from '../../../store/apiStore';

 export default defineComponent({
  mixins: [dateMixin, modalTrainMixin, styleMixin],

+  data() {
+    return {
+      apiStore: useApiStore()
+    };
+  },
+
  props: {
    timetable: {
-      type: Object as PropType<TimetableHistory>,
+      type: Object as PropType<API.TimetableHistory.Data>,
      required: true
    }
  },

  methods: {
-    showTimetable(timetable: TimetableHistory, target: EventTarget | null) {
+    showTimetable(timetable: API.TimetableHistory.Data, target: EventTarget | null) {
      if (timetable?.terminated) return;

-      this.selectModalTrain(timetable.driverName + timetable.trainNo.toString(), target);
+      this.selectModalTrainById(`${timetable.driverName}${timetable.trainNo}`, target);
    }
  }
 });
 </script>

 <style lang="scss" scoped>
-@import '../../../styles/responsive.scss';
-@import '../../../styles/badge.scss';
+@import '../../../styles/responsive';
+@import '../../../styles/badge';

 .item-general {
  display: flex;
@@ -100,14 +121,29 @@ export default defineComponent({

  gap: 0.5em;
  margin-bottom: 0.5em;
-
-  @include smallScreen() {
-    justify-content: center;
-  }
 }

-.info-date {
-  margin-right: 0.5em;
+.general-train {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 0.25em;
+
+  cursor: pointer;
+  line-height: 2;
+}
+
+.general-time {
+  display: flex;
+  align-items: center;
+
+  gap: 0.5em;
+}
+
+.badges {
+  display: flex;
+  gap: 0.25em;
 }

 .info-badge {
@@ -127,11 +163,18 @@ export default defineComponent({
  }
 }

-.general-train {
-  cursor: pointer;
+.btn-timetable {
  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-  gap: 0.25em;
+  padding: 0.2em 0.5em;
+
+  img {
+    height: 1.25em;
+  }
+}
+
+@include smallScreen {
+  .item-general {
+    justify-content: center;
+  }
 }
 </style>
@@ -21,7 +21,7 @@
          <!-- Status -->
          <TimetableStatus :timetable="timetable" />

-          <button class="btn--option btn--show">
+          <button class="btn--action btn--show">
            {{ $t('journal.stock-info') }}
            <img
              :src="`/images/icon-arrow-${showExtraInfo.value ? 'asc' : 'desc'}.svg`"
@@ -38,17 +38,19 @@

 <script lang="ts">
 import { PropType, defineComponent, ref } from 'vue';
-import { TimetableHistory } from '../../../scripts/interfaces/api/TimetablesAPIData';

 import TimetableGeneral from './TimetableGeneral.vue';
 import TimetableStops from './TimetableStops.vue';
 import TimetableStatus from './TimetableStatus.vue';
 import TimetableExtra from './TimetableExtra.vue';
+import { API } from '../../../typings/api';

 export default defineComponent({
+  components: { TimetableGeneral, TimetableStops, TimetableStatus, TimetableExtra },
+
  props: {
    timetableHistory: {
-      type: Array as PropType<TimetableHistory[]>,
+      type: Array as PropType<API.TimetableHistory.Response>,
      required: true
    }
  },
@@ -59,16 +61,14 @@ export default defineComponent({
        showExtraInfo: ref(false)
      }));
    }
-  },
-  methods: {},
-  components: { TimetableGeneral, TimetableStops, TimetableStatus, TimetableExtra }
+  }
 });
 </script>

 <style lang="scss" scoped>
-@import '../../../styles/variables.scss';
-@import '../../../styles/responsive.scss';
-@import '../../../styles/JournalSection.scss';
+@import '../../../styles/variables';
+@import '../../../styles/responsive';
+@import '../../../styles/JournalSection';

 .btn--show {
  display: flex;
@@ -44,14 +44,14 @@

 <script lang="ts">
 import { PropType, defineComponent } from 'vue';
-import { TimetableHistory } from '../../../scripts/interfaces/api/TimetablesAPIData';
 import ProgressBar from '../../Global/ProgressBar.vue';
+import { API } from '../../../typings/api';

 export default defineComponent({
  components: { ProgressBar },
  props: {
    timetable: {
-      type: Object as PropType<TimetableHistory>,
+      type: Object as PropType<API.TimetableHistory.Data>,
      required: true
    }
  }
@@ -24,8 +24,7 @@
 <script lang="ts">
 import { PropType, defineComponent } from 'vue';
 import dateMixin from '../../../mixins/dateMixin';
-
-import { TimetableHistory } from '../../../scripts/interfaces/api/TimetablesAPIData';
+import { API } from '../../../typings/api';

 export default defineComponent({
  mixins: [dateMixin],
@@ -37,7 +36,7 @@ export default defineComponent({
    },

    timetable: {
-      type: Object as PropType<TimetableHistory>,
+      type: Object as PropType<API.TimetableHistory.Data>,
      required: true
    }
  },
@@ -0,0 +1,67 @@
+export namespace Journal {
+  export type DispatcherSearchKey = 'search-dispatcher' | 'search-station' | 'search-date';
+
+  export type TimetableSearchKey =
+    | 'search-driver'
+    | 'search-train'
+    | 'search-date'
+    | 'search-dispatcher'
+    | 'search-issuedFrom';
+
+  export type TimetableSearchType = {
+    [key in TimetableSearchKey]: string;
+  };
+
+  export type DispatcherSearchType = {
+    [key in DispatcherSearchKey]: string;
+  };
+
+  export type TimetableSorterKey = 'timetableId' | 'beginDate' | 'distance' | 'total-stops';
+  export type DispatcherSorterKey = 'timestampFrom' | 'duration';
+
+  export interface DispatcherSorter {
+    id: DispatcherSorterKey;
+    dir: -1 | 1;
+  }
+
+  export interface TimetableSorter {
+    id: TimetableSorterKey;
+    dir: 'asc' | 'desc';
+  }
+
+  export const enum TimetableFilterId {
+    ALL_STATUSES = 'all-statuses',
+    ACTIVE = 'active',
+    FULFILLED = 'fulfilled',
+    ABANDONED = 'abandoned',
+    ALL_SPECIALS = 'all-specials',
+    TWR = 'twr',
+    SKR = 'skr',
+    TWR_SKR = 'twr-skr'
+  }
+
+  export enum FilterSection {
+    TIMETABLE_STATUS = 'timetable-status',
+    SPECIAL = 'special'
+  }
+
+  export interface TimetableFilter {
+    id: TimetableFilterId;
+    filterSection: string;
+    isActive: boolean;
+    default: boolean;
+  }
+
+  export enum StatsTab {
+    DRIVER_STATS = 'journal-driver-stats',
+    DISPATCHER_STATS = 'journal-dispatcher-stats',
+    DAILY_STATS = 'journal-daily-stats'
+  }
+
+  export interface StatsButton {
+    tab: StatsTab;
+    localeKey: string;
+    iconName: string;
+    disabled: boolean;
+  }
+}
@@ -19,7 +19,9 @@
        <tr v-for="historyItem in historyList" :key="historyItem.id">
          <td>#{{ historyItem.stationHash }}</td>
          <td>
-            <router-link :to="`/journal/dispatchers?dispatcherName=${historyItem.dispatcherName}`">
+            <router-link
+              :to="`/journal/dispatchers?search-dispatcher=${historyItem.dispatcherName}`"
+            >
              <b>{{ historyItem.dispatcherName }}</b>
            </router-link>
          </td>
@@ -33,6 +35,8 @@
            >
              {{ historyItem.dispatcherLevel >= 2 ? historyItem.dispatcherLevel : 'L' }}
            </b>
+
+            <b v-else>?</b>
          </td>
          <td class="text--primary">
            <b>{{ historyItem.dispatcherRate }}</b>
@@ -66,38 +70,33 @@
 </template>

 <script lang="ts">
-import axios from 'axios';
 import { defineComponent, PropType } from 'vue';
 import dateMixin from '../../mixins/dateMixin';
-import { DataStatus } from '../../scripts/enums/DataStatus';
-import { DispatcherHistory } from '../../scripts/interfaces/api/DispatchersAPIData';
-import Station from '../../scripts/interfaces/Station';
-import { URLs } from '../../scripts/utils/apiURLs';
 import Loading from '../Global/Loading.vue';
 import styleMixin from '../../mixins/styleMixin';
-import listObserverMixin from '../../mixins/listObserverMixin';
-import { OnlineScenery } from '../../scripts/interfaces/store/storeTypes';
+import { API } from '../../typings/api';
+import { ActiveScenery, Station, Status } from '../../typings/common';
+import { useApiStore } from '../../store/apiStore';

 export default defineComponent({
  name: 'SceneryDispatchersHistory',
-  mixins: [dateMixin, styleMixin, listObserverMixin],
+  mixins: [dateMixin, styleMixin],
  components: { Loading },
  props: {
    station: {
-      type: Object as PropType<Station>,
-      required: true
+      type: Object as PropType<Station>
    },
    onlineScenery: {
-      type: Object as PropType<OnlineScenery>,
-      required: false
+      type: Object as PropType<ActiveScenery>
    }
  },

  data() {
    return {
-      historyList: [] as DispatcherHistory[],
-      dataStatus: DataStatus.Loading,
-      DataStatus
+      historyList: [] as API.DispatcherHistory.Response,
+      dataStatus: Status.Data.Loading,
+      DataStatus: Status.Data,
+      apiStore: useApiStore()
    };
  },

@@ -109,23 +108,38 @@ export default defineComponent({
  },

  methods: {
-    async fetchAPIData(countFrom = 0, countLimit = 30): Promise<DispatcherHistory[] | null> {
+    async fetchAPIData(
+      countFrom = 0,
+      countLimit = 30
+    ): Promise<API.DispatcherHistory.Response | null> {
+      if (!this.station && !this.onlineScenery) {
+        this.dataStatus = Status.Data.Loaded;
+        return null;
+      }
+
      try {
-        this.dataStatus = DataStatus.Loading;
+        this.dataStatus = Status.Data.Loading;

-        const requestString = `${URLs.stacjownikAPI}/api/getDispatchers?stationName=${this.station.name}&countFrom=${countFrom}&countLimit=${countLimit}`;
-        const historyAPIData: DispatcherHistory[] = await (await axios.get(requestString)).data;
+        const requestString = `api/getDispatchers?stationName=${
+          this.station?.name || this.onlineScenery?.name
+        }&countFrom=${countFrom}&countLimit=${countLimit}`;

-        this.dataStatus = DataStatus.Loaded;
+        const historyAPIData: API.DispatcherHistory.Response = await (
+          await this.apiStore.client!.get(requestString)
+        ).data;
+
+        this.dataStatus = Status.Data.Loaded;
        return historyAPIData;
      } catch (error) {
-        this.dataStatus = DataStatus.Error;
+        this.dataStatus = Status.Data.Error;
        console.error(error);
        return null;
      }
    },
    navigateToHistory() {
-      this.$router.push(`/journal/dispatchers?sceneryName=${this.station.name}`);
+      this.$router.push(
+        `/journal/dispatchers?search-station=${this.station?.name || this.onlineScenery?.name}`
+      );
    }
  }
 });
@@ -153,3 +167,4 @@ export default defineComponent({
  }
 }
 </style>
+../../store/storeTypes
@@ -1,11 +1,11 @@
 <template>
  <section class="info-header">
-    <a class="scenery-name" :href="station.generalInfo?.url" target="_blank">
-      {{ station.name }}
+    <a class="scenery-name" :href="station?.generalInfo?.url" target="_blank">
+      {{ stationName.replace(/_/g, ' ') }}
    </a>

-    <div class="scenery-abbrev">
-      {{ $t('scenery.abbrev') }} <b>{{ station.generalInfo?.abbr }}</b>
+    <div class="scenery-abbrev" v-if="station?.generalInfo?.abbr">
+      {{ $t('scenery.abbrev') }} <b>{{ station.generalInfo.abbr }}</b>
    </div>

    <div class="scenery-hash" v-if="onlineScenery?.hash">#{{ onlineScenery.hash }}</div>
@@ -14,19 +14,21 @@

 <script lang="ts">
 import { PropType, defineComponent } from 'vue';
-import Station from '../../scripts/interfaces/Station';
-import { OnlineScenery } from '../../scripts/interfaces/store/storeTypes';
+import { ActiveScenery, Station } from '../../typings/common';

 export default defineComponent({
  props: {
    station: {
-      type: Object as PropType<Station>,
+      type: Object as PropType<Station>
+    },
+
+    stationName: {
+      type: String,
      required: true
    },

    onlineScenery: {
-      type: Object as PropType<OnlineScenery>,
-      required: false
+      type: Object as PropType<ActiveScenery>
    }
  }
 });
@@ -1,10 +1,10 @@
 <template>
  <div class="scenery-info">
    <section>
-      <div class="scenery-info-general" v-if="station.generalInfo">
+      <div class="scenery-info-general">
        <SceneryInfoIcons :station="station" />

-        <div class="scenery-general-list">
+        <div class="scenery-general-list" v-if="station?.generalInfo">
          <span>
            <b>{{ $t('availability.title') }}:</b>
            {{ $t(`availability.${station.generalInfo.availability}`) }}
@@ -46,11 +46,11 @@
          </span>
        </div>

-        <SceneryInfoRoutes :station="station" />
+        <SceneryInfoRoutes v-if="station" :station="station" />

        <div
          class="scenery-authors"
-          v-if="station.generalInfo.authors && station.generalInfo.authors.length > 0"
+          v-if="station?.generalInfo?.authors && station.generalInfo.authors.length > 0"
        >
          <b>
            {{
@@ -72,7 +72,7 @@

      <div class="info-lists">
        <!-- user list -->
-        <SceneryInfoUserList :onlineScenery="onlineScenery" />
+        <SceneryInfoUserList :onlineScenery="onlineScenery" :station="station" />

        <!-- spawn list -->
        <SceneryInfoSpawnList :onlineScenery="onlineScenery" />
@@ -89,8 +89,7 @@ import SceneryInfoIcons from './SceneryInfo/SceneryInfoIcons.vue';
 import SceneryInfoUserList from './SceneryInfo/SceneryInfoUserList.vue';
 import SceneryInfoSpawnList from './SceneryInfo/SceneryInfoSpawnList.vue';
 import SceneryInfoRoutes from './SceneryInfo/SceneryInfoRoutes.vue';
-import Station from '../../scripts/interfaces/Station';
-import { OnlineScenery } from '../../scripts/interfaces/store/storeTypes';
+import { ActiveScenery, Station } from '../../typings/common';

 export default defineComponent({
  components: {
@@ -102,15 +101,13 @@ export default defineComponent({
  },
  props: {
    station: {
-      type: Object as PropType<Station>,
-      required: true
+      type: Object as PropType<Station>
    },

    onlineScenery: {
-      type: Object as PropType<OnlineScenery>,
-      required: false
+      type: Object as PropType<ActiveScenery>
    }
-  },
+  }
 });
 </script>

@@ -1,31 +1,45 @@
 <template>
  <section class="info-dispatcher">
-    <div class="dispatcher" v-if="onlineScenery">
+    <div class="info-top" v-if="onlineScenery && onlineScenery.dispatcherExp != -1">
      <span
-        class="dispatcher_level"
+        class="dispatcher-level"
        :style="calculateExpStyle(onlineScenery.dispatcherExp, onlineScenery.dispatcherIsSupporter)"
      >
        {{ onlineScenery.dispatcherExp > 1 ? onlineScenery.dispatcherExp : 'L' }}
      </span>

      <router-link
-        class="dispatcher_name"
-        :to="`/journal/dispatchers?dispatcherName=${onlineScenery.dispatcherName}`"
+        class="dispatcher-name"
+        :to="`/journal/dispatchers?search-dispatcher=${onlineScenery.dispatcherName}`"
      >
-        {{ onlineScenery.dispatcherName }}
+        <span
+          class="text--donator"
+          v-if="apiStore.donatorsData.includes(onlineScenery.dispatcherName)"
+          :title="$t('donations.dispatcher-message')"
+        >
+          {{ onlineScenery.dispatcherName }}
+        </span>
+        <span v-else>{{ onlineScenery.dispatcherName }}</span>
      </router-link>
+    </div>

-      <span class="dispatcher_likes text--primary">
+    <div class="info-bottom">
+      <span
+        class="dispatcher-likes text--primary"
+        v-if="onlineScenery && onlineScenery.dispatcherExp != -1"
+      >
        <img src="/images/icon-like.svg" alt="Likes count icon" />
        <span>{{ onlineScenery?.dispatcherRate || '0' }}</span>
      </span>
-    </div>

-    <StationStatusBadge
-      :statusID="onlineScenery?.statusID"
-      :isOnline="onlineScenery ? true : false"
-      :statusTimestamp="onlineScenery?.statusTimestamp"
-    />
+      <span class="dispatcher-badge">
+        <StationStatusBadge
+          :isOnline="onlineScenery ? true : false"
+          :dispatcherStatus="onlineScenery?.dispatcherStatus"
+          :dispatcherTimestamp="onlineScenery?.dispatcherTimestamp"
+        />
+      </span>
+    </div>
  </section>
 </template>

@@ -35,13 +49,21 @@ import dateMixin from '../../../mixins/dateMixin';
 import routerMixin from '../../../mixins/routerMixin';
 import styleMixin from '../../../mixins/styleMixin';
 import StationStatusBadge from '../../Global/StationStatusBadge.vue';
-import { OnlineScenery } from '../../../scripts/interfaces/store/storeTypes';
+import { ActiveScenery } from '../../../typings/common';
+import { useApiStore } from '../../../store/apiStore';

 export default defineComponent({
  mixins: [styleMixin, dateMixin, routerMixin],
+
+  data() {
+    return {
+      apiStore: useApiStore()
+    };
+  },
+
  props: {
    onlineScenery: {
-      type: Object as PropType<OnlineScenery>,
+      type: Object as PropType<ActiveScenery>,
      required: false
    }
  },
@@ -51,45 +73,46 @@ export default defineComponent({

 <style lang="scss" scoped>
 .info-dispatcher {
-  display: flex;
-  align-items: center;
-  justify-content: center;
+  font-size: 1.8em;
+}

-  flex-wrap: wrap;
+.info-top {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  gap: 0.5em;
+}
+
+.info-bottom {
+  display: flex;
+  justify-content: center;
+  align-items: center;
  gap: 0.5em;

-  .dispatcher {
-    font-size: 2em;
+  margin-top: 0.5em;
+}

-    &_level {
-      display: inline-block;
-      margin-right: 0.3em;
-      background: firebrick;
+.dispatcher-level {
+  background: firebrick;

-      border-radius: 0.1em;
+  border-radius: 0.1em;

-      width: 1.5em;
-      height: 1.5em;
-      line-height: 1.5em;
-      font-weight: bold;
-    }
+  width: 1.5em;
+  height: 1.5em;
+  line-height: 1.5em;
+  font-weight: bold;
+}

-    &_name {
-      cursor: pointer;
-      margin-right: 0.25em;
-    }
+.dispatcher-likes {
+  display: flex;
+  gap: 0.25em;

-    &_likes {
-      img {
-        height: 0.7em;
-        margin: 0 0.25em;
-      }
-    }
-  }
-
-  .status-badge {
-    font-size: 1.25em;
-    margin: 0.5em 0.25em;
+  img {
+    width: 1em;
  }
 }
+
+.dispatcher-badge {
+  font-size: 0.7em;
+}
 </style>
@@ -1,92 +1,101 @@
 <template>
  <section class="info-icons">
+    <span v-if="!station || !station.generalInfo">
+      <img
+        class="icon-info"
+        src="/images/icon-unknown.svg"
+        alt="icon-unknown"
+        :title="$t('sceneries.info.unknown')"
+      />
+    </span>
+
    <span
-      v-if="station.generalInfo && station.generalInfo.reqLevel >= 0"
+      v-if="station?.generalInfo && station?.generalInfo.reqLevel >= 0"
      class="scenery-icon icon-info level"
-      :style="calculateExpStyle(station.generalInfo.reqLevel)"
+      :style="calculateExpStyle(station?.generalInfo.reqLevel)"
    >
-      {{ station.generalInfo.reqLevel >= 2 ? station.generalInfo.reqLevel : 'L' }}
+      {{ station?.generalInfo.reqLevel >= 2 ? station?.generalInfo.reqLevel : 'L' }}
    </span>

    <span
-      v-if="station.generalInfo"
+      v-if="station?.generalInfo"
      class="scenery-icon icon-info"
-      :class="station.generalInfo.controlType.replace('+', '-')"
-      :title="$t('desc.control-type') + $t(`controls.${station.generalInfo.controlType}`)"
-      v-html="getControlTypeAbbrev(station.generalInfo.controlType)"
+      :class="station?.generalInfo.controlType.replace('+', '-')"
+      :title="
+        $t('sceneries.info.control-type') + $t(`controls.${station?.generalInfo.controlType}`)
+      "
    >
+      {{ $t(`controls.abbrevs.${station.generalInfo.controlType}`) }}
    </span>

    <img
-      v-if="station.generalInfo?.SUP"
-      class="icon-info"
-      src="/images/icon-SUP.svg"
-      alt="SUP (RASP-UZK)"
-      :title="$t('desc.SUP')"
-    />
-
-    <img
-      v-if="station.generalInfo?.signalType"
+      v-if="station?.generalInfo?.signalType"
      class="icon-info"
      :src="`/images/icon-${station.generalInfo.signalType}.svg`"
      :alt="station.generalInfo.signalType"
-      :title="$t('desc.signals-type') + $t(`signals.${station.generalInfo.signalType}`)"
+      :title="$t('sceneries.info.signals-type') + $t(`signals.${station.generalInfo.signalType}`)"
    />

    <img
-      v-if="station.generalInfo?.availability == 'nonPublic'"
+      v-if="station?.generalInfo?.availability == 'nonPublic'"
      class="icon-info"
      src="/images/icon-lock.svg"
      alt="Non-public scenery"
-      :title="$t('desc.non-public')"
+      :title="$t('sceneries.info.non-public')"
    />

    <img
-      v-if="station.generalInfo?.availability == 'unavailable'"
+      v-if="station?.generalInfo?.availability == 'unavailable'"
      class="icon-info"
      src="/images/icon-unavailable.svg"
      alt="Unavailable scenery"
-      :title="$t('desc.unavailable')"
+      :title="$t('sceneries.info.unavailable')"
    />

    <img
-      v-if="station.generalInfo?.availability == 'abandoned'"
+      v-if="station?.generalInfo?.availability == 'abandoned'"
      class="icon-info"
      src="/images/icon-abandoned.svg"
      alt="Abandoned scenery"
-      :title="$t('desc.abandoned')"
+      :title="$t('sceneries.info.abandoned')"
    />

    <img
-      v-if="station.generalInfo?.lines"
+      v-if="station?.generalInfo?.SUP"
+      class="icon-info"
+      src="/images/icon-SUP.svg"
+      alt="SUP (RASP-UZK)"
+      :title="$t('sceneries.info.SUP')"
+    />
+
+    <img
+      v-if="station?.generalInfo?.ASDEK"
+      class="icon-info"
+      src="/images/icon-ASDEK.svg"
+      alt="dSAT ASDEK"
+      :title="$t('sceneries.info.ASDEK')"
+    />
+
+    <img
+      v-if="station?.generalInfo?.lines"
      class="icon-info"
      src="/images/icon-real.svg"
      alt="real scenery"
-      :title="`${$t('desc.real')} ${station.generalInfo.lines}`"
-    />
-
-    <img
-      v-if="!station.generalInfo"
-      class="icon-info"
-      src="/images/icon-unknown.svg"
-      alt="icon-unknown"
-      :title="$t('desc.unknown')"
+      :title="`${$t('sceneries.info.real')} ${station.generalInfo.lines}`"
    />
  </section>
 </template>

 <script lang="ts">
 import { PropType, defineComponent } from 'vue';
-import stationInfoMixin from '../../../mixins/stationInfoMixin';
 import styleMixin from '../../../mixins/styleMixin';
-import Station from '../../../scripts/interfaces/Station';
+import { Station } from '../../../typings/common';

 export default defineComponent({
-  mixins: [stationInfoMixin, styleMixin],
+  mixins: [styleMixin],
  props: {
    station: {
-      type: Object as PropType<Station>,
-      required: true
+      type: Object as PropType<Station>
    }
  }
 });
@@ -94,6 +103,7 @@ export default defineComponent({

 <style lang="scss" scoped>
@import '../../../styles/icons.scss';
+
 .info-icons {
  display: flex;
  justify-content: center;
@@ -101,6 +111,7 @@ export default defineComponent({

  margin: 1em;
 }
+
 .icon-info {
  display: flex;
  justify-content: center;
@@ -1,41 +1,49 @@
 <template>
  <section class="info-routes" v-if="station.generalInfo">
-    <div class="routes one-way" v-if="station.generalInfo.routes.oneWay.length > 0">
+    <div class="routes one-way" v-if="oneWayRoutes.length > 0">
      <b>{{ $t('scenery.one-way-routes') }}</b>

      <ul class="routes-list">
        <li
-          v-for="route in station.generalInfo.routes.oneWay"
-          :key="route.name"
-          @click="setActiveShowLength(route.name)"
+          v-for="route in oneWayRoutes"
+          :key="route.routeName"
+          @click="setActiveShowLength(route.routeName)"
        >
-          <span :class="{ 'no-catenary': !route.catenary, internal: route.isInternal }">
-            {{ route.name }}</span
+          <span :class="{ 'no-catenary': !route.isElectric, internal: route.isInternal }">
+            {{ route.routeName }}</span
          >
-          <span v-if="route.speed" class="speed">
-            {{ activeShowLength.includes(route.name) ? route.length + 'm' : route.speed }}
+          <span v-if="route.routeSpeed" class="speed">
+            {{
+              activeShowLength.includes(route.routeName)
+                ? route.routeLength + 'm'
+                : route.routeSpeed
+            }}
          </span>
-          <span v-if="route.SBL" class="sbl">SBL</span>
+          <span v-if="route.isRouteSBL" class="sbl">SBL</span>
        </li>
      </ul>
    </div>

-    <div class="routes two-way" v-if="station.generalInfo.routes.twoWay.length > 0">
+    <div class="routes two-way" v-if="twoWayRoutes.length > 0">
      <b>{{ $t('scenery.two-way-routes') }}</b>

      <ul class="routes-list">
        <li
-          v-for="route in station.generalInfo.routes.twoWay"
-          :key="route.name"
-          @click="setActiveShowLength(route.name)"
+          v-for="route in twoWayRoutes"
+          :key="route.routeName"
+          @click="setActiveShowLength(route.routeName)"
        >
-          <span :class="{ 'no-catenary': !route.catenary, internal: route.isInternal }">{{
-            route.name
+          <span :class="{ 'no-catenary': !route.isElectric, internal: route.isInternal }">{{
+            route.routeName
          }}</span>
-          <span v-if="route.speed" class="speed">
-            {{ activeShowLength.includes(route.name) ? route.length + 'm' : route.speed }}
+          <span v-if="route.routeSpeed" class="speed">
+            {{
+              activeShowLength.includes(route.routeName)
+                ? route.routeLength + 'm'
+                : route.routeSpeed
+            }}
          </span>
-          <span v-if="route.SBL" class="sbl">SBL</span>
+          <span v-if="route.isRouteSBL" class="sbl">SBL</span>
        </li>
      </ul>
    </div>
@@ -44,7 +52,7 @@

 <script lang="ts">
 import { PropType, defineComponent } from 'vue';
-import Station from '../../../scripts/interfaces/Station';
+import { Station } from '../../../typings/common';

 export default defineComponent({
  props: {
@@ -66,6 +74,16 @@ export default defineComponent({
    return {
      activeShowLength: [] as string[]
    };
+  },
+
+  computed: {
+    oneWayRoutes() {
+      return this.station.generalInfo?.routes.single ?? [];
+    },
+
+    twoWayRoutes() {
+      return this.station.generalInfo?.routes.double ?? [];
+    }
  }
 });
 </script>
@@ -7,18 +7,22 @@
    </h3>

    <transition-group name="spawns-anim" tag="ul">
-      <li class="badge spawn badge-none" v-if="!onlineScenery || onlineScenery.spawns.length == 0" key="no-spawns">
+      <li
+        class="badge badge-none"
+        v-if="!onlineScenery || onlineScenery.spawns.length == 0"
+        key="no-spawns"
+      >
        {{ $t('scenery.no-spawns') }}
      </li>

      <li
-        class="badge spawn"
+        class="badge spawn-badge"
        v-for="(spawn, i) in sortedSpawns"
        :key="spawn.spawnName + onlineScenery?.dispatcherName + i"
        :data-electrified="spawn.isElectrified"
      >
-        <span class="spawn_name">{{ spawn.spawnName }}</span>
-        <span class="spawn_length">{{ spawn.spawnLength }}m</span>
+        <span class="name">{{ spawn.spawnName }}</span>
+        <span class="length">{{ spawn.spawnLength }}m</span>
      </li>
    </transition-group>
  </section>
@@ -26,12 +30,12 @@

 <script lang="ts">
 import { PropType, defineComponent } from 'vue';
-import { OnlineScenery } from '../../../scripts/interfaces/store/storeTypes';
+import { ActiveScenery } from '../../../typings/common';

 export default defineComponent({
  props: {
    onlineScenery: {
-      type: Object as PropType<OnlineScenery>,
+      type: Object as PropType<ActiveScenery>,
      required: false
    }
  },
@@ -55,19 +59,6 @@ ul {
  position: relative;
 }

-.spawn {
-  color: white;
-
-  &_length {
-    background-color: #404040;
-    color: #cfcfcf;
-  }
-
-  &[data-electrified='true'] > &_name {
-    background-color: #007599;
-  }
-}
-
 .spawns-anim {
  &-move,
  &-enter-active,
@@ -1,83 +0,0 @@
-<template>
-  <section class="info-stats" :class="!station.onlineInfo ? 'no-stats' : ''">
-    <span class="likes">
-      <img src="/images/icon-like" alt="Likes count icon" />
-      <span>{{ station.onlineInfo?.dispatcherRate || '0' }}</span>
-    </span>
-
-    <span class="users">
-      <img src="/images/icon-user" alt="Users count icon" />
-      <span>{{ station.onlineInfo?.currentUsers || '0' }}</span>
-      /
-      <span>{{ station.onlineInfo?.maxUsers || '0' }}</span>
-    </span>
-
-    <span class="spawns">
-      <img src="/images/icon-spawn" alt="Spawns count icon" />
-      <span>{{ station.onlineInfo?.spawns.length || '0' }}</span>
-    </span>
-
-    <span class="schedules">
-      <img src="/images/icon-timetable" alt="Timetables count icon" />
-      <span>
-        <span style="color: #eee">{{ station.onlineInfo?.scheduledTrains?.length || '0' }}</span>
-        /
-        <span style="color: #bbb"
-          >{{
-            station.onlineInfo?.scheduledTrains?.filter((train) => train.stopInfo.confirmed)
-              .length || '0'
-          }}
-        </span>
-      </span>
-    </span>
-  </section>
-</template>
-
-<script lang="ts">
-import { PropType, defineComponent } from 'vue';
-import Station from '../../../scripts/interfaces/Station';
-
-export default defineComponent({
-  props: {
-    station: {
-      type: Object as PropType<Station>,
-      required: true
-    }
-  }
-});
-</script>
-
-<style lang="scss" scoped>
-@import '../../../styles/variables.scss';
-
-.info-stats {
-  padding: 1rem 0;
-
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: center;
-
-  font-size: 1.65em;
-
-  &.no-stats {
-    opacity: 0.5;
-  }
-
-  & > span {
-    display: flex;
-    align-items: center;
-
-    margin: 0.3em;
-  }
-
-  .likes,
-  .spawns {
-    color: $accentCol;
-  }
-
-  span > img {
-    width: 1.2em;
-    margin-right: 0.5em;
-  }
-}
-</style>
@@ -13,13 +13,13 @@
      </li>

      <li
-        v-for="train in onlineScenery?.stationTrains"
+        v-for="{ train, status } in stationTrains"
        class="badge user"
-        :class="train.stopStatus"
-        :key="train.trainId"
        tabindex="0"
-        @click.prevent="selectModalTrain(train.trainId, $event.currentTarget)"
-        @keydown.enter="selectModalTrain(train.trainId, $event.currentTarget)"
+        :key="train.id"
+        :data-status="status"
+        @click.prevent="selectModalTrain(train, $event.currentTarget)"
+        @keydown.enter="selectModalTrain(train, $event.currentTarget)"
      >
        <span class="user_train">{{ train.trainNo }}</span>
        <span class="user_name">{{ train.driverName }}</span>
@@ -32,15 +32,51 @@
 import { PropType, defineComponent } from 'vue';
 import modalTrainMixin from '../../../mixins/modalTrainMixin';
 import routerMixin from '../../../mixins/routerMixin';
-import { OnlineScenery } from '../../../scripts/interfaces/store/storeTypes';
+import { ActiveScenery, Station, StopStatus } from '../../../typings/common';
+import { getTrainStopStatus } from '../utils';
+import { useMainStore } from '../../../store/mainStore';

 export default defineComponent({
  mixins: [routerMixin, modalTrainMixin],

  props: {
    onlineScenery: {
-      type: Object as PropType<OnlineScenery>,
+      type: Object as PropType<ActiveScenery>,
      required: false
+    },
+    station: {
+      type: Object as PropType<Station>
+    }
+  },
+
+  data() {
+    return {
+      mainStore: useMainStore()
+    };
+  },
+
+  computed: {
+    stationTrains() {
+      if (!this.onlineScenery) return;
+
+      const name = this.station?.generalInfo?.checkpoints[0] ?? this.onlineScenery.name;
+
+      return this.onlineScenery.stationTrains.map((train) => {
+        const stop = train.timetableData?.followingStops.find(
+          (stop) =>
+            stop.stopNameRAW.toLowerCase() == name.toLowerCase() ||
+            this.station?.generalInfo?.checkpoints.includes(stop.stopNameRAW)
+        );
+
+        const status = stop
+          ? getTrainStopStatus(stop, train.currentStationName, this.onlineScenery!.name)
+          : 'no-timetable';
+
+        return {
+          train,
+          status
+        };
+      });
    }
  }
 });
@@ -74,31 +110,31 @@ ul {
    -webkit-transition: background-color 200ms;
  }

-  &.no-timetable .user_train {
+  &[data-status='no-timetable'] .user_train {
    background-color: $no-timetable;
  }

-  &.departed > &_train {
+  &[data-status='departed'] > &_train {
    background-color: $departed;
  }

-  &.stopped > &_train {
+  &[data-status='stopped'] > &_train {
    background-color: $stopped;
  }

-  &.online > &_train {
+  &[data-status='online'] > &_train {
    background-color: $online;
  }

-  &.terminated > &_train {
+  &[data-status='terminated'] > &_train {
    background-color: $terminated;
  }

-  &.disconnected > &_train {
+  &[data-status='disconnected'] > &_train {
    background-color: $disconnected;
  }

-  &.offline {
+  &[data-status='offline'] {
    background: firebrick;
    pointer-events: none;
  }
@@ -6,22 +6,14 @@
        <span>{{ $t('scenery.timetables') }}</span>

        <span>
-          <span class="text--primary">{{ onlineScenery?.scheduledTrainCount.all || 0 }}</span>
+          <span class="text--primary">{{ onlineScenery?.scheduledTrainCount.all ?? 0 }}</span>
          <span> / </span>
          <span class="text--grayed">
-            {{ onlineScenery?.scheduledTrainCount.confirmed || '0' }}
+            {{ onlineScenery?.scheduledTrainCount.confirmed ?? 0 }}
          </span>
        </span>

-        <span class="header_links">
-          <a
-            :href="`https://pragotron-td2.web.app/board?name=${station.name}`"
-            target="_blank"
-            :title="$t('scenery.pragotron-link')"
-          >
-            <img src="/images/icon-pragotron.svg" alt="icon-pragotron" />
-          </a>
-
+        <span class="header_links" v-if="station">
          <a :href="tabliceZbiorczeHref" target="_blank" :title="$t('scenery.tablice-link')">
            <img src="/images/icon-tablice.ico" alt="icon-tablice" />
          </a>
@@ -33,12 +25,12 @@
          {{ (i > 0 && '&bull;') || '' }}

          <button
-            :key="cp.checkpointName"
+            :key="cp"
            class="checkpoint_item"
-            :class="{ current: chosenCheckpoint === cp.checkpointName }"
+            :class="{ current: chosenCheckpoint === cp }"
            @click="setCheckpoint(cp)"
          >
-            {{ cp.checkpointName }}
+            {{ cp }}
          </button>
        </span>
      </div>
@@ -47,8 +39,8 @@
    <div class="timetable-list">
      <transition-group name="list-anim">
        <div
+          v-if="apiStore.dataStatuses.connection == 0 && sceneryTimetables.length == 0"
          style="padding-bottom: 5em"
-          v-if="store.dataStatuses.trains == 0 && computedScheduledTrains.length == 0"
          key="list-loading"
        >
          <Loading />
@@ -56,7 +48,7 @@

        <span
          class="timetable-item empty"
-          v-else-if="computedScheduledTrains.length == 0 && !onlineScenery"
+          v-else-if="sceneryTimetables.length == 0 && !onlineScenery"
          key="list-offline"
        >
          {{ $t('scenery.offline') }}
@@ -64,7 +56,7 @@

        <div
          class="timetable-item empty"
-          v-else-if="computedScheduledTrains.length == 0"
+          v-else-if="sceneryTimetables.length == 0"
          key="list-no-timetables"
        >
          {{ $t('scenery.no-timetables') }}
@@ -73,57 +65,56 @@
        <div
          class="timetable-item"
          v-else
-          v-for="scheduledTrain in computedScheduledTrains"
-          :key="scheduledTrain.trainId"
+          v-for="(row, i) in sceneryTimetables"
+          :key="row.train.id + i"
          tabindex="0"
-          @click.prevent.stop="selectModalTrain(scheduledTrain.trainId, $event.currentTarget)"
-          @keydown.enter.prevent="selectModalTrain(scheduledTrain.trainId, $event.currentTarget)"
+          @click.prevent.stop="selectModalTrain(row.train, $event.currentTarget)"
+          @keydown.enter.prevent="selectModalTrain(row.train, $event.currentTarget)"
        >
          <span class="timetable-general">
            <span class="general-info">
              <span class="info-number">
-                <strong>{{ scheduledTrain.category }}</strong>
-                {{ scheduledTrain.trainNo }}
+                <strong>{{ row.train.timetableData!.category }}</strong>
+                {{ row.train.trainNo }}

-                <span class="g-tooltip" v-if="scheduledTrain.stopInfo.comments">
+                <span v-if="row.checkpointStop.comments" :title="row.checkpointStop.comments">
                  <img src="/images/icon-warning.svg" />
-                  <span class="content" v-html="scheduledTrain.stopInfo.comments"> </span>
                </span>
              </span>
              &nbsp;|&nbsp;
              <span>
-                {{ scheduledTrain.driverName }}
+                {{ row.train.driverName }}
              </span>

              <div class="info-route">
-                <strong>{{ scheduledTrain.beginsAt }} - {{ scheduledTrain.terminatesAt }}</strong>
+                <strong>{{ row.train.timetableData!.route.replace('|', ' - ') }}</strong>
              </div>

-              <ScheduledTrainStatus :scheduledTrain="scheduledTrain" />
+              <ScheduledTrainStatus :sceneryTimetableRow="row" />
            </span>
          </span>

          <span class="timetable-schedule">
            <span class="schedule-arrival">
-              <span class="arrival-time begins" v-if="scheduledTrain.stopInfo.beginsHere">
+              <span class="arrival-time begins" v-if="row.checkpointStop.beginsHere">
                {{ $t('timetables.begins') }}
              </span>

              <span class="arrival-time" v-else>
-                <div v-if="scheduledTrain.stopInfo.arrivalDelay == 0">
-                  <span>{{ timestampToString(scheduledTrain.stopInfo.arrivalTimestamp) }}</span>
+                <div v-if="row.checkpointStop.arrivalDelay == 0">
+                  <span>{{ timestampToString(row.checkpointStop.arrivalTimestamp) }}</span>
                </div>
                <div v-else>
                  <div>
                    <s style="margin-right: 0.2em" class="text--grayed">{{
-                      timestampToString(scheduledTrain.stopInfo.arrivalTimestamp)
+                      timestampToString(row.checkpointStop.arrivalTimestamp)
                    }}</s>
                  </div>

                  <span>
-                    {{ timestampToString(scheduledTrain.stopInfo.arrivalRealTimestamp) }}
-                    ({{ scheduledTrain.stopInfo.arrivalDelay > 0 ? '+' : ''
-                    }}{{ scheduledTrain.stopInfo.arrivalDelay }})
+                    {{ timestampToString(row.checkpointStop.arrivalRealTimestamp) }}
+                    ({{ row.checkpointStop.arrivalDelay > 0 ? '+' : ''
+                    }}{{ row.checkpointStop.arrivalDelay }})
                  </span>
                </div>
              </span>
@@ -131,41 +122,39 @@

            <span class="schedule-stop">
              <span class="stop-connection">
-                {{ scheduledTrain.arrivingLine }}
+                {{ row.arrivingLine }}
              </span>

              <span class="stop-time">
-                {{ scheduledTrain.stopInfo.stopTime || '' }}
-                {{
-                  scheduledTrain.stopInfo.stopTime ? scheduledTrain.stopInfo.stopType || 'pt' : ''
-                }}
+                {{ row.checkpointStop.stopTime || '' }}
+                {{ row.checkpointStop.stopTime ? row.checkpointStop.stopType || 'pt' : '' }}
              </span>

              <span class="stop-connection">
-                {{ scheduledTrain.departureLine }}
+                {{ row.departureLine }}
              </span>
            </span>

            <span class="schedule-departure">
-              <span class="departure-time terminates" v-if="scheduledTrain.stopInfo.terminatesHere">
+              <span class="departure-time terminates" v-if="row.checkpointStop.terminatesHere">
                {{ $t('timetables.terminates') }}
              </span>

              <span class="departure-time" v-else>
-                <div v-if="scheduledTrain.stopInfo.departureDelay == 0">
-                  <span>{{ timestampToString(scheduledTrain.stopInfo.departureTimestamp) }}</span>
+                <div v-if="row.checkpointStop.departureDelay == 0">
+                  <span>{{ timestampToString(row.checkpointStop.departureTimestamp) }}</span>
                </div>
                <div v-else>
                  <div>
                    <s style="margin-right: 0.2em" class="text--grayed">{{
-                      timestampToString(scheduledTrain.stopInfo.departureTimestamp)
+                      timestampToString(row.checkpointStop.departureTimestamp)
                    }}</s>
                  </div>

                  <span>
-                    {{ timestampToString(scheduledTrain.stopInfo.departureRealTimestamp) }}
-                    ({{ scheduledTrain.stopInfo.departureDelay > 0 ? '+' : ''
-                    }}{{ scheduledTrain.stopInfo.departureDelay }})
+                    {{ timestampToString(row.checkpointStop.departureRealTimestamp) }}
+                    ({{ row.checkpointStop.departureDelay > 0 ? '+' : ''
+                    }}{{ row.checkpointStop.departureDelay }})
                  </span>
                </div>
              </span>
@@ -184,11 +173,13 @@ import { useRoute } from 'vue-router';
 import Loading from '../Global/Loading.vue';
 import dateMixin from '../../mixins/dateMixin';
 import routerMixin from '../../mixins/routerMixin';
-import Station from '../../scripts/interfaces/Station';
-import { useStore } from '../../store/store';
+import { useMainStore } from '../../store/mainStore';
 import modalTrainMixin from '../../mixins/modalTrainMixin';
 import ScheduledTrainStatus from './ScheduledTrainStatus.vue';
-import { OnlineScenery } from '../../scripts/interfaces/store/storeTypes';
+import { useApiStore } from '../../store/apiStore';
+import { ActiveScenery, Station } from '../../typings/common';
+import { SceneryTimetableRow } from './typings';
+import { getTrainStopStatus, stopStatusPriority } from './utils';

 export default defineComponent({
  name: 'SceneryTimetable',
@@ -199,12 +190,10 @@ export default defineComponent({

  props: {
    station: {
-      type: Object as PropType<Station>,
-      required: true
+      type: Object as PropType<Station>
    },
    onlineScenery: {
-      type: Object as PropType<OnlineScenery>,
-      required: false
+      type: Object as PropType<ActiveScenery>
    }
  },

@@ -212,10 +201,6 @@ export default defineComponent({
    listOpen: false
  }),

-  mounted() {
-    this.loadSelectedOption();
-  },
-
  activated() {
    this.loadSelectedOption();
  },
@@ -224,58 +209,140 @@ export default defineComponent({
    const route = useRoute();
    const currentURL = computed(() => `${location.origin}${route.fullPath}`);

-    const store = useStore();
+    const apiStore = useApiStore();
+    const mainStore = useMainStore();

    const chosenCheckpoint = ref(
-      props.station?.generalInfo?.checkpoints?.length == 0
-        ? ''
-        : props.station?.generalInfo?.checkpoints[0].checkpointName || null
+      props.station?.generalInfo?.checkpoints[0] ?? props.station?.name ?? ''
    );

    return {
      currentURL,
      chosenCheckpoint,
-      store
+      apiStore,
+      mainStore
    };
  },

  computed: {
    tabliceZbiorczeHref() {
-      let url = `https://tablice-td2.web.app/?station=${this.station.name}`;
+      let url = `https://tablice-td2.web.app/?station=${this.station!.name}`;
      if (this.chosenCheckpoint) url += `&checkpoint=${this.chosenCheckpoint}`;

      return url;
    },

-    computedScheduledTrains() {
-      return (
-        this.onlineScenery?.scheduledTrains
-          ?.filter(
-            (train) =>
-              train.checkpointName.toLocaleLowerCase() ==
-              (this.chosenCheckpoint || this.station.name).toLocaleLowerCase()
-          )
-          .sort((a, b) => {
-            if (a.stopStatusID > b.stopStatusID) return 1;
-            if (a.stopStatusID < b.stopStatusID) return -1;
+    sceneryTimetables(): SceneryTimetableRow[] {
+      if (!this.station) return [];
+      if (!this.onlineScenery) return [];

-            if (a.stopInfo.arrivalTimestamp > b.stopInfo.arrivalTimestamp) return 1;
-            if (a.stopInfo.arrivalTimestamp < b.stopInfo.arrivalTimestamp) return -1;
+      return this.onlineScenery.scheduledTrains
+        .filter(
+          (ct) =>
+            ct.train.region == this.mainStore.region.id &&
+            this.chosenCheckpoint &&
+            ct.checkpointStop.stopNameRAW.toLowerCase() == this.chosenCheckpoint.toLowerCase()
+        )
+        .map((ct) => {
+          const trainStopStatus = getTrainStopStatus(
+            ct.checkpointStop,
+            ct.train.currentStationName,
+            this.station!.name
+          );

-            return a.stopInfo.departureTimestamp > b.stopInfo.departureTimestamp ? 1 : -1;
-          }) || []
-      );
+          const trainStopIndex =
+            ct.train.timetableData?.followingStops.findIndex(
+              (stop) => stop.stopName == ct.checkpointStop.stopName
+            ) ?? -1;
+
+          let prevStationName = '',
+            nextStationName = '';
+
+          let departureLine: string | null = null;
+          let arrivingLine: string | null = null;
+
+          let prevDepartureLine: string | null = null,
+            nextArrivalLine: string | null = null;
+
+          if (trainStopIndex > -1 && ct.train.timetableData?.followingStops !== undefined) {
+            for (let i = trainStopIndex; i >= 0; i--) {
+              const stop = ct.train.timetableData.followingStops[i];
+
+              if (
+                /strong|podg\.|pe\./g.test(stop.stopName) &&
+                !prevStationName &&
+                i <= trainStopIndex - 1
+              )
+                prevStationName = stop.stopNameRAW.replace(/,.*/g, '');
+
+              if (
+                stop.arrivalLine != null &&
+                !arrivingLine &&
+                !/-|_|it|sbl/gi.test(stop.arrivalLine)
+              ) {
+                arrivingLine = stop.arrivalLine;
+                prevDepartureLine =
+                  ct.train.timetableData.followingStops[i - 1]?.departureLine || null;
+              }
+            }
+
+            for (let i = trainStopIndex; i < ct.train.timetableData.followingStops.length; i++) {
+              const stop = ct.train.timetableData.followingStops[i];
+
+              if (
+                /strong|podg\.|pe\./g.test(stop.stopName) &&
+                !nextStationName &&
+                i > trainStopIndex
+              )
+                nextStationName = stop.stopNameRAW.replace(/,.*/g, '');
+
+              if (
+                stop.departureLine &&
+                !departureLine &&
+                !/-|_|it|sbl/gi.test(stop.departureLine)
+              ) {
+                departureLine = stop.departureLine;
+                nextArrivalLine = ct.train.timetableData.followingStops[i + 1]?.arrivalLine || null;
+              }
+            }
+          }
+
+          return {
+            checkpointStop: ct.checkpointStop,
+            train: ct.train,
+            prevDepartureLine,
+            nextArrivalLine,
+            departureLine,
+            arrivingLine,
+            prevStationName,
+            nextStationName,
+            status: trainStopStatus
+          };
+        })
+        .sort((a, b) => {
+          if (stopStatusPriority.indexOf(a.status) - stopStatusPriority.indexOf(b.status) < 0)
+            return -1;
+
+          if (stopStatusPriority.indexOf(a.status) - stopStatusPriority.indexOf(b.status) > 0)
+            return 1;
+
+          if (a.checkpointStop.arrivalTimestamp > b.checkpointStop.arrivalTimestamp) return 1;
+          if (a.checkpointStop.arrivalTimestamp < b.checkpointStop.arrivalTimestamp) return -1;
+
+          return a.checkpointStop.departureTimestamp > b.checkpointStop.departureTimestamp ? 1 : -1;
+        });
    }
  },

  methods: {
    loadSelectedOption() {
-      this.chosenCheckpoint =
-        this.station.generalInfo?.checkpoints[0]?.checkpointName || this.station.name;
+      if (!this.station) return;
+
+      this.chosenCheckpoint = this.station.generalInfo?.checkpoints[0] ?? this.station.name;
    },

-    setCheckpoint(cp: { checkpointName: string }) {
-      this.chosenCheckpoint = cp.checkpointName;
+    setCheckpoint(cp: string) {
+      this.chosenCheckpoint = cp;
    }
  }
 });
@@ -407,13 +474,6 @@ export default defineComponent({
    width: 100%;
  }

-  .g-tooltip > .content {
-    z-index: 100;
-    color: white;
-
-    left: 110%;
-  }
-
  img {
    width: 1.1em;
  }
@@ -1,6 +1,16 @@
 <template>
+  <!-- WIP -->
+  <!-- <div class="top-filters">
+    <button class="btn btn--option">ROZPOCZYNA BIEG</button>
+
+    <button class="btn btn--option">PRZEZ</button>
+
+    <button class="btn btn--option">KOŃCZY BIEG</button>
+  </div> -->
+
  <section class="scenery-table-section">
    <Loading v-if="dataStatus != DataStatus.Loaded" />
+
    <div class="no-history" v-else-if="historyList.length == 0">
      {{ $t('scenery.history-list-empty') }}
    </div>
@@ -18,20 +28,25 @@
      <tbody>
        <tr v-for="historyItem in historyList" :key="historyItem.id">
          <td>
-            <router-link :to="`/journal/timetables?timetableId=${historyItem.id}`"
-              >#{{ historyItem.id }}</router-link
-            >
+            <router-link :to="`/journal/timetables?search-train=%23${historyItem.id}`">
+              #{{ historyItem.id }}
+            </router-link>
          </td>
          <td>
            <b class="text--primary">{{ historyItem.trainCategoryCode }}</b> <br />
            {{ historyItem.trainNo }}
          </td>
          <td>{{ historyItem.route.replace('|', ' -> ') }}</td>
-          <td>{{ historyItem.driverName }}</td>
+          <td>
+            <router-link :to="`/journal/timetables?search-driver=${historyItem.driverName}`">
+              {{ historyItem.driverName }}
+            </router-link>
+          </td>
+
          <td>
            <router-link
              v-if="historyItem.authorName"
-              :to="`/journal/timetables?authorName=${historyItem.authorName}`"
+              :to="`/journal/timetables?search-dispatcher=${historyItem.authorName}`"
              >{{ historyItem.authorName }}
            </router-link>
            <i v-else>{{ $t('scenery.timetable-author-unknown') }}</i>
@@ -53,63 +68,70 @@
 </template>

 <script lang="ts">
-import axios from 'axios';
 import { defineComponent, PropType } from 'vue';
 import dateMixin from '../../mixins/dateMixin';
-import { DataStatus } from '../../scripts/enums/DataStatus';
-import {
-  TimetableHistory,
-  SceneryTimetableHistory
-} from '../../scripts/interfaces/api/TimetablesAPIData';
-import Station from '../../scripts/interfaces/Station';
-import { URLs } from '../../scripts/utils/apiURLs';
+
 import Loading from '../Global/Loading.vue';
-import listObserverMixin from '../../mixins/listObserverMixin';
-import { OnlineScenery } from '../../scripts/interfaces/store/storeTypes';
+import { API } from '../../typings/api';
+import { ActiveScenery, Station, Status } from '../../typings/common';
+import { useApiStore } from '../../store/apiStore';

 export default defineComponent({
  name: 'SceneryTimetablesHistory',
-  mixins: [dateMixin, listObserverMixin],
+  mixins: [dateMixin],
  props: {
    station: {
-      type: Object as PropType<Station>,
-      required: true
+      type: Object as PropType<Station>
    },
    onlineScenery: {
-      type: Object as PropType<OnlineScenery>,
-      required: false
+      type: Object as PropType<ActiveScenery>
    }
  },

  data() {
    return {
-      historyList: [] as TimetableHistory[],
-      dataStatus: DataStatus.Loading,
-      DataStatus
+      historyList: [] as API.TimetableHistory.Response,
+      apiStore: useApiStore(),
+      dataStatus: Status.Data.Loading,
+      DataStatus: Status.Data
    };
  },

  async activated() {
-    const fetchedHistory = await this.fetchAPIData();
-    if (fetchedHistory) this.historyList = fetchedHistory.timetables;
+    this.fetchAPIData();
  },

  methods: {
-    async fetchAPIData(countFrom = 0, countLimit = 15): Promise<SceneryTimetableHistory | null> {
-      try {
-        const requestString = `${URLs.stacjownikAPI}/api/getIssuedTimetables?name=${this.station.name}&countFrom=${countFrom}&countLimit=${countLimit}`;
-        const historyAPIData: SceneryTimetableHistory = await (await axios.get(requestString)).data;
+    async fetchAPIData() {
+      if (!this.station && !this.onlineScenery) {
+        this.dataStatus = Status.Data.Loaded;
+        return;
+      }

-        this.dataStatus = DataStatus.Loaded;
-        return historyAPIData;
+      try {
+        const response: API.TimetableHistory.Response = await (
+          await this.apiStore.client!.get('api/getTimetables', {
+            params: {
+              issuedFrom: this.station?.name || this.onlineScenery?.name
+            }
+          })
+        ).data;
+
+        this.historyList = response;
+
+        this.dataStatus = Status.Data.Loaded;
      } catch (error) {
        console.error(error);
-        return null;
      }
    },

    navigateToHistory() {
-      this.$router.push(`/journal/timetables?issuedFrom=${this.station.name}`);
+      this.$router.push({
+        path: '/journal/timetables',
+        query: {
+          'search-issuedFrom': this.station?.name || this.onlineScenery?.name
+        }
+      });
    }
  },
  components: { Loading }
@@ -119,4 +141,14 @@ export default defineComponent({
 <style lang="scss" scoped>
@import '../../styles/responsive.scss';
@import '../../styles/sceneryViewTables.scss';
+
+.top-filters {
+  display: flex;
+  justify-content: center;
+  gap: 0.5em;
+
+  button {
+    padding: 0.5em;
+  }
+}
 </style>
@@ -1,7 +1,7 @@
 <template>
  <div class="general-status">
    <span
-      :class="computedScheduledTrain.stopStatus"
+      :class="computedScheduledTrain.status"
      :title="computedScheduledTrain.stopStatusDescription"
    >
      {{ computedScheduledTrain.stopStatusIndicator }}
@@ -11,25 +11,21 @@

 <script lang="ts">
 import { defineComponent, PropType } from 'vue';
-import { ScheduledTrain, StopStatus } from '../../scripts/interfaces/ScheduledTrain';
-
-interface ScheduledTrainComp extends ScheduledTrain {
-  stopStatusIndicator: string;
-  stopStatusDescription: string;
-}
+import { StopStatus } from '../../typings/common';
+import { SceneryTimetableRow } from './typings';

 export default defineComponent({
  props: {
-    scheduledTrain: {
-      type: Object as PropType<ScheduledTrain>,
+    sceneryTimetableRow: {
+      type: Object as PropType<SceneryTimetableRow>,
      required: true
    }
  },

  computed: {
-    computedScheduledTrain(): ScheduledTrainComp {
-      const { prevDepartureLine, prevStationName, stopStatus, nextArrivalLine, nextStationName } =
-        this.scheduledTrain;
+    computedScheduledTrain() {
+      const { prevDepartureLine, prevStationName, nextArrivalLine, nextStationName, status } =
+        this.sceneryTimetableRow;

      const prevDepartureIndicator = prevDepartureLine
        ? `(${prevDepartureLine}) ${prevStationName}`
@@ -41,8 +37,8 @@ export default defineComponent({
      let stopStatusDescription = '',
        stopStatusIndicator = '';

-      switch (stopStatus) {
-        case StopStatus.arriving:
+      switch (status) {
+        case StopStatus.ARRIVING:
          stopStatusIndicator = `${this.$t('timetables.from')}: ${prevDepartureIndicator}`;
          stopStatusDescription = this.$t('timetables.desc-arriving', {
            prevStationName,
@@ -50,17 +46,17 @@ export default defineComponent({
          });
          break;

-        case StopStatus.online:
-        case StopStatus.stopped:
+        case StopStatus.ONLINE:
+        case StopStatus.STOPPED:
          stopStatusIndicator = nextArrivalLine
            ? `${this.$t('timetables.to')}: ${nextArrivalIndicator}`
            : `${this.$t('timetables.desc-end')}`;
          stopStatusDescription = nextArrivalLine
-            ? this.$t(`timetables.desc-${stopStatus}`, { nextStationName, nextArrivalLine })
+            ? this.$t(`timetables.desc-${status}`, { nextStationName, nextArrivalLine })
            : '';
          break;

-        case StopStatus.departed:
+        case StopStatus.DEPARTED:
          stopStatusIndicator = `${this.$t('timetables.to')}: ${nextArrivalIndicator}`;
          stopStatusDescription = this.$t('timetables.desc-departed', {
            nextStationName,
@@ -68,7 +64,7 @@ export default defineComponent({
          });
          break;

-        case StopStatus['departed-away']:
+        case StopStatus.DEPARTED_AWAY:
          stopStatusIndicator = `${this.$t('timetables.to')}: ${nextArrivalIndicator}`;
          stopStatusDescription = this.$t('timetables.desc-departed-away', {
            nextStationName,
@@ -76,7 +72,7 @@ export default defineComponent({
          });
          break;

-        case StopStatus.terminated:
+        case StopStatus.TERMINATED:
          stopStatusIndicator = `X ${this.$t('timetables.desc-terminated')}`;
          stopStatusDescription = this.$t('timetables.desc-terminated');
          break;
@@ -85,7 +81,7 @@ export default defineComponent({
          break;
      }
      return {
-        ...this.scheduledTrain,
+        ...this.sceneryTimetableRow,
        stopStatusDescription,
        stopStatusIndicator
      };
@@ -0,0 +1,13 @@
+import { StopStatus, Train, TrainStop } from '../../typings/common';
+
+export interface SceneryTimetableRow {
+  checkpointStop: TrainStop;
+  train: Train;
+  prevDepartureLine: string | null;
+  nextArrivalLine: string | null;
+  departureLine: string | null;
+  arrivingLine: string | null;
+  prevStationName: string | null;
+  nextStationName: string | null;
+  status: StopStatus;
+}
@@ -0,0 +1,42 @@
+import { StopStatus, TrainStop } from '../../typings/common';
+
+export const stopStatusPriority = [
+  StopStatus.ONLINE,
+  StopStatus.STOPPED,
+  StopStatus.DEPARTED,
+  StopStatus.ARRIVING,
+  StopStatus.DEPARTED_AWAY,
+  StopStatus.TERMINATED
+];
+
+export function getTrainStopStatus(
+  stopInfo: TrainStop,
+  currentStationName: string,
+  sceneryName: string
+) {
+  if (stopInfo.terminatesHere && stopInfo.confirmed) {
+    return StopStatus.TERMINATED;
+  }
+
+  if (!stopInfo.terminatesHere && stopInfo.confirmed && currentStationName == sceneryName) {
+    return StopStatus.DEPARTED;
+  }
+
+  if (!stopInfo.terminatesHere && stopInfo.confirmed && currentStationName != sceneryName) {
+    return StopStatus.DEPARTED_AWAY;
+  }
+
+  if (currentStationName == sceneryName && !stopInfo.stopped) {
+    return StopStatus.ONLINE;
+  }
+
+  if (currentStationName == sceneryName && stopInfo.stopped) {
+    return StopStatus.STOPPED;
+  }
+
+  if (currentStationName != sceneryName) {
+    return StopStatus.ARRIVING;
+  }
+
+  return StopStatus.ONLINE;
+}
@@ -15,7 +15,6 @@

 <script lang="ts">
 import { defineComponent } from 'vue';
-import { useStationFiltersStore } from '../../store/stationFiltersStore';

 interface FilterOption {
  id: string;
@@ -40,15 +39,9 @@ export default defineComponent({

  emits: ['update:optionValue'],

-  setup() {
-    return {
-      filterStore: useStationFiltersStore()
-    };
-  },
-
  watch: {
    'option.value'() {
-      this.filterStore.changeFilterValue(this.option.name, !this.option.value);
+      // this.filterStore.changeFilterValue(this.option.name, !this.option.value);
    }
  },

@@ -56,17 +49,17 @@ export default defineComponent({
    handleDbClick(e: Event) {
      e.preventDefault();

-      this.filterStore.lastClickedFilterId = this.option.id;
+      // this.filterStore.lastClickedFilterId = this.option.id;
      // this.option.value = true;
      this.$emit('update:optionValue', true);

-      this.filterStore.inputs.options
-        .filter((option) => {
-          return option.section == this.option.section && option.id != this.option.id;
-        })
-        .forEach((option) => {
-          option.value = !this.option.value;
-        });
+      // this.filterStore.inputs.options
+      //   .filter((option) => {
+      //     return option.section == this.option.section && option.id != this.option.id;
+      //   })
+      //   .forEach((option) => {
+      //     option.value = !this.option.value;
+      //   });
    }
  }
 });
@@ -1,10 +1,10 @@
 <template>
  <section class="filter-card" v-click-outside="closeCard" @keydown.esc="closeCard">
    <div class="card_controls">
-      <button class="btn--filled btn--image" @click="toggleCard">
+      <button class="card-button btn--filled btn--image" @click="toggleCard">
        <img class="button_icon" src="/images/icon-filter2.svg" alt="filter icon" />
-        {{ $t('options.filters') }} [F]
-        <span class="active-indicator" v-if="!filterStore.areFiltersAtDefault"></span>
+        <p>[F] {{ $t('options.filters') }}</p>
+        <span class="active-indicator" v-if="changedFilters.length != 0"></span>
      </button>

      <label for="scenery-search">
@@ -28,78 +28,106 @@
    </div>

    <transition name="card-anim">
-      <div class="card" v-if="isVisible" tabindex="0" ref="cardEl">
-        <div class="card_content">
+      <div class="card" v-if="isVisible" tabindex="0" ref="cardRef" @keydown.r="resetFilters">
+        <div class="card_content" @scroll="onScroll" ref="cardContentRef">
          <div class="card_title flex">{{ $t('filters.title') }}</div>
          <p class="card_info" v-html="$t('filters.desc')"></p>

+          <div class="changed-filters" :data-active="changedFilters.length > 0">
+            <template v-if="changedFilters.length > 0">
+              {{ $t('filters.changed-filters-count') }} <b>{{ changedFilters.length }}</b>
+            </template>
+            <template v-else>{{ $t('filters.no-changed-filters') }}</template>
+          </div>
+
          <section class="card_options">
            <div
              class="option-section"
-              v-for="section in filterStore.inputs.optionSections"
-              :key="section"
+              v-for="(sectionFilters, sectionKey) in filtersSections"
+              :key="sectionKey"
            >
              <h3 class="text--primary">
-                {{ $t(`filters.sections.${section}`) }}
-
-                <button @click="filterStore.resetSectionOptions(section)">RESET</button>
+                <span class="active-indicator" v-if="!areSectionFiltersDefault(sectionKey)"></span>
+                {{ $t(`filters.sections.${sectionKey}`) }}
+                <button @click="resetSectionFilters(sectionKey)">RESET</button>
              </h3>

              <hr />

-              <div class="section-inputs">
-                <FilterOption
-                  v-for="(option, i) in filterStore.inputs.options.filter(
-                    (o) => o.section == section
-                  )"
-                  v-model:optionValue="option.value"
-                  :option="option"
-                  :key="i"
-                />
+              <div class="section-filters">
+                <label
+                  v-for="filterKey in sectionFilters"
+                  @click="() => (filters[filterKey] = !filters[filterKey])"
+                  @dblclick="setSingleSectionFilter(sectionKey, filterKey)"
+                  :for="filterKey"
+                >
+                  <input
+                    :checked="filters[filterKey]"
+                    v-model="filters[filterKey]"
+                    type="checkbox"
+                    :class="sectionKey"
+                    :name="filterKey"
+                  />
+                  <span>
+                    {{ $t(`filters.${filterKey}`) }}
+                  </span>
+                </label>
              </div>
            </div>
          </section>

-          <section class="card_timestamp" style="text-align: center">
-            <div>{{ $t('filters.minimum-hours-title') }}</div>
+          <section class="card_timestamp">
+            <h3 class="section-header">{{ $t('filters.minimum-hours-title') }}</h3>
+
            <span class="clock">
              <button class="btn--action" @click="subHour">-</button>
              <span>{{
                minimumHours == 0
                  ? $t('filters.now')
-                  : minimumHours < 8
-                  ? minimumHours + $t('filters.hour')
-                  : $t('filters.no-limit')
+                  : minimumHours < 7
+                    ? minimumHours + $t('filters.hour')
+                    : $t('filters.no-limit')
              }}</span>
              <button class="btn--action" @click="addHour">+</button>
            </span>
          </section>

          <section class="card_authors-search">
-            <input
-              type="text"
-              :placeholder="$t('filters.authors-search')"
-              name="authors"
-              v-model="authorsInputValue"
-              @input="handleAuthorsInput"
-              @focus="preventKeyDown = true"
-              @blur="preventKeyDown = false"
-            />
+            <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.authors-button-title') }}</button>
+            </form>
          </section>

          <section class="card_sliders">
-            <div class="slider" v-for="(slider, i) in filterStore.inputs.sliders" :key="i">
+            <div class="slider" v-for="(slider, i) in initSliders" :key="i">
              <input
                class="slider-input"
                type="range"
-                :name="slider.name"
+                :name="slider.id"
                :id="slider.id"
                :min="slider.minRange"
                :max="slider.maxRange"
-                v-model="slider.value"
-                @change="handleInput"
+                :step="slider.step"
+                v-model="filters[slider.id]"
              />
-              <span class="slider-value">{{ slider.value }}</span>
+              <span class="slider-value">{{ filters[slider.id] }}</span>
              <div class="slider-content">
                {{ $t(`filters.sliders.${slider.id}`) }}
              </div>
@@ -120,11 +148,11 @@

            <button
              class="btn--action"
+              :disabled="changedFilters.length == 0"
+              :data-disabled="changedFilters.length == 0"
              @click="resetFilters"
-              :disabled="filterStore.areFiltersAtDefault"
-              :data-disabled="filterStore.areFiltersAtDefault"
            >
-              {{ $t('filters.reset') }}
+              [R] {{ $t('filters.reset') }}
            </button>
            <button class="btn--action" @click="closeCard">{{ $t('filters.close') }}</button>
          </div>
@@ -138,11 +166,23 @@
 import { defineComponent, inject } from 'vue';
 import keyMixin from '../../mixins/keyMixin';
 import routerMixin from '../../mixins/routerMixin';
-import StorageManager from '../../scripts/managers/storageManager';
-import { useStationFiltersStore } from '../../store/stationFiltersStore';
-import { useStore } from '../../store/store';
+import { useMainStore } from '../../store/mainStore';

 import FilterOption from './FilterOption.vue';
+import StorageManager from '../../managers/storageManager';
+
+import {
+  filtersSections,
+  initSliders,
+  initFilters,
+  getChangedFilters
+} from '../../managers/stationFilterManager';
+
+import { StationFilterSection } from '../../managers/stationFilterManager';
+import { computed } from 'vue';
+import { watch } from 'vue';
+
+const STORAGE_KEY = 'options_saved';

 export default defineComponent({
  components: { FilterOption },
@@ -150,36 +190,52 @@ export default defineComponent({

  data: () => ({
    saveOptions: false,
-    STORAGE_KEY: 'options_saved',

-    authorsInputValue: '',
+    filtersSections,
+    initSliders,
+
    minimumHours: 0,
+    authors: '',

    currentRegion: { id: '', value: '' },

    delayInputTimer: -1,
-    chosenSearchScenery: ''
+    chosenSearchScenery: '',
+
+    scrollTop: 0,
+    lastFocusedEl: null as HTMLElement | null
  }),

  setup() {
    const isVisible = inject('isFilterCardVisible');
-    const store = useStore();
-    const filterStore = useStationFiltersStore();
+    const store = useMainStore();
+
+    const filters = inject('StationsView_filters') as Record<string, any>;
+
+    const changedFilters = computed(() => getChangedFilters(filters));
+
+    // Save filters to persistent storage
+    watch(filters, (value) => {
+      if (!StorageManager.isRegistered(STORAGE_KEY)) return;
+
+      Object.keys(value).forEach((filterKey) => {
+        StorageManager.setValue(filterKey, filters[filterKey]);
+      });
+    });

    return {
      isVisible,
      store,
-      filterStore
+      filters,
+      changedFilters
    };
  },

  mounted() {
-    this.saveOptions = StorageManager.isRegistered(this.STORAGE_KEY);
+    this.saveOptions = StorageManager.isRegistered(STORAGE_KEY);

    if (StorageManager.isRegistered('onlineFromHours') && this.saveOptions) {
      this.minimumHours = StorageManager.getNumericValue('onlineFromHours');
-
-      this.changeNumericFilterValue('onlineFromHours', this.minimumHours);
    }

    this.currentRegion = this.store.region;
@@ -196,6 +252,19 @@ export default defineComponent({

    currentOptionsActive() {
      return true;
+    },
+
+    authorsHint() {
+      return this.store.stationList
+        .reduce((acc, station) => {
+          station.generalInfo?.authors?.forEach((author) => {
+            if (author.trim() != '' && !acc.includes(author.toLocaleLowerCase()))
+              acc.push(author.toLocaleLowerCase());
+          });
+
+          return acc;
+        }, [] as string[])
+        .sort((a, b) => a.localeCompare(b));
    }
  },

@@ -211,7 +280,10 @@ export default defineComponent({

    isVisible(value: boolean) {
      this.$nextTick(() => {
-        if (value) (this.$refs['cardEl'] as HTMLDivElement).focus();
+        if (value) {
+          (this.$refs['cardRef'] as HTMLDivElement).focus();
+          (this.$refs['cardContentRef'] as HTMLDivElement).scrollTop = this.scrollTop;
+        }
      });
    }
  },
@@ -222,63 +294,67 @@ export default defineComponent({
      this.isVisible = !this.isVisible;
    },

-    handleInput(e: Event) {
-      const target = e.target as HTMLInputElement;
-
-      this.filterStore.changeFilterValue(target.name, target.value);
-
-      if (this.saveOptions) StorageManager.setStringValue(target.name, target.value);
+    onScroll(e: Event) {
+      this.scrollTop = (e.target as HTMLElement).scrollTop;
    },

-    handleAuthorsInput(e: Event) {
-      clearTimeout(this.delayInputTimer);
-
-      this.delayInputTimer = window.setTimeout(() => {
-        this.handleInput(e);
-      }, 400);
-    },
-
-    changeNumericFilterValue(name: string, value: number, saveToStorage = false) {
-      this.filterStore.changeFilterValue(name, value);
-      if (this.saveOptions && saveToStorage) StorageManager.setNumericValue(name, value);
+    handleAuthorsInput() {
+      this.filters['authors'] = this.authors;
+      // if (this.saveOptions) StorageManager.setStringValue('authors', target.value);
    },

    subHour() {
-      this.minimumHours = this.minimumHours < 1 ? 8 : this.minimumHours - 1;
-
-      this.changeNumericFilterValue('onlineFromHours', this.minimumHours, true);
+      this.minimumHours = this.minimumHours < 1 ? 7 : this.minimumHours - 1;
+      this.filters['onlineFromHours'] = this.minimumHours;
    },

    addHour() {
-      this.minimumHours = this.minimumHours > 7 ? 0 : this.minimumHours + 1;
-
-      this.changeNumericFilterValue('onlineFromHours', this.minimumHours, true);
+      this.minimumHours = this.minimumHours > 6 ? 0 : this.minimumHours + 1;
+      this.filters['onlineFromHours'] = this.minimumHours;
    },

    saveFilters() {
      this.saveOptions = !this.saveOptions;

      if (!this.saveOptions) {
-        StorageManager.unregisterStorage(this.STORAGE_KEY);
+        StorageManager.unregisterStorage(STORAGE_KEY);
        return;
      }

-      StorageManager.registerStorage(this.STORAGE_KEY);
+      StorageManager.registerStorage(STORAGE_KEY);

-      this.filterStore.inputs.options.forEach((option) =>
-        StorageManager.setBooleanValue(option.name, !option.value)
-      );
-      this.filterStore.inputs.sliders.forEach((slider) =>
-        StorageManager.setNumericValue(slider.name, slider.value)
-      );
+      Object.keys(this.filters).forEach((filterKey) => {
+        StorageManager.setValue(filterKey, this.filters[filterKey]);
+      });
    },

    resetFilters() {
-      this.authorsInputValue = '';
-
+      // Reset local model values
      this.minimumHours = 0;
-      this.changeNumericFilterValue('onlineFromHours', this.minimumHours, true);
-      this.filterStore.resetFilters();
+      this.authors = '';
+
+      // Reset global filters
+      Object.keys(this.filters).forEach((filterKey) => {
+        this.filters[filterKey] = (initFilters as any)[filterKey];
+      });
+    },
+
+    areSectionFiltersDefault(sectionKey: StationFilterSection) {
+      return filtersSections[sectionKey].every((filterKey) => {
+        return this.filters[filterKey] == initFilters[filterKey];
+      });
+    },
+
+    resetSectionFilters(sectionKey: StationFilterSection) {
+      filtersSections[sectionKey].forEach((filterKey) => {
+        this.filters[filterKey] = initFilters[filterKey];
+      });
+    },
+
+    setSingleSectionFilter(sectionKey: StationFilterSection, chosenKey: string) {
+      filtersSections[sectionKey].forEach((filterKey) => {
+        if (filterKey != chosenKey) this.filters[filterKey] = initFilters[filterKey];
+      });
    },

    closeCard() {
@@ -293,152 +369,170 @@ export default defineComponent({
 </script>

 <style lang="scss" scoped>
-@import '../../styles/responsive.scss';
-@import '../../styles/card.scss';
+@import '../../styles/responsive';
+@import '../../styles/card';
+@import '../../styles/animations';
+@import '../../styles/variables';

-.card-anim {
-  &-enter-active,
-  &-leave-active {
-    transition: all $animDuration $animType;
-  }
-
-  &-enter-from,
-  &-leave-to {
-    opacity: 0;
-    transform: translate(-50%, -50%) scale(0.45);
-  }
+h3.section-header {
+  text-align: center;
+  margin: 0.5em 0;
 }

 .card {
  display: grid;
  grid-template-rows: 1fr auto;
+}

-  &_info {
-    background-color: #111;
-    padding: 0.5em;
+.card_info {
+  background-color: #111;
+  padding: 0.5em;
+}
+
+.changed-filters {
+  background-color: #111;
+  padding: 0.5em;
+
+  &[data-active='true'] {
+    color: lightgreen;
+  }
+}
+
+.card_controls {
+  display: flex;
+  gap: 0.5em;
+
+  input {
+    border-radius: 0.5em 0.5em 0 0;
+    height: 100%;
+  }
+}
+
+.card_content {
+  padding: 1em 0.5em;
+
+  display: flex;
+  flex-direction: column;
+
+  gap: 1em;
+  overflow: auto;
+}
+
+.card_title {
+  font-size: 2em;
+  font-weight: 700;
+  color: $accentCol;
+
+  text-align: center;
+}
+
+.card_timestamp {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+
+  .clock {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    font-size: 1.2em;
+    text-align: center;
+
+    span {
+      min-width: 120px;
+      font-weight: bold;
+      color: $accentCol;
+    }
+
+    button {
+      padding: 0.2em 0.6em;
+    }
+  }
+}
+
+.card_authors-search {
+  margin: 1em 0;
+
+  form {
+    display: flex;
+    justify-content: center;
+    flex-wrap: wrap;
+    gap: 0.5em;
+    width: 100%;
+    margin-top: 1em;
  }

-  &_controls {
+  input {
+    width: 70%;
+    max-width: 400px;
+    padding: 0.5em;
+    outline: 1px solid white;
+  }
+}
+
+.section-filters {
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  gap: 0.5em;
+  margin: 1em 0;
+}
+
+.section-filters > label {
+  position: relative;
+  user-select: none;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+
+  span {
+    cursor: pointer;
+    display: inline-block;
+    width: 100%;
+    text-align: center;
+    padding: 0.25em;
+    font-weight: bold;
+    background-color: forestgreen;
+  }
+
+  span:hover {
+    background-color: #22aa22;
+  }
+
+  input[type='checkbox'] {
+    cursor: pointer;
+    position: absolute;
+    opacity: 0;
+
+    &:checked + span {
+      background-color: #444;
+
+      &:hover {
+        background-color: #555;
+      }
+    }
+
+    &:focus-visible + span {
+      outline: 1px solid $accentCol;
+    }
+  }
+}
+
+.card_actions {
+  padding: 0.5em;
+
+  .action-buttons {
    display: flex;
    gap: 0.5em;

-    input {
-      border-radius: 0.5em 0.5em 0 0;
-      height: 100%;
-    }
-  }
+    margin-top: 0.5em;

-  &_content {
-    padding: 1em 0.5em;
-
-    display: flex;
-    flex-direction: column;
-
-    gap: 1em;
-    overflow: auto;
-  }
-
-  &_title {
-    font-size: 2em;
-    font-weight: 700;
-    color: $accentCol;
-
-    text-align: center;
-  }
-
-  &_regions {
-    display: flex;
-    justify-content: center;
-
-    label > input {
-      display: none;
-    }
-
-    label > span {
-      padding: 0.25em 0.5em;
-      margin: 0 0.25em;
-
-      cursor: pointer;
-
-      background-color: gray;
-
-      &.checked {
-        background-color: seagreen;
-      }
-    }
-  }
-
-  &_timestamp {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-
-    .clock {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-
-      font-size: 1.2em;
-      margin-top: 0.5em;
-
-      span {
-        min-width: 120px;
-        font-weight: bold;
-        color: $accentCol;
-      }
-
-      button {
-        padding: 0.2em 0.6em;
-      }
-    }
-  }
-
-  &_modes {
-    display: flex;
-    justify-content: center;
-
-    .option {
-      margin: 0 1em;
-    }
-  }
-
-  &_authors-search {
-    display: inline-block;
-    margin: 0 auto;
-    width: 60%;
-    min-width: 240px;
-
-    input {
+    button {
      width: 100%;
-      padding: 0.5em;
-      border: 1px solid white;
-    }
-  }
-
-  &_actions {
-    width: 100%;
-    padding: 0.5em;
-
-    .filter-option {
-      max-width: 50%;
      margin: 0 auto;
-    }
+      padding: 0.5em;

-    .action-buttons {
-      display: flex;
-      gap: 0.5em;
-      width: 100%;
-
-      margin-top: 0.5em;
-
-      button {
-        width: 50%;
-        margin: 0 auto;
-        padding: 0.5em;
-
-        &[data-selected='true'] {
-          background-color: forestgreen;
-        }
+      &[data-selected='true'] {
+        background-color: forestgreen;
      }
    }
  }
@@ -457,35 +551,18 @@ export default defineComponent({
  }
 }

-.section-inputs {
-  display: grid;
-  grid-template-columns: repeat(3, minmax(0, 1fr));
-  gap: 0.5em;
-  margin: 1em 0;
-}
-
-.quick-actions div {
-  display: flex;
-  margin: 1em 0;
-  gap: 1em;
-}
-
 .slider {
  display: flex;
  align-items: center;
+  gap: 0.25em;

  margin-bottom: 1em;

  &-value {
    color: $accentCol;
-    margin-right: 0.5em;
    padding: 0.1em 0.2em;
  }

-  &-content {
-    flex-grow: 2;
-  }
-
  &-input {
    -webkit-appearance: none;
    appearance: none;
@@ -494,7 +571,6 @@ export default defineComponent({
    outline: none;

    min-width: 25%;
-    max-width: 120px;

    &:focus-visible ~ * {
      color: gold;
@@ -564,4 +640,19 @@ export default defineComponent({
    }
  }
 }
+
+@include smallScreen {
+  .card_controls > button.card-button > p {
+    display: none;
+  }
+
+  .slider {
+    flex-wrap: wrap;
+    justify-content: center;
+
+    &-input {
+      width: 90%;
+    }
+  }
+}
 </style>
@@ -0,0 +1,212 @@
+<template>
+  <div class="station-stats">
+    <div class="separator" />
+
+    <div class="stats-row">
+      <div>
+        <span
+          >{{ $t('station-stats.u-factor') }}
+          <a
+            href="https://td2.info.pl/dyskusje/wspolczynnik-ugla-czy-to-ma-sens/msg81011/#msg81011"
+            target="_blank"
+            :data-tooltip="$t('station-stats.u-factor-tooltip')"
+            >(?)</a
+          >:
+        </span>
+
+        <b class="u-factor" :style="calculateFactorStyle()">
+          {{ uFactor.toFixed(2) }}
+        </b>
+      </div>
+
+      <div>
+        &bull;
+        {{ $t('station-stats.avg-timetable-count') }}
+        <b>{{ avgTimetableCount.toFixed(2) }}</b>
+      </div>
+
+      <div>
+        &bull;
+        {{ $t('station-stats.single-track-count') }}
+        <b>{{ trackCount.oneWay }}</b> (<b>{{ trackCount.oneWayElectric }} ⚡</b>)
+      </div>
+
+      <div>
+        &bull;
+        {{ $t('station-stats.double-track-count') }}
+        <b>{{ trackCount.twoWay }}</b>
+        (<b>{{ trackCount.twoWayElectric }} ⚡</b>)
+      </div>
+
+      <div>
+        &bull; {{ $t('station-stats.cross-sceneries') }} <b>{{ trackCount.crossTrack }}</b> (<b
+          >{{ trackCount.crossTrackElectric }} ⚡</b
+        >)
+      </div>
+
+      <div>
+        &bull;
+        {{ $t('station-stats.open-spawns') }} <b>{{ spawnCount.passenger }}</b> - PAS /
+        <b>{{ spawnCount.freight }}</b> - TOW / <b>{{ spawnCount.loco }}</b> - LUZ /
+        <b>{{ spawnCount.all }}</b> - ALL
+      </div>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { useMainStore } from '../../store/mainStore';
+
+export default defineComponent({
+  data() {
+    return {
+      mainStore: useMainStore()
+    };
+  },
+
+  methods: {
+    calculateFactorStyle() {
+      if (this.uFactor == 0) return '';
+
+      const norm = this.uFactor == 0 ? 1 : Math.max(Math.min(this.uFactor / 2, 1), 0);
+      const lerp = 120 * norm;
+
+      return `color: hsl(${lerp}, 100%, 60%)`;
+    }
+  },
+
+  computed: {
+    uFactor() {
+      const activeDispatchers = this.mainStore.activeSceneryList.filter(
+        (scenery) => scenery.region == this.mainStore.region.id && scenery.dispatcherId != -1
+      );
+
+      const activeTrains = this.mainStore.trainList.filter(
+        (train) => train.region == this.mainStore.region.id
+      );
+
+      return activeDispatchers.length != 0 ? activeTrains.length / activeDispatchers.length : 0;
+    },
+
+    avgTimetableCount() {
+      const regionSceneries = this.mainStore.activeSceneryList.filter((sc) => {
+        return sc.region == this.mainStore.region.id;
+      });
+
+      const timetableCountSum = regionSceneries.reduce((acc, sc) => {
+        acc += sc.scheduledTrainCount.all;
+        return acc;
+      }, 0);
+
+      if (regionSceneries.length == 0) return 0;
+
+      return timetableCountSum / regionSceneries.length;
+    },
+
+    trackCount() {
+      return this.mainStore.allStationInfo
+        .filter(
+          (st) =>
+            st.onlineInfo?.dispatcherId != -1 &&
+            st.onlineInfo?.region == this.mainStore.region.id &&
+            st.generalInfo?.routes
+        )
+        .reduce(
+          (acc, st) => {
+            const { routes } = st.generalInfo!;
+
+            if (
+              routes.single.filter((r) => !r.isInternal).length > 0 &&
+              routes.double.filter((r) => !r.isInternal).length > 0
+            ) {
+              acc.crossTrack++;
+
+              if (
+                routes.single.some((r) => r.isElectric) &&
+                routes.double.some((r) => r.isElectric)
+              )
+                acc.crossTrackElectric++;
+            }
+
+            [...routes.single, ...routes.double].forEach((r) => {
+              if (r.isInternal) return;
+
+              acc[r.routeTracks == 2 ? 'twoWay' : 'oneWay'] += 1;
+              if (r.isElectric) acc[r.routeTracks == 2 ? 'twoWayElectric' : 'oneWayElectric'] += 1;
+            });
+
+            return acc;
+          },
+          {
+            oneWay: 0,
+            oneWayElectric: 0,
+            twoWay: 0,
+            twoWayElectric: 0,
+            crossTrack: 0,
+            crossTrackElectric: 0
+          }
+        );
+    },
+
+    spawnCount() {
+      return this.mainStore.activeSceneryList.reduce(
+        (acc, scenery) => {
+          if (scenery.region != this.mainStore.region.id) return acc;
+
+          scenery.spawns.forEach((spawn) => {
+            if (/EZT|POS|OSOB/i.test(spawn.spawnName)) acc['passenger'] += 1;
+            if (/TOW/i.test(spawn.spawnName)) acc['freight'] += 1;
+            if (/LUZ|SM/i.test(spawn.spawnName)) acc['loco'] += 1;
+            if (/ALL/i.test(spawn.spawnName)) acc['all'] += 1;
+          });
+
+          return acc;
+        },
+        { passenger: 0, freight: 0, loco: 0, all: 0 }
+      );
+    }
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+.separator {
+  width: 100%;
+  height: 2px;
+  margin: 0.5em 0;
+  background-color: #aaa;
+}
+
+.station-stats {
+  text-align: center;
+  color: #ddd;
+}
+
+.stats-row {
+  display: flex;
+  justify-content: center;
+  flex-wrap: wrap;
+  text-wrap: pretty;
+  gap: 0.25em;
+  margin-top: 0.25em;
+}
+
+.u-factor {
+  [data-factor-low='true'] {
+    color: #ddd;
+  }
+
+  [data-factor-mediocre='true'] {
+    color: lightgreen;
+  }
+
+  [data-factor-high='true'] {
+    color: greenyellow;
+  }
+
+  [data-factor-highest='true'] {
+    color: rgb(22, 245, 22);
+  }
+}
+</style>
@@ -1,6 +1,10 @@
 <template>
  <section class="station_table">
-    <div class="table_wrapper">
+    <Loading
+      v-if="apiStore.dataStatuses.connection == Status.Loading && filteredStationList.length == 0"
+    />
+
+    <div class="table_wrapper" v-else-if="filteredStationList.length > 0">
      <table>
        <thead>
          <tr>
@@ -9,14 +13,15 @@
              :key="headerName"
              @click="changeSorter(headerName)"
              class="header-text"
+              :class="headerName"
            >
              <span class="header_wrapper">
-                <div v-html="$t(`sceneries.${headerName}`)"></div>
+                <div v-html="$t(`sceneries.headers.${headerName}`)"></div>

                <img
                  class="sort-icon"
-                  v-if="sorterActive.headerName == headerName"
-                  :src="`/images/icon-arrow-${sorterActive.dir == 1 ? 'asc' : 'desc'}.svg`"
+                  v-if="activeSorter.headerName == headerName"
+                  :src="`/images/icon-arrow-${activeSorter.dir == 1 ? 'asc' : 'desc'}.svg`"
                  alt="sort icon"
                />
              </span>
@@ -27,18 +32,19 @@
              :key="headerName"
              @click="changeSorter(headerName)"
              class="header-image"
+              :class="headerName"
            >
              <span class="header_wrapper">
                <img
                  :src="`/images/icon-${headerName}.svg`"
                  :alt="headerName"
-                  :title="$t(`sceneries.${headerName}`)"
+                  :title="$t(`sceneries.headers.${headerName}`)"
                />

                <img
                  class="sort-icon"
-                  v-if="sorterActive.headerName == headerName"
-                  :src="`/images/icon-arrow-${sorterActive.dir == 1 ? 'asc' : 'desc'}.svg`"
+                  v-if="activeSorter.headerName == headerName"
+                  :src="`/images/icon-arrow-${activeSorter.dir == 1 ? 'asc' : 'desc'}.svg`"
                  alt="sort icon"
                />
              </span>
@@ -48,24 +54,23 @@

        <tbody>
          <tr
-            class="station"
+            v-for="station in filteredStationList"
            :class="{ 'last-selected': lastSelectedStationName == station.name }"
-            v-for="(station, i) in stations"
-            :key="i + station.name"
+            :key="station.name"
            @click.left="setScenery(station.name)"
            @click.right="openForumSite($event, station.generalInfo?.url)"
            @keydown.enter="setScenery(station.name)"
            @keydown.space="openForumSite($event, station.generalInfo?.url)"
            tabindex="0"
          >
-            <td class="station_name" :class="station.generalInfo?.availability">
+            <td class="station-name" :class="station.generalInfo?.availability">
              <b v-if="station.generalInfo?.project" style="color: salmon">{{
                station.generalInfo.project
              }}</b>
              {{ station.name }}
            </td>

-            <td class="station_level">
+            <td class="station-level">
              <span v-if="station.generalInfo">
                <span
                  v-if="
@@ -82,7 +87,7 @@
                  <img
                    src="/images/icon-abandoned.svg"
                    alt="non-public"
-                    :title="$t('desc.abandoned')"
+                    :title="$t('sceneries.info.abandoned')"
                  />
                </span>

@@ -90,7 +95,7 @@
                  <img
                    src="/images/icon-lock.svg"
                    alt="non-public"
-                    :title="$t('desc.non-public')"
+                    :title="$t('sceneries.info.non-public')"
                  />
                </span>

@@ -98,7 +103,7 @@
                  <img
                    src="/images/icon-unavailable.svg"
                    alt="unavailable"
-                    :title="$t('desc.unavailable')"
+                    :title="$t('sceneries.info.unavailable')"
                  />
                </span>
              </span>
@@ -106,21 +111,34 @@
              <span v-else> ? </span>
            </td>

-            <td class="station_status">
+            <td class="station-status">
              <StationStatusBadge
-                :statusID="station.onlineInfo?.statusID"
                :isOnline="station.onlineInfo ? true : false"
-                :statusTimestamp="station.onlineInfo?.statusTimestamp"
+                :dispatcherStatus="station.onlineInfo?.dispatcherStatus"
              />
            </td>

-            <td class="station_dispatcher-name">
-              {{ station.onlineInfo ? station.onlineInfo.dispatcherName : '' }}
+            <td class="station-dispatcher-name">
+              <span v-if="station.onlineInfo?.dispatcherName">
+                <b
+                  v-if="apiStore.donatorsData.includes(station.onlineInfo.dispatcherName)"
+                  @click.stop="openDonationCard"
+                  data-tooltip-type="DonatorTooltip"
+                  :data-tooltip-content="$t('donations.dispatcher-message')"
+                >
+                  <img src="/images/icon-diamond.svg" alt="" />
+                  {{ station.onlineInfo.dispatcherName }}
+                </b>
+
+                <div v-else>
+                  {{ station.onlineInfo.dispatcherName }}
+                </div>
+              </span>
            </td>

-            <td class="station_dispatcher-exp">
+            <td class="station-dispatcher-exp">
              <span
-                v-if="station.onlineInfo"
+                v-if="station.onlineInfo && station.onlineInfo?.dispatcherExp != -1"
                :style="
                  calculateExpStyle(
                    station.onlineInfo.dispatcherExp,
@@ -128,208 +146,234 @@
                  )
                "
              >
-                {{ 2 > station.onlineInfo.dispatcherExp ? 'L' : station.onlineInfo.dispatcherExp }}
+                {{ station.onlineInfo.dispatcherExp < 2 ? 'L' : station.onlineInfo.dispatcherExp }}
              </span>
            </td>

-            <td class="station_tracks twoway">
-              <span
-                v-if="
-                  station.generalInfo &&
-                  station.generalInfo.routes.twoWayCatenaryRouteNames.length > 0
-                "
-                class="track catenary"
-                :title="`Liczba zelektryfikowanych szlaków dwutorowych: ${station.generalInfo.routes.twoWayCatenaryRouteNames.length}`"
-              >
-                {{ station.generalInfo.routes.twoWayCatenaryRouteNames.length }}
-              </span>
+            <td class="station-tracks">
+              <div v-if="station.generalInfo">
+                <span
+                  v-if="station.generalInfo.routes.singleElectrifiedNames.length != 0"
+                  class="track catenary"
+                  :title="`${$t('sceneries.info.single-track-routes-catenary')}${
+                    station.generalInfo.routes.singleElectrifiedNames.length
+                  }`"
+                >
+                  {{ station.generalInfo.routes.singleElectrifiedNames.length }}
+                </span>

-              <span
-                v-if="
-                  station.generalInfo &&
-                  station.generalInfo.routes.twoWayNoCatenaryRouteNames.length > 0
-                "
-                class="track no-catenary"
-                :title="`Liczba niezelektryfikowanych szlaków dwutorowych: ${station.generalInfo.routes.twoWayNoCatenaryRouteNames.length}`"
-              >
-                {{ station.generalInfo.routes.twoWayNoCatenaryRouteNames.length }}
-              </span>
-
-              <span class="separator"></span>
-
-              <span
-                v-if="
-                  station.generalInfo &&
-                  station.generalInfo.routes.oneWayCatenaryRouteNames.length > 0
-                "
-                class="track catenary"
-                :title="`Liczba zelektryfikowanych szlaków jednotorowych: ${station.generalInfo.routes.oneWayCatenaryRouteNames.length}`"
-              >
-                {{ station.generalInfo.routes.oneWayCatenaryRouteNames.length }}
-              </span>
-
-              <span
-                v-if="
-                  station.generalInfo &&
-                  station.generalInfo.routes.oneWayNoCatenaryRouteNames.length > 0
-                "
-                class="track no-catenary"
-                :title="`Liczba niezelektryfikowanych szlaków jednotorowych: ${station.generalInfo.routes.oneWayNoCatenaryRouteNames.length}`"
-              >
-                {{ station.generalInfo.routes.oneWayNoCatenaryRouteNames.length }}
-              </span>
+                <span
+                  v-if="station.generalInfo.routes.singleOtherNames.length != 0"
+                  class="track no-catenary"
+                  :title="`${$t('sceneries.info.single-track-routes-other')}${
+                    station.generalInfo.routes.singleOtherNames.length
+                  }`"
+                >
+                  {{ station.generalInfo.routes.singleOtherNames.length }}
+                </span>
+              </div>
            </td>

-            <td class="station_info" v-if="station.generalInfo">
+            <td class="station-tracks">
+              <div v-if="station.generalInfo">
+                <span
+                  v-if="station.generalInfo.routes.doubleElectrifiedNames.length != 0"
+                  class="track catenary"
+                  :title="`${$t('sceneries.info.double-track-routes-catenary')}${
+                    station.generalInfo.routes.doubleElectrifiedNames.length
+                  }`"
+                >
+                  {{ station.generalInfo.routes.doubleElectrifiedNames.length }}
+                </span>
+
+                <span
+                  v-if="station.generalInfo.routes.doubleOtherNames.length != 0"
+                  class="track no-catenary"
+                  :title="`${$t('sceneries.info.double-track-routes-other')}${
+                    station.generalInfo.routes.doubleOtherNames.length
+                  }`"
+                >
+                  {{ station.generalInfo.routes.doubleOtherNames.length }}
+                </span>
+              </div>
+            </td>
+
+            <td class="station-info">
              <span
+                v-if="station.generalInfo?.signalType"
                class="scenery-icon icon-info"
-                :class="station.generalInfo.controlType.replace('+', '-')"
-                :title="$t('desc.control-type') + $t(`controls.${station.generalInfo.controlType}`)"
-                v-html="getControlTypeAbbrev(station.generalInfo.controlType)"
+                :class="station.generalInfo?.controlType.replace('+', '-')"
+                :title="
+                  $t('sceneries.info.control-type') +
+                  $t(`controls.${station.generalInfo?.controlType}`)
+                "
              >
+                {{ $t(`controls.abbrevs.${station.generalInfo.controlType}`) }}
              </span>

-              <span>
-                <img
-                  class="icon-info"
-                  v-if="station.generalInfo.SUP"
-                  src="/images/icon-SUP.svg"
-                  alt="SUP (RASP-UZK)"
-                  :title="$t('desc.SUP')"
-                />
-              </span>
-
-              <span>
-                <img
-                  class="icon-info"
-                  v-if="station.generalInfo.signalType"
-                  :src="`/images/icon-${station.generalInfo.signalType}.svg`"
-                  :alt="station.generalInfo.signalType"
-                  :title="$t('desc.signals-type') + $t(`signals.${station.generalInfo.signalType}`)"
-                />
-              </span>
-
-              <span>
-                <img
-                  class="icon-info"
-                  v-if="station.generalInfo && station.generalInfo.routes.sblRouteNames.length > 0"
-                  src="/images/icon-SBL.svg"
-                  alt="SBL"
-                  :title="$t('desc.SBL') + `${station.generalInfo.routes.sblRouteNames.join(',')}`"
-                />
-              </span>
-            </td>
-
-            <td class="station_info" v-else>
              <img
+                v-if="station.generalInfo?.signalType"
+                class="icon-info"
+                :src="`/images/icon-${station.generalInfo.signalType}.svg`"
+                :alt="station.generalInfo.signalType"
+                :title="
+                  $t('sceneries.info.signals-type') +
+                  $t(`signals.${station.generalInfo.signalType}`)
+                "
+              />
+
+              <img
+                v-if="station.generalInfo?.SUP"
+                class="icon-info"
+                src="/images/icon-SUP.svg"
+                alt="SUP (RASP-UZK)"
+                :title="$t('sceneries.info.SUP')"
+              />
+
+              <img
+                v-if="station.generalInfo?.ASDEK"
+                class="icon-info"
+                src="/images/icon-ASDEK.svg"
+                alt="dSAT ASDEK"
+                :title="$t('sceneries.info.ASDEK')"
+              />
+
+              <img
+                v-if="!station.generalInfo"
                class="icon-info"
                src="/images/icon-unknown.svg"
                alt="icon-unknown"
-                :title="$t('desc.unknown')"
+                :title="$t('sceneries.info.unknown')"
              />
            </td>

-            <td class="station_users" :class="{ inactive: !station.onlineInfo }">
-              <span>{{ station.onlineInfo?.currentUsers || 0 }}</span>
+            <td
+              class="station-users"
+              :class="{ inactive: !station.onlineInfo }"
+              data-tooltip-type="UsersTooltip"
+              :data-tooltip-content="JSON.stringify(station.onlineInfo?.stationTrains ?? [])"
+            >
+              <span class="text--primary">{{
+                station.onlineInfo?.stationTrains?.length ?? '-'
+              }}</span>
              /
-              <span>{{ station.onlineInfo?.maxUsers || 0 }}</span>
+              <span class="text--primary">{{ station.onlineInfo?.maxUsers ?? '-' }}</span>
            </td>

-            <td class="station_spawns" :class="{ inactive: !station.onlineInfo }">
-              <span>{{ station.onlineInfo?.spawns.length || 0 }}</span>
+            <td class="station-likes" :class="{ inactive: !station.onlineInfo }">
+              <span>{{ station.onlineInfo?.dispatcherRate ?? '-' }}</span>
            </td>

            <td
-              class="station_schedules all"
-              style="width: 30px"
+              class="station-spawns"
              :class="{ inactive: !station.onlineInfo }"
+              data-tooltip-type="SpawnsTooltip"
+              :data-tooltip-content="JSON.stringify(station.onlineInfo?.spawns ?? [])"
            >
-              {{ station.onlineInfo?.scheduledTrainCount.all }}
+              <span>{{ station.onlineInfo?.spawns.length ?? '-' }}</span>
            </td>

            <td
-              class="station_schedules unconfirmed"
+              class="station-schedules all"
              style="width: 30px"
              :class="{ inactive: !station.onlineInfo }"
            >
-              {{ station.onlineInfo?.scheduledTrainCount.unconfirmed }}
+              {{ station.onlineInfo?.scheduledTrainCount.all ?? '-' }}
            </td>

            <td
-              class="station_schedules confirmed"
+              class="station-schedules unconfirmed"
              style="width: 30px"
              :class="{ inactive: !station.onlineInfo }"
            >
-              {{ station.onlineInfo?.scheduledTrainCount.confirmed }}
+              {{ station.onlineInfo?.scheduledTrainCount.unconfirmed ?? '-' }}
+            </td>
+
+            <td
+              class="station-schedules confirmed"
+              style="width: 30px"
+              :class="{ inactive: !station.onlineInfo }"
+            >
+              {{ station.onlineInfo?.scheduledTrainCount.confirmed ?? '-' }}
            </td>
          </tr>
        </tbody>
      </table>
    </div>

-    <Loading v-if="!isDataLoaded && stations.length == 0" />
+    <div class="no-stations" v-else>
+      <div>
+        {{ $t('sceneries.no-stations') }} (region: <b>{{ mainStore.region.name }}</b
+        >)
+      </div>

-    <div class="no-stations" v-else-if="stations.length == 0">
-      {{ $t('sceneries.no-stations') }}
+      <div class="text--primary" v-if="getChangedFilters(filters).length != 0">
+        ⚠ {{ $t('sceneries.active-filters') }}
+      </div>
    </div>
  </section>
 </template>

 <script lang="ts">
-import { defineComponent, computed, PropType } from 'vue';
-import dateMixin from '../../mixins/dateMixin';
-import stationInfoMixin from '../../mixins/stationInfoMixin';
-import styleMixin from '../../mixins/styleMixin';
-import { DataStatus } from '../../scripts/enums/DataStatus';
-import Station from '../../scripts/interfaces/Station';
-import { useStationFiltersStore } from '../../store/stationFiltersStore';
-import { useStore } from '../../store/store';
-import Loading from '../Global/Loading.vue';
-import { HeadIdsTypes, headIconsIds, headIds } from '../../scripts/data/stationHeaderNames';
+import { defineComponent, inject, computed } from 'vue';
 import StationStatusBadge from '../Global/StationStatusBadge.vue';
+import Loading from '../Global/Loading.vue';
+import dateMixin from '../../mixins/dateMixin';
+import styleMixin from '../../mixins/styleMixin';
+import { useApiStore } from '../../store/apiStore';
+import { useMainStore } from '../../store/mainStore';
+import { Status } from '../../typings/common';
+import { useTooltipStore } from '../../store/tooltipStore';
+import { getChangedFilters } from '../../managers/stationFilterManager';
+import { ActiveSorter, HeadIdsType, headIconsIds, headIds } from './typings';
+import { filterStations, sortStations } from './utils';

 export default defineComponent({
-  props: {
-    stations: {
-      type: Array as PropType<Station[]>,
-      required: true
-    }
-  },
+  emits: ['toggleDonationCard'],

  components: { Loading, StationStatusBadge },
-  mixins: [styleMixin, dateMixin, stationInfoMixin],
+  mixins: [styleMixin, dateMixin],

  data: () => ({
    headIconsIds,
    headIds,
-    lastSelectedStationName: ''
+    lastSelectedStationName: '',
+    getChangedFilters
  }),

-  computed: {
-    sorterActive() {
-      return this.stationFiltersStore.sorterActive;
-    }
-  },
-
  setup() {
-    const store = useStore();
-    const stationFiltersStore = useStationFiltersStore();
+    const mainStore = useMainStore();
+    const apiStore = useApiStore();
+    const tooltipStore = useTooltipStore();
+
+    const filters = inject('StationsView_filters') as Record<string, any>;
+    const activeSorter = inject('StationsView_activeSorter') as ActiveSorter;
+
+    const filteredStationList = computed(() =>
+      mainStore.allStationInfo
+        .filter((station) => filterStations(station, filters))
+        .sort((a, b) => sortStations(a, b, activeSorter))
+    );

-    const isDataLoaded = computed(() => {
-      return store.dataStatuses.sceneries != DataStatus.Loading;
-    });
    return {
-      isDataLoaded,
-      stationFiltersStore
+      Status: Status.Data,
+      mainStore,
+      apiStore,
+      tooltipStore,
+      filters,
+      filteredStationList,
+      activeSorter
    };
  },

  methods: {
    setScenery(name: string) {
-      const station = this.stations.find((station) => station.name === name);
+      const station = this.filteredStationList.find((station) => station.name === name);
+
      if (!station) return;

      this.lastSelectedStationName = station.name;
+      this.tooltipStore.hide();

      this.$router.push({
        name: 'SceneryView',
@@ -340,16 +384,26 @@ export default defineComponent({
      });
    },

+    openDonationCard(e: Event) {
+      this.$emit('toggleDonationCard', true);
+      this.mainStore.modalLastClickedTarget = e.target;
+      this.tooltipStore.hide();
+    },
+
    openForumSite(e: Event, url: string | undefined) {
      if (!url) return;
      e.preventDefault();
      window.open(url, '_blank');
    },

-    changeSorter(headerName: HeadIdsTypes) {
-      if (headerName == 'general' || headerName == 'routes') return;
+    changeSorter(headerName: HeadIdsType) {
+      if (headerName == 'general') return;

-      this.stationFiltersStore.changeSorter(headerName);
+      if (headerName == this.activeSorter.headerName)
+        this.activeSorter.dir = -1 * this.activeSorter.dir;
+      else this.activeSorter.dir = 1;
+
+      this.activeSorter.headerName = headerName;
    }
  }
 });
@@ -362,37 +416,27 @@ export default defineComponent({

 $rowCol: #424242;

-.change-anim {
-  &-enter-active,
-  &-leave-active {
-    transition: opacity 100ms ease-in;
-  }
-
-  &-enter,
-  &-leave-to {
-    opacity: 0;
-  }
-}
-
-section.station_table {
+.station_table {
+  height: 80vh;
+  min-height: 700px;
  overflow: auto;
-  overflow-y: hidden;
  font-weight: 500;
 }

-.table_wrapper {
-  overflow: auto;
-  overflow-y: hidden;
+.no-stations {
+  text-align: center;
+  font-size: 1.25em;
+  padding: 1em;
+  background: #1a1a1a;
+  line-height: 1.5em;
 }

 table {
-  white-space: nowrap;
  border-collapse: collapse;
-  min-width: 1350px;
-
-  @include smallScreen() {
-    min-width: auto;
-  }
+  table-layout: fixed;
+  width: 100%;
+  min-width: 1250px;
+  white-space: wrap;

  thead tr {
    background-color: $bgCol;
@@ -402,12 +446,41 @@ table {
    position: sticky;
    top: 0;

-    &.header-text {
-      min-width: 140px;
+    &.station {
+      width: 12em;
+    }
+
+    &.min-lvl {
+      width: 4em;
+    }
+
+    &.status {
+      width: 10em;
+    }
+
+    &.dispatcher {
+      width: 12em;
+    }
+
+    &.dispatcher-lvl {
+      width: 6em;
+    }
+
+    &.routes-double,
+    &.routes-single {
+      width: 7em;
+    }
+
+    &.general {
+      width: 11em;
    }

    &.header-image {
-      min-width: 60px;
+      width: 3.5em;
+
+      &.user {
+        width: 5em;
+      }
    }

    padding: 0.5em 0.25em;
@@ -432,7 +505,7 @@ table {
  }
 }

-tr.station {
+tr {
  background-color: $rowCol;

  &:nth-child(even) {
@@ -446,10 +519,15 @@ tr.station {
  }

  td {
-    padding: 0.25em 1em;
+    padding: 0.15em 0;
    text-align: center;
-
    cursor: pointer;
+    overflow: hidden;
+    text-overflow: ellipsis;
+
+    &.inactive {
+      opacity: 0.2;
+    }

    @include smallScreen() {
      margin: 0;
@@ -459,109 +537,95 @@ tr.station {
  }
 }

-td.station {
-  &_name {
-    font-weight: bold;
+.station-name {
+  font-weight: bold;
+  max-width: 200px;

-    &.default {
-      color: $accentCol;
-    }
-
-    &.nonPublic {
-      color: #bebebe;
-    }
-
-    &.unavailable {
-      font-weight: 500;
-      color: #bebebe;
-    }
+  &.default {
+    color: $accentCol;
  }

-  &_level,
-  &_dispatcher-exp {
-    span {
-      display: block;
-
-      width: 2em;
-      height: 2em;
-      line-height: 2em;
-      margin: 0 auto;
-    }
-
-    img {
-      width: 2em;
-      border-radius: 50%;
-    }
+  &.nonPublic {
+    color: #bebebe;
  }

-  &_level {
-    span {
-      background-color: #888;
-      border-radius: 50%;
-    }
-  }
-
-  &_info {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
-    /* Images */
-    .icon-info {
-      display: flex;
-      justify-content: center;
-      align-items: center;
-
-      width: 32px;
-      height: 32px;
-      font-size: 12px;
-
-      margin: 0 0.2em;
-
-      outline: 2px solid #444;
-      border-radius: 0.5em;
-
-      @include smallScreen() {
-        width: 24px;
-        height: 24px;
-        font-size: 10px;
-      }
-    }
-  }
-
-  &_tracks {
-    .no-catenary {
-      background-color: #939393;
-    }
-
-    .catenary {
-      background-color: #009dce;
-    }
-
-    .track {
-      margin: 0 0.35em;
-      padding: 0.35em;
-      font-size: 1.05em;
-      white-space: pre-wrap;
-    }
-  }
-
-  &_users,
-  &_spawns,
-  &_schedules {
-    &.inactive {
-      opacity: 0.2;
-    }
+  &.unavailable {
+    font-weight: 500;
+    color: #bebebe;
  }
 }

-.station_users {
+.station-level,
+.station-dispatcher-exp {
  span {
-    color: gold;
+    display: block;
+
+    width: 2em;
+    height: 2em;
+    line-height: 2em;
+    margin: 0 auto;
+  }
+
+  img {
+    width: 2em;
+    border-radius: 50%;
  }
 }

-.station_schedules {
+.station-dispatcher-name {
+  img {
+    max-width: 1.35em;
+    vertical-align: text-bottom;
+  }
+}
+
+.station-level {
+  span {
+    background-color: #888;
+    border-radius: 50%;
+  }
+}
+
+.station-info {
+  .icon-info {
+    vertical-align: middle;
+    line-height: 2.5em;
+
+    width: 2.5em;
+    height: 2.5em;
+    font-size: 0.8em;
+    margin: 0 3px;
+
+    outline: 2px solid #2b2b2b;
+    border-radius: 5px;
+  }
+}
+
+.station-tracks {
+  .no-catenary {
+    background-color: #939393;
+  }
+
+  .catenary {
+    background-color: #009dce;
+  }
+
+  .separator {
+    background-color: #b3b3b3;
+    padding: 2px;
+  }
+
+  .track {
+    display: inline-block;
+    text-align: center;
+    width: 1.3em;
+    padding: 0.35em 0;
+    font-size: 1.1em;
+    margin: 0 0.2em;
+  }
+}
+
+.station-schedules {
  &.all {
    color: gold;
  }
@@ -574,18 +638,4 @@ td.station {
    color: lime;
  }
 }
-
-.separator {
-  border-left: 3px solid #b3b3b3;
-}
-
-.no-stations {
-  text-align: center;
-  font-size: 1.5em;
-
-  padding: 1em;
-  margin: 1em 0;
-
-  background: #333;
-}
 </style>
@@ -0,0 +1,33 @@
+export interface FilterOption {
+  id: string;
+  name: string;
+  value: boolean;
+  defaultValue: boolean;
+}
+
+export const headIds = [
+  'station',
+  'min-lvl',
+  'status',
+  'dispatcher',
+  'dispatcher-lvl',
+  'routes-single',
+  'routes-double',
+  'general'
+] as const;
+
+export const headIconsIds = [
+  'user',
+  'like',
+  'spawn',
+  'timetableAll',
+  'timetableUnconfirmed',
+  'timetableConfirmed'
+] as const;
+
+export type HeadIdsType = (typeof headIds)[number] | (typeof headIconsIds)[number];
+
+export interface ActiveSorter {
+  headerName: HeadIdsType;
+  dir: number;
+}
@@ -0,0 +1,275 @@
+import { ActiveSorter } from '../../components/StationsView/typings';
+import { ActiveScenery, StationGeneralInfo, Status } from '../../typings/common';
+import { Station } from '../../typings/common';
+
+const dispatcherStatusPriority = [
+  Status.ActiveDispatcher.UNKNOWN,
+  Status.ActiveDispatcher.INVALID,
+  Status.ActiveDispatcher.NOT_LOGGED_IN,
+  Status.ActiveDispatcher.UNAVAILABLE,
+  Status.ActiveDispatcher.AFK,
+  Status.ActiveDispatcher.ENDING,
+  Status.ActiveDispatcher.NO_SPACE,
+  undefined
+];
+
+const filtersAssociations: Record<string, string> = {
+  mechaniczne: 'mechanical',
+  ręczne: 'manual',
+  'mechaniczne+SPK': 'SPK-M',
+  'ręczne+SPK': 'SPK-R',
+  'mechaniczne+SCS': 'SCS-M',
+  'ręczne+SCS': 'SCS-R',
+  współczesna: 'modern',
+  historyczna: 'historical',
+  kształtowa: 'semaphores',
+  mieszana: 'mixed'
+};
+
+function filterStatusSection(
+  filters: Record<string, any>,
+  { dispatcherStatus, dispatcherTimestamp }: ActiveScenery
+) {
+  return (
+    (filters['endingStatus'] && dispatcherStatus == Status.ActiveDispatcher.ENDING) ||
+    (filters['unavailableStatus'] &&
+      (dispatcherStatus == Status.ActiveDispatcher.UNAVAILABLE ||
+        dispatcherStatus == Status.ActiveDispatcher.NOT_LOGGED_IN)) ||
+    (filters['afkStatus'] && dispatcherStatus == Status.ActiveDispatcher.AFK) ||
+    (filters['noSpaceStatus'] && dispatcherStatus == Status.ActiveDispatcher.NO_SPACE) ||
+    (filters['occupied'] && dispatcherStatus != Status.ActiveDispatcher.FREE) ||
+    (filters['onlineFromHours'] > 0 &&
+      (dispatcherTimestamp ?? 0) <= Date.now() + filters['onlineFromHours'] * 3600000)
+  );
+}
+
+function filterTimetablesSection(filters: Record<string, any>, station: Station) {
+  return (
+    (filters['withoutActiveTimetables'] &&
+      (!station.onlineInfo || station.onlineInfo.scheduledTrainCount.all == 0)) ||
+    (filters['withActiveTimetables'] &&
+      station.onlineInfo &&
+      (station.onlineInfo.scheduledTrainCount.all != 0 ||
+        station.onlineInfo.dispatcherStatus == Status.ActiveDispatcher.FREE))
+  );
+}
+
+function filterAccessibilitySection(filters: Record<string, any>, station: Station) {
+  if (
+    filters['nonPublic'] &&
+    (!station.generalInfo || station.generalInfo.availability == 'nonPublic')
+  )
+    return true;
+
+  if (!station.generalInfo) return false;
+
+  const { availability } = station.generalInfo;
+
+  return (
+    (filters['unavailable'] && availability == 'unavailable' && !station.onlineInfo) ||
+    (filters['abandoned'] && availability == 'abandoned' && !station.onlineInfo) ||
+    (filters['default'] && availability == 'default') ||
+    (filters['notDefault'] &&
+      availability != 'default' &&
+      availability != 'abandoned' &&
+      availability != 'unavailable')
+  );
+}
+
+function filterRealitySection(filters: Record<string, any>, generalInfo: StationGeneralInfo) {
+  return (filters['real'] && generalInfo.lines) || (filters['fictional'] && !generalInfo.lines);
+}
+
+function filterProgramsSection(filters: Record<string, any>, generalInfo: StationGeneralInfo) {
+  return (
+    (filters['SUP'] && generalInfo.SUP) ||
+    (filters['noSUP'] && !generalInfo.SUP) ||
+    (filters['ASDEK'] && generalInfo.ASDEK) ||
+    (filters['noASDEK'] && !generalInfo.ASDEK)
+  );
+}
+
+function filterControlsSection(filters: Record<string, any>, generalInfo: StationGeneralInfo) {
+  return (
+    filters[generalInfo.controlType] == true ||
+    filters[filtersAssociations[generalInfo.controlType]] == true
+  );
+}
+
+function filterSignalsSection(filters: Record<string, any>, generalInfo: StationGeneralInfo) {
+  return (
+    filters[generalInfo.signalType] == true ||
+    filters[filtersAssociations[generalInfo.signalType]] == true ||
+    (filters['SBL'] && generalInfo.routes.sblNames.length > 0) ||
+    (filters['PBL'] && generalInfo.routes.sblNames.length == 0)
+  );
+}
+
+function filterStationType(filters: Record<string, any>, generalInfo: StationGeneralInfo) {
+  const singleTracks = generalInfo.routes.single.filter((r) => !r.isInternal);
+  const doubleTracks = generalInfo.routes.double.filter((r) => !r.isInternal);
+
+  let isJunction = singleTracks.length > 0 && doubleTracks.length > 0;
+
+  return (filters['junction'] && isJunction) || (filters['nonJunction'] && !isJunction);
+}
+
+function filterSliderValues(filters: Record<string, any>, generalInfo: StationGeneralInfo) {
+  const { availability, reqLevel, routes } = generalInfo;
+
+  const otherAvailability =
+    availability == 'nonPublic' || availability == 'unavailable' || availability == 'abandoned';
+
+  return (
+    filters['minLevel'] > reqLevel + (otherAvailability ? 1 : 0) ||
+    filters['maxLevel'] < reqLevel + (otherAvailability ? 1 : 0) ||
+    filters['minVmax'] > routes.maxRouteSpeed ||
+    filters['maxVmax'] < routes.minRouteSpeed ||
+    (filters['no-1track'] && routes.single.length != 0) ||
+    (filters['no-2track'] && routes.double.length != 0) ||
+    filters['minOneWayCatenary'] > routes.singleElectrifiedNames.length ||
+    filters['minOneWay'] > routes.singleOtherNames.length ||
+    filters['minTwoWayCatenary'] > routes.doubleElectrifiedNames.length ||
+    filters['minTwoWay'] > routes.doubleOtherNames.length
+  );
+}
+
+function filterInputValues(filters: Record<string, any>, generalInfo: StationGeneralInfo) {
+  return (
+    filters['authors'].length > 3 &&
+    !generalInfo.authors
+      ?.map((a) => a.toLocaleLowerCase())
+      .includes(filters['authors'].toLocaleLowerCase())
+  );
+}
+
+export const sortStations = (a: Station, b: Station, sorter: ActiveSorter) => {
+  let diff = 0;
+
+  switch (sorter.headerName) {
+    case 'station':
+      return sorter.dir == 1 ? a.name.localeCompare(b.name) : b.name.localeCompare(a.name);
+
+    case 'min-lvl':
+      diff = (a.generalInfo?.reqLevel || 0) - (b.generalInfo?.reqLevel || 0);
+      break;
+
+    case 'status':
+      diff =
+        (a.onlineInfo?.dispatcherTimestamp ??
+          dispatcherStatusPriority.indexOf(a.onlineInfo?.dispatcherStatus)) -
+        (b.onlineInfo?.dispatcherTimestamp ??
+          dispatcherStatusPriority.indexOf(b.onlineInfo?.dispatcherStatus));
+      break;
+
+    case 'dispatcher':
+      if (
+        (a.onlineInfo?.dispatcherName.toLowerCase() || '') >
+        (b.onlineInfo?.dispatcherName.toLowerCase() || '')
+      )
+        return sorter.dir;
+      if (
+        (a.onlineInfo?.dispatcherName.toLowerCase() || '') <
+        (b.onlineInfo?.dispatcherName.toLowerCase() || '')
+      )
+        return -sorter.dir;
+      break;
+
+    case 'dispatcher-lvl':
+      diff = (a.onlineInfo?.dispatcherExp || 0) - (b.onlineInfo?.dispatcherExp || 0);
+      break;
+
+    case 'routes-single':
+      diff =
+        (a.generalInfo?.routes.single.filter((r) => !r.hidden && !r.isInternal).length ?? -1) -
+        (b.generalInfo?.routes.single.filter((r) => !r.hidden && !r.isInternal).length ?? -1);
+      break;
+
+    case 'routes-double':
+      diff =
+        (a.generalInfo?.routes.double.filter((r) => !r.hidden && !r.isInternal).length ?? -1) -
+        (b.generalInfo?.routes.double.filter((r) => !r.hidden && !r.isInternal).length ?? -1);
+      break;
+
+    case 'user':
+      diff =
+        (b.onlineInfo?.stationTrains ? b.onlineInfo.stationTrains.length : -1) -
+        (a.onlineInfo?.stationTrains ? a.onlineInfo.stationTrains.length : -1);
+      break;
+
+    case 'like':
+      diff =
+        (a.onlineInfo ? a.onlineInfo.dispatcherRate : -Infinity) -
+        (b.onlineInfo ? b.onlineInfo.dispatcherRate : -Infinity);
+      break;
+
+    case 'spawn':
+      diff =
+        (a.onlineInfo ? a.onlineInfo.spawns.length : -1) -
+        (b.onlineInfo ? b.onlineInfo.spawns.length : -1);
+      break;
+
+    case 'timetableConfirmed':
+      diff =
+        (a.onlineInfo?.scheduledTrainCount.confirmed ?? -1) -
+        (b.onlineInfo?.scheduledTrainCount.confirmed ?? -1);
+      break;
+
+    case 'timetableUnconfirmed':
+      diff =
+        (a.onlineInfo?.scheduledTrainCount.unconfirmed ?? -1) -
+        (b.onlineInfo?.scheduledTrainCount.unconfirmed ?? -1);
+      break;
+
+    case 'timetableAll':
+      diff =
+        (a.onlineInfo?.scheduledTrainCount.all ?? -1) -
+        (b.onlineInfo?.scheduledTrainCount.all ?? -1);
+      break;
+
+    default:
+      break;
+  }
+
+  if (diff != 0) return Math.sign(diff) * sorter.dir;
+  return a.name.localeCompare(b.name);
+};
+
+export const filterStations = (station: Station, filters: Record<string, any>) => {
+  if (filters['free'] && (!station.onlineInfo || station.onlineInfo.dispatcherId == -1))
+    return false;
+
+  // Scenery Timetables section
+  if (filterTimetablesSection(filters, station)) return false;
+
+  // Scenery Accessibility section
+  if (filterAccessibilitySection(filters, station)) return false;
+
+  // Scenery Status section
+  if (station.onlineInfo && filterStatusSection(filters, station.onlineInfo)) return false;
+
+  if (station.generalInfo) {
+    // Scenery Reality section
+    if (filterRealitySection(filters, station.generalInfo)) return false;
+
+    // Scenery Additional Programs section
+    if (filterProgramsSection(filters, station.generalInfo)) return false;
+
+    // Scenery Controls section
+    if (filterControlsSection(filters, station.generalInfo)) return false;
+
+    // Scenery Signalling section(s)
+    if (filterSignalsSection(filters, station.generalInfo)) return false;
+
+    // Scenery Station Type section
+    if (filterStationType(filters, station.generalInfo)) return false;
+
+    // Scenery sliders
+    if (filterSliderValues(filters, station.generalInfo)) return false;
+
+    // Scenery Authors section
+    if (filterInputValues(filters, station.generalInfo)) return false;
+  }
+
+  return true;
+};
@@ -0,0 +1,38 @@
+<template>
+  <div class="tooltip-content">
+    <span>{{ tooltipStore.content }}</span>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { useTooltipStore } from '../../store/tooltipStore';
+
+export default defineComponent({
+  data() {
+    return {
+      tooltipStore: useTooltipStore()
+    };
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+.tooltip-content {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  gap: 0.5em;
+
+  padding: 0.25em 0.5em;
+  border-radius: 0.25em;
+
+  width: 100%;
+  background-color: #333;
+  box-shadow: 0 0 5px 2px #aaa;
+}
+
+img {
+  height: 1em;
+}
+</style>
@@ -0,0 +1,39 @@
+<template>
+  <div class="tooltip-content">
+    <img src="/images/icon-diamond.svg" alt="" />
+    <span>{{ tooltipStore.content }}</span>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { useTooltipStore } from '../../store/tooltipStore';
+
+export default defineComponent({
+  data() {
+    return {
+      tooltipStore: useTooltipStore()
+    };
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+.tooltip-content {
+  gap: 0.5em;
+
+  padding: 0.5em;
+  border-radius: 0.25em;
+
+  width: 100%;
+
+  background-color: #333;
+  box-shadow: 0 0 10px 2px #aaa;
+}
+
+img {
+  vertical-align: middle;
+  height: 1em;
+  margin-right: 0.5em;
+}
+</style>
@@ -0,0 +1,44 @@
+<template>
+  <div class="tooltip-content" v-if="spawns.length != 0">
+    <span v-for="(spawn, i) in spawns">
+      <template v-if="i > 0"> | </template>
+      <b>{{ spawn.spawnName }}</b> ({{ spawn.spawnLength }}m)
+    </span>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { useTooltipStore } from '../../store/tooltipStore';
+import { ScenerySpawn } from '../../typings/common';
+
+export default defineComponent({
+  data() {
+    return {
+      tooltipStore: useTooltipStore()
+    };
+  },
+
+  computed: {
+    spawns() {
+      if (this.tooltipStore.content == '') return [];
+
+      const parsedSpawns = JSON.parse(this.tooltipStore.content) as ScenerySpawn[];
+      return parsedSpawns ?? [];
+    }
+  }
+});
+</script>
+
+<style scoped>
+.tooltip-content {
+  width: 300px;
+
+  padding: 0.25em 0.5em;
+  border-radius: 0.25em;
+
+  width: 100%;
+  background-color: #1b1b1b;
+  box-shadow: 0 0 5px 2px #aaa;
+}
+</style>
@@ -0,0 +1,74 @@
+<template>
+  <div class="tooltip" v-show="tooltipStore.type" ref="preview">
+    <component v-if="tooltipStore.type" :is="tooltipStore.type" />
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { useTooltipStore } from '../../store/tooltipStore';
+import DonatorTooltip from './DonatorTooltip.vue';
+import VehiclePreviewTooltip from './VehiclePreviewTooltip.vue';
+import BaseTooltip from './BaseTooltip.vue';
+import SpawnsTooltip from './SpawnsTooltip.vue';
+import UsersTooltip from './UsersTooltip.vue';
+
+export default defineComponent({
+  components: { DonatorTooltip, VehiclePreviewTooltip, BaseTooltip, SpawnsTooltip, UsersTooltip },
+
+  data() {
+    return {
+      tooltipStore: useTooltipStore()
+    };
+  },
+
+  watch: {
+    'tooltipStore.mousePos': {
+      deep: true,
+      // [x, y]
+      handler(val: [number, number]) {
+        this.$nextTick(() => {
+          const previewEl = this.$refs['preview'] as HTMLElement;
+          const clientWidth = document.body.clientWidth;
+          const boxWidth = previewEl.getBoundingClientRect().width;
+
+          let translateX = '0',
+            translateY = '30px';
+
+          if (clientWidth < 500) {
+            previewEl.style.left = '50%';
+            translateX = '-50%';
+          } else if (val[0] <= boxWidth / 2) {
+            previewEl.style.left = '0';
+            translateX = '0px';
+          } else if (val[0] >= clientWidth - boxWidth / 2) {
+            previewEl.style.left = '100%';
+            translateX = '-100%';
+          } else {
+            previewEl.style.left = `${val[0]}px`;
+            translateX = '-50%';
+          }
+
+          previewEl.style.top = `${val[1]}px`;
+
+          const isOutside =
+            val[1] + previewEl.getBoundingClientRect().height + 30 >=
+            window.innerHeight + window.scrollY;
+
+          if (isOutside) translateY = 'calc(-100% - 30px)';
+          previewEl.style.transform = `translate(${translateX}, ${translateY})`;
+        });
+      }
+    }
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+.tooltip {
+  position: absolute;
+  z-index: 250;
+  max-width: 400px;
+  text-align: center;
+}
+</style>
@@ -0,0 +1,44 @@
+<template>
+  <div class="tooltip-content" v-if="trains.length != 0">
+    <span v-for="(train, i) in trains">
+      <template v-if="i > 0"> | </template>
+      <b>{{ train.trainNo }}</b> {{ train.driverName }}
+    </span>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { useTooltipStore } from '../../store/tooltipStore';
+import { Train } from '../../typings/common';
+
+export default defineComponent({
+  data() {
+    return {
+      tooltipStore: useTooltipStore()
+    };
+  },
+
+  computed: {
+    trains() {
+      if (this.tooltipStore.content == '') return [];
+
+      const parsedTrains = JSON.parse(this.tooltipStore.content) as Train[];
+      return (parsedTrains ?? []).sort((a, b) => a.trainNo - b.trainNo);
+    }
+  }
+});
+</script>
+
+<style scoped>
+.tooltip-content {
+  width: 300px;
+
+  padding: 0.25em 0.5em;
+  border-radius: 0.25em;
+
+  width: 100%;
+  background-color: #1b1b1b;
+  box-shadow: 0 0 5px 2px #aaa;
+}
+</style>
@@ -0,0 +1,95 @@
+<template>
+  <div class="tooltip-content">
+    <div v-if="imageState == 'loading'" class="loading-info">
+      {{ $t('vehicle-preview.loading') }}
+    </div>
+
+    <div v-if="imageState == 'error'">{{ $t('vehicle-preview.error') }}</div>
+
+    <img
+      v-if="tooltipStore.type"
+      @load="onImageLoad"
+      @error="onImageError"
+      width="300"
+      height="176"
+      class="rounded-md w-full h-auto"
+      :src="`https://static.spythere.eu/images/${tooltipStore.content}--300px.jpg`"
+    />
+
+    <div v-if="imageState == 'error'" class="error-placeholder"></div>
+
+    <div class="vehicle-name">
+      {{ tooltipStore.content.replace(/_/g, ' ') }}
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { useTooltipStore } from '../../store/tooltipStore';
+
+export default defineComponent({
+  data() {
+    return {
+      tooltipStore: useTooltipStore(),
+      imageState: 'loading'
+    };
+  },
+
+  mounted() {
+    this.imageState = 'loading';
+  },
+
+  watch: {
+    'tooltipStore.type'(prev, val) {
+      if (prev != val) this.imageState = 'loading';
+    }
+  },
+
+  methods: {
+    onImageLoad() {
+      this.imageState = 'loaded';
+    },
+
+    onImageError(e: Event) {
+      this.imageState = 'error';
+
+      (e.target as HTMLElement).style.display = 'none';
+    }
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+.tooltip-content {
+  width: 300px;
+  min-height: 200px;
+  background-color: #333;
+  box-shadow: 0 0 10px 2px #aaa;
+
+  padding: 0.5em;
+  border-radius: 0.5em;
+}
+
+.loading-info {
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+}
+
+img {
+  width: 100%;
+  height: auto;
+}
+
+.vehicle-name {
+  text-align: center;
+  margin-top: 0.5em;
+  color: #ccc;
+  text-wrap: wrap;
+}
+
+.error-placeholder {
+  height: 176px;
+}
+</style>
@@ -0,0 +1,172 @@
+<template>
+  <span class="stop-label" :data-sbl="stop.isSBL">
+    <span class="name" v-html="stop.nameHtml"></span>
+
+    <span
+      v-if="stop.position != 'begin'"
+      class="date arrival"
+      :data-status="
+        stop.arrivalDelay > 0 && stop.status != 'unconfirmed'
+          ? 'delayed'
+          : stop.arrivalDelay < 0 && stop.status != 'unconfirmed'
+          ? 'preponed'
+          : stop.arrivalDelay == 0 && stop.status == 'confirmed'
+          ? 'on-time'
+          : ''
+      "
+    >
+      <span v-if="stop.arrivalDelay != 0 && stop.status != 'unconfirmed'">
+        <s>{{ timestampToString(stop.arrivalScheduled) }}</s>
+        {{ timestampToString(stop.arrivalReal) }}
+        ({{ stop.arrivalDelay > 0 ? '+' : '' }}{{ stop.arrivalDelay }})
+      </span>
+
+      <span v-else>
+        {{ timestampToString(stop.arrivalScheduled) }}
+      </span>
+    </span>
+
+    <span
+      v-if="
+        stop.duration ||
+        (stop.status == 'stopped' &&
+          stop.position != 'begin' &&
+          stop.departureDelay != stop.arrivalDelay)
+      "
+      class="date stop"
+      :data-stop-types="stop.type.replace(', ', '-')"
+      :data-stop-status="
+        stop.departureDelay - stop.arrivalDelay > 0 && !stop.duration ? 'delayed' : ''
+      "
+    >
+      {{ stop.duration || stop.departureDelay - stop.arrivalDelay }}
+      {{ stop.type == '' ? 'pt' : stop.type }}
+    </span>
+
+    <span
+      v-if="
+        stop.position != 'end' &&
+        (stop.duration != 0 || stop.status == 'stopped' || stop.departureDelay != stop.arrivalDelay)
+      "
+      class="date departure"
+      :data-status="
+        stop.departureDelay > 0 && stop.status == 'confirmed'
+          ? 'delayed'
+          : stop.departureDelay < 0 && stop.status == 'confirmed'
+          ? 'preponed'
+          : stop.departureDelay == 0 && stop.status == 'confirmed'
+          ? 'on-time'
+          : ''
+      "
+    >
+      <span v-if="stop.departureDelay != 0 && stop.status == 'confirmed'">
+        <s>{{ timestampToString(stop.departureScheduled) }}</s>
+        {{ timestampToString(stop.departureReal) }}
+
+        ({{ stop.departureDelay > 0 ? '+' : '' }}{{ stop.departureDelay }})
+      </span>
+
+      <span v-else>
+        {{ timestampToString(stop.departureScheduled) }}
+      </span>
+    </span>
+  </span>
+</template>
+
+<script lang="ts">
+import { PropType, defineComponent } from 'vue';
+import dateMixin from '../../mixins/dateMixin';
+import { TrainScheduleStop } from './TrainSchedule.vue';
+
+export default defineComponent({
+  mixins: [dateMixin],
+
+  props: {
+    stop: {
+      type: Object as PropType<TrainScheduleStop>,
+      required: true
+    }
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+$preponedClr: lime;
+$delayedClr: salmon;
+$dateClr: #525151;
+$stopExchangeClr: #db8e29;
+$stopDefaultClr: #252525;
+$stopNameClr: #22a8d1;
+
+.stop-label {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+
+  &[data-sbl='true'] {
+    .date {
+      display: none;
+    }
+
+    .name {
+      background: none;
+      color: #aaa;
+      padding: 0;
+    }
+  }
+
+  .name {
+    background: $stopNameClr;
+    padding: 0.3em 0.5em;
+
+    display: flex;
+    align-items: center;
+
+    &.misc {
+      background: gray;
+    }
+  }
+
+  .date {
+    background: $dateClr;
+    padding: 0.3em 0.5em;
+  }
+
+  .stop {
+    &[data-stop-types='ph'],
+    &[data-stop-types='ph-pm'],
+    &[data-stop-types='pm'] {
+      background: $stopExchangeClr;
+    }
+
+    background: $stopDefaultClr;
+
+    &[data-stop-status='delayed'] {
+      color: $delayedClr;
+    }
+  }
+
+  .arrival,
+  .departure {
+    &[data-status='delayed'] {
+      s {
+        color: #999;
+      }
+
+      span {
+        color: $delayedClr;
+      }
+    }
+
+    &[data-status='preponed'] {
+      s {
+        color: #999;
+      }
+
+      span {
+        color: $preponedClr;
+      }
+    }
+  }
+}
+</style>
@@ -1,104 +1,159 @@
 <template>
-  <div class="train-info">
-    <section class="train-route">
-      <div class="train_general">
-        <b class="warning-timeout" v-if="train.isTimeout" :title="$t('trains.timeout')">?</b>
-        <span class="timetable-id" v-if="train.timetableData"
-          >#{{ train.timetableData.timetableId }}</span
-        >
+  <div class="train-info" :data-extended="extended">
+    <section class="train-general">
+      <div class="general-top-bar">
+        <div>
+          <b class="warning-timeout" v-if="train.isTimeout" :title="$t('trains.timeout')">?</b>
+          <span class="timetable-id" v-if="train.timetableData">
+            #{{ train.timetableData.timetableId }}
+          </span>

-        <span
-          class="timetable_warnings"
-          v-if="train.timetableData?.TWR || train.timetableData?.SKR"
-        >
-          <span class="train-badge twr" v-if="train.timetableData?.TWR" :title="$t('general.TWR')"
-            >TWR</span
+          <span
+            class="timetable-warnings"
+            v-if="train.timetableData?.TWR || train.timetableData?.SKR"
          >
-          <span class="train-badge skr" v-if="train.timetableData?.SKR" :title="$t('general.SKR')"
-            >SKR</span
-          >
-        </span>
+            <span
+              class="train-badge twr"
+              v-if="train.timetableData?.TWR"
+              :title="$t('general.TWR')"
+            >
+              TWR
+            </span>
+            <span
+              class="train-badge skr"
+              v-if="train.timetableData?.SKR"
+              :title="$t('general.SKR')"
+            >
+              SKR
+            </span>
+          </span>

-        <strong>
-          <span v-if="train.timetableData" class="text--primary"
-            >{{ train.timetableData.category }}&nbsp;</span
+          <strong>
+            <span v-if="train.timetableData" class="text--primary"
+              >{{ train.timetableData.category }}&nbsp;</span
+            >
+            <span class="train-number">{{ train.trainNo }}</span>
+          </strong>
+          <span>&bull;</span>
+          <b
+            class="level-badge driver"
+            :style="calculateExpStyle(train.driverLevel, train.isSupporter)"
          >
-          <span class="train-number">{{ train.trainNo }}</span>
-        </strong>
-        <span>&bull;</span>
-        <b
-          class="level-badge driver"
-          :style="calculateExpStyle(train.driverLevel, train.isSupporter)"
-        >
-          {{ train.driverLevel < 2 ? 'L' : `${train.driverLevel}` }}
-        </b>
-        <span>{{ train.driverName }}</span>
+            {{ train.driverLevel < 2 ? 'L' : `${train.driverLevel}` }}
+          </b>
+
+          <div class="train-driver">
+            <b
+              v-if="apiStore.donatorsData.includes(train.driverName)"
+              data-tooltip-type="DonatorTooltip"
+              :data-tooltip-content="$t('donations.driver-message')"
+            >
+              {{ train.driverName }}
+              <img src="/images/icon-diamond.svg" alt="donator diamond icon" />
+            </b>
+
+            <span v-else>{{ train.driverName }}</span>
+          </div>
+        </div>
+
+        <div v-if="extended">
+          <button class="btn-timetable btn--image btn--action" @click="navigateToJournal">
+            <img src="/images/icon-train.svg" alt="train icon" />
+            <span>
+              {{ $t('trains.journal-button') }}
+            </span>
+          </button>
+
+          <button class="btn-exit btn--image btn--action" @click="closeModal">
+            <img src="/images/icon-exit.svg" alt="modal exit icon" />
+          </button>
+        </div>
      </div>

-      <div class="timetable_route" v-if="train.timetableData">
+      <div class="general-timetable" v-if="train.timetableData">
        <strong>{{ train.timetableData.route.replace('|', ' - ') }}</strong>
-        <img
+        <span
          v-if="getSceneriesWithComments(train.timetableData).length > 0"
-          class="image-warning"
-          src="/images/icon-warning.svg"
-          :title="`${$t('trains.timetable-comments')} (${getSceneriesWithComments(
+          data-tooltip-type="BaseTooltip"
+          :data-tooltip-content="`${$t('trains.timetable-comments')} (${getSceneriesWithComments(
            train.timetableData
          )})`"
-        />
+        >
+          <img class="image-warning" src="/images/icon-warning.svg" />
+        </span>
      </div>

      <hr style="margin: 0.25em 0" />

-      <div class="timetable_stops" v-if="train.timetableData">
+      <div class="general-stops" v-if="train.timetableData">
        <span v-if="train.timetableData.followingStops.length > 2">
          {{ $t('trains.via-title') }}
          <span v-html="displayStopList(train.timetableData.followingStops)"></span>
        </span>
      </div>

-      <div class="timetable_progress" style="margin-top: 0.5em" v-if="train.timetableData">
-        <ProgressBar :progressPercent="confirmedPercentage(train.timetableData.followingStops)" />
+      <div class="general-status">
+        <div class="status-timetable-progress" v-if="train.timetableData">
+          <ProgressBar :progressPercent="confirmedPercentage(train.timetableData.followingStops)" />

-        <span class="timetable_progress-distance">
-          &nbsp; {{ currentDistance(train.timetableData.followingStops) }} km /
-          <span class="text--primary"> {{ train.timetableData.routeDistance }} km </span>
-          |
-          <span v-html="currentDelay(train.timetableData.followingStops)"></span>
-        </span>
+          <span class="progress-distance">
+            &nbsp; {{ currentDistance(train.timetableData.followingStops) }} km /
+            <span class="text--primary"> {{ train.timetableData.routeDistance }} km </span>
+            |
+            <span v-html="currentDelay(train.timetableData.followingStops)"></span>
+          </span>
+        </div>

-        <div class="train-status-badges">
+        <div class="status-badges">
          <div v-if="!train.currentStationHash" class="train-badge offline">
+            <img src="/images/icon-offline.svg" alt="" />
            {{ $t('trains.scenery-offline') }}
          </div>
+
          <div v-if="!train.online" class="train-badge offline">
+            <img src="/images/icon-offline.svg" alt="" />
            Offline {{ lastSeenMessage(train.lastSeen) }}
          </div>
        </div>
      </div>

-      <div class="driver_position text--grayed" style="margin-top: 0.25em">
+      <div class="general-stats" v-if="extended">
+        <div>
+          <img src="/images/icon-length.svg" alt="length icon" />
+          {{ train.length }}m
+        </div>
+
+        <div>
+          <img src="/images/icon-mass.svg" alt="mass icon" />
+          {{ (train.mass / 1000).toFixed(1) }}t
+        </div>
+
+        <div>
+          <img src="/images/icon-speed.svg" alt="speed icon" />
+          {{ train.speed }} km/h
+        </div>
+      </div>
+
+      <div class="text--grayed" style="margin-top: 0.25em">
        {{ displayTrainPosition(train) }}
      </div>
    </section>

-    <section class="train-stats">
-      <TrainThumbnail :name="train.locoType" :onlyFirstSegment="true" />
-
-      <div class="text--grayed">
-        {{ train.locoType }}
-        <span v-if="train.stockList.length > 1">
-          &nbsp;&bull; {{ $t('trains.cars') }}:
-          <span class="count">{{ train.stockList.length - 1 }}</span>
-        </span>
-      </div>
+    <section class="train-stats" v-if="!extended">
+      <StockList :trainStockList="train.stockList" :tractionOnly="true" />

      <div>
-        <span v-for="(stat, i) in STATS.main" :key="stat.name">
-          <span v-if="i > 0"> &bull; </span>
-          <span
-            >{{ `${~~((train as any)[stat.name] * (stat.multiplier || 1))}${stat.unit}` }}
+        <span>{{ train.speed }}km/h</span>
+
+        <div>
+          <span> {{ train.length }}m</span>
+          &bull;
+          <span> {{ (train.mass / 1000).toFixed(1) }}t</span>
+          <span v-if="train.stockList.length > 1">
+            &bull;
+            {{ $t('trains.cars') }}: {{ train.stockList.length - 1 }}
          </span>
-        </span>
+        </div>
      </div>
    </section>
  </div>
@@ -108,13 +163,16 @@
 import { defineComponent } from 'vue';
 import styleMixin from '../../mixins/styleMixin';
 import trainInfoMixin from '../../mixins/trainInfoMixin';
-import Train from '../../scripts/interfaces/Train';
 import ProgressBar from '../Global/ProgressBar.vue';
-import TrainThumbnail from '../Global/TrainThumbnail.vue';
+import { useMainStore } from '../../store/mainStore';
+import { useApiStore } from '../../store/apiStore';
+import StockList from '../Global/StockList.vue';
+import modalTrainMixin from '../../mixins/modalTrainMixin';
+import { Train } from '../../typings/common';

 export default defineComponent({
-  mixins: [trainInfoMixin, styleMixin],
-  components: { ProgressBar, TrainThumbnail },
+  mixins: [trainInfoMixin, styleMixin, modalTrainMixin],
+  components: { ProgressBar, StockList },

  props: {
    train: {
@@ -122,28 +180,40 @@ export default defineComponent({
      required: true
    },
    extended: {
-      type: Boolean,
-      default: true
+      type: Boolean
+    }
+  },
+
+  data() {
+    return {
+      store: useMainStore(),
+      apiStore: useApiStore()
+    };
+  },
+
+  methods: {
+    navigateToJournal() {
+      this.$router.push({
+        path: '/journal/timetables',
+        query: {
+          'search-driver': this.train.driverName
+        }
+      });
+
+      this.closeModal();
    }
  }
 });
 </script>

-<!-- Global style for TrainThumbnail -->
-<style lang="scss">
-.train-stats .train-thumbnail {
-  max-width: 100%;
-}
-</style>
-
 <style lang="scss" scoped>
@import '../../styles/responsive.scss';
@import '../../styles/badge.scss';

 .image-warning {
  height: 1em;
-
  margin-left: 0.5em;
+  vertical-align: middle;
 }

 .train-stats {
@@ -154,7 +224,7 @@ export default defineComponent({
  flex-direction: column;
  text-align: center;

-  gap: 0.25em;
+  line-height: 1.5em;
 }

 .train-info {
@@ -162,12 +232,21 @@ export default defineComponent({
  grid-template-columns: 2fr 1fr;
  grid-template-rows: 1fr;

+  &[data-extended='true'] {
+    grid-template-columns: 1fr;
+  }
+
  padding: 1em;

  background-color: #1a1a1a;
  gap: 0.5em;
 }

+.train-driver img {
+  max-height: 20px;
+  vertical-align: text-bottom;
+}
+
 .timetable-id {
  color: #d2d2d2;
 }
@@ -181,103 +260,102 @@ export default defineComponent({
  padding: 0 0.25em;
 }

-.timetable_stops {
-  font-size: 0.75em;
-}
-
-.train_general {
+.train-general {
  display: flex;
-  align-items: center;
-  flex-wrap: wrap;
-
-  gap: 0.25em;
-  margin-right: 1.5em;
-}
-.train-status-badges {
-  display: flex;
-  flex-wrap: wrap;
-
+  flex-direction: column;
  gap: 0.25em;
 }

-.train-driver {
-  &.supporter {
-    color: orange;
-    text-shadow: orange 0 0 5px;
+.general-stops {
+  font-size: 0.8em;
+}
+
+.general-top-bar {
+  display: flex;
+  justify-content: space-between;
+  flex-wrap: wrap;
+  gap: 0.5em;
+
+  & > div {
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+
+    gap: 0.25em;
  }
 }

-.timetable_route {
-  display: flex;
-  align-items: center;
-
-  margin-top: 0.5em;
+.btn-timetable {
+  padding: 0.25em;
 }

-.timetable_warnings {
+.btn-exit {
+  padding: 0.25em;
+}
+
+.general-status {
  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+
  gap: 0.25em;
 }

-.timetable_progress {
+.general-stats {
+  display: flex;
+  gap: 0.5em;
+  flex-wrap: wrap;
+
+  & > div {
+    display: flex;
+    align-items: center;
+    gap: 0.25em;
+  }
+
+  img {
+    width: 1.5em;
+  }
+}
+
+.general-timetable {
+  display: flex;
+  align-items: center;
+}
+
+.status-badges {
+  display: flex;
+  flex-wrap: wrap;
+
+  gap: 0.25em;
+
+  img {
+    height: 15px;
+  }
+}
+
+.status-timetable-progress {
  display: flex;
  align-items: center;
  flex-wrap: wrap;
 }

-.timetable_progress-distance {
+.progress-distance {
  margin-right: 0.25em;
 }

-.comments {
+.timetable-warnings {
  display: flex;
-  align-items: center;
-
-  font-size: 0.9em;
-
-  margin-top: 1em;
-
-  img {
-    margin-right: 0.5em;
-  }
+  gap: 0.25em;
 }

@include smallScreen() {
  .train-info {
    grid-template-columns: 1fr;
    gap: 1em 0;
-    text-align: center;
-
-    font-size: 1.15em;
  }

-  .train-stats {
-    font-size: 1.1em;
-  }
-
-  .train_general {
-    justify-content: center;
-  }
-
-  .train-status-badges {
-    justify-content: center;
-  }
-
-  .timetable_route {
-    justify-content: center;
-  }
-
-  .timetable_progress {
-    justify-content: center;
-  }
-
-  .comments {
-    flex-direction: column;
-    justify-content: center;
-
-    img {
-      margin: 0 0 0.5em 0;
-    }
+  .btn-timetable > span {
+    display: none;
  }
 }
 </style>
@@ -0,0 +1,103 @@
+<template>
+  <div class="train-modal" v-if="chosenTrain" @keydown.esc="closeModal">
+    <div class="modal-background" @click="closeModal"></div>
+    <div class="modal-content" ref="content" tabindex="0">
+      <TrainInfo :train="chosenTrain" :extended="true" ref="trainInfo" />
+      <TrainSchedule :train="chosenTrain" tabindex="0" />
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import modalTrainMixin from '../../mixins/modalTrainMixin';
+import TrainInfo from './TrainInfo.vue';
+import TrainSchedule from './TrainSchedule.vue';
+import { Train } from '../../typings/common';
+
+export default defineComponent({
+  components: { TrainInfo, TrainSchedule },
+  mixins: [modalTrainMixin],
+
+  computed: {
+    chosenTrain() {
+      return this.store.trainList.find((train) => train.modalId == this.store.chosenModalTrainId);
+    }
+  },
+
+  watch: {
+    chosenTrain(train: Train | undefined) {
+      this.$nextTick(() => {
+        if (train) {
+          document.body.classList.add('no-scroll');
+          const contentEl = this.$refs['content'] as HTMLElement;
+          contentEl.focus();
+        } else {
+          (this.store.modalLastClickedTarget as any)?.focus();
+
+          setTimeout(() => {
+            document.body.classList.remove('no-scroll');
+          }, 90);
+        }
+      });
+    }
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+@import '../../styles/responsive.scss';
+
+.train-modal {
+  position: fixed;
+  top: 0;
+  left: 0;
+
+  width: 100%;
+  height: 100%;
+
+  color: white;
+  z-index: 200;
+
+  display: flex;
+  justify-content: center;
+  align-items: flex-start;
+
+  text-align: left;
+}
+
+.modal-background {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100vw;
+  height: 100vh;
+
+  cursor: pointer;
+
+  background-color: rgba(0, 0, 0, 0.55);
+}
+
+.modal-content {
+  position: relative;
+  overflow-y: scroll;
+
+  width: 95vw;
+  max-height: 95vh;
+  max-height: 95dvh;
+  margin-top: 1em;
+
+  background-color: #1a1a1a;
+  box-shadow: 0 0 15px 10px #0e0e0e;
+}
+
+@include midScreen {
+  .exit {
+    margin: 0.5em;
+
+    img {
+      width: 1.75rem;
+    }
+  }
+}
+</style>
@@ -1,15 +1,15 @@
 <template>
-  <div class="filters-options" @keydown.esc="showOptions = false">
-    <div class="bg" v-if="showOptions" @click="showOptions = false"></div>
+  <div class="dropdown" @keydown.esc="showOptions = false">
+    <div class="dropdown_background" v-if="showOptions" @click="showOptions = false"></div>

    <button class="filter-button btn--filled btn--image" @click="toggleShowOptions" ref="button">
      <img src="/images/icon-filter2.svg" alt="Open filters icon" />
-      {{ $t('options.filters') }} [F]
+      [F] {{ $t('options.filters') }}
      <span class="active-indicator" v-if="currentOptionsActive"></span>
    </button>

-    <transition name="options-anim">
-      <div class="options_wrapper" v-if="showOptions">
+    <transition name="dropdown-anim">
+      <div class="dropdown_wrapper" v-if="showOptions">
        <div class="options_content">
          <h1 class="option-title">{{ $t('options.search-title') }}</h1>
          <div class="search_content">
@@ -23,7 +23,11 @@
                v-model="searchedTrain"
              />
              <button class="search-exit">
-                <img src="/images/icon-exit.svg" alt="Trains search clear icon" @click="onInputClear('train')" />
+                <img
+                  src="/images/icon-exit.svg"
+                  alt="Trains search clear icon"
+                  @click="onInputClear('train')"
+                />
              </button>
            </div>

@@ -36,7 +40,11 @@
                v-model="searchedDriver"
              />
              <button class="search-exit">
-                <img src="/images/icon-exit.svg" alt="Driver search clear icon" @click="onInputClear('driver')" />
+                <img
+                  src="/images/icon-exit.svg"
+                  alt="Driver search clear icon"
+                  @click="onInputClear('driver')"
+                />
              </button>
            </div>
          </div>
@@ -73,12 +81,13 @@
          </div>

          <div class="filter-actions">
-            <div></div>
            <button class="btn--action" @click="resetAllFilters">
              {{ $t('options.filter-reset') }}
            </button>
          </div>
        </div>
+
+        <div tabindex="0" @focus="showOptions = false"></div>
      </div>
    </transition>
  </div>
@@ -87,8 +96,7 @@
 <script lang="ts">
 import { defineComponent, inject, PropType } from 'vue';
 import keyMixin from '../../mixins/keyMixin';
-import { TrainFilterSection } from '../../scripts/enums/TrainFilterType';
-import { TrainFilter } from '../../scripts/interfaces/Trains/TrainFilter';
+import { TrainFilter, TrainFilterSection } from './typings';

 export default defineComponent({
  mixins: [keyMixin],
@@ -152,9 +160,6 @@ export default defineComponent({
    },

    onFilterChange(filter: TrainFilter) {
-      // if (this.lastSelectedFilter?.id === filter.id)
-      //   this.trainFilterList.forEach((tf) => (tf.isActive = filter.id === tf.id));
-
      filter.isActive = !filter.isActive;
      this.lastSelectedFilter = filter;
    },
@@ -180,7 +185,8 @@ export default defineComponent({
 </script>

 <style lang="scss" scoped>
-@import '../../styles/filters_options.scss';
+@import '../../styles/dropdown.scss';
+@import '../../styles/dropdown_filters.scss';

 .search_content > div {
  margin: 0.5em auto;
@@ -216,9 +222,6 @@ export default defineComponent({

 .filter-actions {
  display: flex;
-  gap: 0.5em;
-  width: 100%;
-
  margin-top: 1em;

  > * {
@@ -2,83 +2,126 @@
  <div class="train-schedule" @click="toggleShowState">
    <StockList :trainStockList="train.stockList" />

-    <!-- <div class="train-stock"> -->
-    <!-- <ul>
-        <li v-for="(stockName, i) in train.stockList" :key="i">
-          <p>{{ stockName.split(':')[0].split('_').splice(0, 2).join(' ') }} {{ stockName.split(':')[1] }}</p>
-          <TrainThumbnail :name="stockName" /> 
-        </li>
-      </ul> -->
-    <!-- </div> -->
-
    <div class="schedule-wrapper" v-if="train.timetableData">
-      <ul class="stop_list">
-        <li
-          v-for="(stop, i) in train.timetableData.followingStops"
+      <div class="stops">
+        <div
+          v-for="(stop, i) in scheduleStops"
          :key="i"
          class="stop"
-          :class="addClasses(stop, i)"
+          :data-status="stop.status"
+          :data-position="stop.position"
+          :data-delayed="stop.departureDelay > 0"
+          :data-stop-type="stop.type"
+          :data-minor-stop-active="stop.isActive"
+          :data-last-confirmed="stop.isLastConfirmed"
+          x
        >
          <span class="stop_info">
-            <div class="indicator"></div>
-
-            <div class="progress-bar"></div>
-
-            <div class="stop-bar"></div>
-
-            <span class="distance" v-if="stop.stopDistance">
-              {{ Math.floor(stop.stopDistance) }}
+            <span class="distance">
+              {{ stop.distance ? stop.distance.toFixed(1) : '' }}
            </span>

-            <span class="stop-name" v-html="stop.stopName"> </span>
+            <div class="progress">
+              <div class="line line_node line_node-top"></div>
+              <div class="node"></div>
+              <div class="line line_node line_node-bottom"></div>
+            </div>

-            <StopDate :stop="stop" />
+            <StopLabel :stop="stop" />
          </span>

-          <div class="stop_line" v-if="i < train.timetableData!.followingStops.length - 1">
-            <div class="progress-bar"></div>
+          <div class="stop_line">
+            <!-- Grid placeholder -->
+            <div></div>

-            <div v-if="stop.comments" style="color: salmon">
-              <b>{{ stop.stopNameRAW }} </b>: <span v-html="stop.comments"></span>
+            <div class="progress">
+              <div class="line line_connection" v-if="i < scheduleStops.length - 1"></div>
            </div>

-            <span
-              v-if="
-                stop.departureLine == train.timetableData!.followingStops[i + 1].arrivalLine &&
-                !/sbl/gi.test(stop.departureLine!)
-              "
-            >
-              {{ stop.departureLine }}
-            </span>
+            <div class="bottom-line-info">
+              <div class="info-comments" v-if="stop.comments" style="color: salmon">
+                <img src="/images/icon-warning.svg" alt="icon-warning" width="20" />
+                <b v-html="stop.comments"></b>
+              </div>

-            <span v-else-if="!/sbl/gi.test(stop.departureLine!)">
-              {{ stop.departureLine }} /
-              {{ train.timetableData!.followingStops[i + 1].arrivalLine }}
-            </span>
-          </div>
+              <!-- Routes  -->
+              <span
+                v-if="
+                  stop.departureLine &&
+                  stop.departureLine == scheduleStops[i + 1]?.arrivalLine &&
+                  !/sbl/gi.test(stop.departureLine)
+                "
+              >
+                {{ stop.departureLine }}
+              </span>

-          <div class="stop_line" v-else>
-            <div v-if="stop.comments" style="color: salmon">
-              <b>{{ stop.stopNameRAW }} </b>: <span v-html="stop.comments"></span>
+              <span v-else-if="stop.departureLine && !/sbl/gi.test(stop.departureLine)">
+                <div>{{ stop.departureLine }}</div>
+                <div
+                  class="scenery-change-name"
+                  v-if="
+                    i < scheduleStops.length - 1 &&
+                    stop.sceneryName != scheduleStops[i + 1].sceneryName
+                  "
+                >
+                  {{ scheduleStops[i + 1].sceneryName }}
+                </div>
+                <div>
+                  {{ scheduleStops[i + 1].arrivalLine }}
+                </div>
+              </span>
            </div>
          </div>
-        </li>
-      </ul>
+        </div>
+      </div>
    </div>
  </div>
 </template>

 <script lang="ts">
-import { computed, defineComponent, PropType } from 'vue';
+import { defineComponent, PropType } from 'vue';
 import dateMixin from '../../mixins/dateMixin';
-import Train from '../../scripts/interfaces/Train';
-import TrainStop from '../../scripts/interfaces/TrainStop';
-import { useStore } from '../../store/store';
-import StopDate from '../Global/StopDate.vue';
+import StopLabel from './StopLabel.vue';
 import StockList from '../Global/StockList.vue';
+import { useMainStore } from '../../store/mainStore';
+import { useApiStore } from '../../store/apiStore';
+import { Train } from '../../typings/common';
+
+export interface TrainScheduleStop {
+  nameHtml: string;
+  nameRaw: string;
+
+  status: 'confirmed' | 'unconfirmed' | 'stopped';
+  type: string;
+  position: 'begin' | 'end' | 'en-route';
+
+  arrivalScheduled: number;
+  arrivalReal: number;
+
+  departureScheduled: number;
+  departureReal: number;
+
+  departureDelay: number;
+  arrivalDelay: number;
+
+  duration: number | null;
+
+  isActive: boolean;
+  isLastConfirmed: boolean;
+  isSBL: boolean;
+
+  sceneryName: string | null;
+  sceneryHash: string;
+  distance: number;
+
+  arrivalLine: string | null;
+  departureLine: string | null;
+
+  comments: string | null;
+}

 export default defineComponent({
-  components: { StopDate, StockList },
+  components: { StopLabel, StockList },
  props: {
    train: {
      type: Object as PropType<Train>,
@@ -90,62 +133,95 @@ export default defineComponent({

  emits: ['click'],

-  setup(props) {
+  data() {
    return {
-      store: useStore(),
-
-      lastConfirmed: computed(() => {
-        return props.train.timetableData!.followingStops.findIndex(
-          (stop, i, stops) => stop.confirmed && !stops[i + 1]?.confirmed && !stops[i + 1]?.stopped
-        );
-      }),
-      activeMinorStops: computed(() => {
-        const lastMajorConfirmed = props.train.timetableData!.followingStops.findIndex(
-          (stop, i, stops) => stop.confirmed && !stops[i + 1]?.confirmed
-        );
-
-        const activeMinorStopList: number[] = [];
-        if (lastMajorConfirmed + 1 >= props.train.timetableData!.followingStops.length)
-          return activeMinorStopList;
-
-        for (
-          let i = lastMajorConfirmed + 1;
-          i < props.train.timetableData!.followingStops.length;
-          i++
-        ) {
-          if (/po\.|sbl/gi.test(props.train.timetableData!.followingStops[i].stopNameRAW))
-            activeMinorStopList.push(i);
-          else break;
-        }
-
-        return activeMinorStopList;
-      })
+      store: useMainStore(),
+      apiStore: useApiStore()
    };
  },

+  computed: {
+    scheduleStops(): TrainScheduleStop[] {
+      let currentSceneryIndex = 0;
+
+      return (
+        this.train.timetableData?.followingStops.map((stop, i, arr) => {
+          if (
+            i > 0 &&
+            stop.arrivalLine &&
+            stop.arrivalLine != arr[i - 1].departureLine &&
+            !/sbl/gi.test(stop.arrivalLine)
+          )
+            currentSceneryIndex++;
+
+          return {
+            nameHtml: stop.stopName,
+            nameRaw: stop.stopNameRAW,
+
+            arrivalScheduled: stop.arrivalTimestamp,
+            arrivalReal: stop.arrivalRealTimestamp,
+
+            departureScheduled: stop.departureTimestamp,
+            departureReal: stop.departureRealTimestamp,
+
+            departureDelay: stop.departureDelay,
+            arrivalDelay: stop.arrivalDelay,
+
+            duration: stop.stopTime,
+
+            comments: stop.comments ?? null,
+
+            arrivalLine: stop.arrivalLine,
+            departureLine: stop.departureLine,
+
+            type: stop.stopType,
+            distance: stop.stopDistance,
+            isActive: this.activeMinorStops.includes(i),
+            isLastConfirmed: this.lastConfirmed === i && !stop.terminatesHere,
+            isSBL: /sbl/gi.test(stop.stopName),
+            position: stop.beginsHere ? 'begin' : stop.terminatesHere ? 'end' : 'en-route',
+            sceneryHash: '',
+            sceneryName: this.train.timetableData!.sceneryNames[currentSceneryIndex],
+            status: stop.confirmed ? 'confirmed' : stop.stopped ? 'stopped' : 'unconfirmed'
+          };
+        }) ?? []
+      );
+    },
+
+    lastConfirmed() {
+      return this.train.timetableData?.followingStops.findIndex(
+        (stop, i, stops) => stop.confirmed && !stops[i + 1]?.confirmed && !stops[i + 1]?.stopped
+      );
+    },
+
+    activeMinorStops() {
+      if (!this.train.timetableData) return [];
+
+      const lastMajorConfirmed = this.train.timetableData.followingStops.findIndex(
+        (stop, i, stops) => stop.confirmed && !stops[i + 1]?.confirmed
+      );
+
+      const activeMinorStopList: number[] = [];
+      if (lastMajorConfirmed + 1 >= this.train.timetableData.followingStops.length)
+        return activeMinorStopList;
+
+      for (
+        let i = lastMajorConfirmed + 1;
+        i < this.train.timetableData!.followingStops.length;
+        i++
+      ) {
+        if (/po\.|sbl/gi.test(this.train.timetableData!.followingStops[i].stopNameRAW))
+          activeMinorStopList.push(i);
+        else break;
+      }
+
+      return activeMinorStopList;
+    }
+  },
+
  methods: {
    toggleShowState() {
      this.$emit('click');
-    },
-
-    addClasses(stop: TrainStop, index: number) {
-      return {
-        confirmed: stop.confirmed,
-        stopped: stop.stopped,
-        begin: stop.beginsHere,
-        end: stop.terminatesHere,
-        delayed: stop.departureDelay > 0,
-        sbl: /sbl/gi.test(stop.stopName),
-        [stop.stopType.replaceAll(', ', '-')]:
-          stop.stopType.match(new RegExp('ph|pm|pt')) && !stop.confirmed && !stop.beginsHere,
-        'minor-stop-active': this.activeMinorStops.includes(index),
-        'last-confirmed': index == this.lastConfirmed && !stop.terminatesHere
-      };
-    },
-
-    onImageError(e: Event) {
-      const imageEl = e.target as HTMLImageElement;
-      imageEl.src = '/images/icon-unknown.png';
    }
  }
 });
@@ -155,17 +231,18 @@ export default defineComponent({
@import '../../styles/responsive.scss';

 $barClr: #b1b1b1;
-$confirmedClr: #18d818;
+$confirmedClr: #4ae24a;
 $stoppedClr: #f55f31;
 $haltClr: #f8bb36;
-$stopNameClr: #22a8d1;
+
+$blinkAnim: 0.5s ease-in-out alternate infinite blink;

@keyframes blink {
  from {
-    background-color: $barClr;
+    border-color: $barClr;
  }
  to {
-    background-color: $confirmedClr;
+    border-color: $confirmedClr;
  }
 }

@@ -181,216 +258,247 @@ $stopNameClr: #22a8d1;
  margin-top: 1em;
 }

-.progress-bar {
-  position: absolute;
-  z-index: 10;
-
-  top: -1px;
-  left: -17px;
-
-  height: 100%;
-  width: 3px;
-
-  background-color: $barClr;
-}
-
-.stop-name {
-  background: $stopNameClr;
-  padding: 0.3em 0.5em;
-
-  display: flex;
-  align-items: center;
-
-  &.misc {
-    background: gray;
-  }
-}
-
-.stop-comment {
-  background: forestgreen;
-  padding: 0.3em 0.5em;
-
-  max-width: 250px;
-  overflow: hidden;
-  white-space: nowrap;
-
-  width: 2em;
-
-  cursor: pointer;
-
-  &:hover {
-    text-overflow: ellipsis;
-    width: 100%;
-  }
-
-  img {
-    width: 1em;
-  }
-
-  span {
-    font-size: 0.8em;
-  }
-}
-
-ul.stop_list {
-  margin-left: 2.5em;
-}
-
-ul.stop_list > li.stop {
-  position: relative;
-
+.stops {
  display: flex;
  flex-direction: column;
+  overflow-y: hidden;
+  gap: 5px;

-  padding: 0 0.5em;
+  padding: 5px 0;
+}

-  &.sbl {
-    .stop-date {
-      display: none;
-    }
-
-    .stop-name {
-      background: none;
-      color: #aaa;
-      padding: 0;
-    }
-  }
-
-  &[class*='ph'] > .stop_info > .indicator {
-    border-color: $stopNameClr;
-  }
-
-  &[class*='pt'] > .stop_info > .indicator {
-    border-color: #818181;
-  }
-
-  &.begin {
-    .stop_info > .indicator {
+.stop {
+  // Begin stop
+  &[data-position='begin'] {
+    .node {
      border-color: lightgreen;
    }

-    .stop_info > .progress-bar {
-      background: lightgreen;
+    .line_node-top {
+      display: none;
    }
  }

-  &.end {
-    .stop_info > .indicator {
+  // End stop
+  &[data-position='end'] {
+    .node {
      border-color: salmon;
    }

-    .stop_info > .progress-bar {
-      background: salmon;
+    .line_node-bottom {
+      display: none;
    }
  }

-  &.minor-stop-active {
-    .stop_info > .progress-bar {
-      animation: 0.5s ease-in-out alternate infinite blink;
-    }
-
-    .stop_line > .progress-bar {
-      animation: 0.5s ease-in-out alternate infinite blink;
-    }
+  // Stop types
+  &[data-stop-type*='pt'] .node {
+    border-color: #818181;
  }

-  &.last-confirmed {
-    .stop_line > .progress-bar {
-      animation: 0.5s ease-in-out alternate infinite blink;
-    }
+  &[data-stop-type*='ph'] .node {
+    border-color: $haltClr;
  }

-  &.confirmed {
-    .stop_info {
-      > .progress-bar {
-        background-color: $confirmedClr;
-      }
-
-      > .indicator {
-        border-color: $confirmedClr;
-      }
+  &[data-minor-stop-active='true'] {
+    .progress > .line {
+      animation: $blinkAnim;
    }

-    .stop_line > .progress-bar {
-      background-color: $confirmedClr;
-    }
-  }
-
-  &.stopped {
-    .stop_info {
-      > .indicator {
-        border-color: $stoppedClr;
-      }
-
-      > .stop-bar {
-        background: $stoppedClr;
+    & + div {
+      .progress > .line_node-top {
+        animation: $blinkAnim;
      }
    }
  }

-  .stop_line {
-    font-size: 0.8em;
-    color: #ccc;
+  // Last confirmed outpost / checkpoint
+  &[data-last-confirmed='true'] {
+    .progress > .line_connection {
+      animation: $blinkAnim;
+    }

-    padding: 0.35em 0;
+    .progress > .line_node-bottom {
+      animation: $blinkAnim;
+    }

-    position: relative;
-
-    .line-segment {
-      color: $barClr;
-      font-weight: 500;
+    & + div {
+      .progress > .line_node-top {
+        animation: $blinkAnim;
+      }
    }
  }

-  .stop_info {
-    display: flex;
-
-    position: relative;
-    text-align: center;
-
-    flex-wrap: wrap;
+  // Confirmed status
+  &[data-status='confirmed'] {
+    .progress > .node {
+      border-color: $confirmedClr;
+    }
+    .progress > .line {
+      border-left: 2px solid $confirmedClr;
+      border-right: 2px solid $confirmedClr;
+    }
  }

-  .stop-bar {
+  // Stopped status
+  &[data-status='stopped'] {
+    .progress > .node {
+      border-color: $stoppedClr;
+    }
+
+    .progress > .line_node {
+      border-color: $stoppedClr;
+    }
+  }
+
+  // Unused so far
+  &[data-track-count-departure='2'] {
+    .progress > .line {
+      width: 6px;
+    }
+  }
+
+  &[data-track-count-arrival='2'] {
+    .progress > .line_node-top {
+      width: 6px;
+    }
+  }
+
+  &[data-track-count-arrival='1'] {
+    .progress > .line_node-top {
+      width: 4px;
+    }
+  }
+
+  &[data-electrified-departure] {
+    .stop_line > .line-speed > .speed-departure {
+      color: #00c1c7;
+    }
+  }
+
+  &[data-electrified-arrival] {
+    .stop_line > .line-speed > .speed-next-arrival {
+      color: #00c1c7;
+    }
+  }
+}
+
+.stop_info,
+.stop_line {
+  display: grid;
+  grid-template-columns: 30px 40px auto 1fr;
+}
+
+.line-speed {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  color: #9b9b9b;
+  gap: 10px;
+}
+
+.stop_info {
+  position: relative;
+  text-align: center;
+}
+
+.stop_line {
+  font-size: 0.8em;
+  color: #ccc;
+  margin-top: 5px;
+}
+
+.distance {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 0.75em;
+}
+
+.progress {
+  position: relative;
+
+  & > .node {
    position: absolute;
-    top: 0;
-    left: -17px;
-
-    z-index: 10;
-
-    width: 3px;
-    height: 100%;
-  }
-
-  .distance {
-    position: absolute;
-
    top: 50%;
-    transform: translate(-100%, -50%);
-
-    margin-left: -1.75rem;
-
-    font-size: 0.75em;
-    color: #d6d6d6;
-  }
-
-  .indicator {
-    position: absolute;
-    z-index: 11;
-
-    top: 50%;
-    left: -1rem;
-
-    transform: translate(-47%, -50%);
+    left: 50%;
+    transform: translate(-50%, -50%);
+    z-index: 15;

    text-align: right;

    width: 15px;
    height: 15px;

-    background: var(--clr-secondary);
-    border: 3px solid $barClr;
+    background-color: var(--clr-secondary);
+    border: 4px solid $barClr;
    border-radius: 100%;
  }
+
+  & > .line {
+    position: absolute;
+    top: 0;
+    left: 50%;
+    transform: translate(-50%, 0);
+    z-index: 10;
+
+    height: 100%;
+
+    // background-color: $barClr;
+    border-left: 2px solid $barClr;
+    border-right: 2px solid $barClr;
+
+    &.line_connection {
+      transform: translate(-50%, -6px);
+      height: calc(100% + 12px);
+      // height: calc(100% + 0.25em);
+    }
+
+    &.line_node-top {
+      top: 0;
+      height: 50%;
+    }
+
+    &.line_node-bottom {
+      top: 50%;
+      height: 50%;
+    }
+
+    &.line_stop {
+      border-color: $stoppedClr;
+      z-index: 11;
+    }
+  }
+}
+
+.info-comments {
+  display: flex;
+  align-items: center;
+  gap: 0.25em;
+
+  margin: 0.25em 0;
+
+  img {
+    height: 1.2em;
+  }
+}
+
+.bottom-line-info {
+  .scenery-change-name {
+    position: relative;
+    margin: 0.25em 0;
+
+    &::before {
+      content: '';
+      position: absolute;
+      height: 2px;
+      width: 30px;
+      background-color: #aaa;
+
+      top: 50%;
+      right: calc(100% + 5px);
+      transform: translate(0, -50%);
+    }
+  }
 }
 </style>
@@ -0,0 +1,282 @@
+<template>
+  <div class="dropdown" @keydown.esc="showOptions = false" @focusout="showOptions = false">
+    <div class="bg" v-if="showOptions" @click="showOptions = false"></div>
+
+    <button class="filter-button btn--filled btn--image" @click="toggleShowOptions" ref="button">
+      <img src="/images/icon-stats.svg" alt="Open filters icon" />
+      {{ $t('train-stats.stats-button') }}
+    </button>
+
+    <transition name="dropdown-anim">
+      <div class="dropdown_wrapper" v-if="showOptions">
+        <h1 class="text--primary">
+          <img src="/images/icon-stats.svg" alt="Open filters icon" />
+          {{ $t('train-stats.title') }}
+        </h1>
+
+        <hr style="margin: 0.5em 0" />
+
+        <div v-if="apiStore.dataStatuses.connection == Status.Loaded && regionTrains.length > 0">
+          <div class="top-list general">
+            <transition-group tag="ul" name="stats-anim">
+              <li class="badge" key="timetable-count">
+                <span>{{ $t('train-stats.timetable-count') }}</span>
+                <span>
+                  <b>{{ regionTrainsWithTT.length }}</b>
+                </span>
+              </li>
+
+              <li class="badge" key="avg-speed">
+                <span>{{ $t('train-stats.avg-speed') }}</span>
+                <span>
+                  <b>{{ stats.avgSpeed.toFixed(1) }} km/h</b>
+                </span>
+              </li>
+
+              <li class="badge" key="avg-distance">
+                <span>{{ $t('train-stats.avg-timetable') }}</span>
+                <span>
+                  <b>{{ stats.avgDistance.toFixed(1) }} km</b>
+                </span>
+              </li>
+            </transition-group>
+          </div>
+
+          <div class="top-list categories">
+            <h3>{{ $t('train-stats.top-categories') }}</h3>
+
+            <transition-group tag="ul" name="stats-anim">
+              <li class="badge" v-for="top in stats.topCategories" :key="top.name">
+                <span>{{ top.name }}</span>
+                <span>{{ top.count }}</span>
+              </li>
+            </transition-group>
+
+            <span class="no-data" v-if="stats.topCategories.length == 0">
+              {{ $t('train-stats.no-timetables') }}
+            </span>
+          </div>
+
+          <div class="top-list vehicles">
+            <h3>{{ $t('train-stats.top-vehicles') }}</h3>
+
+            <transition-group tag="ul" name="stats-anim">
+              <li class="badge" v-for="top in stats.topVehicles" :key="top.name">
+                <span>{{ top.name }}</span>
+                <span>{{ top.count }}</span>
+              </li>
+            </transition-group>
+
+            <span class="no-data" v-if="stats.topVehicles.length == 0">
+              {{ $t('train-stats.no-vehicles') }}
+            </span>
+          </div>
+
+          <div class="top-list vehicle-types">
+            <h3>{{ $t('train-stats.top-units') }}</h3>
+
+            <transition-group tag="ul" name="stats-anim">
+              <li class="badge" v-for="top in stats.topUnits.slice(0, 7)" :key="top.name">
+                <span>{{ top.name }}</span>
+                <span>{{ top.count }}</span>
+              </li>
+            </transition-group>
+
+            <span class="no-data" v-if="stats.topUnits.length == 0">
+              {{ $t('train-stats.no-units') }}
+            </span>
+          </div>
+        </div>
+
+        <div v-else-if="apiStore.dataStatuses.connection != Status.Loaded">
+          {{ $t('train-stats.stats-loading') }}
+        </div>
+
+        <div class="no-data" v-else>
+          {{ $t('train-stats.no-stats') }}
+        </div>
+      </div>
+    </transition>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { useMainStore } from '../../store/mainStore';
+import { Status } from '../../typings/common';
+import { useApiStore } from '../../store/apiStore';
+
+interface ITop {
+  name: string;
+  count: number;
+}
+
+interface IStats {
+  timetableCount: number;
+  avgSpeed: number;
+  avgDistance: number;
+  topCategories: ITop[];
+  topVehicles: ITop[];
+  topUnits: ITop[];
+}
+
+function compareTop(top1: ITop, top2: ITop) {
+  return Math.sign(top2.count - top1.count) || top1.name.localeCompare(top2.name, 'pl-PL');
+}
+
+export default defineComponent({
+  data() {
+    return {
+      showOptions: false,
+      store: useMainStore(),
+      apiStore: useApiStore(),
+      Status: Status.Data
+    };
+  },
+
+  computed: {
+    regionTrains() {
+      return this.store.trainList.filter((train) => train.region == this.store.region.id);
+    },
+
+    regionTrainsWithTT() {
+      return this.regionTrains.filter((train) => train.timetableData);
+    },
+
+    stats() {
+      const stats = this.regionTrains.reduce(
+        (acc, train, i, arr) => {
+          // AVG SPEED
+          acc.avgSpeed += train.speed / arr.length;
+
+          // TOP VEHICLES
+          const locoType = train.locoType.split('-')[0];
+          const topVehicle = acc.topVehicles.find((top) => top.name == locoType);
+
+          if (!topVehicle) acc.topVehicles.push({ name: locoType, count: 1 });
+          else topVehicle.count++;
+
+          // TOP UNITS
+          const unitType = train.locoType;
+          const topUnit = acc.topUnits.find((top) => top.name == unitType);
+
+          if (!topUnit) acc.topUnits.push({ name: unitType, count: 1 });
+          else topUnit.count++;
+
+          if (train.timetableData !== undefined) {
+            acc.timetableCount++;
+            // AVG DISTANCE
+            acc.avgDistance += train.timetableData.routeDistance;
+
+            // TOP CATEGORIES
+            const topCategory = acc.topCategories.find(
+              (top) => top.name == train.timetableData!.category
+            );
+
+            if (!topCategory)
+              acc.topCategories.push({ name: train.timetableData!.category, count: 1 });
+            else topCategory.count++;
+          }
+
+          if (i == arr.length - 1 && acc.timetableCount != 0) {
+            acc.avgDistance /= acc.timetableCount;
+          }
+
+          return acc;
+        },
+        {
+          timetableCount: 0,
+          avgDistance: 0,
+          avgSpeed: 0,
+          topCategories: [],
+          topUnits: [],
+          topVehicles: []
+        } as IStats
+      );
+
+      stats.topCategories.sort(compareTop);
+      stats.topUnits.sort(compareTop);
+      stats.topVehicles.sort(compareTop);
+
+      return stats;
+    }
+  },
+
+  methods: {
+    toggleShowOptions() {
+      this.showOptions = !this.showOptions;
+
+      this.$nextTick(() => {
+        if (this.showOptions) (this.$refs['button'] as HTMLButtonElement)?.focus();
+      });
+    }
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+@import '../../styles/dropdown.scss';
+@import '../../styles/badge.scss';
+@import '../../styles/responsive.scss';
+
+h1 img {
+  vertical-align: text-bottom;
+}
+
+h3 {
+  margin: 0.5em 0;
+}
+
+.no-data {
+  font-size: 1.1em;
+  color: #ccc;
+}
+
+.top-list ul {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 0.5em;
+
+  // @include smallScreen {
+  //   justify-content: center;
+  // }
+}
+
+.badge {
+  margin: 0;
+
+  & > span:first-child {
+    background-color: $accentCol;
+    color: black;
+  }
+}
+
+.dropdown_wrapper {
+  max-width: 600px;
+}
+
+.stats-anim {
+  &-move,
+  &-enter-active,
+  &-leave-active {
+    transition: all 250ms ease;
+  }
+
+  &-enter-from,
+  &-leave-to {
+    opacity: 0;
+    transform: translateX(5px);
+  }
+
+  &-leave-active {
+    position: absolute;
+  }
+}
+
+@include smallScreen {
+  h1,
+  .no-data {
+    text-align: center;
+  }
+}
+</style>
@@ -1,44 +1,41 @@
 <template>
-  <div class="train-table">
-    <transition name="anim" mode="out-in">
-      <div :key="store.dataStatuses.trains">
-        <div class="table-info" v-if="store.isOffline">
-          {{ $t('app.offline') }}
-        </div>
-
-        <Loading v-else-if="trains.length == 0 && store.dataStatuses.trains == 0" />
-
-        <div
-          class="table-info no-trains"
-          v-else-if="trains.length == 0 && store.dataStatuses.trains != 0"
-        >
-          {{ $t('trains.no-trains') }}
-        </div>
-
-        <transition-group name="list-anim" tag="ul" class="train-list" v-else>
-          <li
-            class="train-row"
-            v-for="train in currentTrains"
-            :key="train.trainId"
-            tabindex="0"
-            @click.stop="selectModalTrain(train.trainId, $event.currentTarget)"
-            @keydown.enter="selectModalTrain(train.trainId, $event.currentTarget)"
-          >
-            <TrainInfo :train="train" />
-          </li>
-        </transition-group>
+  <transition name="status-anim" mode="out-in" tag="div" class="train-table">
+    <div :key="apiStore.dataStatuses.connection">
+      <div class="table-warning" key="offline" v-if="store.isOffline">
+        {{ $t('app.offline') }}
      </div>
-    </transition>
-  </div>
+
+      <Loading v-else-if="apiStore.dataStatuses.connection == Status.Loading" key="loading" />
+
+      <div class="table-warning" key="no-trains" v-else-if="trains.length == 0">
+        {{ $t('trains.no-trains') }} (region: <b>{{ store.region.name }}</b
+        >)
+      </div>
+
+      <transition-group name="list-anim" tag="ul">
+        <li
+          class="train-row"
+          v-for="train in trains"
+          :key="train.id"
+          tabindex="0"
+          @click.stop="selectModalTrain(train, $event.currentTarget)"
+          @keydown.enter="selectModalTrain(train, $event.currentTarget)"
+        >
+          <TrainInfo :train="train" :extended="false" />
+        </li>
+      </transition-group>
+    </div>
+  </transition>
 </template>

 <script lang="ts">
-import { computed, defineComponent, inject, PropType, Ref } from 'vue';
+import { defineComponent, inject, PropType, Ref } from 'vue';
 import modalTrainMixin from '../../mixins/modalTrainMixin';
-import Train from '../../scripts/interfaces/Train';
-import { useStore } from '../../store/store';
+import { useMainStore } from '../../store/mainStore';
 import Loading from '../Global/Loading.vue';
 import TrainInfo from './TrainInfo.vue';
+import { Status, Train } from '../../typings/common';
+import { useApiStore } from '../../store/apiStore';

 export default defineComponent({
  components: { Loading, TrainInfo },
@@ -52,19 +49,18 @@ export default defineComponent({

  mixins: [modalTrainMixin],

-  setup(props) {
-    const store = useStore();
+  setup() {
+    const store = useMainStore();
+    const apiStore = useApiStore();
    const searchedTrain = inject('searchedTrain') as Ref<string>;
    const searchedDriver = inject('searchedDriver') as Ref<string>;
-    const currentTrains = computed(() => {
-      return props.trains;
-    });

    return {
      searchedTrain,
      searchedDriver,
-      currentTrains,
      store,
+      apiStore,
+      Status: Status.Data,
      sorterActive: inject('sorterActive') as {
        id: string | number;
        dir: number;
@@ -72,14 +68,14 @@ export default defineComponent({
    };
  },

-  activated() {
-    const query = this.$route.query;
-    if (query.trainNo && query.driverName) {
-      this.searchedDriver = query.driverName.toString();
-      this.searchedTrain = query.trainNo.toString();
-      setTimeout(() => {
-        this.selectModalTrain(query.driverName! + query.trainNo!.toString());
-      }, 20);
+  computed: {
+    dataStatus() {
+      if (this.store.isOffline) return Status.Data.Offline;
+
+      if (this.trains.length == 0 && this.apiStore.dataStatuses.connection == Status.Data.Loading)
+        return Status.Data.Loading;
+
+      return Status.Data.Loaded;
    }
  }
 });
@@ -89,121 +85,29 @@ export default defineComponent({
@import '../../styles/responsive.scss';
@import '../../styles/animations.scss';

-.anim {
-  &-enter-from,
-  &-leave-to {
-    opacity: 0;
-  }
+.train-table {
+  position: relative;

-  &-enter-active {
-    transition: all 100ms ease-out;
-  }
-
-  &-leave-active {
-    transition: all 100ms ease-out;
-  }
+  height: 90vh;
+  min-height: 550px;
+  overflow-y: auto;
+  overflow-x: hidden;
 }

-.table-info {
+.table-warning {
  text-align: center;

  padding: 1em 0;
-
-  font-size: 1.5em;
+  font-size: 1.25em;

  background: #1a1a1a;
 }

-img.train-image {
-  width: 12em;
-}
+li.train-row {
+  background-color: var(--clr-secondary);
+  margin-bottom: 1em;
+  width: 100%;

-.traffic-warning {
-  padding: 1em 0;
-  margin-bottom: 0.5em;
-  background: var(--clr-warning);
-}
-
-.timeouts-warning {
-  background-color: #333;
-
-  font-weight: bold;
-  font-size: 1.05em;
-
-  margin-bottom: 0.5em;
-  padding: 0.5em;
-}
-
-.warning-timeout {
-  background-color: #be3728;
-  color: white;
-
-  display: inline-block;
-  text-align: center;
-
-  width: 1.25em;
-  height: 1.25em;
-  border-radius: 50%;
-}
-
-.train {
-  &-list {
-    position: relative;
-
-    @include smallScreen() {
-      width: 100%;
-    }
-  }
-
-  &-row {
-    background-color: var(--clr-secondary);
-    margin-bottom: 1em;
-
-    cursor: pointer;
-  }
-
-  &_cars {
-    display: flex;
-    align-items: center;
-
-    overflow: auto;
-  }
-}
-
-.paginator {
-  display: flex;
-  justify-content: center;
-
-  &_item {
-    padding: 0.25em 0.5em;
-    margin: 0 0.5em;
-    outline: 2px solid salmon;
-
-    min-width: 30px;
-
-    text-align: center;
-
-    cursor: pointer;
-
-    &.page-number {
-      font-weight: bold;
-      color: gold;
-    }
-
-    &.disabled {
-      outline: 2px solid lightgray;
-      color: lightgray;
-    }
-
-    &:focus {
-      outline: 2px solid white;
-    }
-  }
-}
-
-@include smallScreen() {
-  .info-bottom {
-    text-align: center;
-  }
+  cursor: pointer;
 }
 </style>
@@ -1,63 +1,93 @@
-import { TrainFilterSection, TrainFilterType } from '../../scripts/enums/TrainFilterType';
-import { TrainFilter } from '../../scripts/interfaces/Trains/TrainFilter';
+export enum TrainFilterSection {
+  TRAIN_TYPE = 'TRAIN_TYPE',
+  TIMETABLE_TYPE = 'TIMETABLE_TYPE',
+  COMMENTS = 'COMMENTS',
+  TIMETABLE = 'TIMETABLE'
+}
+
+export const enum TrainFilterId {
+  noComments = 'noComments',
+  withComments = 'withComments',
+
+  twr = 'twr',
+  skr = 'skr',
+  common = 'common',
+
+  passenger = 'passenger',
+  freight = 'freight',
+  other = 'other',
+  noTimetable = 'noTimetable',
+  withTimetable = 'withTimetable'
+}
+
+export interface TrainFilter {
+  id: TrainFilterId;
+  section: TrainFilterSection;
+  isActive: boolean;
+}
+
+export interface TrainSorter {
+  id: string;
+  value: string;
+}

 export const trainFilters: TrainFilter[] = [
  {
-    id: TrainFilterType.twr,
+    id: TrainFilterId.twr,
    section: TrainFilterSection.TRAIN_TYPE,
    isActive: true
  },
  {
-    id: TrainFilterType.skr,
+    id: TrainFilterId.skr,
    section: TrainFilterSection.TRAIN_TYPE,
    isActive: true
  },
  {
-    id: TrainFilterType.common,
+    id: TrainFilterId.common,
    section: TrainFilterSection.TRAIN_TYPE,
    isActive: true
  },

  {
-    id: TrainFilterType.passenger,
+    id: TrainFilterId.passenger,
    section: TrainFilterSection.TIMETABLE_TYPE,
    isActive: true
  },
  {
-    id: TrainFilterType.freight,
+    id: TrainFilterId.freight,
    section: TrainFilterSection.TIMETABLE_TYPE,
    isActive: true
  },
  {
-    id: TrainFilterType.other,
+    id: TrainFilterId.other,
    section: TrainFilterSection.TIMETABLE_TYPE,
    isActive: true
  },

  {
-    id: TrainFilterType.withComments,
+    id: TrainFilterId.withComments,
    section: TrainFilterSection.COMMENTS,
    isActive: true
  },
  {
-    id: TrainFilterType.noComments,
+    id: TrainFilterId.noComments,
    section: TrainFilterSection.COMMENTS,
    isActive: true
  },

  {
-    id: TrainFilterType.withTimetable,
+    id: TrainFilterId.withTimetable,
    section: TrainFilterSection.TIMETABLE,
    isActive: true
  },
  {
-    id: TrainFilterType.noTimetable,
+    id: TrainFilterId.noTimetable,
    section: TrainFilterSection.TIMETABLE,
    isActive: true
  }
 ];

-export const sorterOptions = [
+export const sorterOptions: TrainSorter[] = [
  {
    id: 'distance',
    value: 'kilometraż'
@@ -1,46 +0,0 @@
-import { JournalFilterSection, JournalFilterType } from '../../scripts/enums/JournalFilterType';
-import { JournalFilter } from '../../scripts/types/JournalTimetablesTypes';
-
-export const journalTimetableFilters: JournalFilter[] = [
-  {
-    id: JournalFilterType.ALL,
-    filterSection: JournalFilterSection.TIMETABLE_STATUS,
-    isActive: true
-  },
-
-  {
-    id: JournalFilterType.ACTIVE,
-    filterSection: JournalFilterSection.TIMETABLE_STATUS,
-    isActive: false
-  },
-
-  {
-    id: JournalFilterType.FULFILLED,
-    filterSection: JournalFilterSection.TIMETABLE_STATUS,
-    isActive: false
-  },
-
-  {
-    id: JournalFilterType.ABANDONED,
-    filterSection: JournalFilterSection.TIMETABLE_STATUS,
-    isActive: false
-  },
-
-  {
-    id: JournalFilterType.TWR_SKR,
-    filterSection: JournalFilterSection.TWRSKR,
-    isActive: true
-  },
-
-  {
-    id: JournalFilterType.TWR,
-    filterSection: JournalFilterSection.TWRSKR,
-    isActive: false
-  },
-
-  {
-    id: JournalFilterType.SKR,
-    filterSection: JournalFilterSection.TWRSKR,
-    isActive: false
-  }
-];
@@ -1,23 +0,0 @@
-[
-  "EP07-356",
-  "EP07-356",
-  "EP07-356",
-  "ET41-074",
-  "2EN57-694+716rb",
-  "EU07E-083",
-  "EN57-716rb",
-  "EN57-716rb",
-  "EN57-716rb",
-  "EN57-038rb",
-  "EN57-038rb",
-  "SM42-329_PLREG",
-  "2EN57-038+1715rb",
-  "EN57-1953rb",
-  "EN57-1953rb",
-  "SM42-1121",
-  "SM42-091",
-  "SM42-404",
-  "SM42-404",
-  "EN57-1914rb",
-  "EN57-961rb"
-]
@@ -1,13 +1,15 @@
 {
  "optionSections": [
+    "status",
+    "timetables",
    "reality",
    "package-access",
+    "station-type",
    "access",
    "control",
-    "addons",
    "blockades",
    "signals",
-    "status"
+    "addons"
  ],

  "options": [
@@ -60,6 +62,20 @@
      "value": false,
      "defaultValue": false
    },
+    {
+      "id": "junction",
+      "name": "junction",
+      "section": "station-type",
+      "value": true,
+      "defaultValue": true
+    },
+    {
+      "id": "nonJunction",
+      "name": "nonJunction",
+      "section": "station-type",
+      "value": true,
+      "defaultValue": true
+    },
    {
      "id": "SPK",
      "name": "SPK",
@@ -138,6 +154,20 @@
      "value": true,
      "defaultValue": true
    },
+    {
+      "id": "ASDEK",
+      "name": "ASDEK",
+      "section": "addons",
+      "value": true,
+      "defaultValue": true
+    },
+    {
+      "id": "noASDEK",
+      "name": "noASDEK",
+      "section": "addons",
+      "value": true,
+      "defaultValue": true
+    },
    {
      "id": "SBL",
      "name": "SBL",
@@ -228,6 +258,20 @@
      "section": "status",
      "value": true,
      "defaultValue": true
+    },
+    {
+      "id": "withActiveTimetables",
+      "name": "withActiveTimetables",
+      "section": "timetables",
+      "value": true,
+      "defaultValue": true
+    },
+    {
+      "id": "withoutActiveTimetables",
+      "name": "withoutActiveTimetables",
+      "section": "timetables",
+      "value": true,
+      "defaultValue": true
    }
  ],
  "sliders": [
@@ -236,6 +280,7 @@
      "name": "minLevel",
      "minRange": 0,
      "maxRange": 20,
+      "step": 1,
      "value": 0,
      "defaultValue": 0
    },
@@ -244,14 +289,34 @@
      "name": "maxLevel",
      "minRange": 0,
      "maxRange": 20,
+      "step": 1,
      "value": 20,
      "defaultValue": 20
    },
+    {
+      "id": "min-vmax",
+      "name": "minVmax",
+      "minRange": 0,
+      "maxRange": 200,
+      "step": 10,
+      "value": 0,
+      "defaultValue": 0
+    },
+    {
+      "id": "max-vmax",
+      "name": "maxVmax",
+      "minRange": 0,
+      "maxRange": 200,
+      "step": 10,
+      "value": 200,
+      "defaultValue": 200
+    },
    {
      "id": "routes-1t-cat",
      "name": "minOneWayCatenary",
      "minRange": 0,
      "maxRange": 5,
+      "step": 1,
      "value": 0,
      "defaultValue": 0
    },
@@ -260,6 +325,7 @@
      "name": "minOneWay",
      "minRange": 0,
      "maxRange": 5,
+      "step": 1,
      "value": 0,
      "defaultValue": 0
    },
@@ -268,6 +334,7 @@
      "name": "minTwoWayCatenary",
      "minRange": 0,
      "maxRange": 5,
+      "step": 1,
      "value": 0,
      "defaultValue": 0
    },
@@ -276,6 +343,7 @@
      "name": "minTwoWay",
      "minRange": 0,
      "maxRange": 5,
+      "step": 1,
      "value": 0,
      "defaultValue": 0
    }
@@ -0,0 +1,19 @@
+import enLang from './locales/en.json';
+import plLang from './locales/pl.json';
+
+import { createI18n } from 'vue-i18n';
+
+const i18n = createI18n({
+  locale: 'pl',
+  legacy: false,
+  warnHtmlMessage: false,
+  fallbackLocale: 'pl',
+
+  messages: {
+    en: enLang,
+    pl: plLang
+  },
+  enableLegacy: false
+});
+
+export default i18n;
@@ -1,10 +1,38 @@
 {
+  "donations": {
+    "button-title": "TOSS A COIN",
+    "header": "Toss a coin to Stacjownik!",
+    "donator-title": "Project is supported by more than <b>{count}</b> people, including:",
+    "p1": "<b>Hello o7!</b> This is Spythere, the creator of Stacjownik, Pojazdownik and several other applications that enhance the gameplay of Train Driver 2!",
+    "p2": "{b1} is a completely free tool, created and continuously developed for the Train Driver 2 simulator community since 2020. However, a part of the project is sustained solely through my private financial contribution.  Features such as  {b2} or {b3} (operating on my {link} - to which you are warmly invited) must function on a dedicated server where they can collect and process data, and then display it on the website.",
+    "p2-b1": "Stacjownik",
+    "p2-b2": "Journal",
+    "p2-b3": "Stacjobot (Stacjownik bot)",
+    "p2-a1": "Discord server",
+    "p3": "<b>If you have the means and would like to support my work, I would be grateful for any financial assistance that could help cover at least some of the server costs and further enhance the capabilities of the application!</b>",
+    "p4": "Every person who decides to contribute at least {b1} (in case of PayPal it must be a payment including additional transaction fees) for the development of Stacjownik, will receive (upon a personal request) {img}{b2} of username in the app and on my Discord server (after verifying the payment author, preferably by providing the username directly with the payment).",
+    "p4-b1": "5 PLN",
+    "p4-b2": "a symbolic highlight",
+    "p5": "Thank you and enjoy the app!<br />~ Spythere",
+    "action-exit": "Maybe next time...",
+    "action-paypal": "DONATE WITH PAYPAL",
+    "action-buycoffee": "BUY ME A COFFEE!",
+    "dispatcher-message": "Dispatcher supporting the Stacjownik project!",
+    "driver-message": "Driver supporting the Stacjownik project!"
+  },
  "general": {
    "and": " and ",
    "refresh": "REFRESH",
    "TWR": "High risk freight train",
    "SKR": "Train with exceeded gauge"
  },
+  "update": {
+    "title": "Stacjownik update!",
+    "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>"
+  },
  "app": {
    "sceneries": "SCENERIES",
    "trains": "TRAINS",
@@ -20,12 +48,10 @@
  "footer": {
    "discord": "Stacjownik Discord server"
  },
-  "update": {
-    "title": "New version of the app is available!",
-    "paragraph1": "Enjoy the application and may the green signal be with you!",
-    "release-link": "Click here to browse version changelog (GitHub)",
-    "confirm-button": "UPDATE NOW",
-    "later-button": "LATER"
+
+  "vehicle-preview": {
+    "loading": "Loading preview...",
+    "error": "Oops! The vehicle preview seems to be missing! :/"
  },
  "data-status": {
    "S1-offline": "<b>S1 signal</b> <br> The app is working in offline mode!",
@@ -37,20 +63,6 @@
    "S5-dispatchers": "<b>S5 signal</b> <br> Cannot load dispatchers status data!",
    "S5-trains": "<b>S5 signal</b> <br> Cannot load online trains data!"
  },
-  "desc": {
-    "control-type": "Control type: ",
-    "signals-type": "Signals type:  ",
-    "SBL": "This scenery has automatic block signalling (ABS/SBL) system on following routes: ",
-    "SUP": "Requires the SUP application (level crossing remote control simulator)",
-    "TWB-all": "This scenery has two-way route blockade on all routes",
-    "TWB-routes": "This scenery has two-way route blockade on following routes: ",
-    "default": "This scenery is available by default",
-    "non-public": "This scenery is not public",
-    "unknown": "This scenery isn't recognizable right now",
-    "unavailable": "This scenery is unavailable",
-    "abandoned": "This scenery is no longer supported by its creators",
-    "real": "Scenery with real lines: "
-  },
  "signals": {
    "title": "Signal type",
    "współczesna": "modern",
@@ -69,7 +81,20 @@
    "ręczne+SCS": "manual + SCS",
    "mechaniczne": "levers (mechanical)",
    "mechaniczne+SPK": "levers + SPK",
-    "mechaniczne+SCS": "levers + SCS"
+    "mechaniczne+SCS": "levers + SCS",
+
+    "abbrevs": {
+      "SPK": "SPK",
+      "SCS": "SCS",
+      "SCS-SPK": "S/S",
+      "SPE": "SPE",
+      "ręczne": "R",
+      "ręczne+SPK": "R",
+      "ręczne+SCS": "R",
+      "mechaniczne": "M",
+      "mechaniczne+SPK": "M",
+      "mechaniczne+SCS": "M"
+    }
  },
  "status": {
    "online": "UNTIL ",
@@ -78,16 +103,17 @@
    "not-signed": "NOT SIGNED IN",
    "no-limit": "NO LIMIT",
    "unavailable": "UNAVAILABLE",
-    "brb": "AFK",
+    "afk": "AFK",
    "no-space": "NO SPACE",
+    "invalid": "INVALID HASH",
    "unknown": "UNKNOWN"
  },
  "options": {
    "filters": "FILTERS",
    "donate": "DONATE",

-    "search-button": "Search",
-    "reset-button": "Reset",
+    "search-button": "SEARCH",
+    "reset-button": "RESET",

    "sort-title": "SORT BY:",
    "filter-title": "FILTER BY:",
@@ -123,7 +149,8 @@
    "filter-withComments": "COMMENTS",
    "filter-twr": "HIGH RISK CARGO",
    "filter-skr": "EXCEEDED GAUGE",
-    "filter-twr-skr": "ALL TYPES",
+    "filter-twr-skr": "BOTH TYPES",
+    "filter-all-specials": "ALL",
    "filter-common": "NO WARNINGS",
    "filter-passenger": "PASSENGER",
    "filter-freight": "FREIGHT",
@@ -135,9 +162,9 @@
    "filter-clear": "CLEAR FILTERS",

    "filter-section-timetable-status": "TIMETABLE STATUS",
-    "filter-section-twrskr": "WARNINGS",
+    "filter-section-special": "SPECIAL TYPE",

-    "filter-all": "ALL ENTRIES",
+    "filter-all-statuses": "ALL",
    "filter-abandoned": "ABANDONED",
    "filter-fulfilled": "FULFILLED",
    "filter-active": "ACTIVE"
@@ -147,16 +174,22 @@

    "sections": {
      "quick": "QUICK FILTERS",
+      "stationType": "STATION TYPE",
      "reality": "SCENERY REALITY",
-      "package-access": "IN-GAME AVAILABILITY",
+      "packageAccess": "IN-GAME AVAILABILITY",
      "access": "GENERAL AVAILABILITY",
      "control": "CONTROLS",
      "signals": "SIGNALLING",
      "addons": "ADDITIONAL PROGRAMS",
      "blockades": "BLOCK SIGNALLING",
-      "status": "ONLINE STATUS"
+      "status": "ONLINE STATUS",
+      "timetables": "ACTIVE TIMETABLES",
+      "spawns": "OPEN SPAWNS"
    },

+    "changed-filters-count": "Changed filters:",
+    "no-changed-filters": "No changed filters",
+
    "all-available": "ALL AVAILABLE",
    "all-free": "CURRENTLY FREE",

@@ -167,11 +200,11 @@

    "title": "STATION FILTERS",
    "default": "IN-GAME",
-    "not-default": "ADDITIONAL",
+    "notDefault": "ADDITIONAL",
    "real": "REAL",
    "fictional": "FICTIONAL",
    "unavailable": "UNSUPPORTED",
-    "non-public": "NON-PUBLIC",
+    "nonPublic": "NON-PUBLIC",
    "abandoned": "ABANDONED",

    "SPK": "SPK",
@@ -181,13 +214,15 @@
    "SCS-R": "SCS + MANUAL",
    "SCS-M": "SCS + MECH.",
    "SPE": "SPE",
-
    "manual": "MANUAL",
    "mechanical": "MECHANICAL",

    "SUP": "SUP (RASP-UZK)",
    "noSUP": "WITHOUT SUP",

+    "ASDEK": "ASDEK",
+    "noASDEK": "NO ASDEK",
+
    "SBL": "AUTOMATIC (SBL)",
    "PBL": "SEMIAUTOMATIC (PBL)",

@@ -197,15 +232,28 @@
    "historical": "HISTORICAL",
    "free": "FREE",
    "occupied": "OCCUPIED",
+
+    "withActiveTimetables": "ACTIVE",
+    "withoutActiveTimetables": "NO ACTIVE",
+
+    "junction": "JUNCTIONS",
+    "nonJunction": "OTHER",
+
    "sliders": {
-      "min-lvl": "MIN. REQUIRED DISPATCHER LEVEL",
-      "max-lvl": "MAX. REQUIRED DISPATCHER LEVEL",
-      "routes-1t-cat": "MIN. CATENARY SINGLE TRACK ROUTES",
-      "routes-1t-other": "MIN. OTHER SINGLE TRACK ROUTES",
-      "routes-2t-cat": "MIN. CATENARY DOUBLE TRACK ROUTES",
-      "routes-2t-other": "MIN. OTHER DOUBLE TRACK ROUTES"
+      "minLevel": "MIN. REQUIRED DISPATCHER LEVEL",
+      "maxLevel": "MAX. REQUIRED DISPATCHER LEVEL",
+      "minVmax": "MIN. SCENERY ROUTE SPEED",
+      "maxVmax": "MAX. SCENERY ROUTE SPEED",
+      "minOneWayCatenary": "MIN. CATENARY SINGLE TRACK ROUTES",
+      "minOneWay": "MIN. OTHER SINGLE TRACK ROUTES",
+      "minTwoWayCatenary": "MIN. CATENARY DOUBLE TRACK ROUTES",
+      "minTwoWay": "MIN. OTHER DOUBLE TRACK ROUTES"
    },
-    "authors-search": "Search by author (other filters apply)",
+
+    "authors-search": "SEARCH BY AUTHOR NAME (other filters apply):",
+    "authors-placeholder": "Enter the author nickname...",
+    "authors-button-title": "Search",
+
    "minimum-hours-title": "SHOW ONLY SCENERIES UNTIL:",
    "now": "NOW",
    "hour": "h",
@@ -216,20 +264,53 @@
    "close": "CLOSE FILTERS"
  },
  "sceneries": {
-    "station": "Station",
-    "min-lvl": "Min. dispatcher\nlevel",
-    "status": "Status",
-    "dispatcher": "Dispatcher",
-    "dispatcher-lvl": "Dispatcher\nlevel",
-    "routes": "Routes\ndouble / single",
-    "general": "General info",
-    "user": "Drivers online",
-    "spawn": "Spawns online",
-    "timetableAll": "Active timetables",
-    "timetableConfirmed": "Confirmed timetables",
-    "timetableUnconfirmed": "Unconfirmed timetables",
+    "headers": {
+      "station": "Scenery",
+      "min-lvl": "Scenery\nlevel",
+      "status": "Status",
+      "dispatcher": "Dispatcher",
+      "dispatcher-lvl": "Dispatcher\nlevel",
+      "routes-single": "1-track\nroutes",
+      "routes-double": "2-track\nroutes",
+      "general": "General info",
+      "user": "Drivers online",
+      "like": "Dispatcher rating",
+      "spawn": "Spawns online",
+      "timetableAll": "Active timetables",
+      "timetableConfirmed": "Confirmed timetables",
+      "timetableUnconfirmed": "Unconfirmed timetables"
+    },
+    "info": {
+      "control-type": "Control type: ",
+      "signals-type": "Signals type: ",
+      "SBL": "This scenery has automatic block signalling (ABS/SBL) system on following routes: ",
+      "SUP": "Requires the SUP program (level crossing remote control)",
+      "ASDEK": "Requires the ASDEK program (defect detection of moving rolling stock)",
+      "TWB-all": "This scenery has two-way route blockade on all routes",
+      "TWB-routes": "This scenery has two-way route blockade on following routes: ",
+      "default": "This scenery is available by default",
+      "non-public": "This scenery is not public",
+      "unavailable": "This scenery is unavailable",
+      "abandoned": "This scenery is no longer supported by its creators",
+      "unknown": "This scenery isn't recognizable right now",
+      "real": "Scenery with real lines: ",
+      "double-track-routes-catenary": "Electrified double-track routes count: ",
+      "single-track-routes-catenary": "Electrified single-track routes count: ",
+      "double-track-routes-other": "Not electrified double-track routes count: ",
+      "single-track-routes-other": "Not electrified single-track routes count:  "
+    },
    "no-stations": "No stations to show here!",
-    "scenery-search": "Search for scenery..."
+    "scenery-search": "Search for scenery...",
+    "active-filters": "Attention! You got active filters!"
+  },
+  "station-stats": {
+    "u-factor": "U-factor",
+    "u-factor-tooltip": "(?) Current server traffic factor (driver count divided by dispatcher count)",
+    "avg-timetable-count": "Average count of scenery timetables:",
+    "single-track-count": "Single track routes:",
+    "double-track-count": "Double track routes:",
+    "cross-sceneries": "Cross-track sceneries (1-track <-> 2-track)",
+    "open-spawns": "Open spawns:"
  },
  "trains": {
    "no-trains": "No trains to show here!",
@@ -272,7 +353,24 @@
    "last-seen-ago": "since {minutes} minutes",

    "scenery-offline": "Offline ride",
-    "timeout": "An error occured while trying to refresh SWDR timetable data!"
+    "timeout": "An error occured while trying to refresh SWDR timetable data!",
+
+    "journal-button": "DRIVER'S JOURNAL"
+  },
+  "train-stats": {
+    "stats-button": "STATISTICS",
+    "title": "STATISTICS ONLINE",
+    "timetable-count": "ACTIVE TIMETABLES",
+    "avg-speed": "AVG SPEED",
+    "avg-timetable": "AVG TIMETABLE",
+    "top-categories": "Timetable categories",
+    "top-vehicles": "Vehicles online",
+    "top-units": "Common units online",
+    "stats-loading": "Loading...",
+    "no-timetables": "No active timetables in this region!",
+    "no-vehicles": "No active vehicles in this region!",
+    "no-units": "No active units in this region!",
+    "no-stats": "No statistics available for the current region!"
  },
  "journal": {
    "title": "DISPATCHER HISTORY",
@@ -293,6 +391,7 @@
    "timetable-active": "ACTIVE",
    "timetable-fulfilled": "FULFILLED",
    "timetable-abandoned": "ABANDONED",
+    "timetable-online-button": "ONLINE TIMETABLE",

    "online-since": "ONLINE SINCE",
    "duty-lasted": "The duty lasted",
@@ -301,7 +400,7 @@
    "minutes": "{value} min | {value} mins",
    "seconds": "{value} s",

-    "stock-info": "EXTRA INFO",
+    "stock-info": "DETAILS",
    "stock-length": "Length",
    "stock-mass": "Mass",
    "stock-max-speed": "Max. speed",
@@ -311,29 +410,49 @@
    "last-seen-at": "Last seen at",
    "currently-at": "Currently at",

-    "stats-title": "DRIVING STATISTICS OF",
+    "driver-stats": {
+      "button": "DRIVER STATS",
+      "title": "{name}'s DRIVER STATS",
+      "info": "Enter a proper nickname into filters [F] to see user's driving statistics!",
+      "timetables": "TIMETABLES",
+      "longest-timetable": "LONGEST TIMETABLE",
+      "avg-timetable": "AVERAGE TIMETABLE LENGTH",
+      "distance": "DISTANCE",
+      "stations": "STATIONS"
+    },

-    "stats-timetables": "TIMETABLES",
-    "stats-longest-timetable": "LONGEST TIMETABLE",
-    "stats-avg-timetable": "AVERAGE TIMETABLE LENGTH",
-    "stats-distance": "DISTANCE",
-    "stats-stations": "STATIONS",
+    "daily-stats": {
+      "button": "DAILY STATS",
+      "title": "STATS OF THE DAY",
+      "info": "Today's statistics are unavailable yet!",
+      "total": "Issued timetables: {count} (total distance: {distance})",
+      "longest": "The longest timetable: #{id} (made by {author} for {driver}, distance: {distance})",
+      "most-active-dr": "The most active dispatcher: {dispatcher} (created {count})",
+      "most-active-dr-many": "The most active dispatchers: {dispatchers} (created {count} each)",
+      "most-active-driver": "The most active driver: {driver} (total driven distance: {distance})",
+      "longest-duties": "The longest service: {dispatcher} at {station} (duration: {duration})",
+      "count": "timetable | timetables",

-    "timetable-stats-title": "Daily stats on {date}",
-    "timetable-stats-total": "Issued timetables: {count} (total distance: {distance})",
-    "timetable-stats-longest": "The longest timetable: #{id} (made by {author} for {driver}, distance: {distance})",
-    "timetable-stats-most-active-dr": "The most active dispatcher: {dispatcher} (created {count})",
-    "timetable-stats-most-active-dr-many": "The most active dispatchers: {dispatchers} (created {count} each)",
-    "timetable-stats-most-active-driver": "The most active driver: {driver} (total driven distance: {distance})",
-    "timetable-stats-longest-duties": "The longest service: {dispatcher} at {station} (duration: {duration})",
+      "rippedSwitches": "RIPPED SWITCHES",
+      "derailments": "DERAILMENTS",
+      "skippedStopSignals": "SKIPPED STOP SIGNALS",
+      "radioStops": "RADIOSTOPS",
+      "kills": "KILLS"
+    },

-    "timetable-count": "timetable | timetables",
-
-    "daily-stats-title": "DAILY STATS",
-    "daily-stats-info": "Today's statistics are unavailable yet!",
-
-    "driver-stats-title": "DRIVER STATS",
-    "driver-stats-info": "Enter a proper nickname into filters [F] to see user's driving statistics!",
+    "dispatcher-stats": {
+      "button": "DISPATCHER STATS",
+      "title": "{name}'s DISPATCHER STATS",
+      "empty": "This user has no statistics saved yet!",
+      "info": "Enter a proper nickname into filters [F] to see user's dispatcher statistics!",
+      "services-count": "SERVICES",
+      "service-max": "MAX SERVICE DURATION",
+      "service-avg": "AVG SERVICE DURATION",
+      "timetables-count": "ISSUED TIMETABLES",
+      "timetables-sum": "TIMETABLES DISTANCE SUM",
+      "timetables-max": "LONGEST TIMETABLE",
+      "timetables-avg": "AVG TIMETABLE DISTANCE"
+    },

    "stats-loading": "Fetching statistics...",
    "stats-error": "Oops! An unexpected error occurred while trying to fetch statistics! :/",
@@ -369,8 +488,8 @@
    "two-way-routes": "Two way routes",

    "option-active-timetables": "Active timetables",
-    "option-timetables-history": "Timetables history",
-    "option-dispatchers-history": "Dispatchers history",
+    "option-timetables-history": "Timetables history PL1",
+    "option-dispatchers-history": "Dispatchers history PL1",

    "timetable-author-title": "Issued by",
    "timetable-author-unknown": "Author unknown",
@@ -1,434 +0,0 @@
-{
-  "general": {
-    "and": " oraz ",
-    "refresh": "ODŚWIEŻ",
-    "TWR": "Towar niebezpieczny wysokiego ryzyka",
-    "SKR": "Przekroczona skrajnia"
-  },
-  "app": {
-    "sceneries": "SCENERIE",
-    "trains": "POCIĄGI",
-    "journal": "DZIENNIK",
-    "loading": "Pobieranie danych...",
-    "support": "Wspomóż projekt",
-    "error": "Wystąpił problem z załadowaniem danych!",
-    "no-result": "Brak wyników o podanych kryteriach!",
-    "migration-warning": "Usługi Stacjownika będą niedostępne w godzinach 1:00-3:00 2 czerwca 2022r. z powodu migracji hostingów API!",
-    "migration-confirm": "Przyjąłem!",
-    "offline": "Aplikacja w trybie offline!"
-  },
-  "footer": {
-    "discord": "Serwer Discord Stacjownika"
-  },
-  "update": {
-    "title": "Nowa wersja Stacjownika jest dostępna!",
-    "paragraph1": "Miłego korzystania z aplikacji i niech S2 będzie z wami!",
-    "release-link": "Kliknij, aby przejrzeć listę zmian (GitHub)",
-    "confirm-button": "ZAKTUALIZUJ",
-    "later-button": "PÓŹNIEJ"
-  },
-  "data-status": {
-    "S1-offline": "<b>Sygnał S1</b> <br> Aplikacja działa w trybie offline!",
-    "S1a-connection": "<b>Sygnał S1a</b> <br> Błąd podczas próby połączenia się z API Stacjownika!",
-    "S1a-sceneries": "<b>Sygnał S1a</b> <br> Błąd podczas pobierania danych o sceneriach online!",
-    "S2": "<b>Sygnał S2</b> <br> Pomyślnie załadowano dane!",
-    "S3": "<b>Sygnał S3</b> <br> Pobieranie danych...",
-    "S5-timetables": "<b>Sygnał S5</b> <br> Rozkłady jazdy mogą być niekompletne!",
-    "S5-dispatchers": "<b>Sygnał S5</b> <br> Błąd podczas pobierania danych o statusach dyżurnych ruchu!",
-    "S5-trains": "<b>Sygnał S5</b>  <br> Błąd podczas pobierania danych o pociągach online!"
-  },
-  "desc": {
-    "control-type": "Sterowanie: ",
-    "signals-type": "Sygnalizacja: ",
-    "SBL": "Sceneria posiada SBL na szlakach: ",
-    "SUP": "Wymaga programu SUP do kontroli systemu RASP-UZK",
-    "TWB-all": "Sceneria posiada blokadę dwukierunkową na wszystkich szlakach",
-    "TWB-routes": "Sceneria posiada blokadę dwukierunkową na szlakach: ",
-    "default": "Sceneria dostępna domyślnie w paczce z grą",
-    "non-public": "Sceneria niepubliczna",
-    "unavailable": "Sceneria niedostępna",
-    "unknown": "Nieznana sceneria",
-    "real": "Sceneria z realnymi liniami kolejowymi: ",
-    "abandoned": "Sceneria wycofana z rozgrywki"
-  },
-  "signals": {
-    "title": "Sygnalizacja",
-    "współczesna": "współczesna",
-    "mieszana": "mieszana",
-    "kształtowa": "kształtowa",
-    "historyczna": "historyczna"
-  },
-  "controls": {
-    "title": "Sterowanie",
-    "SPK": "SPK",
-    "SCS": "SCS",
-    "SCS-SPK": "SCS/SPK",
-    "SPE": "SPE",
-    "ręczne": "ręczne",
-    "ręczne+SPK": "ręczne z SPK",
-    "ręczne+SCS": "ręczne z SCS",
-    "mechaniczne": "mechaniczne",
-    "mechaniczne+SPK": "mechaniczne z SPK",
-    "mechaniczne+SCS": "mechaniczne z SCS"
-  },
-  "status": {
-    "online": "DO ",
-    "free": "WOLNA",
-    "ending": "KOŃCZY",
-    "not-signed": "NIEZALOGOWANY",
-    "no-limit": "BEZ LIMITU",
-    "unavailable": "NIEDOSTĘPNY",
-    "brb": "Z/W",
-    "no-space": "BRAK MIEJSCA",
-    "unknown": "NIEZNANY"
-  },
-  "options": {
-    "filters": "FILTRY",
-    "donate": "WESPRZYJ",
-
-    "search-button": "Szukaj",
-    "reset-button": "Zresetuj",
-
-    "sort-title": "SORTUJ WG:",
-    "filter-title": "FILTRUJ WG:",
-    "search-title": "SZUKAJ:",
-
-    "search-train-no": "Nr pociągu",
-    "search-train": "Nr pociągu / #",
-    "search-driver": "Nick maszynisty",
-    "search-dispatcher": "Nick dyżurnego",
-    "search-station": "Nazwa scenerii",
-    "search-author": "Nick autora rozkładu jazdy",
-    "search-issuedFrom": "Sceneria początkowa",
-    "search-timetables-date": "Data rozkładu jazdy (UTC+2 / CEST)",
-    "search-dispatchers-date": "Data służby (UTC+2 / CEST)",
-    "search-date": "Data (UTC+2 / CEST)",
-
-    "sort-routeDistance": "kilometraż",
-    "sort-allStopsCount": "stacje",
-    "sort-beginDate": "data",
-    "sort-timetableId": "ID rozkładu",
-    "sort-timestampFrom": "data",
-    "sort-duration": "czas dyżuru",
-    "sort-id": "id rozkładu",
-
-    "sort-mass": "masa",
-    "sort-speed": "prędkość",
-    "sort-length": "długość",
-    "sort-timetable": "nr pociągu",
-    "sort-progress": "przebyta trasa",
-    "sort-delay": "opóźnienie",
-    "sort-comments": "uwagi ekspl.",
-
-    "filter-withComments": "UWAGI EKSPLOATACYJNE",
-    "filter-noComments": "BEZ UWAG",
-    "filter-twr": "WYS. RYZYKA",
-    "filter-skr": "SKRAJNIA",
-    "filter-twr-skr": "WSZYSTKIE",
-    "filter-common": "ZWYKŁE",
-    "filter-passenger": "PASAŻERSKIE",
-    "filter-freight": "TOWAROWE",
-    "filter-other": "INNE",
-    "filter-noTimetable": "BEZ RJ",
-    "filter-withTimetable": "ROZKŁAD JAZDY",
-
-    "filter-reset": "ZRESETUJ FILTRY",
-    "filter-clear": "WYŁĄCZ FILTRY",
-
-    "filter-section-timetable-status": "STATUS ROZKŁADU JAZDY",
-    "filter-section-twrskr": "UWAGI",
-
-    "filter-all": "WSZYSTKIE",
-    "filter-abandoned": "PORZUCONE",
-    "filter-fulfilled": "WYPEŁNIONE",
-    "filter-active": "AKTYWNE"
-  },
-  "filters": {
-    "desc": " &bull; Kliknięcie: zaznaczenie / odznaczenie filtru <br /> &bull; Podwójne kliknięcie: odznaczenie reszty filtrów z <b class='text--primary'>grupy</b> <br /> &bull; <span style='color: coral'>RESET</span>: zresetowanie filtrów z <b class='text--primary'>grupy</b>",
-
-    "sections": {
-      "quick": "SZYBKIE FILTRY",
-      "reality": "FIKCYJNOŚĆ SCENERII",
-      "package-access": "DOSTĘPNOŚĆ W PACZCE",
-      "access": "DOSTĘPNOŚĆ OGÓLNA",
-      "control": "TYP STEROWANIA",
-      "signals": "TYP SYGNALIZACJI",
-      "addons": "DODATKOWE PROGRAMY",
-      "blockades": "BLOKADY LINIOWE",
-      "status": "STATUS ONLINE"
-    },
-
-    "all-available": "WSZYSTKIE DOSTĘPNE",
-    "all-free": "WSZYSTKIE WOLNE",
-
-    "endingStatus": "KOŃCZY",
-    "afkStatus": "Z/W",
-    "noSpaceStatus": "BRAK MIEJSCA",
-    "unavailableStatus": "NIEDOSTĘPNY",
-
-    "title": "FILTRUJ STACJE",
-    "default": "DOMYŚLNA",
-    "not-default": "POZA PACZKĄ",
-    "real": "REALNA",
-    "fictional": "FIKCYJNA",
-    "unavailable": "NIEDOSTĘPNA",
-    "non-public": "NIEPUBLICZNA",
-    "abandoned": "WYCOFANA",
-
-    "SPK": "SPK",
-    "SPK-R": "SPK + RĘCZNE",
-    "SPK-M": "SPK + MECH.",
-    "SCS": "SCS",
-    "SCS-R": "SCS + RĘCZNE",
-    "SCS-M": "SCS + MECH.",
-    "SPE": "SPE",
-    "manual": "RĘCZNE",
-
-    "SUP": "SUP (RASP-UZK)",
-    "noSUP": "BEZ SUP",
-
-    "SBL": "SAMOCZYNNA",
-    "PBL": "PÓŁSAMOCZYNNA",
-
-    "mechanical": "MECHANICZNE",
-    "modern": "WSPÓŁCZESNA",
-    "semaphores": "KSZTAŁTOWA",
-    "mixed": "MIESZANA",
-    "historical": "HISTORYCZNA",
-
-    "free": "WOLNA",
-    "occupied": "ZAJĘTA",
-
-    "sliders": {
-      "min-lvl": "MIN. WYMAGANY POZIOM DYŻURNEGO",
-      "max-lvl": "MAKS. WYMAGANY POZIOM DYŻURNEGO",
-      "routes-1t-cat": "SZLAKI JEDNOTOROWE ZELEKTR. (MINIMUM)",
-      "routes-1t-other": "SZLAKI JEDNOTOROWE NIEZELEKTR. (MINIMUM)",
-      "routes-2t-cat": "SZLAKI DWUTOROWE ZELEKTR. (MINIMUM)",
-      "routes-2t-other": "SZLAKI DWUTOROWE NIEZELEKTR. (MINIMUM)"
-    },
-
-    "authors-search": "Szukaj autora (uwzględnia inne filtry)",
-    "minimum-hours-title": "POKAŻ TYLKO SCENERIE DOSTĘPNE MINIMUM DO:",
-    "now": "TERAZ",
-    "hour": " godz.",
-    "no-limit": "BEZ LIMITU",
-    "include-selected": "POKAŻ ZAZNACZONE",
-    "save": "ZAPAMIĘTAJ FILTRY",
-    "reset": "RESETUJ FILTRY",
-    "close": "ZAMKNIJ FILTRY"
-  },
-  "sceneries": {
-    "station": "Stacja",
-    "abbr": "Skrót\nposterunku",
-    "min-lvl": "Min. poziom\ndyżurnego",
-    "status": "Status",
-    "dispatcher": "Dyżurny",
-    "dispatcher-lvl": "Poziom\ndyżurnego",
-    "routes": "Szlaki\n2tor / 1tor",
-    "general": "Informacje\nogólne",
-    "user": "Maszyniści online",
-    "spawn": "Otwarte spawny",
-    "timetableAll": "Aktywne rozkłady jazdy",
-    "timetableConfirmed": "Zatwierdzone rozkłady jazdy",
-    "timetableUnconfirmed": "Niezatwierdzone rozkłady jazdy",
-    "no-stations": "Brak stacji do wyświetlenia!",
-    "scenery-search": "Wyszukaj scenerię..."
-  },
-  "trains": {
-    "no-trains": "Brak pociągów do wyświetlenia!",
-    "loading": "Pobieranie danych o pociągach...",
-    "offline": "Przejazd offline",
-
-    "stats": "STATYSTYKI RUCHU",
-    "stats-speed": "PRĘDKOŚCI POCIĄGÓW (MIN, ŚR, MAX) [km/h]",
-    "stats-length": "DŁUGOŚCI ROZKŁADÓW (MIN, ŚR, MAX) [km]",
-    "stats-categories": "KATEGORIE RJ",
-    "stats-special-twr": "WYSOKIEGO RYZYKA",
-    "stats-special-skr": "PRZEKROCZONA SKRAJNIA",
-    "stats-locos": "NAJCZĘSTSZE JEDNOSTKI",
-
-    "current-scenery": "na scenerii",
-    "current-signal": "przy semaforze",
-    "current-track": "na szlaku",
-
-    "delayed": "Opóźniony: ",
-    "preponed": "Przed czasem: ",
-    "on-time": "Planowo",
-
-    "route-progress": "Postęp: ",
-
-    "detailed-timetable": "Szczegółowy rozkład jazdy pociągu ",
-    "via-title": "Przez: ",
-    "no-timetable": "brak rozkładu jazdy",
-    "distance-exceeded": "Uwaga! Z powodu wewnętrznego błędu serwera TD2, rozkłady jazdy o kilometrażu powyżej 200km mogą być niepoprawne!",
-    "cars": "Wagony",
-    "EZT": "EZT",
-    "SZT": "SZT",
-    "loco-electric": "Elektrowóz",
-    "loco-diesel": "Spalinowóz",
-    "timetable-comments": "Pociąg z uwagami eksploatacyjnymi",
-    "comment": "Uwagi eksploatacyjne dla: ",
-    "table-limit": "Dla płynności działania strony pokazanych jest tylko 10 pociągów zgodnie z wybranymi filtrami.",
-
-    "last-seen-now": "od niedawna",
-    "last-seen-min": "od minuty",
-    "last-seen-ago": "od {minutes} minut",
-
-    "scenery-offline": "Przejazd offline",
-
-    "timeout": "Wystąpił problem z aktualizacją rozkładów jazdy z SWDR"
-  },
-  "journal": {
-    "title": "HISTORIA DYŻURÓW",
-    "loading": "Ładowanie historii dyżurów...",
-    "no-history": "Brak historii dyżurów dla tej scenerii!",
-    "data-refreshed-at": "Dane odświeżone o",
-
-    "section-timetables": "ROZKŁADY JAZDY",
-    "section-dispatchers": "DYŻURNI",
-
-    "no-further-data": "Brak dalszych wyników dla podanych parametrów",
-    "loading-further-data": "Ładowanie...",
-
-    "online-since": "ONLINE OD",
-    "duty-lasted": "Dyżur trwał",
-    "hours": "{value} godz.",
-    "minutes": "{value} min.",
-    "seconds": "{value} sek.",
-
-    "route-length": "Kilometraż:",
-    "station-count": "Stacje:",
-    "dispatcher-name": "Autor",
-    "timetable-day": "Rozkład z dnia",
-    "timetable-active": "AKTYWNY",
-    "timetable-fulfilled": "WYPEŁNIONY",
-    "timetable-abandoned": "PORZUCONY",
-
-    "stock-info": "DODATKOWE INFORMACJE",
-    "stock-length": "Długość",
-    "stock-mass": "Masa",
-    "stock-max-speed": "Prędkość maks.",
-
-    "load-data": "Pobierz dalszą historię...",
-
-    "stats-title": "STATYSTYKI MASZYNISTY",
-
-    "last-seen-at": "Ostatnio widziany na: ",
-    "currently-at": "Obecnie na scenerii: ",
-
-    "stats-timetables": "ROZKŁADY JAZDY",
-    "stats-longest-timetable": "NAJDŁUŻSZY RJ",
-    "stats-avg-timetable": "ŚREDNIA DŁUGOŚĆ RJ",
-    "stats-distance": "DYSTANS",
-    "stats-stations": "STACJE",
-
-    "timetable-stats-total": "Stworzone rozkłady jazdy: {count} (łączny dystans: {distance})",
-    "timetable-stats-longest": "Najdłuższy rozkład jazdy: #{id} (stworzony przez dyżurnego {author} dla maszynisty {driver} o dystansie {distance})",
-    "timetable-stats-most-active-dr": "Najaktywniejszy dyżurny: {dispatcher} (stworzył {count})",
-    "timetable-stats-most-active-dr-many": "Najaktywniejsi dyżurni: {dispatchers} (stworzyli po {count})",
-    "timetable-stats-most-active-driver": "Najaktywniejszy maszynista: {driver} (łączny przejechany dystans: {distance})",
-    "timetable-stats-longest-duties": "Najdłuższa służba: {dispatcher} na scenerii {station} (czas trwania: {duration})",
-
-    "timetable-count": "rozkład jazdy | rozkładów jazdy",
-
-    "daily-stats-title": "STATYSTYKI DNIA",
-    "daily-stats-info": "Dzisiejsze statystyki nie są jeszcze dostępne!",
-
-    "driver-stats-title": "STATYSTYKI GRACZA",
-    "driver-stats-info": "Wpisz nazwę użytkownika w filtrach [F], aby zobaczyć jego statystyki maszynisty!",
-
-    "stats-loading": "Pobieranie statystyk...",
-    "stats-error": "Ups! Wystąpił błąd podczas próby pobrania statystyk! :/",
-
-    "timetable-location-signal": "semafor:",
-    "timetable-location-route": "szlak:",
-
-    "history-name": "Sceneria",
-    "history-hash": "Hash",
-    "history-dispatcher": "Dyżurny",
-    "history-level": "Poziom",
-    "history-rate": "Ocena",
-    "history-region": "Region",
-    "history-date": "Data służby"
-  },
-  "scenery": {
-    "users": "GRACZE ONLINE",
-    "spawns": "OTWARTE SPAWNY",
-    "timetables": "AKTYWNE ROZKŁADY JAZDY",
-    "no-timetables": "Brak aktywnych rozkładów!",
-    "offline": "Sceneria jest offline",
-    "no-users": "BRAK AKTYWNYCH GRACZY",
-    "no-spawns": "BRAK OTWARTYCH SPAWNÓW",
-    "no-scenery": "Ups! Ta sceneria nie istnieje!",
-    "return-btn": "Wróć na stronę główną",
-    "history-btn": "Przejdź do widoku historii dyżurnych ruchu",
-    "info-btn": "Wróć do widoku scenerii",
-    "authors-title": "Autor scenerii | Autorzy scenerii",
-    "abbrev": "Skrót posterunku:",
-    "lines-title": "Rzeczywiste linie",
-    "project-title": "Projekt",
-    "one-way-routes": "Szlaki jednotorowe",
-    "two-way-routes": "Szlaki dwutorowe",
-
-    "option-active-timetables": "Aktywne rozkłady jazdy",
-    "option-timetables-history": "Historia rozkładów",
-    "option-dispatchers-history": "Historia dyżurów",
-
-    "timetable-author-title": "Wydany przez",
-    "timetable-author-unknown": "Autor nieznany",
-
-    "timetables-history-id": "ID",
-    "timetables-history-number": "Numer",
-    "timetables-history-route": "Trasa",
-    "timetables-history-driver": "Maszynista",
-    "timetables-history-author": "Autor RJ",
-    "timetables-history-date": "Data",
-
-    "dispatchers-history-hash": "Hash",
-    "dispatchers-history-dispatcher": "Dyżurny",
-    "dispatchers-history-level": "Poziom",
-    "dispatchers-history-rate": "Ocena",
-    "dispatchers-history-date": "Data służby",
-
-    "req-level": "ogólnodostępna | minimum {lvl} poziom dyżurnego | minimum {lvl} poziom dyżurnego",
-    "history-list-empty": "Brak historii dla tej scenerii!",
-
-    "forum-topic": "Oficjalny wątek scenerii {name}",
-
-    "pragotron-link": "Paletowa tablica informacyjna (beta)",
-    "tablice-link": "Tablica informacyjna zbiorcza (autorstwa Thundo)",
-
-    "bottom-info": "Pokaż pełną historię w zakładce Dziennika"
-  },
-  "availability": {
-    "title": "Dostępność",
-    "default": "w paczce",
-    "nonDefault": "poza paczką",
-    "unavailable": "niedostępna",
-    "nonPublic": "niepubliczna",
-    "abandoned": "wycofana"
-  },
-  "timetables": {
-    "timetable-only": "Wyodrębnij rozkłady jazdy",
-    "end": "Koniec rozkładu jazdy",
-    "terminated": "Rozkład jazdy zakończony",
-    "begins": "ROZPOCZYNA\nBIEG",
-    "terminates": "KOŃCZY BIEG",
-
-    "from": "Z",
-    "to": "DO",
-
-    "desc-arriving": "Pociągu nie ma jeszcze na tej scenerii. Przyjedzie z: {prevStationName} (szlak {prevDepartureLine})",
-    "desc-online": "Pociąg jest na tej scenerii. Odjedzie do: {nextStationName} (szlak {nextArrivalLine})",
-    "desc-stopped": "Pociąg jest na tej scenerii i odbywa postój. Odjedzie do: {nextStationName} (szlak {nextArrivalLine})",
-    "desc-next-arrival": "Odjeżdża do: {nextStationName} (szlak {nextArrivalLine})",
-    "desc-departed": "Pociąg jest na tej scenerii i został odprawiony. Odjeżdża do: {nextStationName} (szlak {nextArrivalLine})",
-    "desc-departed-away": "Pociąg został odprawiony i odjechał do: {nextStationName} (szlak {nextArrivalLine})",
-    "desc-end": "Pociąg kończy bieg",
-    "desc-terminated": "Pociąg skończył bieg"
-  },
-  "history": {
-    "title": "DZIENNIK ROZKŁADÓW JAZDY"
-  }
-}
@@ -1,10 +1,38 @@
 {
+  "donations": {
+    "button-title": "GROSZA DAJ",
+    "header": "Grosza daj Stacjownikowi!",
+    "donator-title": "Projekt ma już ponad <b>{count}</b> wspierających, w tym:",
+    "p1": "<b>Hej o7!</b> Z tej strony Spythere, twórca Stacjownika, Pojazdownika oraz kilku innych aplikacji wspomagających rozgrywkę symulatora Train Driver 2!",
+    "p2": "{b1} to narzędzie całkowicie darmowe, tworzone i rozwijane dla społeczności symulatora TD2 nieprzerwanie od 2020 roku. Jednakże, część projektu jest podtrzymywana wyłącznie dzięki mojemu prywatnemu wkładowi finansowemu. Funkcje takie jak {b2} czy też {b3} działający na moim {link} (na który serdecznie zapraszam) muszą działać na wydzielonym serwerze, gdzie będą mogły zbierać i przetwarzać dane, aby następnie pokazać je na stronie.",
+    "p2-b1": "Stacjownik",
+    "p2-b2": "Dziennik",
+    "p2-b3": "Stacjobot",
+    "p2-a1": "serwerze Discord",
+    "p3": "<b>Jeśli masz możliwość i chcesz wspomóc moją twórczość dla symulatora, będę wdzięczny za wszelkie pomoce finansowe, które pozwolą na choćby częściowe pokrycie kosztów serwera oraz dalsze rozwijanie możliwości aplikacji!</b>",
+    "p4": "Każda osoba, która postanowi przelać co najmniej {b1} (w przypadku PayPala musi być to opłata brutto z dodatkową opłatą za transakcję) na rozwój Stacjownika, otrzyma na życzenie symboliczne {img}{b2} nicku użytkownika na stronie i moim serwerze Discord (po zweryfikowaniu autora płatności, najlepiej poprzez podanie nicku bezpośrednio przy niej).",
+    "p4-b1": "5 złotych",
+    "p4-b2": "wyróżnienie",
+    "p5": "Dzięki i miłego korzystania z aplikacji! <br />~ Spythere",
+    "action-exit": "Może kiedy indziej...",
+    "action-paypal": "PRZELEJ PAYPALEM",
+    "action-buycoffee": "POSTAW KAWĘ!",
+    "dispatcher-message": "Dyżurny wspierający projekt Stacjownika!",
+    "driver-message": "Maszynista wspierający projekt Stacjownika!"
+  },
  "general": {
    "and": " oraz ",
    "refresh": "ODŚWIEŻ",
    "TWR": "Towar niebezpieczny wysokiego ryzyka",
    "SKR": "Przekroczona skrajnia"
  },
+  "update": {
+    "title": "Aktualizacja Stacjownika!",
+    "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>"
+  },
  "app": {
    "sceneries": "SCENERIE",
    "trains": "POCIĄGI",
@@ -17,6 +45,10 @@
  "footer": {
    "discord": "Serwer Discord Stacjownika"
  },
+  "vehicle-preview": {
+    "loading": "Ładowanie podglądu...",
+    "error": "Ups! Nie znaleziono podglądu pojazdu! :/"
+  },
  "data-status": {
    "S1-offline": "<b>Sygnał S1</b> <br> Aplikacja działa w trybie offline!",
    "S1a-connection": "<b>Sygnał S1a</b> <br> Błąd podczas próby połączenia się z API Stacjownika!",
@@ -27,18 +59,6 @@
    "S5-dispatchers": "<b>Sygnał S5</b> <br> Błąd podczas pobierania danych o statusach dyżurnych ruchu!",
    "S5-trains": "<b>Sygnał S5</b>  <br> Błąd podczas pobierania danych o pociągach online!"
  },
-  "desc": {
-    "control-type": "Sterowanie:",
-    "signals-type": "Sygnalizacja:",
-    "SBL": "Sceneria posiada SBL na szlakach:",
-    "SUP": "Wymaga programu SUP do kontroli systemu RASP-UZK",
-    "default": "Sceneria dostępna domyślnie w paczce z grą",
-    "non-public": "Sceneria niepubliczna",
-    "unavailable": "Sceneria niedostępna",
-    "unknown": "Nieznana sceneria",
-    "real": "Sceneria z realnymi liniami kolejowymi:",
-    "abandoned": "Sceneria wycofana z rozgrywki"
-  },
  "signals": {
    "title": "Sygnalizacja",
    "współczesna": "współczesna",
@@ -57,7 +77,20 @@
    "ręczne+SCS": "ręczne z SCS",
    "mechaniczne": "mechaniczne",
    "mechaniczne+SPK": "mechaniczne z SPK",
-    "mechaniczne+SCS": "mechaniczne z SCS"
+    "mechaniczne+SCS": "mechaniczne z SCS",
+
+    "abbrevs": {
+      "SPK": "SPK",
+      "SCS": "SCS",
+      "SCS-SPK": "S/S",
+      "SPE": "SPE",
+      "ręczne": "R",
+      "ręczne+SPK": "R",
+      "ręczne+SCS": "R",
+      "mechaniczne": "M",
+      "mechaniczne+SPK": "M",
+      "mechaniczne+SCS": "M"
+    }
  },
  "status": {
    "online": "DO ",
@@ -66,16 +99,17 @@
    "not-signed": "NIEZALOGOWANY",
    "no-limit": "BEZ LIMITU",
    "unavailable": "NIEDOSTĘPNY",
-    "brb": "Z/W",
+    "afk": "Z/W",
    "no-space": "BRAK MIEJSCA",
+    "invalid": "NIEWPISANY",
    "unknown": "NIEZNANY"
  },
  "options": {
    "filters": "FILTRY",
    "donate": "WESPRZYJ",

-    "search-button": "Szukaj",
-    "reset-button": "Zresetuj",
+    "search-button": "SZUKAJ",
+    "reset-button": "ZRESETUJ",

    "sort-title": "SORTUJ WG:",
    "filter-title": "FILTRUJ WG:",
@@ -112,7 +146,8 @@
    "filter-noComments": "BEZ UWAG",
    "filter-twr": "WYS. RYZYKA",
    "filter-skr": "SKRAJNIA",
-    "filter-twr-skr": "WSZYSTKIE",
+    "filter-twr-skr": "TWR/SKR",
+    "filter-all-statuses": "WSZYSTKIE",
    "filter-common": "ZWYKŁE",
    "filter-passenger": "PASAŻERSKIE",
    "filter-freight": "TOWAROWE",
@@ -124,9 +159,9 @@
    "filter-clear": "WYŁĄCZ FILTRY",

    "filter-section-timetable-status": "STATUS ROZKŁADU JAZDY",
-    "filter-section-twrskr": "UWAGI",
+    "filter-section-special": "TYPY SPECJALNE",

-    "filter-all": "WSZYSTKIE",
+    "filter-all-specials": "WSZYSTKIE",
    "filter-abandoned": "PORZUCONE",
    "filter-fulfilled": "WYPEŁNIONE",
    "filter-active": "AKTYWNE"
@@ -136,16 +171,22 @@

    "sections": {
      "quick": "SZYBKIE FILTRY",
+      "stationType": "RODZAJ STACJI",
      "reality": "FIKCYJNOŚĆ SCENERII",
-      "package-access": "DOSTĘPNOŚĆ W PACZCE",
+      "packageAccess": "DOSTĘPNOŚĆ W PACZCE",
      "access": "DOSTĘPNOŚĆ OGÓLNA",
      "control": "TYP STEROWANIA",
      "signals": "TYP SYGNALIZACJI",
-      "addons": "DODATKOWE PROGRAMY",
+      "addons": "SZCZEGÓŁY",
      "blockades": "BLOKADY LINIOWE",
-      "status": "STATUS ONLINE"
+      "status": "STATUS ONLINE",
+      "timetables": "AKTYWNE ROZKŁADY JAZDY",
+      "spawns": "OTWARTE SPAWNY"
    },

+    "changed-filters-count": "Zmienione filtry:",
+    "no-changed-filters": "Brak zmienionych filtrów",
+
    "all-available": "WSZYSTKIE DOSTĘPNE",
    "all-free": "WSZYSTKIE WOLNE",

@@ -156,11 +197,11 @@

    "title": "FILTRUJ STACJE",
    "default": "DOMYŚLNA",
-    "not-default": "POZA PACZKĄ",
+    "notDefault": "POZA PACZKĄ",
    "real": "REALNA",
    "fictional": "FIKCYJNA",
    "unavailable": "NIEDOSTĘPNA",
-    "non-public": "NIEPUBLICZNA",
+    "nonPublic": "NIEPUBLICZNA",
    "abandoned": "WYCOFANA",

    "SPK": "SPK",
@@ -175,6 +216,9 @@
    "SUP": "SUP (RASP-UZK)",
    "noSUP": "BEZ SUP",

+    "ASDEK": "ASDEK",
+    "noASDEK": "BEZ ASDEK-a",
+
    "SBL": "SAMOCZYNNA",
    "PBL": "PÓŁSAMOCZYNNA",

@@ -183,20 +227,29 @@
    "semaphores": "KSZTAŁTOWA",
    "mixed": "MIESZANA",
    "historical": "HISTORYCZNA",
-
    "free": "WOLNA",
    "occupied": "ZAJĘTA",

+    "withActiveTimetables": "AKTYWNE",
+    "withoutActiveTimetables": "BEZ AKTYWNYCH",
+
+    "junction": "WĘZŁOWE",
+    "nonJunction": "INNE",
+
    "sliders": {
-      "min-lvl": "MIN. WYMAGANY POZIOM DYŻURNEGO",
-      "max-lvl": "MAKS. WYMAGANY POZIOM DYŻURNEGO",
-      "routes-1t-cat": "SZLAKI JEDNOTOROWE ZELEKTR. (MINIMUM)",
-      "routes-1t-other": "SZLAKI JEDNOTOROWE NIEZELEKTR. (MINIMUM)",
-      "routes-2t-cat": "SZLAKI DWUTOROWE ZELEKTR. (MINIMUM)",
-      "routes-2t-other": "SZLAKI DWUTOROWE NIEZELEKTR. (MINIMUM)"
+      "minLevel": "MIN. WYMAGANY POZIOM DYŻURNEGO",
+      "maxLevel": "MAKS. WYMAGANY POZIOM DYŻURNEGO",
+      "minVmax": "MIN. PRĘDKOŚĆ SZLAKOWA",
+      "maxVmax": "MAKS. PRĘDKOŚĆ SZLAKOWA",
+      "minOneWayCatenary": "SZLAKI JEDNOTOROWE ZELEKTR. (MINIMUM)",
+      "minOneWay": "SZLAKI JEDNOTOROWE NIEZELEKTR. (MINIMUM)",
+      "minTwoWayCatenary": "SZLAKI DWUTOROWE ZELEKTR. (MINIMUM)",
+      "minTwoWay": "SZLAKI DWUTOROWE NIEZELEKTR. (MINIMUM)"
    },

-    "authors-search": "Szukaj autora (uwzględnia inne filtry)",
+    "authors-search": "SZUKAJ AUTORA (uwzględnia inne filtry):",
+    "authors-placeholder": "Wpisz nick autora...",
+    "authors-button-title": "Szukaj",
    "minimum-hours-title": "POKAŻ TYLKO SCENERIE DOSTĘPNE MINIMUM DO:",
    "now": "TERAZ",
    "hour": " godz.",
@@ -207,21 +260,51 @@
    "close": "ZAMKNIJ FILTRY"
  },
  "sceneries": {
-    "station": "Stacja",
-    "abbr": "Skrót\nposterunku",
-    "min-lvl": "Min. poziom\ndyżurnego",
-    "status": "Status",
-    "dispatcher": "Dyżurny",
-    "dispatcher-lvl": "Poziom\ndyżurnego",
-    "routes": "Szlaki\n2tor / 1tor",
-    "general": "Informacje\nogólne",
-    "user": "Maszyniści online",
-    "spawn": "Otwarte spawny",
-    "timetableAll": "Aktywne rozkłady jazdy",
-    "timetableConfirmed": "Zatwierdzone rozkłady jazdy",
-    "timetableUnconfirmed": "Niezatwierdzone rozkłady jazdy",
+    "headers": {
+      "station": "Sceneria",
+      "min-lvl": "Poziom\nscenerii",
+      "status": "Status",
+      "dispatcher": "Dyżurny",
+      "dispatcher-lvl": "Poziom\ndyżurnego",
+      "routes-single": "Szlaki\n1-torowe",
+      "routes-double": "Szlaki\n2-torowe",
+      "general": "Informacje\nogólne",
+      "user": "Maszyniści online",
+      "like": "Ocena dyżurnego",
+      "spawn": "Otwarte spawny",
+      "timetableAll": "Aktywne rozkłady jazdy",
+      "timetableConfirmed": "Zatwierdzone rozkłady jazdy",
+      "timetableUnconfirmed": "Niezatwierdzone rozkłady jazdy"
+    },
+    "info": {
+      "control-type": "Sterowanie: ",
+      "signals-type": "Sygnalizacja: ",
+      "SBL": "Sceneria posiada SBL na szlakach: ",
+      "SUP": "Wymaga programu SUP do kontroli systemu RASP-UZK",
+      "ASDEK": "Wymaga programu ASDEK do detekcji stanów awaryjnych taboru w ruchu",
+      "default": "Sceneria dostępna domyślnie w paczce z grą",
+      "non-public": "Sceneria niepubliczna",
+      "unavailable": "Sceneria niedostępna",
+      "abandoned": "Sceneria wycofana z rozgrywki",
+      "unknown": "Nieznana sceneria",
+      "real": "Sceneria z realnymi liniami kolejowymi: ",
+      "double-track-routes-catenary": "Liczba zelektryfikowanych szlaków dwutorowych: ",
+      "single-track-routes-catenary": "Liczba zelektryfikowanych szlaków jednotorowych: ",
+      "double-track-routes-other": "Liczba niezelektryfikowanych szlaków dwutorowych: ",
+      "single-track-routes-other": "Liczba niezelektryfikowanych szlaków jednotorowych: "
+    },
    "no-stations": "Brak stacji do wyświetlenia!",
-    "scenery-search": "Wyszukaj scenerię..."
+    "scenery-search": "Wyszukaj scenerię...",
+    "active-filters": "Uwaga! Masz obecnie aktywne filtry!"
+  },
+  "station-stats": {
+    "u-factor": "Współczynnik Ugla",
+    "u-factor-tooltip": "(?) Współczynnik ruchu na serwerze (liczba maszynistów online dzielona na liczbę dyżurnych ruchu)",
+    "avg-timetable-count": "Średnia liczba rozkładów jazdy na sceneriach:",
+    "single-track-count": "Szlaki jednotorowe:",
+    "double-track-count": "Szlaki dwutorowe:",
+    "cross-sceneries": "Scenerie przejściowe (1-tor <-> 2-tor):",
+    "open-spawns": "Otwarte spawny:"
  },
  "trains": {
    "no-trains": "Brak pociągów do wyświetlenia!",
@@ -255,7 +338,24 @@

    "scenery-offline": "Przejazd offline",

-    "timeout": "Wystąpił problem z aktualizacją rozkładów jazdy z SWDR"
+    "timeout": "Wystąpił problem z aktualizacją rozkładów jazdy z SWDR",
+
+    "journal-button": "DZIENNIK MASZYNISTY"
+  },
+  "train-stats": {
+    "stats-button": "STATYSTYKI",
+    "title": "STATYSTYKI ONLINE",
+    "timetable-count": "AKTYWNE RJ",
+    "avg-speed": "ŚREDNIA PRĘDKOŚĆ",
+    "avg-timetable": "ŚREDNI RJ",
+    "top-categories": "Kategorie RJ",
+    "top-vehicles": "Pojazdy w grze",
+    "top-units": "Najczęstsze jednostki w grze",
+    "stats-loading": "Ładowanie...",
+    "no-timetables": "Brak aktywnych rozkładów jazdy na tym serwerze!",
+    "no-vehicles": "Brak aktywnych pojazdów na tym serwerze!",
+    "no-units": "Brak aktywnych jednostek na tym serwerze!",
+    "no-stats": "Brak statystyk online dla wybranego serwera!"
  },
  "journal": {
    "title": "HISTORIA DYŻURÓW",
@@ -282,39 +382,60 @@
    "timetable-active": "AKTYWNY",
    "timetable-fulfilled": "WYPEŁNIONY",
    "timetable-abandoned": "PORZUCONY",
+    "timetable-online-button": "RJ ONLINE",

-    "stock-info": "DODATKOWE INFORMACJE",
+    "stock-info": "SZCZEGÓŁY",
    "stock-length": "Długość",
    "stock-mass": "Masa",
    "stock-max-speed": "Prędkość maks.",

    "load-data": "Pobierz dalszą historię...",

-    "stats-title": "STATYSTYKI MASZYNISTY",
-
    "last-seen-at": "Ostatnio widziany na: ",
    "currently-at": "Obecnie na scenerii: ",

-    "stats-timetables": "ROZKŁADY JAZDY",
-    "stats-longest-timetable": "NAJDŁUŻSZY RJ",
-    "stats-avg-timetable": "ŚREDNIA DŁUGOŚĆ RJ",
-    "stats-distance": "DYSTANS",
-    "stats-stations": "STACJE",
+    "driver-stats": {
+      "button": "STAT. MASZYNISTY",
+      "title": "STATYSTYKI MASZYNISTY {name}",
+      "info": "Wpisz nazwę użytkownika w filtrach [F], aby zobaczyć jego statystyki maszynisty!",
+      "timetables": "ROZKŁADY JAZDY",
+      "longest-timetable": "NAJDŁUŻSZY RJ",
+      "avg-timetable": "ŚREDNIA DŁUGOŚĆ RJ",
+      "distance": "DYSTANS",
+      "stations": "STACJE"
+    },

-    "timetable-stats-total": "Stworzone rozkłady jazdy: {count} (łączny dystans: {distance})",
-    "timetable-stats-longest": "Najdłuższy rozkład jazdy: #{id} (stworzony przez dyżurnego {author} dla maszynisty {driver} o dystansie {distance})",
-    "timetable-stats-most-active-dr": "Najaktywniejszy dyżurny: {dispatcher} (stworzył {count})",
-    "timetable-stats-most-active-dr-many": "Najaktywniejsi dyżurni: {dispatchers} (stworzyli po {count})",
-    "timetable-stats-most-active-driver": "Najaktywniejszy maszynista: {driver} (łączny przejechany dystans: {distance})",
-    "timetable-stats-longest-duties": "Najdłuższa służba: {dispatcher} na scenerii {station} (czas trwania: {duration})",
+    "daily-stats": {
+      "button": "STATYSTYKI DNIA",
+      "title": "STATYSTYKI DNIA",
+      "info": "Dzisiejsze statystyki nie są jeszcze dostępne!",
+      "total": "Stworzone rozkłady jazdy: {count} (łączny dystans: {distance})",
+      "longest": "Najdłuższy rozkład jazdy: #{id} (stworzony przez dyżurnego {author} dla maszynisty {driver} o dystansie {distance})",
+      "most-active-dr": "Najaktywniejszy dyżurny: {dispatcher} (stworzył {count})",
+      "most-active-dr-many": "Najaktywniejsi dyżurni: {dispatchers} (stworzyli po {count})",
+      "most-active-driver": "Najaktywniejszy maszynista: {driver} (łączny przejechany dystans: {distance})",
+      "longest-duties": "Najdłuższa służba: {dispatcher} na scenerii {station} (czas trwania: {duration})",
+      "count": "rozkład jazdy | rozkładów jazdy",

-    "timetable-count": "rozkład jazdy | rozkładów jazdy",
+      "rippedSwitches": "ROZPRUTE ZWROTNICE",
+      "derailments": "WYKOLEJENIA",
+      "skippedStopSignals": "POMINIĘTE S1",
+      "radioStops": "RADIOSTOPY",
+      "kills": "POTRĄCENIA"
+    },

-    "daily-stats-title": "STATYSTYKI DNIA",
-    "daily-stats-info": "Dzisiejsze statystyki nie są jeszcze dostępne!",
-
-    "driver-stats-title": "STATYSTYKI GRACZA",
-    "driver-stats-info": "Wpisz nazwę użytkownika w filtrach [F], aby zobaczyć jego statystyki maszynisty!",
+    "dispatcher-stats": {
+      "button": "STATYSTYKI DYŻURNEGO",
+      "title": "STATYSTYKI DYŻURNEGO {name}",
+      "info": "Wpisz nazwę użytkownika w filtrach [F], aby zobaczyć jego statystyki dyżurnego!",
+      "services-count": "DYŻURY",
+      "service-max": "MAKS. CZAS DYŻURU",
+      "service-avg": "ŚREDNI CZAS DYŻURU",
+      "timetables-count": "WYSTAWIONE RJ",
+      "timetables-sum": "SUMA WYSTAWIONYCH RJ",
+      "timetables-max": "NAJDŁUŻSZY WYSTAWIONY RJ",
+      "timetables-avg": "ŚREDNIA WYSTAWIONYCH RJ"
+    },

    "stats-loading": "Pobieranie statystyk...",
    "stats-error": "Ups! Wystąpił błąd podczas próby pobrania statystyk!",
@@ -350,8 +471,8 @@
    "two-way-routes": "Szlaki dwutorowe",

    "option-active-timetables": "Aktywne rozkłady jazdy",
-    "option-timetables-history": "Historia rozkładów",
-    "option-dispatchers-history": "Historia dyżurów",
+    "option-timetables-history": "Historia rozkładów PL1",
+    "option-dispatchers-history": "Historia dyżurów PL1",

    "timetable-author-title": "Wydany przez",
    "timetable-author-unknown": "Autor nieznany",
@@ -2,28 +2,19 @@ import { createApp, Directive, ref } from 'vue';
 import App from './App.vue';
 import router from './router';

-import enLang from './locales/en.json';
-import plLang from './locales/pl.json';
+import i18n from './i18n';

-import { createI18n } from 'vue-i18n';
 import { createPinia } from 'pinia';
-import useCustomSW from './mixins/useCustomSW';
+import { registerSW } from 'virtual:pwa-register';

-const i18n = createI18n({
-  locale: 'pl',
-  legacy: false,
-  warnHtmlMessage: false,
-  fallbackLocale: 'pl',
-  messages: {
-    en: enLang,
-    pl: plLang
-  },
-  enableLegacy: false
+// Service worker
+registerSW({
+  immediate: true,
+  onNeedRefresh() {
+    console.log('Needs refresh!');
+  }
 });

-// SW
-useCustomSW();
-
 const clickOutsideDirective: Directive = {
  mounted(el, binding) {
    el.clickOutsideEvent = (event: Event) => {
@@ -0,0 +1,119 @@
+import StorageManager from './storageManager';
+
+export const sections = [
+  'status',
+  'timetables',
+  'reality',
+  'packageAccess',
+  'stationType',
+  'access',
+  'control',
+  'blockades',
+  'signals',
+  'addons'
+] as const;
+
+export const initFilters = {
+  default: false,
+  notDefault: false,
+  real: false,
+  fictional: false,
+  SPK: false,
+  SCS: false,
+  SPE: false,
+  SUP: false,
+  noSUP: false,
+  ASDEK: false,
+  noASDEK: false,
+  manual: false,
+  'SPK-R': false,
+  'SCS-R': false,
+  mechanical: false,
+  'SPK-M': false,
+  'SCS-M': false,
+  modern: false,
+  semaphores: false,
+  historical: false,
+  mixed: false,
+  SBL: false,
+  PBL: false,
+  'include-selected': false,
+  'no-1track': false,
+  'no-2track': false,
+  free: true,
+  occupied: false,
+  nonPublic: false,
+  unavailable: true,
+  abandoned: true,
+  afkStatus: false,
+  endingStatus: false,
+  noSpaceStatus: false,
+  unavailableStatus: false,
+  unsignedStatus: false,
+  withActiveTimetables: false,
+  withoutActiveTimetables: false,
+  junction: false,
+  nonJunction: false,
+  maxVmax: 200,
+  minVmax: 0,
+  onlineFromHours: 0,
+  minLevel: 0,
+  maxLevel: 20,
+  minOneWayCatenary: 0,
+  minOneWay: 0,
+  minTwoWayCatenary: 0,
+  minTwoWay: 0,
+  authors: ''
+};
+
+export const initSliders = [
+  { id: 'maxVmax', minRange: 0, maxRange: 200, step: 10 },
+  { id: 'minVmax', minRange: 0, maxRange: 200, step: 10 },
+  { id: 'minLevel', minRange: 0, maxRange: 20, step: 1 },
+  { id: 'maxLevel', minRange: 0, maxRange: 20, step: 1 },
+  { id: 'minOneWayCatenary', minRange: 0, maxRange: 5, step: 1 },
+  { id: 'minOneWay', minRange: 0, maxRange: 5, step: 1 },
+  { id: 'minTwoWayCatenary', minRange: 0, maxRange: 5, step: 1 },
+  { id: 'minTwoWay', minRange: 0, maxRange: 5, step: 1 }
+];
+
+export type StationFilter = keyof typeof initFilters;
+export type StationFilterSection = (typeof sections)[number];
+
+export const filtersSections: Record<StationFilterSection, StationFilter[]> = {
+  status: ['free', 'occupied', 'endingStatus', 'afkStatus', 'noSpaceStatus', 'unavailableStatus'],
+  timetables: ['withActiveTimetables', 'withoutActiveTimetables'],
+  reality: ['real', 'fictional'],
+  packageAccess: ['default', 'notDefault'],
+  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'],
+  blockades: ['SBL', 'PBL'],
+  signals: ['modern', 'semaphores', 'mixed', 'historical']
+};
+
+export function setupFilters(currentFilters: Record<string, any>) {
+  if (!StorageManager.isRegistered('options_saved')) return;
+
+  Object.keys(currentFilters).forEach((filterKey) => {
+    const savedValue = StorageManager.getValue(filterKey);
+
+    if (savedValue != null) {
+      if (typeof currentFilters[filterKey] == 'boolean')
+        currentFilters[filterKey] = savedValue === 'true';
+      else if (typeof currentFilters[filterKey] == 'number')
+        currentFilters[filterKey] = Number(savedValue);
+      else currentFilters[filterKey] = savedValue.toString();
+    }
+  });
+}
+
+export function getChangedFilters(currentFilters: Record<string, any>): string[] {
+  return (
+    Object.keys(currentFilters).filter(
+      (filterKey) =>
+        currentFilters[filterKey] !== initFilters[filterKey as keyof typeof initFilters]
+    ) ?? []
+  );
+}
@@ -34,6 +34,10 @@ export default class StorageManager {
    window.localStorage.removeItem(key);
  }

+  static getValue(key: string) {
+    return window.localStorage.getItem(key);
+  }
+
  static getBooleanValue(key: string): boolean {
    return window.localStorage.getItem(key) === 'true' ? true : false;
  }
@@ -1,7 +1,5 @@
-import { TrainFilter } from '../interfaces/Trains/TrainFilter';
-import { TrainFilterType } from '../enums/TrainFilterType';
-import Train from '../interfaces/Train';
-import TrainStop from '../interfaces/TrainStop';
+import { TrainFilter, TrainFilterId } from '../components/TrainsView/typings';
+import { Train, TrainStop } from '../typings/common';

 function confirmedPercentage(stops: TrainStop[] | undefined) {
  if (!stops) return -1;
@@ -32,34 +30,34 @@ function filterTrainList(
      if (f.isActive) return true;

      switch (f.id) {
-        case TrainFilterType.noTimetable:
+        case TrainFilterId.noTimetable:
          return train.timetableData;

-        case TrainFilterType.withTimetable:
+        case TrainFilterId.withTimetable:
          return !train.timetableData;

-        case TrainFilterType.withComments:
+        case TrainFilterId.withComments:
          return !train.timetableData?.followingStops.some((stop) => stop.comments);

-        case TrainFilterType.noComments:
+        case TrainFilterId.noComments:
          return train.timetableData?.followingStops.some((stop) => stop.comments);

-        case TrainFilterType.twr:
+        case TrainFilterId.twr:
          return !train.timetableData?.TWR;

-        case TrainFilterType.skr:
+        case TrainFilterId.skr:
          return !train.timetableData?.SKR;

-        case TrainFilterType.common:
+        case TrainFilterId.common:
          return train.timetableData?.SKR || train.timetableData?.TWR;

-        case TrainFilterType.passenger:
+        case TrainFilterId.passenger:
          return !/^[AMRE]\D{2}$/.test(train.timetableData?.category || '');

-        case TrainFilterType.freight:
+        case TrainFilterId.freight:
          return !train.timetableData?.category.startsWith('T');

-        case TrainFilterType.other:
+        case TrainFilterId.other:
          return !/^[PXZL]\D{2}$/.test(train.timetableData?.category || '');

        default:
@@ -72,7 +70,6 @@ function filterTrainList(
      (searchedDriver.length > 0
        ? train.driverName.toLowerCase().startsWith(searchedDriver.toLowerCase())
        : true) &&
-      (!train.timetableData ? train.online : train.timetableData) &&
      isFiltered
    );
  });
@@ -1,29 +0,0 @@
-import { defineComponent } from 'vue';
-
-export default defineComponent({
-  data: () => ({
-    observer: null as IntersectionObserver | null,
-    observerTarget: null as Element | null
-  }),
-
-  methods: {
-    mountObserver(actionFunction: () => void, target: Element) {
-      this.observer = new IntersectionObserver(
-        (entries) => {
-          console.log(entries);
-
-          if (entries[0].intersectionRatio > 0.5) actionFunction();
-        },
-        { threshold: 0.2 }
-      );
-
-      this.observer.observe(target);
-    },
-
-    unmountObserver() {
-      if (!this.observerTarget) return;
-
-      this.observer?.unobserve(this.observerTarget);
-    }
-  }
-});
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Spythere	44df685606	Merge pull request #92 from Spythere/development v1.24.4	2024-05-30 14:38:04 +02:00
Spythere	785a42b849	hotfix: detecting user timetable status at checkpoints	2024-05-30 14:29:09 +02:00
Spythere	ccfcca8728	hotfix: scenery timetable duplicating	2024-05-30 14:24:18 +02:00
Spythere	d9a7ba122c	Merge pull request #91 from Spythere/development v1.24.3	2024-05-26 01:44:45 +02:00
Spythere	bf8d4a9ef4	chore: global font sizing; chore: train modal dvh	2024-05-25 18:06:01 +02:00
Spythere	6ea1e91d1d	hotfix: card positioning	2024-05-25 17:57:25 +02:00
Spythere	813b557455	chore: improved card positioning	2024-05-25 17:55:18 +02:00
Spythere	834b14da69	fix: card dvh	2024-05-25 17:26:27 +02:00
Spythere	c809b2146d	chore: locale update	2024-05-25 17:12:19 +02:00
Spythere	33b98ca313	chore: added text color for active filters info	2024-05-25 17:11:28 +02:00
Spythere	bcb9c63cb0	chore: reactive hiding body scroll on modal	2024-05-25 17:05:41 +02:00
Spythere	17d77a80d8	bump: 1.24.3	2024-05-25 16:02:40 +02:00
Spythere	65b159f8fd	fix: scenery timetable duplicates; fix: not opening train modal for queries	2024-05-25 16:02:20 +02:00
Spythere	063d5283e4	Merge pull request #90 from Spythere/development v1.24.2	2024-05-24 13:56:39 +02:00
Spythere	29de1b3c4b	chore: scenery view layout	2024-05-24 13:52:42 +02:00
Spythere	f0c02bf12e	chore: pwa adjustments	2024-05-24 13:43:29 +02:00
Spythere	8aa23468b3	chore: changed station stats median to avg	2024-05-23 15:53:18 +02:00
Spythere	4c1fcf710b	refactor: global modals to cards	2024-05-23 15:01:30 +02:00
Spythere	a529d6e9eb	chore: changed no stations message	2024-05-23 14:08:42 +02:00
Spythere	9fc602e08f	chore: filters improvements	2024-05-22 15:41:33 +02:00
Spythere	56e40bd84b	bump: version (1.24.2)	2024-05-21 16:17:41 +02:00
Spythere	a5b5df7452	refactor: restructured station filters	2024-05-21 16:17:23 +02:00
Spythere	1a8da02ced	chore: checkpoints detection fix	2024-05-19 23:42:06 +02:00
Spythere	7e75fa2516	chore: checkpoints hotfix	2024-05-19 23:12:07 +02:00
Spythere	3ed2c09184	chore: checkpoints filtering	2024-05-19 23:05:57 +02:00
Spythere	6901c3d2b4	chore: hotfix	2024-05-19 22:30:21 +02:00
Spythere	8417754403	refactor: optimization of train schedules	2024-05-19 19:50:01 +02:00
Spythere	de5c57181a	Merge pull request #89 from Spythere/development v1.24.1	2024-05-16 23:43:39 +02:00
Spythere	d91d4cc6a8	fix: station stats spawn count regions	2024-05-16 23:42:35 +02:00
Spythere	9a5fd4d670	chore: version bump	2024-05-16 23:29:56 +02:00
Spythere	4202a55673	chore: updated pwa strategies	2024-05-16 21:36:16 +02:00
Spythere	5181e8f4af	chore: fix journal refresh date visibility	2024-05-16 20:06:02 +02:00
Spythere	e117f62fcb	chore: added station filters (scenery types); pwa adjustments	2024-05-16 19:59:43 +02:00
Spythere	e0036bf969	chore: filters & stats fixes	2024-05-15 18:40:42 +02:00
Spythere	1f457d6389	Merge pull request #88 from Spythere/development hotfix: minor adjustments for new simulator version (2024.1.1)	2024-05-13 15:05:28 +02:00
Spythere	eb5b94c9f6	chore: vehicle images hotfixes	2024-05-13 15:02:15 +02:00
Spythere	328e8c0573	chore: fixed stock fallback thumbnnail	2024-05-13 14:54:21 +02:00
Spythere	9f58ae5428	Merge pull request #87 from Spythere/development hotfix: modal positioning	2024-05-12 15:23:30 +02:00
Spythere	ebd0eeb8c4	hotfix: modal positioning	2024-05-12 15:22:03 +02:00
Spythere	fa656c2f26	Merge pull request #86 from Spythere/development v1.24.0	2024-05-12 15:14:22 +02:00
Spythere	0cc3a12d1d	fix: modal responsiveness	2024-05-12 14:55:35 +02:00
Spythere	392a6437f8	feature: current users tooltip	2024-05-09 17:19:22 +02:00
Spythere	122532f0ed	chore: general fixes	2024-05-09 16:40:53 +02:00
Spythere	366ff91f60	hotfix: update modal	2024-05-08 20:12:07 +02:00
Spythere	a0496736dd	chore: modals update	2024-05-08 20:04:41 +02:00
Spythere	f974120e87	fix: lock files	2024-05-08 18:42:33 +02:00
Spythere	abd8b8178b	chore: vue deep selector	2024-05-08 16:42:04 +02:00
Spythere	f1fcde8459	feat: update modal	2024-05-08 16:41:14 +02:00
Spythere	b3289d6aab	chore: region dropdown fixes	2024-05-08 15:16:20 +02:00
Spythere	6481a4a3b0	chore: design improvements	2024-05-08 15:10:40 +02:00
Spythere	05dc268526	fix: spawns detection	2024-05-06 18:18:15 +02:00
Spythere	669acc98d2	chore: station stats translation	2024-05-06 18:16:30 +02:00
Spythere	3371b661c2	fix: ufactor calc	2024-05-06 17:53:07 +02:00
Spythere	871b2c0221	feature: open spawns tooltip	2024-05-06 17:36:23 +02:00
Spythere	d366a877a4	refactor: popups -> tooltips	2024-05-06 16:37:56 +02:00
Spythere	405aab96bd	feature: stations stats	2024-05-05 13:34:43 +02:00
Spythere	f29c160000	fix: lock files	2024-05-04 14:47:30 +02:00
Spythere	a2de0e2030	refactor: types & performance	2024-05-04 14:43:34 +02:00
Spythere	7dd1c06f3f	chore: accessibility of filters	2024-05-03 19:29:10 +02:00
Spythere	ff041b9aaf	bump(version): 1.24.0	2024-05-03 19:02:49 +02:00
Spythere	4782dba444	feat(app): added min route speed & max route speed station filters	2024-05-03 19:02:16 +02:00
Spythere	d6b8d032d6	fix(app): improved data fetching scheduler	2024-05-03 19:02:13 +02:00
Spythere	c16616330c	chore(packages): update & cleanup	2024-05-03 18:01:54 +02:00
Spythere	57cec8bfe7	chore: pwa adjustments	2024-05-03 17:49:54 +02:00
Spythere	6bea340e19	chore(pwa): changed sceneries cache to cachefirst	2024-05-01 19:37:51 +02:00
Spythere	c181cf7e64	fix(workflows): release color	2024-04-27 01:11:38 +02:00
Spythere	8e4ae64cd3	chore(workflows): added release discord webhook notification	2024-04-15 15:13:22 +02:00
Spythere	5750490f01	refactor: journals	2024-04-08 23:21:50 +02:00
Spythere	3ef27e1d69	Merge pull request #85 from Spythere/development Wersja 1.23.1	2024-04-01 13:00:28 +02:00
Spythere	f53993c717	hotfix	2024-03-31 21:55:33 +02:00
Spythere	235c16e30f	train modal	2024-03-31 21:37:14 +02:00
Spythere	c3533f07ad	literówka	2024-03-30 17:48:34 +01:00
Spythere	d05579c5ee	popupy	2024-03-30 13:24:39 +01:00
Spythere	c8f53c2f06	hotfixy designu	2024-03-30 00:18:54 +01:00
Spythere	b44f88ebcd	src miniaturek	2024-03-29 23:37:26 +01:00
Spythere	7805d1350c	responsywność	2024-03-29 23:35:56 +01:00
Spythere	b17bd19433	zmiana położenia przycisku RJ ONLINE w dzienniku	2024-03-29 23:23:14 +01:00
Spythere	c12a6cbacd	zmiana rozłożenia elementów w modalu aktywnego pociągu	2024-03-29 23:21:15 +01:00
Spythere	ba650238db	poprawki rozmieszczenia popupu	2024-03-29 23:04:08 +01:00
Spythere	d5ec9919e2	update modal (wip)	2024-03-29 20:34:56 +01:00
Spythere	20cd393e05	Merge pull request #84 from Spythere/development Wersja 1.23.0	2024-03-24 01:30:03 +01:00
Spythere	31e65c09d6	hotfix: podgląd pojazdów	2024-03-24 00:05:39 +01:00
Spythere	fb2348e774	hotfixy designu	2024-03-23 23:55:18 +01:00
Spythere	1ec75bda70	poprawki do popupów	2024-03-23 16:47:57 +01:00
Spythere	6b6b837dde	bump: v1.23.0	2024-03-23 00:01:15 +01:00
Spythere	66a02d76bd	dodano odnośnik do dziennika RJ maszynisty	2024-03-23 00:00:52 +01:00
Spythere	c7162dbd14	dodano dymki kontekstowe oraz podgląd pojazdu	2024-03-22 23:41:43 +01:00
Spythere	1cfe073bab	Merge pull request #83 from Spythere/development Wersja 1.22.3	2024-03-17 18:38:27 +01:00
Spythere	e3b72c81ea	bump: 1.22.3	2024-03-17 18:37:58 +01:00
Spythere	5552995564	fix: duplikujące się aktywne RJ scenerii	2024-03-17 18:37:45 +01:00
Spythere	623d5dd2ce	fix: RJ scenerii offline	2024-03-17 17:33:19 +01:00
Spythere	6992b998a8	Merge pull request #82 from Spythere/development Wersja 1.22.2	2024-03-17 16:47:52 +01:00
Spythere	669975c68e	hotfixy	2024-03-17 16:42:35 +01:00
Spythere	084823de44	fix pobierania danych	2024-03-16 22:13:38 +01:00
Spythere	f62d6982e5	Merge pull request #81 from Spythere/development Wersja 1.22.1	2024-03-12 16:51:26 +01:00
Spythere	1c9b54b578	bump: 1.22.1	2024-03-11 23:50:00 +01:00
Spythere	0f4e5ee5f3	fix: niepoprawne miniaturki pojazdów	2024-03-11 23:49:45 +01:00
Spythere	29b5e715fa	hotfixy wyglądu	2024-03-11 23:43:10 +01:00
Spythere	91a18b51a0	Merge pull request #80 from Spythere/development Wersja 1.22.0	2024-03-06 22:49:46 +01:00
Spythere	241648ec49	asdek: filtry	2024-03-06 18:33:30 +01:00
Spythere	ed7d93e7fc	fixy filtrowania; ogólne	2024-03-06 18:12:20 +01:00
Spythere	436e3e63f9	hotfixy	2024-03-05 15:27:42 +01:00
Spythere	17ebdace82	fix filtrowania ocenami	2024-03-04 21:13:12 +01:00
Spythere	20826d905d	poprawki tłumaczeń	2024-03-04 21:10:43 +01:00
Spythere	41b1ab398c	bump: 1.22.0	2024-03-04 20:32:05 +01:00
Spythere	03465a1487	poprawki	2024-03-04 20:31:54 +01:00
Spythere	a19fdbc19d	hotfix	2024-03-04 18:18:37 +01:00
Spythere	032f82acd2	animacje statusów listy scenerii; fixy tłumaczeń	2024-03-04 18:06:47 +01:00
Spythere	b4a9d4ca3b	brakujące tłumaczenia	2024-03-04 17:50:45 +01:00
Spythere	986c7ba95e	asdek	2024-03-04 17:46:09 +01:00
Spythere	17f6f9c8ef	poprawki designu scenerii	2024-03-03 22:17:15 +01:00
Spythere	40bbdbe4fa	sortowanie po liczbie szlaków i ocenie dyżurnego	2024-03-03 21:44:39 +01:00
Spythere	9f5d882119	poprawki tabelki scenerii	2024-03-03 20:30:05 +01:00
Spythere	6f45663c6c	design stock listy	2024-03-03 19:04:17 +01:00
Spythere	a7861b361d	design statystyk pociągu	2024-03-03 15:10:29 +01:00
Spythere	5f8d7480d1	fix designu	2024-03-03 14:46:37 +01:00
Spythere	e222dc63eb	scroller sponsorów projektu w modalu	2024-03-03 14:31:04 +01:00
Spythere	9c2f0ac797	bump: 1.21.1	2024-03-02 23:21:13 +01:00
Spythere	e33ba4af90	design szlaków na liście scenerii	2024-03-02 23:16:17 +01:00
Spythere	7b868a9f28	brakujące tłumaczenia	2024-03-02 22:38:53 +01:00
Spythere	2a18ba4368	poprawki szerokości	2024-03-02 22:19:41 +01:00
Spythere	fcbd6d0883	migracja http clienta do apiStore	2024-03-02 16:13:33 +01:00
Spythere	20fc4aba5b	padding scrollbaru	2024-03-01 19:12:23 +01:00
Spythere	76ca0d1786	cleanup kodu	2024-03-01 19:07:21 +01:00
Spythere	7e3c150815	usprawnienia miniaturek pojazdów	2024-03-01 19:07:00 +01:00
Spythere	c8d56ec442	vite config dev	2024-02-29 13:31:48 +01:00
Spythere	5c4c486643	Wersja 1.21.0 Wersja 1.21.0	2024-02-12 15:14:50 +01:00
Spythere	755c729a9b	brakujące tłumaczenia; poprawki	2024-02-12 14:58:59 +01:00
Spythere	3ac8d60c5c	filtry aktywnych RJ	2024-02-11 15:30:19 +01:00
Spythere	dcff3b088f	poprawki filtrowania statusów	2024-02-10 23:11:13 +01:00
Spythere	90b2099955	checkpointy; hotfixy	2024-02-10 22:42:35 +01:00
Spythere	fc0c04ec9d	bump: 1.21.0	2024-02-10 01:31:08 +01:00
Spythere	41b335555a	wyświetlanie RJ dla scenerii offline	2024-02-10 01:30:43 +01:00
Spythere	60f7b3bbb5	Wersja 1.20.5 Wersja 1.20.5	2024-02-03 14:36:57 +01:00
Spythere	eaefe955a7	bump: 1.20.5	2024-02-02 21:14:29 +01:00
Spythere	edaa4f2684	cleanup	2024-02-02 21:14:16 +01:00
Spythere	30fce3787b	usprawnienia pobierania danych; statusy SWDR na semaforze	2024-02-02 21:13:21 +01:00
Spythere	4716f1c7a4	Wersja 1.20.4 Wersja 1.20.4	2024-01-30 16:44:55 +01:00
Spythere	bb7ccf98fd	bump wersji	2024-01-30 16:41:27 +01:00
Spythere	c06d75b981	lock fix; linting	2024-01-30 14:00:38 +01:00
Spythere	c7da8477fa	przywrócenie komunikacji po WS (test)	2024-01-30 13:58:47 +01:00
Spythere	e43f1e0819	Wersja 1.20.3 Wersja 1.20.3	2024-01-26 13:59:23 +01:00
Spythere	f130e6900b	hotfix: brak komentarzy dla ostatniej stacji w RJ	2024-01-26 13:54:47 +01:00
Spythere	db205915be	bump wersji	2024-01-26 13:39:04 +01:00
Spythere	05c38e10e3	hotfix postojów pt w SRJP	2024-01-26 13:38:45 +01:00
Spythere	a8f683a585	mock data	2024-01-26 13:38:28 +01:00
Spythere	68f6fc8a42	Wersja 1.20.2 Wersja 1.20.2	2024-01-24 20:37:35 +01:00
Spythere	6d3b32cd7d	bump: 1.20.2	2024-01-24 20:35:49 +01:00
Spythere	fadecc9d2c	fix literówki w tłumaczeniu	2024-01-24 20:35:15 +01:00
Spythere	50602cb6db	Merge pull request #74 from Spythere/development - rozbudowany szczegółówy RJ pociągu - hotfixy do pobierania danych z API	2024-01-13 17:54:17 +01:00
Spythere	186ce81819	hotfix: filtrowanie aktywnych rj do odpowiednich regionów	2024-01-13 17:28:16 +01:00
Spythere	f836a075b0	hotfix: pobieranie historii RJ nieznanych scenerii	2024-01-13 15:41:40 +01:00
Spythere	9acf3c740c	dodano wybór z listy autorów w filtrach	2024-01-06 17:40:43 +01:00
Spythere	bc1c1bd3d2	filtrowanie ukrytych szlaków	2024-01-06 14:47:20 +01:00
Spythere	2348277b95	poprawki do SRJP	2024-01-06 14:10:59 +01:00
Spythere	cd5f489df7	bump wersji: 1.20.1	2024-01-06 14:06:50 +01:00
Spythere	f74962222b	przywrócenie SRJP bez pokazywania dod. informacji	2024-01-06 14:05:40 +01:00
Spythere	e7f651d2b9	poprawki ułożenia elementów progress bara SRJP, elektryfikacja szlaku	2024-01-02 15:44:48 +01:00
Spythere	4862328090	rozbudowany szczegółówy RJ pociągu	2024-01-01 22:49:19 +01:00
Spythere	87631d1f74	Merge pull request #73 from Spythere/development Wersja 1.20	2023-12-23 14:08:08 +01:00
Spythere	86bb9fcc2e	hotfix redirectu do zakładki dziennika	2023-12-22 16:39:42 +01:00
Spythere	b85e3bfe1d	ukryto ikonę pragotronu	2023-12-22 16:16:19 +01:00
Spythere	dd15072813	linting	2023-12-22 16:13:45 +01:00
Spythere	2f8376c996	dodane nowe statystyki dnia; poprawki bugów	2023-12-22 15:46:47 +01:00
Spythere	514723cf74	poprawki typów; ułożenie elementów w karcie filtrów scenerii	2023-12-21 22:16:03 +01:00
Spythere	0995ce15bc	poprawki filtrów dziennia DR	2023-12-21 22:11:06 +01:00
Spythere	3b3c3bda31	poprawki wskaźników ładowania	2023-12-21 19:53:34 +01:00
Spythere	2027b85450	lokalne fonty; poprawki offline i cachingu pwa	2023-12-21 19:27:27 +01:00
Spythere	0c6b55146f	bump: 1.20.0	2023-12-20 23:56:18 +01:00
Spythere	3c728e3cfa	poprawki requestów statystyk; organizacja kodu	2023-12-20 23:55:42 +01:00
Spythere	adce339392	statystyki dr (c.d.) + tłumaczenia	2023-12-19 22:11:17 +01:00
Spythere	00a4a840b0	statystyki DR	2023-12-18 16:00:18 +01:00
Spythere	1e705ea496	filtry URL dziennika DR	2023-12-17 19:51:52 +01:00
Spythere	e8ed36df16	reaktywne filtry URL w dzienniku RJ	2023-12-17 16:10:13 +01:00
Spythere	f4be32aa39	Statystyki DR (wip)	2023-12-16 17:49:54 +01:00
Spythere	e0d3d2585d	zmiana wyglądu statystyk dzienników	2023-12-14 18:42:13 +01:00
Spythere	ebfaf06a44	Merge pull request #72 from Spythere/development Wersja 1.19.4	2023-12-11 13:02:05 +01:00
Spythere	5a651aedf8	imports hotfix	2023-12-11 12:58:41 +01:00
Spythere	b66af014b9	lock sync	2023-12-10 15:29:29 +01:00
Spythere	634c9e1514	bump wersji: 1.19.4	2023-12-10 15:23:54 +01:00
Spythere	c4132a9be2	cleanup http c.d.	2023-12-10 15:23:27 +01:00
Spythere	82a9a9165f	cleanup http	2023-12-10 15:22:33 +01:00
Spythere	fcac03c0a4	Merge pull request #71 from Spythere/development Wersja 1.19.3	2023-12-10 00:56:21 +01:00
Spythere	39c3cf2329	restrukturyzacja storów	2023-12-09 16:18:23 +01:00
Spythere	59f4a0cb66	zmniejszenie czasu odpytywania z serwera	2023-12-08 20:00:17 +01:00
Spythere	e2b42d16a4	poprawki scrollBehavior	2023-12-08 18:55:06 +01:00
Spythere	e23663ed28	fix: brak ładowania danych o historii scenerii przy bezpośrednim wejściu z poz. URL	2023-12-08 18:15:49 +01:00
Spythere	dc7846c31e	bump wersji: 1.19.3	2023-12-08 17:15:16 +01:00
Spythere	d875433d56	ulepszone zapamiętywanie zakładek statystyk w dzienniku	2023-12-08 17:14:49 +01:00
Spythere	71e5044cb4	poprawki designu dziennika RJ	2023-12-08 16:20:17 +01:00
Spythere	e83aa40f82	aktualizacja endpointu API statystyk	2023-12-08 16:16:14 +01:00
Spythere	d1c0e0b898	Merge pull request #70 from Spythere/development Wersja 1.19.2	2023-12-07 16:29:53 +01:00
Spythere	26a7c69886	bump: 1.19.2	2023-12-07 16:18:21 +01:00
Spythere	0dc2c505db	poprawki do braku pokazywania się niezapisanych scenerii	2023-12-07 16:16:06 +01:00
Spythere	188857d335	fix: rozkłady jazdy pokazują się na innych serwerach	2023-12-06 20:29:28 +01:00
Spythere	3dbbb3b4f9	Merge pull request #69 from Spythere/development Wersja 1.19.1	2023-12-02 23:04:55 +01:00
Spythere	07a77c463b	bump 1.19.1	2023-12-02 23:04:24 +01:00
Spythere	1a8e2231dd	przejście z WS na komunikację http	2023-12-02 23:02:08 +01:00
Spythere	f630d272ca	Merge pull request #68 from Spythere/development Wersja 1.19.0	2023-12-02 18:31:58 +01:00
Spythere	a381cf806c	wyróżnienie nicku donatora w widoku scenerii	2023-12-02 18:15:52 +01:00
Spythere	0023ab8cfd	tłumaczenia; poprawki dropdown	2023-12-02 18:01:01 +01:00
Spythere	a392940d52	tłumaczenia	2023-12-02 16:15:37 +01:00
Spythere	74984ad653	dodano wyróżnienie nicku wspierającego w Dzienniku	2023-12-02 16:11:29 +01:00
Spythere	a8991434bc	tłumaczenia statystyk pociągów	2023-12-02 16:00:28 +01:00
Spythere	825610b4c2	hotfix; aktualizacja paczek	2023-12-01 21:40:04 +01:00
Spythere	fef3991206	bump: 1.19.0	2023-12-01 21:27:13 +01:00
Spythere	a21cb31a0a	ikona przy informacji offline pociągu	2023-12-01 21:26:57 +01:00
Spythere	23a954a0d1	statystyki ruchu online	2023-12-01 21:19:04 +01:00
Spythere	b7bc9625b8	dodatkowe opcje darowizny	2023-12-01 16:11:56 +01:00
Spythere	bc58196804	cleanup	2023-12-01 14:55:13 +01:00
Spythere	6550d6973e	zmiana API do pobierania informacji o wspierających	2023-12-01 14:54:55 +01:00
Spythere	d7a609a4f2	Merge pull request #67 from Spythere/development poprawki tłumaczeń; scrolling	2023-11-28 19:12:57 +01:00
Spythere	763506d5a9	bump: 1.18.6	2023-11-28 19:10:08 +01:00
Spythere	8dbb32b821	dodatkowe tłumaczenia	2023-11-28 19:09:14 +01:00
Spythere	b8a21e0f70	Merge pull request #66 from Spythere/development hotfix: scrollowanie tabelki scenerii	2023-11-28 18:58:27 +01:00
Spythere	7c2b5fbd50	hotfix scrollowania	2023-11-28 18:56:02 +01:00
Spythere	ac740c2743	Merge pull request #65 from Spythere/development feature: darowizny + poprawki (wersja 1.18.5)	2023-11-28 18:44:44 +01:00
Spythere	916f19df72	poprawki tłumaczenia en	2023-11-28 18:38:42 +01:00
Spythere	de8facfb05	bump: 1.18.5	2023-11-28 18:36:37 +01:00
Spythere	5d5ad44508	wielkość czcionki	2023-11-28 18:35:41 +01:00
Spythere	647055d2f0	ikona donatora w zakładce Pociągi; poprawki tłumaczeń	2023-11-28 18:33:40 +01:00
Spythere	1947555724	poprawki responsywności	2023-11-28 17:56:08 +01:00
Spythere	86417f3422	lock sync	2023-11-26 19:50:04 +01:00
Spythere	a224b58d17	feature: modal darowizn	2023-11-26 19:49:32 +01:00
Spythere	69be01fb1e	Merge pull request #64 - 1.18.4 fix poprawki do 1.18.4	2023-11-17 16:55:09 +01:00
Spythere	6ef04f0dbd	fix sortowania statusów dr; linting	2023-11-17 16:52:53 +01:00
Spythere	451d90f854	bump: 1.18.4	2023-11-15 21:09:30 +01:00
Spythere	b01d3e894b	Merge pull request #63 from Spythere/development hotfix: statusy dr	2023-11-15 21:07:28 +01:00
Spythere	13dc6a0e32	hotfix: statusy dr	2023-11-15 21:06:16 +01:00
Spythere	96714550d0	Merge pull request #62 - Wersja 1.18.3 Wersja 1.18.3	2023-11-15 02:13:54 +01:00
Spythere	2b6c751f55	hotifx toString	2023-11-13 15:57:01 +01:00
Spythere	08d3a2a03a	feature: nawigacja URL w widoku scenerii	2023-11-13 15:32:02 +01:00
Spythere	a79ca78781	poprawki animacji statusów danych & tryb offline	2023-11-13 14:59:17 +01:00
Spythere	e08333dba1	fix: tłumaczenie statusów dr	2023-11-12 16:40:25 +01:00
Spythere	8705dd1df5	fix filtrowania RJ na posterunkach; favicons index	2023-11-12 15:47:55 +01:00
Spythere	7b4da9d422	poprawki layoutu aplikacji	2023-11-10 16:18:06 +01:00
Spythere	e51b2fe2f3	poprawki filtrów poc.	2023-11-10 15:39:49 +01:00
Spythere	f8b4ce103f	refactor typów danych	2023-11-10 15:04:49 +01:00
Spythere	e82b4b8817	bump 1.18.3	2023-11-08 22:04:11 +01:00
Spythere	36e9df82b0	hotfixy	2023-11-08 22:03:45 +01:00
Spythere	cbce9af00b	nowe pobieranie i przetwarzanie statusów dyżurnych	2023-11-07 20:16:58 +01:00
Spythere	4a4304d65f	Merge pull request #61 - Wersja 1.18.2 Wersja 1.18.2	2023-11-04 17:03:51 +01:00
Spythere	edad5306f2	bump: 1.18.2	2023-11-04 17:01:01 +01:00
Spythere	5b775dfec9	fix: filtry RJ	2023-11-04 17:00:50 +01:00
Spythere	a485652ca5	Merge pull request #60 (hotfix) hotfix: maksymalny timeout dyżurnych (1.18.1)	2023-11-02 22:44:48 +01:00
Spythere	ed308246d7	hotfix: maksymalny timeout dyżurnych	2023-11-02 22:42:28 +01:00
				`@@ -1 +0,0 @@`
				<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="white" width="18px" height="18px"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1.41 16.09V20h-2.67v-1.93c-1.71-.36-3.16-1.46-3.27-3.4h1.96c.1 1.05.82 1.87 2.65 1.87 1.96 0 2.4-.98 2.4-1.59 0-.83-.44-1.61-2.67-2.14-2.48-.6-4.18-1.62-4.18-3.67 0-1.72 1.39-2.84 3.11-3.21V4h2.67v1.95c1.86.45 2.79 1.86 2.85 3.39H14.3c-.05-1.11-.64-1.87-2.22-1.87-1.5 0-2.4.68-2.4 1.64 0 .84.65 1.39 2.67 1.91s4.18 1.39 4.18 3.91c-.01 1.83-1.38 2.83-3.12 3.16z"/></svg>