Merge pull request #22 from Spythere/development

Wersja 1.8.3
speed disclaimer
2026-05-03 11:45:34 +00:00 · 2024-04-03 21:47:55 +02:00 · 2024-04-03 21:43:37 +02:00 · 2024-03-27 16:21:56 +01:00 · 2024-03-27 16:13:33 +01:00 · 2024-03-27 16:10:53 +01:00
82 changed files with 10873 additions and 13596 deletions
@@ -0,0 +1,13 @@
 /* eslint-env node */
 require('@rushstack/eslint-patch/modern-module-resolution');
 module.exports = {
  root: true,
  extends: ['plugin:vue/vue3-essential', 'eslint:recommended', '@vue/eslint-config-typescript', '@vue/eslint-config-prettier/skip-formatting'],
  rules: {
    'vue/multi-word-component-names': 'off',
  },
  parserOptions: {
    ecmaVersion: 'latest',
  },
 };
@@ -1,20 +0,0 @@
 module.exports = {
  root: true,
  env: {
    node: true,
  },
  extends: [
    "plugin:vue/vue3-essential",
    "eslint:recommended",
    "@vue/typescript/recommended",
    "@vue/prettier",
    "@vue/prettier/@typescript-eslint",
  ],
  parserOptions: {
    ecmaVersion: 2020,
  },
  rules: {
    "no-console": process.env.NODE_ENV === "production" ? "warn" : "off",
    "no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off",
  },
 };
@@ -25,4 +25,7 @@ pnpm-debug.log*
 node_modules
 # Dev files
-stockInfoDev.json
+stockInfoDev.json
 # Lock files
 yarn.lock
@@ -0,0 +1,6 @@
 {
  "semi": true,
  "singleQuote": true,
  "trailingComma": "es5",
  "printWidth": 100
 }
@@ -1,3 +0,0 @@
 module.exports = {
  presets: ["@vue/cli-plugin-babel/preset"],
 };
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
  <head>
    <meta charset="utf-8" />
@@ -8,22 +8,20 @@
    <title>Pojazdownik</title>
    <meta name="description" content="Edytor pociągów online do symulatora Train Driver 2" />
-    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
+    <link rel="icon" href="/favicon.ico" sizes="any" />
-    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
+    <link rel="icon" href="/favicon.svg" type="image/svg+xml" />
-    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
+    <link rel="apple-touch-icon" href="/apple-touch-icon-180x180.png" />
    <link rel="manifest" href="/site.webmanifest" />
    <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5" />
    <link rel="manifest" href="/site.webmanifest" />
    <meta name="msapplication-TileColor" content="#da532c" />
-    <meta name="theme-color" content="#e4c428" />
+    <meta name="theme-color" content="#111" />
  </head>
  <body>
    <noscript>
-      <strong>
+      <strong> We're sorry but Pojazdownik doesn't work properly without JavaScript enabled. Please enable it to continue. </strong>
        We're sorry but Pojazdownik doesn't work properly without JavaScript enabled. Please enable it to continue.
      </strong>
    </noscript>
    <div id="app"></div>
    <script type="module" src="/src/main.ts"></script>
  </body>
 </html>
@@ -1,22 +1,36 @@
 {
  "name": "pojazdownik",
-  "version": "1.5.0",
+  "version": "1.8.3",
  "private": true,
  "type": "module",
  "scripts": {
    "dev": "vite",
    "build": "vue-tsc --noEmit && vite build",
-    "preview": "yarn build && vite preview --port 4174"
+    "preview": "yarn build && vite preview --port 4174",
    "type-check": "vue-tsc --noEmit -p tsconfig.app.json --composite false",
    "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
    "format": "prettier --write src/"
  },
  "dependencies": {
    "axios": "^1.4.0",
    "pinia": "^2.0.17",
-    "vue": "^3.2.37"
+    "prettier": "^3.0.3",
    "vue": "^3.2.37",
    "vue-i18n": "9"
  },
  "devDependencies": {
-    "@vitejs/plugin-vue": "^4.1.0",
+    "@rushstack/eslint-patch": "^1.3.3",
    "@vite-pwa/assets-generator": "^0.2.3",
    "@vitejs/plugin-vue": "^5.0.3",
    "@vue/eslint-config-prettier": "^9.0.0",
    "@vue/eslint-config-typescript": "^12.0.0",
    "@vue/tsconfig": "^0.5.1",
    "eslint": "^8.49.0",
    "eslint-plugin-vue": "^9.17.0",
    "sass": "^1.59.3",
    "typescript": "^5.0.2",
-    "vite": "^4.2.1",
+    "vite": "^5.0.12",
-    "vite-plugin-pwa": "^0.14.6",
+    "vite-plugin-pwa": "^0.17.5",
    "vue-tsc": "^1.2.0"
  }
 }
@@ -0,0 +1,24 @@
 <svg width="500" height="500" viewBox="0 0 500 500" fill="none" xmlns="http://www.w3.org/2000/svg">
 <mask id="path-1-inside-1_102_63" fill="white">
 <path d="M0 250C0 111.929 111.929 6.10352e-05 250 6.10352e-05C388.071 6.10352e-05 500 111.929 500 250C500 388.071 388.071 500 250 500C111.929 500 0 388.071 0 250Z"/>
 </mask>
 <path d="M0 250C0 111.929 111.929 6.10352e-05 250 6.10352e-05C388.071 6.10352e-05 500 111.929 500 250C500 388.071 388.071 500 250 500C111.929 500 0 388.071 0 250Z" fill="#242424"/>
 <path d="M0 222.821C0 84.7503 111.929 -27.1785 250 -27.1785C388.071 -27.1785 500 84.7503 500 222.821V250C500 126.939 388.071 27.1787 250 27.1787C111.929 27.1787 0 126.939 0 250V222.821ZM500 277.179C500 415.25 388.071 527.179 250 527.179C111.929 527.179 0 415.25 0 277.179V250C0 373.061 111.929 472.821 250 472.821C388.071 472.821 500 373.061 500 250V277.179ZM0 500V6.10352e-05V500ZM500 6.10352e-05V500V6.10352e-05Z" fill="#FFD600" mask="url(#path-1-inside-1_102_63)"/>
 <path d="M210.369 301.604C210.369 301.604 210.369 341.807 210.369 364.846C210.369 387.885 202.798 417.491 171.591 417.491C140.385 417.491 132.813 417.491 132.813 417.491L132.812 78.125L250.754 78.125C274.312 78.125 294.504 80.9665 311.331 86.6494C328.311 92.1788 342.232 99.8585 353.093 109.689C364.107 119.519 372.214 131.115 377.415 144.478C382.616 157.84 385.217 172.278 385.217 187.791C385.217 204.533 382.54 219.892 377.186 233.869C371.832 247.846 363.648 259.827 352.634 269.81C341.62 279.794 327.623 287.627 310.643 293.31C293.816 298.839 273.853 301.604 250.754 301.604L210.369 301.604ZM210.369 242.854L250.754 242.854C270.946 242.854 285.479 238.016 294.351 228.34C303.224 218.663 307.66 205.147 307.66 187.791C307.66 180.111 306.512 173.123 304.218 166.825C301.923 160.528 298.405 155.152 293.663 150.698C289.074 146.09 283.184 142.558 275.995 140.1C268.958 137.643 260.544 136.414 250.754 136.414L210.369 136.414L210.369 242.854Z" fill="url(#paint0_linear_102_63)"/>
 <path d="M239.215 301.604C239.215 301.604 239.215 341.807 239.215 364.846C239.215 387.885 231.643 417.491 200.437 417.491C169.231 417.491 161.659 417.491 161.659 417.491L161.658 78.125L279.6 78.125C303.158 78.125 323.35 80.9665 340.177 86.6494C357.157 92.1788 371.077 99.8585 381.938 109.689C392.952 119.519 401.06 131.115 406.261 144.478C411.462 157.84 414.062 172.278 414.062 187.791C414.062 204.533 411.385 219.892 406.031 233.869C400.677 247.846 392.493 259.827 381.479 269.81C370.465 279.794 356.468 287.627 339.488 293.31C322.662 298.839 302.699 301.604 279.6 301.604L239.215 301.604ZM239.215 242.854L279.6 242.854C299.792 242.854 314.325 238.016 323.197 228.34C332.069 218.663 336.505 205.147 336.505 187.791C336.505 180.111 335.358 173.123 333.064 166.825C330.769 160.528 327.251 155.152 322.509 150.698C317.919 146.09 312.03 142.558 304.84 140.1C297.804 137.643 289.39 136.414 279.6 136.414L239.215 136.414L239.215 242.854Z" fill="url(#paint1_linear_102_63)"/>
 <path d="M210.685 301.604C210.685 301.604 210.685 341.807 210.685 364.846C210.685 387.885 203.082 417.491 171.749 417.491C140.416 417.491 132.813 417.491 132.813 417.491L132.812 78.125L251.233 78.125C274.887 78.125 295.161 80.9665 312.057 86.6494C329.105 92.1788 343.083 99.8585 353.988 109.689C365.046 119.519 373.187 131.115 378.409 144.478C383.631 157.84 386.242 172.278 386.242 187.791C386.242 204.533 383.555 219.892 378.179 233.869C372.803 247.846 364.586 259.827 353.527 269.81C342.468 279.794 328.414 287.627 311.365 293.31C294.47 298.839 274.426 301.604 251.233 301.604L210.685 301.604ZM210.685 242.854L251.233 242.854C271.508 242.854 286.099 238.016 295.008 228.34C303.916 218.663 308.37 205.147 308.37 187.791C308.37 180.111 307.218 173.123 304.914 166.825C302.611 160.528 299.078 155.152 294.316 150.698C289.709 146.09 283.795 142.558 276.576 140.1C269.511 137.643 261.063 136.414 251.233 136.414L210.685 136.414L210.685 242.854Z" fill="url(#paint2_radial_102_63)"/>
 <defs>
 <linearGradient id="paint0_linear_102_63" x1="259.015" y1="78.125" x2="259.015" y2="417.491" gradientUnits="userSpaceOnUse">
 <stop offset="0.135417" stop-color="#FFD600"/>
 <stop offset="1"/>
 </linearGradient>
 <linearGradient id="paint1_linear_102_63" x1="287.86" y1="78.125" x2="287.86" y2="417.491" gradientUnits="userSpaceOnUse">
 <stop offset="0.135417" stop-color="#FFD600"/>
 <stop offset="1"/>
 </linearGradient>
 <radialGradient id="paint2_radial_102_63" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(259.527 247.808) rotate(0.36307) scale(345.948 325.206)">
 <stop offset="0.484375" stop-color="white"/>
 <stop offset="1"/>
 </radialGradient>
 </defs>
 </svg>
@@ -0,0 +1 @@
 <svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 -960 960 960" fill="white" width="48"><path d="M314.696-195.478q-32.507 0-55.862-23.356-23.356-23.355-23.356-55.862v-549.826q0-32.74 23.356-56.262 23.355-23.522 55.862-23.522h429.826q32.74 0 56.262 23.522t23.522 56.262v549.826q0 32.507-23.522 55.862-23.522 23.356-56.262 23.356H314.696Zm0-79.218h429.826v-549.826H314.696v549.826ZM175.478-55.694q-32.74 0-56.262-23.522t-23.522-56.262v-629.044h79.784v629.044h509.044v79.784H175.478Zm139.218-219.002v-549.826 549.826Z"/></svg>
@@ -0,0 +1 @@
 <svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 -960 960 960" fill="white" width="48"><path d="M480-318.087 266.651-531.436l57.131-56.001 116.609 116.609v-343.868h79.218v343.868l116.609-116.609 57.131 56.001L480-318.087ZM225.087-145.869q-32.507 0-55.862-23.356-23.356-23.355-23.356-55.862v-143h79.218v143h509.826v-143h79.783v143q0 32.478-23.521 55.848-23.522 23.37-56.262 23.37H225.087Z"/></svg>
@@ -0,0 +1 @@
 <svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 -960 960 960" fill="white" width="48"><path d="M451-107.304q-128.652-10.565-216.892-105.522-88.239-94.956-88.239-225.609 0-78.13 35.5-147.543 35.5-69.413 99.5-114.674l56.566 56.565q-52.609 32.435-82.478 87.957-29.87 55.521-29.87 117.695 0 98.305 64.587 169.609T451-187.087v79.783Zm60 0v-79.783q98.304-11.435 161.609-82.239 63.304-70.804 63.304-169.109 0-103.913-70.978-177.434-70.978-73.522-174.891-76.913h-21.696l62.261 62.826-47.522 47.522-152.783-152.784 152.783-153.349 47.522 47.522-68.479 68.479h22.261q138.522 0 234.914 98.022 96.391 98.022 96.391 236.109 0 130.653-88.022 225.609Q639.652-117.869 511-107.304Z"/></svg>
@@ -0,0 +1 @@
 <svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 -960 960 960" fill="white" width="48"><path d="M575.913-143.782v-72.436h115.956l-173.26-172.825 51.043-51.479 175.261 172.695v-117.391h73v241.436h-242Zm-382.783 2.826L142.652-193l551.217-551.782H575.913v-72.436h242v241.436h-73v-116.391L193.13-140.956Zm198.479-378.522L142.652-768l51.478-52.044 250.088 248.522-52.609 52.044Z"/></svg>
@@ -0,0 +1 @@
 <svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 -960 960 960" fill="white" width="48"><path d="M440.391-318.087v-343.868L323.782-544.782l-57.131-56.566L480-814.696l213.349 213.348-57.131 56.566-116.609-117.173v343.868h-79.218ZM225.087-145.869q-32.507 0-55.862-23.356-23.356-23.355-23.356-55.862v-143h79.218v143h509.826v-143h79.783v143q0 32.478-23.521 55.848-23.522 23.37-56.262 23.37H225.087Z"/></svg>
@@ -5,15 +5,26 @@
  "description": "Generator składów online dla symulatora Train Driver 2",
  "icons": [
    {
-      "src": "/android-chrome-192x192.png",
+      "src": "pwa-64x64.png",
      "sizes": "64x64",
      "type": "image/png"
    },
    {
      "src": "pwa-192x192.png",
      "sizes": "192x192",
      "type": "image/png"
    },
    {
-      "src": "/android-chrome-512x512.png",
+      "src": "pwa-512x512.png",
      "sizes": "512x512",
      "type": "image/png",
-      "purpose": "any maskable"
+      "purpose": "any"
    },
    {
      "src": "maskable-icon-512x512.png",
      "sizes": "512x512",
      "type": "image/png",
      "purpose": "maskable"
    }
  ],
  "theme_color": "#2c3149",
@@ -5,19 +5,29 @@
  "description": "Generator składów online dla symulatora Train Driver 2",
  "icons": [
    {
-      "src": "/android-chrome-192x192.png",
+      "src": "pwa-64x64.png",
      "sizes": "64x64",
      "type": "image/png"
    },
    {
      "src": "pwa-192x192.png",
      "sizes": "192x192",
      "type": "image/png"
    },
    {
-      "src": "/android-chrome-512x512.png",
+      "src": "pwa-512x512.png",
      "sizes": "512x512",
      "type": "image/png",
-      "purpose": "any maskable"
+      "purpose": "any"
    },
    {
      "src": "maskable-icon-512x512.png",
      "sizes": "512x512",
      "type": "image/png",
      "purpose": "maskable"
    }
  ],
  "theme_color": "#2c3149",
  "background_color": "#2c3149",
  "display": "standalone"
 }
@@ -12,21 +12,17 @@ import AppContainerView from './views/AppContainerView.vue';
 import AppModals from './components/app/AppModals.vue';
 export default defineComponent({
  components: { ImageFullscreenPreview, AppContainerView, AppModals },
  data() {
    return {
      store: useStore(),
    };
  },
  async created() {
    /* dev info testing */
    // if (import.meta.env['VITE_STOCK_DEV'] == '1') {
    //   const data = await import('../stockInfoDev.json');
    //   this.store.stockData = data.default as any;
    // }
    this.store.fetchStockInfoData();
    this.store.handleRouting();
    this.store.setupAPIData();
  },
  components: { ImageFullscreenPreview, AppContainerView, AppModals },
 });
 </script>
@@ -39,31 +35,14 @@ export default defineComponent({
  color: $textColor;
  font-size: 1em;
-  padding: 1em 0.5em;
+  padding: 0;
 }
-/* HEADER SECTION */
+  @media screen and (max-width: $breakpointMd) {
 h2 {
  margin: 0;
  margin-bottom: 0.5em;
  color: $accentColor;
  font-weight: 700;
  font-size: 1.2em;
 }
 .header-bottom {
  margin: 0;
  font-size: 1.5em;
  color: #d1d1d1;
 }
@media screen and (max-width: $breakpointMd) {
  #app {
    font-size: calc(0.7rem + 0.75vw);
  }
  @media screen and (orientation: landscape) and (max-width: $breakpointMd) {
    font-size: calc(0.75rem + 0.4vw);
  }
 }
 </style>
@@ -1,24 +1,24 @@
-<template>
+<template>
-  <div>
+  <div>
-    <keep-alive>
+    <keep-alive>
-      <RealStockCard v-if="store.isRealStockListCardOpen" />
+      <RealStockCard v-if="store.isRealStockListCardOpen" />
-    </keep-alive>
+    </keep-alive>
-  </div>
+  </div>
-</template>
+</template>
-
+
-<script lang="ts">
+<script lang="ts">
-import { defineComponent } from 'vue';
+import { defineComponent } from 'vue';
-import { useStore } from '../../store';
+import { useStore } from '../../store';
-import RealStockCard from '../cards/RealStockCard.vue';
+import RealStockCard from '../cards/RealStockCard.vue';
-
+
-export default defineComponent({
+export default defineComponent({
-  components: { RealStockCard },
+  components: { RealStockCard },
-  data() {
+  data() {
-    return {
+    return {
-      store: useStore(),
+      store: useStore(),
-    };
+    };
-  },
+  },
-});
+});
-</script>
+</script>
-
+
-<style scoped></style>
+<style scoped></style>
@@ -1,52 +1,44 @@
-<template>
+<template>
-  <footer>
+  <footer>
-    <div class="text--grayed">
+    <i18n-t keypath="footer.disclaimer" tag="div" class="text--grayed">
-      Ta strona ma charakter informacyjny. Autor nie ponosi odpowiedzialności za tworzenie pociągów niezgodnych z
+      <template #tos>
-      <a
+        <a style="color: #ccc" :href="$t('footer.tos-href')" target="_blank">
-        style="color: #ccc"
+          {{ $t('footer.tos') }}
-        href="https://docs.google.com/document/d/1UAAPUtN0d_RoS4RgOzEzllJZJhA0VcizzCzKW4QylbY/edit"
+        </a>
-        target="_blank"
+      </template>
-      >
+    </i18n-t>
-        regulaminem symulatora Train Driver 2</a
+
-      >!
+    <div class="text--grayed" v-if="store.vehiclesAPIData">
-    </div>
+      {{ $t('footer.version-check', { version: store.vehiclesAPIData.version }) }}
-
+    </div>
-    <div class="text--grayed" v-if="store.stockData">
+
-      Strona jest kompletna dla wersji {{ store.stockData.version }} symulatora TD2
+    <div>
-    </div>
+      &copy;
-
+      <a href="https://td2.info.pl/profile/?u=20777" target="_blank">Spythere</a>
-    <div>
+      {{ new Date().getUTCFullYear() }} | v{{ VERSION }}{{ !isOnProductionHost ? 'dev' : '' }}
-      &copy;
+    </div>
-      <a href="https://td2.info.pl/profile/?u=20777" target="_blank">Spythere</a>
+  </footer>
-      {{ new Date().getUTCFullYear() }} | v{{ VERSION }}{{ !isOnProductionHost ? 'dev' : '' }}
+</template>
-    </div>
+
-  </footer>
+<script lang="ts">
-</template>
+import { defineComponent } from 'vue';
-
+import packageInfo from '../../../package.json';
-<script lang="ts">
+import { useStore } from '../../store';
-import { defineComponent } from 'vue';
+
-import packageInfo from '../../../package.json';
+export default defineComponent({
-import { useStore } from '../../store';
+  data() {
-
+    return {
-export default defineComponent({
+      isOnProductionHost: location.hostname == 'pojazdownik-td2.web.app',
-  data() {
+      VERSION: packageInfo.version,
-    return {
+      store: useStore(),
-      isOnProductionHost: location.hostname == 'pojazdownik-td2.web.app',
+    };
-      VERSION: packageInfo.version,
+  },
-      store: useStore(),
+});
-    };
+</script>
-  },
+
-});
+<style lang="scss" scoped>
-</script>
+footer {
-
+  text-align: center;
-<style lang="scss" scoped>
+  padding: 1em 1em 0 1em;
-footer {
+}
-  display: flex;
+</style>
  flex-direction: column;
  gap: 0.25em;
  text-align: center;
  padding: 1em 1em 0 1em;
  margin-top: auto;
 }
 </style>
@@ -1,45 +1,49 @@
-<template>
+<template>
-  <main>
+  <main>
-    <LogoSection />
+    <LogoSection />
-    <InputsSection />
+    <InputsSection />
-    <TrainImageSection />
+    <TrainImageSection />
-    <StockSection />
+    <StockSection />
-  </main>
+  </main>
-</template>
+</template>
-
+
-<script lang="ts">
+<script lang="ts">
-import { defineComponent } from 'vue';
+import { defineComponent } from 'vue';
-import LogoSection from '../sections/LogoSection.vue';
+import LogoSection from '../sections/LogoSection.vue';
-import InputsSection from '../sections/InputsSection.vue';
+import InputsSection from '../sections/InputsSection.vue';
-import TrainImageSection from '../sections/TrainImageSection.vue';
+import TrainImageSection from '../sections/TrainImageSection.vue';
-import StockSection from '../sections/StockSection.vue';
+import StockSection from '../sections/StockSection.vue';
-
+
-export default defineComponent({
+export default defineComponent({
-  components: { LogoSection, InputsSection, TrainImageSection, StockSection },
+  components: { LogoSection, InputsSection, TrainImageSection, StockSection },
-});
+});
-</script>
+</script>
-
+
-<style lang="scss" scoped>
+<style lang="scss" scoped>
-@import '../../styles/global.scss';
+@import '../../styles/global.scss';
-
+
-main {
+main {
-  display: grid;
+  display: grid;
-  gap: 1em;
+  gap: 1em;
-
+
-  width: 100%;
+  width: 100%;
-  max-width: 1500px;
+  max-width: 1350px;
-  min-height: 75vh;
+
-
+  grid-template-columns: 1fr 2fr;
-  grid-template-columns: 1fr 2fr;
+  grid-template-rows: auto 360px minmax(300px, 1fr);
-  grid-template-rows: auto 360px minmax(400px, 1fr);
+
-}
+  background-color: darken($color: $bgColor, $amount: 5);
-
+  border-radius: 1em;
-@media screen and (max-width: $breakpointMd) {
+
-  main {
+  padding: 1em;
-    display: flex;
+}
-    flex-direction: column;
+
-    grid-template-columns: 1fr;
+@media screen and (max-width: $breakpointMd) {
-    grid-template-rows: 1fr;
+  main {
-  }
+    display: flex;
-}
+    flex-direction: column;
-</style>
+    grid-template-columns: 1fr;
    grid-template-rows: 1fr;
  }
 }
 </style>
@@ -6,46 +6,73 @@
      <div class="card_nav">
        <div class="top-pane">
          <h1>
-            ZESTAWIENIA REALNE by <a href="https://td2.info.pl/profile/?u=17708" target="_blank">Railtrains997</a>
+            {{ $t('realstock.title') }}
            <a href="https://td2.info.pl/profile/?u=17708" target="_blank">Railtrains997</a>
          </h1>
-          <button class="btn exit-btn" @click="store.isRealStockListCardOpen = false">&Cross;</button>
+          <button class="btn exit-btn" @click="store.isRealStockListCardOpen = false">
            &Cross;
          </button>
        </div>
        <div class="filters" ref="focus" tabindex="0">
-          <input list="readyStockDataList" v-model="searchedReadyStockName" placeholder="Szukaj po nazwie" />
+          <input
            list="readyStockDataList"
            v-model="searchedReadyStockName"
            :placeholder="$t('realstock.search-name')"
          />
          <datalist id="readyStockDataList">
-            <option v-for="stock in store.readyStockList" :value="stock.stockId">
+            <option
              v-for="stock in store.realCompositionList"
              :value="stock.stockId"
              :key="stock.name"
            >
              {{ stock.stockId }}
            </option>
          </datalist>
-          <input list="readyStockStringList" v-model="searchedReadyStockString" placeholder="Szukaj po pojazdach" />
+          <input
            list="readyStockStringList"
            v-model="searchedReadyStockString"
            :placeholder="$t('realstock.search-stock')"
          />
          <datalist id="readyStockStringList">
-            <option v-for="stock in computedAvailableStockTypes" :value="stock">
+            <option
-              {{ stock }}
+              v-for="stockType in computedAvailableStockTypes"
              :value="stockType"
              :key="stockType"
            >
              {{ stockType }}
            </option>
          </datalist>
-          <button class="btn" @click="resetStockFilters">RESETUJ</button>
+          <button class="btn" @click="resetStockFilters">
            {{ $t('realstock.action-reset') }}
          </button>
        </div>
      </div>
      <ul class="card_list" ref="list" @scroll="onListScroll">
-        <li
+        <li v-for="rStock in computedReadyStockList" :key="rStock.stockId">
-          v-for="rStock in computedReadyStockList"
+          <!-- :data-last-selected="store.ch === rStock.stockId" -->
-          :key="rStock.stockId"
+          <div
-          :data-last-selected="store.chosenRealStockName === rStock.stockId"
+            class="stock-title"
-        >
+            tabindex="0"
-          <div class="stock-title" tabindex="0" @click="chooseStock(rStock)" @keydown.enter="chooseStock(rStock)">
+            @click="chooseStock(rStock)"
            @keydown.enter="chooseStock(rStock)"
          >
            <img class="stock-icon" :src="getIconURL(rStock.type)" :alt="rStock.type" />
            <b class="text--accent" style="margin-left: 5px"> {{ rStock.name }}</b>
            <div>{{ rStock.number }}</div>
          </div>
          <div class="stock-thumbnails" ref="thumbnailsRef">
-            <div class="thumbnail-item" v-for="stockType in rStock.stockString.split(';')">
+            <div
              class="thumbnail-item"
              v-for="stockType in rStock.stockString.split(';')"
              :key="stockType"
            >
              <div class="thumbnail-container">
                <div>{{ stockType }}</div>
                <img
@@ -53,7 +80,7 @@
                  :title="stockType"
                  style="opacity: 0"
                  @error="(e) => onStockItemError(e, stockType)"
-                  @load="e => (e.target as HTMLElement).style.opacity = '1'"
+                  @load="(e) => ((e.target as HTMLElement).style.opacity = '1')"
                />
              </div>
            </div>
@@ -73,11 +100,7 @@ import { useStore } from '../../store';
 import imageMixin from '../../mixins/imageMixin';
 import stockMixin from '../../mixins/stockMixin';
-import { IReadyStockItem } from '../../types';
+import { IRealComposition } from '../../types';
 interface ResponseJSONData {
  [key: string]: string;
 }
 function getVehicleType(stockType: string) {
  if (/^E/.test(stockType)) return 'loco-e';
@@ -92,7 +115,10 @@ export default defineComponent({
  data: () => ({
    store: useStore(),
    responseStatus: 'loading',
-    isMobile: 'ontouchstart' in document.documentElement && navigator.userAgent.match(/Mobi/) ? true : false,
+    isMobile:
      'ontouchstart' in document.documentElement && navigator.userAgent.match(/Mobi/)
        ? true
        : false,
    observer: null as IntersectionObserver | null,
    searchedReadyStockName: '',
    searchedReadyStockString: '',
@@ -101,9 +127,8 @@ export default defineComponent({
    scrollTop: 0,
  }),
-  async mounted() {
+  mounted() {
    this.mountObserver();
    this.fetchStockListData();
  },
  activated() {
@@ -116,20 +141,22 @@ export default defineComponent({
  },
  computed: {
-    computedReadyStockList() {
+    computedReadyStockList(): IRealComposition[] {
-      if (this.searchedReadyStockName == null) return this.store.readyStockList;
+      return this.store.realCompositionList
      return this.store.readyStockList
        .filter(
-          (rs) =>
+          (rc) =>
-            rs.stockId.toLocaleLowerCase().includes(this.searchedReadyStockName.toLocaleLowerCase()) &&
+            rc.stockId
-            rs.stockString.toLocaleLowerCase().includes(this.searchedReadyStockString.toLocaleLowerCase())
+              .toLocaleLowerCase()
              .includes(this.searchedReadyStockName.toLocaleLowerCase()) &&
            rc.stockString
              .toLocaleLowerCase()
              .includes(this.searchedReadyStockString.toLocaleLowerCase())
        )
        .filter((_, i) => i <= this.visibleIndexesTo);
    },
    computedAvailableStockTypes() {
-      return this.store.readyStockList
+      return this.store.realCompositionList
        .reduce((acc, rs) => {
          rs.stockString.split(';').forEach((s) => {
            if (!acc.includes(s)) acc.push(s);
@@ -153,35 +180,6 @@ export default defineComponent({
  },
  methods: {
    async fetchStockListData() {
      const readyStockJSONData: ResponseJSONData = await (
        await fetch(`https://spythere.github.io/api/td2/data/readyStock.json?t=${Math.floor(Date.now() / 60000)}`)
      ).json();
      if (!readyStockJSONData) {
        this.responseStatus = 'error';
        return;
      }
      for (let stockKey in readyStockJSONData) {
        const [type, number, ...name] = stockKey.split(' ');
        const obj = {
          number: number.replace(/_/g, '/'),
          name: name.join(' '),
          stockString: readyStockJSONData[stockKey],
          type,
        };
        this.store.readyStockList.push({
          ...obj,
          stockId: `${obj.type} ${obj.number} ${obj.name}`,
        });
      }
      this.responseStatus = 'loaded';
    },
    mountObserver() {
      this.observer = new IntersectionObserver((entries) => {
        if (entries[0].intersectionRatio > 0) this.visibleIndexesTo += 20;
@@ -199,7 +197,7 @@ export default defineComponent({
      this.searchedReadyStockString = '';
    },
-    chooseStock(stockItem: IReadyStockItem) {
+    chooseStock(stockItem: IRealComposition) {
      this.loadStockFromString(stockItem.stockString);
      this.lastSelectedStockId = stockItem.stockId;
      this.store.isRealStockListCardOpen = false;
@@ -370,4 +368,3 @@ ul {
  padding: 1em;
 }
 </style>
@@ -0,0 +1,58 @@
 <template>
  <label>
    <input type="checkbox" v-model="model" />
    <div><slot /></div>
  </label>
 </template>
 <script lang="ts" setup>
 const model = defineModel();
 </script>
 <style lang="scss" scoped>
 label {
  cursor: pointer;
  text-transform: uppercase;
  transition: color 200ms;
 }
 div {
  padding: 0.25em 0.5em;
  color: white;
  background-color: #222;
  border-radius: 0.25em;
  user-select: none;
  &::before {
    content: '\2716';
    margin-right: 0.5em;
    color: #aaa;
  }
 }
 input {
  position: absolute;
  clip: rect(1px, 1px, 1px, 1px);
  padding: 0;
  border: 0;
  height: 1px;
  width: 1px;
  overflow: hidden;
  &:focus-visible + div {
    outline: 1px solid white;
  }
  &:checked + div {
    color: palegreen;
    &::before {
      color: palegreen;
      content: '\2714';
    }
  }
 }
 </style>
@@ -1,17 +1,18 @@
 <template>
  <section class="inputs-section">
    <div class="input_container">
-      <h2 class="input_header">WYBIERZ POJAZDY / WAGONY</h2>
+      <h2 class="input_header">{{ $t('inputs.title') }}</h2>
      <div class="input_list type">
        <div class="vehicle-types locos">
          <button
            v-for="locoType in locomotiveTypeList"
            :key="locoType.id"
            class="btn btn--choice"
            :data-selected="locoType.id == store.chosenLocoPower"
            @click="selectLocoType(locoType.id)"
          >
-            {{ locoType.value }}
+            {{ $t(`inputs.${locoType.id}`) }}
          </button>
        </div>
@@ -23,9 +24,11 @@
          @keydown.enter.prevent="addOrSwitchVehicle"
          @keydown.backspace="removeVehicle"
        >
-          <option :value="null" disabled>Wybierz pojazd trakcyjny</option>
+          <option :value="null" disabled>
            {{ $t('inputs.input-vehicle') }}
          </option>
          <option v-for="loco in locoOptions" :value="loco" :key="loco.type">
-            {{ loco.type }}<b v-if="loco.supportersOnly">*</b>
+            {{ loco.type }}<b v-if="loco.isSponsorsOnly">*</b>
          </option>
        </select>
      </div>
@@ -34,11 +37,12 @@
        <div class="vehicle-types carwagons">
          <button
            v-for="carType in carTypeList"
            :key="carType.id"
            class="btn btn--choice"
            :data-selected="carType.id == store.chosenCarUseType"
            @click="selectCarWagonType(carType.id)"
          >
-            {{ carType.value }}
+            {{ $t(`inputs.${carType.id}`) }}
          </button>
        </div>
@@ -50,16 +54,18 @@
          @keydown.enter.prevent="addOrSwitchVehicle"
          @keydown.backspace="removeVehicle"
        >
-          <option :value="null" disabled>Wybierz wagon</option>
+          <option :value="null" disabled>
            {{ $t('inputs.input-carwagon') }}
          </option>
          <option v-for="car in carOptions" :value="car" :key="car.type">
-            {{ car.type }}<b v-if="car.supportersOnly">*</b>
+            {{ car.type }}<b v-if="car.isSponsorsOnly">*</b>
          </option>
        </select>
      </div>
      <div class="input_list cargo">
-        <label for="cargo-select">Ładunek (tylko wybrane towarowe)</label>
+        <label for="cargo-select">{{ $t('inputs.cargo-title') }}</label>
        <select
          id="cargo-select"
          :disabled="
@@ -75,30 +81,36 @@
          @keydown.enter.prevent="addOrSwitchVehicle"
          @keydown.backspace="removeVehicle"
        >
-          <option :value="null" v-if="!store.chosenCar || !store.chosenCar.loadable">brak dostępnych ładunków</option>
+          <option :value="null" v-if="!store.chosenCar || !store.chosenCar.loadable">
-          <option :value="null" v-else>próżny</option>
+            {{ $t('inputs.no-cargo-available') }}
          </option>
          <option :value="null" v-else>{{ $t('inputs.cargo-empty') }}</option>
-          <option v-for="cargo in store.chosenCar?.cargoList" :value="cargo" :key="cargo.id">
+          <option v-for="cargo in store.chosenCar?.cargoTypes" :value="cargo" :key="cargo.id">
            {{ cargo.id }}
          </option>
        </select>
      </div>
      <div class="input_actions">
-        <button class="btn" @click="addVehicle(store.chosenVehicle, store.chosenCargo)">DODAJ NOWY</button>
+        <button class="btn" @click="addVehicle(store.chosenVehicle, store.chosenCargo)">
          {{ $t('inputs.action-add') }}
        </button>
        <button
          class="btn"
          @click="switchVehicles"
          :disabled="store.chosenStockListIndex == -1"
          :data-disabled="store.chosenStockListIndex == -1"
        >
-          ZAMIEŃ ZA
+          {{ $t('inputs.action-swap') }}
          <b class="text--accent">
            {{ store.chosenStockListIndex == -1 ? '' : `${store.chosenStockListIndex + 1}.` }}
          </b>
        </button>
-        <button class="btn" @click="store.isRealStockListCardOpen = true"><b>REALNE ZESTAWIENIA</b></button>
+        <button class="btn" @click="store.isRealStockListCardOpen = true">
          <b>{{ $t('inputs.real-stock') }}</b>
        </button>
      </div>
    </div>
  </section>
@@ -112,59 +124,56 @@ import { useStore } from '../../store';
 import stockPreviewMixin from '../../mixins/stockPreviewMixin';
 import stockMixin from '../../mixins/stockMixin';
 interface ILocoType {
  id: string;
  value: string;
  desc: string;
 }
 export default defineComponent({
  mixins: [imageMixin, stockPreviewMixin, stockMixin],
  data: () => ({
    store: useStore(),
    locomotiveTypeList: [
      {
        id: 'loco-e',
        value: 'ELEKTR',
        desc: 'ELEKTRYCZNE',
      },
      {
        id: 'loco-s',
        value: 'SPAL',
        desc: 'SPALINOWE',
      },
      {
        id: 'loco-ezt',
        value: 'EZT',
        desc: 'ELEKTR. ZESPOŁY TRAKCYJNE',
      },
      {
        id: 'loco-szt',
        value: 'SZT',
        desc: 'SPAL. ZESPOŁY TRAKCYJNE',
      },
-    ] as ILocoType[],
+    ],
    carTypeList: [
      {
        id: 'car-passenger',
        value: 'PAS',
        desc: 'PASAŻERSKIE',
      },
      {
        id: 'car-cargo',
        value: 'TOW',
        desc: 'TOWAROWE',
      },
    ],
  }),
-  setup() {
+  computed: {
-    const store = useStore();
+    locoOptions() {
      return this.store.locoDataList
        .slice()
        .sort((a, b) => (a.type > b.type ? 1 : -1))
        .filter((loco) => loco.power == this.store.chosenLocoPower);
    },
-    return {
+    carOptions() {
-      store,
+      return this.store.carDataList
-    };
+        .slice()
        .sort((a, b) => (a.type > b.type ? 1 : -1))
        .filter((car) => car.useType == this.store.chosenCarUseType);
    },
  },
  methods: {
@@ -175,7 +184,8 @@ export default defineComponent({
    addOrSwitchVehicle() {
      if (!this.store.chosenVehicle) return;
-      if (this.store.chosenStockListIndex == -1) this.addVehicle(this.store.chosenVehicle, this.store.chosenCargo);
+      if (this.store.chosenStockListIndex == -1)
        this.addVehicle(this.store.chosenVehicle, this.store.chosenCargo);
      else this.switchVehicles();
    },
@@ -198,6 +208,32 @@ export default defineComponent({
      const stockObject = this.getStockObject(vehicle, this.store.chosenCargo);
      this.store.stockList[this.store.chosenStockListIndex] = stockObject;
    },
    selectLocoType(locoTypeId: string) {
      this.store.chosenLocoPower = locoTypeId;
      this.store.chosenVehicle = this.locoOptions[0];
      this.store.chosenLoco = this.locoOptions[0];
    },
    selectCarWagonType(carWagonTypeId: string) {
      this.store.chosenCarUseType = carWagonTypeId;
      this.store.chosenVehicle = this.carOptions[0];
      this.store.chosenCar = this.carOptions[0];
      this.store.chosenCargo = null;
    },
    previewVehicleByType(type: 'loco' | 'car' | 'cargo') {
      this.$nextTick(() => {
        if (!this.store.chosenLoco && !this.store.chosenCar) return;
        this.store.chosenVehicle = type == 'loco' ? this.store.chosenLoco : this.store.chosenCar;
        this.store.chosenCargo =
          this.store.chosenCar?.cargoTypes.find(
            (cargo) => cargo.id == this.store.chosenCargo?.id
          ) || null;
      });
    },
  },
 });
 </script>
@@ -213,6 +249,11 @@ export default defineComponent({
  grid-column: 1;
 }
 .input_container {
  width: 100%;
  max-width: 380px;
 }
 .input_header {
  margin-bottom: 1em;
 }
@@ -232,6 +273,10 @@ button.btn--choice {
 .input_list {
  margin: 0.5em 0;
  select {
    width: 100%;
  }
  label {
    display: block;
@@ -273,4 +318,3 @@ button.btn--choice {
  }
 }
 </style>
@@ -1,39 +1,79 @@
 <template>
-  <section class="logo-section" @click="navigate">
+  <section class="logo-section">
-    <img src="/images/logo.svg" alt="logo pojazdownik" />
+    <img :src="`/logo-${$i18n.locale}.svg`" alt="logo pojazdownik" @click="navigate" />
    <div class="actions">
      <button
        v-for="action in localeActions"
        :key="action.name"
        class="btn btn--text"
        :data-selected="$i18n.locale == action.locale"
        @click="chooseLocale(action.locale)"
      >
        {{ action.name }}
      </button>
    </div>
  </section>
 </template>
 <script lang="ts">
 export default {
-  setup() {
+  data() {
-    return {};
+    return {
      localeActions: [
        {
          name: 'POLSKI',
          locale: 'pl',
        },
        {
          name: 'ENGLISH',
          locale: 'en',
        },
      ],
    };
  },
  methods: {
    navigate() {
      window.location.pathname = '';
    },
    chooseLocale(locale: string) {
      this.$i18n.locale = locale;
      window.localStorage.setItem('locale', locale);
    },
  },
 };
 </script>
 <style lang="scss" scoped>
@import '../../styles/global.scss';
 .logo-section {
  grid-row: 1;
  grid-column: 1;
  margin-bottom: 1.5em;
  display: flex;
  justify-content: center;
  align-items: center;
  flex-direction: column;
  gap: 0.5em;
  cursor: pointer;
 }
 .actions {
  display: flex;
  gap: 0.5em;
  button[data-selected='true'] {
    font-weight: bold;
    color: $accentColor;
    text-decoration: underline;
  }
 }
 img {
  max-width: 25em;
  width: 100%;
 }
 </style>
@@ -2,27 +2,28 @@
  <section class="stock-section">
    <div class="section_modes">
      <button
        v-for="(id, i) in sectionModes"
        :key="id"
        class="btn"
        ref="sectionButtonRefs"
        v-for="(id, name, i) in sectionModes"
        @click="chooseSection(id)"
        :data-selected="store.stockSectionMode == id"
      >
-        <span class="text--accent">{{ i + 1 }}.</span> {{ name }}
+        <span class="text--accent">{{ i + 1 }}.</span> {{ $t(`topbar.${id}`) }}
        <span v-if="id == 'stock-list'">({{ store.stockList.length }})</span>
      </button>
    </div>
    <transition name="tab-change" mode="out-in">
      <keep-alive>
-        <component :is="chosenSectionComponent" :key="chosenSectionComponent"></component>
+        <component :is="chosenSectionComponent"></component>
      </keep-alive>
    </transition>
  </section>
 </template>
 <script lang="ts" setup>
-import { computed, KeepAlive, onMounted, ref } from 'vue';
+import { computed, onMounted, ref } from 'vue';
 import { useStore } from '../../store';
 import StockListTab from '../tabs/StockListTab.vue';
 import StockGeneratorTab from '../tabs/StockGeneratorTab.vue';
@@ -34,19 +35,12 @@ const sectionButtonRefs = ref([]);
 const store = useStore();
 type SectionMode = typeof store.stockSectionMode;
-const sectionModes: { [key: string]: SectionMode } = {
+const sectionModes: SectionMode[] = [
-  SKŁAD: 'stock-list',
+  'stock-list',
-  POJAZDY: 'wiki-list',
+  'wiki-list',
-  'GNR NUMERU': 'number-generator',
+  'number-generator',
-  'GNR SKŁADU': 'stock-generator',
+  'stock-generator',
-};
+];
 const sectionKeyIndexes: { [key: number]: SectionMode } = {
  1: 'stock-list',
  2: 'wiki-list',
  3: 'number-generator',
  4: 'stock-generator',
 };
 onMounted(() => {
  window.addEventListener('keydown', (e) => {
@@ -54,8 +48,8 @@ onMounted(() => {
    if (/[1234]/.test(e.key)) {
      const keyNum = Number(e.key);
-      store.stockSectionMode = sectionKeyIndexes[keyNum];
+      store.stockSectionMode = sectionModes[keyNum - 1];
-      (sectionButtonRefs.value[keyNum - 1] as HTMLButtonElement).focus();
+      (sectionButtonRefs.value[keyNum - 1] as HTMLButtonElement)?.focus();
    }
  });
 });
@@ -115,7 +109,7 @@ function chooseSection(sectionId: SectionMode) {
  gap: 0.5em;
-  margin-bottom: 0.5em;
+  margin-bottom: 1em;
  button {
    position: relative;
@@ -146,4 +140,3 @@ function chooseSection(sectionId: SectionMode) {
  }
 }
 </style>
@@ -1,56 +1,59 @@
 <template>
  <section class="train-image-section">
-    <div class="train-image__wrapper">
+    <div class="train-image__content" :class="{ sponsor: store.chosenVehicle?.isSponsorsOnly }">
-      <div class="train-image__content" :class="{'supporter': store.chosenVehicle?.supportersOnly}">
+      <img
-        <transition name="img-message-anim">
+        tabindex="0"
-          <div class="empty-message" v-if="store.imageLoading && store.chosenVehicle?.imageSrc">
+        :src="
-            ŁADOWANIE OBRAZU...
+          store.chosenVehicle
-          </div>
+            ? getThumbnailURL(store.chosenVehicle.type, 'small')
-        </transition>
+            : '/images/placeholder.jpg'
-
+        "
-        <div class="no-img" v-if="!store.chosenVehicle">PODGLĄD WYBRANEGO POJAZDU</div>
+        @click="onImageClick"
-
+        @keydown.enter="onImageClick"
-        <img
+        @error="onImageError"
-          v-if="store.chosenVehicle"
+        type="image/jpeg"
-          :src="`https://spythere.github.io/api/td2/images/${store.chosenVehicle.type}--300px.jpg`"
+      />
          :alt="store.chosenVehicle.type"
          @load="onImageLoad"
          @click="onImageClick"
        />
        <!-- <div class="empty-message" v-if="store.chosenVehicle && !store.chosenVehicle.imageSrc">Ten pojazd nie ma jeszcze podglądu!</div> -->
      </div>
      <div class="train-image__info" v-if="store.chosenVehicle">
        <b class="text--accent">{{ store.chosenVehicle.type }}</b> &bull;
        <b style="color: #ccc">{{
          vehicleTypes[
            isLocomotive(store.chosenVehicle) ? store.chosenVehicle.power : store.chosenVehicle.useType || 'loco-e'
          ]
        }}</b>
        <div style="color: #ccc">
          <div>
            {{ store.chosenVehicle.length }}m | {{ store.chosenVehicle.mass }}t |
            {{ store.chosenVehicle.maxSpeed }} km/h
          </div>
          <div v-if="isLocomotive(store.chosenVehicle)">Typ kabiny: {{ store.chosenVehicle.cabinType }}</div>
          <div v-else>
            {{
              store.chosenVehicle.useType == 'car-cargo'
                ? store.stockData?.usage[store.chosenVehicle.constructionType]
                : 'Typ konstrukcji: ' + store.chosenVehicle.constructionType
            }}
          </div>
          <b style="color: salmon;" v-if="store.chosenVehicle.supportersOnly">* TYLKO DLA SPONSORÓW</b>
        </div>
      </div>
      <div class="train-image__info" v-else>Wybierz pojazd lub wagon, aby zobaczyć jego podgląd powyżej</div>
    </div>
    <div class="train-image__info" v-if="store.chosenVehicle">
      <b class="text--accent">{{ store.chosenVehicle.type }}</b> &bull;
      <b style="color: #ccc">
        {{
          $t(
            `preview.${isLocomotive(store.chosenVehicle) ? store.chosenVehicle.power : store.chosenVehicle.useType}`
          )
        }}
      </b>
      <div style="color: #ccc">
        <div>
          {{ store.chosenVehicle.length }}m | {{ (store.chosenVehicle.weight / 1000).toFixed(1) }}t
          | {{ store.chosenVehicle.maxSpeed }} km/h
        </div>
        <div v-if="isLocomotive(store.chosenVehicle)">
          {{ $t('preview.cabin') }} {{ store.chosenVehicle.cabinType }}
        </div>
        <div v-else>
          {{
            store.chosenVehicle.useType == 'car-cargo'
              ? $t(`usage.${store.chosenVehicle.constructionType}`)
              : `${$t('preview.construction')} ${store.chosenVehicle.constructionType}`
          }}
        </div>
        <b style="color: salmon" v-if="store.chosenVehicle.isSponsorsOnly">{{
          $t('preview.sponsor-only', [
            new Date(store.chosenVehicle.sponsorsOnlyTimestamp).toLocaleDateString(
              $i18n.locale == 'pl' ? 'pl-PL' : 'en-GB'
            ),
          ])
        }}</b>
      </div>
    </div>
    <div class="train-image__info" v-else>{{ $t('preview.desc') }}</div>
  </section>
 </template>
@@ -58,9 +61,18 @@
 import { computed, defineComponent } from 'vue';
 import { useStore } from '../../store';
 import { isLocomotive } from '../../utils/vehicleUtils';
-import { ILocomotive, Vehicle } from '../../types';
+import { ILocomotive, IVehicle } from '../../types';
 import imageMixin from '../../mixins/imageMixin';
 export default defineComponent({
  mixins: [imageMixin],
  data() {
    return {
      noImageAvailable: false,
    };
  },
  setup() {
    const store = useStore();
@@ -70,21 +82,8 @@ export default defineComponent({
    };
  },
  data() {
    return {
      vehicleTypes: {
        'loco-e': 'ELEKTROWÓZ',
        'loco-s': 'SPALINOWÓZ',
        'loco-ezt': 'EZT',
        'loco-szt': 'SZT',
        'car-passenger': 'WAGON PASAŻERSKI',
        'car-cargo': 'WAGON TOWAROWY',
      } as { [key: string]: string },
    };
  },
  watch: {
-    chosenVehicle(vehicle: Vehicle, prevVehicle: Vehicle) {
+    chosenVehicle(vehicle: IVehicle, prevVehicle: IVehicle) {
      if (vehicle && vehicle.type != prevVehicle?.type) {
        this.store.imageLoading = true;
      }
@@ -96,16 +95,26 @@ export default defineComponent({
      this.store.imageLoading = false;
    },
-    isLocomotive(vehicle: Vehicle): vehicle is ILocomotive {
+    onImageError(e: Event) {
      const el = e.target as HTMLImageElement;
      if (el.src == '/images/placeholder.jpg') return;
      el.src = '/images/placeholder.jpg';
    },
    isLocomotive(vehicle: IVehicle): vehicle is ILocomotive {
      return isLocomotive(vehicle);
    },
-    onImageClick() {
+    onImageClick(e: Event) {
      const target = e.target as HTMLElement;
      const chosenVehicle = this.store.chosenVehicle;
      if (!chosenVehicle) return;
-      this.store.vehiclePreviewSrc = `https://spythere.github.io/api/td2/images/${chosenVehicle.type}--800px.jpg`;
+      this.store.lastFocusedElement = target;
      this.store.vehiclePreviewSrc = this.getThumbnailURL(chosenVehicle.type, 'large');
    },
  },
 });
@@ -115,66 +124,45 @@ export default defineComponent({
@import '../../styles/global.scss';
 .train-image-section {
  display: flex;
  flex-direction: column;
  text-align: center;
  grid-row: 3;
  grid-column: 1;
-  margin-top: 2em;
+  margin-top: 1em;
  height: 22em;
 }
 .train-image {
  &__wrapper {
    text-align: center;
  }
  &__content {
-    border: 1px solid white;
+    &.sponsor img {
    position: relative;
    overflow: hidden;
    max-width: 22em;
    height: 13em;
    margin: 0 auto;
    &.supporter {
      border: 1px solid salmon;
    }
    img {
      max-width: 380px;
      width: 100%;
      height: 100%;
      border: 1px solid white;
      cursor: zoom-in;
    }
    .empty-message,
    .no-img {
      position: absolute;
      left: 0;
      bottom: 0;
      padding: 0.3em 0;
      width: 100%;
    }
    .empty-message {
      background: rgba(#000, 0.75);
    }
  }
 }
 .train-image__info {
  margin: 1em 0;
  font-size: 1.1em;
-  padding: 0 1em;
+  padding: 0.5em;
  margin: 0.5em auto;
  line-height: 1.35;
-  b {
+  width: 100%;
-    font-size: 1.1em;
+  max-width: 380px;
  }
-  div {
+  background-color: $secondaryColor;
-    margin: 0.25em 0;
+  font-weight: bold;
  }
 }
 // Transition animations
@@ -196,4 +184,3 @@ export default defineComponent({
  }
 }
 </style>
@@ -1,45 +1,132 @@
 <template>
  <div class="number-generator tab">
    <div class="tab_header">
-      <h2>GENERATOR NUMERU POCIĄGU</h2>
+      <h2>{{ $t('numgen.title') }}</h2>
      <h3>{{ $t('numgen.subtitle') }}</h3>
    </div>
    <div class="tab_content">
-      <div class="options">
+      <div class="category-select">
-        <select v-model="beginRegionName" @change="randomizeTrainNumber()">
+        <label for="category"> {{ $t('numgen.train-category') }}</label>
-          <option :value="null" disabled>Początkowy obszar konstrukcyjny</option>
+        <select id="category" v-model="chosenCategory" @change="randomizeTrainNumber()">
-          <option v-for="(_, name) in genData.regionNumbers" :value="name">{{ name }}</option>
+          <option :value="null" disabled>
            {{ $t('numgen.train-category') }}
          </option>
          <option
            v-for="(_, category) in genData.categoriesRules"
            :key="category"
            :value="category"
          >
            {{ $t(`numgen.categories.${category}`) }}
          </option>
        </select>
      </div>
-        <select v-model="endRegionName" @change="randomizeTrainNumber()">
+      <div class="regions-select">
-          <option :value="null" disabled>Końcowy obszar konstrukcyjny</option>
+        <div>
-          <option v-for="(_, name) in genData.regionNumbers" :value="name">{{ name }}</option>
+          <label for="begin-region"> {{ $t('numgen.start-region') }}</label>
-        </select>
+          <select id="begin-region" v-model="beginRegionName" @change="randomizeTrainNumber()">
            <option :value="null" disabled>
              {{ $t('numgen.start-region') }}
            </option>
            <option v-for="(_, name) in genData.regionNumbers" :key="name" :value="name">
              {{ name }}
            </option>
          </select>
        </div>
-        <select v-model="categoryRules" @change="randomizeTrainNumber()">
+        <div>
-          <option :value="null" disabled>Kategoria pociągu</option>
+          <label for="end-region"> {{ $t('numgen.end-region') }}</label>
-          <option v-for="(rules, category) in genData.categories" :value="rules">{{ category }}</option>
+          <select id="end-region" v-model="endRegionName" @change="randomizeTrainNumber()">
-        </select>
+            <option :value="null" disabled>
              {{ $t('numgen.end-region') }}
            </option>
            <option v-for="(_, name) in genData.regionNumbers" :key="name" :value="name">
              {{ name }}
            </option>
          </select>
        </div>
      </div>
      <div class="generated-number" @click="copyNumber">
        <span v-if="trainNumber">
-          Wygenerowany numer pociągu: <b class="text--accent">{{ trainNumber }}</b>
+          {{ $t('numgen.number-info') }}
          <b class="text--accent">{{ trainNumber }}</b>
        </span>
-        <span v-else>Wybierz kategorię oraz obszary konstrukcyjne (opcjonalnie)</span>
+        <span v-else>{{ $t('numgen.warning') }}</span>
      </div>
      <div class="category-rules" v-if="chosenCategory && categoryRules && trainNumber">
        <!-- First & second digit (the same regions)  -->
        <div v-if="beginRegionName && endRegionName && beginRegionName == endRegionName">
          <b>{{ $t('numgen.rules.two-first-digits') }}</b>
          {{ $t('numgen.rules.from-pool') }}
          <b class="text--accent">{{ genData.sameRegions[beginRegionName].join(', ') }}</b>
          {{ $t('numgen.rules.for-region') }} {{ beginRegionName }}
        </div>
        <!-- First & second digit (different regions)  -->
        <div v-else>
          <div>
            <b>
              {{ $t('numgen.rules.first-digit') }}
              <span class="text--accent">{{ trainNumber[0] }}</span>
            </b>
            {{ $t('numgen.rules.for-region-begin') }} {{ beginRegionName }}
          </div>
          <div>
            <b>
              {{ $t('numgen.rules.second-digit') }}
              <span class="text--accent">{{ trainNumber[1] }} </span>
            </b>
            {{ $t('numgen.rules.for-region-end') }} {{ endRegionName }}
          </div>
        </div>
        <!-- Third digit (non-passenger only) -->
        <div v-if="categoryRules[0] != null">
          <b>
            {{ $t('numgen.rules.third-digit') }}
            <span class="text--accent">{{ categoryRules[0] }}</span>
          </b>
          {{ $t('numgen.rules.for-category') }} {{ chosenCategory }}
        </div>
        <!-- Last digits  -->
        <div>
          <b>
            {{
              $t(`numgen.rules.${categoryRules[1]?.length == 3 ? 'three' : 'two'}-last-digits`)
            }}</b
          >
          {{ $t('numgen.rules.from-range') }}
          <b class="text--accent">{{ categoryRules[1] }}-{{ categoryRules[2] }}</b>
        </div>
      </div>
      <hr />
      <div class="tab_links">
-        <a href="https://wiki.td2.info.pl/index.php?title=Zasady_numeracji_poci%C4%85g%C3%B3w" target="_blank">
+        <a :href="$t('numgen.td2-wiki-link')" target="_blank">
-          > Szczegółowe zasady numeracji (wikipedia TD2)
+          {{ $t('numgen.td2-wiki') }}
        </a>
      </div>
      <hr />
      <div class="tab_actions">
-        <button class="btn" @click="randomizeTrainNumber(true)">LOSUJ OBSZARY</button>
+        <button class="btn" @click="randomizeTrainNumber(true)">
-        <button class="btn" @click="randomizeTrainNumber(false)">LOSUJ NUMER</button>
+          {{ $t('numgen.action-random-region') }}
        </button>
        <button class="btn" @click="randomizeCategory">
          {{ $t('numgen.action-random-category') }}
        </button>
        <button class="btn" @click="randomizeTrainNumber(false)">
          {{ $t('numgen.action-random-number') }}
        </button>
      </div>
    </div>
  </div>
@@ -47,26 +134,43 @@
 <script setup lang="ts">
 import { Ref, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import genData from '../../constants/numberGeneratorData.json';
 import { computed } from 'vue';
 const i18n = useI18n();
 type RegionName = keyof typeof genData.regionNumbers;
 type Category = keyof typeof genData.categoriesRules;
 const beginRegionName = ref(null) as Ref<RegionName | null>;
 const endRegionName = ref(null) as Ref<RegionName | null>;
-const categoryRules = ref(null) as Ref<string | null>;
+const chosenCategory = ref(null) as Ref<Category | null>;
 const trainNumber = ref(null) as Ref<string | null>;
 const copyNumber = () => {
  if (trainNumber.value) {
    navigator.clipboard.writeText(trainNumber.value);
-    alert('Skopiowano numer do schowka!');
+    alert(i18n.t('numgen.alert'));
  }
 };
 const categoryRules = computed(() => {
  if (!chosenCategory.value) return null;
  return genData.categoriesRules[chosenCategory.value];
 });
 const randomizeCategory = () => {
  const categoryKeys = Object.keys(genData.categoriesRules) as Category[];
  chosenCategory.value = categoryKeys[~~(Math.random() * categoryKeys.length)];
  randomizeTrainNumber(false);
 };
 const randomizeTrainNumber = (randomizeRegions = false) => {
-  if (categoryRules.value == null) return;
+  // if (categoryRules.value == null) return;
  const regionKeys = Object.keys(genData.regionNumbers);
@@ -78,9 +182,11 @@ const randomizeTrainNumber = (randomizeRegions = false) => {
  let number = '';
  // Two first numbers (begin & end regions)
  if (beginRegionName.value == endRegionName.value) {
    const sameRegionsNumbers = genData.sameRegions[beginRegionName.value!];
-    const randRegionNumber = sameRegionsNumbers[Math.floor(Math.random() * sameRegionsNumbers.length)];
+    const randRegionNumber =
      sameRegionsNumbers[Math.floor(Math.random() * sameRegionsNumbers.length)];
    number += randRegionNumber.toString();
  } else {
    const beginRegionNumber = genData.regionNumbers[beginRegionName.value!];
@@ -89,29 +195,29 @@ const randomizeTrainNumber = (randomizeRegions = false) => {
    number += `${beginRegionNumber}${endRegionNumber}`;
  }
-  // Do not roll the rest of number again if only randomize regions
+  // Do not roll the rest of number again if only randomize regions and category rules are already selected
-  if (randomizeRegions) {
+  if (randomizeRegions && chosenCategory.value != null) {
    trainNumber.value = number + trainNumber.value?.substring(2);
    return;
  }
-  const rulesArray = categoryRules.value.split(';').map((r) => ({
+  // Choose default category if it's not chosen
-    index: r.split(':')[0],
+  if (chosenCategory.value == null) chosenCategory.value = 'EI';
    rule: r.split(':')[1],
    nums: Number(r.split(':')[2] || '1'),
  }));
-  rulesArray.forEach((r) => {
+  // Get category rules
-    const range = r.rule.split('-');
+  const [thirdNumber, minRange, maxRange] = categoryRules.value!;
-    if (range.length == 1) number += r.rule;
+  // Third number
-    else {
+  number += thirdNumber ?? '';
      const [minRange, maxRange] = range;
      const randRange = Math.floor(Math.random() * (Number(maxRange) - Number(minRange)) + Number(minRange)).toString();
-      number += new Array(Math.abs(randRange.length - r.nums)).fill('0').join('') + randRange;
+  // Remaining numbers
-    }
+  const rangeNums = minRange!.length;
-  });
+  const randRange = Math.floor(
    Math.random() * (Number(maxRange) - Number(minRange)) + Number(minRange)
  ).toString();
  const leadingZeros = new Array(Math.abs(randRange.length - rangeNums)).fill('0').join('');
  number += `${leadingZeros}${randRange}`;
  trainNumber.value = number;
 };
@@ -121,13 +227,38 @@ const randomizeTrainNumber = (randomizeRegions = false) => {
@import '../../styles/tab.scss';
@import '../../styles/global.scss';
-.options {
+label {
  display: block;
  font-weight: bold;
  margin-bottom: 0.5em;
 }
 .category-select {
  select {
    width: auto;
    min-width: 50%;
  }
  margin-bottom: 1em;
 }
 .regions-select {
  display: flex;
-  flex-wrap: wrap;
+  align-items: center;
  justify-content: center;
  gap: 0.5em;
  div {
    width: 100%;
  }
  select {
-    width: calc(50% - 0.5em);
+    width: 100%;
  }
  label {
    display: block;
    margin-bottom: 0.5em;
  }
 }
@@ -143,14 +274,19 @@ const randomizeTrainNumber = (randomizeRegions = false) => {
  background-color: $secondaryColor;
 }
 .category-rules {
  margin-bottom: 0.5em;
 }
 .tab_actions {
-  grid-template-columns: 1fr 1fr;
+  grid-template-columns: repeat(3, 1fr);
  margin: 0.5em 0;
 }
 .tab_links {
  display: flex;
  justify-content: flex-end;
  margin: 0.25em 0;
 }
@media screen and (max-width: $breakpointMd) {
@@ -160,9 +296,20 @@ const randomizeTrainNumber = (randomizeRegions = false) => {
 }
@media screen and (max-width: $breakpointSm) {
-  .options select {
+  .regions-select {
    flex-wrap: wrap;
  }
  .regions-select select {
    width: 100%;
  }
  .category-select select {
    min-width: 100%;
  }
  .category-rules {
    text-align: center;
  }
 }
 </style>
@@ -1,62 +1,68 @@
 <template>
  <div class="stock-generator tab">
    <div class="tab_header">
-      <h2>GENERATOR SKŁADU TOWAROWEGO</h2>
+      <h2>{{ $t('stockgen.title') }}</h2>
    </div>
    <div class="tab_content">
      <div>
-        <h2>WŁAŚCIWOŚCI SKŁADU</h2>
+        <h2>{{ $t('stockgen.properties-title') }}</h2>
        <b class="text--accent">
-          &lArr; Dodaj lokomotywę na pierwsze miejsce listy, aby uwzględnić ją przy losowaniu składu!
+          {{ $t('stockgen.properties-desc') }}
        </b>
        <div class="tab_attributes">
          <label>
-            Maksymalna masa (t)
+            {{ $t('stockgen.input-mass') }}
-            <input type="number" v-model="maxMass" step="100" max="4000" min="0" />
+            <input type="number" v-model="maxTons" step="100" max="4000" min="0" />
          </label>
          <label>
-            Maks. długość (m)
+            {{ $t('stockgen.input-length') }}
            <input type="number" v-model="maxLength" step="25" max="650" min="0" />
          </label>
          <label>
-            Maks. liczba wagonów
+            {{ $t('stockgen.input-carcount') }}
            <input type="number" v-model="maxCarCount" step="1" max="60" min="1" />
          </label>
        </div>
        <!-- <hr style="margin: 1em 0" /> -->
        <!-- <div class="generator_options">
          <Checkbox v-model="isCarGroupingEnabled">Grupuj wylosowane wagony (ustawia podobne wagony obok siebie w składzie)</Checkbox>
        </div>  -->
      </div>
      <div>
-        <h2>ŁADUNEK</h2>
+        <h2>{{ $t('stockgen.cargo-title') }}</h2>
-        <b>Wybierz ładunki, którymi chcesz wypełnić dostępne wagony:</b>
+        <b>{{ $t('stockgen.cargo-desc') }}</b>
      </div>
      <div class="generator_cargo">
        <button
          v-for="cargo in computedCargoData"
          :key="cargo.name"
          class="btn"
-          :data-chosen="chosenCargoTypes.includes(k.toString())"
+          :data-chosen="chosenCargoTypes.includes(cargo.name)"
-          v-for="(v, k) in store.stockData?.generator.cargo"
+          @click="toggleCargoChosen(cargo.name, cargo.cargoList)"
          @click="toggleCargoChosen(k.toString(), v)"
        >
-          {{ k }}
+          {{ $t(`cargo.${cargo.name}`) }}
        </button>
      </div>
      <div>
-        <h2>WAGONY Z WYBRANYMI ŁADUNKAMI</h2>
+        <h2>{{ $t('stockgen.chosen-title') }}</h2>
        <div class="generator_warning">
          <span v-if="computedChosenCarTypes.size == 0">
-            Wybierz co najmniej jeden ładunek, aby zobaczyć wagony, które go posiadają!
+            {{ $t('stockgen.chosen-empty-warning') }}
          </span>
          <span v-else>
-            Wagony posiadające wybrane ładunki. Najedź na nazwę, aby zobaczyć podgląd wagonu. Kliknij, aby wyłączyć z
+            {{ $t('stockgen.chosen-warning') }}
            losowania (tylko podświetlone nazwy będą uwzględnione).
          </span>
        </div>
      </div>
@@ -79,15 +85,28 @@
      <hr />
      <div class="tab_actions">
-        <button class="btn" :data-disabled="computedChosenCarTypes.size == 0" @click="generateStock()">
+        <button
-          WYGENERUJ
+          class="btn"
-        </button>
+          :data-disabled="computedChosenCarTypes.size == 0"
-        <button class="btn" :data-disabled="computedChosenCarTypes.size == 0" @click="generateStock(true)">
+          @click="generateStock()"
-          WYGENERUJ PRÓŻNE WAGONY
+        >
          {{ $t('stockgen.action-generate') }}
        </button>
-        <button class="btn" :data-disabled="computedChosenCarTypes.size == 0" @click="resetChosenCargo">
+        <button
-          ZRESETUJ ŁADUNKI
+          class="btn"
          :data-disabled="computedChosenCarTypes.size == 0"
          @click="generateStock(true)"
        >
          {{ $t('stockgen.action-generate-empty') }}
        </button>
        <button
          class="btn"
          :data-disabled="computedChosenCarTypes.size == 0"
          @click="resetChosenCargo"
        >
          {{ $t('stockgen.action-reset') }}
        </button>
      </div>
    </div>
@@ -104,7 +123,6 @@ import warningsMixin from '../../mixins/warningsMixin';
 export default defineComponent({
  name: 'stock-generator',
  mixins: [stockMixin, warningsMixin],
  data() {
@@ -116,17 +134,32 @@ export default defineComponent({
      previewTimeout: -1,
-      maxMass: 3000,
+      maxTons: 3000,
      maxLength: 650,
      maxCarCount: 50,
      isCarGroupingEnabled: false,
      store: useStore(),
    };
  },
  computed: {
    computedChosenCarTypes() {
-      return new Set<string>(this.chosenCarTypes.sort((c1, c2) => (c1 > c2 ? 1 : -1)));
+      return new Set<string>(this.chosenCarTypes.slice().sort((c1, c2) => (c1 > c2 ? 1 : -1)));
    },
    computedCargoData() {
      if (!this.store.vehiclesAPIData?.generator.cargo) return [];
      const cargoGeneratorData = this.store.vehiclesAPIData.generator.cargo;
      return Object.keys(cargoGeneratorData)
        .sort((v1, v2) => this.$t(`cargo.${v1}`).localeCompare(this.$t(`cargo.${v2}`)))
        .map((v) => ({
          name: v,
          cargoList: cargoGeneratorData[v],
        }));
    },
  },
@@ -149,65 +182,91 @@ export default defineComponent({
      this.excludedCarTypes.length = 0;
    },
    // WIP
    groupStock(stockList: IStock[]) {
      if (!this.isCarGroupingEnabled) return false;
      stockList.sort((s1, s2) => {
        return (s1.constructionType + s1.cargo?.id).localeCompare(
          s2.constructionType + s2.cargo?.id
        );
      });
    },
    generateStock(empty = false) {
-      const generatedChosenStockList = this.chosenCargoTypes.reduce((acc, type) => {
+      const generatedChosenStockList = this.chosenCargoTypes.reduce(
-        this.store.stockData?.generator.cargo[type]
+        (acc, type) => {
-          .filter((c) => !this.excludedCarTypes.includes(c.split(':')[0]))
+          this.store.vehiclesAPIData?.generator.cargo[type]
-          .forEach((c) => {
+            .filter((c) => !this.excludedCarTypes.includes(c.split(':')[0]))
-            const [type, cargoType] = c.split(':');
+            .forEach((c) => {
              const [type, cargoType] = c.split(':');
-            const carWagonObjs = this.store.carDataList.filter((cw) => cw.type.startsWith(type));
+              const carWagonObjs = this.store.carDataList.filter((cw) => cw.type.startsWith(type));
-            const cargoObjs = [] as (ICargo | undefined)[];
+              const cargoObjs = [] as (ICargo | undefined)[];
-            if (!cargoType || empty) cargoObjs.push(undefined);
+              if (!cargoType || empty) cargoObjs.push(undefined);
-            else if (cargoType == 'all') cargoObjs.push(...carWagonObjs[0]?.cargoList);
+              else if (cargoType == 'all') cargoObjs.push(...carWagonObjs[0]!.cargoTypes);
-            else cargoObjs.push(carWagonObjs[0]?.cargoList.find((cargo) => cargo.id == cargoType));
+              else
                cargoObjs.push(carWagonObjs[0]?.cargoTypes.find((cargo) => cargo.id == cargoType));
-            carWagonObjs.forEach((cw) => {
+              carWagonObjs.forEach((cw) => {
-              cargoObjs.forEach((cargoObj) => {
+                cargoObjs.forEach((cargoObj) => {
-                const chosenStock = acc.find((a) => a.constructionType.includes(cw.constructionType));
+                  const chosenStock = acc.find((a) =>
                    a.constructionType.includes(cw.constructionType)
                  );
-                if (!chosenStock)
+                  if (!chosenStock)
-                  acc.push({
+                    acc.push({
-                    constructionType: cw.constructionType,
+                      constructionType: cw.constructionType,
-                    carPool: [{ carWagon: cw, cargo: cargoObj }],
+                      carPool: [{ carWagon: cw, cargo: cargoObj }],
-                  });
+                    });
-                else chosenStock.carPool.push({ carWagon: cw, cargo: cargoObj });
+                  else chosenStock.carPool.push({ carWagon: cw, cargo: cargoObj });
                });
              });
            });
          });
-        return acc;
+          return acc;
-      }, [] as { constructionType: string; carPool: { carWagon: ICarWagon; cargo?: ICargo }[] }[]);
+        },
        [] as {
          constructionType: string;
          carPool: { carWagon: ICarWagon; cargo?: ICargo }[];
        }[]
      );
-      let bestGeneration: { stockList: IStock[]; value: number } = { stockList: [], value: 0 };
+      let bestGeneration: { stockList: IStock[]; value: number } = {
        stockList: [],
        value: 0,
      };
      for (let i = 0; i < 10; i++) {
-        const headingLoco = this.store.stockList[0]?.isLoco ? this.store.stockList[0] : undefined;
+        this.store.stockList.splice(this.store.stockList[0]?.isLoco ? 1 : 0);
        this.store.stockList.length = headingLoco ? 1 : 0;
-        const maxMass =
+        let carCount = 0;
-          this.store.acceptableMass > 0 ? Math.min(this.store.acceptableMass, this.maxMass) : this.maxMass;
+        const maxWeight =
          this.store.acceptableWeight > 0
            ? Math.min(this.store.acceptableWeight, this.maxTons * 1000)
            : this.maxTons * 1000;
-        let exceeded = false;
+        // eslint-disable-next-line no-constant-condition
-
+        while (true) {
-        while (!exceeded) {
+          const randomStockType =
-          const randomStockType = generatedChosenStockList[~~(Math.random() * generatedChosenStockList.length)];
+            generatedChosenStockList[~~(Math.random() * generatedChosenStockList.length)];
-          const { carWagon, cargo } = randomStockType.carPool[~~(Math.random() * randomStockType.carPool.length)];
+          const { carWagon, cargo } =
            randomStockType.carPool[~~(Math.random() * randomStockType.carPool.length)];
          if (
-            this.store.totalMass + (cargo?.totalMass || carWagon.mass) > maxMass ||
+            this.store.totalWeight + (carWagon.weight + (cargo?.weight ?? 0)) > maxWeight ||
            this.store.totalLength + carWagon.length > this.maxLength ||
-            this.store.stockList.length > this.maxCarCount
+            carCount >= this.maxCarCount
          ) {
            exceeded = true;
            break;
          }
          this.addCarWagon(carWagon, cargo);
          carCount++;
        }
-        const currentGenerationValue = this.store.totalLength + this.store.totalMass + this.store.stockList.length;
+        const currentGenerationValue = this.store.totalLength + this.store.totalWeight + carCount;
        if (bestGeneration.value < currentGenerationValue) {
          bestGeneration.stockList = this.store.stockList;
@@ -215,6 +274,10 @@ export default defineComponent({
        }
      }
      const bestStockList = bestGeneration.stockList;
      this.groupStock(bestStockList);
      this.store.stockList = bestGeneration.stockList;
      this.store.stockSectionMode = 'stock-list';
    },
@@ -261,6 +324,11 @@ export default defineComponent({
@import '../../styles/global.scss';
@import '../../styles/tab.scss';
 h2 {
  margin-top: 0;
  margin-bottom: 0.5em;
 }
 .generator_cargo,
 .generator_vehicles {
  display: grid;
@@ -277,13 +345,6 @@ export default defineComponent({
    background-color: $secondaryColor;
    &[data-chosen='true'] {
      background-color: $accentColor;
      color: black;
      box-shadow: 0 0 5px 1px $accentColor;
    }
    &[data-excluded='true'] {
      background-color: gray;
      box-shadow: none;
@@ -308,6 +369,12 @@ export default defineComponent({
  gap: 1em;
 }
 .generator_options {
  display: flex;
  flex-direction: column;
  gap: 0.5em;
 }
 .generator_warning {
  background-color: $accentColor;
  padding: 0.5em;
@@ -316,4 +383,3 @@ export default defineComponent({
  color: black;
 }
 </style>
@@ -1,108 +1,150 @@
 <template>
  <section class="stock-list-tab">
-    <div class="stock_controls" :data-disabled="store.chosenStockListIndex == -1">
+    <div class="tab_header">
-      <b class="no">
+      <h2>{{ $t('stocklist.title') }}</h2>
-        POJAZD NR <span class="text--accent">{{ store.chosenStockListIndex + 1 }}</span> &nbsp;
+    </div>
-      </b>
+
    <div class="stock_actions">
      <button class="btn btn--image" @click="clickFileInput">
        <input type="file" @change="uploadStock" ref="conFile" accept=".con,.txt" />
        <img src="/images/icon-upload.svg" alt="upload icon" />
        {{ $t('stocklist.action-upload') }}
      </button>
      <button
-        class="btn"
+        class="btn btn--image"
        :data-disabled="stockIsEmpty"
        :disabled="stockIsEmpty"
        @click="downloadStock"
      >
        <img src="/images/icon-download.svg" alt="download icon" />
        {{ $t('stocklist.action-download') }}
      </button>
      <button
        class="btn btn--image"
        :data-disabled="stockIsEmpty"
        :disabled="stockIsEmpty"
        @click="copyToClipboard"
      >
        <img src="/images/icon-copy.svg" alt="copy icon" />
        {{ $t('stocklist.action-copy') }}
      </button>
      <button
        class="btn btn--image"
        :data-disabled="stockIsEmpty"
        :disabled="stockIsEmpty"
        @click="resetStock"
      >
        <img src="/images/icon-reset.svg" alt="reset icon" />
        {{ $t('stocklist.action-reset') }}
      </button>
      <button
        class="btn btn--image"
        :data-disabled="stockIsEmpty"
        :disabled="stockIsEmpty"
        @click="shuffleCars"
      >
        <img src="/images/icon-shuffle.svg" alt="shuffle icon" />
        {{ $t('stocklist.action-shuffle') }}
      </button>
    </div>
    <div class="stock_controls" :data-disabled="store.chosenStockListIndex == -1">
      <button
        class="btn btn--image"
        :tabindex="store.chosenStockListIndex == -1 ? -1 : 0"
        @click="moveUpStock(store.chosenStockListIndex)"
      >
        <img :src="getIconURL('higher')" alt="move up vehicle" />
-        PRZENIEŚ WYŻEJ
+        {{ $t('stocklist.action-move-up') }}
      </button>
      <button
-        class="btn"
+        class="btn btn--image"
        :tabindex="store.chosenStockListIndex == -1 ? -1 : 0"
        @click="moveDownStock(store.chosenStockListIndex)"
      >
        <img :src="getIconURL('lower')" alt="move down vehicle" />
-        PRZENIEŚ NIŻEJ
+        {{ $t('stocklist.action-move-down') }}
      </button>
      <button
-        class="btn"
+        class="btn btn--image"
        :tabindex="store.chosenStockListIndex == -1 ? -1 : 0"
        @click="removeStock(store.chosenStockListIndex)"
      >
        <img :src="getIconURL('remove')" alt="remove vehicle" />
-        USUŃ
+        {{ $t('stocklist.action-remove') }}
      </button>
    </div>
    <div class="stock_actions">
      <label class="file-label">
        <div class="btn">WCZYTAJ</div>
        <input type="file" @change="uploadStock" ref="conFile" accept=".con,.txt" />
      </label>
      <button class="btn" :data-disabled="stockIsEmpty" :disabled="stockIsEmpty" @click="downloadStock">POBIERZ</button>
      <button class="btn" :data-disabled="stockIsEmpty" :disabled="stockIsEmpty" @click="copyToClipboard">
        SKOPIUJ
      </button>
      <button class="btn" :data-disabled="stockIsEmpty" :disabled="stockIsEmpty" @click="resetStock">ZRESETUJ</button>
      <button class="btn" :data-disabled="stockIsEmpty" :disabled="stockIsEmpty" @click="shuffleCars">PRZETASUJ</button>
    </div>
    <div class="stock_specs">
-      <b class="real-stock-info" v-if="store.chosenRealStock">
+      <b class="real-stock-info" v-if="chosenRealComposition">
        <span class="text--accent">
-          <img :src="getIconURL(store.chosenRealStock.type)" :alt="store.chosenRealStock.type" />
+          <img :src="getIconURL(chosenRealComposition.type)" :alt="chosenRealComposition.type" />
-          {{ store.chosenRealStock.number }} {{ store.chosenRealStock.name }}
+          {{ chosenRealComposition.number }} {{ chosenRealComposition.name }}
        </span>
        |
      </b>
      <span>
-        Masa: <span class="text--accent">{{ store.totalMass }}t</span> (dopuszczalna:
+        {{ $t('stocklist.mass') }}
-        <span class="text--accent">{{ store.acceptableMass ? store.acceptableMass + 't' : '-' }}</span
+        <span class="text--accent">{{ (store.totalWeight / 1000).toFixed(1) }}t</span>
-        >) - Długość:
+        ({{ $t('stocklist.mass-accepted') }}:
        <span class="text--accent">{{
          store.acceptableWeight ? `${~~(store.acceptableWeight / 1000)}t` : '-'
        }}</span
        >) - {{ $t('stocklist.length') }}:
        <span class="text--accent">{{ store.totalLength }}m</span>
-        - vMax: <span class="text--accent">{{ store.maxStockSpeed }} km/h</span>
+        - {{ $t('stocklist.vmax') }}
        <span tabindex="0" :data-tooltip="$t('stocklist.disclaimer')">(?)</span>:
        <span class="text--accent">{{ store.maxStockSpeed }} km/h</span>
      </span>
    </div>
-    <div class="stock_cold-start">
+    <div class="stock_spawn-settings">
-      <label>
+      <Checkbox v-if="store.stockSupportsColdStart" v-model="store.isColdStart">
-        <input
+        {{ $t('stocklist.coldstart-info') }}
-          type="checkbox"
+      </Checkbox>
-          v-model="store.isColdStart"
+
-          :disabled="!locoSupportsColdStart(store.stockList[0]?.constructionType || '')"
+      <Checkbox v-if="store.stockSupportsDoubleManning" v-model="store.isDoubleManned">
-        />
+        {{ $t('stocklist.doublemanning-info') }}
-        Zimny start lokomotywy czołowej (tylko elektrowozy typów 303E i 203E)
+      </Checkbox>
      </label>
    </div>
    <div class="stock_warnings" v-if="stockHasWarnings">
      <div class="warning" v-if="locoNotSuitable">
-        Lokomotywy EP07 i EP08 są przeznaczone jedynie do ruchu pasażerskiego!
+        (!) {{ $t('stocklist.warning-not-suitable') }}
      </div>
      <div class="warning" v-if="trainTooLong && store.isTrainPassenger">
-        Maksymalna długość składów pasażerskich nie może przekraczać 350m!
+        (!) {{ $t('stocklist.warning-passenger-too-long') }}
      </div>
      <div class="warning" v-if="trainTooLong && !store.isTrainPassenger">
-        Maksymalna długość składów innych niż pasażerskie nie może przekraczać 650m!
+        (!) {{ $t('stocklist.warning-freight-too-long') }}
      </div>
      <div class="warning" v-if="trainTooHeavy">
-        Ten skład jest za ciężki! Sprawdź
+        (!)
-        <a
+        <i18n-t keypath="stocklist.warning-too-heavy">
-          target="_blank"
+          <template #href>
-          href="https://docs.google.com/spreadsheets/d/1bFXUsHsAu4youmNz-46Q1HslZaaoklvfoBDS553TnNk/edit"
+            <a
-        >
+              target="_blank"
-          dopuszczalne masy składów
+              href="https://docs.google.com/spreadsheets/d/1KVa5vn2d8XGkXQFwbavVudwKqUQxbLOucHWs2VYqAUE"
-        </a>
+            >
              {{ $t('stocklist.acceptable-mass-docs') }}
            </a>
          </template>
        </i18n-t>
      </div>
-      <div class="warning" v-if="tooManyLocomotives">Ten skład posiada za dużo pojazdów trakcyjnych!</div>
+      <div class="warning" v-if="tooManyLocomotives">
        {{ $t('stocklist.warning-too-many-locos') }}
      </div>
    </div>
    <StockThumbnails :onListItemClick="onListItemClick" />
@@ -110,10 +152,10 @@
    <!-- Stock list -->
    <ul ref="stock_list">
      <li v-if="stockIsEmpty" class="list-empty">
-        <div class="stock-info">Lista pojazdów jest pusta!</div>
+        <div class="stock-info">{{ $t('stocklist.list-empty') }}</div>
      </li>
-      <TransitionGroup name="stock-list-anim">
+      <TransitionGroup name="stock-list-anim" v-else>
        <li
          v-for="(stock, i) in store.stockList"
          :key="stock.id"
@@ -138,14 +180,18 @@
              {{ i + 1 }}.
            </span>
-            <span class="stock-info__type" :class="{ supporter: stock.supportersOnly }">
+            <span class="stock-info__type" :class="{ sponsor: stock.isSponsorsOnly }">
              {{ stock.isLoco ? stock.type : getCarSpecFromType(stock.type) }}
            </span>
-            <span class="stock-info__cargo" v-if="stock.cargo"> {{ stock.cargo.id }} </span>
+            <span class="stock-info__cargo" v-if="stock.cargo">
-            <span class="stock-info__length"> {{ stock.length }}m </span>
+              {{ stock.cargo.id }}
-            <span class="stock-info__mass">{{ stock.cargo ? stock.cargo.totalMass : stock.mass }}t </span>
+            </span>
-            <span class="stock-info__speed"> {{ stock.maxSpeed }}km/h </span>
+            <span class="stock-info__length">{{ stock.length }}m</span>
            <span class="stock-info__mass"
              >{{ ((stock.weight + (stock.cargo?.weight ?? 0)) / 1000).toFixed(1) }}t</span
            >
            <span class="stock-info__speed">{{ stock.maxSpeed }}km/h</span>
          </div>
        </li>
      </TransitionGroup>
@@ -155,20 +201,19 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import TrainImage from '../sections/TrainImageSection.vue';
 import { useStore } from '../../store';
 import { locoSupportsColdStart } from '../../utils/locoUtils';
 import warningsMixin from '../../mixins/warningsMixin';
 import imageMixin from '../../mixins/imageMixin';
 import stockPreviewMixin from '../../mixins/stockPreviewMixin';
 import StockThumbnails from '../utils/StockThumbnails.vue';
 import stockMixin from '../../mixins/stockMixin';
 import Checkbox from '../common/Checkbox.vue';
 export default defineComponent({
  name: 'stock-list',
-  components: { TrainImage, StockThumbnails },
+  components: { StockThumbnails, Checkbox },
  mixins: [warningsMixin, imageMixin, stockMixin, stockPreviewMixin],
@@ -182,19 +227,28 @@ export default defineComponent({
  data: () => ({
    imageOffsetY: 0,
    draggedVehicleID: -1,
    stockActions: [{}],
  }),
  computed: {
    stockString() {
      if (this.store.stockList.length == 0) return '';
      const includeColdStart = this.store.isColdStart && this.store.stockSupportsColdStart;
      const includeDoubleManned =
        this.store.isDoubleManned && this.store.stockSupportsDoubleManning;
      return this.store.stockList
        .map((stock, i) => {
-          let stockTypeStr = stock.isLoco || !stock.cargo ? stock.type : `${stock.type}:${stock.cargo.id}`;
+          let stockTypeStr =
-          let coldStart =
+            stock.isLoco || !stock.cargo ? stock.type : `${stock.type}:${stock.cargo.id}`;
            i == 0 && this.store.isColdStart && locoSupportsColdStart(stock.constructionType || '') ? ',c' : '';
-          return stockTypeStr + coldStart;
+          if (i == 0 && (includeColdStart || includeDoubleManned))
            return `${stockTypeStr},${includeColdStart ? 'c' : ''}${includeDoubleManned ? 'd' : ''}`;
          return stockTypeStr;
        })
        .join(';');
    },
@@ -204,30 +258,44 @@ export default defineComponent({
    },
    chosenStockVehicle() {
-      return this.store.chosenStockListIndex == -1 ? undefined : this.store.stockList[this.store.chosenStockListIndex];
+      return this.store.chosenStockListIndex == -1
        ? undefined
        : this.store.stockList[this.store.chosenStockListIndex];
    },
    stockHasWarnings() {
-      return this.tooManyLocomotives || this.trainTooHeavy || this.trainTooLong || this.locoNotSuitable;
+      return (
        this.tooManyLocomotives || this.trainTooHeavy || this.trainTooLong || this.locoNotSuitable
      );
    },
    chosenRealComposition() {
      const currentStockString = this.store.stockList.map((s) => s.type).join(';');
      return this.store.realCompositionList.find((rc) => rc.stockString == currentStockString);
    },
  },
  methods: {
    locoSupportsColdStart,
    copyToClipboard() {
      navigator.clipboard.writeText(this.stockString);
      setTimeout(() => {
-        alert('Pociąg został skopiowany do schowka!');
+        alert(this.$t('stocklist.alert-copied'));
      }, 20);
    },
    clickFileInput() {
      (this.$refs['conFile'] as HTMLInputElement).click();
    },
    onListItemClick(stockID: number) {
      const stock = this.store.stockList[stockID];
      this.store.chosenStockListIndex =
-        this.store.chosenStockListIndex == stockID && this.store.chosenVehicle?.type == stock.type ? -1 : stockID;
+        this.store.chosenStockListIndex == stockID && this.store.chosenVehicle?.type == stock.type
          ? -1
          : stockID;
      if (this.store.chosenStockListIndex == -1) {
        this.store.chosenVehicle = null;
@@ -313,7 +381,8 @@ export default defineComponent({
        availableIndexes.splice(i, -1);
-        const randAvailableIndex = availableIndexes[Math.floor(Math.random() * availableIndexes.length)];
+        const randAvailableIndex =
          availableIndexes[Math.floor(Math.random() * availableIndexes.length)];
        const tempSwap = this.store.stockList[randAvailableIndex];
        this.store.stockList[randAvailableIndex] = this.store.stockList[i];
@@ -322,16 +391,13 @@ export default defineComponent({
    },
    downloadStock() {
-      if (this.store.stockList.length == 0) return alert('Lista pojazdów jest pusta!');
+      if (this.store.stockList.length == 0) return alert(this.$t('stocklist.alert-empty'));
-      const defaultName = `${this.store.chosenRealStockName || this.store.stockList[0].type} ${
+      const defaultName = `${this.chosenRealComposition ? this.chosenRealComposition.stockId + ' ' : ''}${this.store.stockList[0].type} ${(this.store.totalWeight / 1000).toFixed(1)}t; ${
-        this.store.totalMass
+        this.store.totalLength
-      }t; ${this.store.totalLength}m; vmax ${this.store.maxStockSpeed}`;
+      }m; vmax ${this.store.maxStockSpeed}`;
-      const fileName = prompt(
+      const fileName = prompt(this.$t('stocklist.prompt-file'), defaultName);
        'Nazwij plik, a następnie pobierz do folderu Presets (Dokumenty/TTSK/TrainDriver2):',
        defaultName
      );
      if (!fileName) return;
@@ -398,10 +464,12 @@ export default defineComponent({
 <style lang="scss" scoped>
@import '../../styles/global';
@import '../../styles/tab.scss';
 .stock-list-tab {
-  display: grid;
+  display: flex;
-  grid-gap: 0.5em;
+  flex-direction: column;
  gap: 0.5em;
 }
 .warning {
@@ -421,9 +489,9 @@ export default defineComponent({
  display: flex;
  justify-content: center;
  align-items: center;
  flex-wrap: wrap;
  gap: 0.5em;
  flex-wrap: wrap;
  padding: 0.5em;
@@ -438,39 +506,30 @@ export default defineComponent({
    pointer-events: none;
  }
  input#stock-count {
    width: 3em;
    margin: 0;
    padding: 0.25em;
    outline: none;
    border: none;
  }
  button {
    img {
      margin-right: 0.25em;
    }
  }
 }
 .stock_actions {
  display: grid;
  gap: 0.5em;
-  grid-template-columns: repeat(auto-fit, minmax(100px, 1fr));
+  grid-template-columns: repeat(auto-fit, minmax(150px, 1fr));
-  label.file-label {
+  button {
-    text-align: center;
+    width: 100%;
    cursor: pointer;
    input {
-      display: none;
+      opacity: 0;
      width: 0;
      height: 0;
    }
  }
 }
 .stock_spawn-settings {
  display: flex;
  gap: 0.5em;
 }
 .real-stock-info {
  img {
    height: 1.3ch;
@@ -480,7 +539,7 @@ export default defineComponent({
 ul {
  position: relative;
  overflow: auto;
-  height: 500px;
+  max-height: 500px;
 }
 ul > li {
@@ -523,7 +582,7 @@ li > .stock-info {
  }
 }
-.supporter {
+.sponsor {
  color: salmon;
 }
@@ -584,4 +643,3 @@ li > .stock-info {
  }
 }
 </style>
@@ -1,361 +1,356 @@
-<template>
+<template>
-  <section class="wiki-list tab">
+  <section class="wiki-list tab">
-    <div class="tab_header">
+    <div class="tab_header">
-      <h2>LISTA DOSTĘPNYCH POJAZDÓW</h2>
+      <h2>{{ $t('wiki.title') }}</h2>
-    </div>
+    </div>
-
+
-    <div class="tab_content">
+    <div class="tab_content">
-      <div class="actions-panel">
+      <div class="actions-panel">
-        <div class="actions-panel_vehicles">
+        <div class="actions-panel_vehicles">
-          <button class="btn btn--choice" @click="changeWikiMode('locomotives')">POJ. TRAKCYJNE</button>
+          <button
-          <button class="btn btn--choice" @click="changeWikiMode('carWagons')">WAGONY</button>
+            class="btn"
-        </div>
+            :data-chosen="currentFilterMode == 'tractions'"
-
+            @click="toggleFilter('tractions')"
-        <div class="actions-panel_search">
+          >
-          <input type="text" placeholder="Wyszukaj pojazd..." v-model="searchedVehicleTypeName" />
+            {{ $t('wiki.action-vehicles') }}
-        </div>
+          </button>
-      </div>
+          <button
-
+            class="btn"
-      <div class="table-wrapper" @scroll="scrollEvent" ref="table-wrapper">
+            :data-chosen="currentFilterMode == 'carriages'"
-        <table>
+            @click="toggleFilter('carriages')"
-          <thead>
+          >
-            <tr>
+            {{ $t('wiki.action-carriages') }}
-              <th v-for="header in wikiMode == 'locomotives' ? locoHeaders : carHeaders" @click="toggleSorter(header)">
+          </button>
-                {{ header.name }}
+        </div>
-
+
-                <span v-if="currentModeSorter.id == header.id">
+        <div class="actions-panel_search">
-                  {{ currentModeSorter.direction == 1 ? `&uArr;` : `&dArr;` }}
+          <input type="text" :placeholder="$t('wiki.search')" v-model="searchedVehicleTypeName" />
-                </span>
+        </div>
-              </th>
+      </div>
-            </tr>
+
-          </thead>
+      <div class="table-wrapper" ref="table-wrapper">
-
+        <table>
-          <tbody v-if="wikiMode == 'locomotives'">
+          <thead>
-            <tr
+            <tr>
-              v-for="loco in computedLocoList"
+              <th v-for="header in visibleHeaders" @click="toggleSorter(header)" :key="header.id">
-              @click="previewLocomotive(loco)"
+                {{ $t(`wiki.header.${header.id}`) }}
-              @keydown.enter="previewLocomotive(loco)"
+
-              @dblclick="addLocomotive(loco)"
+                <span v-if="currentSorter.id == header.id">
-              tabindex="0"
+                  {{ currentSorter.direction == 1 ? `&uArr;` : `&dArr;` }}
-            >
+                </span>
-              <td>
+              </th>
-                <img
+            </tr>
-                  :src="`https://spythere.github.io/api/td2/images/${loco.type}--300px.jpg`"
+          </thead>
-                  loading="lazy"
+
-                  :alt="`Lokomotywa ${loco.type}`"
+          <tbody>
-                />
+            <tr
-              </td>
+              v-for="{ vehicle, show } in computedTableData"
-
+              tabindex="0"
-              <td>{{ loco.type }}</td>
+              v-show="show"
-              <td>{{ vehicleTypes[loco.power] }}</td>
+              :key="vehicle.type"
-              <td>{{ loco.constructionType }}</td>
+              @click="previewVehicle(vehicle)"
-              <td>{{ locoSupportsColdStart(loco.constructionType) ? `&check;` : '&cross;' }}</td>
+              @keydown.enter="previewVehicle(vehicle)"
-              <td>{{ loco.length }}m</td>
+              @dblclick="addVehicle(vehicle)"
-              <td>{{ loco.mass }}t</td>
+            >
-              <td>{{ loco.maxSpeed }}km/h</td>
+              <td style="width: 120px">
-            </tr>
+                <img
-          </tbody>
+                  width="120"
-
+                  :src="getThumbnailURL(vehicle.type, 'small')"
-          <tbody v-else>
+                  :alt="`${vehicle.type}`"
-            <tr
+                  loading="lazy"
-              v-for="car in computedCarList"
+                  @error="(e) => ((e.target as HTMLElement).style.display = 'none')"
-              @keydow.enter="previewCarWagon(car)"
+                />
-              @click="previewCarWagon(car)"
+              </td>
-              @dblclick="addCarWagon(car)"
+
-              tabindex="0"
+              <td :data-sponsoronly="vehicle.isSponsorsOnly">
-            >
+                {{ vehicle.type }}
-              <td>
+              </td>
-                <img
+
-                  :src="`https://spythere.github.io/api/td2/images/${car.type}--300px.jpg`"
+              <td v-if="isLocomotive(vehicle)">
-                  loading="lazy"
+                {{ $t(`wiki.${vehicle.power}`) }}
-                  :alt="`Lokomotywa ${car.type}`"
+              </td>
-                />
+              <td v-else>{{ $t(`wiki.${vehicle.useType}`) }}</td>
-              </td>
+
-
+              <td>{{ vehicle.constructionType }}</td>
-              <td>{{ car.type }}</td>
+              <td>{{ vehicle.length }}m</td>
-              <td>{{ car.constructionType }}</td>
+              <td>{{ (vehicle.weight / 1000).toFixed(1) }}t</td>
-              <td>{{ car.length }}m</td>
+              <td>{{ vehicle.maxSpeed }}km/h</td>
-              <td>{{ car.mass }}t</td>
+
-              <td>{{ car.maxSpeed }}km/h</td>
+              <td v-if="currentFilterMode == 'carriages'">
-              <td>{{ car.cargoList.length == 0 ? '-' : car.cargoList.length }}</td>
+                {{ !isLocomotive(vehicle) ? vehicle.cargoTypes.length : '---' }}
-            </tr>
+              </td>
-          </tbody>
+              <td v-if="currentFilterMode == 'tractions'">
-        </table>
+                {{ isLocomotive(vehicle) ? (vehicle.coldStart ? `&check;` : '&cross;') : '---' }}
-      </div>
+              </td>
-    </div>
+            </tr>
-  </section>
+          </tbody>
-</template>
+
-
+          <span ref="table-bottom"></span>
-<script lang="ts">
+        </table>
-import { defineComponent } from 'vue';
+      </div>
-import { useStore } from '../../store';
+    </div>
-import stockPreviewMixin from '../../mixins/stockPreviewMixin';
+  </section>
-import { Vehicle } from '../../types';
+</template>
-import { isLocomotive } from '../../utils/vehicleUtils';
+
-import stockMixin from '../../mixins/stockMixin';
+<script lang="ts">
-import { locoSupportsColdStart } from '../../utils/locoUtils';
+import { defineComponent } from 'vue';
-
+import { useStore } from '../../store';
-type WikiMode = 'locomotives' | 'carWagons';
+import stockPreviewMixin from '../../mixins/stockPreviewMixin';
-type SorterID =
+import { IVehicle } from '../../types';
-  | 'type'
+import { isLocomotive } from '../../utils/vehicleUtils';
-  | 'constructionType'
+import stockMixin from '../../mixins/stockMixin';
-  | 'image'
+import imageMixin from '../../mixins/imageMixin';
-  | 'length'
+
-  | 'mass'
+type SorterID =
-  | 'maxSpeed'
+  | 'type'
-  | 'cargoCount'
+  | 'constructionType'
-  | 'power'
+  | 'image'
-  | 'coldStart';
+  | 'length'
-
+  | 'weight'
-interface WikiHeader {
+  | 'maxSpeed'
-  name: string;
+  | 'cargoCount'
-  id: SorterID;
+  | 'group'
-  sortable: boolean;
+  | 'coldStart';
-}
+
-
+interface IWikiHeader {
-const locoHeaders: WikiHeader[] = [
+  id: SorterID;
-  { name: 'Zdjęcie', id: 'image', sortable: false },
+  sortable: boolean;
-  { name: 'Nazwa', id: 'type', sortable: true },
+  for: 'all' | 'carriages' | 'tractions';
-  { name: 'Rodzaj', id: 'power', sortable: true },
+}
-  { name: 'Konstrukcja', id: 'constructionType', sortable: true },
+
-  { name: 'Zimny start', id: 'coldStart', sortable: true },
+interface IWikiRow {
-  { name: 'Długość', id: 'length', sortable: true },
+  vehicle: IVehicle;
-  { name: 'Masa', id: 'mass', sortable: true },
+  show: boolean;
-  { name: 'Prędkość', id: 'maxSpeed', sortable: true },
+}
-];
+
-
+const headers: IWikiHeader[] = [
-const carHeaders: WikiHeader[] = [
+  { id: 'image', sortable: false, for: 'all' },
-  { name: 'Zdjęcie', id: 'image', sortable: false },
+  { id: 'type', sortable: true, for: 'all' },
-  { name: 'Nazwa', id: 'type', sortable: true },
+  { id: 'group', sortable: true, for: 'all' },
-  { name: 'Konstrukcja', id: 'constructionType', sortable: true },
+  { id: 'constructionType', sortable: true, for: 'all' },
-  { name: 'Długość', id: 'length', sortable: true },
+  { id: 'length', sortable: true, for: 'all' },
-  { name: 'Masa', id: 'mass', sortable: true },
+  { id: 'weight', sortable: true, for: 'all' },
-  { name: 'Prędkość', id: 'maxSpeed', sortable: true },
+  { id: 'maxSpeed', sortable: true, for: 'all' },
-  { name: 'Ładunki', id: 'cargoCount', sortable: true },
+  { id: 'coldStart', sortable: true, for: 'tractions' },
-];
+  { id: 'cargoCount', sortable: true, for: 'carriages' },
-
+];
-const vehicleTypes: { [key: string]: string } = {
+
-  'loco-ezt': 'EZT',
+export default defineComponent({
-  'loco-szt': 'SZT',
+  mixins: [stockPreviewMixin, stockMixin, imageMixin],
-  'loco-s': 'Spalinowóz',
+
-  'loco-e': 'Elektrowóz',
+  data() {
-};
+    return {
-
+      store: useStore(),
-export default defineComponent({
+      headers,
-  mixins: [stockPreviewMixin, stockMixin],
+
-
+      scrollTop: 0,
-  data() {
+
-    return {
+      searchedVehicleTypeName: '',
-      store: useStore(),
+
-      locoHeaders,
+      currentSorter: {
-      carHeaders,
+        id: 'type' as SorterID,
-      vehicleTypes,
+        direction: 1,
-
+      },
-      locosScrollTop: 0,
+
-      carsScrollTop: 0,
+      currentFilterMode: 'all' as 'all' | 'tractions' | 'carriages',
-
+    };
-      wikiMode: 'locomotives' as WikiMode,
+  },
-      searchedVehicleTypeName: '',
+
-
+  activated() {
-      currentLocoSorter: {
+    const tableWrapperRef = this.$refs['table-wrapper'] as HTMLElement;
-        id: 'type' as SorterID,
+
-        direction: 1,
+    tableWrapperRef.scrollTo({
-      },
+      top: this.scrollTop,
-
+    });
-      currentCarSorter: {
+  },
-        id: 'type' as SorterID,
+
-        direction: 1,
+  methods: {
-      },
+    isLocomotive,
-    };
+
-  },
+    toggleFilter(name: typeof this.currentFilterMode) {
-
+      this.currentFilterMode = this.currentFilterMode == name ? 'all' : name;
-  activated() {
+    },
-    const tableWrapperRef = this.$refs['table-wrapper'] as HTMLElement;
+
-    tableWrapperRef.scrollTo({ top: this.wikiMode == 'locomotives' ? this.locosScrollTop : this.carsScrollTop });
+    toggleSorter(header: IWikiHeader) {
-  },
+      if (!header.sortable) return;
-
+
-  methods: {
+      if (header.id == this.currentSorter.id) this.currentSorter.direction *= -1;
-    locoSupportsColdStart,
+      this.currentSorter.id = header.id;
-
+    },
-    scrollEvent(e: Event) {
+
-      const tableScrollTop = (e.target as HTMLElement).scrollTop;
+    sortTableRows(row1: IWikiRow, row2: IWikiRow) {
-
+      if (!row1.show) return 0;
-      if (this.wikiMode == 'locomotives') this.locosScrollTop = tableScrollTop;
+
-      else this.carsScrollTop = tableScrollTop;
+      const { id, direction } = this.currentSorter;
-    },
+
-
+      switch (id) {
-    changeWikiMode(wikiMode: WikiMode) {
+        case 'type':
-      this.searchedVehicleTypeName = '';
+        case 'constructionType':
-      this.wikiMode = wikiMode;
+        case 'group':
-    },
+          return direction == 1
-
+            ? row1.vehicle[id].localeCompare(row2.vehicle[id])
-    toggleSorter(header: WikiHeader) {
+            : row2.vehicle[id].localeCompare(row1.vehicle[id]);
-      if (!header.sortable) return;
+
-
+        case 'weight':
-      if (header.id == this.currentModeSorter.id) this.currentModeSorter.direction *= -1;
+        case 'length':
-      this.currentModeSorter.id = header.id;
+        case 'maxSpeed':
-    },
+          return Math.sign(row1.vehicle[id] - row2.vehicle[id]) * direction;
-
+
-    sortVehicles(vA: Vehicle, vB: Vehicle) {
+        case 'cargoCount':
-      const { id, direction } = this.currentModeSorter;
+          return (
-      const vehiclesAreLocos = isLocomotive(vA) && isLocomotive(vB);
+            (!isLocomotive(row1.vehicle) ? Math.sign(row1.vehicle.cargoTypes.length || -1) : -1) -
-      const vehiclesAreCars = !isLocomotive(vA) && !isLocomotive(vB);
+            (!isLocomotive(row2.vehicle) ? (row2.vehicle.cargoTypes.length || -1) * direction : -1)
-
+          );
-      switch (id) {
+
-        case 'type':
+        case 'coldStart':
-        case 'constructionType':
+          return (
-          return direction == 1 ? vA[id].localeCompare(vB[id]) : vB[id].localeCompare(vA[id]);
+            ((isLocomotive(row1.vehicle) && row1.vehicle.coldStart ? 1 : -1) -
-
+              (isLocomotive(row2.vehicle) && row2.vehicle.coldStart ? 1 : -1)) *
-        case 'mass':
+            direction
-        case 'length':
+          );
-        case 'maxSpeed':
+
-          return Math.sign(vA[id] - vB[id]) * direction;
+        default:
-
+          break;
-        case 'cargoCount':
+      }
-          if (vehiclesAreCars) return Math.sign((vA.cargoList.length || -1) - (vB.cargoList.length || -1)) * direction;
+
-
+      return direction == 1
-        case 'coldStart':
+        ? row1.vehicle.type.localeCompare(row2.vehicle.type)
-          if (vehiclesAreLocos)
+        : row2.vehicle.type.localeCompare(row1.vehicle.type);
-            return (
+    },
-              (locoSupportsColdStart(vA.constructionType) > locoSupportsColdStart(vB.constructionType) ? 1 : -1) *
+  },
-              direction
+
-            );
+  computed: {
-
+    computedTableData(): IWikiRow[] {
-        default:
+      return this.store.vehicleDataList
-          break;
+        .map((vehicle) => ({
-      }
+          vehicle,
-
+          show:
-      return direction == 1 ? vA.type.localeCompare(vB.type) : vB.type.localeCompare(vA.type);
+            new RegExp(`${this.searchedVehicleTypeName.trim()}`, 'i').test(vehicle.type) &&
-    },
+            (this.currentFilterMode == 'all' ||
-  },
+              (this.currentFilterMode == 'tractions' && isLocomotive(vehicle)) ||
-
+              (this.currentFilterMode == 'carriages' && !isLocomotive(vehicle))),
-  computed: {
+        }))
-    currentModeSorter() {
+        .sort((a, b) => this.sortTableRows(a, b));
-      return this.wikiMode == 'carWagons' ? this.currentCarSorter : this.currentLocoSorter;
+    },
-    },
+
-
+    visibleHeaders() {
-    computedLocoList() {
+      const filtersActive = this.currentFilterMode;
-      const trimmedSearchValue = this.searchedVehicleTypeName.trim();
+
-
+      return this.headers.filter((header) => header.for == 'all' || header.for == filtersActive);
-      return this.store.locoDataList
+    },
-        .filter((loco) => new RegExp(`${trimmedSearchValue}`, 'i').test(loco.type))
+
-        .sort(this.sortVehicles);
+    areTractionVehiclesShown() {
-    },
+      return this.currentFilterMode == 'all' || this.currentFilterMode == 'tractions';
-
+    },
-    computedCarList() {
+
-      const trimmedSearchValue = this.searchedVehicleTypeName.trim();
+    areCarriagesShown() {
-
+      return this.currentFilterMode == 'all' || this.currentFilterMode == 'carriages';
-      return this.store.carDataList
+    },
-        .filter((car) => new RegExp(`${trimmedSearchValue}`, 'i').test(car.type))
+  },
-        .sort(this.sortVehicles);
+});
-    },
+</script>
-  },
+
-});
+<style lang="scss" scoped>
-</script>
+@import '../../styles/tab.scss';
-
+
-<style lang="scss" scoped>
+.actions-panel {
-@import '../../styles/tab.scss';
+  display: flex;
-
+  justify-content: space-between;
-.actions-panel {
+  align-items: center;
-  display: flex;
+
-  justify-content: space-between;
+  flex-wrap: wrap;
-  align-items: center;
+  gap: 0.5em;
-
+
-  flex-wrap: wrap;
+  margin: 0.5em 0;
-  gap: 0.5em;
+}
-
+
-  margin: 0.5em 0;
+.actions-panel_vehicles {
-}
+  display: flex;
-
+  gap: 0.5em;
-.actions-panel_vehicles {
+}
-  display: flex;
+
-  gap: 0.5em;
+.actions-panel_search {
-}
+  input {
-
+    width: auto;
-.actions-panel_search {
+  }
-  input {
+}
-    width: auto;
+
-  }
+.table-wrapper {
-}
+  overflow: auto;
-
+  height: 750px;
-.table-wrapper {
+  max-height: 95vh;
-  overflow: auto;
+}
-  height: 750px;
+
-  max-height: 95vh;
+.wiki-list table {
-}
+  border-collapse: collapse;
-
+  width: 100%;
-.wiki-list table {
+
-  border-collapse: collapse;
+  thead {
-  width: 100%;
+    position: sticky;
-
+    top: 0;
-  thead {
+  }
-    position: sticky;
+
-    top: 0;
+  th {
-  }
+    background-color: #111;
-
+    padding: 0.5em;
-  th {
+    user-select: none;
-    background-color: #111;
+    -moz-user-select: none;
-    padding: 0.5em;
+    -webkit-user-select: none;
-    user-select: none;
+  }
-    -moz-user-select: none;
+
-    -webkit-user-select: none;
+  tr {
-  }
+    cursor: pointer;
-
+    background-color: #333;
-  tr {
+
-    cursor: pointer;
+    &:first-child {
-    background-color: #333;
+      min-width: 120px;
-
+    }
-    &:nth-child(odd) {
+
-      background-color: #444;
+    &:nth-child(odd) {
-    }
+      background-color: #444;
-
+    }
-    &:hover {
+
-      background-color: #666;
+    &:hover {
-    }
+      background-color: #666;
-  }
+    }
-
+  }
-  td {
+
-    text-align: center;
+  td {
-    padding: 0.25em;
+    text-align: center;
-    height: 85px;
+    height: 70px;
-  }
+    padding: 0.25em;
-
+
-  td:first-child {
+    &[data-sponsoronly='true'] {
-    width: 120px;
+      color: salmon;
-  }
+    }
-
+  }
-  td img {
+}
-    display: block;
+
-    width: 120px;
+@media screen and (max-width: $breakpointMd) {
-  }
+  .wiki-list table {
-}
+    th {
-
+      min-width: 100px;
-@media screen and (max-width: $breakpointMd) {
+    }
-  .wiki-list table {
+
-    td {
+    img {
-      width: 100px;
+      max-width: 100px;
-      height: auto;
+    }
-
+  }
-      img {
+}
-        width: 6em;
+
-      }
+@media screen and (max-width: $breakpointSm) {
-    }
+  .actions-panel {
-  }
+    align-items: stretch;
-}
+    flex-direction: column;
-
+  }
-@media screen and (max-width: $breakpointSm) {
+
-  .actions-panel {
+  .actions-panel_vehicles {
-    align-items: stretch;
+    display: grid;
-    flex-direction: column;
+    grid-template-columns: 1fr 1fr;
-  }
+  }
-  
+
-  .actions-panel_vehicles {
+  .actions-panel_search {
-    display: grid;
+    display: grid;
-    grid-template-columns: 1fr 1fr;
+  }
-  }
+}
-
+</style>
  .actions-panel_search {
    display: grid;
  }
 }
 </style>
@@ -1,52 +1,52 @@
-<template>
+<template>
-  <div
+  <div
-    class="image-preview"
+    class="image-preview"
-    @click="store.vehiclePreviewSrc = ''"
+    @click="store.vehiclePreviewSrc = ''"
-    @keydown.esc="store.vehiclePreviewSrc = ''"
+    @keydown.esc="store.vehiclePreviewSrc = ''"
-    tabindex="0"
+    tabindex="0"
-  >
+  >
-    <img :src="store.vehiclePreviewSrc" alt="preview" />
+    <img :src="store.vehiclePreviewSrc" alt="preview" />
-  </div>
+  </div>
-</template>
+</template>
-
+
-<script lang="ts">
+<script lang="ts">
-import { defineComponent } from 'vue';
+import { defineComponent } from 'vue';
-import { useStore } from '../../store';
+import { useStore } from '../../store';
-
+
-export default defineComponent({
+export default defineComponent({
-  data() {
+  data() {
-    return {
+    return {
-      store: useStore(),
+      store: useStore(),
-    };
+    };
-  },
+  },
-
+
-  mounted() {
+  mounted() {
-    this.$el.focus();
+    this.$el.focus();
-  },
+  },
-});
+});
-</script>
+</script>
-
+
-<style lang="scss" scoped>
+<style lang="scss" scoped>
-.image-preview {
+.image-preview {
-  position: fixed;
+  position: fixed;
-  top: 0;
+  top: 0;
-  left: 0;
+  left: 0;
-  z-index: 99;
+  z-index: 99;
-
+
-  display: flex;
+  display: flex;
-  justify-content: center;
+  justify-content: center;
-  align-items: center;
+  align-items: center;
-
+
-  width: 100%;
+  width: 100%;
-  height: 100%;
+  height: 100%;
-
+
-  background: rgba(black, 0.85);
+  background: rgba(black, 0.85);
-  cursor: zoom-out;
+  cursor: zoom-out;
-
+
-  img {
+  img {
-    max-width: 100%;
+    max-width: 100%;
-    height: auto;
+    height: auto;
-    max-height: 100%;
+    max-height: 100%;
-  }
+  }
-}
+}
-</style>
+</style>
@@ -1,28 +1,28 @@
 <template>
-  <div class="stock_thumbnails" ref="thumbnailsRef">
+  <div class="stock-thumbnails" ref="thumbnailsRef">
    <div
      class="thumbnail-item"
      v-for="(stock, stockIndex) in store.stockList"
      :key="stockIndex"
      :data-selected="store.chosenStockListIndex == stockIndex"
      :data-sponsor="stock.isSponsorsOnly"
      draggable="true"
      @dragstart="onDragStart(stockIndex)"
      @drop="onDrop($event, stockIndex)"
      @dragover="allowDrop"
      @click="onListItemClick(stockIndex)"
    >
-      <span @click="onListItemClick(stockIndex)" :key="stock.id">
+      <b>
-        <b :class="{ supporter: stock.supportersOnly }">
+        {{ stock.type }}
-          {{ stock.type }}
+      </b>
        </b>
-        <span>
+      <img
-          <img
+        draggable="false"
-            draggable="false"
+        :src="`https://rj.td2.info.pl/dist/img/thumbnails/${stock.type}.png`"
-            :src="`https://rj.td2.info.pl/dist/img/thumbnails/${stock.type}.png`"
+        :alt="stock.type"
-            :alt="stock.type"
+        :title="stock.type"
-            :title="stock.type"
+        @error="stockImageError($event, stock)"
-            @error="stockImageError($event, stock)"
+      />
          />
        </span>
      </span>
    </div>
  </div>
 </template>
@@ -54,7 +54,11 @@ watch(
    nextTick(() => {
      (thumbnailsRef.value as HTMLElement)
        .querySelector(`div:nth-child(${index + 1})`)
-        ?.scrollIntoView({ block: 'nearest', inline: 'start', behavior: 'smooth' });
+        ?.scrollIntoView({
          block: 'nearest',
          inline: 'start',
          behavior: 'smooth',
        });
    });
  }
 );
@@ -84,42 +88,45 @@ const allowDrop = (e: DragEvent) => {
 </script>
 <style lang="scss" scoped>
-.stock_thumbnails {
+.stock-thumbnails {
  display: flex;
  overflow: auto;
  background-color: #353a57;
 }
-  > div {
+.thumbnail-item {
-    display: flex;
+  display: flex;
-    align-items: flex-end;
+  align-items: center;
-    cursor: pointer;
+  justify-content: space-between;
    min-height: 100px;
-    &[data-selected='true'] {
+  flex-direction: column;
-      background-color: rebeccapurple;
+  gap: 0.5em;
    }
-    > span {
+  padding-top: 0.5em;
      display: flex;
      flex-direction: column;
      gap: 0.5em;
      padding: 0.5em 0;
-      text-align: center;
+  cursor: pointer;
  min-height: 100px;
  font-size: 0.85em;
-      font-size: 0.85em;
+  user-select: none;
-      user-select: none;
+  -moz-user-select: none;
-      -moz-user-select: none;
+  -webkit-user-select: none;
-    }
+
  &[data-selected='true'] {
    background-color: rebeccapurple;
  }
  b {
    color: #ccc;
    margin: 0 1em;
  }
  &[data-sponsor='true'] > b {
    color: salmon;
  }
  img {
    max-height: 60px;
  }
 }
 .supporter {
  color: salmon;
 }
 </style>
@@ -0,0 +1,11 @@
 {
  "EU06": [650000, 2000000],
  "EU07": [650000, 2000000],
  "4E": [650000, 2000000],
  "EU07E": [650000, 2000000],
  "EP07": [650000, 650000],
  "EP08": [650000, 650000],
  "EP09": [800000, 800000],
  "ET41": [700000, 4000000],
  "SM42": [2400000, 2400000]
 }
@@ -1,38 +1,71 @@
 {
  "regionNumbers": {
-    "Warszawa": 1,
+    "Warszawa (1)": 1,
-    "Lublin": 2,
+    "Lublin (2)": 2,
-    "Kraków": 3,
+    "Kraków (3)": 3,
-    "Sosnowiec": 4,
+    "Sosnowiec (4)": 4,
-    "Gdańsk": 5,
+    "Gdańsk (5)": 5,
-    "Wrocław": 6,
+    "Wrocław (6)": 6,
-    "Poznań": 7,
+    "Poznań (7)": 7,
-    "Szczecin": 8,
+    "Szczecin (8)": 8,
-    "Rezerwa": 9
+    "Rezerwa (9)": 9
  },
  "sameRegions": {
    "Losowy": [
-      10, 11, 19, 91, 93, 97, 99, 20, 22, 29, 30, 33, 39, 40, 44, 49, 94, 50, 55, 59, 90, 95, 96, 66, 60, 69, 77, 70,
+      10, 11, 19, 91, 93, 97, 99, 20, 22, 29, 30, 33, 39, 40, 44, 49, 94, 50, 55, 59, 90, 95, 96,
-      79, 88, 80, 89, 92, 98
+      66, 60, 69, 77, 70, 79, 88, 80, 89, 92, 98
    ],
-    "Warszawa": [10, 11, 19, 91, 93, 97, 99],
+    "Warszawa (1)": [10, 11, 19, 91, 93, 97, 99],
-    "Lublin": [20, 22, 29],
+    "Lublin (2)": [20, 22, 29],
-    "Kraków": [30, 33, 39],
+    "Kraków (3)": [30, 33, 39],
-    "Sosnowiec": [40, 44, 49, 94],
+    "Sosnowiec (4)": [40, 44, 49, 94],
-    "Gdańsk": [50, 55, 59, 90, 95, 96],
+    "Gdańsk (5)": [50, 55, 59, 90, 95, 96],
-    "Wrocław": [66, 60, 69],
+    "Wrocław (6)": [66, 60, 69],
-    "Poznań": [77, 70, 79],
+    "Poznań (7)": [77, 70, 79],
-    "Szczecin": [88, 80],
+    "Szczecin (8)": [88, 80],
-    "Rezerwa": [89, 92, 98]
+    "Rezerwa (9)": [89, 92, 98]
  },
-  "categories": {
+  "categoriesRules": {
-    "ekspres krajowy (EI)": "2:00-99:2",
+    "EI": [null, "00", "99"],
-    "(między)wojewódzki pośpieszny (MP/RP)": "2:050-169:3",
+    "MP": [null, "050", "169"],
-    "wojewódzki osobowy (RO)": "2:200-999:3",
+    "RO": [null, "200", "999"],
-    "próżny \"służbowy\" (PW)": "2:6;3:0-899:3",
+    "RP": [null, "050", "169"],
-    "towarowy do przewozów masowych (TM)": "2:4;3:0-899:3",
+    "PW": ["6", "000", "899"],
-    "towarowy do obsługi stacji (TK)": "2:3;3:0-899:3",
+    "TK": ["3", "000", "899"],
-    "lokomotywa luzem (LT)": "2:5;3:0-899:3"
+    "TM": ["4", "000", "899"],
    "LT": ["5", "000", "899"]
  },
  "categoriesNextVersion": {
    "EI": [null, "00", "99"],
    "EC": [null, "001", "049"],
    "EN": [null, "001", "049"],
    "RO": [null, "200", "999"],
    "RP": [null, "050", "169"],
    "RM": [null, "200", "999"],
    "RA": [null, "200", "999"],
    "MO": [null, "200", "999"],
    "MP": [null, "050", "169"],
    "MM": [null, "001", "049"],
    "MH": [null, "170", "199"],
    "PW": ["6", "000", "899"],
    "PX": ["6", "000", "899"],
    "TC": ["0", "000", "899"],
    "TG": ["1", "000", "899"],
    "TR": ["1", "000", "899"],
    "TD": ["2", "000", "899"],
    "TK": ["3", "000", "899"],
    "TN": ["3", "000", "899"],
    "TM": ["4", "000", "899"],
    "TS": ["5", "000", "899"],
    "LT": ["5", "000", "899"],
    "LP": ["6", "000", "899"],
    "LS": ["9", "000", "899"],
    "ZN": ["9", "000", "899"]
  }
 }
@@ -1,62 +1,82 @@
 {
  "EU07": {
    "passenger": {
-      "650": 125
+      "650000": 125
    },
    "cargo": {
-      "2000": 70
+      "2000000": 70
-    }
+    },
    "none": 110
  },
  "4E": {
    "passenger": {
      "650000": 125
    },
    "cargo": {
      "2000000": 70
    },
    "none": 110
  },
  "EU07E": {
    "passenger": {
-      "650": 125
+      "650000": 125
    },
    "cargo": {
-      "2000": 70
+      "2000000": 70
-    }
+    },
    "none": 110
  },
  "EP07": {
    "passenger": {
-      "650": 125
+      "650000": 125
    },
-    "cargo": null
+    "cargo": null,
    "none": 110
  },
  "EP08": {
    "passenger": {
-      "650": 140
+      "650000": 140
    },
-    "cargo": null
+    "cargo": null,
    "none": 110
  },
  "EP09": {
    "passenger": {
      "650000": 160
    },
    "cargo": null,
    "none": 160
  },
  "ET41": {
    "passenger": {
-      "700": 125
+      "700000": 125
    },
    "cargo": {
-      "4000": 70
+      "4000000": 70
-    }
+    },
    "none": 110
  },
  "SM42": {
    "passenger": {
-      "95": 90,
+      "95000": 90,
-      "200": 80,
+      "200000": 80,
-      "300": 70,
+      "300000": 70,
-      "450": 60,
+      "450000": 60,
-      "750": 50,
+      "750000": 50,
-      "1130": 40,
+      "1130000": 40,
-      "1720": 30,
+      "1720000": 30,
-      "2400": 20
+      "2400000": 20
    },
    "cargo": {
-      "95": 90,
+      "95000": 90,
-      "200": 80,
+      "200000": 80,
-      "300": 70,
+      "300000": 70,
-      "450": 60,
+      "450000": 60,
-      "750": 50,
+      "750000": 50,
-      "1130": 40,
+      "1130000": 40,
-      "1720": 30,
+      "1720000": 30,
-      "2400": 20
+      "2400000": 20
-    }
+    },
    "none": 90
  }
 }
@@ -1,9 +1,9 @@
 export const enum EVehicleUseType {
-    LOCO_ELECTRICAL = 'loco-e',
+  LOCO_ELECTRICAL = 'loco-e',
-    LOCO_DIESEL = "loco-s",
+  LOCO_DIESEL = 'loco-s',
-    EMU = "loco-ezt",
+  EMU = 'loco-ezt',
-    DMU = "loco-szt",
+  DMU = 'loco-szt',
-    CAR_PASSENGER = "car-passenger",
+  CAR_PASSENGER = 'car-passenger',
-    CAR_CARGO = "car-cargo"
+  CAR_CARGO = 'car-cargo',
-}
+}
@@ -0,0 +1,10 @@
 import axios from 'axios';
 const http = axios.create({
  baseURL:
    import.meta.env.VITE_API_DEV === '1' && import.meta.env.DEV
      ? 'http://localhost:5500'
      : 'https://static.spythere.eu',
 });
 export default http;
@@ -0,0 +1,24 @@
 import localePL from './locales/pl.json';
 import localeEN from './locales/en.json';
 import { createI18n } from 'vue-i18n';
 type LocaleMessageSchema = typeof localePL;
 type LocaleKey = 'en' | 'pl';
 const locales: { [key in LocaleKey]: LocaleMessageSchema } = {
  en: localeEN,
  pl: localePL,
 };
 const locale =
  window.localStorage.getItem('locale') || (/^pl\b/.test(navigator.language) ? 'pl' : 'en');
 const i18n = createI18n<[LocaleMessageSchema], 'en' | 'pl'>({
  locale,
  fallbackLocale: 'pl',
  legacy: false,
  globalInjection: true,
  messages: locales,
 });
 export default i18n;
@@ -0,0 +1,189 @@
 {
  "app": {
    "title": "ROLLING STOCK EDITOR"
  },
  "footer": {
    "disclaimer": "This site has only an informational intent. The author does not carry any responsibility for creating trains against {tos}!",
    "tos": "Train Driver 2 simulator rules",
    "tos-href": "https://docs.google.com/document/d/1UAAPUtN0d_RoS4RgOzEzllJZJhA0VcizzCzKW4QylbY/edit#heading=h.1ldcvhomwjp9",
    "version-check": "Site is complete for version {version} of Train Driver 2 simulator"
  },
  "inputs": {
    "title": "CHOOSE A VEHICLE",
    "input-vehicle": "Choose a traction unit",
    "input-carwagon": "Choose a carriage",
    "cargo-title": "Cargo (only selected freight cars)",
    "no-cargo-available": "no cargo available",
    "cargo-empty": "empty",
    "loco-e": "ELECTR.",
    "loco-s": "DIESEL",
    "loco-ezt": "EMU",
    "loco-szt": "DMU",
    "car-passenger": "PASSENGER",
    "car-cargo": "FREIGHT",
    "action-add": "ADD NEW",
    "action-swap": "SWAP WITH",
    "real-stock": "POLISH TRAIN COMPOSITIONS"
  },
  "preview": {
    "title": "RAILWAY VEHICLE PREVIEW",
    "loading": "IMAGE LOADING...",
    "desc": "Choose a railway vehicle above to see its preview",
    "sponsor-only": "* SPONSORS ONLY UNTIL {0}",
    "loco-e": "ELECTRIC LOCO",
    "loco-s": "DIESEL LOCO",
    "loco-ezt": "ELECTRIC M.U.",
    "loco-szt": "DIESEL M.U.",
    "car-passenger": "PASSENGER CARRIAGE",
    "car-cargo": "FREIGHT CARRIAGE",
    "cabin": "Cabin type:",
    "construction": "Construction type:"
  },
  "topbar": {
    "stock-list": "STOCK",
    "wiki-list": "VEHICLES",
    "number-generator": "NUMBER GEN.",
    "stock-generator": "STOCK GEN."
  },
  "stocklist": {
    "title": "STOCK EDITOR",
    "disclaimer": "Theorethical value based on vehicles maximum speed in the current composition. It may be inaccurate in relation to the correct operational speed in certain configurations.",
    "alert-copied": "The rolling stock has been copied to your clipboard!",
    "alert-empty": "Lista pojazdów jest pusta!",
    "prompt-file": "Name a file and download it to the Presets folder (Documents/TTSK/TrainDriver2):",
    "vehicle-no": "VEHICLE NO.",
    "no-vehicle-chosen": "NO VEHICLE CHOSEN",
    "action-move-up": "MOVE UP",
    "action-move-down": "MOVE DOWN",
    "action-remove": "REMOVE",
    "action-upload": "LOAD",
    "action-download": "DOWNLOAD",
    "action-copy": "COPY",
    "action-reset": "RESET",
    "action-shuffle": "SHUFFLE",
    "mass": "Mass",
    "mass-accepted": "accepted",
    "length": "Length",
    "vmax": "vMax",
    "coldstart-info": "Locomotive cold start",
    "doublemanning-info": "Double manning",
    "list-empty": "Stock list is empty!",
    "warning-not-suitable": "EP07 & EP08 type locomotives are designed for passenger traffic only!",
    "warning-passenger-too-long": "Maximum length of a passenger train may not be greater than 350m!",
    "warning-freight-too-long": "Maximum length of a freight train may not be greater than 650m!",
    "warning-too-many-locos": "This train has too many traction units!",
    "warning-too-heavy": "This train is too heavy! Check {href}",
    "acceptable-mass-docs": "acceptable rolling stock masses (PL)"
  },
  "stockgen": {
    "title": "FREIGHT TRAIN GENERATOR",
    "properties-title": "ROLLING STOCK PROPERTIES",
    "properties-desc": "⇐ Add a locomotive in the first place of the stock list to include it in a drawing!",
    "input-mass": "Max. mass (t)",
    "input-length": "Max. length (m)",
    "input-carcount": "Max. car count",
    "cargo-title": "CARGO",
    "cargo-desc": "Choose cargo you want to fill available cars with:",
    "chosen-title": "CARS WITH CHOSEN CARGO",
    "chosen-empty-warning": "Choose at least one cargo type to see available cars!",
    "chosen-warning": "Cars containing chosen cargo are shown below. Hover over a type to see a preview of the car. Click it to include/exclude it from a drawing (only highlighted types will be included).",
    "action-generate": "GENERATE",
    "action-generate-empty": "GENERATE EMPTY",
    "action-reset": "RESET CARGO"
  },
  "numgen": {
    "title": "TRAIN NUMBER GENERATOR",
    "subtitle": "Generates real train number based on Polish railway instruction Ir-11",
    "alert": "The number has been copied to your clipboard!",
    "start-region": "Beginning construction region",
    "end-region": "Terminating construction region",
    "train-category": "Train category",
    "number-info": "Generated train number:",
    "warning": "Choose category and (optionally) construction regions",
    "td2-wiki": "> Polish rules of train numbering (forum thread)",
    "td2-wiki-link": "https://td2.info.pl/english-boards/new-train-categories-in-the-simulator/",
    "action-random-region": "DRAW REGIONS",
    "action-random-number": "DRAW LAST DIGITS",
    "action-random-category": "DRAW A CATEGORY",
    "rules": {
      "first-digit": "First digit:",
      "second-digit": "Second digit:",
      "third-digit": "Third digit:",
      "two-first-digits": "Two first digits:",
      "two-last-digits": "Two last digits:",
      "three-last-digits": "Three last digits:",
      "from-pool": "from pool of",
      "for-category": "for category",
      "for-region": "for region",
      "for-region-begin": "for the beginning construction region",
      "for-region-end": "for the terminating construction region",
      "from-range": "from range of"
    },
    "categories": {
      "EI": "EI - domestic express",
      "EC": "EC - international express",
      "EN": "EN - domestic night express",
      "MP": "MP - intervoivodeship bullet",
      "RP": "RP - voivodeship bullet",
      "MO": "MO - intervoivodeship regio",
      "RO": "RO - voivodeship regio",
      "MM": "MM - international bullet",
      "MH": "MH - intervoivodeship bullet (night / hotel)",
      "RM": "RM - international voivodeship regio",
      "RA": "RA - voivodeship regio (urban)",
      "PW": "PW - empty passenger",
      "PX": "PX - empty passenger test drive",
      "TC": "TC - international freight (intermodal)",
      "TG": "TG - international freight (cargo)",
      "TR": "TR - international freight (no cargo)",
      "TD": "TD - domestic freight (intermodal)",
      "TM": "TM - domestic freight (cargo)",
      "TN": "TN - domestic freight (no cargo)",
      "TK": "TK - freight (stations & sidings service)",
      "TS": "TS - empty freight test drive",
      "LT": "LT - locomotive only",
      "LT-new": "LT - freight locomotive only",
      "LP": "LP - passenger locomotive only",
      "LS": "LS - shunting locomotive",
      "ZN": "ZN - inspection / diagnostic"
    }
  },
  "wiki": {
    "title": "LIST OF AVAILABLE VEHICLES",
    "action-vehicles": "TRACTION UNITS",
    "action-carriages": "CARRIAGES",
    "search": "Search for a vehicle...",
    "header": {
      "image": "Image",
      "type": "Name",
      "group": "Type group",
      "constructionType": "Construction",
      "coldStart": "Cold start",
      "length": "Length",
      "weight": "Mass",
      "maxSpeed": "Speed",
      "cargoCount": "Cargo count"
    },
    "loco-ezt": "EMU",
    "loco-szt": "DMU",
    "loco-s": "Diesel locomotive",
    "loco-e": "Electric locomotive",
    "car-passenger": "Passenger carriage",
    "car-cargo": "Frieght carriage"
  },
  "realstock": {
    "title": "POLISH TRAIN COMPOSITIONS by",
    "search-name": "Search by name",
    "search-stock": "Search by vehicles",
    "action-reset": "RESET"
  }
 }
@@ -0,0 +1,189 @@
 {
  "app": {
    "title": "EDYTOR SKŁADÓW ONLINE"
  },
  "footer": {
    "disclaimer": "Ta strona ma charakter informacyjny. Autor nie ponosi odpowiedzialności za tworzenie pociągów niezgodnych z {tos}!",
    "tos": "regulaminem symulatora Train Driver 2",
    "tos-href": "https://docs.google.com/document/d/1UAAPUtN0d_RoS4RgOzEzllJZJhA0VcizzCzKW4QylbY/edit",
    "version-check": "Strona jest kompletna dla wersji {version} symulatora TD2"
  },
  "inputs": {
    "title": "WYBIERZ POJAZD SZYNOWY",
    "input-vehicle": "Wybierz pojazd trakcyjny",
    "input-carwagon": "Wybierz wagon",
    "cargo-title": "Ładunek (tylko wybrane towarowe)",
    "no-cargo-available": "brak dostępnych ładunków",
    "cargo-empty": "próżny",
    "loco-e": "ELEKTR.",
    "loco-s": "SPAL.",
    "loco-ezt": "EZT",
    "loco-szt": "SZT",
    "car-passenger": "PASAŻERSKIE",
    "car-cargo": "TOWAROWE",
    "action-add": "DODAJ NOWY",
    "action-swap": "ZAMIEŃ ZA",
    "real-stock": "REALNE ZESTAWIENIA"
  },
  "preview": {
    "title": "PODGLĄD WYBRANEGO POJAZDU",
    "loading": "ŁADOWANIE OBRAZU...",
    "desc": "Wybierz pojazd lub wagon, aby zobaczyć jego podgląd powyżej",
    "sponsor-only": "* TYLKO DLA SPONSORÓW DO {0}",
    "loco-e": "ELEKTROWÓZ",
    "loco-s": "SPALINOWÓZ",
    "loco-ezt": "EZT",
    "loco-szt": "SZT",
    "car-passenger": "WAGON PASAŻERSKI",
    "car-cargo": "WAGON TOWAROWY",
    "cabin": "Typ kabiny:",
    "construction": "Typ konstrukcji:"
  },
  "topbar": {
    "stock-list": "SKŁAD",
    "wiki-list": "POJAZDY",
    "number-generator": "GNR NUMERU",
    "stock-generator": "GNR SKŁADU"
  },
  "stocklist": {
    "title": "EDYTOR SKŁADU",
    "disclaimer": "Wartość poglądowa wzorowana na prędkościach maksymalnych poszczególnych pojazdów w zestawieniu. Może nie zgadzać się z prawdziwymi prędkościami eksploatacyjnymi w konkretnych konfiguracjach.",
    "alert-copied": "Skład został skopiowany do twojego schowka!",
    "alert-empty": "Lista pojazdów jest pusta!",
    "prompt-file": "Nazwij plik, a następnie pobierz do folderu Presets (Dokumenty/TTSK/TrainDriver2):",
    "vehicle-no": "POJAZD NR",
    "no-vehicle-chosen": "NIE WYBRANO POJAZDU",
    "action-move-up": "PRZENIEŚ WYŻEJ",
    "action-move-down": "PRZENIEŚ NIŻEJ",
    "action-remove": "USUŃ",
    "action-upload": "WCZYTAJ",
    "action-download": "POBIERZ",
    "action-copy": "SKOPIUJ",
    "action-reset": "ZRESETUJ",
    "action-shuffle": "PRZETASUJ",
    "mass": "Masa",
    "mass-accepted": "dopuszczalna",
    "length": "Długość",
    "vmax": "vMax",
    "coldstart-info": "Zimny start",
    "doublemanning-info": "Podwójna obsada",
    "list-empty": "Lista pojazdów jest pusta!",
    "warning-not-suitable": "Lokomotywy EP07 i EP08 są przeznaczone jedynie do ruchu pasażerskiego!",
    "warning-passenger-too-long": "Maksymalna długość składów pasażerskich nie może przekraczać 350m!",
    "warning-freight-too-long": "Maksymalna długość składów innych niż pasażerskie nie może przekraczać 650m!",
    "warning-too-many-locos": "Ten skład posiada za dużo pojazdów trakcyjnych!",
    "warning-too-heavy": "Ten skład jest za ciężki! Sprawdź {href}",
    "acceptable-mass-docs": "dopuszczalne masy składów"
  },
  "stockgen": {
    "title": "GENERATOR SKŁADU TOWAROWEGO",
    "properties-title": "WŁAŚCIWOŚCI SKŁADU",
    "properties-desc": "⇐ Dodaj lokomotywę na pierwsze miejsce listy, aby uwzględnić ją przy losowaniu składu!",
    "input-mass": "Maksymalna masa (t)",
    "input-length": "Maks. długość (m)",
    "input-carcount": "Maks. liczba wagonów",
    "cargo-title": "ŁADUNEK",
    "cargo-desc": "Wybierz ładunki, którymi chcesz wypełnić dostępne wagony:",
    "chosen-title": "WAGONY Z WYBRANYMI ŁADUNKAMI",
    "chosen-empty-warning": "Wybierz co najmniej jeden ładunek, aby zobaczyć wagony, które go posiadają!",
    "chosen-warning": "Wagony posiadające wybrane ładunki. Najedź na nazwę, aby zobaczyć podgląd wagonu. Kliknij, aby wyłączyć z losowania (tylko podświetlone nazwy będą uwzględnione).",
    "action-generate": "WYGENERUJ",
    "action-generate-empty": "WYGENERUJ PRÓŻNE WAGONY",
    "action-reset": "ZRESETUJ ŁADUNKI"
  },
  "numgen": {
    "title": "GENERATOR NUMERU POCIĄGU",
    "subtitle": "Generuje realny numer pociągu na podstawie instrukcji Ir-11",
    "alert": "Numer został skopiowany do twojego schowka!",
    "start-region": "Początkowy obszar konstrukcyjny",
    "end-region": "Końcowy obszar konstrukcyjny",
    "train-category": "Kategoria pociągu",
    "number-info": "Wygenerowany numer pociągu:",
    "warning": "Wybierz kategorię oraz (opcjonalnie) obszary konstrukcyjne",
    "td2-wiki": "> Szczegółowe zasady numeracji (wątek forum)",
    "td2-wiki-link": "https://td2.info.pl/ogloszenia/nowe-kategorie-pociagow-w-symulatorze/",
    "action-random-region": "LOSUJ OBSZARY",
    "action-random-number": "LOSUJ KOŃCÓWKĘ",
    "action-random-category": "LOSUJ KATEGORIĘ",
    "rules": {
      "first-digit": "Pierwsza cyfra:",
      "second-digit": "Druga cyfra:",
      "third-digit": "Trzecia cyfra:",
      "two-first-digits": "Dwie pierwsze cyfry:",
      "two-last-digits": "Dwie ostatnie cyfry:",
      "three-last-digits": "Trzy ostatnie cyfry:",
      "from-pool": "z puli",
      "for-category": "dla kategorii",
      "for-region": "dla obszaru",
      "for-region-begin": "dla początkowego obszaru konstrukcyjnego",
      "for-region-end": "dla końcowego obszaru konstrukcyjnego",
      "from-range": "z przedziału"
    },
    "categories": {
      "EI": "EI - ekspres krajowy",
      "EC": "EC - ekspres międzynarodowy",
      "EN": "EN - ekspres krajowy nocny",
      "MP": "MP - międzywojewódzki pośpieszny",
      "RP": "RP - wojewódzki pośpieszny",
      "MO": "MO - międzywojewódzki osobowy",
      "RO": "RO - wojewódzki osobowy",
      "MM": "MM - międzynarodowy pośpieszny",
      "MH": "MH - międzywoj. pośpieszny nocny / hotelowy",
      "RM": "RM - wojewódzki osobowy międzynarodowy",
      "RA": "RA - wojewódzki osobowy algomeracyjny",
      "PW": "PW - pasażerski próżny (\"służbowy\")",
      "PX": "PX - pasażerski próżny próbny",
      "TC": "TC - towarowy międzynarodowy intermodalny",
      "TG": "TG - towarowy międzynarodowy masowy",
      "TR": "TR - towarowy międzynarodowy niemasowy",
      "TD": "TD - towarowy krajowy intermodalny",
      "TM": "TM - towarowy krajowy masowy",
      "TN": "TN - towarowy krajowy niemasowy",
      "TK": "TK - towarowy do obsługi stacji i bocznic",
      "TS": "TS - towarowy próżny próbny",
      "LT": "LT - lokomotywa luzem",
      "LT-new": "LT - lokomotywa towarowa luzem",
      "LP": "LP - lokomotywa pasażerska luzem",
      "LS": "LS - lokomotywa manewrowa",
      "ZN": "ZN - inspekcyjny / diagnostyczny"
    }
  },
  "wiki": {
    "title": "LISTA DOSTĘPNYCH POJAZDÓW",
    "action-vehicles": "POJ. TRAKCYJNE",
    "action-carriages": "WAGONY",
    "search": "Wyszukaj pojazd...",
    "header": {
      "image": "Zdjęcie",
      "type": "Nazwa",
      "group": "Rodzaj",
      "constructionType": "Konstrukcja",
      "coldStart": "Zimny start",
      "length": "Długość",
      "weight": "Masa",
      "maxSpeed": "Prędkość",
      "cargoCount": "Ładunki"
    },
    "loco-ezt": "EZT",
    "loco-szt": "SZT",
    "loco-s": "Spalinowóz",
    "loco-e": "Elektrowóz",
    "car-passenger": "Wagon pasażerski",
    "car-cargo": "Wagon towarowy"
  },
  "realstock": {
    "title": "ZESTAWIENIA REALNE by",
    "search-name": "Szukaj po nazwie",
    "search-stock": "Szukaj po pojazdach",
    "action-reset": "RESETUJ"
  }
 }
@@ -1,14 +1,8 @@
 import { createApp } from 'vue';
 import { createPinia } from 'pinia';
 import { registerSW } from 'virtual:pwa-register';
 import App from './App.vue';
-
+import i18n from './i18n-setup';
 const pinia = createPinia();
-const updateSW = registerSW({
+createApp(App).use(pinia).use(i18n).mount('#app');
  immediate: true,
 });
 createApp(App).use(pinia).mount('#app');
@@ -5,5 +5,13 @@ export default defineComponent({
    getIconURL(name: string, ext = 'svg'): string {
      return `/images/icon-${name}.${ext}`;
    },
    getThumbnailURL(vehicleType: string, size: 'small' | 'large') {
      return `${
        import.meta.env.VITE_API_DEV === '1'
          ? 'http://localhost:5500'
          : 'https://static.spythere.eu'
      }/images/${vehicleType}--${size == 'small' ? 300 : 800}px.jpg`;
    },
  },
 });
@@ -1,6 +1,6 @@
 import { defineComponent } from 'vue';
 import { useStore } from '../store';
-import { ICargo, ICarWagon, ILocomotive, IStock, Vehicle } from '../types';
+import { ICarWagon, ILocomotive, IStock, ICargo, IVehicle } from '../types';
 import { isLocomotive } from '../utils/vehicleUtils';
 export default defineComponent({
@@ -15,26 +15,27 @@ export default defineComponent({
      return `${Math.random().toString(36).slice(5)}`;
    },
-    getStockObject(vehicle: Vehicle, cargo?: ICargo | null, count = 1): IStock {
+    getStockObject(vehicle: IVehicle, cargo?: ICargo | null, count = 1): IStock {
      const isLoco = isLocomotive(vehicle);
      return {
        id: this.getStockId(),
        type: vehicle.type,
        length: vehicle.length,
-        mass: vehicle.mass,
+        weight: vehicle.weight,
        maxSpeed: vehicle.maxSpeed,
        isLoco,
        cargo: !isLoco && vehicle.loadable && cargo ? cargo : undefined,
        count,
        imgSrc: vehicle.imageSrc,
        useType: isLoco ? vehicle.power : vehicle.useType,
-        supportersOnly: vehicle.supportersOnly,
+        isSponsorsOnly: vehicle.isSponsorsOnly,
        constructionType: vehicle.constructionType,
        sponsorsOnlyTimestamp: vehicle.sponsorsOnlyTimestamp,
      };
    },
-    addVehicle(vehicle: Vehicle | null, cargo?: ICargo | null) {
+    addVehicle(vehicle: IVehicle | null, cargo?: ICargo | null) {
      if (!vehicle) return;
      const stock = this.getStockObject(vehicle, cargo);
@@ -46,7 +47,8 @@ export default defineComponent({
    addLocomotive(loco: ILocomotive) {
      const stockObj = this.getStockObject(loco);
-      if (this.store.stockList.length > 0 && !this.store.stockList[0].isLoco) this.store.stockList.unshift(stockObj);
+      if (this.store.stockList.length > 0 && !this.store.stockList[0].isLoco)
        this.store.stockList.unshift(stockObj);
      else this.store.stockList.push(stockObj);
    },
@@ -69,26 +71,31 @@ export default defineComponent({
      this.store.swapVehicles = false;
      stockArray.forEach((type, i) => {
-        let vehicle: Vehicle | null = null;
+        let vehicle: IVehicle | null = null;
        let vehicleCargo: ICargo | null = null;
-        if (/^(EU|EP|ET|SM|EN|2EN|SN)/.test(type)) {
+        const isLoco = /^(EU|EP|ET|SM|EN|2EN|SN)/.test(type);
-          const [locoType, coldStart] = type.split(',');
+
        if (isLoco) {
          const [locoType, spawnProps] = type.split(',');
          vehicle = this.store.locoDataList.find((loco) => loco.type == locoType) || null;
-          if (i == 0 && coldStart == 'c') this.store.isColdStart = true;
+          // Spawn settings
          if (i == 0 && spawnProps) {
            this.store.isColdStart = spawnProps.includes('c');
            this.store.isDoubleManned = spawnProps.includes('d');
          }
        } else {
          const [carType, cargo] = type.split(':');
          vehicle = this.store.carDataList.find((car) => car.type == carType) || null;
-          if (cargo) vehicleCargo = vehicle?.cargoList.find((c) => c.id == cargo) || null;
+          if (cargo) vehicleCargo = vehicle?.cargoTypes.find((c) => c.id == cargo) || null;
        }
-        if (!vehicle) console.log('Brak pojazdu:', type);
+        if (!vehicle) console.log('Brak pojazdu / rodzaj pojazdu źle wczytany:', type);
        this.addVehicle(vehicle, vehicleCargo);
      });
    },
  },
 });
@@ -1,6 +1,7 @@
 import { defineComponent } from 'vue';
 import { useStore } from '../store';
-import { ICarWagon, ILocomotive, IStock, Vehicle } from '../types';
+import { ICarWagon, ILocomotive, IStock, IVehicle } from '../types';
 import { isLocomotive } from '../utils/vehicleUtils';
 export default defineComponent({
  setup() {
@@ -9,45 +10,9 @@ export default defineComponent({
    };
  },
-  computed: {
+  computed: {},
    locoOptions() {
      return this.store.locoDataList
        .sort((a, b) => (a.type > b.type ? 1 : -1))
        .filter((loco) => loco.power == this.store.chosenLocoPower);
    },
    carOptions() {
      return this.store.carDataList
        .sort((a, b) => (a.type > b.type ? 1 : -1))
        .filter((car) => car.useType == this.store.chosenCarUseType);
    },
  },
  methods: {
    selectLocoType(locoTypeId: string) {
      this.store.chosenLocoPower = locoTypeId;
      this.store.chosenVehicle = this.locoOptions[0];
      this.store.chosenLoco = this.locoOptions[0];
    },
    selectCarWagonType(carWagonTypeId: string) {
      this.store.chosenCarUseType = carWagonTypeId;
      this.store.chosenVehicle = this.carOptions[0];
      this.store.chosenCar = this.carOptions[0];
      this.store.chosenCargo = null;
    },
    previewVehicleByType(type: 'loco' | 'car' | 'cargo') {
      this.$nextTick(() => {
        if (!this.store.chosenLoco && !this.store.chosenCar) return;
        this.store.chosenVehicle = type == 'loco' ? this.store.chosenLoco : this.store.chosenCar;
        this.store.chosenCargo =
          this.store.chosenCar?.cargoList.find((cargo) => cargo.id == this.store.chosenCargo?.id) || null;
      });
    },
    previewStock(stock: IStock) {
      if (this.store.chosenVehicle?.imageSrc != stock.imgSrc) this.store.imageLoading = true;
@@ -81,6 +46,11 @@ export default defineComponent({
      this.store.chosenCargo = null;
    },
    previewVehicle(vehicle: IVehicle) {
      if (isLocomotive(vehicle)) this.previewLocomotive(vehicle);
      else this.previewCarWagon(vehicle);
    },
    resetPreview() {
      this.store.chosenVehicle = null;
      this.store.chosenCar = null;
@@ -89,4 +59,3 @@ export default defineComponent({
    },
  },
 });
@@ -18,7 +18,7 @@ export default defineComponent({
    },
    trainTooHeavy() {
-      return this.store.acceptableMass && this.store.totalMass > this.store.acceptableMass;
+      return this.store.acceptableWeight && this.store.totalWeight > this.store.acceptableWeight;
    },
    locoNotSuitable() {
@@ -31,10 +31,12 @@ export default defineComponent({
    },
    tooManyLocomotives() {
-      return this.store.stockList.reduce((acc, stock) => {
+      return (
-        if (stock.isLoco) acc += stock.count;
+        this.store.stockList.reduce((acc, stock) => {
-        return acc;
+          if (stock.isLoco) acc += stock.count;
-      }, 0) > 2;
+          return acc;
        }, 0) > 2
      );
    },
  },
 });
@@ -1,68 +1,145 @@
-import { IStore } from './types';
+import {
  IVehiclesAPI,
  ICarWagon,
  ILocomotive,
  ICargo,
  IVehicle,
  IStock,
  IRealComposition,
 } from './types';
 import { defineStore } from 'pinia';
 import {
-  acceptableMass,
+  acceptableWeight,
  carDataList,
  chosenRealStock,
  isTrainPassenger,
  locoDataList,
  maxStockSpeed,
  totalLength,
-  totalMass,
+  totalWeight,
 } from './utils/vehicleUtils';
 import http from './http';
 import i18n from './i18n-setup';
 export const useStore = defineStore({
  id: 'store',
-  state: () =>
+  state: () => ({
-    ({
+    chosenCar: null as ICarWagon | null,
-      chosenCar: null,
+    chosenLoco: null as ILocomotive | null,
-      chosenLoco: null,
+    chosenCargo: null as ICargo | null,
-      chosenCargo: null,
+    chosenVehicle: null as IVehicle | null,
      chosenVehicle: null,
-      isColdStart: false,
+    isColdStart: false,
    isDoubleManned: false,
-      showSupporter: false,
+    imageLoading: false,
      imageLoading: false,
-      chosenLocoPower: 'loco-e',
+    chosenLocoPower: 'loco-e',
-      chosenCarUseType: 'car-passenger',
+    chosenCarUseType: 'car-passenger',
-      stockList: [],
+    stockList: [] as IStock[],
-      cargoOptions: [],
+    cargoOptions: [] as any[][],
-      readyStockList: [],
+    swapVehicles: false,
-      swapVehicles: false,
+    chosenStockListIndex: -1,
-      chosenStockListIndex: -1,
+    vehiclePreviewSrc: '',
      chosenRealStockName: undefined,
-      vehiclePreviewSrc: '',
+    stockSectionMode: 'stock-list',
-      stockSectionMode: 'stock-list',
+    isRandomizerCardOpen: false,
    isRealStockListCardOpen: false,
-      isRandomizerCardOpen: false,
+    vehiclesAPIData: undefined as IVehiclesAPI | undefined,
      isRealStockListCardOpen: false,
-      stockData: undefined,
+    lastFocusedElement: null as HTMLElement | null,
-    } as IStore),
+  }),
  getters: {
-    locoDataList: (state) => locoDataList(state),
+    locoDataList: (state) => locoDataList(state.vehiclesAPIData),
-    carDataList: (state) => carDataList(state),
+    carDataList: (state) => carDataList(state.vehiclesAPIData),
-    totalMass: (state) => totalMass(state),
+    vehicleDataList: (state) => [
-    totalLength: (state) => totalLength(state),
+      ...locoDataList(state.vehiclesAPIData),
-    maxStockSpeed: (state) => maxStockSpeed(state),
+      ...carDataList(state.vehiclesAPIData),
-    isTrainPassenger: (state) => isTrainPassenger(state),
+    ],
-    chosenRealStock: (state) => chosenRealStock(state),
+    totalWeight: (state) => totalWeight(state.stockList),
-    acceptableMass: (state) => acceptableMass(state),
+    totalLength: (state) => totalLength(state.stockList),
    maxStockSpeed: (state) => maxStockSpeed(state.stockList),
    isTrainPassenger: (state) => isTrainPassenger(state.stockList),
    acceptableWeight: (state) => acceptableWeight(state.stockList),
    realCompositionList: (state) => {
      if (!state.vehiclesAPIData) return [];
      return Object.keys(state.vehiclesAPIData.realCompositions).reduce<IRealComposition[]>(
        (acc, key) => {
          const [type, number, ...name] = key.split(' ');
          const obj = {
            number: number.replace(/_/g, '/'),
            name: name.join(' '),
            stockString: state.vehiclesAPIData!.realCompositions[key],
            type,
          };
          acc.push({
            stockId: `${obj.type} ${obj.number} ${obj.name}`,
            ...obj,
          });
          return acc;
        },
        []
      );
    },
    stockSupportsColdStart: (state) => {
      if (state.stockList.length == 0) return false;
      if (!state.stockList[0].isLoco) return false;
      const headingLoco = state.stockList[0];
      return (
        state.vehiclesAPIData?.vehicleProps.find(
          (stock) => stock.type == headingLoco.constructionType
        )?.coldStart ?? false
      );
    },
    stockSupportsDoubleManning: (state) => {
      if (state.stockList.length == 0) return false;
      if (!state.stockList[0].isLoco) return false;
      const headingLoco = state.stockList[0];
      return (
        state.vehiclesAPIData?.vehicleProps.find(
          (stock) => stock.type == headingLoco.constructionType
        )?.doubleManned ?? false
      );
    },
  },
  actions: {
-    async fetchStockInfoData() {
+    async fetchVehiclesAPI() {
-      const stockData = await (await fetch(`https://spythere.github.io/api/td2/data/stockInfo.json`)).json();
+      try {
-      this.stockData = stockData;
+        const vehiclesData = (await http.get<IVehiclesAPI>('/vehicles.json')).data;
        this.vehiclesAPIData = vehiclesData;
      } catch (error) {
        console.error(error);
      }
    },
    async setupAPIData() {
      await this.fetchVehiclesAPI();
      this.mergeBackendTranslations();
    },
    async mergeBackendTranslations() {
      if (!this.vehiclesAPIData) return;
      i18n.global.mergeLocaleMessage('pl', this.vehiclesAPIData.vehicleLocales.pl);
      i18n.global.mergeLocaleMessage('en', this.vehiclesAPIData.vehicleLocales.en);
    },
    handleRouting() {
@@ -82,5 +159,3 @@ export const useStore = defineStore({
    },
  },
 });
@@ -1,256 +1,329 @@
-@import url('https://fonts.googleapis.com/css2?family=Lato:wght@400;700;900&display=swap');
+$breakpointMd: 960px;
-
+$breakpointSm: 550px;
-$breakpointMd: 960px;
+
-$breakpointSm: 550px;
+$bgColor: #2b3552;
-
+$textColor: #fff;
-$bgColor: #2b3552;
+$secondaryColor: #1b1b1b;
-$textColor: #fff;
+$accentColor: #e4c428;
-$secondaryColor: #222;
+
-$accentColor: #e4c428;
+@font-face {
-
+  font-family: 'Lato';
-::-webkit-scrollbar {
+  src:
-  width: 7px;
+    url('/fonts/Lato-Light.woff2') format('woff2'),
-  height: 7px;
+    url('/fonts/Lato-Light.woff') format('woff');
-
+  font-weight: 300;
-  &-track {
+  font-style: normal;
-    background: #222;
+  font-display: swap;
-    border-radius: 0.5rem;
+}
-  }
+
-
+@font-face {
-  &-thumb {
+  font-family: 'Lato';
-    border-radius: 1rem;
+  src:
-    background: #777;
+    url('/fonts/Lato-Bold.woff2') format('woff2'),
-  }
+    url('/fonts/Lato-Bold.woff') format('woff');
-
+  font-weight: bold;
-  &-corner {
+  font-style: normal;
-    background: #222;
+  font-display: swap;
-  }
+}
-}
+
-
+@font-face {
-body,
+  font-family: 'Lato';
-html {
+  src:
-  margin: 0;
+    url('/fonts/Lato-Regular.woff2') format('woff2'),
-  padding: 0;
+    url('/fonts/Lato-Regular.woff') format('woff');
-
+  font-weight: normal;
-  font-family: 'Lato', sans-serif;
+  font-style: normal;
-
+  font-display: swap;
-  background-color: $bgColor;
+}
-  overflow-x: hidden;
+
-}
+::-webkit-scrollbar {
-
+  width: 7px;
-*,
+  height: 7px;
-*::before,
+
-*::after {
+  &-track {
-  box-sizing: border-box;
+    background: #222;
-}
+    border-radius: 0.5rem;
-
+  }
-a {
+
-  color: white;
+  &-thumb {
-  text-decoration: none;
+    border-radius: 1rem;
-
+    background: #777;
-  transition: color 250ms;
+  }
-
+
-  &:visited {
+  &-corner {
-    color: white;
+    background: #222;
-  }
+  }
-
+}
-  &:hover,
+
-  &:focus {
+body,
-    color: $accentColor;
+html {
-  }
+  margin: 0;
-}
+  padding: 0;
-
+
-select,
+  font-family: Lato, sans-serif;
-option,
+
-input,
+  background-color: $bgColor;
-button {
+  overflow-x: hidden;
-  font-family: 'Lato', sans-serif;
+}
-  font-size: 1em;
+
-}
+*,
-
+*::before,
-button {
+*::after {
-  border: none;
+  box-sizing: border-box;
-  outline: none;
+}
-  background: none;
+
-
+a {
-  padding: 0;
+  color: white;
-  margin: 0;
+  text-decoration: none;
-
+
-  cursor: pointer;
+  transition: color 250ms;
-
+
-  font-size: 1em;
+  &:visited {
-  color: white;
+    color: white;
-
+  }
-  &:hover {
+
-    color: $accentColor;
+  &:hover,
-  }
+  &:focus {
-}
+    color: $accentColor;
-
+  }
-.btn {
+}
-  padding: 0.4em 0.75em;
+
-
+select,
-  outline: none;
+option,
-  background-color: #222;
+input,
-  border-radius: 8px;
+button {
-  font-weight: bold;
+  font-family: Lato, sans-serif;
-
+  font-size: 1em;
-  transition: all 250ms;
+}
-
+
-  &:hover {
+button {
-    color: $accentColor;
+  border: none;
-  }
+  outline: none;
-
+  background: none;
-  &.btn--outline {
+
-    background: none;
+  padding: 0;
-    font-weight: bold;
+  margin: 0;
-    outline: 1px solid $accentColor;
+
-  }
+  cursor: pointer;
-
+
-  &:focus-visible {
+  font-size: 1em;
-    color: $accentColor;
+  color: white;
-    outline: 1px solid white;
+
-  }
+  &:hover {
-
+    color: $accentColor;
-  &[data-disabled='true'] {
+  }
-    user-select: none;
+}
-    pointer-events: none;
+
-    -moz-user-select: none;
+[data-tooltip]:hover::after,
-    -webkit-user-select: none;
+[data-tooltip]:focus::after {
-
+  position: absolute;
-    opacity: 0.75;
+  transform: translateX(10px);
-    background-color: #2b2b2b;
+
-  }
+  content: attr(data-tooltip);
-
+  color: white;
-  &--text {
+  background: black;
-    font-weight: bold;
+  padding: 0.5em;
-    transition: all 250ms;
+  max-width: 300px;
-    background: none;
+  z-index: 100;
-    padding: 0;
+}
-
+
-    &:focus-visible {
+[data-tooltip] {
-      outline: 1px solid white;
+  cursor: pointer;
-    }
+}
-  }
+
-}
+.btn {
-
+  padding: 0.4em 0.75em;
-select,
+
-input[type="text"],
+  outline: none;
-input[type="number"] {
+  background-color: $secondaryColor;
-  background: none;
+  border-radius: 8px;
-  border: 2px solid #aaa;
+  font-weight: bold;
-  outline: none;
+
-
+  transition:
-  padding: 0.25em 0.35em;
+    color 150ms,
-
+    background-color 150ms;
-  color: white;
+
-  font-size: 1em;
+  &:hover {
-
+    color: $accentColor;
-  width: 18em;
+  }
-
+
-  &:focus-visible {
+  &.btn--outline {
-    border-color: $accentColor;
+    background: none;
-  }
+    font-weight: bold;
-
+    outline: 1px solid $accentColor;
-  &::placeholder {
+  }
-    color: #aaa;
+
-  }
+  &:focus-visible {
-}
+    color: $accentColor;
-
+    outline: 1px solid white;
-option {
+  }
-  color: white;
+
-  border: none;
+  &[data-chosen='true'] {
-  background-color: $bgColor;
+    background-color: $accentColor;
-}
+    color: black;
-
+
-ul {
+    box-shadow: 0 0 5px 1px $accentColor;
-  list-style: none;
+  }
-  margin: 0;
+
-  padding: 0;
+  &[data-disabled='true'] {
-}
+    user-select: none;
-
+    pointer-events: none;
-.text {
+    -moz-user-select: none;
-  &--accent {
+    -webkit-user-select: none;
-    color: $accentColor;
+
-  }
+    opacity: 0.75;
-
+    background-color: #2b2b2b;
-  &--grayed {
+  }
-    color: #aaa;
+
-  }
+  &--image {
-}
+    display: flex;
-
+    justify-content: center;
-.g-card {
+    align-items: center;
-  position: fixed;
+    gap: 0.5em;
-  top: 1em;
+
-  left: 0;
+    img {
-
+      width: 1.3em;
-  width: 100vw;
+      vertical-align: middle;
-  height: 100vh;
+    }
-
+  }
-  display: flex;
+
-  justify-content: center;
+  &--text {
-
+    font-weight: bold;
-  z-index: 200;
+    transition: all 250ms;
-
+    background: none;
-  &_bg {
+    padding: 0;
-    position: fixed;
+
-    top: 0;
+    &:focus-visible {
-    left: 0;
+      outline: 1px solid white;
-
+    }
-    width: 100vw;
+  }
-    height: 100vh;
+}
-
+
-    background-color: #000000aa;
+select,
-    z-index: 10;
+input[type='text'],
-  }
+input[type='number'] {
-}
+  background: $bgColor;
-
+  border: 2px solid #aaa;
-.g-choice {
+  outline: none;
-  input {
+
-    display: none;
+  padding: 0.25em 0.35em;
-  }
+
-
+  color: white;
-  span {
+  font-size: 1em;
-    padding: 0.25em 1em;
+
-    border-radius: 0.25em;
+  width: 18em;
-    border: 2px solid white;
+
-    margin: 0.25em;
+  &:focus-visible {
-    cursor: pointer;
+    border-color: $accentColor;
-
+  }
-    transition: all 100ms ease;
+
-  }
+  &::placeholder {
-
+    color: #aaa;
-  span:focus {
+  }
-    color: $accentColor;
+}
-    outline: none;
+
-  }
+option {
-
+  color: white;
-  label > input:checked + span {
+  border: none;
-    color: $accentColor;
+  background-color: $bgColor;
-    border-color: $accentColor;
+}
-  }
+
-}
+ul {
-
+  list-style: none;
-// Vue Transition anims
+  margin: 0;
-.slide-top {
+  padding: 0;
-  &-enter-from,
+}
-  &-leave-to {
+
-    transform: translateY(-100%);
+.text {
-  }
+  &--accent {
-
+    color: $accentColor;
-  &-enter-active,
+  }
-  &-leave-active {
+
-    transition: transform 100ms ease-in-out;
+  &--grayed {
-  }
+    color: #aaa;
-}
+  }
-
+}
-.card-appear {
+
-  &-enter-from,
+hr {
-  &-leave-to {
+  height: 3px;
-    opacity: 0;
+  background-color: white;
-  }
+  outline: none;
-
+  margin: 0;
-  &-enter-active,
+}
-  &-leave-active {
+
-    transition: all 100ms ease-in-out;
+.g-card {
-  }
+  position: fixed;
-}
+  top: 1em;
  left: 0;
  width: 100vw;
  height: 100vh;
  display: flex;
  justify-content: center;
  z-index: 200;
  &_bg {
    position: fixed;
    top: 0;
    left: 0;
    width: 100vw;
    height: 100vh;
    background-color: #000000aa;
    z-index: 10;
  }
 }
 .g-choice {
  input {
    display: none;
  }
  span {
    padding: 0.25em 1em;
    border-radius: 0.25em;
    border: 2px solid white;
    margin: 0.25em;
    cursor: pointer;
    transition: all 100ms ease;
  }
  span:focus {
    color: $accentColor;
    outline: none;
  }
  label > input:checked + span {
    color: $accentColor;
    border-color: $accentColor;
  }
 }
 // Vue Transition anims
 .slide-top {
  &-enter-from,
  &-leave-to {
    transform: translateY(-100%);
  }
  &-enter-active,
  &-leave-active {
    transition: transform 100ms ease-in-out;
  }
 }
 .card-appear {
  &-enter-from,
  &-leave-to {
    opacity: 0;
  }
  &-enter-active,
  &-leave-active {
    transition: all 100ms ease-in-out;
  }
 }
@@ -8,12 +8,18 @@
    padding: 0.5em 1em;
    background-color: $secondaryColor;
    text-align: center;
    h2 {
      margin: 0;
      color: white;
      font-size: 1.35em;
-      text-align: center;
+    }
    h3 {
      margin: 0.5em 0 0 0;
      font-size: 1.15em;
      color: #aaa;
    }
    button {
@@ -58,13 +64,6 @@
  }
 }
 hr {
  height: 3px;
  background-color: white;
  outline: none;
  margin: 0;
 }
@media only screen and (max-width: 470px) {
  .tab_attributes {
    label {
@@ -77,4 +76,3 @@ hr {
    }
  }
 }
@@ -1,101 +1,88 @@
-export type Vehicle = ILocomotive | ICarWagon;
+export type IVehicle = ILocomotive | ICarWagon;
 export type StockSectionMode = 'STOCK_LIST' | 'STOCK_GENERATOR';
-export interface IStore {
+export type TLocoGroup = 'loco-e' | 'loco-s' | 'loco-ezt' | 'loco-szt';
-  chosenCar: ICarWagon | null;
+export type TCarWagonGroup = 'car-passenger' | 'car-cargo';
  chosenLoco: ILocomotive | null;
  chosenCargo: ICargo | null;
  chosenVehicle: Vehicle | null;
  isColdStart: boolean;
  showSupporter: boolean;
  imageLoading: boolean;
  chosenLocoPower: string;
  chosenCarUseType: string;
  stockList: IStock[];
  readyStockList: IReadyStockItem[];
  cargoOptions: any[][];
  chosenStockListIndex: number;
  chosenRealStockName?: string;
  swapVehicles: boolean;
  vehiclePreviewSrc: string;
  isRandomizerCardOpen: boolean;
  isRealStockListCardOpen: boolean;
  stockSectionMode: 'stock-list' | 'stock-generator' | 'number-generator' | 'wiki-list';
  stockData?: IStockData;
 }
 export type TStockInfoKey = 'loco-e' | 'loco-s' | 'loco-ezt' | 'loco-szt' | 'car-passenger' | 'car-cargo';
 export interface IStockProps {
  type: string;
  length: number;
-  mass: number;
+  // mass: number;
-  cargo: string;
+  weight: number;
  // cargo?: string | null;
  cargoTypes: ICargo[] | null;
  coldStart?: boolean;
  doubleManned?: boolean;
 }
-export interface IStockData {
+export interface ICargo {
  id: string;
  weight: number;
 }
 export interface IVehiclesAPI {
  version: string;
  generator: {
    passenger: any;
    cargo: {
      [key: string]: string[];
    };
  };
-  info: {
+  vehicleInfo: {
-    'car-cargo': [string, string, boolean, boolean, string][];
+    'car-cargo': [string, string, boolean, number | null, string][];
-    'car-passenger': [string, string, boolean, boolean, string][];
+    'car-passenger': [string, string, boolean, number | null, string][];
-    'loco-e': [string, string, string, string, boolean][];
+    'loco-e': [string, string, string, string, number | null][];
-    'loco-s': [string, string, string, string, boolean][];
+    'loco-s': [string, string, string, string, number | null][];
-    'loco-szt': [string, string, string, string, boolean][];
+    'loco-szt': [string, string, string, string, number | null][];
-    'loco-ezt': [string, string, string, string, boolean][];
+    'loco-ezt': [string, string, string, string, number | null][];
  };
-  props: IStockProps[];
+  vehicleProps: IStockProps[];
-  usage: { [key: string]: string };
+  vehicleLocales: {
    pl: {
      cargo: Record<string, string>;
      usage: Record<string, string>;
    };
    en: {
      cargo: Record<string, string>;
      usage: Record<string, string>;
    };
  };
  realCompositions: Record<string, string>;
 }
 export interface ILocomotive {
  type: string;
-  power: string;
+  power: TLocoGroup;
  group: TLocoGroup;
  constructionType: string;
  cabinType: string;
  maxSpeed: number;
-  supportersOnly: boolean;
+  isSponsorsOnly: boolean;
  sponsorsOnlyTimestamp: number;
  imageSrc: string;
-
+  weight: number;
  mass: number;
  length: number;
  coldStart: boolean;
  doubleManned: boolean;
 }
 export interface ICarWagon {
  //"203V_PKPC_Fll_01","203V",true,false,"100",img
  type: string;
-  useType: 'car-passenger' | 'car-cargo';
+  useType: TCarWagonGroup;
  group: TCarWagonGroup;
  constructionType: string;
  loadable: boolean;
-  supportersOnly: boolean;
+  isSponsorsOnly: boolean;
  sponsorsOnlyTimestamp: number;
  maxSpeed: number;
  imageSrc: string;
-
+  weight: number;
  mass: number;
  length: number;
-  cargoList: { id: string; totalMass: number }[];
+  cargoTypes: ICargo[];
 }
 export interface ICargo {
  id: string;
  totalMass: number;
 }
 export interface IStock {
@@ -104,20 +91,21 @@ export interface IStock {
  useType: string;
  constructionType: string;
  length: number;
-  mass: number;
+  // mass: number;
  weight: number;
  maxSpeed: number;
-  cargo?: { id: string; totalMass: number };
+  cargo?: ICargo;
  isLoco: boolean;
-  supportersOnly: boolean;
+  isSponsorsOnly: boolean;
  sponsorsOnlyTimestamp: number;
  count: number;
  imgSrc?: string;
 }
-export interface IReadyStockItem {
+export interface IRealComposition {
  stockId: string;
  stockString: string;
  type: string;
  number: string;
  name: string;
 }
@@ -1,5 +0,0 @@
 const supportedConstructions = ['303e', '203e'];
 export function locoSupportsColdStart(constructionType: string) {
  return new RegExp(`(${supportedConstructions.join('|')})`).test(constructionType);
 }
@@ -1,14 +0,0 @@
 import speedLimitTable from '../constants/speedLimits.json';
 export type LocoType = keyof typeof speedLimitTable;
 export const calculateSpeedLimit = (locoType: LocoType, stockMass: number, isTrainPassenger: boolean) => {
  const speedTable = speedLimitTable[locoType][isTrainPassenger ? 'passenger' : 'cargo'];
  if (!speedTable) return undefined;
  let speedLimit = 0;
  for (let mass in speedTable) if (stockMass > Number(mass)) speedLimit = (speedTable as any)[mass];
  return speedLimit;
 };
@@ -0,0 +1,33 @@
 import speedLimits from '../constants/speedLimits.json';
 import massLimits from '../constants/massLimits.json';
 export type SpeedLimitLocoType = keyof typeof speedLimits;
 export type MassLimitLocoType = keyof typeof massLimits;
 export function calculateSpeedLimit(
  locoType: SpeedLimitLocoType,
  stockTotalWeight: number,
  stockCount: number,
  isTrainPassenger: boolean
 ) {
  if (speedLimits[locoType] === undefined) return 0;
  if (stockCount == 1) return speedLimits[locoType]['none'];
  const stockType = isTrainPassenger ? 'passenger' : 'cargo';
  const speedTable = speedLimits[locoType][stockType];
  if (!speedTable) return undefined;
  let speedLimit = 0;
  for (const mass in speedTable)
    if (stockTotalWeight > Number(mass)) speedLimit = (speedTable as any)[mass];
  return speedLimit;
 }
 export function calculateMassLimit(locoType: MassLimitLocoType, isTrainPassenger: boolean) {
  if (massLimits[locoType] === undefined) return 0;
  return massLimits[locoType][isTrainPassenger ? 0 : 1] || 0;
 }
@@ -1,38 +1,49 @@
 import { EVehicleUseType } from '../enums/EVehicleUseType';
-import { ICarWagon, ILocomotive, IStore, TStockInfoKey } from '../types';
+import { ICarWagon, ILocomotive, IStock, IVehiclesAPI, TCarWagonGroup, TLocoGroup } from '../types';
-import { LocoType, calculateSpeedLimit } from './speedLimitUtils';
+import {
  MassLimitLocoType,
  SpeedLimitLocoType,
  calculateMassLimit,
  calculateSpeedLimit,
 } from './vehicleLimitsUtils';
 export function isLocomotive(vehicle: ILocomotive | ICarWagon): vehicle is ILocomotive {
  return (vehicle as ILocomotive).power !== undefined;
 }
-export function locoDataList(state: IStore) {
+export function locoDataList(vehiclesData: IVehiclesAPI | undefined) {
-  if (!state.stockData) return [];
+  if (!vehiclesData) return [];
-  const stockData = state.stockData;
+  return Object.keys(vehiclesData.vehicleInfo).reduce((acc, vehiclePower) => {
  return Object.keys(stockData.info).reduce((acc, vehiclePower) => {
    if (!vehiclePower.startsWith('loco')) return acc;
-    const locoVehiclesData = stockData.info[vehiclePower as 'loco-e' | 'loco-s' | 'loco-ezt' | 'loco-szt'];
+    const locoVehiclesData = vehiclesData.vehicleInfo[vehiclePower as TLocoGroup];
    locoVehiclesData.forEach((loco) => {
-      if (state.showSupporter && !loco[4]) return;
+      // if (!loco[4]) return;
-      const [type, constructionType, cabinType, maxSpeed, supportersOnly] = loco;
+      const [type, constructionType, cabinType, maxSpeed, sponsorsTimestamp] = loco;
-      const locoProps = stockData.props.find((prop) => constructionType == prop.type);
+      const locoProps = vehiclesData.vehicleProps.find((prop) => constructionType == prop.type);
      acc.push({
-        power: vehiclePower,
+        power: vehiclePower as TLocoGroup,
        group: vehiclePower as TLocoGroup,
        type,
        constructionType,
        cabinType,
        maxSpeed: Number(maxSpeed),
-        supportersOnly,
+        isSponsorsOnly: Number(sponsorsTimestamp) > Date.now(),
        sponsorsOnlyTimestamp: Number(sponsorsTimestamp),
        imageSrc: '',
-        length: locoProps?.length && type.startsWith('2EN') ? locoProps.length * 2 : locoProps?.length || 0,
+        length:
-        mass: locoProps?.mass && type.startsWith('2EN') ? 253 : locoProps?.mass || 0,
+          locoProps?.length && type.startsWith('2EN')
            ? locoProps.length * 2
            : locoProps?.length ?? 0,
        weight: locoProps?.weight && type.startsWith('2EN') ? 253000 : locoProps?.weight ?? 0,
        coldStart: locoProps?.coldStart ?? false,
        doubleManned: locoProps?.doubleManned ?? false,
      });
    });
@@ -40,38 +51,36 @@ export function locoDataList(state: IStore) {
  }, [] as ILocomotive[]);
 }
-export function carDataList(state: IStore) {
+export function carDataList(vehiclesData: IVehiclesAPI | undefined) {
-  if (!state.stockData) return [];
+  if (!vehiclesData) return [];
-  const stockData = state.stockData;
+  return Object.keys(vehiclesData.vehicleInfo).reduce((acc, vehicleUseType) => {
  return Object.keys(stockData.info).reduce((acc, vehicleUseType) => {
    if (!vehicleUseType.startsWith('car')) return acc;
-    const carVehiclesData = stockData.info[vehicleUseType as 'car-passenger' | 'car-cargo'];
+    const carVehiclesData = vehiclesData.vehicleInfo[vehicleUseType as TCarWagonGroup];
    carVehiclesData.forEach((car) => {
-      if (state.showSupporter && !car[3]) return;
+      const [type, constructionType, loadable, sponsorsOnlyTimestamp, maxSpeed] = car;
-      const carPropsData = stockData.props.find((v) => car[0].toString().startsWith(v.type));
+      if (sponsorsOnlyTimestamp && Number(sponsorsOnlyTimestamp) <= Date.now()) return;
      const carPropsData = vehiclesData.vehicleProps.find((v) =>
        type.toString().startsWith(v.type)
      );
      acc.push({
-        useType: vehicleUseType as 'car-passenger' | 'car-cargo',
+        useType: vehicleUseType as TCarWagonGroup,
-        type: car[0],
+        group: vehicleUseType as TCarWagonGroup,
-        constructionType: car[1],
+        type,
-        loadable: car[2],
+        constructionType,
-        supportersOnly: car[3],
+        loadable,
-        maxSpeed: Number(car[4]),
+        isSponsorsOnly: Number(sponsorsOnlyTimestamp) > Date.now(),
        sponsorsOnlyTimestamp: Number(sponsorsOnlyTimestamp),
        maxSpeed: Number(maxSpeed),
        imageSrc: '',
-        cargoList:
+        cargoTypes: carPropsData?.cargoTypes ?? [],
          !carPropsData || carPropsData.cargo === null
            ? []
            : carPropsData.cargo.split(';').map((cargo) => ({
                id: cargo.split(':')[0],
                totalMass: Number(cargo.split(':')[1]),
              })),
-        mass: carPropsData?.mass || 0,
+        weight: carPropsData?.weight || 0,
        length: carPropsData?.length || 0,
      });
    });
@@ -80,23 +89,23 @@ export function carDataList(state: IStore) {
  }, [] as ICarWagon[]);
 }
-export function totalMass(state: IStore) {
+export function totalWeight(stockList: IStock[]) {
-  return ~~state.stockList.reduce(
+  return stockList.reduce(
-    (acc, stock) => acc + (stock.cargo ? stock.cargo.totalMass : stock.mass) * stock.count,
+    (acc, stock) => acc + (stock.weight + (stock.cargo?.weight ?? 0)) * stock.count,
    0
  );
 }
-export function totalLength(state: IStore) {
+export function totalLength(stockList: IStock[]) {
-  return state.stockList.reduce((acc, stock) => acc + stock.length * stock.count, 0);
+  return stockList.reduce((acc, stock) => acc + stock.length * stock.count, 0);
 }
-export function maxStockSpeed(state: IStore) {
+export function maxStockSpeed(stockList: IStock[]) {
-  const stockSpeedLimit = state.stockList.reduce(
+  const stockSpeedLimit = stockList.reduce(
    (acc, stock) => (stock.maxSpeed < acc || acc == 0 ? stock.maxSpeed : acc),
    0
  );
-  const headingLoco = state.stockList[0]?.isLoco ? state.stockList[0] : undefined;
+  const headingLoco = stockList[0]?.isLoco ? stockList[0] : undefined;
  if (!headingLoco) return stockSpeedLimit;
@@ -104,58 +113,34 @@ export function maxStockSpeed(state: IStore) {
  if (/^(EN|2EN|SN)/.test(locoType)) return stockSpeedLimit;
-  const stockMass = totalMass(state);
+  const speedLimitByMass = calculateSpeedLimit(
-
+    locoType as SpeedLimitLocoType,
-  const speedLimitByMass = calculateSpeedLimit(locoType as LocoType, stockMass, isTrainPassenger(state));
+    totalWeight(stockList),
    stockList.length,
    isTrainPassenger(stockList)
  );
  return speedLimitByMass ? Math.min(stockSpeedLimit, speedLimitByMass) : stockSpeedLimit;
 }
-export function acceptableMass(state: IStore) {
+export function acceptableWeight(stockList: IStock[]) {
-  if (state.stockList.length == 0 || !state.stockList[0].isLoco) return 0;
+  if (stockList.length == 0 || !stockList[0].isLoco) return 0;
  const activeLocomotiveType = state.stockList[0].type;
-  if (/^SM/.test(activeLocomotiveType)) return 2400;
+  const activeLocomotiveType = stockList[0].type.split('-')[0];
-  // Elektryczne EU07 / EP07 / EP08 / ET41
+  const locoMassLimit = calculateMassLimit(
    activeLocomotiveType as MassLimitLocoType,
    isTrainPassenger(stockList)
  );
-  // Pasażerski elektr.
+  return locoMassLimit;
  if (isTrainPassenger(state)) {
    if (/^(EU|EP)/.test(activeLocomotiveType)) return 650;
    if (/^ET/.test(activeLocomotiveType)) return 700;
    return 0;
  }
  // Towarowy / inny elektr.
  if (/^EU/.test(activeLocomotiveType)) return 2000;
  if (/^ET/.test(activeLocomotiveType)) return 4000;
  if (/^EP/.test(activeLocomotiveType)) return 650;
  return 0;
 }
-export function isTrainPassenger(state: IStore) {
+export function isTrainPassenger(stockList: IStock[]) {
-  if (state.stockList.length == 0) return false;
+  if (stockList.length == 0) return false;
-  if (state.stockList.every((stock) => stock.isLoco)) return false;
+  if (stockList.every((stock) => stock.isLoco)) return false;
-  return state.stockList
+  return stockList
    .filter((stock) => !stock.isLoco)
    .every((stock) => stock.useType === EVehicleUseType.CAR_PASSENGER);
 }
 export function chosenRealStock(state: IStore) {
  const currentStockString = state.stockList
    .reduce((acc, stock) => {
      for (let i = 0; i < stock.count; i++) acc.push(stock.type);
      return acc;
    }, [] as string[])
    .join(';');
  const realStockObj = state.readyStockList.find((readyStock) => readyStock.stockString == currentStockString);
  state.chosenRealStockName = realStockObj?.stockId ?? undefined;
  return realStockObj;
 }
@@ -1,35 +1,37 @@
-<template>
+<template>
-  <div class="app-container">
+  <div class="app-container">
-    <MainContainer />
+    <MainContainer />
-    <Footer />
+    <FooterVue />
-  </div>
+  </div>
-</template>
+</template>
-
+
-<script lang="ts">
+<script lang="ts">
-import { defineComponent } from 'vue';
+import { defineComponent } from 'vue';
-import { useStore } from '../store';
+import { useStore } from '../store';
-
+
-import MainContainer from '../components/app/MainContainer.vue';
+import MainContainer from '../components/app/MainContainer.vue';
-import Footer from '../components/app/Footer.vue';
+import FooterVue from '../components/app/Footer.vue';
-
+
-export default defineComponent({
+export default defineComponent({
-  components: {
+  components: {
-    MainContainer,
+    MainContainer,
-    Footer,
+    FooterVue,
-  },
+  },
-
+
-  data: () => ({
+  data: () => ({
-    store: useStore(),
+    store: useStore(),
-  }),
+  }),
-});
+});
-</script>
+</script>
-
+
-<style lang="scss" scoped>
+<style lang="scss" scoped>
-.app-container {
+.app-container {
-  min-height: 100vh;
+  display: flex;
-
+  justify-content: center;
-  display: flex;
+  align-items: center;
-  flex-direction: column;
+  flex-direction: column;
-  align-items: center;
+
-}
+  min-height: 100vh;
-</style>
+  padding: 0.5em;
 }
 </style>
@@ -1,7 +1,7 @@
 /// <reference types="vite/client" />
 declare module '*.vue' {
-  import type { DefineComponent } from 'vue'
+  import type { DefineComponent } from 'vue';
-  const component: DefineComponent<{}, {}, any>
+  const component: DefineComponent<{}, {}, any>;
-  export default component
+  export default component;
 }
@@ -13,8 +13,13 @@ export default defineConfig({
    VitePWA({
      registerType: 'autoUpdate',
      devOptions: {
        suppressWarnings: true,
        enabled: true,
      },
      workbox: {
-        // globPatterns: ['**/*.{js,css,html,png,svg,img}'],
+        globPatterns: ['**/*.{js,css,html,jpg,png,svg,img,woff,woff2}'],
        runtimeCaching: [
          {
@@ -24,10 +29,24 @@ export default defineConfig({
              cacheName: 'swdr-images-cache',
              expiration: {
                maxEntries: 50,
-                maxAgeSeconds: 60 * 60 * 24 * 7, // <== 7 days
+                maxAgeSeconds: 60 * 60 * 24, // <== 1 day
              },
              cacheableResponse: {
-                statuses: [404],
+                statuses: [0, 200, 404],
              },
            },
          },
          {
            urlPattern: /^https:\/\/static.spythere.eu\/.*/i,
            handler: 'CacheFirst',
            options: {
              cacheName: 'spythere-api-cache',
              expiration: {
                maxEntries: 100,
                maxAgeSeconds: 60 * 60 * 24, // <== 1 day
              },
              cacheableResponse: {
                statuses: [200, 302],
              },
            },
          },
@@ -36,5 +55,3 @@ export default defineConfig({
    }),
  ],
 });
Author	SHA1	Message	Date
Spythere	583c2887e9	Merge pull request #22 from Spythere/development Wersja 1.8.3	2024-04-03 21:47:55 +02:00
Spythere	f915094775	speed disclaimer	2024-04-03 21:43:37 +02:00
Spythere	d5e735b59e	caching	2024-03-27 16:21:56 +01:00
Spythere	43a724bf13	cleanup	2024-03-27 16:13:33 +01:00
Spythere	337425d21c	eslint & prettier update; api fetching from static server	2024-03-27 16:10:53 +01:00
Spythere	9ff9341851	Merge pull request #21 from Spythere/development Wersja 1.8.2	2024-03-08 16:55:16 +01:00
Spythere	f9276f6c71	bump: 1.8.2	2024-03-08 16:54:30 +01:00
Spythere	f4f9a4729f	poprawki cachowania	2024-03-08 16:54:08 +01:00
Spythere	ed0906b63e	Merge pull request #20 from Spythere/development Wersja 1.8.1	2024-03-07 14:22:45 +01:00
Spythere	2ae19123a3	bump: 1.8.1	2024-03-07 14:19:23 +01:00
Spythere	0c2be7b927	speed limits fix	2024-03-07 14:19:04 +01:00
Spythere	ffce2b572b	Wersja 1.7.4 Wersja 1.7.4	2024-02-20 13:26:22 +01:00
Spythere	1b5a26e380	speed constraints for locomotives-only	2024-02-20 12:14:09 +01:00
Spythere	c9b681eaee	bump: 1.8.0	2024-02-20 11:49:52 +01:00
Spythere	160879adec	hotfix	2024-02-19 21:25:21 +01:00
Spythere	d6ddbe7af7	translation fixes	2024-02-19 17:42:41 +01:00
Spythere	1c7b72ea1d	removed new categories; awaiting changes in the simulator	2024-02-19 17:41:16 +01:00
Spythere	83f5b07c7e	code adaptation for API changes; tons changed to kilos	2024-02-19 17:37:46 +01:00
Spythere	77cb64e25a	num. generator: categories update	2024-02-15 23:09:21 +01:00
Spythere	6d0cc8e7cd	wiki tab td padding	2024-02-14 15:06:45 +01:00
Spythere	7fb4b0ae26	fix: incorrect wagon count while generating a r.stock	2024-02-14 15:04:23 +01:00
Spythere	ed191d597b	translations; numgen category drawing	2024-02-05 22:36:36 +01:00
Spythere	5d24accb15	forum link update	2024-02-03 18:19:43 +01:00
Spythere	54c6850121	translation & num gen fixes	2024-02-03 18:17:01 +01:00
Spythere	fad8c40b4b	translation fixes	2024-02-03 16:41:07 +01:00
Spythere	a8485b3531	lock sync hotfix	2024-02-03 16:31:04 +01:00
Spythere	e7dcd125ec	packages upgrade	2024-02-03 16:26:42 +01:00
Spythere	d886f44c59	lock files	2024-02-03 16:18:13 +01:00
Spythere	5ff6c0504e	bump to 1.7.4; added new categories to number gen & showing rules	2024-02-03 16:15:22 +01:00
Spythere	2158145ae8	design update & fixes	2024-02-01 16:12:41 +01:00
Spythere	6101c9bfb2	grouping generated stock (wip)	2024-01-30 16:39:16 +01:00
Spythere	bd9af9a630	Merge pull request #18 from Spythere/development Wersja 1.7.3	2024-01-18 17:57:01 +01:00
Spythere	2188dbdf9b	bump: 1.7.3	2024-01-18 16:37:15 +01:00
Spythere	c4576d7802	hotfix 4E	2024-01-18 16:36:57 +01:00
Spythere	86cb4cff4d	Merge pull request #17 - Wersja 1.7.2 Wersja 1.7.2	2023-11-07 17:43:34 +01:00
Spythere	0534848677	bump: 1.7.2	2023-11-06 21:20:22 +01:00
Spythere	c5d116e2db	added alphabetical cargo sort	2023-11-06 21:20:07 +01:00
Spythere	3dce5ec7c0	responsive font size	2023-11-06 21:08:01 +01:00
Spythere	956ff8afd7	stock thumbnail labels fix	2023-11-06 20:20:00 +01:00
Spythere	5b629833df	Merge pull request #16 - Wersja 1.7.1 Wersja 1.7.1	2023-10-31 23:05:43 +01:00
Spythere	b53201a7ff	hotfix	2023-10-31 23:02:58 +01:00
Spythere	f0ddd0e27f	custom checkboxes	2023-10-31 03:17:24 +01:00
Spythere	94bfba2c49	resolve fonts edit	2023-10-31 03:17:11 +01:00
Spythere	1e4541ef0d	spawn props checking on stock upload	2023-10-28 15:40:22 +02:00
Spythere	c25a55a7d9	added double manning checkbox & support	2023-10-28 15:33:09 +02:00
Spythere	bea3c59405	thumbnail placeholder fix	2023-10-28 14:12:21 +02:00
Spythere	8cd43adff3	acceptable masses & speeds update	2023-10-28 13:44:55 +02:00
Spythere	5ab1963117	lock files sync	2023-10-27 16:46:57 +02:00
Spythere	50d784a0de	1.7.1 bump	2023-10-27 16:43:39 +02:00
Spythere	f61135ce6b	packages bump; config	2023-10-27 16:39:54 +02:00
Spythere	5e43ece1aa	pwa optimize & fixes	2023-10-27 16:36:25 +02:00
Spythere	37e4149a34	Merge pull request #15 from Spythere/development Wersja 1.7.0	2023-10-26 21:43:46 +02:00
Spythere	e515203557	stockObject & static handling hotfixes	2023-10-26 21:37:33 +02:00
Spythere	0d79c71eba	1.7.0 bump	2023-10-26 21:36:00 +02:00
Spythere	2bbf9a8ac3	section improvements; hotfixes	2023-10-26 21:35:42 +02:00
Spythere	45b2bd01a2	enhanced wiki list	2023-10-26 00:55:13 +02:00
Spythere	665ffb9dce	lock: hotfix; bump 1.6.1	2023-10-24 23:31:45 +02:00
Spythere	1c2a93fbd5	format; linting; aktualizacja do 2023.2.1	2023-10-24 23:28:42 +02:00
Spythere	57ab6cc02d	gitignore	2023-08-25 20:29:17 +02:00
Spythere	aa62240d27	Merge do wersji 1.6.0	2023-08-24 01:29:45 +02:00
Spythere	a699c9851f	tłumaczenia; fix losowania generatora numeru	2023-08-24 00:01:19 +02:00
Spythere	d7c1f8c5b4	fix: tłumaczenia alertów	2023-08-23 23:04:04 +02:00
Spythere	c1c01c496a	poprawki w widoku składu; tłumaczenia	2023-08-23 22:54:17 +02:00
Spythere	a7f92d3ec5	feature: zapamiętywanie języka	2023-08-22 18:34:15 +02:00
Spythere	ae7be6d6f8	tłumaczenie PL/EN (cz.3)	2023-08-22 18:30:04 +02:00
Spythere	bf204d5e36	hotfix: pliki lock	2023-08-22 00:55:17 +02:00
Spythere	459876f5b4	bump: 1.6.0	2023-08-22 00:53:02 +02:00
Spythere	4a1a840c16	cleanup i18n; wykrywanie języka	2023-08-22 00:52:51 +02:00
Spythere	c0552e890c	hotfix: synchronizacja plików lock	2023-08-22 00:36:31 +02:00
Spythere	80d6f2b85f	tłumaczenie PL/EN (wip, cz.2)	2023-08-22 00:33:51 +02:00
Spythere	17882e3e6e	feature: tłumaczenie PL/EN (wip)	2023-08-21 03:19:37 +02:00
Spythere	4a03535b07	feature: ikony akcji	2023-08-19 13:13:00 +02:00
		`@@ -0,0 +1 @@`
							<svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 -960 960 960" fill="white" width="48"><path d="M314.696-195.478q-32.507 0-55.862-23.356-23.356-23.355-23.356-55.862v-549.826q0-32.74 23.356-56.262 23.355-23.522 55.862-23.522h429.826q32.74 0 56.262 23.522t23.522 56.262v549.826q0 32.507-23.522 55.862-23.522 23.356-56.262 23.356H314.696Zm0-79.218h429.826v-549.826H314.696v549.826ZM175.478-55.694q-32.74 0-56.262-23.522t-23.522-56.262v-629.044h79.784v629.044h509.044v79.784H175.478Zm139.218-219.002v-549.826 549.826Z"/></svg>
		`@@ -0,0 +1 @@`
							`<svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 -960 960 960" fill="white" width="48"><path d="M480-318.087 266.651-531.436l57.131-56.001 116.609 116.609v-343.868h79.218v343.868l116.609-116.609 57.131 56.001L480-318.087ZM225.087-145.869q-32.507 0-55.862-23.356-23.356-23.355-23.356-55.862v-143h79.218v143h509.826v-143h79.783v143q0 32.478-23.521 55.848-23.522 23.37-56.262 23.37H225.087Z"/></svg>`