diff --git a/layouts/error.vue b/layouts/error.vue
index 6c08605e..1445050e 100644
--- a/layouts/error.vue
+++ b/layouts/error.vue
@@ -1,6 +1,6 @@
- .container
- #error
+ el-main
+ el-card#error
h1(v-if="error.statusCode === 404") {{error.message}}
h1(v-else) An error occurred: {{error.message}}
diff --git a/pages/embed/_event_id.vue b/pages/embed/_event_id.vue
new file mode 100644
index 00000000..1f598b09
--- /dev/null
+++ b/pages/embed/_event_id.vue
@@ -0,0 +1,119 @@
+
+ nuxt-link.embed_event(:to='`/event/${link}`' target='_blank' :class='{ withImg: event.image_path }')
+
+ //- image
+ img.float-left(v-if='event.image_path' :src='`/media/thumb/${event.image_path}`')
+ .event-info
+
+ //- title
+ .date {{event|when('home')}}
+ h4 {{event.title}}
+
+ //- date / place
+ .date {{event.place.name}}
{{event.place.address}}
+
+ //- ul.tags(v-if='event.tags')
+ //- li(v-for='tag in event.tags' :key='tag') {{tag}}
+ //- li(v-if='settings.enable_federation && event.comments && event.comments.length') {{$tc('common.comments', event.comments.length)}}
+
+
+
\ No newline at end of file
diff --git a/server/api/controller/event.js b/server/api/controller/event.js
index 3f58f8ac..2a7f1dea 100644
--- a/server/api/controller/event.js
+++ b/server/api/controller/event.js
@@ -94,8 +94,7 @@ const eventController = {
const format = req.params.format || 'json'
const is_admin = req.user && req.user.is_admin
const id = req.params.event_id
- const event = await Event.findByPk(id, {
- plain: true,
+ let event = await Event.findByPk(id, {
attributes: {
exclude: ['createdAt', 'updatedAt']
},
@@ -109,6 +108,8 @@ const eventController = {
})
if (event && (event.is_visible || is_admin)) {
+ event = event.toJSON()
+ event.tags = event.tags.map(t => t.tag)
if (format === 'json') {
res.json(event)
} else if (format === 'ics') {