janishutz/libreevent
1
0
Fork 0
mirror of https://github.com/janishutz/libreevent.git synced 2025-11-25 13:24:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix setup progress

Browse Source
This commit is contained in:
janis
2023-06-12 15:30:46 +02:00
parent f517786655
commit 4bb78c3991
4 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/webapp/src/router/index.js
View File

@@ -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' };
}
} );

16
src/webapp/src/router/setupRoutes.js
View File

@@ -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,
}
},
]

2
src/webapp/src/stores/backendStore.js
View File

@@ -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,

3
src/webapp/src/views/SetupView.vue
View File

@@ -11,8 +11,7 @@
<div>
<nav class="setup-nav">
<router-link to="/setup">Start</router-link> |
<router-link to="/setup/root" v-if="backendStore.getVisitedSetupPages[ 'root' ]">Root account</router-link>
<a v-else class="inactive">Root account</a> |
<router-link to="/setup/root">Root account</router-link> |
<router-link to="/setup/page" v-if="backendStore.getVisitedSetupPages[ 'page' ]">Landing page</router-link>
<a v-else class="inactive">Landing page</a> |
<router-link to="/setup/payments" v-if="backendStore.getVisitedSetupPages[ 'payments' ]">Payments</router-link>