From c3b8ed9359c5454281311aedc0dd2915fd737b74 Mon Sep 17 00:00:00 2001 From: Spythere Date: Mon, 4 Mar 2024 18:14:42 +0100 Subject: [PATCH] asdek; hotfixy --- src/App.vue | 2 +- src/components/TableActions.vue | 2 +- src/main.ts | 6 +++++- src/types/types.ts | 4 +++- src/views/ManagerView.vue | 4 +++- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/App.vue b/src/App.vue index 0539951..b412a01 100644 --- a/src/App.vue +++ b/src/App.vue @@ -35,7 +35,7 @@ export default defineComponent({ const response = await client.post('/auth/token'); this.store.setUserData(response.data); - this.$router.push('/'); + // this.$router.push('/'); } catch (error) { this.store.removeUserData(); this.$router.push('/login'); diff --git a/src/components/TableActions.vue b/src/components/TableActions.vue index 04885f7..87c1c6d 100644 --- a/src/components/TableActions.vue +++ b/src/components/TableActions.vue @@ -148,7 +148,7 @@ export default defineComponent({ signalType: 'współczesna', controlType: 'SCS', SUP: false, - routes: 'Test_1EPB:0:0', + ASDEK: false, hidden: false, routesInfo: [ { diff --git a/src/main.ts b/src/main.ts index ca8488a..5c6f7a4 100644 --- a/src/main.ts +++ b/src/main.ts @@ -20,6 +20,10 @@ router.beforeEach((to, from, next) => { return; } + if (to.meta.loginPage && window.localStorage.getItem('user')) { + next('/'); + return; + } + next(); }); - diff --git a/src/types/types.ts b/src/types/types.ts index d63d8b4..8f51cc1 100644 --- a/src/types/types.ts +++ b/src/types/types.ts @@ -10,6 +10,7 @@ export type ChangeProp = | 'signalType' | 'controlType' | 'SUP' + | 'ASDEK' | 'routesInfo' | 'checkpoints' | 'authors' @@ -28,6 +29,7 @@ export enum HeaderTypes { signalType = 'Sygnalizacja', controlType = 'Sterowanie', SUP = 'SUP', + ASDEK = 'ASDEK', authors = 'Autorzy', routesInfo = 'Szlaki', checkpoints = 'Posterunki', @@ -68,8 +70,8 @@ export interface SceneryRowItem { signalType: string; controlType: string; SUP: boolean; + ASDEK: boolean; hidden: boolean; - routes: string; routesInfo: SceneryRoutesInfo[]; checkpoints: string; authors: string; diff --git a/src/views/ManagerView.vue b/src/views/ManagerView.vue index 4537574..f14a5c3 100644 --- a/src/views/ManagerView.vue +++ b/src/views/ManagerView.vue @@ -17,7 +17,7 @@ - + URL URL @@ -31,6 +31,7 @@ {{ (station as any)[propName] ? '✅' : '❌' }} + {{ (station as any)[propName] }} @@ -85,6 +86,7 @@ export default defineComponent({ signalType: 'Sygnalizacja', controlType: 'Sterowanie', SUP: 'SUP', + ASDEK: 'ASDEK', authors: 'Autorzy', routes: 'Szlaki', checkpoints: 'Posterunki',