From a79ca7878135f17eec1e1129e14579fa32ed885d Mon Sep 17 00:00:00 2001
From: Spythere <spythere@protonmail.com>
Date: Mon, 13 Nov 2023 14:59:17 +0100
Subject: [PATCH] =?UTF-8?q?poprawki=20animacji=20status=C3=B3w=20danych=20?=
 =?UTF-8?q?&=20tryb=20offline?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                              |   2 +-
 src/components/TrainsView/TrainTable.vue | 173 ++++++-----------------
 src/typings/common.ts                    |   1 +
 src/views/SceneryView.vue                |   2 +
 4 files changed, 47 insertions(+), 131 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 9957d50..36caa16 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -10,7 +10,7 @@
 
     <main class="app_main">
       <router-view v-slot="{ Component }">
-        <keep-alive exclude="JournalView">
+        <keep-alive exclude="JournalView,SceneryView">
           <component :is="Component" :key="$route.name" />
         </keep-alive>
       </router-view>
diff --git a/src/components/TrainsView/TrainTable.vue b/src/components/TrainsView/TrainTable.vue
index 34c6cd7..81ee5a7 100644
--- a/src/components/TrainsView/TrainTable.vue
+++ b/src/components/TrainsView/TrainTable.vue
@@ -1,41 +1,44 @@
 <template>
-  <div>
-    <transition-group name="list-anim" tag="ul" class="train-list">
-      <li class="table-info" key="offline" v-if="store.isOffline">
+  <transition name="status-anim" mode="out-in" tag="div" class="train-table">
+    <div :key="store.dataStatuses.trains">
+      <div class="table-info" key="offline" v-if="store.isOffline">
         {{ $t('app.offline') }}
-      </li>
+      </div>
 
       <Loading v-else-if="trains.length == 0 && store.dataStatuses.trains == 0" key="loading" />
 
-      <li
+      <div
         class="table-info"
         key="no-trains"
         v-else-if="trains.length == 0 && store.dataStatuses.trains != 0"
       >
         {{ $t('trains.no-trains') }}
-      </li>
+      </div>
 
-      <li
-        class="train-row"
-        v-for="train in currentTrains"
-        :key="train.trainId"
-        tabindex="0"
-        @click.stop="selectModalTrain(train.trainId, $event.currentTarget)"
-        @keydown.enter="selectModalTrain(train.trainId, $event.currentTarget)"
-      >
-        <TrainInfo :train="train" />
-      </li>
-    </transition-group>
-  </div>
+      <transition-group name="list-anim" tag="ul">
+        <li
+          class="train-row"
+          v-for="train in trains"
+          :key="train.trainId"
+          tabindex="0"
+          @click.stop="selectModalTrain(train.trainId, $event.currentTarget)"
+          @keydown.enter="selectModalTrain(train.trainId, $event.currentTarget)"
+        >
+          <TrainInfo :train="train" />
+        </li>
+      </transition-group>
+    </div>
+  </transition>
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, inject, PropType, Ref } from 'vue';
+import { defineComponent, inject, PropType, Ref } from 'vue';
 import modalTrainMixin from '../../mixins/modalTrainMixin';
 import Train from '../../scripts/interfaces/Train';
 import { useStore } from '../../store/mainStore';
 import Loading from '../Global/Loading.vue';
 import TrainInfo from './TrainInfo.vue';
+import { Status } from '../../typings/common';
 
 export default defineComponent({
   components: { Loading, TrainInfo },
@@ -53,14 +56,10 @@ export default defineComponent({
     const store = useStore();
     const searchedTrain = inject('searchedTrain') as Ref<string>;
     const searchedDriver = inject('searchedDriver') as Ref<string>;
-    const currentTrains = computed(() => {
-      return props.trains;
-    });
 
     return {
       searchedTrain,
       searchedDriver,
-      currentTrains,
       store,
       sorterActive: inject('sorterActive') as {
         id: string | number;
@@ -69,6 +68,17 @@ export default defineComponent({
     };
   },
 
+  computed: {
+    dataStatus() {
+      if (this.store.isOffline) return Status.Data.Offline;
+
+      if (this.trains.length == 0 && this.store.dataStatuses.trains == Status.Data.Loading)
+        return Status.Data.Loading;
+
+      return Status.Data.Loaded;
+    }
+  },
+
   activated() {
     const query = this.$route.query;
     if (query.trainNo && query.driverName) {
@@ -86,23 +96,13 @@ export default defineComponent({
 @import '../../styles/responsive.scss';
 @import '../../styles/animations.scss';
 
-.anim {
-  &-enter-from,
-  &-leave-to {
-    opacity: 0;
-  }
-
-  &-enter-active {
-    transition: all 100ms ease-out;
-  }
-
-  &-leave-active {
-    transition: all 100ms ease-out;
-  }
-}
-
 .train-table {
   position: relative;
+
+  height: 90vh;
+  min-height: 550px;
+  overflow-y: auto;
+  overflow-x: hidden;
 }
 
 .table-info {
@@ -115,98 +115,11 @@ export default defineComponent({
   background: #1a1a1a;
 }
 
-img.train-image {
-  width: 12em;
-}
+li.train-row {
+  background-color: var(--clr-secondary);
+  margin-bottom: 1em;
+  width: 100%;
 
-.traffic-warning {
-  padding: 1em 0;
-  margin-bottom: 0.5em;
-  background: var(--clr-warning);
-}
-
-.timeouts-warning {
-  background-color: #333;
-
-  font-weight: bold;
-  font-size: 1.05em;
-
-  margin-bottom: 0.5em;
-  padding: 0.5em;
-}
-
-.warning-timeout {
-  background-color: #be3728;
-  color: white;
-
-  display: inline-block;
-  text-align: center;
-
-  width: 1.25em;
-  height: 1.25em;
-  border-radius: 50%;
-}
-
-.train {
-  &-list {
-    position: relative;
-    overflow-y: hidden;
-    min-height: 100%;
-
-    @include smallScreen() {
-      width: 100%;
-    }
-  }
-
-  &-row {
-    background-color: var(--clr-secondary);
-    margin-bottom: 1em;
-
-    cursor: pointer;
-  }
-
-  &_cars {
-    display: flex;
-    align-items: center;
-
-    overflow: auto;
-  }
-}
-
-.paginator {
-  display: flex;
-  justify-content: center;
-
-  &_item {
-    padding: 0.25em 0.5em;
-    margin: 0 0.5em;
-    outline: 2px solid salmon;
-
-    min-width: 30px;
-
-    text-align: center;
-
-    cursor: pointer;
-
-    &.page-number {
-      font-weight: bold;
-      color: gold;
-    }
-
-    &.disabled {
-      outline: 2px solid lightgray;
-      color: lightgray;
-    }
-
-    &:focus {
-      outline: 2px solid white;
-    }
-  }
-}
-
-@include smallScreen() {
-  .info-bottom {
-    text-align: center;
-  }
+  cursor: pointer;
 }
 </style>
diff --git a/src/typings/common.ts b/src/typings/common.ts
index 4cde8c2..fe5e181 100644
--- a/src/typings/common.ts
+++ b/src/typings/common.ts
@@ -10,6 +10,7 @@ export namespace Status {
   }
 
   export enum Data {
+    Offline = 2,
     Initialized = -1,
     Loading = 0,
     Error = 1,
diff --git a/src/views/SceneryView.vue b/src/views/SceneryView.vue
index 340a2ef..4318001 100644
--- a/src/views/SceneryView.vue
+++ b/src/views/SceneryView.vue
@@ -66,6 +66,8 @@ enum SceneryViewMode {
 }
 
 export default defineComponent({
+  name: 'SceneryView',
+
   components: {
     SceneryInfo,
     SceneryTimetable,