poprawki wskaźników ładowania

This commit is contained in:
2023-12-21 19:53:34 +01:00
parent 2027b85450
commit 3b3c3bda31
5 changed files with 9 additions and 22 deletions
@@ -48,7 +48,7 @@
<transition-group name="list-anim"> <transition-group name="list-anim">
<div <div
style="padding-bottom: 5em" style="padding-bottom: 5em"
v-if="apiStore.dataStatuses.trains == 0 && computedScheduledTrains.length == 0" v-if="apiStore.dataStatuses.connection == 0 && computedScheduledTrains.length == 0"
key="list-loading" key="list-loading"
> >
<Loading /> <Loading />
+1 -1
View File
@@ -279,7 +279,7 @@
</table> </table>
</div> </div>
<Loading v-if="apiStore.dataStatuses.sceneries == Status.Loading" /> <Loading v-if="apiStore.dataStatuses.connection == Status.Loading" />
<div class="no-stations" v-else-if="stations.length == 0"> <div class="no-stations" v-else-if="stations.length == 0">
{{ $t('sceneries.no-stations') }} {{ $t('sceneries.no-stations') }}
+2 -2
View File
@@ -16,7 +16,7 @@
<hr style="margin: 0.5em 0" /> <hr style="margin: 0.5em 0" />
<div v-if="apiStore.dataStatuses.trains == Status.Loaded && regionTrains.length > 0"> <div v-if="apiStore.dataStatuses.connection == Status.Loaded && regionTrains.length > 0">
<div class="top-list general"> <div class="top-list general">
<transition-group tag="ul" name="stats-anim"> <transition-group tag="ul" name="stats-anim">
<li class="badge" key="timetable-count"> <li class="badge" key="timetable-count">
@@ -88,7 +88,7 @@
</div> </div>
</div> </div>
<div v-else-if="apiStore.dataStatuses.trains != Status.Loaded"> <div v-else-if="apiStore.dataStatuses.connection != Status.Loaded">
{{ $t('train-stats.stats-loading') }} {{ $t('train-stats.stats-loading') }}
</div> </div>
+4 -6
View File
@@ -1,14 +1,11 @@
<template> <template>
<transition name="status-anim" mode="out-in" tag="div" class="train-table"> <transition name="status-anim" mode="out-in" tag="div" class="train-table">
<div :key="apiStore.dataStatuses.trains"> <div :key="apiStore.dataStatuses.connection">
<div class="table-info" key="offline" v-if="store.isOffline"> <div class="table-info" key="offline" v-if="store.isOffline">
{{ $t('app.offline') }} {{ $t('app.offline') }}
</div> </div>
<Loading <Loading v-else-if="apiStore.dataStatuses.connection == Status.Loading" key="loading" />
v-else-if="trains.length == 0 && apiStore.dataStatuses.connection == 0"
key="loading"
/>
<div class="table-info" key="no-trains" v-else-if="trains.length == 0"> <div class="table-info" key="no-trains" v-else-if="trains.length == 0">
{{ $t('trains.no-trains') }} {{ $t('trains.no-trains') }}
@@ -63,6 +60,7 @@ export default defineComponent({
searchedDriver, searchedDriver,
store, store,
apiStore, apiStore,
Status: Status.Data,
sorterActive: inject('sorterActive') as { sorterActive: inject('sorterActive') as {
id: string | number; id: string | number;
dir: number; dir: number;
@@ -74,7 +72,7 @@ export default defineComponent({
dataStatus() { dataStatus() {
if (this.store.isOffline) return Status.Data.Offline; if (this.store.isOffline) return Status.Data.Offline;
if (this.trains.length == 0 && this.apiStore.dataStatuses.trains == Status.Data.Loading) if (this.trains.length == 0 && this.apiStore.dataStatuses.connection == Status.Data.Loading)
return Status.Data.Loading; return Status.Data.Loading;
return Status.Data.Loaded; return Status.Data.Loaded;
+1 -12
View File
@@ -1,16 +1,5 @@
<template> <template>
<div class="scenery-view"> <div class="scenery-view">
<!-- <div
class="scenery-offline"
v-if="!stationInfo && !onlineSceneryInfo && store.dataStatuses.sceneries == 2"
>
<div>{{ $t('scenery.no-scenery') }}</div>
<action-button>
<router-link to="/">{{ $t('scenery.return-btn') }}</router-link>
</action-button>
</div> -->
<div class="scenery-wrapper" ref="card-wrapper"> <div class="scenery-wrapper" ref="card-wrapper">
<div class="scenery-left"> <div class="scenery-left">
<div class="scenery-actions"> <div class="scenery-actions">
@@ -43,7 +32,7 @@
<div <div
v-if=" v-if="
apiStore.dataStatuses.sceneries == Status.Loading || apiStore.dataStatuses.sceneries == Status.Loading ||
apiStore.dataStatuses.trains == Status.Loading apiStore.dataStatuses.connection == Status.Loading
" "
></div> ></div>