From 526f2bef37c8e1b2a175a1f7fc015efa1babad3d Mon Sep 17 00:00:00 2001 From: Spythere Date: Wed, 5 Jan 2022 13:23:57 +0100 Subject: [PATCH] Cleanup i restrukturyzacja widoku scenerii --- src/components/SceneryView/SceneryInfo.vue | 437 ++---------------- .../SceneryInfo/SceneryInfoDispatcher.vue | 79 ++++ .../SceneryInfo/SceneryInfoHeader.vue | 61 +++ .../SceneryInfo/SceneryInfoIcons.vue | 100 ++++ .../SceneryInfo/SceneryInfoSpawnList.vue | 54 +++ .../SceneryInfo/SceneryInfoStats.vue | 90 ++++ .../SceneryInfo/SceneryInfoUserList.vue | 134 ++++++ .../SceneryView/SceneryTimetable.vue | 6 +- src/components/StationsView/StationTable.vue | 2 +- src/components/TrainsView/TrainTable.vue | 19 +- src/styles/user_badge.scss | 54 --- 11 files changed, 571 insertions(+), 465 deletions(-) create mode 100644 src/components/SceneryView/SceneryInfo/SceneryInfoDispatcher.vue create mode 100644 src/components/SceneryView/SceneryInfo/SceneryInfoHeader.vue create mode 100644 src/components/SceneryView/SceneryInfo/SceneryInfoIcons.vue create mode 100644 src/components/SceneryView/SceneryInfo/SceneryInfoSpawnList.vue create mode 100644 src/components/SceneryView/SceneryInfo/SceneryInfoStats.vue create mode 100644 src/components/SceneryView/SceneryInfo/SceneryInfoUserList.vue delete mode 100644 src/styles/user_badge.scss diff --git a/src/components/SceneryView/SceneryInfo.vue b/src/components/SceneryView/SceneryInfo.vue index 32798be..7d84064 100644 --- a/src/components/SceneryView/SceneryInfo.vue +++ b/src/components/SceneryView/SceneryInfo.vue @@ -1,189 +1,49 @@ - diff --git a/src/components/SceneryView/SceneryInfo/SceneryInfoDispatcher.vue b/src/components/SceneryView/SceneryInfo/SceneryInfoDispatcher.vue new file mode 100644 index 0000000..ceb628d --- /dev/null +++ b/src/components/SceneryView/SceneryInfo/SceneryInfoDispatcher.vue @@ -0,0 +1,79 @@ + + + + + diff --git a/src/components/SceneryView/SceneryInfo/SceneryInfoHeader.vue b/src/components/SceneryView/SceneryInfo/SceneryInfoHeader.vue new file mode 100644 index 0000000..edf724a --- /dev/null +++ b/src/components/SceneryView/SceneryInfo/SceneryInfoHeader.vue @@ -0,0 +1,61 @@ + + + + + diff --git a/src/components/SceneryView/SceneryInfo/SceneryInfoIcons.vue b/src/components/SceneryView/SceneryInfo/SceneryInfoIcons.vue new file mode 100644 index 0000000..13b5cd9 --- /dev/null +++ b/src/components/SceneryView/SceneryInfo/SceneryInfoIcons.vue @@ -0,0 +1,100 @@ + + + + + diff --git a/src/components/SceneryView/SceneryInfo/SceneryInfoSpawnList.vue b/src/components/SceneryView/SceneryInfo/SceneryInfoSpawnList.vue new file mode 100644 index 0000000..988c8c8 --- /dev/null +++ b/src/components/SceneryView/SceneryInfo/SceneryInfoSpawnList.vue @@ -0,0 +1,54 @@ + + + + + diff --git a/src/components/SceneryView/SceneryInfo/SceneryInfoStats.vue b/src/components/SceneryView/SceneryInfo/SceneryInfoStats.vue new file mode 100644 index 0000000..6b5eafd --- /dev/null +++ b/src/components/SceneryView/SceneryInfo/SceneryInfoStats.vue @@ -0,0 +1,90 @@ + + + + + diff --git a/src/components/SceneryView/SceneryInfo/SceneryInfoUserList.vue b/src/components/SceneryView/SceneryInfo/SceneryInfoUserList.vue new file mode 100644 index 0000000..7c460fa --- /dev/null +++ b/src/components/SceneryView/SceneryInfo/SceneryInfoUserList.vue @@ -0,0 +1,134 @@ + + + + + diff --git a/src/components/SceneryView/SceneryTimetable.vue b/src/components/SceneryView/SceneryTimetable.vue index 716c81c..99067eb 100644 --- a/src/components/SceneryView/SceneryTimetable.vue +++ b/src/components/SceneryView/SceneryTimetable.vue @@ -35,11 +35,7 @@ :key="i + 1" tabindex="0" @click="navigateToTrain(scheduledTrain.trainNo)" - @keydown=" - (e) => { - if (e.keyCode == 13) navigateToTrain(scheduledTrain.trainNo); - } - " + @keydown.enter="navigateToTrain(scheduledTrain.trainNo)" > diff --git a/src/components/StationsView/StationTable.vue b/src/components/StationsView/StationTable.vue index 1abdff0..ddebae8 100644 --- a/src/components/StationsView/StationTable.vue +++ b/src/components/StationsView/StationTable.vue @@ -38,7 +38,7 @@ v-for="(station, i) in stations" :key="i + station.name" @click="() => setScenery(station.name)" - @keydown="(e) => { if(e.keyCode == 13) setScenery(station.name) }" + @keydown.enter="setScenery(station.name)" tabindex="0" >
@@ -268,6 +260,10 @@ export default defineComponent({ }, 10); }, + registerReference(el: HTMLElement, timetableId: number | undefined) { + if(timetableId) this.elList[timetableId] = el; + }, + focusOnTrain(trainNoStr: string) { const timetableId = this.computedTrains.find((train) => train.trainNo == Number(trainNoStr))?.timetableData ?.timetableId; @@ -335,7 +331,6 @@ export default defineComponent({