From 142f1413ba54d708f86a8449426513867c0c5a88 Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Mon, 23 May 2022 14:35:09 +0200
Subject: [PATCH] =?UTF-8?q?Poprawiony=20wygl=C4=85d=20progress=20baru=20ak?=
 =?UTF-8?q?tywnych=20RJ?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TrainsView/TrainInfo.vue       |  53 ++-
 .../TrainsView/TrainInfoExtended.vue          | 305 ------------------
 src/components/TrainsView/TrainTable.vue      |   2 -
 .../TrainsView/TrainTimetableCard.vue         |  80 -----
 src/mixins/trainInfoMixin.ts                  |   4 +-
 5 files changed, 47 insertions(+), 397 deletions(-)
 delete mode 100644 src/components/TrainsView/TrainInfoExtended.vue
 delete mode 100644 src/components/TrainsView/TrainTimetableCard.vue

diff --git a/src/components/TrainsView/TrainInfo.vue b/src/components/TrainsView/TrainInfo.vue
index 9e7b615..099c4b0 100644
--- a/src/components/TrainsView/TrainInfo.vue
+++ b/src/components/TrainsView/TrainInfo.vue
@@ -41,12 +41,19 @@
             <span v-html="displayStopList(train.timetableData.followingStops)"></span>
           </span>
         </div>
-        <div style="margin-top: 0.5em" v-if="train.timetableData">
-          <span style="color: gray" v-html="generateProgressBar(train)"></span>
-          &nbsp;{{ currentDistance(train.timetableData.followingStops) }} km /
-          <span class="text--primary"> {{ train.timetableData.routeDistance }} km </span>
-          |
-          <span v-html="currentDelay(train.timetableData.followingStops)"></span>
+
+        <div class="timetable_progress" style="margin-top: 0.5em" v-if="train.timetableData">
+          <span class="timetable_progress-bar">
+            <span class="bar-bg"></span>
+            <span class="bar-fg" :style="{ width: `${Math.floor(confirmedPercentage(train.timetableData.followingStops))}%` }"></span>
+          </span>
+
+          <span>
+            &nbsp;{{ currentDistance(train.timetableData.followingStops) }} km /
+            <span class="text--primary"> {{ train.timetableData.routeDistance }} km </span>
+            |
+            <span v-html="currentDelay(train.timetableData.followingStops)"></span>
+          </span>
         </div>
 
         <div class="driver_position text--grayed" style="margin-top: 0.25em">
@@ -93,8 +100,6 @@
       </div>
     </section>
   </div>
-
-
 </template>
 
 <script lang="ts">
@@ -203,6 +208,34 @@ export default defineComponent({
   }
 }
 
+.timetable_progress {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+}
+
+.timetable_progress-bar {
+  position: relative;
+
+  width: 100px;
+  height: 1em;
+
+  .bar-fg,
+  .bar-bg {
+    position: absolute;
+    height: 1em;
+    width: 100%;
+  }
+
+  .bar-fg {
+    background-color: springgreen;
+  }
+
+  .bar-bg {
+    background-color: #5b5b5b;
+  }
+}
+
 .comments {
   display: flex;
   align-items: center;
@@ -231,6 +264,10 @@ export default defineComponent({
     justify-content: center;
   }
 
+  .timetable_progress {
+    justify-content: center;
+  }
+
   .comments {
     flex-direction: column;
     justify-content: center;
diff --git a/src/components/TrainsView/TrainInfoExtended.vue b/src/components/TrainsView/TrainInfoExtended.vue
deleted file mode 100644
index 9158135..0000000
--- a/src/components/TrainsView/TrainInfoExtended.vue
+++ /dev/null
@@ -1,305 +0,0 @@
-<template>
-  <div class="train-info extended">
-    <section class="info-timetable">
-      <div v-if="!train.timetableData">
-        <div class="timetable_general">
-          <span>
-            {{ train.trainNo }} |
-            <span>{{ train.driverName }}</span>
-          </span>
-        </div>
-      </div>
-
-      <div v-else>
-        <div class="timetable_general">
-          <span class="timetable_hero">
-            <span class="timetable_warnings">
-              <span class="warning twr" v-if="train.timetableData.TWR">
-                TWR
-              </span>
-
-              <span class="warning skr" v-if="train.timetableData.SKR">
-                SKR
-              </span>
-            </span>
-
-            <span class="timetable_driver-stats">
-              <span>
-                <b>{{ train.timetableData.category }}</b>
-                <b>{{ ' ' + train.trainNo }}</b> |
-
-                <span>{{ train.driverName }}</span>
-              </span>
-
-              <img
-                class="image-offline"
-                v-if="!train.currentStationHash"
-                :src="icons.offline"
-                alt="offline"
-                :title="$t('trains.offline')"
-              />
-
-              <span class="hide-info" @click="toggleInfo">
-                <img :src="icons.ascArrow" :class="{ hidden: !isInfoShown }" />
-                <span>{{ isInfoShown ? 'Ukryj' : 'Pokaż' }} informacje</span>
-              </span>
-            </span>
-          </span>
-        </div>
-
-        <div class="timetable_route">
-          {{ train.timetableData.route.replace('|', ' - ') }}
-        </div>
-
-        <div class="timetable_stops" v-if="isInfoShown">
-          <span v-if="train.timetableData.followingStops.length > 2">
-            {{ $t('trains.via-title') }}
-            <span v-html="displayStopList(train.timetableData.followingStops)"></span>
-          </span>
-        </div>
-
-        <div class="timetable_comments" v-if="getSceneriesWithComments(train.timetableData).length > 0 && isInfoShown">
-          {{ $t('trains.comment') }} <b>{{ getSceneriesWithComments(train.timetableData) }}</b>
-        </div>
-      </div>
-    </section>
-
-    <section class="info-driver" v-show="isInfoShown">
-      <div class="driver_cars">
-        <!-- <span v-else>{{ displayLocoInfo(train.locoType) }}</span> -->
-      </div>
-
-      <div class="color: #444;">
-        <span v-if="train.timetableData">
-          <span class="text--primary"> {{ train.timetableData.routeDistance }} </span>km &bull;
-        </span>
-        <span v-for="(stat, i) in STATS.main" :key="stat.name">
-          <span v-if="i > 0">&nbsp;&bull;&nbsp;</span>
-          <span class="text--primary">{{ `${~~(train[stat.name] * (stat.multiplier || 1))}` }}</span>
-          <span>{{ stat.unit }}</span>
-        </span>
-      </div>
-
-      <div class="driver_position">
-        <span v-if="train.currentStationHash">
-          {{ $t('trains.current-scenery') }} <b class="text--primary">{{ train['currentStationName'] }}&nbsp;</b>
-        </span>
-
-        <span v-else>
-          {{ $t('trains.current-scenery') }}
-          <span
-            ><b class="text--primary">{{ train['currentStationName'].replace(/.[a-zA-Z0-9]+.sc/, '') }}</b>
-            (offline)&nbsp;</span
-          >
-        </span>
-
-        <span v-if="train.signal">
-          {{ $t('trains.current-signal') }} <b class="text--primary">{{ train['signal'] }}&nbsp;</b>
-        </span>
-
-        <span v-if="train.connectedTrack">
-          {{ $t('trains.current-track') }} <b class="text--primary">{{ train['connectedTrack'] }}&nbsp;</b>
-        </span>
-
-        <span v-if="train.distance">({{ displayDistance(train.distance) }})</span>
-      </div>
-
-      <div style="margin-top: 0.5em;">
-        <b class="text--grayed"> {{ train.locoType }} </b>
-
-        <span v-if="train.cars.length > 0">
-          &nbsp;&bull; {{ $t('trains.cars') }}:
-          <span class="count">{{ train.cars.length }}</span>
-        </span>
-      </div>
-
-      <div class="driver_stock">
-        <img class="train-image" :src="train.locoURL" alt="loco" @error="onImageError" />
-
-        <img v-if="train.locoType.startsWith('EN')" :src="train.locoURL.replace('rb', 's')" alt="" />
-        <img v-if="train.locoType.startsWith('EN71')" :src="train.locoURL.replace('rb', 's')" alt="" />
-        <img v-if="train.locoType.startsWith('EN')" :src="train.locoURL.replace('rb', 'ra')" alt="" />
-
-        <img
-          v-for="(car, i) in train.cars"
-          :key="i"
-          :src="`https://rj.td2.info.pl/dist/img/thumbnails/${car.split(':')[0]}.png`"
-          @error="onImageError"
-          alt="car"
-        />
-      </div>
-    </section>
-  </div>
-</template>
-
-<script lang="ts">
-import trainInfoMixin from '@/mixins/trainInfoMixin';
-import Train from '@/scripts/interfaces/Train';
-import { defineComponent } from 'vue';
-
-export default defineComponent({
-  props: {
-    train: {
-      type: Object as () => Train,
-      required: true,
-    },
-  },
-
-  mixins: [trainInfoMixin],
-
-  data: () => ({
-    icons: {
-      warning: require('@/assets/icon-warning.svg'),
-      ascArrow: require('@/assets/icon-arrow-asc.svg'),
-      offline: require('@/assets/icon-offline.svg'),
-    },
-
-    isInfoShown: true,
-  }),
-
-  methods: {
-    toggleInfo() {
-      this.isInfoShown = !this.isInfoShown;
-    },
-  },
-});
-</script>
-
-<style lang="scss" scoped>
-.image-warning,
-.image-offline {
-  width: 1em;
-  height: 1em;
-
-  margin-left: 0.5em;
-}
-
-.extended {
-  margin-top: 0.5em;
-  padding: 1em;
-}
-
-.hide-info {
-  margin-left: 1em;
-
-  img {
-    width: 1.3em;
-    vertical-align: text-bottom;
-
-    &.hidden {
-      transform: rotate(180deg);
-    }
-  }
-
-  cursor: pointer;
-}
-
-.info-timetable {
-  display: flex;
-}
-
-.timetable {
-  &_general {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-  }
-
-  &_hero {
-    display: flex;
-  }
-
-  &_srjp .activator {
-    display: flex;
-    align-items: center;
-
-    background-color: #22a8d1;
-    border-radius: 0.5em;
-    padding: 0.1em 0.35em;
-  }
-
-  &_route {
-    font-weight: bold;
-
-    margin: 5px 0;
-
-    font-size: 1.1em;
-  }
-
-  &_stops {
-    margin-bottom: 10px;
-    font-size: 0.8em;
-  }
-
-  &_comments {
-    color: salmon;
-  }
-
-  &_warnings {
-    display: flex;
-    color: black;
-
-    .warning {
-      padding: 0.1em 0.65em;
-      margin-right: 0.35em;
-
-      font-weight: bold;
-
-      &.twr {
-        background: var(--clr-twr);
-      }
-
-      &.skr {
-        background: var(--clr-skr);
-      }
-    }
-  }
-}
-
-.driver {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  flex-flow: column;
-
-  padding-top: 1em;
-
-  &_header {
-    text-align: center;
-    word-wrap: break-word;
-    margin-top: 1em;
-  }
-
-  &_cars {
-    margin: 0.65em 0;
-    white-space: pre-wrap;
-    text-align: center;
-
-    color: #c5c5c5;
-
-    .count {
-      color: var(--clr-primary);
-    }
-  }
-
-  &_stock {
-    display: flex;
-    align-items: flex-end;
-    overflow-x: auto;
-
-    width: 100%;
-
-    padding: 0.5em 0;
-  }
-
-  &_position {
-    span {
-      text-align: center;
-    }
-
-    &:first-letter {
-      text-transform: capitalize;
-    }
-  }
-}
-</style>
diff --git a/src/components/TrainsView/TrainTable.vue b/src/components/TrainsView/TrainTable.vue
index 11f1eae..e5d9199 100644
--- a/src/components/TrainsView/TrainTable.vue
+++ b/src/components/TrainsView/TrainTable.vue
@@ -50,13 +50,11 @@ import TrainInfo from '@/components/TrainsView/TrainInfo.vue';
 
 import { DataStatus } from '@/scripts/enums/DataStatus';
 import { GETTERS } from '@/constants/storeConstants';
-import TrainTimetableCard from './TrainTimetableCard.vue';
 import { ref } from 'vue';
 
 export default defineComponent({
   components: {
     TrainSchedule,
-    TrainTimetableCard,
     TrainInfo,
   },
 
diff --git a/src/components/TrainsView/TrainTimetableCard.vue b/src/components/TrainsView/TrainTimetableCard.vue
deleted file mode 100644
index 626cf96..0000000
--- a/src/components/TrainsView/TrainTimetableCard.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<template>
-  <div class="bg-dimmer" @click="close"></div>
-  <section class="train-timetable-card card">
-    <div class="card-exit" @click="close" @keydown.enter="close" tabindex="0">
-      <img :src="icons.exit" alt="icon-exit" />
-    </div>
-
-    <train-info :train="train" />
-    <train-schedule
-      v-if="train.timetableData"
-      :followingStops="train.timetableData.followingStops"
-      ref="card-inner"
-      tabindex="0"
-    />
-  </section>
-</template>
-
-<script lang="ts">
-import Train from '@/scripts/interfaces/Train';
-import { defineComponent } from 'vue';
-import TrainInfo from './TrainInfo.vue';
-import TrainSchedule from './TrainSchedule.vue';
-
-export default defineComponent({
-  components: { TrainInfo, TrainSchedule },
-  emits: ['close'],
-
-  data: () => ({
-    icons: {
-      exit: require('@/assets/icon-exit.svg'),
-    },
-  }),
-  props: {
-    train: {
-      type: Object as () => Train,
-      required: true,
-    },
-  },
-  setup() {
-    return {};
-  },
-
-  methods: {
-    close() {
-      this.$emit('close');
-    },
-  },
-});
-</script>
-
-<style lang="scss" scoped>
-@import '../../styles/card';
-
-.bg-dimmer {
-  position: fixed;
-
-  top: 0;
-  left: 0;
-  width: 100vw;
-  height: 100vh;
-
-  z-index: 25;
-
-  background: rgba(black, 0.5);
-}
-
-.train-timetable-card {
-  padding: 0.5em;
-
-  width: 95%;
-  max-width: 1300px;
-  max-height: calc(100vh - 2em);
-
-  background-color: #202020;
-  
-
-  top: 0;
-  transform: translate(-50%, 1em);
-}
-</style>
diff --git a/src/mixins/trainInfoMixin.ts b/src/mixins/trainInfoMixin.ts
index f56d29d..cd1f452 100644
--- a/src/mixins/trainInfoMixin.ts
+++ b/src/mixins/trainInfoMixin.ts
@@ -68,7 +68,7 @@ export default defineComponent({
         },
 
         confirmedPercentage(stops: TrainStop[]) {
-            return ((stops.filter((stop) => stop.confirmed).length / stops.length) * 100).toFixed(0);
+            return Number(((stops.filter((stop) => stop.confirmed).length / stops.length) * 100).toFixed(0));
         },
 
         currentDelay(stops: TrainStop[]) {
@@ -100,7 +100,7 @@ export default defineComponent({
             const moreCount = commentList.length - 10;
 
 
-            return commentList.slice(0,10).join(", ") + (moreCount > 0 ? `... (+${moreCount})` : '');
+            return commentList.slice(0, 10).join(", ") + (moreCount > 0 ? `... (+${moreCount})` : '');
         },
 
         displayDistance(distance: number) {