Merge pull request #59 - Wersja 1.18.1

Wersja 1.18.1

.eslintrc.cjs

@@ -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'
+  }
+}

.prettierrc

@@ -0,0 +1,7 @@
+{
+  "$schema": "https://json.schemastore.org/prettierrc",
+  "tabWidth": 2,
+  "singleQuote": true,
+  "printWidth": 100,
+  "trailingComma": "none"
+}

package.json

@@ -1,12 +1,15 @@
 {
   "name": "stacjownik",
-  "version": "1.17.1",
+  "version": "1.18.1",
   "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%",

src/App.scss

@@ -1,105 +1,106 @@
-@import './styles/responsive.scss';
-@import './styles/variables.scss';
-@import './styles/global.scss';
-
-// VUE ROUTE CHANGE ANIMATION
-.view-anim {
-  &-enter-from,
-  &-leave-to {
-    opacity: 0.02;
-  }
-
-  &-enter-active,
-  &-leave-active {
-    transition: all $animDuration $animType;
-    min-height: 100%;
-  }
-}
-
-.modal-anim {
-  &-enter-active,
-  &-leave-active {
-    transition: all $animDuration $animType;
-  }
-
-  &-enter-from,
-  &-leave-to {
-    transform: translateY(-25%);
-    opacity: 0;
-  }
-}
-
-.route {
-  margin: 0 0.2em;
-
-  &-active,
-  &[data-active='true'] {
-    color: $accentCol;
-    font-weight: bold;
-  }
-}
-
-// APP
-#app {
-  color: white;
-  font-size: 1rem;
-
-  @include smallScreen() {
-    font-size: calc(0.55rem + 1.1vw);
-  }
-
-  @include screenLandscape() {
-    font-size: calc(0.45rem + 0.8vw);
-  }
-}
-
-// CONTAINER
-.app_container {
-  display: flex;
-  flex-flow: column;
-
-  min-height: 100vh;
-
-  header {
-    flex: 0 0 auto;
-  }
-
-  main {
-    flex: 1 1 auto;
-
-    padding: 0 0.5em;
-  }
-
-  footer {
-    flex: 0 1 0.2em;
-  }
-}
-
-.warning {
-  background-color: firebrick;
-  text-align: center;
-  padding: 0.5em 0.4em;
-  max-width: 1100px;
-  margin: 0 auto;
-
-  border-radius: 0 0 1em 1em;
-}
-
-// FOOTER
-footer.app_footer {
-  max-width: 100%;
-  padding: 0.5em;
-
-  img {
-    width: 1.1em;
-    vertical-align: text-bottom;
-  }
-
-  z-index: 10;
-
-  background: #111;
-  color: white;
-
-  text-align: center;
-  vertical-align: middle;
-}
+@import './styles/responsive.scss';
+@import './styles/variables.scss';
+@import './styles/global.scss';
+
+// VUE ROUTE CHANGE ANIMATION
+.view-anim {
+  &-enter-from,
+  &-leave-to {
+    opacity: 0.02;
+  }
+
+  &-enter-active,
+  &-leave-active {
+    transition: all $animDuration $animType;
+    min-height: 100%;
+  }
+}
+
+.modal-anim {
+  &-enter-active,
+  &-leave-active {
+    transition: all $animDuration $animType;
+  }
+
+  &-enter-from,
+  &-leave-to {
+    transform: translateY(-25%);
+    opacity: 0;
+  }
+}
+
+.route {
+  margin: 0 0.2em;
+
+  &-active,
+  &[data-active='true'] {
+    color: $accentCol;
+    font-weight: bold;
+  }
+}
+
+// APP
+#app {
+  color: white;
+  font-size: 1rem;
+  overflow-x: hidden;
+
+  @include smallScreen() {
+    font-size: calc(0.65rem + 0.8vw);
+  }
+
+  @include screenLandscape() {
+    font-size: calc(0.45rem + 0.8vw);
+  }
+}
+
+// CONTAINER
+.app_container {
+  display: flex;
+  flex-flow: column;
+
+  min-height: 100vh;
+
+  header {
+    flex: 0 0 auto;
+  }
+
+  main {
+    flex: 1 1 auto;
+
+    padding: 0 0.5em;
+  }
+
+  footer {
+    flex: 0 1 0.2em;
+  }
+}
+
+.warning {
+  background-color: firebrick;
+  text-align: center;
+  padding: 0.5em 0.4em;
+  max-width: 1100px;
+  margin: 0 auto;
+
+  border-radius: 0 0 1em 1em;
+}
+
+// FOOTER
+footer.app_footer {
+  max-width: 100%;
+  padding: 0.5em;
+
+  img {
+    width: 1.1em;
+    vertical-align: text-bottom;
+  }
+
+  z-index: 10;
+
+  background: #111;
+  color: white;
+
+  text-align: center;
+  vertical-align: middle;
+}

src/App.vue

@@ -1,178 +1,162 @@
-<template>
-  <div class="app_container">
-    <transition name="modal-anim">
-      <keep-alive>
-        <TrainModal v-if="store.chosenModalTrainId" />
-      </keep-alive>
-    </transition>
-
-    <UpdatePrompt />
-
-    <AppHeader :current-lang="currentLang" @change-lang="changeLang" />
-
-    <main class="app_main">
-      <router-view v-slot="{ Component }">
-        <keep-alive exclude="JournalView">
-          <component :is="Component" :key="$route.name" />
-        </keep-alive>
-      </router-view>
-    </main>
-
-    <footer class="app_footer">
-      &copy;
-      <a href="https://td2.info.pl/profile/?u=20777" target="_blank">Spythere</a>
-      {{ new Date().getUTCFullYear() }} |
-      <a :href="releaseURL" target="_blank">v{{ VERSION }}{{ isOnProductionHost ? '' : 'dev' }}</a>
-      <br />
-      <a href="https://discord.gg/x2mpNN3svk"><img :src="getIcon('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>
-  </div>
-</template>
-
-<script lang="ts">
-import { computed, defineComponent, KeepAlive, provide, ref, watch } from 'vue';
-
-import Clock from './components/App/Clock.vue';
-
-import packageInfo from '.././package.json';
-
-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 { VERSION } from 'vue-i18n';
-import { RouterView } from 'vue-router';
-import useCustomSW from './mixins/useCustomSW';
-
-export default defineComponent({
-  components: {
-    Clock,
-    StatusIndicator,
-    SelectBox,
-    TrainModal,
-    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,
-
-    currentLang: 'pl',
-    releaseURL: '',
-    isOnProductionHost: location.hostname == 'stacjownik-td2.web.app',
-  }),
-
-  created() {
-    this.loadLang();
-
-    this.store.isOffline = !window.navigator.onLine;
-
-    window.addEventListener('offline', () => {
-      this.store.isOffline = true;
-
-      this.store.apiData = {
-        stations: [],
-        dispatchers: [],
-        trains: [],
-        connectedSocketCount: 0,
-      };
-
-      this.store.setOnlineData();
-    });
-
-    window.addEventListener('online', () => {
-      this.store.isOffline = false;
-    });
-  },
-
-  async mounted() {
-    this.setReleaseURL();
-
-    watch(
-      () => this.store.blockScroll,
-      (value) => {
-        if (value) {
-          document.body.classList.add('no-scroll');
-          return;
-        }
-
-        document.body.classList.remove('no-scroll');
-      }
-    );
-  },
-
-  methods: {
-    changeLang(lang: string) {
-      this.$i18n.locale = lang;
-      this.currentLang = lang;
-
-      StorageManager.setStringValue('lang', lang);
-    },
-
-    async setReleaseURL() {
-      try {
-        const releaseData = await (
-          await axios.get('https://api.github.com/repos/Spythere/stacjownik/releases/latest')
-        ).data;
-
-        if (!releaseData) return;
-
-        this.releaseURL = releaseData.html_url;
-      } catch (error) {
-        console.error(`Wystąpił błąd podczas pobierania danych z API GitHuba: ${error}`);
-        return;
-      }
-    },
-
-    loadLang() {
-      const storageLang = StorageManager.getStringValue('lang');
-
-      if (storageLang) {
-        this.changeLang(storageLang);
-        return;
-      }
-
-      if (!window.navigator.language) return;
-
-      const naviLanguage = window.navigator.language.toString();
-
-      if (naviLanguage.includes('en')) {
-        this.changeLang('en');
-        return;
-      }
-    },
-  },
-});
-</script>
-
-<style lang="scss" src="./App.scss"></style>
+<template>
+  <div class="app_container">
+    <transition name="modal-anim">
+      <keep-alive>
+        <TrainModal v-if="store.chosenModalTrainId" />
+      </keep-alive>
+    </transition>
+
+    <AppHeader :current-lang="currentLang" @change-lang="changeLang" />
+
+    <main class="app_main">
+      <router-view v-slot="{ Component }">
+        <keep-alive exclude="JournalView">
+          <component :is="Component" :key="$route.name" />
+        </keep-alive>
+      </router-view>
+    </main>
+
+    <footer class="app_footer">
+      &copy;
+      <a href="https://td2.info.pl/profile/?u=20777" target="_blank">Spythere</a>
+      {{ new Date().getUTCFullYear() }} |
+      <a :href="releaseURL" target="_blank">v{{ VERSION }}{{ isOnProductionHost ? '' : 'dev' }}</a>
+      <br />
+      <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>
+  </div>
+</template>
+
+<script lang="ts">
+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/store';
+import StatusIndicator from './components/App/StatusIndicator.vue';
+import TrainModal from './components/Global/TrainModal.vue';
+import StorageManager from './scripts/managers/storageManager';
+import AppHeader from './components/App/AppHeader.vue';
+import axios from 'axios';
+
+export default defineComponent({
+  components: {
+    Clock,
+    StatusIndicator,
+    TrainModal,
+    AppHeader
+  },
+
+  data: () => ({
+    VERSION: packageInfo.version,
+    store: useStore(),
+
+    currentLang: 'pl',
+    releaseURL: '',
+    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 = {
+        stations: [],
+        dispatchers: [],
+        trains: [],
+        connectedSocketCount: 0
+      };
+
+      this.store.setStatuses();
+    });
+
+    window.addEventListener('online', () => {
+      this.store.isOffline = false;
+    });
+  },
+
+  async mounted() {
+    this.setReleaseURL();
+
+    watch(
+      () => this.store.blockScroll,
+      (value) => {
+        if (value) document.body.classList.add('no-scroll');
+        else document.body.classList.remove('no-scroll');
+      }
+    );
+  },
+
+  watch: {
+    '$route.query.region': {
+      immediate: true,
+      handler(regionQuery: string) {
+        if (regionQuery) {
+          this.store.region.id =
+            regions.find(
+              (reg) =>
+                reg.id == regionQuery.toLocaleLowerCase() ||
+                reg.value.toLocaleLowerCase() == regionQuery.toLocaleLowerCase()
+            )?.id || 'eu';
+        }
+      }
+    }
+  },
+
+  methods: {
+    changeLang(lang: string) {
+      this.$i18n.locale = lang;
+      this.currentLang = lang;
+
+      StorageManager.setStringValue('lang', lang);
+    },
+
+    async setReleaseURL() {
+      try {
+        const releaseData = await (
+          await axios.get('https://api.github.com/repos/Spythere/stacjownik/releases/latest')
+        ).data;
+
+        if (!releaseData) return;
+
+        this.releaseURL = releaseData.html_url;
+      } catch (error) {
+        console.error(`Wystąpił błąd podczas pobierania danych z API GitHuba: ${error}`);
+        return;
+      }
+    },
+
+    loadLang() {
+      const storageLang = StorageManager.getStringValue('lang');
+
+      if (storageLang) {
+        this.changeLang(storageLang);
+        return;
+      }
+
+      if (!window.navigator.language) return;
+
+      const naviLanguage = window.navigator.language.toString();
+
+      if (naviLanguage.includes('en')) {
+        this.changeLang('en');
+        return;
+      }
+    }
+  }
+});
+</script>
+
+<style lang="scss" src="./App.scss"></style>

src/components/App/AppHeader.vue

@@ -1,237 +1,212 @@
-<template>
-  <header class="app_header">
-    <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 :src="getIcon('en', 'jpg')" alt="icon-en" @click="changeLang('pl')" v-else />
-        </span>
-      </div>
-
-      <div class="header_body">
-        <StatusIndicator />
-
-        <span class="header_brand">
-          <router-link to="/">
-            <img :src="getImage('stacjownik-header-logo.svg')" alt="Stacjownik" />
-          </router-link>
-        </span>
-
-        <span class="header_info">
-          <Clock />
-
-          <div class="info_counter">
-            <img :src="getIcon('dispatcher')" alt="icon dispatcher" />
-            <span class="text--primary">{{ onlineDispatchersCount }}</span>
-
-            <!-- <span class="g-tooltip">
-              <b class="text--primary">{{ factorU }}U</b>
-              <div class="content">Test</div>
-            </span> -->
-
-            <span class="text--grayed"> / </span>
-            <span class="text--primary">{{ onlineTrainsCount }}</span>
-            <img :src="getIcon('train')" alt="icon train" />
-          </div>
-
-          <span class="info_region">
-            <SelectBox :itemList="computedRegions" :defaultItemIndex="0" @selected="changeRegion" />
-          </span>
-        </span>
-
-        <span class="header_links">
-          <router-link class="route" active-class="route-active" to="/" exact>
-            {{ $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"
-            :data-active="$route.path.startsWith('/journal')"
-            to="/journal"
-          >
-            {{ $t('app.journal') }}
-          </router-link>
-        </span>
-      </div>
-    </div>
-  </header>
-</template>
-<script lang="ts">
-import { defineComponent } from 'vue';
-import { useStore } from '../../store/store';
-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';
-
-export default defineComponent({
-  emits: ['changeLang'],
-  mixins: [imageMixin],
-  props: {
-    currentLang: {
-      type: String,
-      required: true,
-    },
-  },
-  setup() {
-    return {
-      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;
-    },
-
-    onlineDispatchersCount() {
-      return this.store.stationList.filter(
-        (station) => station.onlineInfo && station.onlineInfo.region == this.store.region.id
-      ).length;
-    },
-
-    factorU() {
-      return this.onlineDispatchersCount == 0 ? '-' : (this.onlineTrainsCount / this.onlineDispatchersCount).toFixed(2);
-    },
-
-    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>
-@import '../../styles/variables.scss';
-@import '../../styles/responsive.scss';
-
-// HEADER
-.app_header {
-  display: flex;
-  justify-content: center;
-
-  position: relative;
-  background-color: $primaryCol;
-}
-
-.header {
-  &_body {
-    position: relative;
-    max-width: 20em;
-  }
-
-  &_container {
-    display: flex;
-    justify-content: center;
-
-    border-radius: 0 0 1em 1em;
-
-    @include smallScreen {
-      position: relative;
-      margin-top: 0.5em;
-    }
-  }
-
-  &_brand {
-    display: flex;
-
-    img {
-      width: 100%;
-
-      margin: 0 auto;
-    }
-  }
-
-  &_info {
-    display: grid;
-    grid-template-columns: 1fr 1fr 1fr;
-    font-size: 1.15em;
-  }
-
-  &_links {
-    display: flex;
-    justify-content: center;
-
-    border-radius: 0.7em;
-
-    font-size: 1.25em;
-    padding: 0.5em;
-  }
-
-  &_icons {
-    position: absolute;
-    right: 0;
-    top: 0;
-
-    padding: 0.5em;
-
-    @include smallScreen {
-      transform: translateX(85%);
-    }
-  }
-}
-
-// ICONS
-.icons-top {
-  img {
-    width: 2.5em;
-    cursor: pointer;
-  }
-}
-
-// COUNTER
-.info_counter {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-
-  span {
-    margin: 0 0.15em;
-  }
-
-  img {
-    width: 1.35em;
-  }
-}
-
-// 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>
+<template>
+  <header class="app_header">
+    <div class="header_container">
+      <div class="header_icons">
+        <span class="icons-top">
+          <img
+            src="/images/icon-pl.svg"
+            alt="icon-pl"
+            @click="changeLang('en')"
+            v-if="currentLang == 'pl'"
+          />
+          <img src="/images/icon-en.jpg" alt="icon-en" @click="changeLang('pl')" v-else />
+        </span>
+      </div>
+
+      <div class="header_body">
+        <StatusIndicator />
+
+        <span class="header_brand">
+          <router-link to="/">
+            <img src="/images/stacjownik-header-logo.svg" alt="Stacjownik" />
+          </router-link>
+        </span>
+
+        <span class="header_info">
+          <Clock />
+
+          <div class="info_counter">
+            <img src="/images/icon-dispatcher.svg" alt="icon dispatcher" />
+            <span class="text--primary">{{ onlineDispatchersCount }}</span>
+
+            <!-- <span class="g-tooltip">
+              <b class="text--primary">{{ factorU }}U</b>
+              <div class="content">Test</div>
+            </span> -->
+
+            <span class="text--grayed"> / </span>
+            <span class="text--primary">{{ onlineTrainsCount }}</span>
+            <img src="/images/icon-train.svg" alt="icon train" />
+          </div>
+
+          <div class="info_region">
+            <RegionDropdown />
+          </div>
+        </span>
+
+        <span class="header_links">
+          <router-link class="route" active-class="route-active" to="/" exact>
+            {{ $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"
+            :data-active="$route.path.startsWith('/journal')"
+            to="/journal"
+          >
+            {{ $t('app.journal') }}
+          </router-link>
+        </span>
+      </div>
+    </div>
+  </header>
+</template>
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { useStore } from '../../store/store';
+import StatusIndicator from './StatusIndicator.vue';
+import Clock from './Clock.vue';
+import RegionDropdown from '../Global/RegionDropdown.vue';
+
+export default defineComponent({
+  emits: ['changeLang'],
+  props: {
+    currentLang: {
+      type: String,
+      required: true
+    }
+  },
+
+  setup() {
+    return {
+      store: useStore()
+    };
+  },
+
+  methods: {
+    changeLang(lang: string) {
+      this.$emit('changeLang', lang);
+    }
+  },
+
+  computed: {
+    onlineTrainsCount() {
+      return this.store.trainList.filter((train) => train.online).length;
+    },
+
+    onlineDispatchersCount() {
+      return this.store.onlineSceneryList.length;
+    },
+
+    factorU() {
+      return this.onlineDispatchersCount == 0
+        ? '-'
+        : (this.onlineTrainsCount / this.onlineDispatchersCount).toFixed(2);
+    }
+  },
+  components: { StatusIndicator, Clock, RegionDropdown }
+});
+</script>
+<style lang="scss" scoped>
+@import '../../styles/variables.scss';
+@import '../../styles/responsive.scss';
+
+// HEADER
+.app_header {
+  display: flex;
+  justify-content: center;
+
+  position: relative;
+  background-color: $primaryCol;
+}
+
+.header {
+  &_body {
+    position: relative;
+    max-width: 20em;
+  }
+
+  &_container {
+    display: flex;
+    justify-content: center;
+
+    border-radius: 0 0 1em 1em;
+
+    @include smallScreen {
+      position: relative;
+      margin-top: 0.5em;
+    }
+  }
+
+  &_brand {
+    display: flex;
+
+    img {
+      width: 100%;
+
+      margin: 0 auto;
+    }
+  }
+
+  &_info {
+    display: grid;
+    grid-template-columns: 1fr 1fr 1fr;
+    font-size: 1.15em;
+  }
+
+  &_links {
+    display: flex;
+    justify-content: center;
+
+    border-radius: 0.7em;
+
+    font-size: 1.25em;
+    padding: 0.5em;
+  }
+
+  &_icons {
+    position: absolute;
+    right: 0;
+    top: 0;
+
+    padding: 0.5em;
+
+    @include smallScreen {
+      transform: translateX(85%);
+    }
+  }
+}
+
+// ICONS
+.icons-top {
+  img {
+    width: 2.5em;
+    cursor: pointer;
+  }
+}
+
+// COUNTER
+.info_counter {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  span {
+    margin: 0 0.15em;
+  }
+
+  img {
+    width: 1.35em;
+  }
+}
+
+.info_region {
+  display: flex;
+  justify-content: flex-end;
+}
+</style>

src/components/App/Clock.vue

@@ -1,36 +1,37 @@
-<template>
-  <div class="clock">{{ computedDate }}</div>
-</template>
-
-
-<script lang="ts">
-import { computed, defineComponent, ref } from "vue";
-export default defineComponent({
-  name: "clock",
-  data: () => ({
-    timestamp: Date.now(),
-  }),
-  setup() {
-      let timestamp = ref(Date.now());
-
-      const computedDate = computed(() => new Date(timestamp.value).toLocaleString("pl-PL", {
-        hour: "2-digit",
-        minute: "2-digit",
-        second: "2-digit",
-      }));
-
-      setInterval(() => (timestamp.value = Date.now()), 1000);
-
-      return { computedDate }
-  }
-});
-</script>
-
-<style lang="scss" scoped>
-@import "../../styles/responsive.scss";
-
-.clock {
-  display: flex;
-  align-items: center;
-}
-</style>
+<template>
+  <div class="clock">{{ computedDate }}</div>
+</template>
+
+<script lang="ts">
+import { computed, defineComponent, ref } from 'vue';
+export default defineComponent({
+  name: 'VueClock',
+  data: () => ({
+    timestamp: Date.now()
+  }),
+  setup() {
+    let timestamp = ref(Date.now());
+
+    const computedDate = computed(() =>
+      new Date(timestamp.value).toLocaleString('pl-PL', {
+        hour: '2-digit',
+        minute: '2-digit',
+        second: '2-digit'
+      })
+    );
+
+    setInterval(() => (timestamp.value = Date.now()), 1000);
+
+    return { computedDate };
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+@import '../../styles/responsive.scss';
+
+.clock {
+  display: flex;
+  align-items: center;
+}
+</style>

src/components/App/StatusIndicator.vue

@@ -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>
@@ -173,14 +205,14 @@ export default defineComponent({
       indicator: {
         offline: false,
         status: DataStatus.Loading,
-        message: 'data-status.S3',
+        message: 'data-status.S3'
       },
 
       greenLight: false,
       greenBlinkLight: false,
       redTopLight: false,
       orangeLight: false,
-      redBottomLight: false,
+      redBottomLight: false
     };
   },
 
@@ -193,7 +225,7 @@ export default defineComponent({
 
     return {
       dataStatus: store.dataStatuses,
-      store,
+      store
     };
   },
 
@@ -248,8 +280,8 @@ export default defineComponent({
           this.indicator.status = DataStatus.Loaded;
           this.indicator.message = 'data-status.S2';
         }
-      },
-    },
+      }
+    }
   },
 
   methods: {
@@ -280,8 +312,8 @@ export default defineComponent({
       if (status == DataStatus.Loading) {
         this.greenBlinkLight = true;
       }
-    },
-  },
+    }
+  }
 });
 </script>
 
@@ -375,4 +407,3 @@ export default defineComponent({
   }
 }
 </style>
-

src/components/App/UpdateModal.vue

@@ -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>

src/components/App/UpdatePrompt.vue

@@ -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>
-

src/components/Global/ActionButton.vue

@@ -1,24 +1,24 @@
-<template>
-  <button class="action-btn btn--filled">
-    <div class="button_content">
-      <slot></slot>
-    </div>
-  </button>
-</template>
-
-<script lang="ts">
-import { defineComponent } from "vue";
-
-export default defineComponent({});
-</script>
-
-<style lang="scss">
-@import "../../styles/variables";
-@import "../../styles/responsive";
-
-.button_content {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-</style>
+<template>
+  <button class="action-btn btn--filled">
+    <div class="button_content">
+      <slot></slot>
+    </div>
+  </button>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+
+export default defineComponent({});
+</script>
+
+<style lang="scss">
+@import '../../styles/variables';
+@import '../../styles/responsive';
+
+.button_content {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+</style>

src/components/Global/AddDataButton.vue

@@ -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>
 

src/components/Global/Loading.vue

@@ -12,7 +12,7 @@ import { defineComponent } from 'vue';
 export default defineComponent({
   setup() {
     return {};
-  },
+  }
 });
 </script>
 

src/components/Global/ProgressBar.vue

@@ -1,62 +1,65 @@
-<template>
-  <div class="progress-bar">
-    <span class="bar-bg"></span>
-    <span class="bar-fg" :style="{ width: `${~~progressPercent}%`, backgroundColor: bgColor }"></span>
-  </div>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-
-export default defineComponent({
-  props: {
-    progressPercent: {
-      type: Number,
-      required: true,
-    },
-    progressType: {
-      type: String,
-      required: false,
-    },
-  },
-
-  computed: {
-    bgColor() {
-      switch (this.progressType) {
-        case 'abandoned':
-          return 'salmon';
-
-        default:
-          return 'springgreen';
-      }
-    },
-  },
-});
-</script>
-
-<style lang="scss" scoped>
-.progress-bar {
-  position: relative;
-
-  width: 6em;
-  height: 1em;
-  margin: 0.5em 0;
-
-  .bar-fg,
-  .bar-bg {
-    position: absolute;
-    height: 1em;
-    width: 100%;
-
-    left: 0;
-  }
-
-  .bar-fg {
-    background-color: springgreen;
-  }
-
-  .bar-bg {
-    background-color: #5b5b5b;
-  }
-}
-</style>
+<template>
+  <div class="progress-bar">
+    <span class="bar-bg"></span>
+    <span
+      class="bar-fg"
+      :style="{ width: `${~~progressPercent}%`, backgroundColor: bgColor }"
+    ></span>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+  props: {
+    progressPercent: {
+      type: Number,
+      required: true
+    },
+    progressType: {
+      type: String,
+      required: false
+    }
+  },
+
+  computed: {
+    bgColor() {
+      switch (this.progressType) {
+        case 'abandoned':
+          return 'salmon';
+
+        default:
+          return 'springgreen';
+      }
+    }
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+.progress-bar {
+  position: relative;
+
+  width: 6em;
+  height: 1em;
+  margin: 0.5em 0;
+
+  .bar-fg,
+  .bar-bg {
+    position: absolute;
+    height: 1em;
+    width: 100%;
+
+    left: 0;
+  }
+
+  .bar-fg {
+    background-color: springgreen;
+  }
+
+  .bar-bg {
+    background-color: #5b5b5b;
+  }
+}
+</style>

src/components/Global/RegionDropdown.vue

@@ -1,217 +1,226 @@
-<template>
-  <div class="select-box">
-    <div class="select-box_content">
-      <button class="selected" @click="toggleBox">
-        <span>{{ computedSelectedItem.selectedValue || computedSelectedItem.value }}</span>
-
-        <div class="arrow">
-          <img :src="listOpen ? getIcon('arrow-asc') : getIcon('arrow-desc')" alt="arrow-icon" />
-        </div>
-      </button>
-
-      <ul class="options" :ref="(el) => (listRef = el as Element)">
-        <li class="option" v-for="(item, i) in itemList" :key="item.id">
-          <transition
-            name="unfold"
-            :style="`
-            --delay-in: ${i * 55}ms; 
-            --delay-out: ${(itemList.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>
-            </label>
-          </transition>
-        </li>
-      </ul>
-    </div>
-  </div>
-</template>
-
-<script lang="ts">
-import { defineComponent, Ref, ref, computed } from 'vue';
-import imageMixin from '../../mixins/imageMixin';
-
-interface Item {
-  id: string;
-  value: string;
-  selectedValue?: string;
-}
-
-export default defineComponent({
-  emits: ['selected'],
-  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,
-      listOpen,
-      selectedItem,
-      listRef,
-      buttonRef,
-      activeEl,
-    };
-  },
-
-  methods: {
-    selectOption(item: Item) {
-      this.selectedItem = item;
-      this.listOpen = false;
-
-      this.$emit('selected', item);
-    },
-
-    toggleBox(e: Event) {
-      this.listOpen = !this.listOpen;
-
-      if (!this.listOpen) (e.target as HTMLButtonElement).blur();
-    },
-
-    clickedOutside() {
-      this.listOpen = false;
-      this.buttonRef?.blur();
-    },
-  },
-});
-</script>
-
-<style lang="scss" scoped>
-@import '../../styles/variables.scss';
-
-.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);
-  }
-}
-
-.select-box {
-  display: flex;
-  align-items: center;
-}
-
-.arrow {
-  img {
-    vertical-align: middle;
-    width: 1.35em;
-  }
-}
-
-button.selected {
-  color: paleturquoise;
-
-  font-weight: bold;
-  padding: 0.1em 0.5em;
-
-  &:focus {
-    background-color: #262626;
-  }
-}
-
-.select-box_content {
-  position: relative;
-  margin: 0 auto;
-
-  height: 100%;
-
-  text-align: center;
-}
-
-ul.options {
-  position: absolute;
-  top: 100%;
-  left: 0;
-
-  height: auto;
-
-  z-index: 100;
-  width: 100%;
-
-  font-size: 0.9em;
-}
-
-li.option {
-  input {
-    position: absolute;
-    top: 0;
-    left: 0;
-
-    -webkit-appearance: none;
-    -moz-appearance: none;
-    appearance: none;
-    border: none;
-    outline: none;
-    background: none;
-
-    &:focus + span {
-      color: $accentCol;
-      font-weight: 800;
-    }
-  }
-
-  &:last-child label {
-    border-radius: 0 0 1em 1em;
-  }
-
-  label {
-    position: relative;
-
-    display: inline-block;
-    background-color: #262626f2;
-
-    &:hover,
-    &:focus {
-      background-color: #333333f2;
-    }
-
-    padding: 0.5em 0;
-
-    width: 100%;
-
-    cursor: pointer;
-  }
-}
-</style>
+<template>
+  <div class="region-dropdown" v-click-outside="clickedOutside">
+    <div class="content">
+      <button class="selected-region" @click="toggleBox">
+        <span>{{ selectedItem.name }}</span>
+
+        <img :src="`/images/icon-arrow-${listOpen ? 'asc' : 'desc'}.svg`" alt="Arrow icon" />
+      </button>
+
+      <ul class="options">
+        <li class="option" v-for="(item, i) in regionList" :key="item.id">
+          <transition
+            name="unfold"
+            :style="`
+            --delay-in: ${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="selectedItem.id == item.id ? 'color: gold;' : ''" v-html="item.value">
+              </span>
+            </label>
+          </transition>
+        </li>
+      </ul>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent, Ref, ref } from 'vue';
+import { useStore } from '../../store/store';
+import { regions as regionsJSON } from '../../data/options.json';
+
+interface Item {
+  id: string;
+  value: string;
+  name: string;
+}
+
+export default defineComponent({
+  data() {
+    return {
+      store: useStore(),
+      selectedItemIndex: 0,
+      listOpen: false
+    };
+  },
+
+  setup() {
+    let buttonRef: Ref<HTMLButtonElement | null> = ref(null);
+
+    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.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>`,
+          name: region.name
+        };
+      });
+    }
+  },
+
+  methods: {
+    selectOption(selectedRegion: Item) {
+      this.store.region = selectedRegion;
+      this.listOpen = false;
+    },
+
+    toggleBox(e: Event) {
+      this.listOpen = !this.listOpen;
+
+      if (!this.listOpen) (e.target as HTMLButtonElement).blur();
+    },
+
+    clickedOutside() {
+      this.listOpen = false;
+      this.buttonRef?.blur();
+    }
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+@import '../../styles/variables.scss';
+
+.region-dropdown {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+button img {
+  vertical-align: middle;
+  width: 1.35em;
+}
+
+button.selected-region {
+  display: flex;
+  justify-content: space-between;
+  color: paleturquoise;
+
+  font-weight: bold;
+  padding: 0.1em 0.5em;
+
+  &:focus {
+    background-color: #262626;
+  }
+
+  span {
+    margin-right: 10px;
+  }
+}
+
+.content {
+  position: relative;
+  margin: 0 auto;
+  font-weight: bold;
+
+  height: 100%;
+
+  text-align: center;
+}
+
+ul.options {
+  position: absolute;
+  top: 100%;
+  left: 0;
+
+  height: auto;
+
+  z-index: 100;
+  width: 100%;
+
+  font-size: 0.9em;
+}
+
+li.option {
+  input {
+    position: absolute;
+    top: 0;
+    left: 0;
+
+    -webkit-appearance: none;
+    -moz-appearance: none;
+    appearance: none;
+    border: none;
+    outline: none;
+    background: none;
+
+    &:focus + span {
+      color: $accentCol;
+      font-weight: 800;
+    }
+  }
+
+  &:last-child label {
+    border-radius: 0 0 1em 1em;
+  }
+
+  label {
+    position: relative;
+
+    display: inline-block;
+    background-color: #262626f2;
+
+    &:hover,
+    &:focus {
+      background-color: #333333f2;
+    }
+
+    padding: 0.5em 0;
+
+    width: 100%;
+
+    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>

src/components/Global/SearchBox.vue

@@ -7,39 +7,31 @@
       @keypress="updateValue"
     />
 
-    <img
-      class="search-exit"
-      :src="getIcon('exit')"
-      alt="exit-icon"
-      @click="clearValue"
-    />
+    <img class="search-exit" src="/images/icon-exit.svg" alt="exit-icon" @click="clearSearchValue" />
   </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, ref, watch } from "vue";
-import imageMixin from "../../mixins/imageMixin";
+import { defineComponent, ref, watch } from 'vue';
 
 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 = () => {
-      compSearchedValue.value = "";
-      emit("clearValue");
+    const clearSearchValue = () => {
+      compSearchedValue.value = '';
+      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 {
@@ -109,4 +101,4 @@ export default defineComponent({
     width: 1em;
   }
 }
-</style>
+</style>

src/components/Global/StationStatusBadge.vue

@@ -1,90 +1,90 @@
-<template>
-  <span class="status-badge" :class="statusID" v-if="isOnline">
-    {{ $t(`status.${statusID}`) }}
-    {{ statusID == 'online' ? timestampToString(statusTimestamp!) : '' }}
-  </span>
-
-  <span class="status-badge free" v-else>
-    {{ $t('status.free') }}
-  </span>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-import dateMixin from '../../mixins/dateMixin';
-
-export default defineComponent({
-  props: {
-    statusID: {
-      type: String,
-    },
-    statusTimestamp: {
-      type: Number,
-    },
-    isOnline: {
-      type: Boolean,
-    },
-  },
-  mixins: [dateMixin],
-});
-</script>
-
-<style lang="scss" scoped>
-$free: #8a8a8a;
-$ending: #e6c300;
-$no-limit: #117fc9;
-$unav: #ff3d5d;
-$brb: #e6a100;
-$no-space: #222;
-$online: #09a116;
-$unknown: rgb(185, 60, 60);
-
-.status-badge {
-  border-radius: 1rem;
-  font-weight: 500;
-
-  padding: 0.2em 0.55em;
-
-  background-color: $online;
-
-  &.free {
-    background-color: $free;
-    font-size: 0.95em;
-  }
-
-  &.ending {
-    background-color: $ending;
-    color: black;
-    font-size: 0.9em;
-  }
-
-  &.no-limit {
-    background-color: $no-limit;
-    font-size: 0.85em;
-  }
-
-  &.not-signed,
-  &.unavailable {
-    background-color: $unav;
-    font-size: 0.85em;
-  }
-
-  &.brb {
-    background-color: $brb;
-    color: black;
-    font-size: 0.95em;
-  }
-
-  &.no-space {
-    background-color: $no-space;
-    border: 1px solid white;
-    color: white;
-    font-size: 0.85em;
-  }
-
-  &.unknown {
-    background-color: $unknown;
-    font-size: 0.95em;
-  }
-}
-</style>
+<template>
+  <span class="status-badge" :class="statusID" v-if="isOnline">
+    {{ $t(`status.${statusID}`) }}
+    {{ statusID == 'online' ? timestampToString(statusTimestamp!) : '' }}
+  </span>
+
+  <span class="status-badge free" v-else>
+    {{ $t('status.free') }}
+  </span>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import dateMixin from '../../mixins/dateMixin';
+
+export default defineComponent({
+  props: {
+    statusID: {
+      type: String
+    },
+    statusTimestamp: {
+      type: Number
+    },
+    isOnline: {
+      type: Boolean
+    }
+  },
+  mixins: [dateMixin]
+});
+</script>
+
+<style lang="scss" scoped>
+$free: #8a8a8a;
+$ending: #e6c300;
+$no-limit: #117fc9;
+$unav: #ff3d5d;
+$brb: #e6a100;
+$no-space: #222;
+$online: #09a116;
+$unknown: rgb(185, 60, 60);
+
+.status-badge {
+  border-radius: 1rem;
+  font-weight: 500;
+
+  padding: 0.2em 0.55em;
+
+  background-color: $online;
+
+  &.free {
+    background-color: $free;
+    font-size: 0.95em;
+  }
+
+  &.ending {
+    background-color: $ending;
+    color: black;
+    font-size: 0.9em;
+  }
+
+  &.no-limit {
+    background-color: $no-limit;
+    font-size: 0.85em;
+  }
+
+  &.not-signed,
+  &.unavailable {
+    background-color: $unav;
+    font-size: 0.85em;
+  }
+
+  &.brb {
+    background-color: $brb;
+    color: black;
+    font-size: 0.95em;
+  }
+
+  &.no-space {
+    background-color: $no-space;
+    border: 1px solid white;
+    color: white;
+    font-size: 0.85em;
+  }
+
+  &.unknown {
+    background-color: $unknown;
+    font-size: 0.95em;
+  }
+}
+</style>

src/components/Global/StockList.vue

@@ -1,12 +1,17 @@
 <template>
   <div class="stock-list">
     <ul>
-      <li v-for="(stockName, i) in trainStockList">
-        <p>{{ stockName.split(':')[0].split('_').splice(0, 2).join(' ') }} {{ stockName.split(':')[1] }}</p>
+      <li v-for="(stockName, i) in trainStockList" :key="i">
+        <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>
@@ -41,21 +52,18 @@
 import { PropType, defineComponent } from 'vue';
 import { useStore } from '../../store/store';
 import { RollingStockInfo } from '../../scripts/interfaces/github_api/StockInfoGithubData';
-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 RollingStockInfo].find(
+            (v) => v[0] === stockName.split(':')[0]
+          );
         }) || 'vehicle-unknown';
 
       (event.target as HTMLImageElement).src = `/images/icon-${fallbackName}.png`;
-    },
-  },
+    }
+  }
 });
 </script>
 

src/components/Global/StopDate.vue

@@ -1,119 +1,123 @@
-<template>
-  <span class="stop-date">
-    <span
-      class="date arrival"
-      v-if="!stop.beginsHere"
-      :class="{
-        delayed: stop.arrivalDelay > 0 && (stop.confirmed || stop.stopped),
-        preponed: stop.arrivalDelay < 0 && (stop.confirmed || stop.stopped),
-        'on-time': stop.arrivalDelay == 0 && stop.confirmed,
-      }"
-    >
-      <span v-if="stop.arrivalDelay != 0 && (stop.confirmed || stop.stopped)">
-        <s>{{ timestampToString(stop.arrivalTimestamp) }}</s>
-        {{ timestampToString(stop.arrivalRealTimestamp) }}
-        ({{ stop.arrivalDelay > 0 ? '+' : '' }}{{ stop.arrivalDelay }})
-      </span>
-
-      <span v-else>
-        {{ timestampToString(stop.arrivalTimestamp) }}
-      </span>
-    </span>
-
-    <span class="date stop" v-if="stop.stopTime || stop.stopped" :class="stop.stopType.replace(', ', '-')">
-      {{ stop.stopTime }} {{ stop.stopType == '' ? 'pt' : stop.stopType }}
-    </span>
-
-    <span
-      class="date departure"
-      v-if="!stop.terminatesHere && (stop.stopTime != 0 || stop.stopped)"
-      :class="{
-        delayed: stop.departureDelay > 0 && stop.confirmed,
-        preponed: stop.departureDelay < 0 && stop.confirmed,
-      }"
-    >
-      <span v-if="stop.departureDelay != 0 && stop.confirmed">
-        <s>{{ timestampToString(stop.departureTimestamp) }}</s>
-        {{ timestampToString(stop.departureRealTimestamp) }}
-
-        ({{ stop.departureDelay > 0 ? '+' : '' }}{{ stop.departureDelay }})
-      </span>
-
-      <span v-else>
-        {{ timestampToString(stop.departureTimestamp) }}
-      </span>
-    </span>
-  </span>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-import dateMixin from '../../mixins/dateMixin';
-import TrainStop from '../../scripts/interfaces/TrainStop';
-
-export default defineComponent({
-  mixins: [dateMixin],
-
-  props: {
-    stop: {
-      type: Object as () => TrainStop,
-      required: true,
-    },
-  },
-
-  setup() {
-    return {};
-  },
-});
-</script>
-
-<style lang="scss" scoped>
-$preponedClr: lime;
-$delayedClr: salmon;
-$dateClr: #525151;
-$stopExchangeClr: #db8e29;
-$stopDefaultClr: #252525;
-
-.stop-date {
-  display: flex;
-  align-items: center;
-
-  .date {
-    background: $dateClr;
-    padding: 0.3em 0.5em;
-  }
-
-  .stop {
-    &.ph,
-    &.ph-pm,
-    &.pm {
-      background: $stopExchangeClr;
-    }
-
-    background: $stopDefaultClr;
-  }
-
-  .arrival,
-  .departure {
-    &.delayed {
-      s {
-        color: #999;
-      }
-
-      span {
-        color: $delayedClr;
-      }
-    }
-
-    &.preponed {
-      s {
-        color: #999;
-      }
-
-      span {
-        color: $preponedClr;
-      }
-    }
-  }
-}
-</style>
+<template>
+  <span class="stop-date">
+    <span
+      class="date arrival"
+      v-if="!stop.beginsHere"
+      :class="{
+        delayed: stop.arrivalDelay > 0 && (stop.confirmed || stop.stopped),
+        preponed: stop.arrivalDelay < 0 && (stop.confirmed || stop.stopped),
+        'on-time': stop.arrivalDelay == 0 && stop.confirmed
+      }"
+    >
+      <span v-if="stop.arrivalDelay != 0 && (stop.confirmed || stop.stopped)">
+        <s>{{ timestampToString(stop.arrivalTimestamp) }}</s>
+        {{ timestampToString(stop.arrivalRealTimestamp) }}
+        ({{ stop.arrivalDelay > 0 ? '+' : '' }}{{ stop.arrivalDelay }})
+      </span>
+
+      <span v-else>
+        {{ timestampToString(stop.arrivalTimestamp) }}
+      </span>
+    </span>
+
+    <span
+      class="date stop"
+      v-if="stop.stopTime || stop.stopped"
+      :class="stop.stopType.replace(', ', '-')"
+    >
+      {{ stop.stopTime }} {{ stop.stopType == '' ? 'pt' : stop.stopType }}
+    </span>
+
+    <span
+      class="date departure"
+      v-if="!stop.terminatesHere && (stop.stopTime != 0 || stop.stopped)"
+      :class="{
+        delayed: stop.departureDelay > 0 && stop.confirmed,
+        preponed: stop.departureDelay < 0 && stop.confirmed
+      }"
+    >
+      <span v-if="stop.departureDelay != 0 && stop.confirmed">
+        <s>{{ timestampToString(stop.departureTimestamp) }}</s>
+        {{ timestampToString(stop.departureRealTimestamp) }}
+
+        ({{ stop.departureDelay > 0 ? '+' : '' }}{{ stop.departureDelay }})
+      </span>
+
+      <span v-else>
+        {{ timestampToString(stop.departureTimestamp) }}
+      </span>
+    </span>
+  </span>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import dateMixin from '../../mixins/dateMixin';
+import TrainStop from '../../scripts/interfaces/TrainStop';
+
+export default defineComponent({
+  mixins: [dateMixin],
+
+  props: {
+    stop: {
+      type: Object as () => TrainStop,
+      required: true
+    }
+  },
+
+  setup() {
+    return {};
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+$preponedClr: lime;
+$delayedClr: salmon;
+$dateClr: #525151;
+$stopExchangeClr: #db8e29;
+$stopDefaultClr: #252525;
+
+.stop-date {
+  display: flex;
+  align-items: center;
+
+  .date {
+    background: $dateClr;
+    padding: 0.3em 0.5em;
+  }
+
+  .stop {
+    &.ph,
+    &.ph-pm,
+    &.pm {
+      background: $stopExchangeClr;
+    }
+
+    background: $stopDefaultClr;
+  }
+
+  .arrival,
+  .departure {
+    &.delayed {
+      s {
+        color: #999;
+      }
+
+      span {
+        color: $delayedClr;
+      }
+    }
+
+    &.preponed {
+      s {
+        color: #999;
+      }
+
+      span {
+        color: $preponedClr;
+      }
+    }
+  }
+}
+</style>

src/components/Global/TrainModal.vue

@@ -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,7 +14,6 @@
 
 <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';
@@ -23,11 +22,11 @@ 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
     };
   },
 
@@ -35,7 +34,7 @@ export default defineComponent({
     const store = useStore();
 
     return {
-      store,
+      store
     };
   },
 
@@ -49,12 +48,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 +145,6 @@ export default defineComponent({
 }
 
 @include smallScreen {
-
   .modal_content {
     max-height: 85vh;
   }

src/components/Global/TrainThumbnail.vue

@@ -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,7 +16,6 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-import imageMixin from '../../mixins/imageMixin';
 import { useStore } from '../../store/store';
 import { RollingStockInfo } from '../../scripts/interfaces/github_api/StockInfoGithubData';
 
@@ -22,20 +23,20 @@ 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 RollingStockInfo].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>
 

src/components/JournalView/DailyStats.vue

@@ -54,42 +54,42 @@
           </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}`">
-                <b>{{ firstPlaceDispatchers[0].name }}</b>
+              <router-link :to="`/journal/dispatchers?dispatcherName=${topDispatchers[0].name}`">
+                <b>{{ topDispatchers[0].name }}</b>
               </router-link>
             </template>
             <template #count>
               <b class="text--primary">
-                {{ firstPlaceDispatchers[0].count }}
-                {{ $t('journal.timetable-count', firstPlaceDispatchers[0].count) }}
+                {{ topDispatchers[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-if="i == firstPlaceDispatchers.length - 1"> {{ $t('general.and') }} </span>
+              <span v-for="(disp, i) in topDispatchers" :key="i">
+                <span v-if="i == topDispatchers.length - 1"> {{ $t('general.and') }} </span>
 
                 <router-link :to="`/journal/dispatchers?dispatcherName=${disp.name}`">
                   <b>{{ disp.name }}</b>
                 </router-link>
 
-                <span v-if="i < firstPlaceDispatchers.length - 2">, </span>
+                <span v-if="i < topDispatchers.length - 2">, </span>
               </span>
             </template>
 
             <template #count>
               <b class="text--primary">
-                {{ firstPlaceDispatchers[0].count }}
-                {{ $t('journal.timetable-count', firstPlaceDispatchers[0].count) }}
+                {{ topDispatchers[0].count }}
+                {{ $t('journal.timetable-count', topDispatchers[0].count) }}
               </b>
             </template>
           </i18n-t>
@@ -99,7 +99,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>
@@ -133,7 +135,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 {
+  ITimetablesDailyStats,
+  ITimetablesDailyStatsResponse
+} from '../../scripts/interfaces/api/StatsAPIData';
 import { URLs } from '../../scripts/utils/apiURLs';
 
 export default defineComponent({
@@ -156,8 +161,8 @@ export default defineComponent({
         timetableRouteDistance: 0,
         longestDuties: [],
         mostActiveDrivers: [],
-        mostActiveDispatchers: [],
-      } as ITimetablesDailyStats,
+        mostActiveDispatchers: []
+      } as ITimetablesDailyStats
     };
   },
 
@@ -171,12 +176,12 @@ 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: {
@@ -197,7 +202,7 @@ export default defineComponent({
 
           mostActiveDispatchers: res.mostActiveDispatchers,
           mostActiveDrivers: res.mostActiveDrivers,
-          longestDuties: res.longestDuties,
+          longestDuties: res.longestDuties
         };
 
         this.statsStatus = DataStatus.Loaded;
@@ -218,8 +223,8 @@ export default defineComponent({
     stopFetchingDailyStats() {
       clearInterval(this.intervalId);
       this.intervalId = -1;
-    },
-  },
+    }
+  }
 });
 </script>
 
@@ -238,13 +243,8 @@ export default defineComponent({
 }
 
 @include smallScreen {
-  .daily-stats {
-    text-align: justify;
-  }
-
   h3 {
     text-align: center;
   }
 }
 </style>
-

src/components/JournalView/DispatcherStats.vue

@@ -14,7 +14,7 @@
 
         <div v-else>
           <h3>STATYSTYKI WYSTAWIONYCH ROZKŁADÓW</h3>
-          
+
           <div class="info-stats" v-if="store.dispatcherStatsData._count._all">
             <span class="stat-badge">
               <span>LICZBA</span>
@@ -36,8 +36,9 @@
 
           <h3>OSTATNIE WYSTAWIONE ROZKŁADY</h3>
           <div class="last-timetables">
-            <div class="timetable-row" v-for="timetable in timetables">
-              #{{ timetable.timetableId }} | <b>{{ timetable.trainCategoryCode }} {{ timetable.trainNo }}</b> |
+            <div class="timetable-row" v-for="timetable in timetables" :key="timetable.id">
+              #{{ timetable.timetableId }} |
+              <b>{{ timetable.trainCategoryCode }} {{ timetable.trainNo }}</b> |
               {{ timetable.driverName }} ({{ timetable.routeDistance }}km)
               <div>{{ timetable.route.replace('|', ' > ') }}</div>
             </div>
@@ -49,9 +50,8 @@
 </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';
@@ -64,15 +64,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,
-      statsData2,
+      store
     };
   },
 
@@ -80,7 +73,7 @@ export default defineComponent({
     return {
       cardVisible: false,
       lastDispatcherName: '',
-      timetables: [] as TimetableHistory[],
+      timetables: [] as TimetableHistory[]
     };
   },
 
@@ -98,18 +91,22 @@ export default defineComponent({
       }
 
       const statsData: DispatcherStatsAPIData = 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 (
-        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 +160,7 @@ h3 {
   text-align: center;
 }
 
-
 .last-timetables {
   overflow-y: auto;
 }
-
-
-
 </style>

src/components/JournalView/JournalDispatchersList.vue

@@ -1,241 +1,253 @@
-<template>
-  <div>
-    <transition name="status-anim" mode="out-in">
-      <div :key="dataStatus">
-        <div class="journal_warning" v-if="store.isOffline">
-          {{ $t('app.offline') }}
-        </div>
-
-        <Loading v-else-if="dataStatus == DataStatus.Loading" />
-
-        <div v-else-if="dataStatus == DataStatus.Error" class="journal_warning error">
-          {{ $t('app.error') }}
-        </div>
-
-        <div class="journal_warning" v-else-if="dispatcherHistory.length == 0">
-          {{ $t('app.no-result') }}
-        </div>
-
-        <div v-else>
-          <table class="scenery-history-table">
-            <thead>
-              <th>{{ $t('journal.history-name') }}</th>
-              <th>{{ $t('journal.history-hash') }}</th>
-              <th>{{ $t('journal.history-dispatcher') }}</th>
-              <th>{{ $t('journal.history-level') }}</th>
-              <th>{{ $t('journal.history-rate') }}</th>
-              <th>{{ $t('journal.history-region') }}</th>
-              <th>{{ $t('journal.history-date') }}</th>
-            </thead>
-
-            <tbody>
-              <transition-group name="list-anim">
-                <tr v-for="historyItem in dispatcherHistory" :key="historyItem.id">
-                  <td>
-                    <router-link :to="`/journal/dispatchers?sceneryName=${historyItem.stationName}`">
-                      <b>{{ historyItem.stationName }}</b>
-                    </router-link>
-                  </td>
-                  <td>#{{ historyItem.stationHash }}</td>
-                  <td>
-                    <router-link :to="`/journal/dispatchers?dispatcherName=${historyItem.dispatcherName}`">
-                      <b>{{ historyItem.dispatcherName }}</b>
-                    </router-link>
-                  </td>
-                  <td>
-                    <b
-                      v-if="historyItem.dispatcherLevel !== null"
-                      class="level-badge dispatcher"
-                      :style="calculateExpStyle(historyItem.dispatcherLevel, historyItem.dispatcherIsSupporter)"
-                    >
-                      {{ historyItem.dispatcherLevel >= 2 ? historyItem.dispatcherLevel : 'L' }}
-                    </b>
-                  </td>
-                  <td class="text--primary">
-                    <b>{{ historyItem.dispatcherRate }}</b>
-                  </td>
-                  <td>
-                    <b class="region-badge" :aria-describedby="historyItem.region">{{
-                      regions.find((r) => r.id == historyItem.region)?.value || '???'
-                    }}</b>
-                  </td>
-                  <td style="min-width: 200px" class="time">
-                    <span v-if="historyItem.timestampTo" class="text--offline">
-                      <b>{{ $d(historyItem.timestampFrom) }}</b>
-                      {{ timestampToString(historyItem.timestampFrom) }}
-                      - {{ timestampToString(historyItem.timestampTo) }} ({{
-                        calculateDuration(historyItem.currentDuration)
-                      }})
-                    </span>
-                    <span class="dispatcher-online" v-else>
-                      <b class="text--online">
-                        <router-link :to="`/scenery?station=${historyItem.stationName}`">{{
-                          $t('journal.online-since')
-                        }}</router-link>
-                        {{ timestampToString(historyItem.timestampFrom) }}
-                      </b>
-                      ({{ calculateDuration(historyItem.currentDuration) }})
-                    </span>
-                  </td>
-                </tr>
-              </transition-group>
-            </tbody>
-          </table>
-
-          <AddDataButton
-            :list="dispatcherHistory"
-            :scrollDataLoaded="scrollDataLoaded"
-            :scrollNoMoreData="scrollNoMoreData"
-            @addHistoryData="addHistoryData"
-          />
-        </div>
-      </div>
-    </transition>
-
-    <div class="journal_warning" v-if="scrollNoMoreData">
-      {{ $t('journal.no-further-data') }}
-    </div>
-
-    <div class="journal_warning" v-else-if="!scrollDataLoaded">
-      {{ $t('journal.loading-further-data') }}
-    </div>
-  </div>
-</template>
-
-<script lang="ts">
-import { defineComponent, PropType } from 'vue';
-import dateMixin from '../../mixins/dateMixin';
-import { DispatcherHistory } from '../../scripts/interfaces/api/DispatchersAPIData';
-import styleMixin from '../../mixins/styleMixin';
-import imageMixin from '../../mixins/imageMixin';
-import { DataStatus } from '../../scripts/enums/DataStatus';
-import { useStore } from '../../store/store';
-import Loading from '../Global/Loading.vue';
-import { regions } from '../../data/options.json';
-import AddDataButton from '../Global/AddDataButton.vue';
-
-export default defineComponent({
-  components: { Loading, AddDataButton },
-
-  mixins: [dateMixin, styleMixin, imageMixin],
-
-  props: {
-    dispatcherHistory: {
-      type: Array as PropType<DispatcherHistory[]>,
-      required: true,
-    },
-    scrollNoMoreData: {
-      type: Boolean,
-    },
-    scrollDataLoaded: {
-      type: Boolean,
-    },
-    addHistoryData: {
-      type: Function as PropType<() => void>,
-    },
-    dataStatus: {
-      type: Number as PropType<DataStatus>,
-    },
-  },
-
-  data() {
-    return {
-      DataStatus,
-      store: useStore(),
-      regions,
-    };
-  },
-
-  computed: {
-    computedDispatcherHistory() {
-      console.log(this.dispatcherHistory.length);
-
-      return this.dispatcherHistory.reduce((acc, historyItem, i) => {
-        if (this.isAnotherDay(i - 1, i)) acc.push(new Date(historyItem.timestampFrom).toLocaleDateString('pl-PL'));
-        acc.push(historyItem);
-
-        return acc;
-      }, [] as (DispatcherHistory | string)[]);
-    },
-  },
-
-  methods: {
-    navigateToScenery(name: string, isOnline: boolean) {
-      if (!isOnline) return;
-
-      this.$router.push(`/scenery?station=${name.trim().replace(/ /g, '_')}`);
-    },
-
-    isAnotherDay(prevIndex: number, currIndex: number) {
-      if (currIndex == 0) return true;
-
-      return (
-        new Date(this.dispatcherHistory[prevIndex].timestampFrom).getDate() !=
-        new Date(this.dispatcherHistory[currIndex].timestampFrom).getDate()
-      );
-    },
-  },
-});
-</script>
-
-<style lang="scss" scoped>
-@import '../../styles/animations.scss';
-@import '../../styles/responsive.scss';
-@import '../../styles/badge.scss';
-@import '../../styles/variables.scss';
-@import '../../styles/JournalSection.scss';
-
-table.scenery-history-table {
-  --_bg-table: #111;
-  --_bg-head: #101010;
-  --_bg-row: #2f2f2f;
-
-  width: 100%;
-  border-collapse: collapse;
-  position: relative;
-  text-align: center;
-
-  margin-bottom: 1em;
-
-  thead {
-    position: sticky;
-    top: 0;
-    background-color: var(--_bg-head);
-  }
-
-  th {
-    padding: 0.5em;
-  }
-
-  tr {
-    background-color: var(--_bg-row);
-    border-bottom: 2px solid black;
-
-    &:last-child {
-      border: none;
-    }
-  }
-
-  td {
-    padding: 0.75em;
-
-    .level-badge {
-      margin: 0 auto;
-    }
-  }
-
-  @media screen and (max-width: 550px) {
-    font-size: 0.9em;
-  }
-}
-
-.text {
-  &--online {
-    color: springgreen;
-  }
-
-  &--offline {
-    color: #ddd;
-  }
-}
-</style>
+<template>
+  <div>
+    <transition name="status-anim" mode="out-in">
+      <div :key="dataStatus">
+        <div class="journal_warning" v-if="store.isOffline">
+          {{ $t('app.offline') }}
+        </div>
+
+        <Loading v-else-if="dataStatus == DataStatus.Loading" />
+
+        <div v-else-if="dataStatus == DataStatus.Error" class="journal_warning error">
+          {{ $t('app.error') }}
+        </div>
+
+        <div class="journal_warning" v-else-if="dispatcherHistory.length == 0">
+          {{ $t('app.no-result') }}
+        </div>
+
+        <div v-else>
+          <table class="scenery-history-table">
+            <thead>
+              <th>{{ $t('journal.history-name') }}</th>
+              <th>{{ $t('journal.history-hash') }}</th>
+              <th>{{ $t('journal.history-dispatcher') }}</th>
+              <th>{{ $t('journal.history-level') }}</th>
+              <th>{{ $t('journal.history-rate') }}</th>
+              <th>{{ $t('journal.history-region') }}</th>
+              <th>{{ $t('journal.history-date') }}</th>
+            </thead>
+
+            <tbody>
+              <transition-group name="list-anim">
+                <tr v-for="historyItem in dispatcherHistory" :key="historyItem.id">
+                  <td>
+                    <router-link
+                      :to="`/journal/dispatchers?sceneryName=${historyItem.stationName}`"
+                    >
+                      <b>{{ historyItem.stationName }}</b>
+                    </router-link>
+                  </td>
+                  <td>#{{ historyItem.stationHash }}</td>
+                  <td>
+                    <router-link
+                      :to="`/journal/dispatchers?dispatcherName=${historyItem.dispatcherName}`"
+                    >
+                      <b>{{ historyItem.dispatcherName }}</b>
+                    </router-link>
+                  </td>
+                  <td>
+                    <b
+                      v-if="historyItem.dispatcherLevel !== null"
+                      class="level-badge dispatcher"
+                      :style="
+                        calculateExpStyle(
+                          historyItem.dispatcherLevel,
+                          historyItem.dispatcherIsSupporter
+                        )
+                      "
+                    >
+                      {{ historyItem.dispatcherLevel >= 2 ? historyItem.dispatcherLevel : 'L' }}
+                    </b>
+                  </td>
+                  <td class="text--primary">
+                    <b>{{ historyItem.dispatcherRate }}</b>
+                  </td>
+                  <td>
+                    <b class="region-badge" :aria-describedby="historyItem.region">{{
+                      regions.find((r) => r.id == historyItem.region)?.value || '???'
+                    }}</b>
+                  </td>
+                  <td style="min-width: 200px" class="time">
+                    <span v-if="historyItem.timestampTo" class="text--offline">
+                      <b>{{ $d(historyItem.timestampFrom) }}</b>
+                      {{ timestampToString(historyItem.timestampFrom) }}
+                      - {{ timestampToString(historyItem.timestampTo) }} ({{
+                        calculateDuration(historyItem.currentDuration)
+                      }})
+                    </span>
+                    <span class="dispatcher-online" v-else>
+                      <b class="text--online">
+                        <router-link :to="`/scenery?station=${historyItem.stationName}`">{{
+                          $t('journal.online-since')
+                        }}</router-link>
+                        {{ timestampToString(historyItem.timestampFrom) }}
+                      </b>
+                      ({{ calculateDuration(historyItem.currentDuration) }})
+                    </span>
+                  </td>
+                </tr>
+              </transition-group>
+            </tbody>
+          </table>
+
+          <AddDataButton
+            :list="dispatcherHistory"
+            :scrollDataLoaded="scrollDataLoaded"
+            :scrollNoMoreData="scrollNoMoreData"
+            @addHistoryData="addHistoryData"
+          />
+        </div>
+      </div>
+    </transition>
+
+    <div class="journal_warning" v-if="scrollNoMoreData">
+      {{ $t('journal.no-further-data') }}
+    </div>
+
+    <div class="journal_warning" v-else-if="!scrollDataLoaded">
+      {{ $t('journal.loading-further-data') }}
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent, PropType } from 'vue';
+import dateMixin from '../../mixins/dateMixin';
+import { DispatcherHistory } from '../../scripts/interfaces/api/DispatchersAPIData';
+import styleMixin from '../../mixins/styleMixin';
+import { DataStatus } from '../../scripts/enums/DataStatus';
+import { useStore } from '../../store/store';
+import Loading from '../Global/Loading.vue';
+import { regions } from '../../data/options.json';
+import AddDataButton from '../Global/AddDataButton.vue';
+
+export default defineComponent({
+  components: { Loading, AddDataButton },
+
+  mixins: [dateMixin, styleMixin],
+
+  props: {
+    dispatcherHistory: {
+      type: Array as PropType<DispatcherHistory[]>,
+      required: true
+    },
+    scrollNoMoreData: {
+      type: Boolean
+    },
+    scrollDataLoaded: {
+      type: Boolean
+    },
+    addHistoryData: {
+      type: Function as PropType<() => void>
+    },
+    dataStatus: {
+      type: Number as PropType<DataStatus>
+    }
+  },
+
+  data() {
+    return {
+      DataStatus,
+      store: useStore(),
+      regions
+    };
+  },
+
+  computed: {
+    computedDispatcherHistory() {
+      console.log(this.dispatcherHistory.length);
+
+      return this.dispatcherHistory.reduce(
+        (acc, historyItem, i) => {
+          if (this.isAnotherDay(i - 1, i))
+            acc.push(new Date(historyItem.timestampFrom).toLocaleDateString('pl-PL'));
+          acc.push(historyItem);
+
+          return acc;
+        },
+        [] as (DispatcherHistory | string)[]
+      );
+    }
+  },
+
+  methods: {
+    navigateToScenery(name: string, isOnline: boolean) {
+      if (!isOnline) return;
+
+      this.$router.push(`/scenery?station=${name.trim().replace(/ /g, '_')}`);
+    },
+
+    isAnotherDay(prevIndex: number, currIndex: number) {
+      if (currIndex == 0) return true;
+
+      return (
+        new Date(this.dispatcherHistory[prevIndex].timestampFrom).getDate() !=
+        new Date(this.dispatcherHistory[currIndex].timestampFrom).getDate()
+      );
+    }
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+@import '../../styles/animations.scss';
+@import '../../styles/responsive.scss';
+@import '../../styles/badge.scss';
+@import '../../styles/variables.scss';
+@import '../../styles/JournalSection.scss';
+
+table.scenery-history-table {
+  --_bg-table: #111;
+  --_bg-head: #101010;
+  --_bg-row: #2f2f2f;
+
+  width: 100%;
+  border-collapse: collapse;
+  position: relative;
+  text-align: center;
+
+  margin-bottom: 1em;
+
+  thead {
+    position: sticky;
+    top: 0;
+    background-color: var(--_bg-head);
+  }
+
+  th {
+    padding: 0.5em;
+  }
+
+  tr {
+    background-color: var(--_bg-row);
+    border-bottom: 2px solid black;
+
+    &:last-child {
+      border: none;
+    }
+  }
+
+  td {
+    padding: 0.75em;
+
+    .level-badge {
+      margin: 0 auto;
+    }
+  }
+
+  @media screen and (max-width: 550px) {
+    font-size: 0.9em;
+  }
+}
+
+.text {
+  &--online {
+    color: springgreen;
+  }
+
+  &--offline {
+    color: #ddd;
+  }
+}
+</style>

src/components/JournalView/JournalDriverStats.vue

@@ -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,7 +43,9 @@
       </div>
     </span>
 
-    <b v-else-if="store.driverStatsStatus == DataStatus.Loading">{{ $t('journal.stats-loading') }}</b>
+    <b v-else-if="store.driverStatsStatus == DataStatus.Loading">{{
+      $t('journal.stats-loading')
+    }}</b>
     <b v-else-if="store.driverStatsStatus == DataStatus.Error">
       {{ $t('journal.stats-error ') }}
     </b>
@@ -56,9 +62,9 @@ export default defineComponent({
   data() {
     return {
       store: useStore(),
-      DataStatus,
+      DataStatus
     };
-  },
+  }
 });
 </script>
 

src/components/JournalView/JournalOptions.vue

@@ -1,300 +1,306 @@
-<template>
-  <div class="filters-options" @keydown.esc="showOptions = false">
-    <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">
-        <img :src="getIcon('filter2')" 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" />
-        {{ $t('general.refresh') }}
-      </button>
-    </div>
-
-    <datalist id="search-driver">
-      <option v-for="sugg in driverSuggestions" :value="sugg"></option>
-    </datalist>
-
-    <datalist id="search-dispatcher">
-      <option v-for="sugg in dispatcherSuggestions" :value="sugg"></option>
-    </datalist>
-
-    <transition name="options-anim">
-      <div class="options_wrapper" v-if="showOptions">
-        <div class="options_content">
-          <h1 class="option-title">{{ $t('options.search-title') }}</h1>
-          <div class="search_content">
-            <div class="search" v-for="(_, propName) in searchersValues" :key="propName">
-              <label v-if="propName == 'search-date'" for="date">{{ $t(`options.search-${optionsType}-date`) }}</label>
-
-              <div class="search-box">
-                <input
-                  class="search-input"
-                  v-model="searchersValues[propName]"
-                  @keydown.enter="onSearchConfirm"
-                  @focus="preventKeyDown = true"
-                  @blur="preventKeyDown = false"
-                  :placeholder="$t(`options.${propName}`)"
-                  :type="propName == 'search-date' ? 'date' : 'text'"
-                  :min="propName == 'search-date' ? '2022-02-01' : undefined"
-                  :list="propName.toString()"
-                />
-
-                <button class="search-exit" v-if="propName != 'search-date'">
-                  <img :src="getIcon('exit')" alt="exit-icon" @click="onInputClear(propName)" />
-                </button>
-              </div>
-            </div>
-          </div>
-
-          <h1 class="option-title">{{ $t('options.sort-title') }}</h1>
-          <div class="options_sorters">
-            <div v-for="opt in translatedSorterOptions">
-              <button
-                class="sort-option btn--option"
-                :data-selected="opt.id == sorterActive.id"
-                @click="onSorterChange(opt)"
-              >
-                {{ opt.value.toUpperCase() }}
-              </button>
-            </div>
-          </div>
-
-          <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">
-              <p>{{ $t(`options.filter-section-${section}`) }}</p>
-
-              <div class="options_filters">
-                <button
-                  v-for="filter in filterList.filter((f) => f.filterSection == section)"
-                  class="filter-option btn--option"
-                  :class="{ checked: filter.isActive }"
-                  :id="filter.id"
-                  @click="onFilterChange(filter)"
-                >
-                  {{ $t(`options.filter-${filter.id}`) }}
-                </button>
-              </div>
-            </section>
-          </div>
-
-          <div class="options_actions">
-            <button class="btn--action" @click="onResetButtonClick">
-              {{ $t('options.reset-button') }}
-            </button>
-            <button class="btn--action" @click="onSearchButtonConfirm">
-              {{ $t('options.search-button') }}
-            </button>
-          </div>
-        </div>
-      </div>
-    </transition>
-  </div>
-</template>
-
-<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 ActionButton from '../Global/ActionButton.vue';
-import SelectBox from '../Global/SelectBox.vue';
-import { JournalFilterSection } from '../../scripts/enums/JournalFilterType';
-import { JournalFilter } from '../../scripts/types/JournalTimetablesTypes';
-
-export default defineComponent({
-  components: { SelectBox, ActionButton },
-  emits: ['onSearchConfirm', 'onOptionsReset', 'onRefreshData'],
-  mixins: [imageMixin, keyMixin],
-
-  props: {
-    sorterOptionIds: {
-      type: Array as PropType<Array<string>>,
-      required: true,
-    },
-
-    filters: {
-      type: Array as PropType<JournalFilter[]>,
-      default: [],
-    },
-
-    dataStatus: {
-      type: Number as PropType<DataStatus>,
-      default: DataStatus.Initialized,
-    },
-
-    currentOptionsActive: {
-      type: Boolean,
-      default: false,
-    },
-
-    optionsType: {
-      type: String,
-      required: true,
-    },
-  },
-
-  data() {
-    return {
-      showOptions: false,
-      JournalFilterSection,
-
-      driverSuggestions: [] as string[],
-      dispatcherSuggestions: [] as string[],
-
-      searchTimeout: 0,
-      store: useStore(),
-
-      DataStatus,
-    };
-  },
-
-  setup() {
-    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 JournalFilter[] | undefined,
-    };
-  },
-
-  computed: {
-    driverStatsName() {
-      return this.store.driverStatsName;
-    },
-
-    translatedSorterOptions() {
-      return this.$props.sorterOptionIds.map((id) => ({
-        id,
-        value: this.$t(`options.sort-${id}`),
-      }));
-    },
-  },
-
-  watch: {
-    async driverStatsName(value: string) {
-      await this.fetchDriverStats();
-
-      // if (value) this.store.currentStatsTab = 'driver';
-    },
-
-    async 'searchersValues.search-driver'(value: string | undefined) {
-      clearTimeout(this.searchTimeout);
-
-      if (!value || value == '') return;
-      if (value.length < 3) return;
-
-      this.startSearchTimeout('driver', value);
-    },
-
-    async 'searchersValues.search-dispatcher'(value: string | undefined) {
-      if (!value || value == '') return;
-      if (value.length < 3) return;
-
-      this.startSearchTimeout('dispatcher', value);
-    },
-  },
-
-  methods: {
-    async fetchDriverStats() {
-      this.store.driverStatsData = undefined;
-
-      if (!this.store.driverStatsName) {
-        this.store.driverStatsStatus = DataStatus.Initialized;
-        return;
-      }
-
-      try {
-        this.store.driverStatsStatus = DataStatus.Loading;
-
-        const statsData: DriverStatsAPIData = await (
-          await axios.get(`${URLs.stacjownikAPI}/api/getDriverInfo?name=${this.store.driverStatsName}`)
-        ).data;
-
-        this.store.driverStatsData = statsData;
-        this.store.driverStatsStatus = DataStatus.Loaded;
-      } catch (error) {
-        this.store.driverStatsStatus = DataStatus.Error;
-        console.error('Ups! Wystąpił błąd przy próbie pobrania statystyk maszynisty! :/');
-      }
-    },
-
-    refreshData() {
-      this.$emit('onRefreshData');
-    },
-
-    startSearchTimeout(type: 'driver' | 'dispatcher', value: string) {
-      if (this[`${type}Suggestions`].includes(value)) return;
-
-      window.clearTimeout(this.searchTimeout);
-
-      this.searchTimeout = setTimeout(async () => {
-        try {
-          const suggestions: string[] = await (
-            await axios.get(`${URLs.stacjownikAPI}/api/get${type}Suggestions?name=${value}`)
-          ).data;
-
-          this[`${type}Suggestions`] = suggestions;
-        } catch (error) {
-          this[`${type}Suggestions`] = [];
-        }
-      }, 450);
-    },
-
-    // Override keyMixin function
-    onKeyDownFunction() {
-      this.showOptions = !this.showOptions;
-
-      this.$nextTick(() => {
-        if (this.showOptions) (this.$refs['button'] as HTMLButtonElement)?.focus();
-      });
-    },
-
-    onSorterChange(item: { id: string | number; value: string }) {
-      this.sorterActive.id = item.id;
-      this.sorterActive.dir = -1;
-      this.$emit('onSearchConfirm');
-    },
-
-    onFilterChange(filter: JournalFilter) {
-      // this.journalFilterActive = filter;
-      this.filterList?.filter((f) => f.filterSection === filter.filterSection).forEach((f) => (f.isActive = false));
-      filter.isActive = true;
-
-      this.$emit('onSearchConfirm');
-    },
-
-    onInputClear(id: any) {
-      this.searchersValues[id] = '';
-      this.$emit('onSearchConfirm');
-    },
-
-    onSearchConfirm() {
-      this.$emit('onSearchConfirm');
-    },
-
-    onSearchButtonConfirm() {
-      this.showOptions = false;
-      this.$emit('onSearchConfirm');
-    },
-
-    onResetButtonClick() {
-      this.$emit('onOptionsReset');
-    },
-  },
-});
-</script>
-
-<style lang="scss" scoped>
-@import '../../styles/filters_options.scss';
-</style>
+<template>
+  <div class="filters-options" @keydown.esc="showOptions = false">
+    <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"
+      >
+        <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="/images/icon-refresh.svg" alt="Refresh data" />
+        {{ $t('general.refresh') }}
+      </button>
+    </div>
+
+    <datalist id="search-driver">
+      <option v-for="(sugg, i) in driverSuggestions" :key="i" :value="sugg"></option>
+    </datalist>
+
+    <datalist id="search-dispatcher">
+      <option v-for="(sugg, i) in dispatcherSuggestions" :key="i" :value="sugg"></option>
+    </datalist>
+
+    <transition name="options-anim">
+      <div class="options_wrapper" v-if="showOptions">
+        <div class="options_content">
+          <h1 class="option-title">{{ $t('options.search-title') }}</h1>
+          <div class="search_content">
+            <div class="search" v-for="(_, propName) in searchersValues" :key="propName">
+              <label v-if="propName == 'search-date'" for="date">{{
+                $t(`options.search-${optionsType}-date`)
+              }}</label>
+
+              <div class="search-box">
+                <input
+                  class="search-input"
+                  v-model="searchersValues[propName]"
+                  @keydown.enter="onSearchConfirm"
+                  @focus="preventKeyDown = true"
+                  @blur="preventKeyDown = false"
+                  :placeholder="$t(`options.${propName}`)"
+                  :type="propName == 'search-date' ? 'date' : 'text'"
+                  :min="propName == 'search-date' ? '2022-02-01' : undefined"
+                  :list="propName.toString()"
+                />
+
+                <button class="search-exit" v-if="propName != 'search-date'">
+                  <img
+                    src="/images/icon-exit.svg"
+                    alt="exit-icon"
+                    @click="onInputClear(propName)"
+                  />
+                </button>
+              </div>
+            </div>
+          </div>
+
+          <h1 class="option-title">{{ $t('options.sort-title') }}</h1>
+          <div class="options_sorters">
+            <div v-for="opt in translatedSorterOptions" :key="opt.id">
+              <button
+                class="sort-option btn--option"
+                :data-selected="opt.id == sorterActive.id"
+                @click="onSorterChange(opt)"
+              >
+                {{ opt.value.toUpperCase() }}
+              </button>
+            </div>
+          </div>
+
+          <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" :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"
+                  @click="onFilterChange(filter)"
+                >
+                  {{ $t(`options.filter-${filter.id}`) }}
+                </button>
+              </div>
+            </section>
+          </div>
+
+          <div class="options_actions">
+            <button class="btn--action" @click="onResetButtonClick">
+              {{ $t('options.reset-button') }}
+            </button>
+            <button class="btn--action" @click="onSearchButtonConfirm">
+              {{ $t('options.search-button') }}
+            </button>
+          </div>
+        </div>
+      </div>
+    </transition>
+  </div>
+</template>
+
+<script lang="ts">
+import axios from 'axios';
+import { defineComponent, inject, PropType } from 'vue';
+import keyMixin from '../../mixins/keyMixin';
+import { DataStatus } from '../../scripts/enums/DataStatus';
+import { DriverStatsAPIData } from '../../scripts/interfaces/api/DriverStatsAPIData';
+import { URLs } from '../../scripts/utils/apiURLs';
+import { useStore } from '../../store/store';
+import { JournalFilterSection } from '../../scripts/enums/JournalFilterType';
+import { JournalFilter } from '../../scripts/types/JournalTimetablesTypes';
+
+export default defineComponent({
+  emits: ['onSearchConfirm', 'onOptionsReset', 'onRefreshData'],
+  mixins: [keyMixin],
+
+  props: {
+    sorterOptionIds: {
+      type: Array as PropType<Array<string>>,
+      required: true
+    },
+
+    filters: {
+      type: Array as PropType<JournalFilter[]>,
+      default: () => []
+    },
+
+    dataStatus: {
+      type: Number as PropType<DataStatus>,
+      default: DataStatus.Initialized
+    },
+
+    currentOptionsActive: {
+      type: Boolean,
+      default: false
+    },
+
+    optionsType: {
+      type: String,
+      required: true
+    }
+  },
+
+  data() {
+    return {
+      showOptions: false,
+      JournalFilterSection,
+
+      driverSuggestions: [] as string[],
+      dispatcherSuggestions: [] as string[],
+
+      searchTimeout: 0,
+      store: useStore(),
+
+      DataStatus
+    };
+  },
+
+  setup() {
+    return {
+      searchersValues: inject('searchersValues') as { [key: string]: string },
+      sorterActive: inject('sorterActive') as { id: string | number; dir: number },
+      filterList: inject('filterList') as JournalFilter[] | undefined
+    };
+  },
+
+  computed: {
+    translatedSorterOptions() {
+      return this.$props.sorterOptionIds.map((id) => ({
+        id,
+        value: this.$t(`options.sort-${id}`)
+      }));
+    }
+  },
+
+  watch: {
+    async 'store.driverStatsName'() {
+      await this.fetchDriverStats();
+
+      // if (value) this.store.currentStatsTab = 'driver';
+    },
+
+    async 'searchersValues.search-driver'(value: string | undefined) {
+      clearTimeout(this.searchTimeout);
+
+      if (!value || value == '') return;
+      if (value.length < 3) return;
+
+      this.startSearchTimeout('driver', value);
+    },
+
+    async 'searchersValues.search-dispatcher'(value: string | undefined) {
+      if (!value || value == '') return;
+      if (value.length < 3) return;
+
+      this.startSearchTimeout('dispatcher', value);
+    }
+  },
+
+  methods: {
+    async fetchDriverStats() {
+      this.store.driverStatsData = undefined;
+
+      if (!this.store.driverStatsName) {
+        this.store.driverStatsStatus = DataStatus.Initialized;
+        return;
+      }
+
+      try {
+        this.store.driverStatsStatus = DataStatus.Loading;
+
+        const statsData: DriverStatsAPIData = await (
+          await axios.get(
+            `${URLs.stacjownikAPI}/api/getDriverInfo?name=${this.store.driverStatsName}`
+          )
+        ).data;
+
+        this.store.driverStatsData = statsData;
+        this.store.driverStatsStatus = DataStatus.Loaded;
+      } catch (error) {
+        this.store.driverStatsStatus = DataStatus.Error;
+        console.error('Ups! Wystąpił błąd przy próbie pobrania statystyk maszynisty! :/');
+      }
+    },
+
+    refreshData() {
+      this.$emit('onRefreshData');
+    },
+
+    startSearchTimeout(type: 'driver' | 'dispatcher', value: string) {
+      if (this[`${type}Suggestions`].includes(value)) return;
+
+      window.clearTimeout(this.searchTimeout);
+
+      this.searchTimeout = setTimeout(async () => {
+        try {
+          const suggestions: string[] = await (
+            await axios.get(`${URLs.stacjownikAPI}/api/get${type}Suggestions?name=${value}`)
+          ).data;
+
+          this[`${type}Suggestions`] = suggestions;
+        } catch (error) {
+          this[`${type}Suggestions`] = [];
+        }
+      }, 450);
+    },
+
+    // Override keyMixin function
+    onKeyDownFunction() {
+      this.showOptions = !this.showOptions;
+
+      this.$nextTick(() => {
+        if (this.showOptions) (this.$refs['button'] as HTMLButtonElement)?.focus();
+      });
+    },
+
+    onSorterChange(item: { id: string | number; value: string }) {
+      this.sorterActive.id = item.id;
+      this.sorterActive.dir = -1;
+      this.$emit('onSearchConfirm');
+    },
+
+    onFilterChange(filter: JournalFilter) {
+      // this.journalFilterActive = filter;
+      this.filterList
+        ?.filter((f) => f.filterSection === filter.filterSection)
+        .forEach((f) => (f.isActive = false));
+      filter.isActive = true;
+
+      this.$emit('onSearchConfirm');
+    },
+
+    onInputClear(id: any) {
+      this.searchersValues[id] = '';
+      this.$emit('onSearchConfirm');
+    },
+
+    onSearchConfirm() {
+      this.$emit('onSearchConfirm');
+    },
+
+    onSearchButtonConfirm() {
+      this.showOptions = false;
+      this.$emit('onSearchConfirm');
+    },
+
+    onResetButtonClick() {
+      this.$emit('onOptionsReset');
+    }
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+@import '../../styles/filters_options.scss';
+</style>

src/components/JournalView/JournalStats.vue

@@ -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,7 +28,7 @@
 </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 JournalDailyStats from './DailyStats.vue';
 import JournalDriverStats from './JournalDriverStats.vue';
@@ -44,19 +48,19 @@ 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 +119,3 @@ onMounted(() => {
   }
 }
 </style>
-

src/components/JournalView/JournalTimetables/JournalTimetablesList.vue

@@ -1,82 +1,83 @@
-<template>
-  <div>
-    <transition name="status-anim" mode="out-in">
-      <div :key="dataStatus">
-        <div class="journal_warning" v-if="store.isOffline">
-          {{ $t('app.offline') }}
-        </div>
-
-        <Loading v-else-if="dataStatus == DataStatus.Loading" />
-
-        <div v-else-if="dataStatus == DataStatus.Error" class="journal_warning error">
-          {{ $t('app.error') }}
-        </div>
-
-        <div v-else-if="timetableHistory.length == 0" class="journal_warning">
-          {{ $t('app.no-result') }}
-        </div>
-
-        <div v-else>
-          <TimetableHistoryList :timetableHistory="timetableHistory" />
-
-          <AddDataButton
-            :list="timetableHistory"
-            :scrollDataLoaded="scrollDataLoaded"
-            :scrollNoMoreData="scrollNoMoreData"
-            @addHistoryData="addHistoryData"
-          />
-        </div>
-      </div>
-    </transition>
-
-    <div class="journal_warning" v-if="scrollNoMoreData">{{ $t('journal.no-further-data') }}</div>
-    <div class="journal_warning" v-else-if="!scrollDataLoaded">{{ $t('journal.loading-further-data') }}</div>
-  </div>
-</template>
-
-<script lang="ts">
-import { defineComponent, PropType } from 'vue';
-import { 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';
-
-export default defineComponent({
-  components: { ProgressBar, Loading, AddDataButton, TimetableHistoryList },
-
-  props: {
-    timetableHistory: {
-      type: Array as PropType<TimetableHistory[]>,
-      required: true,
-    },
-    scrollNoMoreData: {
-      type: Boolean,
-    },
-    scrollDataLoaded: {
-      type: Boolean,
-    },
-    addHistoryData: {
-      type: Function as PropType<() => void>,
-    },
-    dataStatus: {
-      type: Number as PropType<DataStatus>,
-    },
-  },
-
-  data() {
-    return {
-      DataStatus,
-      store: useStore(),
-    };
-  },
-});
-</script>
-
-<style lang="scss" scoped>
-@import '../../../styles/JournalSection.scss';
-@import '../../../styles/animations.scss';
-</style>
+<template>
+  <div>
+    <transition name="status-anim" mode="out-in">
+      <div :key="dataStatus">
+        <div class="journal_warning" v-if="store.isOffline">
+          {{ $t('app.offline') }}
+        </div>
+
+        <Loading v-else-if="dataStatus == DataStatus.Loading" />
+
+        <div v-else-if="dataStatus == DataStatus.Error" class="journal_warning error">
+          {{ $t('app.error') }}
+        </div>
+
+        <div v-else-if="timetableHistory.length == 0" class="journal_warning">
+          {{ $t('app.no-result') }}
+        </div>
+
+        <div v-else>
+          <TimetableHistoryList :timetableHistory="timetableHistory" />
+
+          <AddDataButton
+            :list="timetableHistory"
+            :scrollDataLoaded="scrollDataLoaded"
+            :scrollNoMoreData="scrollNoMoreData"
+            @addHistoryData="addHistoryData"
+          />
+        </div>
+      </div>
+    </transition>
+
+    <div class="journal_warning" v-if="scrollNoMoreData">{{ $t('journal.no-further-data') }}</div>
+    <div class="journal_warning" v-else-if="!scrollDataLoaded">
+      {{ $t('journal.loading-further-data') }}
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent, PropType } from 'vue';
+import { DataStatus } from '../../../scripts/enums/DataStatus';
+import { TimetableHistory } from '../../../scripts/interfaces/api/TimetablesAPIData';
+import { useStore } from '../../../store/store';
+
+import Loading from '../../Global/Loading.vue';
+import AddDataButton from '../../Global/AddDataButton.vue';
+import TimetableHistoryList from './TimetableHistoryList.vue';
+
+export default defineComponent({
+  components: { Loading, AddDataButton, TimetableHistoryList },
+
+  props: {
+    timetableHistory: {
+      type: Array as PropType<TimetableHistory[]>,
+      required: true
+    },
+    scrollNoMoreData: {
+      type: Boolean
+    },
+    scrollDataLoaded: {
+      type: Boolean
+    },
+    addHistoryData: {
+      type: Function as PropType<() => void>
+    },
+    dataStatus: {
+      type: Number as PropType<DataStatus>
+    }
+  },
+
+  data() {
+    return {
+      DataStatus,
+      store: useStore()
+    };
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+@import '../../../styles/JournalSection.scss';
+@import '../../../styles/animations.scss';
+</style>

src/components/JournalView/JournalTimetables/TimetableExtra.vue

@@ -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
@@ -57,25 +78,23 @@
 <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';
 
 export default defineComponent({
-  mixins: [imageMixin],
+  components: { StockList },
   props: {
     showExtraInfo: {
       type: Boolean,
-      required: true,
+      required: true
     },
     timetable: {
       type: Object as PropType<TimetableHistory>,
-      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');
-    },
-  },
-  components: { TrainThumbnail, StockList },
+      imageEl.src = '/images/icon-unknown.png';
+    }
+  }
 });
 </script>
 

src/components/JournalView/JournalTimetables/TimetableGeneral.vue

@@ -45,7 +45,7 @@
         :class="{
           fulfilled: timetable.fulfilled,
           terminated: timetable.terminated && !timetable.fulfilled,
-          active: !timetable.terminated,
+          active: !timetable.terminated
         }"
       >
         {{
@@ -74,8 +74,8 @@ export default defineComponent({
   props: {
     timetable: {
       type: Object as PropType<TimetableHistory>,
-      required: true,
-    },
+      required: true
+    }
   },
 
   methods: {
@@ -83,8 +83,8 @@ export default defineComponent({
       if (timetable?.terminated) return;
 
       this.selectModalTrain(timetable.driverName + timetable.trainNo.toString(), target);
-    },
-  },
+    }
+  }
 });
 </script>
 

src/components/JournalView/JournalTimetables/TimetableHistoryList.vue

@@ -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,7 +38,6 @@
 
 <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';
@@ -44,23 +46,22 @@ import TimetableStatus from './TimetableStatus.vue';
 import TimetableExtra from './TimetableExtra.vue';
 
 export default defineComponent({
-  mixins: [imageMixin],
   props: {
     timetableHistory: {
       type: Array as PropType<TimetableHistory[]>,
-      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>
 

src/components/JournalView/JournalTimetables/TimetableStatus.vue

@@ -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">
@@ -46,9 +52,9 @@ export default defineComponent({
   props: {
     timetable: {
       type: Object as PropType<TimetableHistory>,
-      required: true,
-    },
-  },
+      required: true
+    }
+  }
 });
 </script>
 

src/components/JournalView/JournalTimetables/TimetableStops.vue

@@ -38,8 +38,8 @@ export default defineComponent({
 
     timetable: {
       type: Object as PropType<TimetableHistory>,
-      required: true,
-    },
+      required: true
+    }
   },
 
   computed: {
@@ -65,12 +65,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 +89,8 @@ export default defineComponent({
         if (html) html = ` (${html})`;
         return { stopName, html, confirmed };
       });
-    },
-  },
+    }
+  }
 });
 </script>
 

src/components/SceneryView/SceneryDispatchersHistory.vue

@@ -1,143 +1,155 @@
-<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">
-      <thead>
-        <th>{{ $t('scenery.dispatchers-history-hash') }}</th>
-        <th>{{ $t('scenery.dispatchers-history-dispatcher') }}</th>
-        <th>{{ $t('scenery.dispatchers-history-level') }}</th>
-        <th>{{ $t('scenery.dispatchers-history-rate') }}</th>
-        <th>{{ $t('scenery.dispatchers-history-date') }}</th>
-      </thead>
-
-      <tbody>
-        <tr v-for="historyItem in historyList">
-          <td>#{{ historyItem.stationHash }}</td>
-          <td>
-            <router-link :to="`/journal/dispatchers?dispatcherName=${historyItem.dispatcherName}`">
-              <b>{{ historyItem.dispatcherName }}</b>
-            </router-link>
-          </td>
-          <td>
-            <b
-              v-if="historyItem.dispatcherLevel !== null"
-              class="level-badge dispatcher"
-              :style="calculateExpStyle(historyItem.dispatcherLevel, historyItem.dispatcherIsSupporter)"
-            >
-              {{ historyItem.dispatcherLevel >= 2 ? historyItem.dispatcherLevel : 'L' }}
-            </b>
-          </td>
-          <td class="text--primary">
-            <b>{{ historyItem.dispatcherRate }}</b>
-          </td>
-          <td style="min-width: 300px">
-            <div v-if="historyItem.timestampTo">
-              <b>{{ $d(historyItem.timestampFrom) }}</b>
-
-              {{ timestampToString(historyItem.timestampFrom) }}
-              - {{ timestampToString(historyItem.timestampTo) }} ({{ calculateDuration(historyItem.currentDuration) }})
-            </div>
-
-            <div class="dispatcher-online" v-else>
-              {{ $t('journal.online-since') }}
-              <b>{{ timestampToString(historyItem.timestampFrom) }}</b>
-              ({{ calculateDuration(historyItem.currentDuration) }})
-            </div>
-          </td>
-        </tr>
-      </tbody>
-    </table>
-  </section>
-
-  <div class="bottom-info">
-    <button class="btn btn--option" v-if="historyList.length > 0" @click="navigateToHistory">
-      {{ $t('scenery.bottom-info') }}
-    </button>
-  </div>
-</template>
-
-<script lang="ts">
-import axios from 'axios';
-import { defineComponent, PropType } from 'vue';
-import dateMixin from '../../mixins/dateMixin';
-import { DataStatus } from '../../scripts/enums/DataStatus';
-import { DispatcherHistory } from '../../scripts/interfaces/api/DispatchersAPIData';
-import Station from '../../scripts/interfaces/Station';
-import { URLs } from '../../scripts/utils/apiURLs';
-import Loading from '../Global/Loading.vue';
-import styleMixin from '../../mixins/styleMixin';
-import listObserverMixin from '../../mixins/listObserverMixin';
-
-export default defineComponent({
-  name: 'SceneryDispatchersHistory',
-  mixins: [dateMixin, styleMixin, listObserverMixin],
-  props: {
-    station: {
-      type: Object as PropType<Station>,
-      required: true,
-    },
-  },
-
-  data() {
-    return {
-      historyList: [] as DispatcherHistory[],
-      dataStatus: DataStatus.Loading,
-      DataStatus,
-    };
-  },
-
-  async activated() {
-    // if (this.historyList.length == 0) {
-    const fetchedHistory = await this.fetchAPIData();
-    if (fetchedHistory) this.historyList = fetchedHistory;
-    // }
-  },
-
-  methods: {
-    async fetchAPIData(countFrom = 0, countLimit = 30): Promise<DispatcherHistory[] | null> {
-      try {
-        this.dataStatus = DataStatus.Loading;
-
-        const requestString = `${URLs.stacjownikAPI}/api/getDispatchers?stationName=${this.station.name}&countFrom=${countFrom}&countLimit=${countLimit}`;
-        const historyAPIData: DispatcherHistory[] = await (await axios.get(requestString)).data;
-
-        this.dataStatus = DataStatus.Loaded;
-        return historyAPIData;
-      } catch (error) {
-        this.dataStatus = DataStatus.Error;
-        console.error(error);
-        return null;
-      }
-    },
-    navigateToHistory() {
-      this.$router.push(`/journal/dispatchers?sceneryName=${this.station.name}`);
-    },
-  },
-  components: { Loading },
-});
-</script>
-
-<style lang="scss" scoped>
-@import '../../styles/responsive.scss';
-@import '../../styles/sceneryViewTables.scss';
-
-.level-badge {
-  margin: 0 auto;
-}
-
-.dispatcher-online {
-  color: springgreen;
-}
-
-@include smallScreen {
-  .history-list {
-    font-size: 1.1em;
-  }
-  .list-item {
-    align-items: center;
-    flex-direction: column;
-  }
-}
-</style>
+<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>
+      <thead>
+        <th>{{ $t('scenery.dispatchers-history-hash') }}</th>
+        <th>{{ $t('scenery.dispatchers-history-dispatcher') }}</th>
+        <th>{{ $t('scenery.dispatchers-history-level') }}</th>
+        <th>{{ $t('scenery.dispatchers-history-rate') }}</th>
+        <th>{{ $t('scenery.dispatchers-history-date') }}</th>
+      </thead>
+
+      <tbody>
+        <tr v-for="historyItem in historyList" :key="historyItem.id">
+          <td>#{{ historyItem.stationHash }}</td>
+          <td>
+            <router-link :to="`/journal/dispatchers?dispatcherName=${historyItem.dispatcherName}`">
+              <b>{{ historyItem.dispatcherName }}</b>
+            </router-link>
+          </td>
+          <td>
+            <b
+              v-if="historyItem.dispatcherLevel !== null"
+              class="level-badge dispatcher"
+              :style="
+                calculateExpStyle(historyItem.dispatcherLevel, historyItem.dispatcherIsSupporter)
+              "
+            >
+              {{ historyItem.dispatcherLevel >= 2 ? historyItem.dispatcherLevel : 'L' }}
+            </b>
+          </td>
+          <td class="text--primary">
+            <b>{{ historyItem.dispatcherRate }}</b>
+          </td>
+          <td style="min-width: 300px">
+            <div v-if="historyItem.timestampTo">
+              <b>{{ $d(historyItem.timestampFrom) }}</b>
+
+              {{ timestampToString(historyItem.timestampFrom) }}
+              - {{ timestampToString(historyItem.timestampTo) }} ({{
+                calculateDuration(historyItem.currentDuration)
+              }})
+            </div>
+
+            <div class="dispatcher-online" v-else>
+              {{ $t('journal.online-since') }}
+              <b>{{ timestampToString(historyItem.timestampFrom) }}</b>
+              ({{ calculateDuration(historyItem.currentDuration) }})
+            </div>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </section>
+
+  <div class="bottom-info">
+    <button class="btn btn--option" v-if="historyList.length > 0" @click="navigateToHistory">
+      {{ $t('scenery.bottom-info') }}
+    </button>
+  </div>
+</template>
+
+<script lang="ts">
+import axios from 'axios';
+import { defineComponent, PropType } from 'vue';
+import dateMixin from '../../mixins/dateMixin';
+import { DataStatus } from '../../scripts/enums/DataStatus';
+import { DispatcherHistory } from '../../scripts/interfaces/api/DispatchersAPIData';
+import Station from '../../scripts/interfaces/Station';
+import { URLs } from '../../scripts/utils/apiURLs';
+import Loading from '../Global/Loading.vue';
+import styleMixin from '../../mixins/styleMixin';
+import listObserverMixin from '../../mixins/listObserverMixin';
+import { OnlineScenery } from '../../scripts/interfaces/store/storeTypes';
+
+export default defineComponent({
+  name: 'SceneryDispatchersHistory',
+  mixins: [dateMixin, styleMixin, listObserverMixin],
+  components: { Loading },
+  props: {
+    station: {
+      type: Object as PropType<Station>,
+      required: true
+    },
+    onlineScenery: {
+      type: Object as PropType<OnlineScenery>,
+      required: false
+    }
+  },
+
+  data() {
+    return {
+      historyList: [] as DispatcherHistory[],
+      dataStatus: DataStatus.Loading,
+      DataStatus
+    };
+  },
+
+  async activated() {
+    // if (this.historyList.length == 0) {
+    const fetchedHistory = await this.fetchAPIData();
+    if (fetchedHistory) this.historyList = fetchedHistory;
+    // }
+  },
+
+  methods: {
+    async fetchAPIData(countFrom = 0, countLimit = 30): Promise<DispatcherHistory[] | null> {
+      try {
+        this.dataStatus = DataStatus.Loading;
+
+        const requestString = `${URLs.stacjownikAPI}/api/getDispatchers?stationName=${this.station.name}&countFrom=${countFrom}&countLimit=${countLimit}`;
+        const historyAPIData: DispatcherHistory[] = await (await axios.get(requestString)).data;
+
+        this.dataStatus = DataStatus.Loaded;
+        return historyAPIData;
+      } catch (error) {
+        this.dataStatus = DataStatus.Error;
+        console.error(error);
+        return null;
+      }
+    },
+    navigateToHistory() {
+      this.$router.push(`/journal/dispatchers?sceneryName=${this.station.name}`);
+    }
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+@import '../../styles/responsive.scss';
+@import '../../styles/sceneryViewTables.scss';
+
+.level-badge {
+  margin: 0 auto;
+}
+
+.dispatcher-online {
+  color: springgreen;
+}
+
+@include smallScreen {
+  .history-list {
+    font-size: 1.1em;
+  }
+  .list-item {
+    align-items: center;
+    flex-direction: column;
+  }
+}
+</style>

src/components/SceneryView/SceneryHeader.vue

@@ -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 '../../scripts/interfaces/store/storeTypes';
 
 export default defineComponent({
   props: {
     station: {
-      type: Object as () => Station,
-      default: {},
+      type: Object as PropType<Station>,
+      required: true
     },
-  },
+
+    onlineScenery: {
+      type: Object as PropType<OnlineScenery>,
+      required: false
+    }
+  }
 });
 </script>
 
@@ -52,4 +58,3 @@ export default defineComponent({
   font-size: 1.2em;
 }
 </style>
-

src/components/SceneryView/SceneryInfo.vue

@@ -1,139 +1,162 @@
-<template>
-  <div class="scenery-info">
-    <section v-if="!timetableOnly">
-      <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}`) }}
-
-            <span v-if="station.generalInfo.reqLevel > -1">
-              - {{ $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}`) }}
-          </span>
-
-          <span>
-            &bull; <b>{{ $t('signals.title') }}:</b> {{ $t(`signals.${station.generalInfo.signalType}`) }}
-          </span>
-
-          <span v-if="station.generalInfo.lines">
-            &bull; <b>{{ $t('scenery.lines-title') }}:</b> {{ station.generalInfo.lines }}
-          </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">
-              {{ station.generalInfo.project }}
-            </a>
-          </span>
-        </div>
-
-        <SceneryInfoRoutes :station="station" />
-
-        <div 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>
-
-      <div style="margin: 2em 0; height: 2px; background-color: white"></div>
-
-      <!-- info dispatcher -->
-      <SceneryInfoDispatcher :station="station" :onlineFrom="onlineFrom" />
-
-      <div class="info-lists">
-        <!-- user list -->
-        <SceneryInfoUserList :station="station" />
-
-        <!-- spawn list -->
-        <SceneryInfoSpawnList :station="station" />
-      </div>
-    </section>
-  </div>
-</template>
-
-<script lang="ts">
-import { defineComponent } from '@vue/runtime-core';
-
-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';
-
-export default defineComponent({
-  components: {
-    SceneryInfoDispatcher,
-    SceneryInfoIcons,
-    SceneryInfoStats,
-    SceneryInfoUserList,
-    SceneryInfoSpawnList,
-    SceneryInfoRoutes,
-  },
-  props: {
-    station: {
-      type: Object as () => Station,
-      default: {},
-    },
-
-    timetableOnly: Boolean,
-  },
-
-  data: () => ({
-    onlineFrom: -1,
-  }),
-});
-</script>
-
-<style lang="scss">
-@import '../../styles/responsive.scss';
-@import '../../styles/badge.scss';
-
-h3.section-header {
-  margin: 0.5em 0;
-  padding: 0.3em;
-
-  display: flex;
-  justify-content: center;
-  align-items: center;
-
-  font-size: 1.2em;
-
-  img {
-    width: 1.1em;
-    margin-left: 0.5em;
-  }
-}
-
-.info-lists {
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: space-around;
-
-  margin-top: 1em;
-}
-
-.scenery-info-general {
-  margin-top: 1em;
-}
-
-.scenery-general-list {
-  display: flex;
-  justify-content: center;
-  flex-wrap: wrap;
-
-  span {
-    margin: 0 0.15em;
-  }
-}
-
-.scenery-topic a {
-  font-weight: bold;
-}
-</style>
+<template>
+  <div class="scenery-info">
+    <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}`) }}
+
+            <span v-if="station.generalInfo.reqLevel > -1">
+              -
+              {{
+                $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}`) }}
+          </span>
+
+          <span>
+            &bull; <b>{{ $t('signals.title') }}:</b>
+            {{ $t(`signals.${station.generalInfo.signalType}`) }}
+          </span>
+
+          <span v-if="station.generalInfo.lines">
+            &bull; <b>{{ $t('scenery.lines-title') }}:</b> {{ station.generalInfo.lines }}
+          </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"
+            >
+              {{ station.generalInfo.project }}
+            </a>
+          </span>
+        </div>
+
+        <SceneryInfoRoutes :station="station" />
+
+        <div
+          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>
+
+      <div style="margin: 2em 0; height: 2px; background-color: white"></div>
+
+      <!-- info dispatcher -->
+      <SceneryInfoDispatcher :onlineScenery="onlineScenery" />
+
+      <div class="info-lists">
+        <!-- user list -->
+        <SceneryInfoUserList :onlineScenery="onlineScenery" />
+
+        <!-- spawn list -->
+        <SceneryInfoSpawnList :onlineScenery="onlineScenery" />
+      </div>
+    </section>
+  </div>
+</template>
+
+<script lang="ts">
+import { PropType, defineComponent } from 'vue';
+
+import SceneryInfoDispatcher from './SceneryInfo/SceneryInfoDispatcher.vue';
+import SceneryInfoIcons from './SceneryInfo/SceneryInfoIcons.vue';
+import SceneryInfoUserList from './SceneryInfo/SceneryInfoUserList.vue';
+import SceneryInfoSpawnList from './SceneryInfo/SceneryInfoSpawnList.vue';
+import SceneryInfoRoutes from './SceneryInfo/SceneryInfoRoutes.vue';
+import Station from '../../scripts/interfaces/Station';
+import { OnlineScenery } from '../../scripts/interfaces/store/storeTypes';
+
+export default defineComponent({
+  components: {
+    SceneryInfoDispatcher,
+    SceneryInfoIcons,
+    SceneryInfoUserList,
+    SceneryInfoSpawnList,
+    SceneryInfoRoutes
+  },
+  props: {
+    station: {
+      type: Object as PropType<Station>,
+      required: true
+    },
+
+    onlineScenery: {
+      type: Object as PropType<OnlineScenery>,
+      required: false
+    }
+  },
+});
+</script>
+
+<style lang="scss">
+@import '../../styles/responsive.scss';
+@import '../../styles/badge.scss';
+
+h3.section-header {
+  margin: 0.5em 0;
+  padding: 0.3em;
+
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  font-size: 1.2em;
+
+  img {
+    width: 1.1em;
+    margin-left: 0.5em;
+  }
+}
+
+.info-lists {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-around;
+
+  margin-top: 1em;
+}
+
+.scenery-info-general {
+  margin-top: 1em;
+}
+
+.scenery-general-list {
+  display: flex;
+  justify-content: center;
+  flex-wrap: wrap;
+
+  span {
+    margin: 0 0.15em;
+  }
+}
+
+.scenery-topic a {
+  font-weight: bold;
+}
+</style>

src/components/SceneryView/SceneryInfo/SceneryInfoDispatcher.vue

@@ -1,56 +1,51 @@
 <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" />
-        <span>{{ station.onlineInfo?.dispatcherRate || '0' }}</span>
+        <img src="/images/icon-like.svg" alt="Likes count icon" />
+        <span>{{ onlineScenery?.dispatcherRate || '0' }}</span>
       </span>
     </div>
 
     <StationStatusBadge
-      :statusID="station.onlineInfo?.statusID"
-      :isOnline="station.onlineInfo ? true : false"
-      :statusTimestamp="station.onlineInfo?.statusTimestamp"
+      :statusID="onlineScenery?.statusID"
+      :isOnline="onlineScenery ? true : false"
+      :statusTimestamp="onlineScenery?.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 '../../../scripts/interfaces/store/storeTypes';
 
 export default defineComponent({
-    mixins: [styleMixin, dateMixin, routerMixin, imageMixin],
-    props: {
-        station: {
-            type: Object as () => Station,
-            default: {},
-        },
-        onlineFrom: {
-            type: Number,
-            default: -1,
-        },
-    },
-    components: { StationStatusBadge }
+  mixins: [styleMixin, dateMixin, routerMixin],
+  props: {
+    onlineScenery: {
+      type: Object as PropType<OnlineScenery>,
+      required: false
+    }
+  },
+  components: { StationStatusBadge }
 });
 </script>
 
@@ -98,4 +93,3 @@ export default defineComponent({
   }
 }
 </style>
-

src/components/SceneryView/SceneryInfo/SceneryInfoIcons.vue

@@ -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 imageMixin from '../../../mixins/imageMixin';
+import { PropType, defineComponent } from 'vue';
 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,
-      default: {},
-    },
-  },
+      type: Object as PropType<Station>,
+      required: true
+    }
+  }
 });
 </script>
 
@@ -118,4 +117,3 @@ export default defineComponent({
   }
 }
 </style>
-

src/components/SceneryView/SceneryInfo/SceneryInfoRoutes.vue

@@ -1,129 +1,142 @@
-<template>
-  <section class="info-routes" v-if="station.generalInfo">
-    <div class="routes one-way" v-if="station.generalInfo.routes.oneWay.length > 0">
-      <b>{{ $t('scenery.one-way-routes') }}</b>
-
-      <ul class="routes-list">
-        <li v-for="route in station.generalInfo.routes.oneWay" @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>
-          <span v-if="route.SBL" class="sbl">SBL</span>
-        </li>
-      </ul>
-    </div>
-
-    <div class="routes two-way" v-if="station.generalInfo.routes.twoWay.length > 0">
-      <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)">
-          <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>
-          <span v-if="route.SBL" class="sbl">SBL</span>
-        </li>
-      </ul>
-    </div>
-  </section>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-import Station from '../../../scripts/interfaces/Station';
-
-export default defineComponent({
-  props: {
-    station: {
-      type: Object as () => Station,
-      default: {},
-    },
-  },
-
-  methods: {
-    setActiveShowLength(name: string) {
-      if (this.activeShowLength.includes(name)) this.activeShowLength.splice(this.activeShowLength.indexOf(name), 1);
-      else this.activeShowLength.push(name);
-    },
-  },
-
-  data() {
-    return {
-      activeShowLength: [] as string[],
-    };
-  },
-});
-</script>
-
-<style lang="scss" scoped>
-.info-routes {
-  display: flex;
-  justify-content: center;
-  flex-wrap: wrap;
-
-  margin: 1em 0;
-}
-
-.routes {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  flex-wrap: wrap;
-
-  padding: 0.25em;
-}
-
-ul.routes-list {
-  margin: 0.45em 0.25em;
-  display: flex;
-  justify-content: center;
-  flex-wrap: wrap;
-
-  li {
-    margin: 0.5em 0.25em;
-    cursor: pointer;
-
-    user-select: none;
-    -moz-user-select: none;
-    -webkit-user-select: none;
-
-    span {
-      padding: 0.2em 0.25em;
-      background-color: #007599;
-      font-weight: bold;
-
-      &.no-catenary {
-        background-color: #686868;
-      }
-
-      &.internal {
-        text-decoration: underline;
-      }
-
-      &.speed {
-        background-color: #404040;
-        color: #cfcfcf;
-      }
-
-      &.sbl {
-        color: var(--clr-primary);
-        background-color: #404040;
-      }
-
-      &:last-child {
-        border-radius: 0 0.5em 0.5em 0;
-      }
-
-      &:first-child {
-        border-radius: 0.5em 0 0 0.5em;
-      }
-
-      &:only-child {
-        border-radius: 0.5em;
-      }
-    }
-  }
-}
-</style>
+<template>
+  <section class="info-routes" v-if="station.generalInfo">
+    <div class="routes one-way" v-if="station.generalInfo.routes.oneWay.length > 0">
+      <b>{{ $t('scenery.one-way-routes') }}</b>
+
+      <ul class="routes-list">
+        <li
+          v-for="route in station.generalInfo.routes.oneWay"
+          :key="route.name"
+          @click="setActiveShowLength(route.name)"
+        >
+          <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>
+          <span v-if="route.SBL" class="sbl">SBL</span>
+        </li>
+      </ul>
+    </div>
+
+    <div class="routes two-way" v-if="station.generalInfo.routes.twoWay.length > 0">
+      <b>{{ $t('scenery.two-way-routes') }}</b>
+
+      <ul class="routes-list">
+        <li
+          v-for="route in station.generalInfo.routes.twoWay"
+          :key="route.name"
+          @click="setActiveShowLength(route.name)"
+        >
+          <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>
+          <span v-if="route.SBL" class="sbl">SBL</span>
+        </li>
+      </ul>
+    </div>
+  </section>
+</template>
+
+<script lang="ts">
+import { PropType, defineComponent } from 'vue';
+import Station from '../../../scripts/interfaces/Station';
+
+export default defineComponent({
+  props: {
+    station: {
+      type: Object as PropType<Station>,
+      required: true
+    }
+  },
+
+  methods: {
+    setActiveShowLength(name: string) {
+      if (this.activeShowLength.includes(name))
+        this.activeShowLength.splice(this.activeShowLength.indexOf(name), 1);
+      else this.activeShowLength.push(name);
+    }
+  },
+
+  data() {
+    return {
+      activeShowLength: [] as string[]
+    };
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+.info-routes {
+  display: flex;
+  justify-content: center;
+  flex-wrap: wrap;
+
+  margin: 1em 0;
+}
+
+.routes {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-wrap: wrap;
+
+  padding: 0.25em;
+}
+
+ul.routes-list {
+  margin: 0.45em 0.25em;
+  display: flex;
+  justify-content: center;
+  flex-wrap: wrap;
+
+  li {
+    margin: 0.5em 0.25em;
+    cursor: pointer;
+
+    user-select: none;
+    -moz-user-select: none;
+    -webkit-user-select: none;
+
+    span {
+      padding: 0.2em 0.25em;
+      background-color: #007599;
+      font-weight: bold;
+
+      &.no-catenary {
+        background-color: #686868;
+      }
+
+      &.internal {
+        text-decoration: underline;
+      }
+
+      &.speed {
+        background-color: #404040;
+        color: #cfcfcf;
+      }
+
+      &.sbl {
+        color: var(--clr-primary);
+        background-color: #404040;
+      }
+
+      &:last-child {
+        border-radius: 0 0.5em 0.5em 0;
+      }
+
+      &:first-child {
+        border-radius: 0.5em 0 0 0.5em;
+      }
+
+      &:only-child {
+        border-radius: 0.5em;
+      }
+    }
+  }
+}
+</style>

src/components/SceneryView/SceneryInfo/SceneryInfoSpawnList.vue

@@ -1,65 +1,88 @@
-<template>
-  <section class="info-spawn-list">
-    <h3 class="spawn-header section-header">
-      <img :src="getIcon('spawn')" alt="icon-spawn" />
-      &nbsp;{{ $t('scenery.spawns') }} &nbsp;
-      <span class="text--primary">{{ station.onlineInfo?.spawns.length || '0' }}</span>
-    </h3>
-
-    <span v-if="station.onlineInfo">
-      <span
-        class="badge spawn"
-        v-for="(spawn, i) in sortedSpawns"
-        :key="spawn.spawnName + station.onlineInfo?.dispatcherName + i"
-        :data-electrified="spawn.isElectrified"
-      >
-        <span class="spawn_name">{{ spawn.spawnName }}</span>
-        <span class="spawn_length">{{ spawn.spawnLength }}m</span>
-      </span>
-    </span>
-
-    <span class="badge spawn badge-none" v-if="!station.onlineInfo || station.onlineInfo.spawns.length == 0"
-      >{{ $t('scenery.no-spawns') }}
-    </span>
-  </section>
-</template>
-
-<script lang="ts">
-import { defineComponent } from 'vue';
-import imageMixin from '../../../mixins/imageMixin';
-import Station from '../../../scripts/interfaces/Station';
-
-export default defineComponent({
-  mixins: [imageMixin],
-
-  props: {
-    station: {
-      type: Object as () => Station,
-      default: {},
-    },
-  },
-
-  computed: {
-    sortedSpawns() {
-      return this.station.onlineInfo?.spawns.sort((s1, s2) => (s1.spawnLength < s2.spawnLength ? 1 : -1));
-    },
-  },
-});
-</script>
-
-<style lang="scss" scoped>
-@import '../../../styles/variables.scss';
-
-.spawn {
-  color: white;
-
-  &_length {
-    background-color: #404040;
-    color: #cfcfcf;
-  }
-
-  &[data-electrified='true'] > &_name {
-    background-color: #007599;
-  }
-}
-</style>
+<template>
+  <section class="info-spawn-list">
+    <h3 class="spawn-header section-header">
+      <img src="/images/icon-spawn.svg" alt="Open spawns icon" />
+      &nbsp;{{ $t('scenery.spawns') }} &nbsp;
+      <span class="text--primary">{{ onlineScenery?.spawns.length || '0' }}</span>
+    </h3>
+
+    <transition-group name="spawns-anim" tag="ul">
+      <li class="badge spawn badge-none" v-if="!onlineScenery || onlineScenery.spawns.length == 0" key="no-spawns">
+        {{ $t('scenery.no-spawns') }}
+      </li>
+
+      <li
+        class="badge spawn"
+        v-for="(spawn, i) in sortedSpawns"
+        :key="spawn.spawnName + onlineScenery?.dispatcherName + i"
+        :data-electrified="spawn.isElectrified"
+      >
+        <span class="spawn_name">{{ spawn.spawnName }}</span>
+        <span class="spawn_length">{{ spawn.spawnLength }}m</span>
+      </li>
+    </transition-group>
+  </section>
+</template>
+
+<script lang="ts">
+import { PropType, defineComponent } from 'vue';
+import { OnlineScenery } from '../../../scripts/interfaces/store/storeTypes';
+
+export default defineComponent({
+  props: {
+    onlineScenery: {
+      type: Object as PropType<OnlineScenery>,
+      required: false
+    }
+  },
+
+  computed: {
+    sortedSpawns() {
+      if (!this.onlineScenery) return [];
+
+      return [...this.onlineScenery.spawns].sort((s1, s2) =>
+        s1.spawnLength < s2.spawnLength ? 1 : -1
+      );
+    }
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+@import '../../../styles/variables.scss';
+
+ul {
+  position: relative;
+}
+
+.spawn {
+  color: white;
+
+  &_length {
+    background-color: #404040;
+    color: #cfcfcf;
+  }
+
+  &[data-electrified='true'] > &_name {
+    background-color: #007599;
+  }
+}
+
+.spawns-anim {
+  &-move,
+  &-enter-active,
+  &-leave-active {
+    transition: all 250ms ease;
+  }
+
+  &-enter-from,
+  &-leave-to {
+    opacity: 0;
+    transform: translateX(10px);
+  }
+
+  &-leave-active {
+    position: absolute;
+  }
+}
+</style>

src/components/SceneryView/SceneryInfo/SceneryInfoStats.vue

@@ -1,29 +1,32 @@
 <template>
   <section class="info-stats" :class="!station.onlineInfo ? 'no-stats' : ''">
     <span class="likes">
-      <img :src="getIcon('like')" alt="icon-like" />
+      <img src="/images/icon-like" alt="Likes count icon" />
       <span>{{ station.onlineInfo?.dispatcherRate || '0' }}</span>
     </span>
 
     <span class="users">
-      <img :src="getIcon('user')" alt="icon-user" />
+      <img src="/images/icon-user" alt="Users count icon" />
       <span>{{ station.onlineInfo?.currentUsers || '0' }}</span>
       /
       <span>{{ station.onlineInfo?.maxUsers || '0' }}</span>
     </span>
 
     <span class="spawns">
-      <img :src="getIcon('spawn')" alt="icon-spawn" />
+      <img src="/images/icon-spawn" alt="Spawns count icon" />
       <span>{{ station.onlineInfo?.spawns.length || '0' }}</span>
     </span>
 
     <span class="schedules">
-      <img :src="getIcon('timetable')" alt="icon-timetable" />
+      <img src="/images/icon-timetable" alt="Timetables count icon" />
       <span>
         <span style="color: #eee">{{ station.onlineInfo?.scheduledTrains?.length || '0' }}</span>
         /
         <span style="color: #bbb"
-          >{{ station.onlineInfo?.scheduledTrains?.filter((train) => train.stopInfo.confirmed).length || '0' }}
+          >{{
+            station.onlineInfo?.scheduledTrains?.filter((train) => train.stopInfo.confirmed)
+              .length || '0'
+          }}
         </span>
       </span>
     </span>
@@ -31,18 +34,16 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
-import imageMixin from '../../../mixins/imageMixin';
+import { PropType, defineComponent } from 'vue';
 import Station from '../../../scripts/interfaces/Station';
 
 export default defineComponent({
-  mixins: [imageMixin],
   props: {
     station: {
-      type: Object as () => Station,
-      default: {},
-    },
-  },
+      type: Object as PropType<Station>,
+      required: true
+    }
+  }
 });
 </script>