Merge pull request #61 - Wersja 1.18.2

Wersja 1.18.2

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

.gitignore

@@ -31,6 +31,7 @@ node_modules
 .firebase
 .firebaserc
 
+# Env
 .env
 
 .fake

.prettierrc

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

index.html

@@ -16,14 +16,30 @@
     <link rel="manifest" href="/site.webmanifest" />
     <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5" />
     <meta name="msapplication-TileColor" content="#da532c" />
-    <meta name="theme-color" content="#ffffff" />
+    <meta name="theme-color" content="#222222" />
 
     <link rel="icon" href="favicon-64.png" sizes="64x64" type="image/png" />
-    <link rel="icon" href="favicon-32.png" sizes="32x32" type="image/png" />
     <link rel="icon" href="favicon-62.png" sizes="62x62" type="image/png" />
+    <link rel="icon" href="favicon-32.png" sizes="32x32" type="image/png" />
     <link rel="icon" href="favicon-16.png" sizes="16x16" type="image/png" />
     <link rel="icon" href="favicon.ico" />
 
+    <!-- Static OpenGraph meta -->
+    <meta name="description" content="Pomocnik maszynisty i dyżurnego symulatora Train Driver 2" />
+    <meta property="og:url" content="https://stacjownik-td2.web.app/" />
+    <meta property="og:type" content="website" />
+    <meta property="og:title" content="Stacjownik" />
+    <meta property="og:description" content="Pomocnik maszynisty i dyżurnego symulatora Train Driver 2" />
+    <meta property="og:image" content="https://raw.githubusercontent.com/Spythere/api/main/thumbnails/stacjownik.jpg" />
+    <meta property="og:image:width" content="1200" />
+    <meta property="og:image:height" content="630" />
+    <meta property="og:site_name" content="Stacjownik" />
+
+    <meta name="twitter:card" content="summary_large_image" />
+    <meta name="twitter:title" content="Stacjownik" />
+    <meta name="twitter:description" content="Pomocnik maszynisty i dyżurnego symulatora Train Driver 2" />
+    <meta name="twitter:image" content="https://raw.githubusercontent.com/Spythere/api/main/thumbnails/stacjownik.jpg" />
+
     <link href="https://fonts.googleapis.com/css2?family=Quicksand:wght@500;700&display=swap" rel="stylesheet" />
   </head>
 
@@ -32,4 +48,3 @@
     <script type="module" src="/src/main.ts"></script>
   </body>
 </html>
-

package.json

@@ -1,33 +1,44 @@
 {
   "name": "stacjownik",
-  "version": "1.14.1",
+  "version": "1.18.2",
   "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.12.1",
+    "core-js": "^3.32.2",
-    "dotenv": "^16.0.3",
+    "dotenv": "^16.3.1",
-    "firebase": "^9.8.1",
+    "firebase": "^10.4.0",
-    "howler": "^2.2.1",
+    "howler": "^2.2.4",
-    "pinia": "^2.0.14",
+    "pinia": "^2.1.6",
-    "sass": "^1.53.0",
+    "sass": "^1.67.0",
-    "socket.io-client": "^4.4.1",
+    "socket.io-client": "^4.7.2",
-    "vue": "^3.2.37",
+    "vue": "^3.3.4",
-    "vue-i18n": "^9.1.6",
+    "vue-i18n": "^9.4.1",
-    "vue-router": "^4.0.0-0"
+    "vue-router": "^4.2.4"
   },
   "devDependencies": {
-    "@types/node": "^18.11.17",
+    "@types/node": "^20.6.2",
-    "@vitejs/plugin-vue": "^4.0.0",
+    "@vite-pwa/assets-generator": "^0.0.10",
-    "axios": "^1.2.1",
+    "@vitejs/plugin-vue": "^4.3.4",
-    "typescript": "^4.9.4",
+    "axios": "^1.5.0",
-    "vite": "^4.0.3",
+    "prettier": "^3.0.3",
-    "vite-plugin-pwa": "^0.14.0",
+    "typescript": "^5.2.2",
-    "vue-tsc": "^1.0.18"
+    "vite": "^4.4.9",
+    "vite-plugin-pwa": "^0.16.5",
+    "vue-tsc": "^1.8.11",
+    "@vue/eslint-config-prettier": "^8.0.0",
+    "@vue/eslint-config-typescript": "^12.0.0",
+    "@vue/tsconfig": "^0.4.0",
+    "eslint": "^8.49.0",
+    "eslint-plugin-vue": "^9.17.0",
+    "@rushstack/eslint-patch": "^1.3.3"
   },
   "browserslist": [
     "> 1%",

public/images/icon-timetableAll.svg

@@ -0,0 +1,3 @@
+<svg width="30" height="30" viewBox="0 0 30 30" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M23.75 3.75H22.5V1.25H20V3.75H10V1.25H7.5V3.75H6.25C4.875 3.75 3.75 4.875 3.75 6.25V23.75C3.75 25.125 4.875 26.25 6.25 26.25H23.75C25.125 26.25 26.25 25.125 26.25 23.75V6.25C26.25 4.875 25.125 3.75 23.75 3.75ZM23.75 23.75H6.25V11.25H23.75V23.75ZM6.25 8.75V6.25H23.75V8.75H6.25ZM8.75 13.75H21.25V16.25H8.75V13.75ZM8.75 18.75H17.5V21.25H8.75V18.75Z" fill="#F2E147"/>
+</svg>

public/images/icon-timetableConfirmed.svg

@@ -0,0 +1,3 @@
+<svg width="30" height="30" viewBox="0 0 30 30" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M23.75 3.75H22.5V1.25H20V3.75H10V1.25H7.5V3.75H6.25C4.875 3.75 3.75 4.875 3.75 6.25V23.75C3.75 25.125 4.875 26.25 6.25 26.25H23.75C25.125 26.25 26.25 25.125 26.25 23.75V6.25C26.25 4.875 25.125 3.75 23.75 3.75ZM23.75 23.75H6.25V11.25H23.75V23.75ZM6.25 8.75V6.25H23.75V8.75H6.25ZM8.75 13.75H21.25V16.25H8.75V13.75ZM8.75 18.75H17.5V21.25H8.75V18.75Z" fill="#66FF6C"/>
+</svg>

public/images/icon-timetableUnconfirmed.svg

@@ -0,0 +1,3 @@
+<svg width="30" height="30" viewBox="0 0 30 30" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M23.75 3.75H22.5V1.25H20V3.75H10V1.25H7.5V3.75H6.25C4.875 3.75 3.75 4.875 3.75 6.25V23.75C3.75 25.125 4.875 26.25 6.25 26.25H23.75C25.125 26.25 26.25 25.125 26.25 23.75V6.25C26.25 4.875 25.125 3.75 23.75 3.75ZM23.75 23.75H6.25V11.25H23.75V23.75ZM6.25 8.75V6.25H23.75V8.75H6.25ZM8.75 13.75H21.25V16.25H8.75V13.75ZM8.75 18.75H17.5V21.25H8.75V18.75Z" fill="#898989"/>
+</svg>

public/img/icons/safari-pinned-tab.svg

@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.00251 14.9297L0 1.07422H6.14651L8.00251 4.27503L9.84583 1.07422H16L8.00251 14.9297Z" fill="black"/>
-</svg>

src/App.scss

@@ -1,7 +1,6 @@
 @import './styles/responsive.scss';
 @import './styles/variables.scss';
 @import './styles/global.scss';
-@import './styles/scenery_status.scss';
 
 // VUE ROUTE CHANGE ANIMATION
 .view-anim {
@@ -44,9 +43,10 @@
 #app {
   color: white;
   font-size: 1rem;
+  overflow-x: hidden;
 
   @include smallScreen() {
-    font-size: calc(0.55rem + 1.1vw);
+    font-size: calc(0.65rem + 0.8vw);
   }
 
   @include screenLandscape() {

src/App.vue

@@ -6,8 +6,6 @@
       </keep-alive>
     </transition>
 
-    <UpdatePrompt />
-
     <AppHeader :current-lang="currentLang" @change-lang="changeLang" />
 
     <main class="app_main">
@@ -24,7 +22,9 @@
       {{ new Date().getUTCFullYear() }} |
       <a :href="releaseURL" target="_blank">v{{ VERSION }}{{ isOnProductionHost ? '' : 'dev' }}</a>
       <br />
-      <a href="https://discord.gg/x2mpNN3svk"><img :src="getIcon('discord', 'png')" alt="">&nbsp;<b>{{ $t('footer.discord') }}</b></a>
+      <a href="https://discord.gg/x2mpNN3svk">
+        <img src="/images/icon-discord.png" alt="" />&nbsp;<b>{{ $t('footer.discord') }}</b>
+      </a>
 
       <div style="display: none">&int; ukryta taktyczna całka do programowania w HTMLu</div>
     </footer>
@@ -32,68 +32,40 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, KeepAlive, provide, ref, watch } from 'vue';
+import { defineComponent, watch } from 'vue';
 
 import Clock from './components/App/Clock.vue';
 
 import packageInfo from '.././package.json';
+import { regions } from './data/options.json';
 
-import StatusIndicator from './components/App/StatusIndicator.vue';
-import SelectBox from './components/Global/SelectBox.vue';
 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 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,
+    AppHeader
-    UpdatePrompt,
-  },
-
-  mixins: [imageMixin],
-
-  setup() {
-    const store = useStore();
-    store.connectToAPI();
-
-    const { offlineReady } = useCustomSW();
-
-    const isFilterCardVisible = ref(false);
-
-    provide('isFilterCardVisible', isFilterCardVisible);
-
-    return {
-      store,
-      isFilterCardVisible,
-      onlineDispatchers: computed(() =>
-        store.stationList.filter((station) => station.onlineInfo && station.onlineInfo.region == store.region.id)
-      ),
-
-      dispatcherDataStatus: store.dataStatuses.dispatchers,
-    };
   },
 
   data: () => ({
     VERSION: packageInfo.version,
+    store: useStore(),
 
     currentLang: 'pl',
     releaseURL: '',
-    isOnProductionHost: location.hostname == 'stacjownik-td2.web.app',
+    isOnProductionHost: location.hostname == 'stacjownik-td2.web.app'
   }),
 
   created() {
     this.loadLang();
+    this.store.connectToAPI();
 
     this.store.isOffline = !window.navigator.onLine;
 
@@ -104,10 +76,10 @@ export default defineComponent({
         stations: [],
         dispatchers: [],
         trains: [],
-        connectedSocketCount: 0,
+        connectedSocketCount: 0
       };
 
-      this.store.setOnlineData();
+      this.store.setStatuses();
     });
 
     window.addEventListener('online', () => {
@@ -121,16 +93,28 @@ export default defineComponent({
     watch(
       () => this.store.blockScroll,
       (value) => {
-        if (value) {
+        if (value) document.body.classList.add('no-scroll');
-          document.body.classList.add('no-scroll');
+        else document.body.classList.remove('no-scroll');
-          return;
-        }
-
-        document.body.classList.remove('no-scroll');
       }
     );
   },
 
+  watch: {
+    '$route.query.region': {
+      immediate: true,
+      handler(regionQuery: string) {
+        if (regionQuery) {
+          this.store.region.id =
+            regions.find(
+              (reg) =>
+                reg.id == regionQuery.toLocaleLowerCase() ||
+                reg.value.toLocaleLowerCase() == regionQuery.toLocaleLowerCase()
+            )?.id || 'eu';
+        }
+      }
+    }
+  },
+
   methods: {
     changeLang(lang: string) {
       this.$i18n.locale = lang;
@@ -170,8 +154,8 @@ export default defineComponent({
         this.changeLang('en');
         return;
       }
-    },
+    }
-  },
+  }
 });
 </script>
 

src/components/App/AppHeader.vue

@@ -3,8 +3,13 @@
     <div class="header_container">
       <div class="header_icons">
         <span class="icons-top">
-          <img :src="getIcon('pl')" alt="icon-pl" @click="changeLang('en')" v-if="currentLang == 'pl'" />
+          <img
-          <img :src="getIcon('en', 'jpg')" alt="icon-en" @click="changeLang('pl')" v-else />
+            src="/images/icon-pl.svg"
+            alt="icon-pl"
+            @click="changeLang('en')"
+            v-if="currentLang == 'pl'"
+          />
+          <img src="/images/icon-en.jpg" alt="icon-en" @click="changeLang('pl')" v-else />
         </span>
       </div>
 
@@ -13,7 +18,7 @@
 
         <span class="header_brand">
           <router-link to="/">
-            <img :src="getImage('stacjownik-header-logo.svg')" alt="Stacjownik" />
+            <img src="/images/stacjownik-header-logo.svg" alt="Stacjownik" />
           </router-link>
         </span>
 
@@ -21,7 +26,7 @@
           <Clock />
 
           <div class="info_counter">
-            <img :src="getIcon('dispatcher')" alt="icon dispatcher" />
+            <img src="/images/icon-dispatcher.svg" alt="icon dispatcher" />
             <span class="text--primary">{{ onlineDispatchersCount }}</span>
 
             <!-- <span class="g-tooltip">
@@ -31,12 +36,12 @@
 
             <span class="text--grayed"> / </span>
             <span class="text--primary">{{ onlineTrainsCount }}</span>
-            <img :src="getIcon('train')" alt="icon train" />
+            <img src="/images/icon-train.svg" alt="icon train" />
           </div>
 
-          <span class="info_region">
+          <div class="info_region">
-            <SelectBox :itemList="computedRegions" :defaultItemIndex="0" @selected="changeRegion" />
+            <RegionDropdown />
-          </span>
+          </div>
         </span>
 
         <span class="header_links">
@@ -44,7 +49,9 @@
             {{ $t('app.sceneries') }}
           </router-link>
           /
-          <router-link class="route" active-class="route-active" to="/trains">{{ $t('app.trains') }}</router-link>
+          <router-link class="route" active-class="route-active" to="/trains">{{
+            $t('app.trains')
+          }}</router-link>
           /
           <router-link
             class="route"
@@ -62,64 +69,47 @@
 <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';
+import RegionDropdown from '../Global/RegionDropdown.vue';
 
 export default defineComponent({
   emits: ['changeLang'],
-  mixins: [imageMixin],
   props: {
     currentLang: {
       type: String,
-      required: true,
+      required: true
-    },
+    }
   },
+
   setup() {
     return {
-      store: useStore(),
+      store: useStore()
     };
   },
+
   methods: {
-    changeRegion(region: { id: string; value: string }) {
-      this.store.changeRegion(region);
-    },
     changeLang(lang: string) {
       this.$emit('changeLang', lang);
+    }
   },
-  },
+
   computed: {
     onlineTrainsCount() {
       return this.store.trainList.filter((train) => train.online).length;
     },
 
     onlineDispatchersCount() {
-      return this.store.stationList.filter(
+      return this.store.onlineSceneryList.length;
-        (station) => station.onlineInfo && station.onlineInfo.region == this.store.region.id
-      ).length;
     },
 
     factorU() {
-      return this.onlineDispatchersCount == 0 ? '-' : (this.onlineTrainsCount / this.onlineDispatchersCount).toFixed(2);
+      return this.onlineDispatchersCount == 0
+        ? '-'
+        : (this.onlineTrainsCount / this.onlineDispatchersCount).toFixed(2);
+    }
   },
-
+  components: { StatusIndicator, Clock, RegionDropdown }
-    computedRegions() {
-      return options.regions.map((region) => {
-        const regionStationCount =
-          this.store.apiData.stations?.filter((station) => station.region == region.id && station.isOnline).length || 0;
-        const regionTrainCount =
-          this.store.apiData.trains?.filter((train) => train.region == region.id && train.online).length || 0;
-        return {
-          id: region.id,
-          value: `${region.value} <div class='text--grayed'>${regionStationCount} / ${regionTrainCount}</div>`,
-          selectedValue: region.value,
-        };
-      });
-    },
-  },
-  components: { SelectBox, StatusIndicator, Clock },
 });
 </script>
 <style lang="scss" scoped>
@@ -215,23 +205,8 @@ export default defineComponent({
   }
 }
 
-// REGION SELECTION
 .info_region {
-  color: white;
-  font-weight: bold;
-
   display: flex;
   justify-content: flex-end;
-
-  .select-box_content button {
-    background-color: transparent;
-    font-weight: bold;
-    padding: 0.1em 0.5em;
-    color: paleturquoise;
-  }
-
-  .options {
-    font-size: 0.9em;
-  }
 }
 </style>

src/components/App/Clock.vue

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

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

@@ -7,14 +7,14 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from "vue";
+import { defineComponent } from 'vue';
 
 export default defineComponent({});
 </script>
 
 <style lang="scss">
-@import "../../styles/variables";
+@import '../../styles/variables';
-@import "../../styles/responsive";
+@import '../../styles/responsive';
 
 .button_content {
   display: flex;

src/components/Global/AddDataButton.vue

@@ -0,0 +1,42 @@
+<template>
+  <button
+    class="btn btn--option btn--load-data"
+    v-if="!scrollNoMoreData && scrollDataLoaded && list.length >= 15"
+    @click="addHistoryData"
+  >
+    {{ $t('journal.load-data') }}
+  </button>
+</template>
+
+<script lang="ts">
+import { PropType, defineComponent } from 'vue';
+
+export default defineComponent({
+  props: {
+    scrollNoMoreData: {
+      type: Boolean,
+      required: true
+    },
+
+    scrollDataLoaded: {
+      type: Boolean,
+      required: true
+    },
+
+    list: {
+      type: Array as PropType<any[]>,
+      required: true
+    }
+  },
+
+  emits: ['addHistoryData'],
+
+  methods: {
+    addHistoryData() {
+      this.$emit('addHistoryData');
+    }
+  }
+});
+</script>
+
+<style scoped></style>

src/components/Global/Loading.vue

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

src/components/Global/ProgressBar.vue

@@ -0,0 +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>

src/components/Global/RegionDropdown.vue

@@ -1,25 +1,24 @@
 <template>
-  <div class="select-box">
+  <div class="region-dropdown" v-click-outside="clickedOutside">
-    <div class="select-box_content">
+    <div class="content">
-      <button class="selected" @click="toggleBox">
+      <button class="selected-region" @click="toggleBox">
-        <span>{{ computedSelectedItem.selectedValue || computedSelectedItem.value }}</span>
+        <span>{{ selectedItem.name }}</span>
 
-        <div class="arrow">
+        <img :src="`/images/icon-arrow-${listOpen ? 'asc' : 'desc'}.svg`" alt="Arrow icon" />
-          <img :src="listOpen ? getIcon('arrow-asc') : getIcon('arrow-desc')" alt="arrow-icon" />
-        </div>
       </button>
 
-      <ul class="options" :ref="(el) => (listRef = el as Element)">
+      <ul class="options">
-        <li class="option" v-for="(item, i) in itemList" :key="item.id">
+        <li class="option" v-for="(item, i) in regionList" :key="item.id">
           <transition
             name="unfold"
             :style="`
             --delay-in: ${i * 55}ms; 
-            --delay-out: ${(itemList.length - 1 - i) * 55}ms`"
+            --delay-out: ${(regionList.length - 1 - i) * 55}ms`"
           >
             <label :for="item.id" v-if="listOpen">
               <input type="button" :id="item.id" name="select-box" @click="selectOption(item)" />
-              <span :style="computedSelectedItem.id == item.id ? 'color: gold;' : ''" v-html="item.value"> </span>
+              <span :style="selectedItem.id == item.id ? 'color: gold;' : ''" v-html="item.value">
+              </span>
             </label>
           </transition>
         </li>
@@ -29,65 +28,69 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, Ref, ref, computed } from 'vue';
+import { defineComponent, Ref, ref } from 'vue';
-import imageMixin from '../../mixins/imageMixin';
+import { useStore } from '../../store/store';
+import { regions as regionsJSON } from '../../data/options.json';
 
 interface Item {
   id: string;
   value: string;
-  selectedValue?: string;
+  name: string;
 }
 
 export default defineComponent({
-  emits: ['selected'],
+  data() {
-  mixins: [imageMixin],
-
-  props: {
-    itemList: {
-      type: Array as () => Item[],
-      required: true,
-    },
-
-    defaultItemIndex: {
-      type: Number,
-      default: 0,
-    },
-
-    prefix: {
-      type: String,
-      default: '',
-    },
-  },
-
-  setup(props) {
-    let listRef: Ref<Element | null> = ref(null);
-    let buttonRef: Ref<HTMLButtonElement | null> = ref(null);
-
-    let activeEl: Ref<Element | null> = ref(document.activeElement);
-
-    let listOpen = ref(false);
-    let selectedItem: Ref<Item> = ref(props.itemList[props.defaultItemIndex]);
-
-    const computedSelectedItem = computed(() => {
-      return props.itemList.find((item) => item.id === selectedItem.value.id) || props.itemList[props.defaultItemIndex];
-    });
-
     return {
-      computedSelectedItem,
+      store: useStore(),
-      listOpen,
+      selectedItemIndex: 0,
-      selectedItem,
+      listOpen: false
-      listRef,
-      buttonRef,
-      activeEl,
     };
   },
 
-  methods: {
+  setup() {
-    selectOption(item: Item) {
+    let buttonRef: Ref<HTMLButtonElement | null> = ref(null);
-      this.selectedItem = item;
-      this.listOpen = false;
 
-      this.$emit('selected', item);
+    return {
+      buttonRef
+    };
+  },
+
+  watch: {
+    'store.region.id': {
+      handler(regionId) {
+        this.selectedItemIndex = this.regionList.findIndex((reg) => reg.id == regionId);
+      }
+    }
+  },
+
+  computed: {
+    selectedItem() {
+      return this.regionList[this.selectedItemIndex] || null;
+    },
+    regionList() {
+      return regionsJSON.map((region) => {
+        const regionStationCount =
+          this.store.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) {
@@ -99,48 +102,28 @@ export default defineComponent({
     clickedOutside() {
       this.listOpen = false;
       this.buttonRef?.blur();
-    },
+    }
-  },
+  }
 });
 </script>
 
 <style lang="scss" scoped>
 @import '../../styles/variables.scss';
 
-.unfold {
+.region-dropdown {
-  &-enter-from,
-  &-leave-to {
-    opacity: 0;
-    transform: translateY(-10px) scale(0.85);
-  }
-
-  &-enter-active,
-  &-leave-active {
-    transition: all 110ms ease-out;
-  }
-
-  &-enter-active {
-    transition-delay: var(--delay-in);
-  }
-
-  &-leave-active {
-    transition-delay: var(--delay-out);
-  }
-}
-
-.select-box {
   display: flex;
   align-items: center;
+  justify-content: space-between;
 }
 
-.arrow {
+button img {
-  img {
   vertical-align: middle;
   width: 1.35em;
-  }
 }
 
-button.selected {
+button.selected-region {
+  display: flex;
+  justify-content: space-between;
   color: paleturquoise;
 
   font-weight: bold;
@@ -149,11 +132,16 @@ button.selected {
   &:focus {
     background-color: #262626;
   }
+
+  span {
+    margin-right: 10px;
+  }
 }
 
-.select-box_content {
+.content {
   position: relative;
   margin: 0 auto;
+  font-weight: bold;
 
   height: 100%;
 
@@ -214,4 +202,25 @@ li.option {
     cursor: pointer;
   }
 }
+
+.unfold {
+  &-enter-from,
+  &-leave-to {
+    opacity: 0;
+    transform: translateY(-10px) scale(0.85);
+  }
+
+  &-enter-active,
+  &-leave-active {
+    transition: all 110ms ease-out;
+  }
+
+  &-enter-active {
+    transition-delay: var(--delay-in);
+  }
+
+  &-leave-active {
+    transition-delay: var(--delay-out);
+  }
+}
 </style>

src/components/Global/SearchBox.vue

@@ -7,39 +7,31 @@
       @keypress="updateValue"
     />
 
-    <img
+    <img class="search-exit" src="/images/icon-exit.svg" alt="exit-icon" @click="clearSearchValue" />
-      class="search-exit"
-      :src="getIcon('exit')"
-      alt="exit-icon"
-      @click="clearValue"
-    />
   </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, ref, watch } from "vue";
+import { defineComponent, ref, watch } from 'vue';
-import imageMixin from "../../mixins/imageMixin";
 
 export default defineComponent({
-  mixins: [imageMixin],
+  emits: ['update:searchedValue', 'clearValue'],
-
-  emits: ["update:searchedValue", "clearValue"],
   props: {
     searchedValue: {
       type: String,
-      required: true,
+      required: true
     },
     updateOnInput: {
       type: Boolean,
-      default: true,
+      default: true
     },
     titleToTranslate: {
       type: String,
-      required: true,
+      required: true
     },
     clearValue: {
-      type: Function,
+      type: Function
-    },
+    }
   },
 
   setup(props, { emit }) {
@@ -49,32 +41,32 @@ export default defineComponent({
       watch(
         () => compSearchedValue.value,
         (value) => {
-          emit("update:searchedValue", value);
+          emit('update:searchedValue', value);
         }
       );
     }
 
-    const clearValue = () => {
+    const clearSearchValue = () => {
-      compSearchedValue.value = "";
+      compSearchedValue.value = '';
-      emit("clearValue");
+      emit('clearValue');
     };
 
     const updateValue = (e: any) => {
       if (!props.updateOnInput && e.keyCode == 13)
-        emit("update:searchedValue", compSearchedValue.value);
+        emit('update:searchedValue', compSearchedValue.value);
     };
 
     return {
       compSearchedValue,
       updateValue,
-      clearValue,
+      clearSearchValue
     };
-  },
+  }
 });
 </script>
 
 <style lang="scss" scoped>
-@import "../../styles/responsive";
+@import '../../styles/responsive';
 
 .search {
   &-box {

src/components/Global/StationStatusBadge.vue

@@ -1,19 +1,51 @@
+<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;
-$taken: #09a116;
+$online: #09a116;
 $unknown: rgb(185, 60, 60);
 
 .status-badge {
   border-radius: 1rem;
   font-weight: 500;
 
-  padding: 0.2em .55em;
+  padding: 0.2em 0.55em;
 
-  background-color: $taken;
+  background-color: $online;
 
   &.free {
     background-color: $free;
@@ -45,6 +77,7 @@ $unknown: rgb(185, 60, 60);
 
   &.no-space {
     background-color: $no-space;
+    border: 1px solid white;
     color: white;
     font-size: 0.85em;
   }
@@ -54,3 +87,4 @@ $unknown: rgb(185, 60, 60);
     font-size: 0.95em;
   }
 }
+</style>