Compare commits

...

11 Commits

Author SHA1 Message Date
Spythere 466ec2084b Merge pull request #40 from Spythere/development
v1.8.13
2024-12-04 14:37:44 +01:00
Spythere 75b04ad247 chore: fixed navigation & route links issues 2024-12-04 14:30:56 +01:00
Spythere a3a0fb358c bump: v1.8.13 2024-12-02 18:37:05 +01:00
Spythere b602819179 chore: added more advanced routing to elements 2024-12-02 17:54:46 +01:00
Spythere 346d20fc08 restruct: types organization 2024-12-02 17:03:33 +01:00
Spythere 56ae593d5e chore: added new wiki list filters 2024-11-29 01:30:12 +01:00
Spythere 4f6b79c686 Merge pull request #39 from Spythere/development
chore: updated compatible simulator version
2024-10-24 21:38:31 +02:00
Spythere 4f89b932fb chore: updated compatible simulator version 2024-10-24 21:38:03 +02:00
Spythere 2106675a0a Merge pull request #38 from Spythere/development
v1.8.12
2024-10-22 21:31:37 +02:00
Spythere 1b68e0174d bump: v1.8.12 2024-10-22 20:54:35 +02:00
Spythere b47f692ac1 fix: typos; updated images api source 2024-10-22 20:54:24 +02:00
22 changed files with 295 additions and 136 deletions
+3 -2
View File
@@ -1,6 +1,6 @@
{ {
"name": "pojazdownik", "name": "pojazdownik",
"version": "1.8.11", "version": "1.8.13",
"private": true, "private": true,
"type": "module", "type": "module",
"scripts": { "scripts": {
@@ -16,7 +16,8 @@
"pinia": "^2.0.17", "pinia": "^2.0.17",
"prettier": "^3.0.3", "prettier": "^3.0.3",
"vue": "^3.2.37", "vue": "^3.2.37",
"vue-i18n": "9.11.0" "vue-i18n": "9.11.0",
"vue-router": "4"
}, },
"devDependencies": { "devDependencies": {
"@rushstack/eslint-patch": "^1.3.3", "@rushstack/eslint-patch": "^1.3.3",
+2 -1
View File
@@ -1,7 +1,8 @@
<template> <template>
<AppModals /> <AppModals />
<ImageFullscreenPreview v-if="store.vehiclePreviewSrc" /> <ImageFullscreenPreview v-if="store.vehiclePreviewSrc" />
<AppContainerView />
<router-view></router-view>
</template> </template>
<script lang="ts"> <script lang="ts">
+2 -2
View File
@@ -76,7 +76,7 @@
<div class="thumbnail-container"> <div class="thumbnail-container">
<div>{{ stockType }}</div> <div>{{ stockType }}</div>
<img <img
:src="`https://static.spythere.eu/thumbnails/${stockType}.png`" :src="`https://stacjownik.spythere.eu/static/thumbnails/${stockType}.png`"
:title="stockType" :title="stockType"
style="opacity: 0" style="opacity: 0"
@error="(e) => onStockItemError(e, stockType)" @error="(e) => onStockItemError(e, stockType)"
@@ -100,7 +100,7 @@ import { useStore } from '../../store';
import imageMixin from '../../mixins/imageMixin'; import imageMixin from '../../mixins/imageMixin';
import stockMixin from '../../mixins/stockMixin'; import stockMixin from '../../mixins/stockMixin';
import { IRealComposition, VehicleGroupType } from '../../types'; import { IRealComposition, VehicleGroupType } from '../../types/common.types';
function getVehicleType(stockType: string): VehicleGroupType { function getVehicleType(stockType: string): VehicleGroupType {
if (/^E/.test(stockType)) return 'loco-electric'; if (/^E/.test(stockType)) return 'loco-electric';
+1 -1
View File
@@ -126,7 +126,7 @@ import imageMixin from '../../mixins/imageMixin';
import { useStore } from '../../store'; import { useStore } from '../../store';
import stockPreviewMixin from '../../mixins/stockPreviewMixin'; import stockPreviewMixin from '../../mixins/stockPreviewMixin';
import stockMixin from '../../mixins/stockMixin'; import stockMixin from '../../mixins/stockMixin';
import { LocoGroupType, WagonGroupType } from '../../types'; import { LocoGroupType, WagonGroupType } from '../../types/common.types';
export default defineComponent({ export default defineComponent({
mixins: [imageMixin, stockPreviewMixin, stockMixin], mixins: [imageMixin, stockPreviewMixin, stockMixin],
+28 -72
View File
@@ -1,45 +1,46 @@
<template> <template>
<section class="stock-section"> <section class="stock-section">
<div class="section_modes"> <div class="section_modes">
<button <router-link v-for="(route, i) in routes" :key="route.name" class="link-btn" :to="route.href">
v-for="(id, i) in sectionModes" <span class="text--accent">{{ i + 1 }}.</span> {{ $t(`topbar.${route.name}`) }}
:key="id" <span class="text--grayed" v-if="route.name == 'stock'">({{ store.stockList.length }})</span>
class="btn" </router-link>
ref="sectionButtonRefs"
@click="chooseSection(id)"
:data-selected="store.stockSectionMode == id"
>
<span class="text--accent">{{ i + 1 }}.</span> {{ $t(`topbar.${id}`) }}
<span v-if="id == 'stock-list'">({{ store.stockList.length }})</span>
</button>
</div> </div>
<transition name="tab-change" mode="out-in"> <transition name="tab-change" mode="out-in">
<keep-alive> <keep-alive>
<component :is="chosenSectionComponent"></component> <component :is="route.meta.viewMode"></component>
</keep-alive> </keep-alive>
</transition> </transition>
</section> </section>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { computed, onMounted, ref } from 'vue'; import { onMounted } from 'vue';
import { useStore } from '../../store'; import { useStore } from '../../store';
import StockListTab from '../tabs/StockListTab.vue'; import { useRoute, useRouter } from 'vue-router';
import StockGeneratorTab from '../tabs/StockGeneratorTab.vue';
import NumberGeneratorTab from '../tabs/NumberGeneratorTab.vue';
import WikiListTab from '../tabs/WikiListTab.vue';
const sectionButtonRefs = ref([]);
const store = useStore(); const store = useStore();
type SectionMode = typeof store.stockSectionMode; const route = useRoute();
const router = useRouter();
const sectionModes: SectionMode[] = [ const routes = [
'stock-list', {
'wiki-list', name: 'stock',
'number-generator', href: '/',
'stock-generator', },
{
name: 'wiki',
href: '/wiki',
},
{
name: 'numgen',
href: '/numgen',
},
{
name: 'stockgen',
href: '/stockgen',
},
]; ];
onMounted(() => { onMounted(() => {
@@ -49,34 +50,10 @@ onMounted(() => {
if (/^[1234]$/.test(e.key)) { if (/^[1234]$/.test(e.key)) {
const keyNum = Number(e.key); const keyNum = Number(e.key);
store.stockSectionMode = sectionModes[keyNum - 1]; router.push(routes[keyNum - 1].href);
(sectionButtonRefs.value[keyNum - 1] as HTMLButtonElement)?.focus();
} }
}); });
}); });
const chosenSectionComponent = computed(() => {
switch (store.stockSectionMode) {
case 'stock-list':
return StockListTab;
case 'wiki-list':
return WikiListTab;
case 'stock-generator':
return StockGeneratorTab;
case 'number-generator':
return NumberGeneratorTab;
default:
return StockListTab;
}
});
function chooseSection(sectionId: SectionMode) {
store.stockSectionMode = sectionId;
}
</script> </script>
<style lang="scss"> <style lang="scss">
@@ -107,32 +84,11 @@ function chooseSection(sectionId: SectionMode) {
.section_modes { .section_modes {
display: grid; display: grid;
grid-template-columns: repeat(4, 1fr); grid-template-columns: repeat(4, 1fr);
padding: 1px;
gap: 0.5em; gap: 0.5em;
margin-bottom: 1em; margin-bottom: 1em;
button {
position: relative;
border-radius: 0.5em 0.5em 0 0;
&::after {
position: absolute;
bottom: 0;
left: 50%;
transform: translateX(-50%);
content: '';
width: 0;
height: 2px;
transition: all 100ms;
background-color: $accentColor;
}
&[data-selected='true']::after {
width: 100%;
}
}
} }
@media screen and (max-width: 650px) { @media screen and (max-width: 650px) {
+3 -4
View File
@@ -118,7 +118,7 @@ import { defineComponent } from 'vue';
import { useStore } from '../../store'; import { useStore } from '../../store';
import stockMixin from '../../mixins/stockMixin'; import stockMixin from '../../mixins/stockMixin';
import { ICargo, ICarWagon, IStock } from '../../types'; import { ICargo, ICarWagon, IStock } from '../../types/common.types';
import { isTractionUnit } from '../../utils/vehicleUtils'; import { isTractionUnit } from '../../utils/vehicleUtils';
import generatorDataJSON from '../../data/generatorData.json'; import generatorDataJSON from '../../data/generatorData.json';
@@ -280,10 +280,9 @@ export default defineComponent({
const bestStockList = bestGeneration.stockList; const bestStockList = bestGeneration.stockList;
this.groupStock(bestStockList);
this.store.stockList = bestGeneration.stockList; this.store.stockList = bestGeneration.stockList;
this.store.stockSectionMode = 'stock-list'; this.groupStock(bestStockList);
this.$router.push('/');
}, },
previewCar(type: string) { previewCar(type: string) {
+40 -11
View File
@@ -98,19 +98,28 @@
import { defineComponent } from 'vue'; import { defineComponent } from 'vue';
import { useStore } from '../../store'; import { useStore } from '../../store';
import stockPreviewMixin from '../../mixins/stockPreviewMixin'; import stockPreviewMixin from '../../mixins/stockPreviewMixin';
import { IVehicle } from '../../types'; import { IVehicle } from '../../types/common.types';
import { isTractionUnit } from '../../utils/vehicleUtils'; import { isTractionUnit } from '../../utils/vehicleUtils';
import stockMixin from '../../mixins/stockMixin'; import stockMixin from '../../mixins/stockMixin';
import imageMixin from '../../mixins/imageMixin'; import imageMixin from '../../mixins/imageMixin';
const sorters = ['type', 'group', 'length', 'weight', 'maxSpeed'] as const; const sorters = ['type', 'group', 'length', 'weight', 'maxSpeed'] as const;
const filters = ['vehicles-all', 'vehicles-traction', 'vehicles-wagon'] as const;
enum VehicleFilter {
AllVehicles = 'vehicles-all',
AllTractions = 'vehicles-tractions-all',
ElectricTraction = 'vehicles-tractions-electric',
DieselTraction = 'vehicles-tractions-diesel',
EmuTraction = 'vehicles-tractions-emu',
DmuTraction = 'vehicles-tractions-dmu',
AllWagons = 'vehicles-wagons-all',
PassengerWagons = 'vehicles-wagons-passenger',
FreightWagons = 'vehicles-wagons-freight',
}
type SorterType = (typeof sorters)[number]; type SorterType = (typeof sorters)[number];
type SorterDirection = 'asc' | 'desc'; type SorterDirection = 'asc' | 'desc';
type FilterType = (typeof filters)[number];
export default defineComponent({ export default defineComponent({
mixins: [stockPreviewMixin, stockMixin, imageMixin], mixins: [stockPreviewMixin, stockMixin, imageMixin],
@@ -120,14 +129,14 @@ export default defineComponent({
observer: null as IntersectionObserver | null, observer: null as IntersectionObserver | null,
sorters: sorters, sorters: sorters,
filters: filters, filters: Object.values(VehicleFilter),
searchedVehicleTypeName: '', searchedVehicleTypeName: '',
sorterType: 'type' as SorterType, sorterType: 'type' as SorterType,
sorterDirection: 'asc' as SorterDirection, sorterDirection: 'asc' as SorterDirection,
filterType: 'vehicles-all' as FilterType, filterType: VehicleFilter.AllVehicles,
lastScrollTop: 0, lastScrollTop: 0,
}; };
@@ -170,11 +179,31 @@ export default defineComponent({
) )
return false; return false;
if ( switch (this.filterType) {
(this.filterType == 'vehicles-traction' && !isTractionUnit(v)) || case VehicleFilter.AllTractions:
(this.filterType == 'vehicles-wagon' && isTractionUnit(v)) return isTractionUnit(v);
)
return false; case VehicleFilter.ElectricTraction:
return isTractionUnit(v) && v.group == 'loco-electric';
case VehicleFilter.DieselTraction:
return isTractionUnit(v) && v.group == 'loco-diesel';
case VehicleFilter.EmuTraction:
return isTractionUnit(v) && v.group == 'unit-electric';
case VehicleFilter.DmuTraction:
return isTractionUnit(v) && v.group == 'unit-diesel';
case VehicleFilter.AllWagons:
return !isTractionUnit(v);
case VehicleFilter.PassengerWagons:
return !isTractionUnit(v) && v.group == 'wagon-passenger';
case VehicleFilter.FreightWagons:
return !isTractionUnit(v) && v.group == 'wagon-freight';
}
return true; return true;
}, },
+1 -1
View File
@@ -28,7 +28,7 @@
v-for="thumbnail in getVehicleThumbnails(stock.vehicleRef.type)" v-for="thumbnail in getVehicleThumbnails(stock.vehicleRef.type)"
draggable="false" draggable="false"
style="min-width: 200px" style="min-width: 200px"
:src="`https://static.spythere.eu/thumbnails/v2/${thumbnail.src}.png`" :src="`https://stacjownik.spythere.eu/static/thumbnails/${thumbnail.src}.png`"
:alt="stock.vehicleRef.type" :alt="stock.vehicleRef.type"
:title="stock.vehicleRef.type" :title="stock.vehicleRef.type"
@load="($event) => (($event.target as HTMLImageElement).style.minWidth = 'auto')" @load="($event) => (($event.target as HTMLImageElement).style.minWidth = 'auto')"
+18 -12
View File
@@ -41,10 +41,10 @@
"construction": "Construction type:" "construction": "Construction type:"
}, },
"topbar": { "topbar": {
"stock-list": "STOCK", "stock": "STOCK",
"wiki-list": "VEHICLES", "wiki": "VEHICLES",
"number-generator": "NUMBER GEN.", "numgen": "NUMBER GEN.",
"stock-generator": "STOCK GEN." "stockgen": "STOCK GEN."
}, },
"stocklist": { "stocklist": {
"title": "STOCK EDITOR", "title": "STOCK EDITOR",
@@ -128,20 +128,20 @@
"EI": "EI - domestic express", "EI": "EI - domestic express",
"EC": "EC - international express", "EC": "EC - international express",
"EN": "EN - domestic night express", "EN": "EN - domestic night express",
"MP": "MP - intervoivodeship bullet", "MP": "MP - intervoivodeship bullet",
"MO": "MO - intervoivodeship regio", "MO": "MO - intervoivodeship regio",
"MM": "MM - international bullet", "MM": "MM - international bullet",
"MH": "MH - intervoivodeship night bullet", "MH": "MH - intervoivodeship night bullet",
"RP": "RP - voivodeship bullet", "RP": "RP - voivodeship bullet",
"RM": "RM - international voivodeship regio", "RM": "RM - international voivodeship regio",
"RO": "RO - voivodeship regio", "RO": "RO - voivodeship regio",
"RA": "RA - voivodeship regio (urban)", "RA": "RA - voivodeship regio (urban)",
"PW": "PW - empty passenger", "PW": "PW - empty passenger",
"PX": "PX - empty passenger test drive", "PX": "PX - empty passenger test drive",
"TC": "TC - international freight (intermodal)", "TC": "TC - international freight (intermodal)",
"TG": "TG - international freight (organized cargo)", "TG": "TG - international freight (organized cargo)",
"TR": "TR - international freight (unorganized cargo)", "TR": "TR - international freight (unorganized cargo)",
@@ -151,12 +151,12 @@
"TK": "TK - freight (for stations & sidings)", "TK": "TK - freight (for stations & sidings)",
"TS": "TS - empty freight test drive", "TS": "TS - empty freight test drive",
"TH": "TH - locomotive rolling stock (over 3 vehicles)", "TH": "TH - locomotive rolling stock (over 3 vehicles)",
"LT": "LT - freight locomotive only", "LT": "LT - freight locomotive only",
"LP": "LP - passenger locomotive only", "LP": "LP - passenger locomotive only",
"LS": "LS - shunting locomotive only", "LS": "LS - shunting locomotive only",
"LZ": "LS - shunting locomotive only", "LZ": "LS - shunting locomotive only",
"ZN": "ZN - inspection / diagnostic type", "ZN": "ZN - inspection / diagnostic type",
"ZU": "ZU - other maintenance type" "ZU": "ZU - other maintenance type"
} }
@@ -173,8 +173,14 @@
}, },
"filters": { "filters": {
"vehicles-all": "all", "vehicles-all": "all",
"vehicles-traction": "traction units", "vehicles-tractions-all": "traction units - all",
"vehicles-wagon": "wagons" "vehicles-tractions-electric": "electric locomotives",
"vehicles-tractions-diesel": "diesel locomotives",
"vehicles-tractions-emu": "electric units",
"vehicles-tractions-dmu": "diesel units",
"vehicles-wagons-all": "wagons - all",
"vehicles-wagons-passenger": "wagons - passenger",
"vehicles-wagons-freight": "wagons - freight"
}, },
"sort-by": { "sort-by": {
"type": "name", "type": "name",
+13 -7
View File
@@ -41,10 +41,10 @@
"construction": "Typ konstrukcji:" "construction": "Typ konstrukcji:"
}, },
"topbar": { "topbar": {
"stock-list": "SKŁAD", "stock": "SKŁAD",
"wiki-list": "POJAZDY", "wiki": "POJAZDY",
"number-generator": "GNR NUMERU", "numgen": "GNR NUMERU",
"stock-generator": "GNR SKŁADU" "stockgen": "GNR SKŁADU"
}, },
"stocklist": { "stocklist": {
"title": "EDYTOR SKŁADU", "title": "EDYTOR SKŁADU",
@@ -137,7 +137,7 @@
"MM": "MM - międzynar. pośpieszny", "MM": "MM - międzynar. pośpieszny",
"MH": "MH - międzywoj. pośpieszny hotelowy", "MH": "MH - międzywoj. pośpieszny hotelowy",
"RM": "RM - woj. osobowy międzynarodowy", "RM": "RM - woj. osobowy międzynarodowy",
"RA": "RA - woj. osobowy algomeracyjny", "RA": "RA - woj. osobowy aglomeracyjny",
"PW": "PW - pasażerski próżny - służbowy", "PW": "PW - pasażerski próżny - służbowy",
"PX": "PX - pasażerski próżny próbny", "PX": "PX - pasażerski próżny próbny",
@@ -173,8 +173,14 @@
}, },
"filters": { "filters": {
"vehicles-all": "wszystkie", "vehicles-all": "wszystkie",
"vehicles-traction": "trakcyjne", "vehicles-tractions-all": "trakcyjne - wszystkie",
"vehicles-wagon": "wagony" "vehicles-tractions-electric": "elektrowozy",
"vehicles-tractions-diesel": "spalinowozy",
"vehicles-tractions-emu": "EZT",
"vehicles-tractions-dmu": "SZT",
"vehicles-wagons-all": "wagony - wszystkie",
"vehicles-wagons-passenger": "wagony pasażerskie",
"vehicles-wagons-freight": "wagony towarowe"
}, },
"sort-by": { "sort-by": {
"type": "nazwa", "type": "nazwa",
+2 -1
View File
@@ -3,6 +3,7 @@ import { createPinia } from 'pinia';
import App from './App.vue'; import App from './App.vue';
import i18n from './i18n-setup'; import i18n from './i18n-setup';
import router from './router';
const pinia = createPinia(); const pinia = createPinia();
createApp(App).use(pinia).use(i18n).mount('#app'); createApp(App).use(pinia).use(i18n).use(router).mount('#app');
+16
View File
@@ -0,0 +1,16 @@
import http from '../http';
import { API } from '../types/api.types';
export class ApiManager {
static async fetchActiveData() {
try {
const responseData = (await http.get<API.ActiveData>('/api/getActiveData')).data;
return responseData;
} catch (error) {
console.error('Nie udało się pobrać zdalnej zawartości', error);
}
return null;
}
}
+1 -1
View File
@@ -7,7 +7,7 @@ export default defineComponent({
}, },
getThumbnailURL(vehicleType: string, size: 'small' | 'large') { getThumbnailURL(vehicleType: string, size: 'small' | 'large') {
return `https://static.spythere.eu/images/${vehicleType}--${size == 'small' ? 300 : 800}px.jpg`; return `https://stacjownik.spythere.eu/static/images/${vehicleType}--${size == 'small' ? 300 : 800}px.jpg`;
}, },
}, },
}); });
+1 -1
View File
@@ -1,6 +1,6 @@
import { defineComponent } from 'vue'; import { defineComponent } from 'vue';
import { useStore } from '../store'; import { useStore } from '../store';
import { ICarWagon, ILocomotive, IStock, ICargo, IVehicle } from '../types'; import { ICarWagon, ILocomotive, IStock, ICargo, IVehicle } from '../types/common.types';
import { isTractionUnit } from '../utils/vehicleUtils'; import { isTractionUnit } from '../utils/vehicleUtils';
export default defineComponent({ export default defineComponent({
+1 -1
View File
@@ -1,6 +1,6 @@
import { defineComponent } from 'vue'; import { defineComponent } from 'vue';
import { useStore } from '../store'; import { useStore } from '../store';
import { ICarWagon, ILocomotive, IStock, IVehicle, LocoGroupType, WagonGroupType } from '../types'; import { ICarWagon, ILocomotive, IStock, IVehicle, LocoGroupType, WagonGroupType } from '../types/common.types';
import { isTractionUnit } from '../utils/vehicleUtils'; import { isTractionUnit } from '../utils/vehicleUtils';
export default defineComponent({ export default defineComponent({
+53
View File
@@ -0,0 +1,53 @@
import { createRouter, createWebHistory, RouteRecordRaw } from 'vue-router';
import AppContainerView from './views/AppContainerView.vue';
import WikiListTab from './components/tabs/WikiListTab.vue';
import StockListTab from './components/tabs/StockListTab.vue';
import NumberGeneratorTab from './components/tabs/NumberGeneratorTab.vue';
import StockGeneratorTab from './components/tabs/StockGeneratorTab.vue';
const routes: RouteRecordRaw[] = [
{
path: '/',
component: AppContainerView,
meta: {
viewMode: StockListTab,
},
children: [
{
path: 'stock',
redirect: '/',
meta: {
viewMode: StockListTab,
},
},
{
path: 'wiki',
component: AppContainerView,
meta: {
viewMode: WikiListTab,
},
},
{
path: 'numgen',
component: AppContainerView,
meta: {
viewMode: NumberGeneratorTab,
},
},
{
path: 'stockgen',
component: AppContainerView,
meta: {
viewMode: StockGeneratorTab,
},
},
],
},
];
const router = createRouter({
history: createWebHistory(),
routes,
});
export default router;
+4 -16
View File
@@ -9,7 +9,7 @@ import {
LocoGroupType, LocoGroupType,
WagonGroupType, WagonGroupType,
IVehicleData, IVehicleData,
} from './types'; } from './types/common.types';
import { defineStore } from 'pinia'; import { defineStore } from 'pinia';
import { import {
acceptableWeight, acceptableWeight,
@@ -50,8 +50,6 @@ export const useStore = defineStore({
vehiclePreviewSrc: '', vehiclePreviewSrc: '',
stockSectionMode: 'stock-list',
isRandomizerCardOpen: false, isRandomizerCardOpen: false,
isRealStockListCardOpen: false, isRealStockListCardOpen: false,
@@ -59,7 +57,7 @@ export const useStore = defineStore({
lastFocusedElement: null as HTMLElement | null, lastFocusedElement: null as HTMLElement | null,
compatibleSimulatorVersion: '2024.1.2', compatibleSimulatorVersion: '2024.2.1',
}), }),
getters: { getters: {
@@ -139,18 +137,8 @@ export const useStore = defineStore({
}, },
handleRouting() { handleRouting() {
switch (window.location.pathname) { if (window.location.search.includes('trainId=')) {
case '/numgnr': const trainId = window.location.search;
this.stockSectionMode = 'number-generator';
break;
case '/stockgnr':
this.stockSectionMode = 'stock-generator';
break;
case '/vehicles':
this.stockSectionMode = 'wiki-list';
break;
default:
break;
} }
}, },
}, },
+6 -1
View File
@@ -138,7 +138,8 @@ button {
cursor: pointer; cursor: pointer;
} }
.btn { .btn,
.link-btn {
padding: 0.4em 0.75em; padding: 0.4em 0.75em;
outline: none; outline: none;
@@ -206,6 +207,10 @@ button {
} }
} }
.link-btn.router-link-exact-active {
color: $accentColor;
}
select, select,
input[type='text'], input[type='text'],
input[type='number'] { input[type='number'] {
+87
View File
@@ -0,0 +1,87 @@
// API namespace
export namespace API {
export interface ActiveData {
trains: Train[];
activeSceneries: ActiveScenery[];
}
}
export interface ActiveScenery {
dispatcherId: number;
dispatcherName: string;
dispatcherIsSupporter: boolean;
stationName: string;
stationHash: string;
region: string;
maxUsers: number;
currentUsers: number;
spawn: number;
lastSeen: number;
dispatcherExp: number;
nameFromHeader: string;
spawnString?: string;
networkConnectionString: string;
isOnline: number;
dispatcherRate: number;
dispatcherStatus: number;
}
export interface Train {
id: string;
trainNo: number;
mass: number;
speed: number;
length: number;
distance: number;
stockString: string;
driverName: string;
driverId: number;
driverIsSupporter: boolean;
driverLevel: number;
currentStationHash: string;
currentStationName: string;
signal: string;
connectedTrack: string;
online: number;
lastSeen: number;
region: string;
isTimeout: boolean;
timetable?: Timetable;
}
export interface Timetable {
SKR: boolean;
TWR: boolean;
hasDangerousCargo: boolean;
hasExtraDeliveries: boolean;
warningNotes: string;
category: string;
stopList: TimetableStop[];
route: string;
timetableId: number;
sceneries: string[];
path: string;
}
export interface TimetableStop {
stopName: string;
stopNameRAW: string;
stopType: string;
stopDistance: number;
pointId: string;
comments?: (null | string)[];
mainStop: boolean;
arrivalLine?: string;
arrivalTimestamp: number;
arrivalRealTimestamp: number;
arrivalDelay: number;
departureLine?: string;
departureTimestamp: number;
departureRealTimestamp: number;
departureDelay: number;
beginsHere: boolean;
terminatesHere: boolean;
confirmed: number;
stopped: number;
stopTime?: number;
}
@@ -1,5 +1,4 @@
export type IVehicle = ILocomotive | ICarWagon; export type IVehicle = ILocomotive | ICarWagon;
export type StockSectionMode = 'STOCK_LIST' | 'STOCK_GENERATOR';
export type LocoGroupType = 'loco-electric' | 'loco-diesel' | 'unit-electric' | 'unit-diesel'; export type LocoGroupType = 'loco-electric' | 'loco-diesel' | 'unit-electric' | 'unit-diesel';
export type WagonGroupType = 'wagon-passenger' | 'wagon-freight'; export type WagonGroupType = 'wagon-passenger' | 'wagon-freight';
+1 -1
View File
@@ -6,7 +6,7 @@ import {
IVehiclesAPIResponse, IVehiclesAPIResponse,
LocoGroupType, LocoGroupType,
WagonGroupType, WagonGroupType,
} from '../types'; } from '../types/common.types';
import { import {
MassLimitLocoType, MassLimitLocoType,
SpeedLimitLocoType, SpeedLimitLocoType,
+12
View File
@@ -1672,6 +1672,11 @@
resolved "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.5.1.tgz" resolved "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.5.1.tgz"
integrity sha512-+KpckaAQyfbvshdDW5xQylLni1asvNSGme1JFs8I1+/H5pHEhqUKMEQD/qn3Nx5+/nycBq11qAEi8lk+LXI2dA== integrity sha512-+KpckaAQyfbvshdDW5xQylLni1asvNSGme1JFs8I1+/H5pHEhqUKMEQD/qn3Nx5+/nycBq11qAEi8lk+LXI2dA==
"@vue/devtools-api@^6.6.4":
version "6.6.4"
resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.6.4.tgz#cbe97fe0162b365edc1dba80e173f90492535343"
integrity sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==
"@vue/eslint-config-prettier@^9.0.0": "@vue/eslint-config-prettier@^9.0.0":
version "9.0.0" version "9.0.0"
resolved "https://registry.npmjs.org/@vue/eslint-config-prettier/-/eslint-config-prettier-9.0.0.tgz" resolved "https://registry.npmjs.org/@vue/eslint-config-prettier/-/eslint-config-prettier-9.0.0.tgz"
@@ -4346,6 +4351,13 @@ vue-i18n@9.11.0:
"@intlify/shared" "9.11.0" "@intlify/shared" "9.11.0"
"@vue/devtools-api" "^6.5.0" "@vue/devtools-api" "^6.5.0"
vue-router@4:
version "4.5.0"
resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.5.0.tgz#58fc5fe374e10b6018f910328f756c3dae081f14"
integrity sha512-HDuk+PuH5monfNuY+ct49mNmkCRK4xJAV9Ts4z9UFc4rzdDnxQLyCMGGc8pKhZhHTVzfanpNwB/lwqevcBwI4w==
dependencies:
"@vue/devtools-api" "^6.6.4"
vue-template-compiler@^2.7.14: vue-template-compiler@^2.7.14:
version "2.7.16" version "2.7.16"
resolved "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.16.tgz" resolved "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.16.tgz"