diff --git a/src/assets/christmas-cap.svg b/src/assets/christmas-cap.svg deleted file mode 100644 index e5cf177..0000000 --- a/src/assets/christmas-cap.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/assets/icon-1track-e.svg b/src/assets/icon-1track-e.svg deleted file mode 100644 index 059707a..0000000 --- a/src/assets/icon-1track-e.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/assets/icon-1track-ne.svg b/src/assets/icon-1track-ne.svg deleted file mode 100644 index 29b1f10..0000000 --- a/src/assets/icon-1track-ne.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/assets/icon-2track-e.svg b/src/assets/icon-2track-e.svg deleted file mode 100644 index 4eb6069..0000000 --- a/src/assets/icon-2track-e.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/assets/icon-2track-ne.svg b/src/assets/icon-2track-ne.svg deleted file mode 100644 index 20f8fae..0000000 --- a/src/assets/icon-2track-ne.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/assets/icon-distance.svg b/src/assets/icon-distance.svg deleted file mode 100644 index 0234ecc..0000000 --- a/src/assets/icon-distance.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/assets/icon-filter.svg b/src/assets/icon-filter.svg deleted file mode 100644 index 0f61b4c..0000000 --- a/src/assets/icon-filter.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/components/JournalView/JournalDispatchers.vue b/src/components/JournalView/JournalDispatchers.vue index c4ab55e..81db17a 100644 --- a/src/components/JournalView/JournalDispatchers.vue +++ b/src/components/JournalView/JournalDispatchers.vue @@ -16,9 +16,8 @@
-
- loading icon - {{ $t('app.loading') }} +
+ {{ $t('app.loading') }}
diff --git a/src/components/JournalView/JournalTimetables.vue b/src/components/JournalView/JournalTimetables.vue index 84498fe..0ff9f49 100644 --- a/src/components/JournalView/JournalTimetables.vue +++ b/src/components/JournalView/JournalTimetables.vue @@ -18,8 +18,7 @@
- loading icon - {{ $t('app.loading') }} + {{ $t('app.loading') }}
@@ -112,7 +111,11 @@
{{ $t('journal.dispatcher-name') }}  - {{ item.authorName }} + {{ item.authorName }}
@@ -159,9 +162,11 @@ import { journalTimetableFilters } from '@/data/journalFilters'; import { JournalFilterType } from '@/scripts/enums/JournalFilterType'; import routerMixin from '@/mixins/routerMixin'; -const PROD_MODE = process.env.VUE_APP_JOURNAL_TIMETABLES_DEV != "1" || process.env.NODE_ENV === "production"; +const PROD_MODE = process.env.VUE_APP_JOURNAL_TIMETABLES_DEV != '1' || process.env.NODE_ENV === 'production'; -const TIMETABLES_API_URL = PROD_MODE ? `${URLs.stacjownikAPI}/api/getTimetables` : 'http://localhost:3001/api/getTimetables'; +const TIMETABLES_API_URL = PROD_MODE + ? `${URLs.stacjownikAPI}/api/getTimetables` + : 'http://localhost:3001/api/getTimetables'; interface APIResponse { errorMessage: string | null; @@ -214,7 +219,7 @@ export default defineComponent({ showReturnButton: false, - journalTimetableFilters + journalTimetableFilters, }), setup() { @@ -226,7 +231,10 @@ export default defineComponent({ const sorterActive = ref({ id: 'timetableId', dir: -1 }); const journalFilterActive = ref(journalTimetableFilters[0]); - const searchersValues = reactive([{ id: 'search-train', value: '' }, { id: 'search-driver', value: '' }]) + const searchersValues = reactive([ + { id: 'search-train', value: '' }, + { id: 'search-driver', value: '' }, + ]); const countFromIndex = ref(0); const countLimit = 15; @@ -270,9 +278,9 @@ export default defineComponent({ methods: { navigateToTimetable(historyItem: TimetableHistory) { - if(historyItem.terminated) return; + if (historyItem.terminated) return; - this.navigateToTrain(historyItem.trainNo, historyItem.driverName); + this.navigateToTrain(historyItem.trainNo, historyItem.driverName); }, getSceneryList(historyItem: TimetableHistory) { @@ -330,7 +338,7 @@ export default defineComponent({ async fetchHistoryData( props: { - searchers?: JournalSearcher[], + searchers?: JournalSearcher[]; filter?: JournalFilter; } = {} ) { @@ -338,8 +346,8 @@ export default defineComponent({ const queries: string[] = []; - const driver = props.searchers?.find(s => s.id == "search-driver")?.value.trim(); - const train = props.searchers?.find(s => s.id == "search-train")?.value.trim(); + const driver = props.searchers?.find((s) => s.id == 'search-driver')?.value.trim(); + const train = props.searchers?.find((s) => s.id == 'search-train')?.value.trim(); if (driver) queries.push(`driver=${driver}`); if (train) queries.push(`train=${train}`); @@ -372,7 +380,9 @@ export default defineComponent({ this.currentQuery = queries.join('&'); try { - const responseData: APIResponse | null = await (await axios.get(`${TIMETABLES_API_URL}?${this.currentQuery}`)).data; + const responseData: APIResponse | null = await ( + await axios.get(`${TIMETABLES_API_URL}?${this.currentQuery}`) + ).data; if (!responseData) { this.historyDataStatus.status = DataStatus.Error; diff --git a/src/styles/JournalSection.scss b/src/styles/JournalSection.scss index eca6ee2..4de5ad6 100644 --- a/src/styles/JournalSection.scss +++ b/src/styles/JournalSection.scss @@ -8,11 +8,11 @@ } &-enter-active { - transition: all 200ms ease-in-out; + transition: all 100ms ease-out; } &-leave-active { - transition: all 200ms ease-in-out; + transition: all 100ms ease-out; } } @@ -48,33 +48,17 @@ } .journal_item, -.journal_warning { +.journal_warning, +.journal_loading { background: #202020; padding: 1em; margin: 1em 0; } .journal_loading { - margin-top: 2em; - - img { - margin: 0 auto; - display: block; - - width: 8em; - } - text-align: center; + font-size: 1.35em; - .loading-label { - background: #333; - color: white; - - padding: 0.5em 0.5em; - font-size: 1.3em; - - border-radius: 1em; - } } @include smallScreen() { diff --git a/src/styles/icons.scss b/src/styles/icons.scss new file mode 100644 index 0000000..e69de29