refactor typów danych

src/components/JournalView/JournalTimetables/JournalTimetablesList.vue

@@ -6,9 +6,9 @@
           {{ $t('app.offline') }}
         </div>
 
-        <Loading v-else-if="dataStatus == DataStatus.Loading" />
+        <Loading v-else-if="dataStatus == Status.Data.Loading" />
 
-        <div v-else-if="dataStatus == DataStatus.Error" class="journal_warning error">
+        <div v-else-if="dataStatus == Status.Data.Error" class="journal_warning error">
           {{ $t('app.error') }}
         </div>
 
@@ -38,20 +38,20 @@
 
 <script lang="ts">
 import { defineComponent, PropType } from 'vue';
-import { DataStatus } from '../../../scripts/enums/DataStatus';
-import { TimetableHistory } from '../../../scripts/interfaces/api/TimetablesAPIData';
-import { useStore } from '../../../store/store';
 
 import Loading from '../../Global/Loading.vue';
 import AddDataButton from '../../Global/AddDataButton.vue';
 import TimetableHistoryList from './TimetableHistoryList.vue';
+import { useStore } from '../../../store/mainStore';
+import { Status } from '../../../typings/common';
+import { API } from '../../../typings/api';
 
 export default defineComponent({
   components: { Loading, AddDataButton, TimetableHistoryList },
 
   props: {
     timetableHistory: {
-      type: Array as PropType<TimetableHistory[]>,
+      type: Array as PropType<API.TimetableHistory.Response>,
       required: true
     },
     scrollNoMoreData: {
@@ -64,13 +64,13 @@ export default defineComponent({
       type: Function as PropType<() => void>
     },
     dataStatus: {
-      type: Number as PropType<DataStatus>
+      type: Number as PropType<Status.Data>
     }
   },
 
   data() {
     return {
-      DataStatus,
+      Status,
       store: useStore()
     };
   }

src/components/JournalView/JournalTimetables/TimetableExtra.vue

@@ -77,8 +77,8 @@
 
 <script lang="ts">
 import { PropType, defineComponent } from 'vue';
-import { TimetableHistory } from '../../../scripts/interfaces/api/TimetablesAPIData';
 import StockList from '../../Global/StockList.vue';
+import { API } from '../../../typings/api';
 
 export default defineComponent({
   components: { StockList },
@@ -88,7 +88,7 @@ export default defineComponent({
       required: true
     },
     timetable: {
-      type: Object as PropType<TimetableHistory>,
+      type: Object as PropType<API.TimetableHistory.Data>,
       required: true
     }
   },

src/components/JournalView/JournalTimetables/TimetableGeneral.vue

@@ -62,24 +62,24 @@
 
 <script lang="ts">
 import { PropType, defineComponent } from 'vue';
-import { TimetableHistory } from '../../../scripts/interfaces/api/TimetablesAPIData';
 
 import dateMixin from '../../../mixins/dateMixin';
 import modalTrainMixin from '../../../mixins/modalTrainMixin';
 import styleMixin from '../../../mixins/styleMixin';
+import { API } from '../../../typings/api';
 
 export default defineComponent({
   mixins: [dateMixin, modalTrainMixin, styleMixin],
 
   props: {
     timetable: {
-      type: Object as PropType<TimetableHistory>,
+      type: Object as PropType<API.TimetableHistory.Data>,
       required: true
     }
   },
 
   methods: {
-    showTimetable(timetable: TimetableHistory, target: EventTarget | null) {
+    showTimetable(timetable: API.TimetableHistory.Data, target: EventTarget | null) {
       if (timetable?.terminated) return;
 
       this.selectModalTrain(timetable.driverName + timetable.trainNo.toString(), target);

src/components/JournalView/JournalTimetables/TimetableHistoryList.vue

@@ -38,17 +38,17 @@
 
 <script lang="ts">
 import { PropType, defineComponent, ref } from 'vue';
-import { TimetableHistory } from '../../../scripts/interfaces/api/TimetablesAPIData';
 
 import TimetableGeneral from './TimetableGeneral.vue';
 import TimetableStops from './TimetableStops.vue';
 import TimetableStatus from './TimetableStatus.vue';
 import TimetableExtra from './TimetableExtra.vue';
+import { API } from '../../../typings/api';
 
 export default defineComponent({
   props: {
     timetableHistory: {
-      type: Array as PropType<TimetableHistory[]>,
+      type: Array as PropType<API.TimetableHistory.Response>,
       required: true
     }
   },

src/components/JournalView/JournalTimetables/TimetableStatus.vue

@@ -44,14 +44,14 @@
 
 <script lang="ts">
 import { PropType, defineComponent } from 'vue';
-import { TimetableHistory } from '../../../scripts/interfaces/api/TimetablesAPIData';
 import ProgressBar from '../../Global/ProgressBar.vue';
+import { API } from '../../../typings/api';
 
 export default defineComponent({
   components: { ProgressBar },
   props: {
     timetable: {
-      type: Object as PropType<TimetableHistory>,
+      type: Object as PropType<API.TimetableHistory.Data>,
       required: true
     }
   }

src/components/JournalView/JournalTimetables/TimetableStops.vue

@@ -24,8 +24,7 @@
 <script lang="ts">
 import { PropType, defineComponent } from 'vue';
 import dateMixin from '../../../mixins/dateMixin';
-
-import { TimetableHistory } from '../../../scripts/interfaces/api/TimetablesAPIData';
+import { API } from '../../../typings/api';
 
 export default defineComponent({
   mixins: [dateMixin],
@@ -37,7 +36,7 @@ export default defineComponent({
     },
 
     timetable: {
-      type: Object as PropType<TimetableHistory>,
+      type: Object as PropType<API.TimetableHistory.Data>,
       required: true
     }
   },