NoLog.cz/gancio
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

refix #18

Browse source
This commit is contained in:
lesion 2019-07-04 01:09:35 +02:00
parent 5139d0b323
commit 15a763324f
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pages/event/_id.vue
View file

@ -95,9 +95,13 @@ export default {
console.error(e) console.error(e)
} }
}, },
async asyncData ( { $axios, params }) { async asyncData ( { $axios, params, error }) {
try {
const event = await $axios.$get(`/event/${params.id}`) const event = await $axios.$get(`/event/${params.id}`)
return { event, id: params.id } return { event, id: params.id }
} catch(e) {
error({ statusCode: 404, message: 'Event not found'})
}
}, },
computed: { computed: {
...mapGetters(['filteredEvents']), ...mapGetters(['filteredEvents']),

2
server/api/controller/event.js
View file

@ -84,7 +84,7 @@ const eventController = {
// TODO retrieve next/prev event also // TODO retrieve next/prev event also
// select id, start_datetime, title from events where start_datetime > (select start_datetime from events where id=89) order by start_datetime limit 20; // select id, start_datetime, title from events where start_datetime > (select start_datetime from events where id=89) order by start_datetime limit 20;
async get(req, res) { async get(req, res) {
const is_admin = req.user.is_admin const is_admin = req.user && req.user.is_admin
const id = req.params.event_id const id = req.params.event_id
let event = await Event.findByPk(id, { let event = await Event.findByPk(id, {
plain: true, plain: true,

2
server/api/index.js
View file

@ -87,7 +87,7 @@ api.get('/settings', settingsController.getAllRequest)
api.post('/settings', jwt, fillUser, isAdmin, settingsController.setRequest) api.post('/settings', jwt, fillUser, isAdmin, settingsController.setRequest)
// get event // get event
api.get('/event/:event_id', eventController.get) api.get('/event/:event_id', jwt, fillUser, eventController.get)
// confirm event // confirm event
api.get('/event/confirm/:event_id', jwt, isAuth, isAdmin, eventController.confirm) api.get('/event/confirm/:event_id', jwt, isAuth, isAdmin, eventController.confirm)