diff --git a/web/src/components/Navbar.vue b/web/src/components/Navbar.vue index d2d36e0..c24be73 100644 --- a/web/src/components/Navbar.vue +++ b/web/src/components/Navbar.vue @@ -77,6 +77,11 @@ {{ link.title }} + @@ -104,7 +109,7 @@ export default { }, methods: { ...mapActions(['changeEvent', 'changeView', 'searchEventItems']), - ...mapMutations(['setLayout']), + ...mapMutations(['setLayout', 'logout']), navigateTo(link) { if (this.$router.currentRoute.path !== link) this.$router.push(link); diff --git a/web/src/router.js b/web/src/router.js index f26fee5..5bdbd53 100644 --- a/web/src/router.js +++ b/web/src/router.js @@ -22,18 +22,18 @@ const routes = [ {path: '/login', name: 'login', component: Login, meta: {requiresAuth: false}}, {path: '/register', name: 'register', component: Register, meta: {requiresAuth: false}}, {path: '/howto', name: 'howto', component: HowTo, meta: {requiresAuth: true}}, - {path: '/:event/boxes', name: 'boxes', component: Boxes, meta: - {requiresAuth: true, requiresPermission: 'inventory.view_container'}}, {path: '/:event/items', name: 'items', component: Items, meta: {requiresAuth: true, requiresPermission: 'inventory.view_item'}}, - {path: '/:event/box/:uid', name: 'box', component: Boxes, meta: - {requiresAuth: true, requiresPermission: 'inventory.view_container'}}, {path: '/:event/item/:uid', name: 'item', component: Items, meta: {requiresAuth: true, requiresPermission: 'inventory.view_item'}}, + {path: '/:event/boxes', name: 'boxes', component: Boxes, meta: + {requiresAuth: true, requiresPermission: 'inventory.view_container'}}, + {path: '/:event/box/:uid', name: 'box', component: Boxes, meta: + {requiresAuth: true, requiresPermission: 'inventory.view_container'}}, {path: '/:event/tickets', name: 'tickets', component: Tickets, meta: - {requiresAuth: true, requiresPermission: 'inventory.view_issuethread'}}, + {requiresAuth: true, requiresPermission: 'tickets.view_issuethread'}}, {path: '/:event/ticket/:id', name: 'ticket', component: Ticket, meta: - {requiresAuth: true, requiresPermission: 'inventory.view_issuethread'}}, + {requiresAuth: true, requiresPermission: 'tickets.view_issuethread'}}, {path: '/admin', name: 'admin', component: Admin, meta: {requiresAuth: true, requiresPermission: 'inventory.delete_event'}}, {path: '/admin/files', name: 'files', component: Files, meta: diff --git a/web/src/views/Empty.vue b/web/src/views/Empty.vue index c792651..4c7c3eb 100644 --- a/web/src/views/Empty.vue +++ b/web/src/views/Empty.vue @@ -7,7 +7,7 @@

User: {{user}}

-

Your Acoount is not yet activated. Please contact an admin.

+

Your Account is not yet activated. Please contact an admin.