diff --git a/src/components/Global/RegionDropdown.vue b/src/components/Global/RegionDropdown.vue index aa6552a..507907c 100644 --- a/src/components/Global/RegionDropdown.vue +++ b/src/components/Global/RegionDropdown.vue @@ -65,12 +65,12 @@ export default defineComponent({ immediate: true, handler(regionQuery: string) { if (regionQuery) { - this.store.region.id = + this.store.region = regionsJSON.find( (reg) => reg.id == regionQuery.toLocaleLowerCase() || reg.value.toLocaleLowerCase() == regionQuery.toLocaleLowerCase() - )?.id || 'eu'; + ) ?? regionsJSON[0]; } } } diff --git a/src/components/SceneryView/SceneryDispatchersHistory.vue b/src/components/SceneryView/SceneryDispatchersHistory.vue index 34a2ea6..c44b301 100644 --- a/src/components/SceneryView/SceneryDispatchersHistory.vue +++ b/src/components/SceneryView/SceneryDispatchersHistory.vue @@ -72,13 +72,11 @@ - - diff --git a/src/components/SceneryView/SceneryInfo/SceneryInfoUserList.vue b/src/components/SceneryView/SceneryInfo/SceneryInfoUserList.vue index 14930fe..06db7fb 100644 --- a/src/components/SceneryView/SceneryInfo/SceneryInfoUserList.vue +++ b/src/components/SceneryView/SceneryInfo/SceneryInfoUserList.vue @@ -32,7 +32,7 @@ import { PropType, defineComponent } from 'vue'; import modalTrainMixin from '../../../mixins/modalTrainMixin'; import routerMixin from '../../../mixins/routerMixin'; -import { ActiveScenery } from '../../../store/typings'; +import { ActiveScenery } from '../../../typings/common'; export default defineComponent({ mixins: [routerMixin, modalTrainMixin], diff --git a/src/components/SceneryView/SceneryTimetable.vue b/src/components/SceneryView/SceneryTimetable.vue index a0d140d..279775f 100644 --- a/src/components/SceneryView/SceneryTimetable.vue +++ b/src/components/SceneryView/SceneryTimetable.vue @@ -14,14 +14,6 @@ - - icon-tablice @@ -186,12 +178,11 @@ import { useRoute } from 'vue-router'; import Loading from '../Global/Loading.vue'; import dateMixin from '../../mixins/dateMixin'; import routerMixin from '../../mixins/routerMixin'; -import Station from '../../scripts/interfaces/Station'; import { useMainStore } from '../../store/mainStore'; import modalTrainMixin from '../../mixins/modalTrainMixin'; import ScheduledTrainStatus from './ScheduledTrainStatus.vue'; -import { ActiveScenery } from '../../store/typings'; import { useApiStore } from '../../store/apiStore'; +import { ActiveScenery, Station } from '../../typings/common'; export default defineComponent({ name: 'SceneryTimetable', diff --git a/src/components/SceneryView/SceneryTimetablesHistory.vue b/src/components/SceneryView/SceneryTimetablesHistory.vue index 4fefc36..0c35eb6 100644 --- a/src/components/SceneryView/SceneryTimetablesHistory.vue +++ b/src/components/SceneryView/SceneryTimetablesHistory.vue @@ -71,12 +71,10 @@ import { defineComponent, PropType } from 'vue'; import dateMixin from '../../mixins/dateMixin'; -import Station from '../../scripts/interfaces/Station'; import Loading from '../Global/Loading.vue'; import listObserverMixin from '../../mixins/listObserverMixin'; -import { ActiveScenery } from '../../store/typings'; import { API } from '../../typings/api'; -import { Status } from '../../typings/common'; +import { ActiveScenery, Station, Status } from '../../typings/common'; import { useApiStore } from '../../store/apiStore'; export default defineComponent({ diff --git a/src/components/SceneryView/ScheduledTrainStatus.vue b/src/components/SceneryView/ScheduledTrainStatus.vue index 3187b21..6d69c01 100644 --- a/src/components/SceneryView/ScheduledTrainStatus.vue +++ b/src/components/SceneryView/ScheduledTrainStatus.vue @@ -11,7 +11,7 @@