diff --git a/src/webapp/src/router/index.js b/src/webapp/src/router/index.js index 4b669f1..08423d2 100644 --- a/src/webapp/src/router/index.js +++ b/src/webapp/src/router/index.js @@ -49,8 +49,8 @@ router.beforeEach( ( to, from ) => { return { name: 'adminHome' }; } else if ( UserAccountPages.includes( to.name ) && !isUserAuthenticated ) { return { name: 'login' }; - } else if ( !isUserAuthenticated && to.name === 'purchase' && authRequired ) { - return { name: 'login' }; + } else if ( isUserAuthenticated && to.name === 'login' ) { + return { name: 'account' }; } 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' && to.name.substring( 5 ).toLowerCase() !== 'root' ) { diff --git a/src/webapp/src/stores/userStore.js b/src/webapp/src/stores/userStore.js index a477ce1..b08a571 100644 --- a/src/webapp/src/stores/userStore.js +++ b/src/webapp/src/stores/userStore.js @@ -10,7 +10,7 @@ import { defineStore } from "pinia"; export const useUserStore = defineStore ( 'user', { - state: () => ( { 'isUserAuth': false, 'isAdminAuth': true, 'userPermissions': {} } ), + state: () => ( { 'isUserAuth': true, 'isAdminAuth': true, 'userPermissions': {} } ), getters: { getUserAuthenticated: ( state ) => state.isUserAuth, getAdminAuthenticated: ( state ) => state.isAdminAuth, diff --git a/src/webapp/src/views/PurchaseView.vue b/src/webapp/src/views/PurchaseView.vue index 189a400..adba69d 100644 --- a/src/webapp/src/views/PurchaseView.vue +++ b/src/webapp/src/views/PurchaseView.vue @@ -19,8 +19,13 @@

Billing

- - Buy now + + + + + +
Street and house number
+ Buy now
@@ -44,6 +49,25 @@