Merge pull request #62 - Wersja 1.18.3

Wersja 1.18.3
hotifx toString
2026-05-03 13:28:11 +00:00 · 2023-11-15 02:13:54 +01:00 · 2023-11-13 15:57:01 +01:00 · 2023-11-13 15:32:02 +01:00 · 2023-11-13 14:59:17 +01:00 · 2023-11-12 16:40:25 +01:00
197 changed files with 16855 additions and 24434 deletions
@@ -0,0 +1,18 @@
 /* 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'
  }
 }
@@ -0,0 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/prettierrc",
  "tabWidth": 2,
  "singleQuote": true,
  "printWidth": 100,
  "trailingComma": "none"
 }
@@ -1,11 +1,14 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="pl">
  <head>
    <meta charset="utf-8" />
    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
    <meta name="viewport" content="width=device-width,initial-scale=1.0" />
-    <meta name="keywords" content="Stacjownik, TD2, Train Driver 2, stacjownik-td2, stacjownik, td2.info.pl" />
+    <meta
      name="keywords"
      content="Stacjownik, TD2, Train Driver 2, stacjownik-td2, stacjownik, td2.info.pl"
    />
    <meta name="description" content="Pomocnik maszynisty i dyżurnego symulatora Train Driver 2" />
    <title>Stacjownik</title>
@@ -18,10 +21,6 @@
    <meta name="msapplication-TileColor" content="#da532c" />
    <meta name="theme-color" content="#222222" />
    <link rel="icon" href="favicon-64.png" sizes="64x64" type="image/png" />
    <link rel="icon" href="favicon-62.png" sizes="62x62" type="image/png" />
    <link rel="icon" href="favicon-32.png" sizes="32x32" type="image/png" />
    <link rel="icon" href="favicon-16.png" sizes="16x16" type="image/png" />
    <link rel="icon" href="favicon.ico" />
    <!-- Static OpenGraph meta -->
@@ -29,18 +28,33 @@
    <meta property="og:url" content="https://stacjownik-td2.web.app/" />
    <meta property="og:type" content="website" />
    <meta property="og:title" content="Stacjownik" />
-    <meta property="og:description" content="Pomocnik maszynisty i dyżurnego symulatora Train Driver 2" />
+    <meta
-    <meta property="og:image" content="https://raw.githubusercontent.com/Spythere/api/main/thumbnails/stacjownik.jpg" />
+      property="og:description"
      content="Pomocnik maszynisty i dyżurnego symulatora Train Driver 2"
    />
    <meta
      property="og:image"
      content="https://raw.githubusercontent.com/Spythere/api/main/thumbnails/stacjownik.jpg"
    />
    <meta property="og:image:width" content="1200" />
    <meta property="og:image:height" content="630" />
    <meta property="og:site_name" content="Stacjownik" />
    <meta name="twitter:card" content="summary_large_image" />
    <meta name="twitter:title" content="Stacjownik" />
-    <meta name="twitter:description" content="Pomocnik maszynisty i dyżurnego symulatora Train Driver 2" />
+    <meta
-    <meta name="twitter:image" content="https://raw.githubusercontent.com/Spythere/api/main/thumbnails/stacjownik.jpg" />
+      name="twitter:description"
      content="Pomocnik maszynisty i dyżurnego symulatora Train Driver 2"
    />
    <meta
      name="twitter:image"
      content="https://raw.githubusercontent.com/Spythere/api/main/thumbnails/stacjownik.jpg"
    />
-    <link href="https://fonts.googleapis.com/css2?family=Quicksand:wght@500;700&display=swap" rel="stylesheet" />
+    <link
      href="https://fonts.googleapis.com/css2?family=Quicksand:wght@500;700&display=swap"
      rel="stylesheet"
    />
  </head>
  <body>
@@ -1,12 +1,15 @@
 {
  "name": "stacjownik",
-  "version": "1.17.1",
+  "version": "1.18.3",
  "private": true,
  "scripts": {
    "dev": "vite",
    "build": "vue-tsc --noEmit && vite build",
    "deploy": "yarn build && firebase deploy --only hosting",
-    "preview": "yarn build && vite preview"
+    "preview": "yarn build && vite preview",
    "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": {
    "core-js": "^3.32.2",
@@ -25,10 +28,17 @@
    "@vite-pwa/assets-generator": "^0.0.10",
    "@vitejs/plugin-vue": "^4.3.4",
    "axios": "^1.5.0",
    "prettier": "^3.0.3",
    "typescript": "^5.2.2",
    "vite": "^4.4.9",
    "vite-plugin-pwa": "^0.16.5",
-    "vue-tsc": "^1.8.11"
+    "vue-tsc": "^1.8.11",
    "@vue/eslint-config-prettier": "^8.0.0",
    "@vue/eslint-config-typescript": "^12.0.0",
    "@vue/tsconfig": "^0.4.0",
    "eslint": "^8.49.0",
    "eslint-plugin-vue": "^9.17.0",
    "@rushstack/eslint-patch": "^1.3.3"
  },
  "browserslist": [
    "> 1%",
@@ -43,9 +43,10 @@
 #app {
  color: white;
  font-size: 1rem;
  overflow-x: hidden;
  @include smallScreen() {
-    font-size: calc(0.55rem + 1.1vw);
+    font-size: calc(0.65rem + 0.8vw);
  }
  @include screenLandscape() {
@@ -55,24 +56,17 @@
 // CONTAINER
 .app_container {
-  display: flex;
+  // display: flex;
-  flex-flow: column;
+  // flex-flow: column;
  display: grid;
  grid-template-rows: auto 1fr auto;
  grid-template-columns: 100%;
  min-height: 100vh;
 }
-  header {
+.app_main {
    flex: 0 0 auto;
  }
  main {
    flex: 1 1 auto;
  padding: 0 0.5em;
  }
  footer {
    flex: 0 1 0.2em;
  }
 }
 .warning {
@@ -6,13 +6,11 @@
      </keep-alive>
    </transition>
    <UpdatePrompt />
    <AppHeader :current-lang="currentLang" @change-lang="changeLang" />
    <main class="app_main">
      <router-view v-slot="{ Component }">
-        <keep-alive exclude="JournalView">
+        <keep-alive exclude="JournalView,SceneryView">
          <component :is="Component" :key="$route.name" />
        </keep-alive>
      </router-view>
@@ -24,7 +22,9 @@
      {{ new Date().getUTCFullYear() }} |
      <a :href="releaseURL" target="_blank">v{{ VERSION }}{{ isOnProductionHost ? '' : 'dev' }}</a>
      <br />
-      <a href="https://discord.gg/x2mpNN3svk"><img :src="getIcon('discord', 'png')" alt="">&nbsp;<b>{{ $t('footer.discord') }}</b></a>
+      <a href="https://discord.gg/x2mpNN3svk">
        <img src="/images/icon-discord.png" alt="" />&nbsp;<b>{{ $t('footer.discord') }}</b>
      </a>
      <div style="display: none">&int; ukryta taktyczna całka do programowania w HTMLu</div>
    </footer>
@@ -32,82 +32,51 @@
 </template>
 <script lang="ts">
-import { computed, defineComponent, KeepAlive, provide, ref, watch } from 'vue';
+import { defineComponent, watch } from 'vue';
 import Clock from './components/App/Clock.vue';
 import packageInfo from '.././package.json';
 import { regions } from './data/options.json';
 import { useStore } from './store/mainStore';
 import StatusIndicator from './components/App/StatusIndicator.vue';
 import SelectBox from './components/Global/SelectBox.vue';
 import { useStore } from './store/store';
 import TrainModal from './components/Global/TrainModal.vue';
 import StorageManager from './scripts/managers/storageManager';
 import imageMixin from './mixins/imageMixin';
 import AppHeader from './components/App/AppHeader.vue';
 import axios from 'axios';
-import UpdatePrompt from './components/App/UpdatePrompt.vue';
+import StorageManager from './managers/storageManager';
 import { VERSION } from 'vue-i18n';
 import { RouterView } from 'vue-router';
 import useCustomSW from './mixins/useCustomSW';
 export default defineComponent({
  components: {
    Clock,
    StatusIndicator,
    SelectBox,
    TrainModal,
-    AppHeader,
+    AppHeader
    UpdatePrompt,
  },
  mixins: [imageMixin],
  setup() {
    const store = useStore();
    store.connectToAPI();
    const { offlineReady } = useCustomSW();
    const isFilterCardVisible = ref(false);
    provide('isFilterCardVisible', isFilterCardVisible);
    return {
      store,
      isFilterCardVisible,
      onlineDispatchers: computed(() =>
        store.stationList.filter((station) => station.onlineInfo && station.onlineInfo.region == store.region.id)
      ),
      dispatcherDataStatus: store.dataStatuses.dispatchers,
    };
  },
  data: () => ({
    VERSION: packageInfo.version,
    store: useStore(),
    currentLang: 'pl',
    releaseURL: '',
-    isOnProductionHost: location.hostname == 'stacjownik-td2.web.app',
+    isOnProductionHost: location.hostname == 'stacjownik-td2.web.app'
  }),
  created() {
    this.loadLang();
    this.store.connectToAPI();
    this.store.isOffline = !window.navigator.onLine;
    window.addEventListener('offline', () => {
      this.store.isOffline = true;
-      this.store.apiData = {
+      this.store.activeData.activeSceneries = [];
-        stations: [],
+      this.store.activeData.trains = [];
-        dispatchers: [],
+      this.store.activeData.connectedSocketCount = 0;
        trains: [],
        connectedSocketCount: 0,
      };
-      this.store.setOnlineData();
+      this.store.setStatuses();
    });
    window.addEventListener('online', () => {
@@ -121,16 +90,28 @@ export default defineComponent({
    watch(
      () => this.store.blockScroll,
      (value) => {
-        if (value) {
+        if (value) document.body.classList.add('no-scroll');
-          document.body.classList.add('no-scroll');
+        else document.body.classList.remove('no-scroll');
          return;
        }
        document.body.classList.remove('no-scroll');
      }
    );
  },
  watch: {
    '$route.query.region': {
      immediate: true,
      handler(regionQuery: string) {
        if (regionQuery) {
          this.store.region.id =
            regions.find(
              (reg) =>
                reg.id == regionQuery.toLocaleLowerCase() ||
                reg.value.toLocaleLowerCase() == regionQuery.toLocaleLowerCase()
            )?.id || 'eu';
        }
      }
    }
  },
  methods: {
    changeLang(lang: string) {
      this.$i18n.locale = lang;
@@ -170,8 +151,8 @@ export default defineComponent({
        this.changeLang('en');
        return;
      }
-    },
+    }
-  },
+  }
 });
 </script>
@@ -3,8 +3,13 @@
    <div class="header_container">
      <div class="header_icons">
        <span class="icons-top">
-          <img :src="getIcon('pl')" alt="icon-pl" @click="changeLang('en')" v-if="currentLang == 'pl'" />
+          <img
-          <img :src="getIcon('en', 'jpg')" alt="icon-en" @click="changeLang('pl')" v-else />
+            src="/images/icon-pl.svg"
            alt="icon-pl"
            @click="changeLang('en')"
            v-if="currentLang == 'pl'"
          />
          <img src="/images/icon-en.jpg" alt="icon-en" @click="changeLang('pl')" v-else />
        </span>
      </div>
@@ -13,7 +18,7 @@
        <span class="header_brand">
          <router-link to="/">
-            <img :src="getImage('stacjownik-header-logo.svg')" alt="Stacjownik" />
+            <img src="/images/stacjownik-header-logo.svg" alt="Stacjownik" />
          </router-link>
        </span>
@@ -21,7 +26,7 @@
          <Clock />
          <div class="info_counter">
-            <img :src="getIcon('dispatcher')" alt="icon dispatcher" />
+            <img src="/images/icon-dispatcher.svg" alt="icon dispatcher" />
            <span class="text--primary">{{ onlineDispatchersCount }}</span>
            <!-- <span class="g-tooltip">
@@ -31,12 +36,12 @@
            <span class="text--grayed"> / </span>
            <span class="text--primary">{{ onlineTrainsCount }}</span>
-            <img :src="getIcon('train')" alt="icon train" />
+            <img src="/images/icon-train.svg" alt="icon train" />
          </div>
-          <span class="info_region">
+          <div class="info_region">
-            <SelectBox :itemList="computedRegions" :defaultItemIndex="0" @selected="changeRegion" />
+            <RegionDropdown />
-          </span>
+          </div>
        </span>
        <span class="header_links">
@@ -44,7 +49,9 @@
            {{ $t('app.sceneries') }}
          </router-link>
          /
-          <router-link class="route" active-class="route-active" to="/trains">{{ $t('app.trains') }}</router-link>
+          <router-link class="route" active-class="route-active" to="/trains">{{
            $t('app.trains')
          }}</router-link>
          /
          <router-link
            class="route"
@@ -61,65 +68,50 @@
 </template>
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { useStore } from '../../store/store';
+import { useStore } from '../../store/mainStore';
 import options from '../../data/options.json';
 import imageMixin from '../../mixins/imageMixin';
 import SelectBox from '../Global/SelectBox.vue';
 import StatusIndicator from './StatusIndicator.vue';
 import Clock from './Clock.vue';
 import RegionDropdown from '../Global/RegionDropdown.vue';
 export default defineComponent({
  emits: ['changeLang'],
  mixins: [imageMixin],
  props: {
    currentLang: {
      type: String,
-      required: true,
+      required: true
-    },
+    }
  },
  setup() {
    return {
-      store: useStore(),
+      store: useStore()
    };
  },
  methods: {
    changeRegion(region: { id: string; value: string }) {
      this.store.changeRegion(region);
    },
    changeLang(lang: string) {
      this.$emit('changeLang', lang);
    }
  },
-  },
+
  computed: {
    onlineTrainsCount() {
-      return this.store.trainList.filter((train) => train.online).length;
+      return this.store.trainList.filter((train) => train.region == this.store.region.id).length;
    },
    onlineDispatchersCount() {
-      return this.store.stationList.filter(
+      return this.store.onlineSceneryList.filter(
-        (station) => station.onlineInfo && station.onlineInfo.region == this.store.region.id
+        (scenery) => scenery.region == this.store.region.id
      ).length;
    },
    factorU() {
-      return this.onlineDispatchersCount == 0 ? '-' : (this.onlineTrainsCount / this.onlineDispatchersCount).toFixed(2);
+      return this.onlineDispatchersCount == 0
        ? '-'
        : (this.onlineTrainsCount / this.onlineDispatchersCount).toFixed(2);
    }
  },
-
+  components: { StatusIndicator, Clock, RegionDropdown }
    computedRegions() {
      return options.regions.map((region) => {
        const regionStationCount =
          this.store.apiData.stations?.filter((station) => station.region == region.id && station.isOnline).length || 0;
        const regionTrainCount =
          this.store.apiData.trains?.filter((train) => train.region == region.id && train.online).length || 0;
        return {
          id: region.id,
          value: `${region.value} <div class='text--grayed'>${regionStationCount} / ${regionTrainCount}</div>`,
          selectedValue: region.value,
        };
      });
    },
  },
  components: { SelectBox, StatusIndicator, Clock },
 });
 </script>
 <style lang="scss" scoped>
@@ -215,23 +207,8 @@ export default defineComponent({
  }
 }
 // REGION SELECTION
 .info_region {
  color: white;
  font-weight: bold;
  display: flex;
  justify-content: flex-end;
  .select-box_content button {
    background-color: transparent;
    font-weight: bold;
    padding: 0.1em 0.5em;
    color: paleturquoise;
  }
  .options {
    font-size: 0.9em;
  }
 }
 </style>
@@ -2,32 +2,33 @@
  <div class="clock">{{ computedDate }}</div>
 </template>
 <script lang="ts">
-import { computed, defineComponent, ref } from "vue";
+import { computed, defineComponent, ref } from 'vue';
 export default defineComponent({
-  name: "clock",
+  name: 'VueClock',
  data: () => ({
-    timestamp: Date.now(),
+    timestamp: Date.now()
  }),
  setup() {
    let timestamp = ref(Date.now());
-      const computedDate = computed(() => new Date(timestamp.value).toLocaleString("pl-PL", {
+    const computedDate = computed(() =>
-        hour: "2-digit",
+      new Date(timestamp.value).toLocaleString('pl-PL', {
-        minute: "2-digit",
+        hour: '2-digit',
-        second: "2-digit",
+        minute: '2-digit',
-      }));
+        second: '2-digit'
      })
    );
    setInterval(() => (timestamp.value = Date.now()), 1000);
-      return { computedDate }
+    return { computedDate };
  }
 });
 </script>
 <style lang="scss" scoped>
-@import "../../styles/responsive.scss";
+@import '../../styles/responsive.scss';
 .clock {
  display: flex;
@@ -43,7 +43,13 @@
          <g v-if="greenBlinkLight" filter="url(#filter0_d_843_28)">
            <circle cx="15" cy="17" r="7" fill="#00FF0A" />
-            <animate attributeType="XML" attributeName="opacity" values="1;0;1" dur="1s" repeatCount="indefinite" />
+            <animate
              attributeType="XML"
              attributeName="opacity"
              values="1;0;1"
              dur="1s"
              repeatCount="indefinite"
            />
          </g>
          <g v-if="redTopLight" filter="url(#filter1_d_843_28)">
@@ -56,7 +62,13 @@
          <g v-if="redBottomLight" filter="url(#filter3_d_843_28)">
            <circle cx="15" cy="74" r="7" fill="#F40000" />
-            <animate attributeType="XML" attributeName="opacity" values="1;0;1" dur="1s" repeatCount="indefinite" />
+            <animate
              attributeType="XML"
              attributeName="opacity"
              values="1;0;1"
              dur="1s"
              repeatCount="indefinite"
            />
          </g>
        </g>
@@ -82,7 +94,12 @@
            <feComposite in2="hardAlpha" operator="out" />
            <feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 1 0 0 0 0 0.04 0 0 0 1 0" />
            <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_843_28" />
-            <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_843_28" result="shape" />
+            <feBlend
              mode="normal"
              in="SourceGraphic"
              in2="effect1_dropShadow_843_28"
              result="shape"
            />
          </filter>
          <filter
            id="filter1_d_843_28"
@@ -104,7 +121,12 @@
            <feGaussianBlur stdDeviation="2.5" />
            <feColorMatrix type="matrix" values="0 0 0 0 0.770833 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0" />
            <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_843_28" />
-            <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_843_28" result="shape" />
+            <feBlend
              mode="normal"
              in="SourceGraphic"
              in2="effect1_dropShadow_843_28"
              result="shape"
            />
          </filter>
          <filter
            id="filter2_d_843_28"
@@ -126,7 +148,12 @@
            <feGaussianBlur stdDeviation="2.5" />
            <feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 0.72 0 0 0 0 0 0 0 0 1 0" />
            <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_843_28" />
-            <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_843_28" result="shape" />
+            <feBlend
              mode="normal"
              in="SourceGraphic"
              in2="effect1_dropShadow_843_28"
              result="shape"
            />
          </filter>
          <filter
            id="filter3_d_843_28"
@@ -148,7 +175,12 @@
            <feGaussianBlur stdDeviation="2.5" />
            <feColorMatrix type="matrix" values="0 0 0 0 0.770833 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0" />
            <feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_843_28" />
-            <feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_843_28" result="shape" />
+            <feBlend
              mode="normal"
              in="SourceGraphic"
              in2="effect1_dropShadow_843_28"
              result="shape"
            />
          </filter>
        </defs>
      </svg>
@@ -162,9 +194,9 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { DataStatus } from '../../scripts/enums/DataStatus';
+import { StoreState } from '../../store/typings';
-import { useStore } from '../../store/store';
+import { useStore } from '../../store/mainStore';
-import { StoreState } from '../../scripts/interfaces/store/storeTypes';
+import { Status } from '../../typings/common';
 export default defineComponent({
  data() {
@@ -172,20 +204,20 @@ export default defineComponent({
      tooltipActive: false,
      indicator: {
        offline: false,
-        status: DataStatus.Loading,
+        status: Status.Data.Loading,
-        message: 'data-status.S3',
+        message: 'data-status.S3'
      },
      greenLight: false,
      greenBlinkLight: false,
      redTopLight: false,
      orangeLight: false,
-      redBottomLight: false,
+      redBottomLight: false
    };
  },
  mounted() {
-    this.setSignalStatus(DataStatus.Loading);
+    this.setSignalStatus(Status.Data.Loading);
  },
  setup() {
@@ -193,7 +225,7 @@ export default defineComponent({
    return {
      dataStatus: store.dataStatuses,
-      store,
+      store
    };
  },
@@ -208,80 +240,80 @@ export default defineComponent({
        const dispatcherDataStatus = statuses.dispatchers;
        if (this.store.isOffline) {
-          this.setSignalStatus(DataStatus.Initialized);
+          this.setSignalStatus(Status.Data.Initialized);
-          this.indicator.status = DataStatus.Initialized;
+          this.indicator.status = Status.Data.Initialized;
          this.indicator.message = 'data-status.S1-offline';
          return;
        }
-        if (connectionStatus == DataStatus.Error) {
+        if (connectionStatus == Status.Data.Error) {
          this.setSignalStatus(connectionStatus);
          this.indicator.status = connectionStatus;
          this.indicator.message = 'data-status.S1a-connection';
          return;
        }
-        if (sceneryDataStatus == DataStatus.Error) {
+        if (sceneryDataStatus == Status.Data.Error) {
          this.setSignalStatus(sceneryDataStatus);
          this.indicator.status = sceneryDataStatus;
          this.indicator.message = 'data-status.S1a-sceneries';
          return;
        }
-        if (trainsDataStatus == DataStatus.Warning) {
+        if (trainsDataStatus == Status.Data.Warning) {
          this.setSignalStatus(trainsDataStatus);
          this.indicator.status = trainsDataStatus;
          this.indicator.message = 'data-status.S5-trains';
          return;
        }
-        if (dispatcherDataStatus == DataStatus.Warning) {
+        if (dispatcherDataStatus == Status.Data.Warning) {
          this.setSignalStatus(dispatcherDataStatus);
          this.indicator.status = dispatcherDataStatus;
          this.indicator.message = 'data-status.S5-dispatchers';
          return;
        }
-        if (sceneryDataStatus == DataStatus.Loaded) {
+        if (sceneryDataStatus == Status.Data.Loaded) {
-          this.setSignalStatus(DataStatus.Loaded);
+          this.setSignalStatus(Status.Data.Loaded);
-          this.indicator.status = DataStatus.Loaded;
+          this.indicator.status = Status.Data.Loaded;
          this.indicator.message = 'data-status.S2';
        }
-      },
+      }
-    },
+    }
  },
  methods: {
-    setSignalStatus(status: DataStatus) {
+    setSignalStatus(status: Status.Data) {
      this.greenLight = false;
      this.greenBlinkLight = false;
      this.redTopLight = false;
      this.orangeLight = false;
      this.redBottomLight = false;
-      if (status == DataStatus.Initialized) {
+      if (status == Status.Data.Initialized) {
        this.redTopLight = true;
      }
-      if (status == DataStatus.Loaded) {
+      if (status == Status.Data.Loaded) {
        this.greenLight = true;
      }
-      if (status == DataStatus.Warning) {
+      if (status == Status.Data.Warning) {
        this.orangeLight = true;
      }
-      if (status == DataStatus.Error) {
+      if (status == Status.Data.Error) {
        this.redTopLight = true;
        this.redBottomLight = true;
      }
-      if (status == DataStatus.Loading) {
+      if (status == Status.Data.Loading) {
        this.greenBlinkLight = true;
      }
-    },
+    }
-  },
+  }
 });
 </script>
@@ -375,4 +407,3 @@ export default defineComponent({
  }
 }
 </style>
@@ -1,168 +0,0 @@
 <template>
  <transition name="modal-anim">
    <section class="update-modal card" v-if="releaseData && modalOpen">
      <h2 class="modal_header text--primary">
        <img :src="getImage('stacjownik-header-logo.svg')" alt="stacjownik logo" />
        {{ releaseData.tag_name }}
      </h2>
      <div class="horizontal"></div>
      <div class="modal_content">
        <h3>{{ $t('update.title') }}</h3>
        <a :href="releaseData.html_url" target="_blank">{{ $t('update.release-link') }}</a>
        <br />
        <br />
        <p>{{ $t('update.paragraph1') }}</p>
        <!-- <div class="modal_changelog" v-html="markdownReleaseBody"></div> -->
      </div>
      <div class="modal_actions">
        <button class="btn btn--option" @click="modalOpen = false">{{ $t('update.confirm-button') }}</button>
      </div>
    </section>
  </transition>
 </template>
 <script lang="ts">
 import axios from 'axios';
 import { defineComponent } from 'vue';
 import packageInfo from '../../../package.json';
 import imageMixin from '../../mixins/imageMixin';
 import { ReleaseAPIData } from '../../scripts/interfaces/github_api/ReleaseAPIData';
 import StorageManager from '../../scripts/managers/storageManager';
 import { useStore } from '../../store/store';
 const GH_LASTEST_RELEASE_URL = 'https://api.github.com/repos/Spythere/stacjownik/releases/latest';
 export default defineComponent({
  mixins: [imageMixin],
  mounted() {
    this.fetchReleases();
  },
  data() {
    return {
      modalOpen: false,
      releaseData: null as ReleaseAPIData | null,
    };
  },
  setup() {
    return {
      store: useStore()
    }
  },
  methods: {
    async fetchReleases() {
      const storedVersion = StorageManager.getStringValue('appVersion');
      const appVersion = packageInfo.version;
      // Zmiana
      if (appVersion != storedVersion) {
        StorageManager.setStringValue('appVersion', appVersion);
        // Znajdź changelog na GitHubie, jeśli jest pokaż modal
        try {
          const releaseData: ReleaseAPIData = await (await axios.get(GH_LASTEST_RELEASE_URL)).data;
          if (!releaseData) return;
          const lastReleaseVersion = releaseData.tag_name.slice(1);
          if (lastReleaseVersion == appVersion) {
            this.releaseData = releaseData;        
            this.modalOpen = true;
            StorageManager.setStringValue('releaseURL', releaseData.html_url);
          }
        } catch (error) {
          console.error(`Wystąpił błąd podczas pobierania danych z API GitHuba: ${error}`);
        }
      }
    },
  },
 });
 </script>
 <style lang="scss" scoped>
@import '../../styles/card.scss';
@import '../../styles/responsive.scss';
 .modal-anim {
  &-enter-active,
  &-leave-active {
    transition: all $animDuration $animType;
  }
  &-enter-from,
  &-leave-to {
    opacity: 0;
    transform: translate(-50%, -50%) scale(0.45);
  }
 }
 .update-modal {
  text-align: center;
  background-color: var(--clr-secondary);
  padding: 1em;
 }
 .horizontal {
  margin: 1em 0;
  height: 2px;
  width: 100%;
  background-color: white;
 }
 .modal_header {
  font-size: 1.6em;
  img {
    width: 50%;
    vertical-align: text-top;
  }
 }
 .modal_content {
  font-size: 1.1em;
  a {
    text-decoration: underline;
  }
 }
 .modal_actions {
  margin-top: 2em;
  button {
    color: white;
    padding: 0.5em;
    font-size: 1.2em;
    background-color: black;
  }
 }
 .modal_changelog {
  font-size: 0.8em;
  margin-top: 2em;
 }
@include smallScreen {
  .update-modal {
    height: auto;
    max-width: 95%;
  }
 }
 </style>
@@ -1,69 +0,0 @@
 <template>
  <div class="update-prompt">
    <transition name="prompt-anim">
      <div class="prompt_content" v-if="!hidePrompt && needRefresh">
        <div>{{ $t('update.title') }}</div>
        <div class="prompt_actions">
          <button class="btn btn--filled" @click="updateServiceWorker(true)">{{ $t('update.confirm-button') }}</button>
          <button class="btn btn--filled" @click="hidePrompt = true">{{ $t('update.later-button') }}</button>
        </div>
      </div>
    </transition>
  </div>
 </template>
 <script setup lang="ts">
 import { ref } from 'vue';
 import useCustomSW from '../../mixins/useCustomSW';
 const hidePrompt = ref(false);
 const { needRefresh, updateServiceWorker } = useCustomSW();
 </script>
 <style lang="scss" scoped>
@import '../../styles/variables.scss';
 .update-prompt {
  position: fixed;
  bottom: 0;
  right: 0;
  z-index: 200;
 }
 .prompt_content {
  margin: 1em;
  padding: 1em;
  font-weight: bold;
  background-color: black;
  box-shadow: 0 0 10px 1px $accentCol;
  border-radius: 1em;
 }
 .prompt_actions {
  display: flex;
  margin-top: 1em;
  gap: 0.5em;
  button {
    width: 100%;
  }
 }
 // Animation
 .prompt-anim {
  &-enter-active,
  &-leave-active {
    transition: all 120ms ease-in;
    transform: translateY(0);
  }
  &-enter-from,
  &-leave-to {
    transform: translateY(100%);
  }
 }
 </style>
@@ -7,14 +7,14 @@
 </template>
 <script lang="ts">
-import { defineComponent } from "vue";
+import { defineComponent } from 'vue';
 export default defineComponent({});
 </script>
 <style lang="scss">
-@import "../../styles/variables";
+@import '../../styles/variables';
-@import "../../styles/responsive";
+@import '../../styles/responsive';
 .button_content {
  display: flex;
@@ -15,18 +15,18 @@ export default defineComponent({
  props: {
    scrollNoMoreData: {
      type: Boolean,
-      required: true,
+      required: true
    },
    scrollDataLoaded: {
      type: Boolean,
-      required: true,
+      required: true
    },
    list: {
      type: Array as PropType<any[]>,
-      required: true,
+      required: true
-    },
+    }
  },
  emits: ['addHistoryData'],
@@ -34,8 +34,8 @@ export default defineComponent({
  methods: {
    addHistoryData() {
      this.$emit('addHistoryData');
-    },
+    }
-  },
+  }
 });
 </script>
@@ -12,7 +12,7 @@ import { defineComponent } from 'vue';
 export default defineComponent({
  setup() {
    return {};
-  },
+  }
 });
 </script>
@@ -1,7 +1,10 @@
 <template>
  <div class="progress-bar">
    <span class="bar-bg"></span>
-    <span class="bar-fg" :style="{ width: `${~~progressPercent}%`, backgroundColor: bgColor }"></span>
+    <span
      class="bar-fg"
      :style="{ width: `${~~progressPercent}%`, backgroundColor: bgColor }"
    ></span>
  </div>
 </template>
@@ -12,12 +15,12 @@ export default defineComponent({
  props: {
    progressPercent: {
      type: Number,
-      required: true,
+      required: true
    },
    progressType: {
      type: String,
-      required: false,
+      required: false
-    },
+    }
  },
  computed: {
@@ -29,8 +32,8 @@ export default defineComponent({
        default:
          return 'springgreen';
      }
-    },
+    }
-  },
+  }
 });
 </script>
@@ -1,25 +1,24 @@
 <template>
-  <div class="select-box">
+  <div class="region-dropdown" v-click-outside="clickedOutside">
-    <div class="select-box_content">
+    <div class="content">
-      <button class="selected" @click="toggleBox">
+      <button class="selected-region" @click="toggleBox">
-        <span>{{ computedSelectedItem.selectedValue || computedSelectedItem.value }}</span>
+        <span>{{ selectedItem.name }}</span>
-        <div class="arrow">
+        <img :src="`/images/icon-arrow-${listOpen ? 'asc' : 'desc'}.svg`" alt="Arrow icon" />
          <img :src="listOpen ? getIcon('arrow-asc') : getIcon('arrow-desc')" alt="arrow-icon" />
        </div>
      </button>
-      <ul class="options" :ref="(el) => (listRef = el as Element)">
+      <ul class="options">
-        <li class="option" v-for="(item, i) in itemList" :key="item.id">
+        <li class="option" v-for="(item, i) in regionList" :key="item.id">
          <transition
            name="unfold"
            :style="`
            --delay-in: ${i * 55}ms; 
-            --delay-out: ${(itemList.length - 1 - i) * 55}ms`"
+            --delay-out: ${(regionList.length - 1 - i) * 55}ms`"
          >
            <label :for="item.id" v-if="listOpen">
              <input type="button" :id="item.id" name="select-box" @click="selectOption(item)" />
-              <span :style="computedSelectedItem.id == item.id ? 'color: gold;' : ''" v-html="item.value"> </span>
+              <span :style="selectedItem.id == item.id ? 'color: gold;' : ''" v-html="item.value">
              </span>
            </label>
          </transition>
        </li>
@@ -29,65 +28,68 @@
 </template>
 <script lang="ts">
-import { defineComponent, Ref, ref, computed } from 'vue';
+import { defineComponent, Ref, ref } from 'vue';
-import imageMixin from '../../mixins/imageMixin';
+import { regions as regionsJSON } from '../../data/options.json';
 import { useStore } from '../../store/mainStore';
 interface Item {
  id: string;
  value: string;
-  selectedValue?: string;
+  name: string;
 }
 export default defineComponent({
-  emits: ['selected'],
+  data() {
  mixins: [imageMixin],
  props: {
    itemList: {
      type: Array as () => Item[],
      required: true,
    },
    defaultItemIndex: {
      type: Number,
      default: 0,
    },
    prefix: {
      type: String,
      default: '',
    },
  },
  setup(props) {
    let listRef: Ref<Element | null> = ref(null);
    let buttonRef: Ref<HTMLButtonElement | null> = ref(null);
    let activeEl: Ref<Element | null> = ref(document.activeElement);
    let listOpen = ref(false);
    let selectedItem: Ref<Item> = ref(props.itemList[props.defaultItemIndex]);
    const computedSelectedItem = computed(() => {
      return props.itemList.find((item) => item.id === selectedItem.value.id) || props.itemList[props.defaultItemIndex];
    });
    return {
-      computedSelectedItem,
+      store: useStore(),
-      listOpen,
+      selectedItemIndex: 0,
-      selectedItem,
+      listOpen: false
      listRef,
      buttonRef,
      activeEl,
    };
  },
-  methods: {
+  setup() {
-    selectOption(item: Item) {
+    let buttonRef: Ref<HTMLButtonElement | null> = ref(null);
      this.selectedItem = item;
      this.listOpen = false;
-      this.$emit('selected', item);
+    return {
      buttonRef
    };
  },
  watch: {
    'store.region.id': {
      handler(regionId) {
        this.selectedItemIndex = this.regionList.findIndex((reg) => reg.id == regionId);
      }
    }
  },
  computed: {
    selectedItem() {
      return this.regionList[this.selectedItemIndex] || null;
    },
    regionList() {
      return regionsJSON.map((region) => {
        const regionStationCount = this.store.onlineSceneryList.filter(
          (scenery) => scenery.region == region.id
        ).length;
        const regionTrainCount =
          this.store.trainList.filter((train) => train.region == region.id).length || 0;
        return {
          id: region.id,
          value: `${region.value} <div class='text--grayed'>${regionStationCount} / ${regionTrainCount}</div>`,
          name: region.name
        };
      });
    }
  },
  methods: {
    selectOption(selectedRegion: Item) {
      this.store.region = selectedRegion;
      this.listOpen = false;
    },
    toggleBox(e: Event) {
@@ -99,48 +101,28 @@ export default defineComponent({
    clickedOutside() {
      this.listOpen = false;
      this.buttonRef?.blur();
-    },
+    }
-  },
+  }
 });
 </script>
 <style lang="scss" scoped>
@import '../../styles/variables.scss';
-.unfold {
+.region-dropdown {
  &-enter-from,
  &-leave-to {
    opacity: 0;
    transform: translateY(-10px) scale(0.85);
  }
  &-enter-active,
  &-leave-active {
    transition: all 110ms ease-out;
  }
  &-enter-active {
    transition-delay: var(--delay-in);
  }
  &-leave-active {
    transition-delay: var(--delay-out);
  }
 }
 .select-box {
  display: flex;
  align-items: center;
  justify-content: space-between;
 }
-.arrow {
+button img {
  img {
  vertical-align: middle;
  width: 1.35em;
  }
 }
-button.selected {
+button.selected-region {
  display: flex;
  justify-content: space-between;
  color: paleturquoise;
  font-weight: bold;
@@ -149,11 +131,16 @@ button.selected {
  &:focus {
    background-color: #262626;
  }
  span {
    margin-right: 10px;
  }
 }
-.select-box_content {
+.content {
  position: relative;
  margin: 0 auto;
  font-weight: bold;
  height: 100%;
@@ -214,4 +201,25 @@ li.option {
    cursor: pointer;
  }
 }
 .unfold {
  &-enter-from,
  &-leave-to {
    opacity: 0;
    transform: translateY(-10px) scale(0.85);
  }
  &-enter-active,
  &-leave-active {
    transition: all 110ms ease-out;
  }
  &-enter-active {
    transition-delay: var(--delay-in);
  }
  &-leave-active {
    transition-delay: var(--delay-out);
  }
 }
 </style>
@@ -7,39 +7,31 @@
      @keypress="updateValue"
    />
-    <img
+    <img class="search-exit" src="/images/icon-exit.svg" alt="exit-icon" @click="clearSearchValue" />
      class="search-exit"
      :src="getIcon('exit')"
      alt="exit-icon"
      @click="clearValue"
    />
  </div>
 </template>
 <script lang="ts">
-import { defineComponent, ref, watch } from "vue";
+import { defineComponent, ref, watch } from 'vue';
 import imageMixin from "../../mixins/imageMixin";
 export default defineComponent({
-  mixins: [imageMixin],
+  emits: ['update:searchedValue', 'clearValue'],
  emits: ["update:searchedValue", "clearValue"],
  props: {
    searchedValue: {
      type: String,
-      required: true,
+      required: true
    },
    updateOnInput: {
      type: Boolean,
-      default: true,
+      default: true
    },
    titleToTranslate: {
      type: String,
-      required: true,
+      required: true
    },
    clearValue: {
-      type: Function,
+      type: Function
-    },
+    }
  },
  setup(props, { emit }) {
@@ -49,32 +41,32 @@ export default defineComponent({
      watch(
        () => compSearchedValue.value,
        (value) => {
-          emit("update:searchedValue", value);
+          emit('update:searchedValue', value);
        }
      );
    }
-    const clearValue = () => {
+    const clearSearchValue = () => {
-      compSearchedValue.value = "";
+      compSearchedValue.value = '';
-      emit("clearValue");
+      emit('clearValue');
    };
    const updateValue = (e: any) => {
      if (!props.updateOnInput && e.keyCode == 13)
-        emit("update:searchedValue", compSearchedValue.value);
+        emit('update:searchedValue', compSearchedValue.value);
    };
    return {
      compSearchedValue,
      updateValue,
-      clearValue,
+      clearSearchValue
    };
-  },
+  }
 });
 </script>
 <style lang="scss" scoped>
-@import "../../styles/responsive";
+@import '../../styles/responsive';
 .search {
  &-box {
@@ -1,7 +1,11 @@
 <template>
-  <span class="status-badge" :class="statusID" v-if="isOnline">
+  <span class="status-badge" :class="statusName" v-if="isOnline">
-    {{ $t(`status.${statusID}`) }}
+    {{ $t(`status.${statusName}`) }}
-    {{ statusID == 'online' ? timestampToString(statusTimestamp!) : '' }}
+    {{
      statusName == 'online' && dispatcherStatus && dispatcherStatus > 5
        ? timestampToString(dispatcherStatus)
        : ''
    }}
  </span>
  <span class="status-badge free" v-else>
@@ -10,22 +14,53 @@
 </template>
 <script lang="ts">
-import { defineComponent } from 'vue';
+import { PropType, defineComponent } from 'vue';
 import dateMixin from '../../mixins/dateMixin';
 import { Status } from '../../typings/common';
 export default defineComponent({
  props: {
-    statusID: {
+    dispatcherStatus: {
-      type: String,
+      type: Number as PropType<Status.ActiveDispatcher | number>
    },
    statusTimestamp: {
      type: Number,
    },
    isOnline: {
-      type: Boolean,
+      type: Boolean
-    },
+    }
  },
  mixins: [dateMixin],
  computed: {
    statusName() {
      if (!this.dispatcherStatus) return 'free';
      switch (this.dispatcherStatus) {
        case Status.ActiveDispatcher.AFK:
          return 'afk';
        case Status.ActiveDispatcher.ENDING:
          return 'ending';
        case Status.ActiveDispatcher.INVALID:
          return 'invalid';
        case Status.ActiveDispatcher.NOT_LOGGED_IN:
          return 'not-signed';
        case Status.ActiveDispatcher.NO_SPACE:
          return 'no-space';
        case Status.ActiveDispatcher.UNAVAILABLE:
          return 'unavailable';
        case Status.ActiveDispatcher.UNKNOWN:
          return 'unknown';
        default:
          if (this.dispatcherStatus >= Date.now() + 25500000) return 'no-limit';
          return 'online';
      }
    }
  }
 });
 </script>
@@ -34,10 +69,10 @@ $free: #8a8a8a;
 $ending: #e6c300;
 $no-limit: #117fc9;
 $unav: #ff3d5d;
-$brb: #e6a100;
+$afk: #e6a100;
 $no-space: #222;
 $online: #09a116;
-$unknown: rgb(185, 60, 60);
+$unknown: #b93c3c;
 .status-badge {
  border-radius: 1rem;
@@ -69,8 +104,8 @@ $unknown: rgb(185, 60, 60);
    font-size: 0.85em;
  }
-  &.brb {
+  &.afk {
-    background-color: $brb;
+    background-color: $afk;
    color: black;
    font-size: 0.95em;
  }
@@ -82,7 +117,8 @@ $unknown: rgb(185, 60, 60);
    font-size: 0.85em;
  }
-  &.unknown {
+  &.unknown,
  &.invalid {
    background-color: $unknown;
    font-size: 0.95em;
  }
@@ -1,12 +1,17 @@
 <template>
  <div class="stock-list">
    <ul>
-      <li v-for="(stockName, i) in trainStockList">
+      <li v-for="(stockName, i) in trainStockList" :key="i">
-        <p>{{ stockName.split(':')[0].split('_').splice(0, 2).join(' ') }} {{ stockName.split(':')[1] }}</p>
+        <p>
          {{ stockName.split(':')[0].split('_').splice(0, 2).join(' ') }}
          {{ stockName.split(':')[1] }}
        </p>
        <span>
          <img
-            :src="`https://rj.td2.info.pl/dist/img/thumbnails/${stockName.split(':')[0]}${/^EN/.test(stockName) ? 'rb' : ''}.png`"
+            :src="`https://rj.td2.info.pl/dist/img/thumbnails/${stockName.split(':')[0]}${
              /^EN/.test(stockName) ? 'rb' : ''
            }.png`"
            @error="onImageError($event, stockName)"
            width="400"
            height="60"
@@ -15,21 +20,27 @@
          <img
            v-if="/^(EN|2EN)/.test(stockName)"
            :src="`https://rj.td2.info.pl/dist/img/thumbnails/${stockName.split(':')[0]}s.png`"
-            @error="(event) => ((event.target as HTMLImageElement).src = '/images/icon-loco-ezt-s.png')"
+            @error="
              (event) => ((event.target as HTMLImageElement).src = '/images/icon-loco-ezt-s.png')
            "
          />
          <img
            class="train-thumbnail"
            v-if="/^EN71/.test(stockName)"
            :src="`https://rj.td2.info.pl/dist/img/thumbnails/${stockName.split(':')[0]}s.png`"
-            @error="(event) => ((event.target as HTMLImageElement).src = '/images/icon-loco-ezt-s.png')"
+            @error="
              (event) => ((event.target as HTMLImageElement).src = '/images/icon-loco-ezt-s.png')
            "
          />
          <img
            class="train-thumbnail"
            v-if="/^(EN|2EN)/.test(stockName)"
            :src="`https://rj.td2.info.pl/dist/img/thumbnails/${stockName.split(':')[0]}ra.png`"
-            @error="(event) => ((event.target as HTMLImageElement).src = '/images/icon-loco-ezt-ra.png')"
+            @error="
              (event) => ((event.target as HTMLImageElement).src = '/images/icon-loco-ezt-ra.png')
            "
          />
        </span>
      </li>
@@ -39,23 +50,20 @@
 <script lang="ts">
 import { PropType, defineComponent } from 'vue';
-import { useStore } from '../../store/store';
+import { useStore } from '../../store/mainStore';
-import { RollingStockInfo } from '../../scripts/interfaces/github_api/StockInfoGithubData';
+import { API } from '../../typings/api';
 import imageMixin from '../../mixins/imageMixin';
 export default defineComponent({
  mixins: [imageMixin],
  props: {
    trainStockList: {
      type: Array as PropType<string[]>,
-      required: true,
+      required: true
-    },
+    }
  },
  data() {
    return {
-      store: useStore(),
+      store: useStore()
    };
  },
@@ -63,12 +71,14 @@ export default defineComponent({
    onImageError(event: Event, stockName: string) {
      const fallbackName =
        Object.keys(this.store.rollingStockData!.info).find((type) => {
-          return this.store.rollingStockData!.info[type as keyof RollingStockInfo].find((v) => v[0] === stockName.split(':')[0]);
+          return this.store.rollingStockData!.info[type as keyof API.RollingStock.Info].find(
            (v) => v[0] === stockName.split(':')[0]
          );
        }) || 'vehicle-unknown';
      (event.target as HTMLImageElement).src = `/images/icon-${fallbackName}.png`;
-    },
+    }
-  },
+  }
 });
 </script>
@@ -6,7 +6,7 @@
      :class="{
        delayed: stop.arrivalDelay > 0 && (stop.confirmed || stop.stopped),
        preponed: stop.arrivalDelay < 0 && (stop.confirmed || stop.stopped),
-        'on-time': stop.arrivalDelay == 0 && stop.confirmed,
+        'on-time': stop.arrivalDelay == 0 && stop.confirmed
      }"
    >
      <span v-if="stop.arrivalDelay != 0 && (stop.confirmed || stop.stopped)">
@@ -20,7 +20,11 @@
      </span>
    </span>
-    <span class="date stop" v-if="stop.stopTime || stop.stopped" :class="stop.stopType.replace(', ', '-')">
+    <span
      class="date stop"
      v-if="stop.stopTime || stop.stopped"
      :class="stop.stopType.replace(', ', '-')"
    >
      {{ stop.stopTime }} {{ stop.stopType == '' ? 'pt' : stop.stopType }}
    </span>
@@ -29,7 +33,7 @@
      v-if="!stop.terminatesHere && (stop.stopTime != 0 || stop.stopped)"
      :class="{
        delayed: stop.departureDelay > 0 && stop.confirmed,
-        preponed: stop.departureDelay < 0 && stop.confirmed,
+        preponed: stop.departureDelay < 0 && stop.confirmed
      }"
    >
      <span v-if="stop.departureDelay != 0 && stop.confirmed">
@@ -47,23 +51,23 @@
 </template>
 <script lang="ts">
-import { defineComponent } from 'vue';
+import { PropType, defineComponent } from 'vue';
 import dateMixin from '../../mixins/dateMixin';
-import TrainStop from '../../scripts/interfaces/TrainStop';
+import { TrainStop } from '../../store/typings';
 export default defineComponent({
  mixins: [dateMixin],
  props: {
    stop: {
-      type: Object as () => TrainStop,
+      type: Object as PropType<TrainStop>,
-      required: true,
+      required: true
-    },
+    }
  },
  setup() {
    return {};
-  },
+  }
 });
 </script>
@@ -3,7 +3,7 @@
    <div class="modal_background" @click="closeModal"></div>
    <div class="modal_content" ref="content" tabindex="0">
      <button class="btn exit" @click="closeModal">
-        <img :src="getIcon('exit')" alt="close card" />
+        <img src="/images/icon-exit.svg" alt="close card" />
      </button>
      <TrainInfo :train="chosenTrain" :extended="false" ref="trainInfo" />
@@ -14,28 +14,18 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import imageMixin from '../../mixins/imageMixin';
 import modalTrainMixin from '../../mixins/modalTrainMixin';
 import trainInfoMixin from '../../mixins/trainInfoMixin';
 import { useStore } from '../../store/store';
 import TrainInfo from '../TrainsView/TrainInfo.vue';
 import TrainSchedule from '../TrainsView/TrainSchedule.vue';
 export default defineComponent({
  components: { TrainInfo, TrainSchedule },
-  mixins: [trainInfoMixin, modalTrainMixin, imageMixin],
+  mixins: [trainInfoMixin, modalTrainMixin],
  data() {
    return {
-      isTopBarVisible: false,
+      isTopBarVisible: false
    };
  },
  setup() {
    const store = useStore();
    return {
      store,
    };
  },
@@ -49,12 +39,14 @@ export default defineComponent({
  methods: {
    handleContentScroll(e: Event) {
-      const trainInfoCompHeight: number = (this.$refs['trainInfo'] as any).$el.getBoundingClientRect().height;
+      const trainInfoCompHeight: number = (
        this.$refs['trainInfo'] as any
      ).$el.getBoundingClientRect().height;
      const posTop = (e.target as HTMLElement).scrollTop;
      this.isTopBarVisible = posTop > trainInfoCompHeight;
-    },
+    }
-  },
+  }
 });
 </script>
@@ -144,7 +136,6 @@ export default defineComponent({
 }
@include smallScreen {
  .modal_content {
    max-height: 85vh;
  }
@@ -4,7 +4,9 @@
  <img
    class="train-thumbnail"
    v-else
-    :src="`https://rj.td2.info.pl/dist/img/thumbnails/${name.split(':')[0]}${stockType == 'loco-ezt' ? 'rb' : ''}.png`"
+    :src="`https://rj.td2.info.pl/dist/img/thumbnails/${name.split(':')[0]}${
      stockType == 'loco-ezt' ? 'rb' : ''
    }.png`"
    @error="onImageError"
    @load="onImageLoad"
    width="220"
@@ -14,28 +16,27 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
-import imageMixin from '../../mixins/imageMixin';
+import { useStore } from '../../store/mainStore';
-import { useStore } from '../../store/store';
+import { API } from '../../typings/api';
 import { RollingStockInfo } from '../../scripts/interfaces/github_api/StockInfoGithubData';
 export default defineComponent({
  props: {
    name: {
      type: String,
-      required: true,
+      required: true
    },
    onlyFirstSegment: {
      type: Boolean,
-      default: false,
+      default: false
-    },
+    }
  },
  data() {
    return {
      store: useStore(),
      isNotFound: false,
-      isLoaded: false,
+      isLoaded: false
    };
  },
@@ -53,10 +54,12 @@ export default defineComponent({
      return (
        Object.keys(this.store.rollingStockData.info).find((type) => {
-          return this.store.rollingStockData?.info[type as keyof RollingStockInfo].find((v) => v[0] === this.name.split(':')[0]);
+          return this.store.rollingStockData?.info[type as keyof API.RollingStock.Info].find(
            (v) => v[0] === this.name.split(':')[0]
          );
        }) || 'vehicle-unknown'
      );
-    },
+    }
  },
  methods: {
@@ -68,8 +71,8 @@ export default defineComponent({
    onImageLoad() {
      this.isNotFound = false;
      this.isLoaded = true;
-    },
+    }
-  },
+  }
 });
 </script>
@@ -1,7 +1,7 @@
 <template>
  <section class="daily-stats">
    <span :data-active="statsStatus">
-      <b v-if="statsStatus == DataStatus.Loading">
+      <b v-if="statsStatus == Status.Data.Loading">
        {{ $t('app.loading') }}
      </b>
@@ -32,64 +32,66 @@
          </i18n-t>
        </div>
-        <div v-if="stats.timetableId">
+        <div v-if="stats.maxTimetable">
          &bull;
          <i18n-t keypath="journal.timetable-stats-longest">
            <template #id>
-              <router-link :to="`/journal/timetables?timetableId=${stats.timetableId}`">
+              <router-link :to="`/journal/timetables?timetableId=${stats.maxTimetable.id}`">
-                <b>{{ stats.timetableId }}</b>
+                <b>{{ stats.maxTimetable.id }}</b>
              </router-link>
            </template>
            <template #author>
-              <router-link :to="`/journal/dispatchers?dispatcherName=${stats.timetableAuthor}`">
+              <router-link
-                <b>{{ stats.timetableAuthor }}</b>
+                :to="`/journal/dispatchers?dispatcherName=${stats.maxTimetable.authorName}`"
              >
                <b>{{ stats.maxTimetable.authorName }}</b>
              </router-link>
            </template>
            <template #driver>
-              <b class="text--primary">{{ stats.timetableDriver }}</b>
+              <b class="text--primary">{{ stats.maxTimetable.driverName }}</b>
            </template>
            <template #distance>
-              <b class="text--primary">{{ stats.timetableRouteDistance }} km</b>
+              <b class="text--primary">{{ stats.maxTimetable.routeDistance }} km</b>
            </template>
          </i18n-t>
        </div>
-        <div v-if="firstPlaceDispatchers.length == 1">
+        <div v-if="topDispatchers.length == 1">
          &bull;
          <i18n-t keypath="journal.timetable-stats-most-active-dr">
            <template #dispatcher>
-              <router-link :to="`/journal/dispatchers?dispatcherName=${firstPlaceDispatchers[0].name}`">
+              <router-link :to="`/journal/dispatchers?dispatcherName=${topDispatchers[0].name}`">
-                <b>{{ firstPlaceDispatchers[0].name }}</b>
+                <b>{{ topDispatchers[0].name }}</b>
              </router-link>
            </template>
            <template #count>
              <b class="text--primary">
-                {{ firstPlaceDispatchers[0].count }}
+                {{ topDispatchers[0].count }}
-                {{ $t('journal.timetable-count', firstPlaceDispatchers[0].count) }}
+                {{ $t('journal.timetable-count', topDispatchers[0].count) }}
              </b>
            </template>
          </i18n-t>
        </div>
-        <div v-if="firstPlaceDispatchers.length > 1">
+        <div v-if="topDispatchers.length > 1">
          &bull;
          <i18n-t keypath="journal.timetable-stats-most-active-dr-many">
            <template #dispatchers>
-              <span v-for="(disp, i) in firstPlaceDispatchers">
+              <span v-for="(disp, i) in topDispatchers" :key="i">
-                <span v-if="i == firstPlaceDispatchers.length - 1"> {{ $t('general.and') }} </span>
+                <span v-if="i == topDispatchers.length - 1"> {{ $t('general.and') }} </span>
                <router-link :to="`/journal/dispatchers?dispatcherName=${disp.name}`">
                  <b>{{ disp.name }}</b>
                </router-link>
-                <span v-if="i < firstPlaceDispatchers.length - 2">, </span>
+                <span v-if="i < topDispatchers.length - 2">, </span>
              </span>
            </template>
            <template #count>
              <b class="text--primary">
-                {{ firstPlaceDispatchers[0].count }}
+                {{ topDispatchers[0].count }}
-                {{ $t('journal.timetable-count', firstPlaceDispatchers[0].count) }}
+                {{ $t('journal.timetable-count', topDispatchers[0].count) }}
              </b>
            </template>
          </i18n-t>
@@ -99,7 +101,9 @@
          &bull;
          <i18n-t keypath="journal.timetable-stats-longest-duties">
            <template #dispatcher>
-              <router-link :to="`/journal/dispatchers?dispatcherName=${stats.longestDuties[0].name}`">
+              <router-link
                :to="`/journal/dispatchers?dispatcherName=${stats.longestDuties[0].name}`"
              >
                <b>{{ stats.longestDuties[0].name }}</b>
              </router-link>
            </template>
@@ -132,9 +136,10 @@
 import axios from 'axios';
 import { defineComponent } from 'vue';
 import dateMixin from '../../mixins/dateMixin';
-import { DataStatus } from '../../scripts/enums/DataStatus';
+
 import { ITimetablesDailyStats, ITimetablesDailyStatsResponse } from '../../scripts/interfaces/api/StatsAPIData';
 import { URLs } from '../../scripts/utils/apiURLs';
 import { API } from '../../typings/api';
 import { Status } from '../../typings/common';
 export default defineComponent({
  mixins: [dateMixin],
@@ -142,22 +147,11 @@ export default defineComponent({
  data() {
    return {
-      DataStatus,
+      Status,
-      statsStatus: DataStatus.Loading,
+      statsStatus: Status.Data.Loading,
      intervalId: -1,
-      stats: {
+      stats: {} as API.DailyStats.Response
        totalTimetables: 0,
        distanceSum: 0,
        distanceAvg: 0,
        timetableAuthor: '',
        timetableDriver: '',
        timetableId: 0,
        timetableRouteDistance: 0,
        longestDuties: [],
        mostActiveDrivers: [],
        mostActiveDispatchers: [],
      } as ITimetablesDailyStats,
    };
  },
@@ -171,39 +165,41 @@ export default defineComponent({
  },
  computed: {
-    firstPlaceDispatchers() {
+    topDispatchers() {
      if (this.stats.mostActiveDispatchers.length == 0) return [];
      const maxCount = this.stats.mostActiveDispatchers[0].count;
      return this.stats.mostActiveDispatchers.filter((disp) => disp.count === maxCount);
-    },
+    }
  },
  methods: {
    async fetchDailyTimetableStats() {
      try {
-        const res: ITimetablesDailyStatsResponse = await (
+        const res: API.DailyStats.Response = await (
          await axios.get(`${URLs.stacjownikAPI}/api/getDailyTimetableStats`)
        ).data;
-        this.stats = {
+        // this.stats = {
-          totalTimetables: res.totalTimetables,
+        //   totalTimetables: res.totalTimetables,
-          distanceSum: res.distanceSum,
+        //   distanceSum: res.distanceSum,
-          distanceAvg: res.distanceAvg,
+        //   distanceAvg: res.distanceAvg,
-          timetableAuthor: res.maxTimetable?.authorName || '',
+        //   // timetableAuthor: res.maxTimetable?.authorName || '',
-          timetableDriver: res.maxTimetable?.driverName || '',
+        //   // timetableDriver: res.maxTimetable?.driverName || '',
-          timetableId: res.maxTimetable?.id || 0,
+        //   // timetableId: res.maxTimetable?.id || 0,
-          timetableRouteDistance: res.maxTimetable?.routeDistance || 0,
+        //   // timetableRouteDistance: res.maxTimetable?.routeDistance || 0,
-          mostActiveDispatchers: res.mostActiveDispatchers,
+        //   mostActiveDispatchers: res.mostActiveDispatchers,
-          mostActiveDrivers: res.mostActiveDrivers,
+        //   mostActiveDrivers: res.mostActiveDrivers,
-          longestDuties: res.longestDuties,
+        //   longestDuties: res.longestDuties
-        };
+        // };
-        this.statsStatus = DataStatus.Loaded;
+        this.stats = res;
        this.statsStatus = Status.Data.Loaded;
      } catch (error) {
        console.error('Ups! Wystąpił błąd podczas pobierania statystyk rozkładów jazdy...');
-        this.statsStatus = DataStatus.Error;
+        this.statsStatus = Status.Data.Error;
      }
    },
@@ -218,8 +214,8 @@ export default defineComponent({
    stopFetchingDailyStats() {
      clearInterval(this.intervalId);
      this.intervalId = -1;
-    },
+    }
-  },
+  }
 });
 </script>
@@ -238,13 +234,8 @@ export default defineComponent({
 }
@include smallScreen {
  .daily-stats {
    text-align: justify;
  }
  h3 {
    text-align: center;
  }
 }
 </style>
@@ -36,8 +36,9 @@
          <h3>OSTATNIE WYSTAWIONE ROZKŁADY</h3>
          <div class="last-timetables">
-            <div class="timetable-row" v-for="timetable in timetables">
+            <div class="timetable-row" v-for="timetable in timetables" :key="timetable.id">
-              #{{ timetable.timetableId }} | <b>{{ timetable.trainCategoryCode }} {{ timetable.trainNo }}</b> |
+              #{{ timetable.timetableId }} |
              <b>{{ timetable.trainCategoryCode }} {{ timetable.trainNo }}</b> |
              {{ timetable.driverName }} ({{ timetable.routeDistance }}km)
              <div>{{ timetable.route.replace('|', ' > ') }}</div>
            </div>
@@ -49,14 +50,12 @@
 </template>
 <script lang="ts">
 import axios from 'axios';
-import { computed, defineComponent } from 'vue';
+import { defineComponent } from 'vue';
 import { DispatcherStatsAPIData } from '../../scripts/interfaces/api/DispatcherStatsAPIData';
 import { TimetableHistory } from '../../scripts/interfaces/api/TimetablesAPIData';
 import { URLs } from '../../scripts/utils/apiURLs';
-import { useStore } from '../../store/store';
+import { useStore } from '../../store/mainStore';
 import Loading from '../Global/Loading.vue';
 import { API } from '../../typings/api';
 export default defineComponent({
  components: { Loading },
@@ -64,15 +63,8 @@ export default defineComponent({
  setup() {
    const store = useStore();
    const statsData2 = computed(async () => {
      return await (
        await axios.get(`${URLs.stacjownikAPI}/api/getDispatcherInfo?name=${store.dispatcherStatsName}`)
      ).data;
    });
    return {
-      store,
+      store
      statsData2,
    };
  },
@@ -80,7 +72,7 @@ export default defineComponent({
    return {
      cardVisible: false,
      lastDispatcherName: '',
-      timetables: [] as TimetableHistory[],
+      timetables: [] as API.TimetableHistory.Response
    };
  },
@@ -97,19 +89,23 @@ export default defineComponent({
        this.store.dispatcherStatsData = undefined;
      }
-      const statsData: DispatcherStatsAPIData = await (
+      const statsData: API.DispatcherStats.Response = await (
-        await axios.get(`${URLs.stacjownikAPI}/api/getDispatcherInfo?name=${this.store.dispatcherStatsName}`)
+        await axios.get(
          `${URLs.stacjownikAPI}/api/getDispatcherInfo?name=${this.store.dispatcherStatsName}`
        )
      ).data;
-      const timetables: TimetableHistory[] = await (
+      const timetables: API.TimetableHistory.Response = await (
-        await axios.get(`${URLs.stacjownikAPI}/api/getTimetables?authorName=${this.store.dispatcherStatsName}`)
+        await axios.get(
          `${URLs.stacjownikAPI}/api/getTimetables?authorName=${this.store.dispatcherStatsName}`
        )
      ).data;
      this.timetables = timetables;
      this.store.dispatcherStatsData = statsData;
      this.lastDispatcherName = this.store.dispatcherStatsName;
-    },
+    }
-  },
+  }
 });
 </script>
@@ -163,11 +159,7 @@ h3 {
  text-align: center;
 }
 .last-timetables {
  overflow-y: auto;
 }
 </style>
@@ -6,9 +6,9 @@
          {{ $t('app.offline') }}
        </div>
-        <Loading v-else-if="dataStatus == DataStatus.Loading" />
+        <Loading v-else-if="dataStatus == Status.Data.Loading" />
-        <div v-else-if="dataStatus == DataStatus.Error" class="journal_warning error">
+        <div v-else-if="dataStatus == Status.Data.Error" class="journal_warning error">
          {{ $t('app.error') }}
        </div>
@@ -32,13 +32,17 @@
              <transition-group name="list-anim">
                <tr v-for="historyItem in dispatcherHistory" :key="historyItem.id">
                  <td>
-                    <router-link :to="`/journal/dispatchers?sceneryName=${historyItem.stationName}`">
+                    <router-link
                      :to="`/journal/dispatchers?sceneryName=${historyItem.stationName}`"
                    >
                      <b>{{ historyItem.stationName }}</b>
                    </router-link>
                  </td>
                  <td>#{{ historyItem.stationHash }}</td>
                  <td>
-                    <router-link :to="`/journal/dispatchers?dispatcherName=${historyItem.dispatcherName}`">
+                    <router-link
                      :to="`/journal/dispatchers?dispatcherName=${historyItem.dispatcherName}`"
                    >
                      <b>{{ historyItem.dispatcherName }}</b>
                    </router-link>
                  </td>
@@ -46,7 +50,12 @@
                    <b
                      v-if="historyItem.dispatcherLevel !== null"
                      class="level-badge dispatcher"
-                      :style="calculateExpStyle(historyItem.dispatcherLevel, historyItem.dispatcherIsSupporter)"
+                      :style="
                        calculateExpStyle(
                          historyItem.dispatcherLevel,
                          historyItem.dispatcherIsSupporter
                        )
                      "
                    >
                      {{ historyItem.dispatcherLevel >= 2 ? historyItem.dispatcherLevel : 'L' }}
                    </b>
@@ -105,44 +114,43 @@
 <script lang="ts">
 import { defineComponent, PropType } from 'vue';
 import dateMixin from '../../mixins/dateMixin';
 import { DispatcherHistory } from '../../scripts/interfaces/api/DispatchersAPIData';
 import styleMixin from '../../mixins/styleMixin';
-import imageMixin from '../../mixins/imageMixin';
+import { useStore } from '../../store/mainStore';
 import { DataStatus } from '../../scripts/enums/DataStatus';
 import { useStore } from '../../store/store';
 import Loading from '../Global/Loading.vue';
 import { regions } from '../../data/options.json';
 import AddDataButton from '../Global/AddDataButton.vue';
 import { API } from '../../typings/api';
 import { Status } from '../../typings/common';
 export default defineComponent({
  components: { Loading, AddDataButton },
-  mixins: [dateMixin, styleMixin, imageMixin],
+  mixins: [dateMixin, styleMixin],
  props: {
    dispatcherHistory: {
-      type: Array as PropType<DispatcherHistory[]>,
+      type: Array as PropType<API.DispatcherHistory.Response>,
-      required: true,
+      required: true
    },
    scrollNoMoreData: {
-      type: Boolean,
+      type: Boolean
    },
    scrollDataLoaded: {
-      type: Boolean,
+      type: Boolean
    },
    addHistoryData: {
-      type: Function as PropType<() => void>,
+      type: Function as PropType<() => void>
    },
    dataStatus: {
-      type: Number as PropType<DataStatus>,
+      type: Number as PropType<Status.Data>
-    },
+    }
  },
  data() {
    return {
-      DataStatus,
+      Status,
      store: useStore(),
-      regions,
+      regions
    };
  },
@@ -150,13 +158,17 @@ export default defineComponent({
    computedDispatcherHistory() {
      console.log(this.dispatcherHistory.length);
-      return this.dispatcherHistory.reduce((acc, historyItem, i) => {
+      return this.dispatcherHistory.reduce(
-        if (this.isAnotherDay(i - 1, i)) acc.push(new Date(historyItem.timestampFrom).toLocaleDateString('pl-PL'));
+        (acc, historyItem, i) => {
          if (this.isAnotherDay(i - 1, i))
            acc.push(new Date(historyItem.timestampFrom).toLocaleDateString('pl-PL'));
          acc.push(historyItem);
          return acc;
      }, [] as (DispatcherHistory | string)[]);
        },
        [] as (API.DispatcherHistory.Data | string)[]
      );
    }
  },
  methods: {
@@ -173,8 +185,8 @@ export default defineComponent({
        new Date(this.dispatcherHistory[prevIndex].timestampFrom).getDate() !=
        new Date(this.dispatcherHistory[currIndex].timestampFrom).getDate()
      );
-    },
+    }
-  },
+  }
 });
 </script>
@@ -2,13 +2,17 @@
  <div class="journal-stats">
    <span v-if="store.driverStatsData">
      <h3>
-        {{ $t('journal.stats-title') }} <span class="text--primary">{{ store.driverStatsName.toUpperCase() }}</span>
+        {{ $t('journal.stats-title') }}
        <span class="text--primary">{{ store.driverStatsName.toUpperCase() }}</span>
      </h3>
      <div class="info-stats">
        <span class="stat-badge">
          <span>{{ $t('journal.stats-timetables') }}</span>
-          <span>{{ store.driverStatsData._count.fulfilled }} / {{ store.driverStatsData._count._all }}</span>
+          <span
            >{{ store.driverStatsData._count.fulfilled }} /
            {{ store.driverStatsData._count._all }}</span
          >
        </span>
        <span class="stat-badge">
@@ -39,8 +43,10 @@
      </div>
    </span>
-    <b v-else-if="store.driverStatsStatus == DataStatus.Loading">{{ $t('journal.stats-loading') }}</b>
+    <b v-else-if="store.driverStatsStatus == Status.Data.Loading">{{
-    <b v-else-if="store.driverStatsStatus == DataStatus.Error">
+      $t('journal.stats-loading')
    }}</b>
    <b v-else-if="store.driverStatsStatus == Status.Data.Error">
      {{ $t('journal.stats-error ') }}
    </b>
    <b v-else>{{ $t('journal.driver-stats-info') }}</b>
@@ -49,16 +55,16 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
-import { DataStatus } from '../../scripts/enums/DataStatus';
+import { useStore } from '../../store/mainStore';
-import { useStore } from '../../store/store';
+import { Status } from '../../typings/common';
 export default defineComponent({
  data() {
    return {
      store: useStore(),
-      DataStatus,
+      Status: Status
    };
-  },
+  }
 });
 </script>
@@ -3,24 +3,28 @@
    <div class="bg" v-if="showOptions" @click="showOptions = false"></div>
    <div class="actions-bar">
-      <button class="filter-button btn--filled btn--image" @click="showOptions = !showOptions" ref="button">
+      <button
-        <img :src="getIcon('filter2')" alt="Open filters" />
+        class="filter-button btn--filled btn--image"
        @click="showOptions = !showOptions"
        ref="button"
      >
        <img src="/images/icon-filter2.svg" alt="Open filters" />
        {{ $t('options.filters') }} [F]
        <span class="active-indicator" v-if="currentOptionsActive"></span>
      </button>
      <button class="filter-button btn--filled btn--image" @click="refreshData">
-        <img :src="getIcon('refresh')" alt="Refresh data" />
+        <img src="/images/icon-refresh.svg" alt="Refresh data" />
        {{ $t('general.refresh') }}
      </button>
    </div>
    <datalist id="search-driver">
-      <option v-for="sugg in driverSuggestions" :value="sugg"></option>
+      <option v-for="(sugg, i) in driverSuggestions" :key="i" :value="sugg"></option>
    </datalist>
    <datalist id="search-dispatcher">
-      <option v-for="sugg in dispatcherSuggestions" :value="sugg"></option>
+      <option v-for="(sugg, i) in dispatcherSuggestions" :key="i" :value="sugg"></option>
    </datalist>
    <transition name="options-anim">
@@ -29,7 +33,9 @@
          <h1 class="option-title">{{ $t('options.search-title') }}</h1>
          <div class="search_content">
            <div class="search" v-for="(_, propName) in searchersValues" :key="propName">
-              <label v-if="propName == 'search-date'" for="date">{{ $t(`options.search-${optionsType}-date`) }}</label>
+              <label v-if="propName == 'search-date'" for="date">{{
                $t(`options.search-${optionsType}-date`)
              }}</label>
              <div class="search-box">
                <input
@@ -45,7 +51,11 @@
                />
                <button class="search-exit" v-if="propName != 'search-date'">
-                  <img :src="getIcon('exit')" alt="exit-icon" @click="onInputClear(propName)" />
+                  <img
                    src="/images/icon-exit.svg"
                    alt="exit-icon"
                    @click="onInputClear(propName)"
                  />
                </button>
              </div>
            </div>
@@ -53,7 +63,7 @@
          <h1 class="option-title">{{ $t('options.sort-title') }}</h1>
          <div class="options_sorters">
-            <div v-for="opt in translatedSorterOptions">
+            <div v-for="opt in translatedSorterOptions" :key="opt.id">
              <button
                class="sort-option btn--option"
                :data-selected="opt.id == sorterActive.id"
@@ -67,12 +77,13 @@
          <h1 class="option-title" v-if="filters.length != 0">{{ $t('options.filter-title') }}</h1>
          <div class="options_filter-sections" v-if="filters.length != 0 && filterList">
-            <section class="filter-section" v-for="section in JournalFilterSection">
+            <section class="filter-section" v-for="section in JournalFilterSection" :key="section">
              <p>{{ $t(`options.filter-section-${section}`) }}</p>
              <div class="options_filters">
                <button
                  v-for="filter in filterList.filter((f) => f.filterSection == section)"
                  :key="filter.id"
                  class="filter-option btn--option"
                  :class="{ checked: filter.isActive }"
                  :id="filter.id"
@@ -101,53 +112,47 @@
 <script lang="ts">
 import axios from 'axios';
 import { defineComponent, inject, PropType } from 'vue';
 import imageMixin from '../../mixins/imageMixin';
 import keyMixin from '../../mixins/keyMixin';
 import { DataStatus } from '../../scripts/enums/DataStatus';
 import { DriverStatsAPIData } from '../../scripts/interfaces/api/DriverStatsAPIData';
 import { URLs } from '../../scripts/utils/apiURLs';
-import { useStore } from '../../store/store';
+import { useStore } from '../../store/mainStore';
-import ActionButton from '../Global/ActionButton.vue';
+import { Journal } from './typings';
-import SelectBox from '../Global/SelectBox.vue';
+import { API } from '../../typings/api';
-import { JournalFilterSection } from '../../scripts/enums/JournalFilterType';
+import { Status } from '../../typings/common';
 import { JournalFilter } from '../../scripts/types/JournalTimetablesTypes';
 export default defineComponent({
  components: { SelectBox, ActionButton },
  emits: ['onSearchConfirm', 'onOptionsReset', 'onRefreshData'],
-  mixins: [imageMixin, keyMixin],
+  mixins: [keyMixin],
  props: {
    sorterOptionIds: {
      type: Array as PropType<Array<string>>,
-      required: true,
+      required: true
    },
    filters: {
-      type: Array as PropType<JournalFilter[]>,
+      type: Array as PropType<Journal.TimetableFilter[]>,
-      default: [],
+      default: () => []
    },
    dataStatus: {
-      type: Number as PropType<DataStatus>,
+      type: Number as PropType<Status.Data>,
-      default: DataStatus.Initialized,
+      default: -1
    },
    currentOptionsActive: {
      type: Boolean,
-      default: false,
+      default: false
    },
    optionsType: {
      type: String,
-      required: true,
+      required: true
-    },
+    }
  },
  data() {
    return {
      showOptions: false,
      JournalFilterSection,
      driverSuggestions: [] as string[],
      dispatcherSuggestions: [] as string[],
@@ -155,7 +160,7 @@ export default defineComponent({
      searchTimeout: 0,
      store: useStore(),
-      DataStatus,
+      JournalFilterSection: Journal.FilterSection
    };
  },
@@ -163,26 +168,21 @@ export default defineComponent({
    return {
      searchersValues: inject('searchersValues') as { [key: string]: string },
      sorterActive: inject('sorterActive') as { id: string | number; dir: number },
-      // journalFilterActive: inject('journalFilterActive') as JournalFilter,
+      filterList: inject('filterList') as Journal.TimetableFilter[] | undefined
      filterList: inject('filterList') as JournalFilter[] | undefined,
    };
  },
  computed: {
    driverStatsName() {
      return this.store.driverStatsName;
    },
    translatedSorterOptions() {
      return this.$props.sorterOptionIds.map((id) => ({
        id,
-        value: this.$t(`options.sort-${id}`),
+        value: this.$t(`options.sort-${id}`)
      }));
-    },
+    }
  },
  watch: {
-    async driverStatsName(value: string) {
+    async 'store.driverStatsName'() {
      await this.fetchDriverStats();
      // if (value) this.store.currentStatsTab = 'driver';
@@ -202,7 +202,7 @@ export default defineComponent({
      if (value.length < 3) return;
      this.startSearchTimeout('dispatcher', value);
-    },
+    }
  },
  methods: {
@@ -210,21 +210,23 @@ export default defineComponent({
      this.store.driverStatsData = undefined;
      if (!this.store.driverStatsName) {
-        this.store.driverStatsStatus = DataStatus.Initialized;
+        this.store.driverStatsStatus = Status.Data.Initialized;
        return;
      }
      try {
-        this.store.driverStatsStatus = DataStatus.Loading;
+        this.store.driverStatsStatus = Status.Data.Loading;
-        const statsData: DriverStatsAPIData = await (
+        const statsData: API.DriverStats.Response = await (
-          await axios.get(`${URLs.stacjownikAPI}/api/getDriverInfo?name=${this.store.driverStatsName}`)
+          await axios.get(
            `${URLs.stacjownikAPI}/api/getDriverInfo?name=${this.store.driverStatsName}`
          )
        ).data;
        this.store.driverStatsData = statsData;
-        this.store.driverStatsStatus = DataStatus.Loaded;
+        this.store.driverStatsStatus = Status.Data.Loaded;
      } catch (error) {
-        this.store.driverStatsStatus = DataStatus.Error;
+        this.store.driverStatsStatus = Status.Data.Error;
        console.error('Ups! Wystąpił błąd przy próbie pobrania statystyk maszynisty! :/');
      }
    },
@@ -266,9 +268,11 @@ export default defineComponent({
      this.$emit('onSearchConfirm');
    },
-    onFilterChange(filter: JournalFilter) {
+    onFilterChange(filter: Journal.TimetableFilter) {
      // this.journalFilterActive = filter;
-      this.filterList?.filter((f) => f.filterSection === filter.filterSection).forEach((f) => (f.isActive = false));
+      this.filterList
        ?.filter((f) => f.filterSection === filter.filterSection)
        .forEach((f) => (f.isActive = false));
      filter.isActive = true;
      this.$emit('onSearchConfirm');
@@ -290,8 +294,8 @@ export default defineComponent({
    onResetButtonClick() {
      this.$emit('onOptionsReset');
-    },
+    }
-  },
+  }
 });
 </script>
@@ -3,6 +3,7 @@
    <div class="tabs">
      <button
        v-for="tab in data.tabs"
        :key="tab.name"
        class="btn--filled"
        :data-selected="tab.name == store.currentStatsTab && areStatsOpen"
        :data-inactive="tab.inactive"
@@ -16,7 +17,10 @@
    <div class="stats-tab" v-show="areStatsOpen">
      <keep-alive>
-        <JournalDailyStats v-if="store.currentStatsTab == 'daily'" @toggleStatsOpen="toggleStatsOpen" />
+        <JournalDailyStats
          v-if="store.currentStatsTab == 'daily'"
          @toggleStatsOpen="toggleStatsOpen"
        />
        <JournalDriverStats v-else-if="store.currentStatsTab == 'driver'" />
      </keep-alive>
    </div>
@@ -24,11 +28,11 @@
 </template>
 <script setup lang="ts">
-import { computed, KeepAlive, onMounted, reactive, Ref, ref, watch } from 'vue';
+import { computed, onMounted, reactive, Ref, ref, watch } from 'vue';
-import { useStore } from '../../store/store';
+import { useStore } from '../../store/mainStore';
 import JournalDailyStats from './DailyStats.vue';
 import JournalDriverStats from './JournalDriverStats.vue';
-import StorageManager from '../../scripts/managers/storageManager';
+import StorageManager from '../../managers/storageManager';
 // Types
 type TStatTab = 'daily' | 'driver';
@@ -44,19 +48,20 @@ let data = reactive({
  tabs: [
    {
      name: 'daily',
-      titlePath: 'journal.daily-stats-title',
+      titlePath: 'journal.daily-stats-title'
    },
    {
      name: 'driver',
-      titlePath: 'journal.driver-stats-title',
+      titlePath: 'journal.driver-stats-title'
      // inactive: true,
-    },
+    }
-  ] as { name: TStatTab; titlePath: string; inactive?: boolean }[],
+  ] as { name: TStatTab; titlePath: string; inactive?: boolean }[]
 });
 // Methods
 function onTabButtonClick(tab: TStatTab) {
-  if (lastClickedTab.value == tab || !areStatsOpen.value) areStatsOpen.value = !areStatsOpen.value;
+  if (lastClickedTab.value == tab || !lastClickedTab.value || !areStatsOpen.value)
    areStatsOpen.value = !areStatsOpen.value;
  if (tab == 'daily') {
    StorageManager.setBooleanValue('dailyStatsOpen', areStatsOpen.value);
@@ -115,4 +120,3 @@ onMounted(() => {
  }
 }
 </style>
@@ -6,9 +6,9 @@
          {{ $t('app.offline') }}
        </div>
-        <Loading v-else-if="dataStatus == DataStatus.Loading" />
+        <Loading v-else-if="dataStatus == Status.Data.Loading" />
-        <div v-else-if="dataStatus == DataStatus.Error" class="journal_warning error">
+        <div v-else-if="dataStatus == Status.Data.Error" class="journal_warning error">
          {{ $t('app.error') }}
        </div>
@@ -30,49 +30,50 @@
    </transition>
    <div class="journal_warning" v-if="scrollNoMoreData">{{ $t('journal.no-further-data') }}</div>
-    <div class="journal_warning" v-else-if="!scrollDataLoaded">{{ $t('journal.loading-further-data') }}</div>
+    <div class="journal_warning" v-else-if="!scrollDataLoaded">
      {{ $t('journal.loading-further-data') }}
    </div>
  </div>
 </template>
 <script lang="ts">
 import { defineComponent, PropType } from 'vue';
 import { DataStatus } from '../../../scripts/enums/DataStatus';
 import { TimetableHistory } from '../../../scripts/interfaces/api/TimetablesAPIData';
 import { useStore } from '../../../store/store';
 import Loading from '../../Global/Loading.vue';
 import ProgressBar from '../../Global/ProgressBar.vue';
 import AddDataButton from '../../Global/AddDataButton.vue';
 import TimetableHistoryList from './TimetableHistoryList.vue';
 import { useStore } from '../../../store/mainStore';
 import { Status } from '../../../typings/common';
 import { API } from '../../../typings/api';
 export default defineComponent({
-  components: { ProgressBar, Loading, AddDataButton, TimetableHistoryList },
+  components: { Loading, AddDataButton, TimetableHistoryList },
  props: {
    timetableHistory: {
-      type: Array as PropType<TimetableHistory[]>,
+      type: Array as PropType<API.TimetableHistory.Response>,
-      required: true,
+      required: true
    },
    scrollNoMoreData: {
-      type: Boolean,
+      type: Boolean
    },
    scrollDataLoaded: {
-      type: Boolean,
+      type: Boolean
    },
    addHistoryData: {
-      type: Function as PropType<() => void>,
+      type: Function as PropType<() => void>
    },
    dataStatus: {
-      type: Number as PropType<DataStatus>,
+      type: Number as PropType<Status.Data>
-    },
+    }
  },
  data() {
    return {
-      DataStatus,
+      Status,
-      store: useStore(),
+      store: useStore()
    };
-  },
+  }
 });
 </script>
@@ -18,7 +18,11 @@
      <span class="badge">
        <span>{{ $t('journal.stock-length') }}</span>
        <span>
-          {{ currentHistoryIndex == 0 ? timetable.stockLength : stockHistory[currentHistoryIndex].stockLength || timetable.stockLength }}m
+          {{
            currentHistoryIndex == 0
              ? timetable.stockLength
              : stockHistory[currentHistoryIndex].stockLength || timetable.stockLength
          }}m
        </span>
      </span>
@@ -26,7 +30,11 @@
        <span>{{ $t('journal.stock-mass') }}</span>
        <span>
          {{
-            Math.floor((currentHistoryIndex == 0 ? timetable.stockMass! : stockHistory[currentHistoryIndex].stockMass || timetable.stockMass) / 1000)
+            Math.floor(
              (currentHistoryIndex == 0
                ? timetable.stockMass!
                : stockHistory[currentHistoryIndex].stockMass || timetable.stockMass) / 1000
            )
          }}t
        </span>
      </span>
@@ -34,13 +42,26 @@
    <!-- Historia zmian w składzie -->
    <div class="stock-history" v-if="stockHistory.length > 1">
-      <button class="btn--action" v-for="(sh, i) in stockHistory" :data-checked="i == currentHistoryIndex" @click.stop="currentHistoryIndex = i">
+      <button
        v-for="(sh, i) in stockHistory"
        :key="i"
        class="btn--action"
        :data-checked="i == currentHistoryIndex"
        @click.stop="currentHistoryIndex = i"
      >
        {{ sh.updatedAt }}
      </button>
    </div>
    <!-- <StockList :trainStockList="currentHistoryIndex == 0 ? timetable.stockString : stockHistory[currentHistoryIndex].stockString).split(';')" /> -->
-    <StockList :trainStockList="(currentHistoryIndex == 0 ? timetable.stockString : stockHistory[currentHistoryIndex].stockString).split(';') " />
+    <StockList
      :trainStockList="
        (currentHistoryIndex == 0
          ? timetable.stockString
          : stockHistory[currentHistoryIndex].stockString
        ).split(';')
      "
    />
    <!-- <ul class="stock-list">
      <li
@@ -56,26 +77,24 @@
 <script lang="ts">
 import { PropType, defineComponent } from 'vue';
 import { TimetableHistory } from '../../../scripts/interfaces/api/TimetablesAPIData';
 import imageMixin from '../../../mixins/imageMixin';
 import TrainThumbnail from '../../Global/TrainThumbnail.vue';
 import StockList from '../../Global/StockList.vue';
 import { API } from '../../../typings/api';
 export default defineComponent({
-  mixins: [imageMixin],
+  components: { StockList },
  props: {
    showExtraInfo: {
      type: Boolean,
-      required: true,
+      required: true
    },
    timetable: {
-      type: Object as PropType<TimetableHistory>,
+      type: Object as PropType<API.TimetableHistory.Data>,
-      required: true,
+      required: true
-    },
+    }
  },
  data() {
    return {
-      currentHistoryIndex: 0,
+      currentHistoryIndex: 0
    };
  },
  computed: {
@@ -88,22 +107,21 @@ export default defineComponent({
          return {
            updatedAt: new Date(Number(historyData[0])).toLocaleTimeString(this.$i18n.locale, {
              hour: '2-digit',
-              minute: '2-digit',
+              minute: '2-digit'
            }),
            stockString: historyData[1],
            stockMass: Number(historyData[2]) || undefined,
-            stockLength: Number(historyData[3]) || undefined,
+            stockLength: Number(historyData[3]) || undefined
          };
        });
-    },
+    }
  },
  methods: {
    onImageError(e: Event) {
      const imageEl = e.target as HTMLImageElement;
-      imageEl.src = this.getImage('unknown.png');
+      imageEl.src = '/images/icon-unknown.png';
-    },
+    }
-  },
+  }
  components: { TrainThumbnail, StockList },
 });
 </script>
@@ -45,7 +45,7 @@
        :class="{
          fulfilled: timetable.fulfilled,
          terminated: timetable.terminated && !timetable.fulfilled,
-          active: !timetable.terminated,
+          active: !timetable.terminated
        }"
      >
        {{
@@ -62,29 +62,29 @@
 <script lang="ts">
 import { PropType, defineComponent } from 'vue';
 import { TimetableHistory } from '../../../scripts/interfaces/api/TimetablesAPIData';
 import dateMixin from '../../../mixins/dateMixin';
 import modalTrainMixin from '../../../mixins/modalTrainMixin';
 import styleMixin from '../../../mixins/styleMixin';
 import { API } from '../../../typings/api';
 export default defineComponent({
  mixins: [dateMixin, modalTrainMixin, styleMixin],
  props: {
    timetable: {
-      type: Object as PropType<TimetableHistory>,
+      type: Object as PropType<API.TimetableHistory.Data>,
-      required: true,
+      required: true
-    },
+    }
  },
  methods: {
-    showTimetable(timetable: TimetableHistory, target: EventTarget | null) {
+    showTimetable(timetable: API.TimetableHistory.Data, target: EventTarget | null) {
      if (timetable?.terminated) return;
      this.selectModalTrain(timetable.driverName + timetable.trainNo.toString(), target);
-    },
+    }
-  },
+  }
 });
 </script>
@@ -23,7 +23,10 @@
          <button class="btn--option btn--show">
            {{ $t('journal.stock-info') }}
-            <img :src="getIcon(`arrow-${showExtraInfo.value ? 'asc' : 'desc'}`)" alt="Arrow" />
+            <img
              :src="`/images/icon-arrow-${showExtraInfo.value ? 'asc' : 'desc'}.svg`"
              alt="Arrow icon"
            />
          </button>
          <!-- Extra -->
          <TimetableExtra :timetable="timetable" :showExtraInfo="showExtraInfo.value" />
@@ -35,32 +38,30 @@
 <script lang="ts">
 import { PropType, defineComponent, ref } from 'vue';
 import imageMixin from '../../../mixins/imageMixin';
 import { TimetableHistory } from '../../../scripts/interfaces/api/TimetablesAPIData';
 import TimetableGeneral from './TimetableGeneral.vue';
 import TimetableStops from './TimetableStops.vue';
 import TimetableStatus from './TimetableStatus.vue';
 import TimetableExtra from './TimetableExtra.vue';
 import { API } from '../../../typings/api';
 export default defineComponent({
  mixins: [imageMixin],
  props: {
    timetableHistory: {
-      type: Array as PropType<TimetableHistory[]>,
+      type: Array as PropType<API.TimetableHistory.Response>,
-      required: true,
+      required: true
-    },
+    }
  },
  computed: {
    computedTimetableHistory() {
      return this.timetableHistory.map((timetable) => ({
        timetable,
-        showExtraInfo: ref(false),
+        showExtraInfo: ref(false)
      }));
-    },
+    }
  },
  methods: {},
-  components: { TimetableGeneral, TimetableStops, TimetableStatus, TimetableExtra },
+  components: { TimetableGeneral, TimetableStops, TimetableStatus, TimetableExtra }
 });
 </script>
@@ -6,13 +6,19 @@
    />
    <span>
-      <span :style="{ color: timetable.fulfilled ? 'lightgreen' : timetable.terminated ? 'salmon' : '' }">
+      <span
        :style="{
          color: timetable.fulfilled ? 'lightgreen' : timetable.terminated ? 'salmon' : ''
        }"
      >
        {{ timetable.currentDistance + ' km' }}
      </span>
      <span> / </span>
      <span class="text--primary">{{ timetable.routeDistance }} km</span>
      |
-      <span class="text--grayed">{{ timetable.confirmedStopsCount }}/{{ timetable.allStopsCount }}</span>
+      <span class="text--grayed"
        >{{ timetable.confirmedStopsCount }}/{{ timetable.allStopsCount }}</span
      >
    </span>
    <span class="text--grayed" v-if="timetable.currentSceneryName">
@@ -38,17 +44,17 @@
 <script lang="ts">
 import { PropType, defineComponent } from 'vue';
 import { TimetableHistory } from '../../../scripts/interfaces/api/TimetablesAPIData';
 import ProgressBar from '../../Global/ProgressBar.vue';
 import { API } from '../../../typings/api';
 export default defineComponent({
  components: { ProgressBar },
  props: {
    timetable: {
-      type: Object as PropType<TimetableHistory>,
+      type: Object as PropType<API.TimetableHistory.Data>,
-      required: true,
+      required: true
-    },
+    }
-  },
+  }
 });
 </script>
@@ -24,8 +24,7 @@
 <script lang="ts">
 import { PropType, defineComponent } from 'vue';
 import dateMixin from '../../../mixins/dateMixin';
-
+import { API } from '../../../typings/api';
 import { TimetableHistory } from '../../../scripts/interfaces/api/TimetablesAPIData';
 export default defineComponent({
  mixins: [dateMixin],
@@ -37,9 +36,9 @@ export default defineComponent({
    },
    timetable: {
-      type: Object as PropType<TimetableHistory>,
+      type: Object as PropType<API.TimetableHistory.Data>,
-      required: true,
+      required: true
-    },
+    }
  },
  computed: {
@@ -65,12 +64,18 @@ export default defineComponent({
        if (i == 0) return { stopName, html: beginDateHTML, confirmed };
        if (i == stopNames.length - 1) return { stopName, html: endDateHTML, confirmed };
-        const departureDateScheduled = this.stringToDate(timetable.checkpointDeparturesScheduled?.at(i));
+        const departureDateScheduled = this.stringToDate(
          timetable.checkpointDeparturesScheduled?.at(i)
        );
        const departureDateReal = this.stringToDate(timetable.checkpointDepartures?.at(i));
-        const arrivalDateScheduled = this.stringToDate(timetable.checkpointArrivalsScheduled?.at(i));
+        const arrivalDateScheduled = this.stringToDate(
          timetable.checkpointArrivalsScheduled?.at(i)
        );
        const arrivalDateReal = this.stringToDate(timetable.checkpointArrivals?.at(i));
        const arrivalHTML =
-          (arrivalDateReal && arrivalDateScheduled && arrivalDateReal?.getTime() != arrivalDateScheduled?.getTime()
+          (arrivalDateReal &&
          arrivalDateScheduled &&
          arrivalDateReal?.getTime() != arrivalDateScheduled?.getTime()
            ? `<s class="text--grayed">${this.parseDateToTimeString(arrivalDateScheduled)}</s> `
            : '') + this.parseDateToTimeString(arrivalDateReal || arrivalDateScheduled);
        const departureHTML =
@@ -83,8 +88,8 @@ export default defineComponent({
        if (html) html = ` (${html})`;
        return { stopName, html, confirmed };
      });
-    },
+    }
-  },
+  }
 });
 </script>
@@ -0,0 +1,49 @@
 export namespace Journal {
  export type DispatcherSearcher = {
    [key in 'search-dispatcher' | 'search-station' | 'search-date']: string;
  };
  export interface DispatcherSorter {
    id: 'timestampFrom' | 'duration';
    dir: -1 | 1;
  }
  export type TimetableSearchKey =
    | 'search-driver'
    | 'search-train'
    | 'search-date'
    | 'search-dispatcher'
    | 'search-issuedFrom';
  export type TimetableSearchType = {
    [key in TimetableSearchKey]: string;
  };
  export const enum TimetableFilterId {
    ACTIVE = 'active',
    FULFILLED = 'fulfilled',
    ABANDONED = 'abandoned',
    ALL = 'all',
    TWR = 'twr',
    SKR = 'skr',
    TWR_SKR = 'twr-skr'
  }
  export enum FilterSection {
    TIMETABLE_STATUS = 'timetable-status',
    TWRSKR = 'twrskr'
  }
  export interface TimetableFilter {
    id: TimetableFilterId;
    filterSection: string;
    isActive: boolean;
  }
  export type TimetableSorterKey = 'timetableId' | 'beginDate' | 'distance' | 'total-stops';
  export interface TimetableSorter {
    id: TimetableSorterKey;
    dir: 'asc' | 'desc';
  }
 }
@@ -1,9 +1,12 @@
 <template>
  <section class="scenery-table-section">
    <Loading v-if="dataStatus != DataStatus.Loaded && historyList.length == 0" />
    <div class="no-history" v-else-if="historyList.length == 0">{{ $t('scenery.history-list-empty') }}</div>
-    <table class="scenery-history-table" v-else="historyList.length">
+    <div class="no-history" v-else-if="historyList.length == 0">
      {{ $t('scenery.history-list-empty') }}
    </div>
    <table class="scenery-history-table" v-else>
      <thead>
        <th>{{ $t('scenery.dispatchers-history-hash') }}</th>
        <th>{{ $t('scenery.dispatchers-history-dispatcher') }}</th>
@@ -13,7 +16,7 @@
      </thead>
      <tbody>
-        <tr v-for="historyItem in historyList">
+        <tr v-for="historyItem in historyList" :key="historyItem.id">
          <td>#{{ historyItem.stationHash }}</td>
          <td>
            <router-link :to="`/journal/dispatchers?dispatcherName=${historyItem.dispatcherName}`">
@@ -24,7 +27,9 @@
            <b
              v-if="historyItem.dispatcherLevel !== null"
              class="level-badge dispatcher"
-              :style="calculateExpStyle(historyItem.dispatcherLevel, historyItem.dispatcherIsSupporter)"
+              :style="
                calculateExpStyle(historyItem.dispatcherLevel, historyItem.dispatcherIsSupporter)
              "
            >
              {{ historyItem.dispatcherLevel >= 2 ? historyItem.dispatcherLevel : 'L' }}
            </b>
@@ -37,7 +42,9 @@
              <b>{{ $d(historyItem.timestampFrom) }}</b>
              {{ timestampToString(historyItem.timestampFrom) }}
-              - {{ timestampToString(historyItem.timestampTo) }} ({{ calculateDuration(historyItem.currentDuration) }})
+              - {{ timestampToString(historyItem.timestampTo) }} ({{
                calculateDuration(historyItem.currentDuration)
              }})
            </div>
            <div class="dispatcher-online" v-else>
@@ -62,29 +69,35 @@
 import axios from 'axios';
 import { defineComponent, PropType } from 'vue';
 import dateMixin from '../../mixins/dateMixin';
 import { DataStatus } from '../../scripts/enums/DataStatus';
 import { DispatcherHistory } from '../../scripts/interfaces/api/DispatchersAPIData';
 import Station from '../../scripts/interfaces/Station';
 import { URLs } from '../../scripts/utils/apiURLs';
 import Loading from '../Global/Loading.vue';
 import styleMixin from '../../mixins/styleMixin';
 import listObserverMixin from '../../mixins/listObserverMixin';
 import { OnlineScenery } from '../../store/typings';
 import { API } from '../../typings/api';
 import { Status } from '../../typings/common';
 export default defineComponent({
  name: 'SceneryDispatchersHistory',
  mixins: [dateMixin, styleMixin, listObserverMixin],
  components: { Loading },
  props: {
    station: {
      type: Object as PropType<Station>,
-      required: true,
+      required: true
    },
    onlineScenery: {
      type: Object as PropType<OnlineScenery>,
      required: false
    }
  },
  data() {
    return {
-      historyList: [] as DispatcherHistory[],
+      historyList: [] as API.DispatcherHistory.Response,
-      dataStatus: DataStatus.Loading,
+      dataStatus: Status.Data.Loading,
-      DataStatus,
+      DataStatus: Status.Data
    };
  },
@@ -96,26 +109,30 @@ export default defineComponent({
  },
  methods: {
-    async fetchAPIData(countFrom = 0, countLimit = 30): Promise<DispatcherHistory[] | null> {
+    async fetchAPIData(
      countFrom = 0,
      countLimit = 30
    ): Promise<API.DispatcherHistory.Response | null> {
      try {
-        this.dataStatus = DataStatus.Loading;
+        this.dataStatus = Status.Data.Loading;
        const requestString = `${URLs.stacjownikAPI}/api/getDispatchers?stationName=${this.station.name}&countFrom=${countFrom}&countLimit=${countLimit}`;
-        const historyAPIData: DispatcherHistory[] = await (await axios.get(requestString)).data;
+        const historyAPIData: API.DispatcherHistory.Response = await (
          await axios.get(requestString)
        ).data;
-        this.dataStatus = DataStatus.Loaded;
+        this.dataStatus = Status.Data.Loaded;
        return historyAPIData;
      } catch (error) {
-        this.dataStatus = DataStatus.Error;
+        this.dataStatus = Status.Data.Error;
        console.error(error);
        return null;
      }
    },
    navigateToHistory() {
      this.$router.push(`/journal/dispatchers?sceneryName=${this.station.name}`);
-    },
+    }
-  },
+  }
  components: { Loading },
 });
 </script>
@@ -141,3 +158,4 @@ export default defineComponent({
  }
 }
 </style>
 ../../store/storeTypes
@@ -8,21 +8,27 @@
      {{ $t('scenery.abbrev') }} <b>{{ station.generalInfo?.abbr }}</b>
    </div>
-    <div class="scenery-hash" v-if="station.onlineInfo?.hash">#{{ station.onlineInfo.hash }}</div>
+    <div class="scenery-hash" v-if="onlineScenery?.hash">#{{ onlineScenery.hash }}</div>
  </section>
 </template>
 <script lang="ts">
-import { defineComponent } from 'vue';
+import { PropType, defineComponent } from 'vue';
 import Station from '../../scripts/interfaces/Station';
 import { OnlineScenery } from '../../store/typings';
 export default defineComponent({
  props: {
    station: {
-      type: Object as () => Station,
+      type: Object as PropType<Station>,
-      default: {},
+      required: true
    },
    },
    onlineScenery: {
      type: Object as PropType<OnlineScenery>,
      required: false
    }
  }
 });
 </script>
@@ -52,4 +58,4 @@ export default defineComponent({
  font-size: 1.2em;
 }
 </style>
-
+../../store/storeTypes
@@ -1,24 +1,34 @@
 <template>
  <div class="scenery-info">
-    <section v-if="!timetableOnly">
+    <section>
      <div class="scenery-info-general" v-if="station.generalInfo">
        <SceneryInfoIcons :station="station" />
        <div class="scenery-general-list">
          <span>
-            <b>{{ $t('availability.title') }}:</b> {{ $t(`availability.${station.generalInfo.availability}`) }}
+            <b>{{ $t('availability.title') }}:</b>
            {{ $t(`availability.${station.generalInfo.availability}`) }}
            <span v-if="station.generalInfo.reqLevel > -1">
-              - {{ $t('scenery.req-level', { lvl: station.generalInfo.reqLevel }, station.generalInfo.reqLevel) }}
+              -
              {{
                $t(
                  'scenery.req-level',
                  { lvl: station.generalInfo.reqLevel },
                  station.generalInfo.reqLevel
                )
              }}
            </span>
          </span>
          <span>
-            &bull; <b>{{ $t('controls.title') }}:</b> {{ $t(`controls.${station.generalInfo.controlType}`) }}
+            &bull; <b>{{ $t('controls.title') }}:</b>
            {{ $t(`controls.${station.generalInfo.controlType}`) }}
          </span>
          <span>
-            &bull; <b>{{ $t('signals.title') }}:</b> {{ $t(`signals.${station.generalInfo.signalType}`) }}
+            &bull; <b>{{ $t('signals.title') }}:</b>
            {{ $t(`signals.${station.generalInfo.signalType}`) }}
          </span>
          <span v-if="station.generalInfo.lines">
@@ -26,7 +36,11 @@
          </span>
          <span v-if="station.generalInfo.project">
            &bull; <b>{{ $t('scenery.project-title') }}: </b>
-            <a style="color: salmon; text-decoration: underline; font-weight: bold" :href="station.generalInfo.projectUrl" target="_blank">
+            <a
              style="color: salmon; text-decoration: underline; font-weight: bold"
              :href="station.generalInfo.projectUrl"
              target="_blank"
            >
              {{ station.generalInfo.project }}
            </a>
          </span>
@@ -34,8 +48,19 @@
        <SceneryInfoRoutes :station="station" />
-        <div class="scenery-authors" v-if="station.generalInfo.authors && station.generalInfo.authors.length > 0">
+        <div
-          <b> {{ $t('scenery.authors-title', { authors: station.generalInfo.authors.length }, station.generalInfo.authors.length) }}: </b>
+          class="scenery-authors"
          v-if="station.generalInfo.authors && station.generalInfo.authors.length > 0"
        >
          <b>
            {{
              $t(
                'scenery.authors-title',
                { authors: station.generalInfo.authors.length },
                station.generalInfo.authors.length
              )
            }}:
          </b>
          {{ station.generalInfo.authors.join(', ') }}
        </div>
      </div>
@@ -43,51 +68,49 @@
      <div style="margin: 2em 0; height: 2px; background-color: white"></div>
      <!-- info dispatcher -->
-      <SceneryInfoDispatcher :station="station" :onlineFrom="onlineFrom" />
+      <SceneryInfoDispatcher :onlineScenery="onlineScenery" />
      <div class="info-lists">
        <!-- user list -->
-        <SceneryInfoUserList :station="station" />
+        <SceneryInfoUserList :onlineScenery="onlineScenery" />
        <!-- spawn list -->
-        <SceneryInfoSpawnList :station="station" />
+        <SceneryInfoSpawnList :onlineScenery="onlineScenery" />
      </div>
    </section>
  </div>
 </template>
 <script lang="ts">
-import { defineComponent } from '@vue/runtime-core';
+import { PropType, defineComponent } from 'vue';
 import SceneryInfoDispatcher from './SceneryInfo/SceneryInfoDispatcher.vue';
 import SceneryInfoIcons from './SceneryInfo/SceneryInfoIcons.vue';
 import SceneryInfoStats from './SceneryInfo/SceneryInfoStats.vue';
 import SceneryInfoUserList from './SceneryInfo/SceneryInfoUserList.vue';
 import SceneryInfoSpawnList from './SceneryInfo/SceneryInfoSpawnList.vue';
 import SceneryInfoRoutes from './SceneryInfo/SceneryInfoRoutes.vue';
 import Station from '../../scripts/interfaces/Station';
 import { OnlineScenery } from '../../store/typings';
 export default defineComponent({
  components: {
    SceneryInfoDispatcher,
    SceneryInfoIcons,
    SceneryInfoStats,
    SceneryInfoUserList,
    SceneryInfoSpawnList,
-    SceneryInfoRoutes,
+    SceneryInfoRoutes
  },
  props: {
    station: {
-      type: Object as () => Station,
+      type: Object as PropType<Station>,
-      default: {},
+      required: true
    },
-    timetableOnly: Boolean,
+    onlineScenery: {
-  },
+      type: Object as PropType<OnlineScenery>,
-
+      required: false
-  data: () => ({
+    }
-    onlineFrom: -1,
+  }
  }),
 });
 </script>
@@ -1,54 +1,48 @@
 <template>
  <section class="info-dispatcher">
-    <div class="dispatcher" v-if="station.onlineInfo">
+    <div class="dispatcher" v-if="onlineScenery">
      <span
        class="dispatcher_level"
-        :style="calculateExpStyle(station.onlineInfo.dispatcherExp, station.onlineInfo.dispatcherIsSupporter)"
+        :style="calculateExpStyle(onlineScenery.dispatcherExp, onlineScenery.dispatcherIsSupporter)"
      >
-        {{ station.onlineInfo.dispatcherExp > 1 ? station.onlineInfo.dispatcherExp : 'L' }}
+        {{ onlineScenery.dispatcherExp > 1 ? onlineScenery.dispatcherExp : 'L' }}
      </span>
      <router-link
        class="dispatcher_name"
-        :to="`/journal/dispatchers?dispatcherName=${station.onlineInfo.dispatcherName}`"
+        :to="`/journal/dispatchers?dispatcherName=${onlineScenery.dispatcherName}`"
      >
-        {{ station.onlineInfo.dispatcherName }}
+        {{ onlineScenery.dispatcherName }}
      </router-link>
      <span class="dispatcher_likes text--primary">
-        <img :src="getIcon('like')" alt="icon-like" />
+        <img src="/images/icon-like.svg" alt="Likes count icon" />
-        <span>{{ station.onlineInfo?.dispatcherRate || '0' }}</span>
+        <span>{{ onlineScenery?.dispatcherRate || '0' }}</span>
      </span>
    </div>
    <StationStatusBadge
-      :statusID="station.onlineInfo?.statusID"
+      :isOnline="onlineScenery ? true : false"
-      :isOnline="station.onlineInfo ? true : false"
+      :dispatcherStatus="onlineScenery?.dispatcherStatus"
      :statusTimestamp="station.onlineInfo?.statusTimestamp"
    />
  </section>
 </template>
 <script lang="ts">
-import { defineComponent } from 'vue';
+import { PropType, defineComponent } from 'vue';
 import dateMixin from '../../../mixins/dateMixin';
 import imageMixin from '../../../mixins/imageMixin';
 import routerMixin from '../../../mixins/routerMixin';
 import styleMixin from '../../../mixins/styleMixin';
 import Station from '../../../scripts/interfaces/Station';
 import StationStatusBadge from '../../Global/StationStatusBadge.vue';
 import { OnlineScenery } from '../../../store/typings';
 export default defineComponent({
-    mixins: [styleMixin, dateMixin, routerMixin, imageMixin],
+  mixins: [styleMixin, dateMixin, routerMixin],
  props: {
-        station: {
+    onlineScenery: {
-            type: Object as () => Station,
+      type: Object as PropType<OnlineScenery>,
-            default: {},
+      required: false
-        },
+    }
        onlineFrom: {
            type: Number,
            default: -1,
        },
  },
  components: { StationStatusBadge }
 });
@@ -98,4 +92,3 @@ export default defineComponent({
  }
 }
 </style>
@@ -20,7 +20,7 @@
    <img
      v-if="station.generalInfo?.SUP"
      class="icon-info"
-      :src="getIcon('SUP')"
+      src="/images/icon-SUP.svg"
      alt="SUP (RASP-UZK)"
      :title="$t('desc.SUP')"
    />
@@ -28,7 +28,7 @@
    <img
      v-if="station.generalInfo?.signalType"
      class="icon-info"
-      :src="getIcon(station.generalInfo.signalType)"
+      :src="`/images/icon-${station.generalInfo.signalType}.svg`"
      :alt="station.generalInfo.signalType"
      :title="$t('desc.signals-type') + $t(`signals.${station.generalInfo.signalType}`)"
    />
@@ -36,7 +36,7 @@
    <img
      v-if="station.generalInfo?.availability == 'nonPublic'"
      class="icon-info"
-      :src="getIcon('lock')"
+      src="/images/icon-lock.svg"
      alt="Non-public scenery"
      :title="$t('desc.non-public')"
    />
@@ -44,7 +44,7 @@
    <img
      v-if="station.generalInfo?.availability == 'unavailable'"
      class="icon-info"
-      :src="getIcon('unavailable')"
+      src="/images/icon-unavailable.svg"
      alt="Unavailable scenery"
      :title="$t('desc.unavailable')"
    />
@@ -52,7 +52,7 @@
    <img
      v-if="station.generalInfo?.availability == 'abandoned'"
      class="icon-info"
-      :src="getIcon('abandoned')"
+      src="/images/icon-abandoned.svg"
      alt="Abandoned scenery"
      :title="$t('desc.abandoned')"
    />
@@ -60,7 +60,7 @@
    <img
      v-if="station.generalInfo?.lines"
      class="icon-info"
-      :src="getIcon('real')"
+      src="/images/icon-real.svg"
      alt="real scenery"
      :title="`${$t('desc.real')} ${station.generalInfo.lines}`"
    />
@@ -68,7 +68,7 @@
    <img
      v-if="!station.generalInfo"
      class="icon-info"
-      :src="getIcon('unknown')"
+      src="/images/icon-unknown.svg"
      alt="icon-unknown"
      :title="$t('desc.unknown')"
    />
@@ -76,20 +76,19 @@
 </template>
 <script lang="ts">
-import { defineComponent } from 'vue';
+import { PropType, defineComponent } from 'vue';
 import imageMixin from '../../../mixins/imageMixin';
 import stationInfoMixin from '../../../mixins/stationInfoMixin';
 import styleMixin from '../../../mixins/styleMixin';
 import Station from '../../../scripts/interfaces/Station';
 export default defineComponent({
-  mixins: [stationInfoMixin, styleMixin, imageMixin],
+  mixins: [stationInfoMixin, styleMixin],
  props: {
    station: {
-      type: Object as () => Station,
+      type: Object as PropType<Station>,
-      default: {},
+      required: true
-    },
+    }
-  },
+  }
 });
 </script>
@@ -118,4 +117,3 @@ export default defineComponent({
  }
 }
 </style>
@@ -4,8 +4,14 @@
      <b>{{ $t('scenery.one-way-routes') }}</b>
      <ul class="routes-list">
-        <li v-for="route in station.generalInfo.routes.oneWay" @click="setActiveShowLength(route.name)">
+        <li
-          <span :class="{ 'no-catenary': !route.catenary, internal: route.isInternal }"> {{ route.name }}</span>
+          v-for="route in station.generalInfo.routes.oneWay"
          :key="route.name"
          @click="setActiveShowLength(route.name)"
        >
          <span :class="{ 'no-catenary': !route.catenary, internal: route.isInternal }">
            {{ route.name }}</span
          >
          <span v-if="route.speed" class="speed">
            {{ activeShowLength.includes(route.name) ? route.length + 'm' : route.speed }}
          </span>
@@ -18,8 +24,14 @@
      <b>{{ $t('scenery.two-way-routes') }}</b>
      <ul class="routes-list">
-        <li v-for="(route, i) in station.generalInfo.routes.twoWay" @click="setActiveShowLength(route.name)">
+        <li
-          <span :class="{ 'no-catenary': !route.catenary, internal: route.isInternal }">{{ route.name }}</span>
+          v-for="route in station.generalInfo.routes.twoWay"
          :key="route.name"
          @click="setActiveShowLength(route.name)"
        >
          <span :class="{ 'no-catenary': !route.catenary, internal: route.isInternal }">{{
            route.name
          }}</span>
          <span v-if="route.speed" class="speed">
            {{ activeShowLength.includes(route.name) ? route.length + 'm' : route.speed }}
          </span>
@@ -31,29 +43,30 @@
 </template>
 <script lang="ts">
-import { defineComponent } from 'vue';
+import { PropType, defineComponent } from 'vue';
 import Station from '../../../scripts/interfaces/Station';
 export default defineComponent({
  props: {
    station: {
-      type: Object as () => Station,
+      type: Object as PropType<Station>,
-      default: {},
+      required: true
-    },
+    }
  },
  methods: {
    setActiveShowLength(name: string) {
-      if (this.activeShowLength.includes(name)) this.activeShowLength.splice(this.activeShowLength.indexOf(name), 1);
+      if (this.activeShowLength.includes(name))
        this.activeShowLength.splice(this.activeShowLength.indexOf(name), 1);
      else this.activeShowLength.push(name);
-    },
+    }
  },
  data() {
    return {
-      activeShowLength: [] as string[],
+      activeShowLength: [] as string[]
    };
-  },
+  }
 });
 </script>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Spythere	96714550d0	Merge pull request #62 - Wersja 1.18.3 Wersja 1.18.3	2023-11-15 02:13:54 +01:00
Spythere	2b6c751f55	hotifx toString	2023-11-13 15:57:01 +01:00
Spythere	08d3a2a03a	feature: nawigacja URL w widoku scenerii	2023-11-13 15:32:02 +01:00
Spythere	a79ca78781	poprawki animacji statusów danych & tryb offline	2023-11-13 14:59:17 +01:00
Spythere	e08333dba1	fix: tłumaczenie statusów dr	2023-11-12 16:40:25 +01:00
Spythere	8705dd1df5	fix filtrowania RJ na posterunkach; favicons index	2023-11-12 15:47:55 +01:00
Spythere	7b4da9d422	poprawki layoutu aplikacji	2023-11-10 16:18:06 +01:00
Spythere	e51b2fe2f3	poprawki filtrów poc.	2023-11-10 15:39:49 +01:00
Spythere	f8b4ce103f	refactor typów danych	2023-11-10 15:04:49 +01:00
Spythere	e82b4b8817	bump 1.18.3	2023-11-08 22:04:11 +01:00
Spythere	36e9df82b0	hotfixy	2023-11-08 22:03:45 +01:00
Spythere	cbce9af00b	nowe pobieranie i przetwarzanie statusów dyżurnych	2023-11-07 20:16:58 +01:00
Spythere	4a4304d65f	Merge pull request #61 - Wersja 1.18.2 Wersja 1.18.2	2023-11-04 17:03:51 +01:00
Spythere	edad5306f2	bump: 1.18.2	2023-11-04 17:01:01 +01:00
Spythere	5b775dfec9	fix: filtry RJ	2023-11-04 17:00:50 +01:00
Spythere	a485652ca5	Merge pull request #60 (hotfix) hotfix: maksymalny timeout dyżurnych (1.18.1)	2023-11-02 22:44:48 +01:00
Spythere	ed308246d7	hotfix: maksymalny timeout dyżurnych	2023-11-02 22:42:28 +01:00
Spythere	621bb1ad55	Merge pull request #59 - Wersja 1.18.1 Wersja 1.18.1	2023-11-02 17:41:59 +01:00
Spythere	154ae2ddac	bump 1.18.1	2023-11-02 17:40:55 +01:00
Spythere	d9da49a867	rozszerzony wybór regionów przez URL; poprawki headerów	2023-11-02 17:40:31 +01:00
Spythere	826d51f66c	Merge pull request #58 - Wersja 1.18 Wersja 1.18	2023-11-02 01:27:29 +01:00
Spythere	1d7fc2955f	animacje userów i spawnów scenerii	2023-11-01 17:20:05 +01:00
Spythere	c550e7598a	bump 1.18.0	2023-10-31 23:03:51 +01:00
Spythere	d5168ce59d	lock sync	2023-10-31 22:54:53 +01:00
Spythere	380c97655c	filtrowanie statusów; poprawki w statystykach	2023-10-31 22:53:18 +01:00
Spythere	e4ed24de80	region query	2023-10-31 02:35:41 +01:00
Spythere	8de03b9210	rework reaktywności danych z API i WS	2023-10-30 23:19:17 +01:00
Spythere	12ece46089	migracja assetów	2023-10-04 17:30:30 +02:00
Spythere	085238fada	hotfix: zapamiętywanie stanu statystyk	2023-10-04 15:32:36 +02:00
Spythere	45c1d83512	format & lint	2023-10-04 15:01:01 +02:00