diff --git a/src/webapp/src/router/index.js b/src/webapp/src/router/index.js index 1ba3ced..4b669f1 100644 --- a/src/webapp/src/router/index.js +++ b/src/webapp/src/router/index.js @@ -53,7 +53,7 @@ router.beforeEach( ( to, from ) => { return { name: 'login' }; } else if ( !isUserAuthenticated && to.name === 'pay' ) { return { name: 'purchase' }; - } else if ( to.name.substring( 0, 5 ) === 'setup' && !backendStore.getVisitedSetupPages[ to.name.substring( 5 ).toLowerCase() ] && to.name.substring( 5 ).toLowerCase() !== 'start' ) { + } else if ( to.name.substring( 0, 5 ) === 'setup' && !backendStore.getVisitedSetupPages[ to.name.substring( 5 ).toLowerCase() ] && to.name.substring( 5 ).toLowerCase() !== 'start' && to.name.substring( 5 ).toLowerCase() !== 'root' ) { return { name: 'setupStart' }; } } ); diff --git a/src/webapp/src/router/setupRoutes.js b/src/webapp/src/router/setupRoutes.js index 6da4036..70ad87f 100644 --- a/src/webapp/src/router/setupRoutes.js +++ b/src/webapp/src/router/setupRoutes.js @@ -13,7 +13,7 @@ export default { component: () => import( '../views/SetupView.vue' ), meta: { title: 'Login :: Admin - libreevent', - adminAuthRequired: true, + setupAuthRequired: true, }, children: [ { @@ -22,7 +22,7 @@ export default { component: () => import( '../views/setup/SetupStartView.vue' ), meta: { title: 'Start :: Setup - libreevent', - adminAuthRequired: true, + setupAuthRequired: true, } }, { @@ -31,7 +31,7 @@ export default { component: () => import( '../views/setup/SetupRootView.vue' ), meta: { title: 'Root account :: Setup - libreevent', - adminAuthRequired: true, + setupAuthRequired: true, } }, { @@ -40,7 +40,7 @@ export default { component: () => import( '../views/setup/SetupPageView.vue' ), meta: { title: 'Landing page :: Setup - libreevent', - adminAuthRequired: true, + setupAuthRequired: true, } }, { @@ -49,7 +49,7 @@ export default { component: () => import( '../views/setup/SetupPaymentsView.vue' ), meta: { title: 'Payments :: Setup - libreevent', - adminAuthRequired: true, + setupAuthRequired: true, } }, { @@ -58,7 +58,7 @@ export default { component: () => import( '../views/setup/SetupEventsView.vue' ), meta: { title: 'Events :: Setup - libreevent', - adminAuthRequired: true, + setupAuthRequired: true, } }, { @@ -67,7 +67,7 @@ export default { component: () => import( '../views/setup/SetupTOSView.vue' ), meta: { title: 'TOS (Optional) :: Setup - libreevent', - adminAuthRequired: true, + setupAuthRequired: true, } }, { @@ -76,7 +76,7 @@ export default { component: () => import( '../views/setup/SetupCompleteView.vue' ), meta: { title: 'Setup complete :: Setup - libreevent', - adminAuthRequired: true, + setupAuthRequired: true, } }, ] diff --git a/src/webapp/src/stores/backendStore.js b/src/webapp/src/stores/backendStore.js index 919f3db..70ffaee 100644 --- a/src/webapp/src/stores/backendStore.js +++ b/src/webapp/src/stores/backendStore.js @@ -10,7 +10,7 @@ import { defineStore } from "pinia"; export const useBackendStore = defineStore ( 'backend', { - state: () => ( { 'visitedSetupPages': { 'root': true }, 'guestPurchase': false, 'guestPurchaseAllowed': false } ), + state: () => ( { 'visitedSetupPages': {}, 'guestPurchase': false, 'guestPurchaseAllowed': false } ), getters: { getVisitedSetupPages: ( state ) => state.visitedSetupPages, getIsGuestPurchase: ( state ) => state.guestPurchase, diff --git a/src/webapp/src/views/SetupView.vue b/src/webapp/src/views/SetupView.vue index 25cdb0b..8d650f5 100644 --- a/src/webapp/src/views/SetupView.vue +++ b/src/webapp/src/views/SetupView.vue @@ -11,8 +11,7 @@