From 8bedc4dfc62dba4374c3f02b9308a723052b8dad Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Sat, 11 Feb 2023 03:08:24 +0100
Subject: [PATCH 01/12] =?UTF-8?q?feature:=20vmax=20szlak=C3=B3w?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SceneryInfo/SceneryInfoRoutes.vue         | 220 +++++++++---------
 src/components/TrainsView/TrainSchedule.vue   |   4 +
 src/scripts/interfaces/StationRoutes.ts       |  57 ++---
 src/scripts/interfaces/Train.ts               |   2 +-
 src/scripts/interfaces/TrainStop.ts           |   2 +-
 src/store/store.ts                            | 118 +++++-----
 src/store/storeTypes.ts                       |   3 +-
 7 files changed, 207 insertions(+), 199 deletions(-)

diff --git a/src/components/SceneryView/SceneryInfo/SceneryInfoRoutes.vue b/src/components/SceneryView/SceneryInfo/SceneryInfoRoutes.vue
index 50ef6f0..ee1fda2 100644
--- a/src/components/SceneryView/SceneryInfo/SceneryInfoRoutes.vue
+++ b/src/components/SceneryView/SceneryInfo/SceneryInfoRoutes.vue
@@ -1,114 +1,106 @@
-<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"
-          :class="{ 'no-catenary': !route.catenary, internal: route.isInternal }"
-        >
-          {{ route.name }}
-          <b v-if="route.SBL">SBL</b>
-        </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"
-          :class="{ 'no-catenary': !route.catenary, internal: route.isInternal }"
-        >
-          {{ route.name }} <b v-if="route.SBL">SBL</b>
-        </li>
-      </ul>
-    </div>
-
-    <!-- <div
-      class="route-info"
-      :class="{ 'no-catenary': !route.catenary, internal: route.isInternal }"
-      v-for="route in [...station.generalInfo.routes.oneWay, ...station.generalInfo.routes.twoWay].filter(
-        (route) => route.name != '-'
-      )"
-      :key="route.name"
-      :title="`Szlak ${route.name}: ${route.isInternal ? 'wewnętrzny' : 'zewnętrzny'}, ${
-        route.tracks == 2 ? 'dwutorowy' : 'jednotorowy'
-      }, ${route.catenary ? 'zelektryfikowany' : 'niezelektryfikowany'} z ${route.SBL ? 'SBL' : 'PBL'} ${
-        route.TWB ? 'i blokadą dwukierunkową' : ''
-      }`"
-    > -->
-    <!-- <span class="track-name">
-        <b>{{ route.name }}</b>
-      </span> -->
-    <!--
-      <span class="track-specs">
-        {{ route.tracks }}tor
-        <img v-if="route.catenary" :src="icons.trackCatenary" alt="icon track catenary" />
-        <img v-else :src="icons.trackNoCatenary" alt="icon track no catenary" />
-
-        <img v-if="route.TWB" :src="icons.trackTWB" alt="icon track twb" />
-        <img v-if="route.SBL" :src="icons.trackSBL" alt="icon track sbl" />
-      </span> -->
-    <!-- </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: {},
-    },
-  },
-});
-</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;
-
-  li {
-    background-color: #007599;
-
-    padding: 0.2em 0.25em;
-    margin-left: 0.25em;
-
-    &.no-catenary {
-      background-color: #686868;
-    }
-
-    &.internal {
-      text-decoration: underline;
-    }
-
-    b {
-      color: var(--clr-primary);
-    }
-  }
-}
-</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">
+          <span :class="{ 'no-catenary': !route.catenary, internal: route.isInternal }"> {{ route.name }}</span>
+          <span v-if="route.speed" class="speed">{{ 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">
+          <span :class="{ 'no-catenary': !route.catenary, internal: route.isInternal }">{{ route.name }}</span>
+          <span v-if="route.speed" class="speed">{{ 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: {},
+    },
+  },
+});
+</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;
+
+  li {
+    margin: 0.2em 0.25em;
+
+    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>
diff --git a/src/components/TrainsView/TrainSchedule.vue b/src/components/TrainsView/TrainSchedule.vue
index e8fe839..29b9d86 100644
--- a/src/components/TrainsView/TrainSchedule.vue
+++ b/src/components/TrainsView/TrainSchedule.vue
@@ -89,6 +89,7 @@ import dateMixin from '../../mixins/dateMixin';
 import imageMixin from '../../mixins/imageMixin';
 import Train from '../../scripts/interfaces/Train';
 import TrainStop from '../../scripts/interfaces/TrainStop';
+import { useStore } from '../../store/store';
 import StopDate from '../Global/StopDate.vue';
 
 export default defineComponent({
@@ -106,6 +107,8 @@ export default defineComponent({
 
   setup(props) {
     return {
+      store: useStore(),
+
       lastConfirmed: computed(() => {
         return props.train.timetableData!.followingStops.findIndex(
           (stop, i, stops) => stop.confirmed && !stops[i + 1]?.confirmed && !stops[i + 1]?.stopped
@@ -424,3 +427,4 @@ ul.stop_list > li.stop {
   }
 }
 </style>
+
diff --git a/src/scripts/interfaces/StationRoutes.ts b/src/scripts/interfaces/StationRoutes.ts
index 434c343..b7587ac 100644
--- a/src/scripts/interfaces/StationRoutes.ts
+++ b/src/scripts/interfaces/StationRoutes.ts
@@ -1,27 +1,30 @@
-export default interface StationRoutes {
-    oneWay:
-    {
-        name: string;
-        catenary: boolean;
-        SBL: boolean;
-        TWB: boolean;
-        isInternal: boolean;
-        tracks: number;
-    }[];
-
-    twoWay: {
-        name: string;
-        catenary: boolean;
-        SBL: boolean;
-        TWB: boolean;
-        isInternal: boolean;
-        tracks: number;
-    }[];
-
-    /* [catenary, noCatenary] */
-    oneWayCatenaryRouteNames: string[];
-    oneWayNoCatenaryRouteNames: string[];
-    twoWayCatenaryRouteNames: string[];
-    twoWayNoCatenaryRouteNames: string[];
-    sblRouteNames: string[];
-}
\ No newline at end of file
+export default interface StationRoutes {
+  oneWay: {
+    name: string;
+    catenary: boolean;
+    SBL: boolean;
+    TWB: boolean;
+    isInternal: boolean;
+    tracks: number;
+    speed: number;
+    length: number;
+  }[];
+
+  twoWay: {
+    name: string;
+    catenary: boolean;
+    SBL: boolean;
+    TWB: boolean;
+    isInternal: boolean;
+    tracks: number;
+    speed: number;
+    length: number;
+  }[];
+
+  /* [catenary, noCatenary] */
+  oneWayCatenaryRouteNames: string[];
+  oneWayNoCatenaryRouteNames: string[];
+  twoWayCatenaryRouteNames: string[];
+  twoWayNoCatenaryRouteNames: string[];
+  sblRouteNames: string[];
+}
diff --git a/src/scripts/interfaces/Train.ts b/src/scripts/interfaces/Train.ts
index b4e4dfb..8c46386 100644
--- a/src/scripts/interfaces/Train.ts
+++ b/src/scripts/interfaces/Train.ts
@@ -12,7 +12,7 @@ export default interface Train {
   driverId: number;
   trainNo: number;
   driverName: string;
-  driverLevel: number;
+  driverLevel?: number;
   currentStationName: string;
   currentStationHash: string;
   locoURL: string;
diff --git a/src/scripts/interfaces/TrainStop.ts b/src/scripts/interfaces/TrainStop.ts
index 7062d13..3572504 100644
--- a/src/scripts/interfaces/TrainStop.ts
+++ b/src/scripts/interfaces/TrainStop.ts
@@ -1,4 +1,4 @@
-export default interface  TrainStop {
+export default interface TrainStop {
   stopName: string;
   stopNameRAW: string;
   stopType: string;
diff --git a/src/store/store.ts b/src/store/store.ts
index b72cdc8..ac12b04 100644
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@ -24,6 +24,7 @@ export const useStore = defineStore('store', {
 
       stationList: [],
       trainList: [],
+      routesList: [],
 
       sceneryData: [],
       lastDispatcherStatuses: [],
@@ -115,8 +116,8 @@ export const useStore = defineStore('store', {
                   sceneries: timetable.sceneries,
                 }
               : undefined,
-          };
-        }) as Train[];
+          } as Train;
+        });
     },
 
     getDispatcherStatus(onlineStationData: StationAPIData) {
@@ -294,65 +295,72 @@ export const useStore = defineStore('store', {
         return;
       }
 
-      this.stationList = sceneryData.map((scenery) => ({
-        name: scenery.name,
+      this.stationList = sceneryData.map((scenery) => {
+        return {
+          name: scenery.name,
 
-        generalInfo: {
-          ...scenery,
-          authors: scenery.authors?.split(',').map((a) => a.trim()),
-          routes:
-            scenery.routes
-              ?.split(';')
-              .filter((routeString) => routeString)
-              .reduce(
-                (acc, routeString) => {
-                  const specs1 = routeString.split('_')[0];
-                  const isInternal = specs1.startsWith('!');
-                  const name = isInternal ? specs1.replace('!', '') : specs1;
+          generalInfo: {
+            ...scenery,
+            authors: scenery.authors?.split(',').map((a) => a.trim()),
+            routes:
+              scenery.routes
+                ?.split(';')
+                .filter((routeString) => routeString)
+                .reduce(
+                  (acc, routeString) => {
+                    const specs1 = routeString.split('_')[0];
+                    const isInternal = specs1.startsWith('!');
+                    const name = isInternal ? specs1.replace('!', '') : specs1;
 
-                  const specs2 = routeString.split('_')[1].split('');
-                  const twoWay = specs2[0] == '2';
-                  const catenary = specs2[1] == 'E';
-                  const SBL = specs2[2] == 'S';
-                  const TWB = specs2[3] ? true : false;
+                    const specs2 = routeString.split('_')[1].split('');
+                    const twoWay = specs2[0] == '2';
+                    const catenary = specs2[1] == 'E';
+                    const SBL = specs2[2] == 'S';
+                    const TWB = specs2[3] ? true : false;
+                    const speed = Number(routeString.split(':')[1]) || 0;
+                    const length  = Number(routeString.split(':')[2]) || 0;
 
-                  const propName = twoWay
-                    ? catenary
-                      ? 'twoWayCatenaryRouteNames'
-                      : 'twoWayNoCatenaryRouteNames'
-                    : catenary
-                    ? 'oneWayCatenaryRouteNames'
-                    : 'oneWayNoCatenaryRouteNames';
 
-                  acc[twoWay ? 'twoWay' : 'oneWay'].push({
-                    name,
-                    SBL,
-                    TWB,
-                    catenary,
-                    isInternal,
-                    tracks: twoWay ? 2 : 1,
-                  });
-                  if (!isInternal) acc[propName].push(name);
+                    const propName = twoWay
+                      ? catenary
+                        ? 'twoWayCatenaryRouteNames'
+                        : 'twoWayNoCatenaryRouteNames'
+                      : catenary
+                      ? 'oneWayCatenaryRouteNames'
+                      : 'oneWayNoCatenaryRouteNames';
 
-                  if (SBL) acc['sblRouteNames'].push(name);
+                    acc[twoWay ? 'twoWay' : 'oneWay'].push({
+                      name,
+                      SBL,
+                      TWB,
+                      catenary,
+                      isInternal,
+                      tracks: twoWay ? 2 : 1,
+                      length,
+                      speed,
+                    });
+                    if (!isInternal) acc[propName].push(name);
 
-                  return acc;
-                },
-                {
-                  oneWay: [],
-                  twoWay: [],
-                  sblRouteNames: [],
-                  oneWayCatenaryRouteNames: [],
-                  oneWayNoCatenaryRouteNames: [],
-                  twoWayCatenaryRouteNames: [],
-                  twoWayNoCatenaryRouteNames: [],
-                } as StationRoutes
-              ) || {},
-          checkpoints: scenery.checkpoints
-            ? scenery.checkpoints.split(';').map((sub) => ({ checkpointName: sub, scheduledTrains: [] }))
-            : [],
-        },
-      }));
+                    if (SBL) acc['sblRouteNames'].push(name);
+
+                    return acc;
+                  },
+                  {
+                    oneWay: [],
+                    twoWay: [],
+                    sblRouteNames: [],
+                    oneWayCatenaryRouteNames: [],
+                    oneWayNoCatenaryRouteNames: [],
+                    twoWayCatenaryRouteNames: [],
+                    twoWayNoCatenaryRouteNames: [],
+                  } as StationRoutes
+                ) || {},
+            checkpoints: scenery.checkpoints
+              ? scenery.checkpoints.split(';').map((sub) => ({ checkpointName: sub, scheduledTrains: [] }))
+              : [],
+          },
+        };
+      });
     },
 
     connectToWebsocket() {
diff --git a/src/store/storeTypes.ts b/src/store/storeTypes.ts
index 632ef84..d06fef5 100644
--- a/src/store/storeTypes.ts
+++ b/src/store/storeTypes.ts
@@ -69,8 +69,9 @@ export interface StationJSONData {
   SUP: boolean;
 
   routes: string;
+  
   checkpoints: string | null;
   authors?: string;
 
   availability: Availability;
-}
+}
\ No newline at end of file

From e959eac6c541ff696ebfd8d7079489c4d6df2507 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Sat, 11 Feb 2023 03:14:43 +0100
Subject: [PATCH 02/12] hotfix

---
 src/scripts/interfaces/Train.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/scripts/interfaces/Train.ts b/src/scripts/interfaces/Train.ts
index 8c46386..b4e4dfb 100644
--- a/src/scripts/interfaces/Train.ts
+++ b/src/scripts/interfaces/Train.ts
@@ -12,7 +12,7 @@ export default interface Train {
   driverId: number;
   trainNo: number;
   driverName: string;
-  driverLevel?: number;
+  driverLevel: number;
   currentStationName: string;
   currentStationHash: string;
   locoURL: string;

From 2f6e2e740236f322bbe25aeb37d141d87270dfb6 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Sun, 12 Feb 2023 00:30:05 +0100
Subject: [PATCH 03/12] =?UTF-8?q?fix:=20responsywno=C5=9B=C4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.scss                                                 | 2 +-
 src/components/SceneryView/SceneryInfo/SceneryInfoRoutes.vue | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/App.scss b/src/App.scss
index 4fb119d..267bc52 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -46,7 +46,7 @@
   font-size: 1rem;
 
   @include smallScreen() {
-    font-size: calc(0.5rem + 1.1vw);
+    font-size: calc(0.65rem + 1.1vw);
   }
 
   @include screenLandscape() {
diff --git a/src/components/SceneryView/SceneryInfo/SceneryInfoRoutes.vue b/src/components/SceneryView/SceneryInfo/SceneryInfoRoutes.vue
index ee1fda2..71a1941 100644
--- a/src/components/SceneryView/SceneryInfo/SceneryInfoRoutes.vue
+++ b/src/components/SceneryView/SceneryInfo/SceneryInfoRoutes.vue
@@ -61,9 +61,11 @@ export default defineComponent({
 ul.routes-list {
   margin: 0.45em 0.25em;
   display: flex;
+  justify-content: center;
+  flex-wrap: wrap;
 
   li {
-    margin: 0.2em 0.25em;
+    margin: 0.5em 0.25em;
 
     span {
       padding: 0.2em 0.25em;

From 36d71292bcc4e9aa7e004262f053f9d267d95ba5 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Sun, 12 Feb 2023 00:42:37 +0100
Subject: [PATCH 04/12] =?UTF-8?q?feature:=20url=20projekt=C3=B3w?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SceneryView/SceneryHeader.vue |  2 +-
 src/components/SceneryView/SceneryInfo.vue   | 26 ++++++++++++--------
 src/scripts/interfaces/Station.ts            |  5 ++--
 src/store/storeTypes.ts                      |  1 +
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/components/SceneryView/SceneryHeader.vue b/src/components/SceneryView/SceneryHeader.vue
index 40126df..ab40750 100644
--- a/src/components/SceneryView/SceneryHeader.vue
+++ b/src/components/SceneryView/SceneryHeader.vue
@@ -1,6 +1,6 @@
 <template>
   <section class="info-header">
-    <a class="scenery-name" :href="station.generalInfo?.url">
+    <a class="scenery-name" :href="station.generalInfo?.url" target="_blank">
       {{ station.name }}
     </a>
 
diff --git a/src/components/SceneryView/SceneryInfo.vue b/src/components/SceneryView/SceneryInfo.vue
index 077f421..6bd23e1 100644
--- a/src/components/SceneryView/SceneryInfo.vue
+++ b/src/components/SceneryView/SceneryInfo.vue
@@ -26,26 +26,32 @@
           </span>
           <span v-if="station.generalInfo.project">
             &bull; <b>{{ $t('scenery.project-title') }}: </b>
-            <b style="color: salmon">{{ station.generalInfo.project }}</b>
+            <a
+              style="color: salmon; text-decoration: underline; font-weight: bold"
+              :href="station.generalInfo.projectUrl"
+              target="_blank"
+              >{{ station.generalInfo.project }}</a
+            >
           </span>
         </div>
 
         <scenery-info-routes :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>
+          <b>
+            {{
+              $t(
+                'scenery.authors-title',
+                { authors: station.generalInfo.authors.length },
+                station.generalInfo.authors.length
+              )
+            }}:
+          </b>
           {{ station.generalInfo.authors.join(', ') }}
         </div>
-
-        <br />
-        <div class="scenery-topic" v-if="station.generalInfo.url">
-          <a :href="station.generalInfo.url" target="_blank">
-            &gt; {{ $t('scenery.forum-topic', { name: station.name }) }} &lt;
-          </a>
-        </div>
       </div>
 
-      <div style="margin: 2em 0; height: 2px; background-color: white" />
+      <div style="margin: 2em 0; height: 2px; background-color: white"></div>
 
       <!-- info dispatcher -->
       <scenery-info-dispatcher :station="station" :onlineFrom="onlineFrom" />
diff --git a/src/scripts/interfaces/Station.ts b/src/scripts/interfaces/Station.ts
index 16be93b..ac1f07f 100644
--- a/src/scripts/interfaces/Station.ts
+++ b/src/scripts/interfaces/Station.ts
@@ -8,12 +8,13 @@ export default interface Station {
   generalInfo?: {
     name: string;
     url: string;
-
+    
     reqLevel: number;
     // supportersOnly: boolean;
-
+    
     lines: string;
     project: string;
+    projectUrl?: string;
 
     signalType: string;
     controlType: string;
diff --git a/src/store/storeTypes.ts b/src/store/storeTypes.ts
index d06fef5..05be43d 100644
--- a/src/store/storeTypes.ts
+++ b/src/store/storeTypes.ts
@@ -60,6 +60,7 @@ export interface StationJSONData {
   url: string;
   lines: string;
   project: string;
+  projectUrl: string;
 
   reqLevel: number;
 

From e14d328ed9260331dba9fdae7c8b4f34f7c93959 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Sun, 12 Feb 2023 00:48:18 +0100
Subject: [PATCH 05/12] =?UTF-8?q?fix:=20wielko=C5=9B=C4=87=20scrollbaru?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/global.scss | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/styles/global.scss b/src/styles/global.scss
index 2cd46e6..96f9129 100644
--- a/src/styles/global.scss
+++ b/src/styles/global.scss
@@ -18,17 +18,15 @@
 }
 
 ::-webkit-scrollbar {
-  width: 1rem;
-  height: 1rem;
+  width: 15px;
+  height: 15px;
   background-color: transparent;
 
   &-track {
-    border-radius: 0.5em;
     background-color: #333;
   }
 
   &-thumb {
-    border-radius: 0.5em;
     background-color: #666;
   }
 }
@@ -47,7 +45,7 @@ body {
 
   &.no-scroll {
     overflow-y: hidden;
-    padding-right: 1rem;
+    padding-right: 15px;
 
     @include smallScreen() {
       padding: 0;

From 59bd3fa2efff68ca1a006ccf93a8277e9aa0ef8f Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Sun, 12 Feb 2023 12:58:23 +0100
Subject: [PATCH 06/12] =?UTF-8?q?design:=20badge=20poziom=C3=B3w?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.scss                                  |  2 +-
 .../JournalView/JournalDispatchersList.vue    | 39 +++------
 .../JournalView/JournalTimetablesList.vue     | 53 ++++++++----
 .../SceneryView/SceneryDispatchersHistory.vue | 41 ++++++---
 src/components/SceneryView/SceneryInfo.vue    |  8 +-
 src/components/TrainsView/TrainInfo.vue       | 12 +--
 src/styles/badge.scss                         | 86 +++++++++++++------
 7 files changed, 145 insertions(+), 96 deletions(-)

diff --git a/src/App.scss b/src/App.scss
index 267bc52..4fb119d 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -46,7 +46,7 @@
   font-size: 1rem;
 
   @include smallScreen() {
-    font-size: calc(0.65rem + 1.1vw);
+    font-size: calc(0.5rem + 1.1vw);
   }
 
   @include screenLandscape() {
diff --git a/src/components/JournalView/JournalDispatchersList.vue b/src/components/JournalView/JournalDispatchersList.vue
index 68880ac..e72ce69 100644
--- a/src/components/JournalView/JournalDispatchersList.vue
+++ b/src/components/JournalView/JournalDispatchersList.vue
@@ -17,10 +17,10 @@
         @keydown.enter="navigateToScenery(item.stationName, item.isOnline)"
         tabindex="0"
       >
-        <span>
+        <span class="item-general">
           <b
             v-if="item.dispatcherLevel !== null"
-            class="dispatcher-level"
+            class="level-badge dispatcher"
             :style="calculateExpStyle(item.dispatcherLevel, item.dispatcherIsSupporter)"
           >
             {{ item.dispatcherLevel >= 2 ? item.dispatcherLevel : 'L' }}
@@ -31,7 +31,7 @@
           <span class="region-badge" :class="item.region">PL1</span>
         </span>
 
-        <span>
+        <span class="item-time">
           <span :data-status="item.isOnline"> {{ item.isOnline ? $t('journal.online-since') : 'OFFLINE' }}&nbsp; </span>
           <span>
             {{ new Date(item.timestampFrom).toLocaleTimeString('pl-PL', { timeStyle: 'short' }) }}
@@ -99,18 +99,9 @@ export default defineComponent({
 <style lang="scss" scoped>
 @import '../../styles/animations.scss';
 @import '../../styles/responsive.scss';
+@import '../../styles/badge.scss';
 @import '../../styles/JournalSection.scss';
 
-.region-badge {
-  padding: 0.1em 0.5em;
-  border-radius: 0.5em;
-  font-weight: bold;
-
-  &.eu {
-    background-color: forestgreen;
-  }
-}
-
 li.sticky {
   position: sticky;
   top: 0;
@@ -141,6 +132,16 @@ li.sticky {
   }
 }
 
+.item-general {
+  display: flex;
+  align-items: center;
+  gap: 0.25em;
+
+  .level-badge {
+    margin-right: 0.25em;
+  }
+}
+
 .journal_day {
   margin-bottom: 1em;
   padding: 0.5em;
@@ -157,16 +158,4 @@ li.sticky {
     font-weight: bold;
   }
 }
-
-.dispatcher-level {
-  display: inline-block;
-  text-align: center;
-
-  line-height: 1.45em;
-  width: 1.45em;
-  height: 1.45em;
-
-  margin-right: 0.45em;
-  border-radius: 0.25em;
-}
 </style>
diff --git a/src/components/JournalView/JournalTimetablesList.vue b/src/components/JournalView/JournalTimetablesList.vue
index 36ad0bd..a14f89e 100644
--- a/src/components/JournalView/JournalTimetablesList.vue
+++ b/src/components/JournalView/JournalTimetablesList.vue
@@ -6,25 +6,35 @@
       :key="timetable.id"
     >
       <div class="journal_item-info">
-        <div class="info-top">
+        <div class="info-general">
           <span
+            class="general-train"
             tabindex="0"
             @click="showTimetable(timetable)"
             @keydown.enter="showTimetable(timetable)"
             style="cursor: pointer"
           >
-            <b class="text--primary">{{ timetable.trainCategoryCode }}&nbsp;</b>
-            <b>{{ timetable.trainNo }}</b>
-            | <span>{{ timetable.driverName }}</span> |
             <span class="text--grayed">#{{ timetable.id }}</span>
-            <span v-if="timetable.driverLevel !== null">
-              |
-              <b :style="calculateTextExpStyle(timetable.driverLevel, timetable.driverIsSupporter)">
-                {{ timetable.driverLevel < 2 ? 'L' : `${timetable.driverLevel} lvl` }}
-              </b>
+            &bull;
+            <span>
+              <strong class="text--primary">
+                {{ timetable.trainCategoryCode }}
+              </strong>
+              <strong>&nbsp;{{ timetable.trainNo }}</strong>
             </span>
+            &bull;
+            <strong
+              v-if="timetable.driverLevel !== null"
+              class="level-badge driver"
+              :style="calculateExpStyle(timetable.driverLevel, timetable.driverIsSupporter)"
+            >
+              {{ timetable.driverLevel < 2 ? 'L' : `${timetable.driverLevel}` }}
+            </strong>
+
+            <strong>{{ timetable.driverName }}</strong>
           </span>
-          <span>
+
+          <span class="general-time">
             <b class="info-date">{{ localeDay(timetable.beginDate, $i18n.locale) }}</b>
             <b
               class="info-status"
@@ -189,6 +199,7 @@ export default defineComponent({
     },
 
     showTimetable(timetable: TimetableHistory) {
+      if (!timetable) return;
       if (timetable.terminated) return;
 
       this.selectModalTrain(timetable.driverName + timetable.trainNo.toString());
@@ -209,7 +220,6 @@ export default defineComponent({
 @import '../../styles/badge.scss';
 @import '../../styles/JournalSection.scss';
 
-
 hr {
   margin: 0.25em 0;
 }
@@ -236,10 +246,14 @@ hr {
     }
   }
 
-  &-top {
+  &-general {
     display: flex;
-    flex-wrap: wrap;
     justify-content: space-between;
+    align-items: center;
+    flex-wrap: wrap;
+
+    gap: 0.25em;
+    margin-bottom: 0.5em;
   }
 
   &-route {
@@ -251,6 +265,12 @@ hr {
   }
 }
 
+.general-train {
+  display: flex;
+  align-items: center;
+  gap: 0.25em;
+}
+
 ul.stock-list {
   display: flex;
   align-items: flex-end;
@@ -291,14 +311,9 @@ ul.stock-list {
 }
 
 @include smallScreen {
-  .info-top {
+  .info-general {
     flex-direction: column;
-
-    span {
-      margin: 0.1em auto;
-    }
   }
-
   .info-extended {
     text-align: center;
   }
diff --git a/src/components/SceneryView/SceneryDispatchersHistory.vue b/src/components/SceneryView/SceneryDispatchersHistory.vue
index bf0e068..17b4c73 100644
--- a/src/components/SceneryView/SceneryDispatchersHistory.vue
+++ b/src/components/SceneryView/SceneryDispatchersHistory.vue
@@ -5,25 +5,31 @@
     <div class="list-warning" v-else-if="dispatcherHistoryList.length == 0">{{ $t('scenery.history-list-empty') }}</div>
 
     <ul class="history-list" v-else>
-      <li class="list-item" v-for="historyItem in dispatcherHistoryList">
-        <div>
-          <router-link :to="`/journal/dispatchers?dispatcherName=${historyItem.dispatcherName}`">
-            <span class="text--grayed">#{{ historyItem.stationHash }}&nbsp;</span>
-            <b>{{ historyItem.dispatcherName }}</b>
-          </router-link>
-        </div>
+      <li class="list-item" v-for="item in dispatcherHistoryList">
+        <router-link class="item-general" :to="`/journal/dispatchers?dispatcherName=${item.dispatcherName}`">
+          <span class="text--grayed">#{{ item.stationHash }}&nbsp;</span>
+          <b
+            v-if="item.dispatcherLevel !== null"
+            class="level-badge dispatcher"
+            :style="calculateExpStyle(item.dispatcherLevel, item.dispatcherIsSupporter)"
+          >
+            {{ item.dispatcherLevel >= 2 ? item.dispatcherLevel : 'L' }}
+          </b>
 
-        <div v-if="historyItem.timestampTo">
-          <b>{{ $d(historyItem.timestampFrom) }}</b>
+          <b>{{ item.dispatcherName }}</b>
+        </router-link>
 
-          {{ timestampToString(historyItem.timestampFrom) }}
-          - {{ timestampToString(historyItem.timestampTo) }} ({{ calculateDuration(historyItem.currentDuration) }})
+        <div v-if="item.timestampTo">
+          <b>{{ $d(item.timestampFrom) }}</b>
+
+          {{ timestampToString(item.timestampFrom) }}
+          - {{ timestampToString(item.timestampTo) }} ({{ calculateDuration(item.currentDuration) }})
         </div>
 
         <div class="dispatcher-online" v-else>
           {{ $t('journal.online-since') }}
-          <b>{{ timestampToString(historyItem.timestampFrom) }}</b>
-          ({{ calculateDuration(historyItem.currentDuration) }})
+          <b>{{ timestampToString(item.timestampFrom) }}</b>
+          ({{ calculateDuration(item.currentDuration) }})
         </div>
       </li>
     </ul>
@@ -39,10 +45,11 @@ import { DispatcherHistory } from '../../scripts/interfaces/api/DispatchersAPIDa
 import Station from '../../scripts/interfaces/Station';
 import { URLs } from '../../scripts/utils/apiURLs';
 import Loading from '../Global/Loading.vue';
+import styleMixin from '../../mixins/styleMixin';
 
 export default defineComponent({
   name: 'SceneryDispatchersHistory',
-  mixins: [dateMixin],
+  mixins: [dateMixin, styleMixin],
   props: {
     station: {
       type: Object as PropType<Station>,
@@ -96,6 +103,12 @@ export default defineComponent({
   line-height: 1.5em;
 }
 
+.item-general {
+  display: flex;
+  align-items: center;
+  gap: 0.25em;
+}
+
 .dispatcher-online {
   color: springgreen;
 }
diff --git a/src/components/SceneryView/SceneryInfo.vue b/src/components/SceneryView/SceneryInfo.vue
index 6bd23e1..82a9dc4 100644
--- a/src/components/SceneryView/SceneryInfo.vue
+++ b/src/components/SceneryView/SceneryInfo.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="scenery-info">
     <section v-if="!timetableOnly">
-      <div class="info-general" v-if="station.generalInfo">
+      <div class="scenery-info-general" v-if="station.generalInfo">
         <scenery-info-icons :station="station" />
 
-        <div class="general-list">
+        <div class="scenery-general-list">
           <span>
             <b>{{ $t('availability.title') }}:</b> {{ $t(`availability.${station.generalInfo.availability}`) }}
 
@@ -130,11 +130,11 @@ h3.section-header {
   margin-top: 1em;
 }
 
-.info-general {
+.scenery-info-general {
   margin-top: 1em;
 }
 
-.general-list {
+.scenery-general-list {
   display: flex;
   justify-content: center;
   flex-wrap: wrap;
diff --git a/src/components/TrainsView/TrainInfo.vue b/src/components/TrainsView/TrainInfo.vue
index 16f6123..fd200bc 100644
--- a/src/components/TrainsView/TrainInfo.vue
+++ b/src/components/TrainsView/TrainInfo.vue
@@ -14,12 +14,11 @@
           <span v-if="train.timetableData">{{ train.timetableData.category }}&nbsp;</span>
           <span class="train-number">{{ train.trainNo }}</span>
         </strong>
-        <span>|</span>
-        <span>{{ train.driverName }}</span>
-        <span>|</span>
-        <b :style="calculateTextExpStyle(train.driverLevel, train.isSupporter)">
-          {{ train.driverLevel < 2 ? 'L' : `${train.driverLevel} lvl` }}
+        <span>&bull;</span>
+        <b class="level-badge driver" :style="calculateExpStyle(train.driverLevel, train.isSupporter)">
+          {{ train.driverLevel < 2 ? 'L' : `${train.driverLevel}` }}
         </b>
+        <span>{{ train.driverName }}</span>
       </div>
 
       <div class="timetable_route" v-if="train.timetableData">
@@ -117,6 +116,8 @@ export default defineComponent({
 
 <style lang="scss" scoped>
 @import '../../styles/responsive.scss';
+@import '../../styles/badge.scss';
+
 
 .image-warning {
   height: 1em;
@@ -172,6 +173,7 @@ export default defineComponent({
   flex-wrap: wrap;
 
   gap: 0.25em;
+  margin-right: 1.5em;
 }
 .train-status-badges {
   display: flex;
diff --git a/src/styles/badge.scss b/src/styles/badge.scss
index aa029d1..f574e18 100644
--- a/src/styles/badge.scss
+++ b/src/styles/badge.scss
@@ -1,28 +1,58 @@
-.badge {
-  font-weight: 600;
-
-  display: inline-block;
-  padding: 0;
-
-  background: #585858;
-
-  margin: 0.25em;
-
-  span {
-    display: inline-block;
-    padding: 0.2em 0.4em;
-  }
-
-  &-none {
-    font-weight: 600;
-
-    padding: 0.2em 0.4em;
-    background: firebrick;
-
-    text-align: center;
-
-    @include smallScreen() {
-      font-size: 1em;
-    }
-  }
-}
\ No newline at end of file
+.badge {
+  font-weight: 600;
+
+  display: inline-block;
+  padding: 0;
+
+  background: #585858;
+
+  margin: 0.25em;
+
+  span {
+    display: inline-block;
+    padding: 0.2em 0.4em;
+  }
+
+  &-none {
+    font-weight: 600;
+
+    padding: 0.2em 0.4em;
+    background: firebrick;
+
+    text-align: center;
+
+    @include smallScreen() {
+      font-size: 1em;
+    }
+  }
+}
+
+.level-badge {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 0.9em;
+
+  &.driver {
+    border-radius: 50%;
+    width: 1.7em;
+    height: 1.7em;
+  }
+
+  &.dispatcher {
+    border-radius: 0.25em;
+
+    width: 1.6em;
+    height: 1.6em;
+  }
+}
+
+.region-badge {
+  padding: 0 0.5em;
+  border-radius: 0.5em;
+  font-weight: bold;
+
+  &.eu {
+    background-color: forestgreen;
+  }
+}

From b9868ba52ee4cf7e00a217b440952d745f1ac321 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Sun, 12 Feb 2023 16:12:48 +0100
Subject: [PATCH 07/12] dzienniki: stylistyka

---
 src/App.scss                                  |  2 +-
 .../JournalView/JournalDispatchersList.vue    |  2 +
 .../JournalView/JournalTimetablesList.vue     |  2 +-
 .../SceneryView/SceneryDispatchersHistory.vue |  3 +-
 .../SceneryView/SceneryTimetablesHistory.vue  | 82 +++++++++++++++----
 src/components/TrainsView/TrainInfo.vue       |  2 +-
 src/mixins/styleMixin.ts                      |  4 +-
 src/styles/global.scss                        |  4 +
 8 files changed, 80 insertions(+), 21 deletions(-)

diff --git a/src/App.scss b/src/App.scss
index 4fb119d..1033d9d 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -46,7 +46,7 @@
   font-size: 1rem;
 
   @include smallScreen() {
-    font-size: calc(0.5rem + 1.1vw);
+    font-size: calc(0.55rem + 1.1vw);
   }
 
   @include screenLandscape() {
diff --git a/src/components/JournalView/JournalDispatchersList.vue b/src/components/JournalView/JournalDispatchersList.vue
index e72ce69..2b63c99 100644
--- a/src/components/JournalView/JournalDispatchersList.vue
+++ b/src/components/JournalView/JournalDispatchersList.vue
@@ -136,6 +136,8 @@ li.sticky {
   display: flex;
   align-items: center;
   gap: 0.25em;
+  flex-wrap: wrap;
+
 
   .level-badge {
     margin-right: 0.25em;
diff --git a/src/components/JournalView/JournalTimetablesList.vue b/src/components/JournalView/JournalTimetablesList.vue
index a14f89e..e4ad7cd 100644
--- a/src/components/JournalView/JournalTimetablesList.vue
+++ b/src/components/JournalView/JournalTimetablesList.vue
@@ -252,7 +252,7 @@ hr {
     align-items: center;
     flex-wrap: wrap;
 
-    gap: 0.25em;
+    gap: 0.5em;
     margin-bottom: 0.5em;
   }
 
diff --git a/src/components/SceneryView/SceneryDispatchersHistory.vue b/src/components/SceneryView/SceneryDispatchersHistory.vue
index 17b4c73..ca07009 100644
--- a/src/components/SceneryView/SceneryDispatchersHistory.vue
+++ b/src/components/SceneryView/SceneryDispatchersHistory.vue
@@ -62,7 +62,7 @@ export default defineComponent({
       dataStatus: DataStatus.Loading,
     };
   },
-  mounted() {
+  activated() {
     this.fetchAPIData();
   },
   methods: {
@@ -106,6 +106,7 @@ export default defineComponent({
 .item-general {
   display: flex;
   align-items: center;
+  flex-wrap: wrap;
   gap: 0.25em;
 }
 
diff --git a/src/components/SceneryView/SceneryTimetablesHistory.vue b/src/components/SceneryView/SceneryTimetablesHistory.vue
index e59e311..7182fac 100644
--- a/src/components/SceneryView/SceneryTimetablesHistory.vue
+++ b/src/components/SceneryView/SceneryTimetablesHistory.vue
@@ -2,8 +2,46 @@
   <section class="scenery-timetables-history scenery-section">
     <Loading v-if="dataStatus != 2" />
 
-    <div class="list-warning" v-else-if="sceneryHistoryList.length == 0">{{ $t('scenery.history-list-empty') }}</div>
-    <ul class="history-list" v-else>
+    <table v-else-if="sceneryHistoryList.length">
+      <thead>
+        <th>ID</th>
+        <th>Kat. nr</th>
+        <th>Relacja</th>
+        <th>Maszynista</th>
+        <th>Autor RJ</th>
+        <th>Data</th>
+      </thead>
+
+      <tbody>
+        <tr v-for="historyItem in sceneryHistoryList" @click="test">
+          <td>
+            <router-link :to="`/journal/timetables?timetableId=${historyItem.id}`">#{{ historyItem.id }}</router-link>
+          </td>
+          <td>
+            <b class="text--primary">{{ historyItem.trainCategoryCode }}</b> <br />
+            {{ historyItem.trainNo }}
+          </td>
+          <td>{{ historyItem.route.replace('|', ' -> ') }}</td>
+          <td>{{ historyItem.driverName }}</td>
+          <td>
+            <router-link
+              v-if="historyItem.authorName"
+              :to="`/journal/dispatchers?dispatcherName=${historyItem.authorName}`"
+              >{{ historyItem.authorName }}
+            </router-link>
+            <i v-else>{{ $t('scenery.timetable-author-unknown') }}</i>
+          </td>
+          <td>
+            <b>{{ localeDay(historyItem.beginDate, $i18n.locale) }}</b>
+            {{ localeTime(historyItem.beginDate, $i18n.locale) }}
+          </td>
+        </tr>
+      </tbody>
+    </table>
+
+    <div class="list-warning" v-else>{{ $t('scenery.history-list-empty') }}</div>
+
+    <!-- <ul class="history-list" v-else>
       <li class="list-item" v-for="historyItem in sceneryHistoryList">
         <div>
           <b>{{ localeDay(historyItem.beginDate, $i18n.locale) }}</b>
@@ -19,16 +57,14 @@
         </div>
 
         <div>{{ historyItem.route.replace('|', ' -> ') }}</div>
-        <!-- <div>{{ historyItem.routeDistance }} km</div> -->
         <div>
           {{ $t('scenery.timetable-author-title') }}:
           <b v-if="historyItem.authorName">{{ historyItem.authorName }}</b>
           <i v-else>{{ $t('scenery.timetable-author-unknown') }}</i>
         </div>
 
-        <!-- <div v-if="historyItem.authorId">{{ historyItem.authorName }}</div> -->
       </li>
-    </ul>
+    </ul> -->
   </section>
 </template>
 
@@ -57,7 +93,7 @@ export default defineComponent({
       dataStatus: DataStatus.Loading,
     };
   },
-  mounted() {
+  activated() {
     this.fetchAPIData();
   },
   methods: {
@@ -72,6 +108,10 @@ export default defineComponent({
         console.error(error);
       }
     },
+
+    test() {
+      console.log('test');
+    },
   },
   components: { Loading },
 });
@@ -91,17 +131,29 @@ export default defineComponent({
   padding: 0 0.5em;
 }
 
-.list-item {
-  display: grid;
-  grid-template-columns: 1fr 2fr 2fr 1fr;
-  gap: 1em;
-  align-items: center;
+table {
+  width: 100%;
+  border-collapse: collapse;
 
-  background-color: #353535;
-  padding: 0.5em;
-  margin: 0.5em 0;
+  thead {
+    position: sticky;
+    top: 0;
+    background-color: #222222;
+  }
 
-  line-height: 1.5em;
+  th {
+    padding: 0.5em;
+  }
+
+  tr {
+    background-color: #353535;
+    border: none;
+  }
+
+  td {
+    padding: 0.75em;
+    border-bottom: solid 5px #111;
+  }
 }
 
 @include smallScreen {
diff --git a/src/components/TrainsView/TrainInfo.vue b/src/components/TrainsView/TrainInfo.vue
index fd200bc..37be2b5 100644
--- a/src/components/TrainsView/TrainInfo.vue
+++ b/src/components/TrainsView/TrainInfo.vue
@@ -11,7 +11,7 @@
         </span>
 
         <strong>
-          <span v-if="train.timetableData">{{ train.timetableData.category }}&nbsp;</span>
+          <span v-if="train.timetableData" class="text--primary">{{ train.timetableData.category }}&nbsp;</span>
           <span class="train-number">{{ train.trainNo }}</span>
         </strong>
         <span>&bull;</span>
diff --git a/src/mixins/styleMixin.ts b/src/mixins/styleMixin.ts
index cc4747b..0702eab 100644
--- a/src/mixins/styleMixin.ts
+++ b/src/mixins/styleMixin.ts
@@ -6,7 +6,7 @@ export default defineComponent({
       const bgColor = exp > -1 ? (exp < 2 ? '#26B0D9' : `hsl(${-exp * 5 + 100},  85%, 50%)`) : '#666';
 
       const fontColor = exp > 14 || exp == -1 ? 'white' : 'black';
-      const boxShadow = isSupporter ? `box-shadow: 0 0 10px 2px ${bgColor};` : '';
+      const boxShadow = isSupporter ? `box-shadow: 0 0 6px 2px ${bgColor};` : '';
 
       return `background-color: ${bgColor}; color: ${fontColor}; ${boxShadow};`;
     },
@@ -14,7 +14,7 @@ export default defineComponent({
     calculateTextExpStyle(exp: number, isSupporter = false): string {
       const textColor = exp > -1 ? (exp < 2 ? '#26B0D9' : `hsl(${-exp * 5 + 100},  75%, 50%)`) : '#666';
 
-      return `color: ${textColor}; ${isSupporter ? 'text-shadow: 0 0 10px ' + textColor : ''};`;
+      return `color: ${textColor}; ${isSupporter ? 'text-shadow: 0 0 6px ' + textColor : ''};`;
     },
 
     statusClasses(occupiedTo: string) {
diff --git a/src/styles/global.scss b/src/styles/global.scss
index 96f9129..033831a 100644
--- a/src/styles/global.scss
+++ b/src/styles/global.scss
@@ -29,6 +29,10 @@
   &-thumb {
     background-color: #666;
   }
+
+  &-corner {
+    background-color: #333;
+  }
 }
 
 html {

From d496c70fa87ea63b9609fc954e6635d811ff7343 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Tue, 14 Feb 2023 13:51:52 +0100
Subject: [PATCH 08/12] =?UTF-8?q?aktualizacja=20t=C5=82umaczenia?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SceneryView/SceneryTimetablesHistory.vue         | 12 ++++++------
 src/locales/en.json                                  |  7 +++++++
 src/locales/pl.json                                  |  7 +++++++
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/components/SceneryView/SceneryTimetablesHistory.vue b/src/components/SceneryView/SceneryTimetablesHistory.vue
index 7182fac..b158b8c 100644
--- a/src/components/SceneryView/SceneryTimetablesHistory.vue
+++ b/src/components/SceneryView/SceneryTimetablesHistory.vue
@@ -4,12 +4,12 @@
 
     <table v-else-if="sceneryHistoryList.length">
       <thead>
-        <th>ID</th>
-        <th>Kat. nr</th>
-        <th>Relacja</th>
-        <th>Maszynista</th>
-        <th>Autor RJ</th>
-        <th>Data</th>
+        <th>{{ $t('scenery.timetables-history-id')  }}</th>
+        <th>{{ $t('scenery.timetables-history-number')}}</th>
+        <th>{{ $t('scenery.timetables-history-route')}}</th>
+        <th>{{ $t('scenery.timetables-history-driver')}}</th>
+        <th>{{ $t('scenery.timetables-history-author')}}</th>
+        <th>{{ $t('scenery.timetables-history-date')}}</th>
       </thead>
 
       <tbody>
diff --git a/src/locales/en.json b/src/locales/en.json
index 130ff8c..26f5f84 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -313,6 +313,13 @@
     "timetable-author-title": "Issued by",
     "timetable-author-unknown": "Author unknown",
 
+    "timetables-history-id": "ID",
+    "timetables-history-number": "Number",
+    "timetables-history-route": "Route",
+    "timetables-history-driver": "Driver",
+    "timetables-history-author": "TT author",
+    "timetables-history-date": "Date",
+
     "req-level": "all dispatcher levels | dispatcher level {lvl} required | dispatcher level {lvl} required",
     "history-list-empty": "No recorded scenery history!",
 
diff --git a/src/locales/pl.json b/src/locales/pl.json
index 4fbbd4c..c3cd4cc 100644
--- a/src/locales/pl.json
+++ b/src/locales/pl.json
@@ -317,6 +317,13 @@
     "timetable-author-title": "Wydany przez",
     "timetable-author-unknown": "Autor nieznany",
 
+    "timetables-history-id": "ID",
+    "timetables-history-number": "Numer",
+    "timetables-history-route": "Trasa",
+    "timetables-history-driver": "Maszynista",
+    "timetables-history-author": "Autor RJ",
+    "timetables-history-date": "Data",
+
     "req-level": "ogólnodostępna | minimum {lvl} poziom dyżurnego | minimum {lvl} poziom dyżurnego",
     "history-list-empty": "Brak historii dla tej scenerii!",
 

From a71ccd3e1a4fa56d65299605a2b358771482081b Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Tue, 14 Feb 2023 13:52:20 +0100
Subject: [PATCH 09/12] bump: wersja 1.12

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index faa0726..4da46ce 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stacjownik",
-  "version": "1.11.2",
+  "version": "1.12.0",
   "private": true,
   "scripts": {
     "dev": "vite",

From ca19f7e3973be7f694f165f77de0e29223c766e3 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Tue, 14 Feb 2023 16:40:15 +0100
Subject: [PATCH 10/12] hotfix: websocket

---
 src/store/store.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/store/store.ts b/src/store/store.ts
index ac12b04..7af3b94 100644
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@ -318,8 +318,7 @@ export const useStore = defineStore('store', {
                     const SBL = specs2[2] == 'S';
                     const TWB = specs2[3] ? true : false;
                     const speed = Number(routeString.split(':')[1]) || 0;
-                    const length  = Number(routeString.split(':')[2]) || 0;
-
+                    const length = Number(routeString.split(':')[2]) || 0;
 
                     const propName = twoWay
                       ? catenary
@@ -365,10 +364,9 @@ export const useStore = defineStore('store', {
 
     connectToWebsocket() {
       const socket = io(URLs.stacjownikAPI, {
-        transports: ['websocket', 'polling'],
+        // transports: ['websocket', 'polling'],
         rememberUpgrade: true,
         reconnection: true,
-        timeout: 2000,
       });
 
       socket.on('connect_error', (err) => {
@@ -382,8 +380,9 @@ export const useStore = defineStore('store', {
       });
 
       socket.emit('FETCH_DATA', {}, (data: APIData) => {
-        this.apiData = data;
         this.dataStatuses.connection = DataStatus.Loaded;
+
+        this.apiData = data;
         this.setOnlineData();
       });
 

From 221e0c7e821ec0990f4da53b3707f29b63327ce6 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Tue, 14 Feb 2023 16:50:12 +0100
Subject: [PATCH 11/12] =?UTF-8?q?dzienniki:=20fix=20=C5=82adowania?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/JournalView/JournalStats.vue | 10 ++++++----
 src/views/JournalDispatchers.vue            |  4 ++--
 src/views/JournalTimetables.vue             |  6 +++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/components/JournalView/JournalStats.vue b/src/components/JournalView/JournalStats.vue
index ba33170..a5effe1 100644
--- a/src/components/JournalView/JournalStats.vue
+++ b/src/components/JournalView/JournalStats.vue
@@ -35,7 +35,8 @@ type TStatTab = 'daily' | 'driver';
 const store = useStore();
 const dailyStatsComp: Ref<InstanceType<typeof JournalDailyStats> | null> = ref(null);
 
-const areStatsOpen = ref(true);
+const lastDailyStatsOpen = ref(false);
+const areStatsOpen = ref(false);
 const lastClickedTab = ref('daily');
 
 let data = reactive({
@@ -54,9 +55,9 @@ let data = reactive({
 
 // Methods
 function onTabButtonClick(tab: TStatTab) {
-  if (lastClickedTab.value == tab || !areStatsOpen.value) {
-    areStatsOpen.value = !areStatsOpen.value;
-  }
+  if (lastClickedTab.value == tab || !areStatsOpen.value) areStatsOpen.value = !areStatsOpen.value;
+
+  if (tab == 'daily') lastDailyStatsOpen.value = areStatsOpen.value;
 
   store.currentStatsTab = tab;
   lastClickedTab.value = tab;
@@ -77,6 +78,7 @@ watch(
 
     lastClickedTab.value = statsData ? 'driver' : 'daily';
     if (statsData) areStatsOpen.value = true;
+    if (!statsData) areStatsOpen.value = lastDailyStatsOpen.value;
   }
 );
 </script>
diff --git a/src/views/JournalDispatchers.vue b/src/views/JournalDispatchers.vue
index c2a517d..56b28eb 100644
--- a/src/views/JournalDispatchers.vue
+++ b/src/views/JournalDispatchers.vue
@@ -19,7 +19,7 @@
               {{ $t('app.offline') }}
             </div>
 
-            <Loading v-else-if="dataStatus == DataStatus.Initialized || dataStatus == DataStatus.Loading" />
+            <Loading v-else-if="dataStatus == DataStatus.Loading" />
 
             <div v-else-if="dataStatus == DataStatus.Error" class="journal_warning error">
               {{ $t('app.error') }}
@@ -111,7 +111,7 @@ export default defineComponent({
     statsCardOpen: false,
     currentOptionsActive: false,
 
-    dataStatus: DataStatus.Initialized,
+    dataStatus: DataStatus.Loading,
     DataStatus,
 
     historyList: [] as DispatcherHistory[],
diff --git a/src/views/JournalTimetables.vue b/src/views/JournalTimetables.vue
index bc5f61e..1f5e6ac 100644
--- a/src/views/JournalTimetables.vue
+++ b/src/views/JournalTimetables.vue
@@ -22,7 +22,7 @@
               {{ $t('app.offline') }}
             </div>
 
-            <Loading v-else-if="dataStatus == DataStatus.Initialized || dataStatus == DataStatus.Loading" />
+            <Loading v-else-if="dataStatus == DataStatus.Loading" />
 
             <div v-else-if="dataStatus == DataStatus.Error" class="journal_warning error">
               {{ $t('app.error') }}
@@ -105,7 +105,7 @@ export default defineComponent({
     timetableHistory: [] as TimetableHistory[],
     journalTimetableFilters,
 
-    dataStatus: DataStatus.Initialized,
+    dataStatus: DataStatus.Loading,
     dataErrorMessage: '',
 
     DataStatus,
@@ -215,7 +215,7 @@ export default defineComponent({
     },
 
     async fetchHistoryData() {
-      if(this.dataStatus == DataStatus.Loading) return;
+      // if(this.dataStatus == DataStatus.Loading) return;
 
       const queries: string[] = [];
 

From 500f3c1223f5a72c298b9b0bfc008396ccadf4ab Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Tue, 14 Feb 2023 16:57:22 +0100
Subject: [PATCH 12/12] =?UTF-8?q?dziennik=20RJ:=20wy=C5=9Bwietlanie=20stat?=
 =?UTF-8?q?=C3=B3w?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/JournalView/JournalStats.vue          | 2 +-
 src/components/JournalView/JournalTimetablesList.vue | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/JournalView/JournalStats.vue b/src/components/JournalView/JournalStats.vue
index a5effe1..23c7b37 100644
--- a/src/components/JournalView/JournalStats.vue
+++ b/src/components/JournalView/JournalStats.vue
@@ -11,7 +11,7 @@
         {{ $t(tab.titlePath) }}
       </button>
     </div>
-
+    
     <div class="stats-tab" v-show="areStatsOpen">
       <keep-alive>
         <JournalDailyStats v-if="store.currentStatsTab == 'daily'" ref="dailyStatsComp" />
diff --git a/src/components/JournalView/JournalTimetablesList.vue b/src/components/JournalView/JournalTimetablesList.vue
index e4ad7cd..078543c 100644
--- a/src/components/JournalView/JournalTimetablesList.vue
+++ b/src/components/JournalView/JournalTimetablesList.vue
@@ -15,7 +15,6 @@
             style="cursor: pointer"
           >
             <span class="text--grayed">#{{ timetable.id }}</span>
-            &bull;
             <span>
               <strong class="text--primary">
                 {{ timetable.trainCategoryCode }}
@@ -96,6 +95,7 @@
             <b>{{ timetable.authorName }}</b>
           </router-link>
         </div>
+
         <button
           v-if="timetable.stockString"
           class="btn--option btn--show"
@@ -104,6 +104,7 @@
           {{ $t('journal.stock-info') }}
           <img :src="getIcon(`arrow-${item.showStock.value ? 'asc' : 'desc'}`)" alt="Arrow" />
         </button>
+
         <div class="info-extended" v-if="timetable.stockString && item.showStock.value">
           <hr />
           <div>