From 4d2f75140c6807166a2020a3887568e38fe83d93 Mon Sep 17 00:00:00 2001 From: lesion Date: Fri, 5 Jul 2019 23:58:47 +0200 Subject: [PATCH] minor --- pages/event/_id.vue | 7 +++++-- server/api/controller/user.js | 2 +- server/emails/event/html.pug | 2 +- server/emails/event/subject.pug | 2 +- server/firstrun.js | 1 + 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pages/event/_id.vue b/pages/event/_id.vue index 4fbe642e..7a356e29 100644 --- a/pages/event/_id.vue +++ b/pages/event/_id.vue @@ -45,8 +45,8 @@ a(:href='`https://${settings.mastodon_instance}/web/statuses/${event.activitypub_id}`') {{$t('common.add')}} .card-header(v-for='comment in event.comments' :key='comment.id') - img.avatar(:src='comment.data.account.avatar') - strong {{comment.data.account.display_name}} {{comment.data.account.username}} + img.avatar(:src='comment.data.account.avatar') + strong {{comment.data.account.display_name}} @{{comment.data.account.username}} //- a.float-right(:href='comment.data.url') a.float-right(:href='`https://${settings.mastodon_instance}/web/statuses/${comment.data.id}`') small {{comment.data.created_at|datetime}} @@ -209,6 +209,9 @@ export default { img { max-width: 100%; } + .invisible { + visibility: visible !important; + } } .avatar { diff --git a/server/api/controller/user.js b/server/api/controller/user.js index e3ce72b5..029f05a0 100644 --- a/server/api/controller/user.js +++ b/server/api/controller/user.js @@ -70,7 +70,7 @@ const userController = { } }, - // ADD EVENT // there's probably a better way to do this with sequelize! TOFIX + // ADD EVENT async addEvent(req, res) { const body = req.body diff --git a/server/emails/event/html.pug b/server/emails/event/html.pug index 855c1f58..eb3fe378 100644 --- a/server/emails/event/html.pug +++ b/server/emails/event/html.pug @@ -1,6 +1,6 @@ h3 #{event.title} p Dove: #{event.place.name} - #{event.place.address} -p Quando: #{datetime(event.start_datetime)} +p Quando: #{datetime(event.start_datetime*1000)} br if event.image_path diff --git a/server/emails/event/subject.pug b/server/emails/event/subject.pug index fd159324..280909ec 100644 --- a/server/emails/event/subject.pug +++ b/server/emails/event/subject.pug @@ -1 +1 @@ -= `[${config.title}] ${event.title} @${event.place.name} ${datetime(event.start_datetime)}` += `[${config.title}] ${event.title} @${event.place.name} ${datetime(event.start_datetime*1000)}` diff --git a/server/firstrun.js b/server/firstrun.js index 45d5d029..ed644c54 100644 --- a/server/firstrun.js +++ b/server/firstrun.js @@ -56,6 +56,7 @@ If you want to `) // send confirmed event to mastodon await db.notification.create({ type: 'mastodon', filters: { is_visible: true } }) + await db.notification.create({ type: 'email', filters: { is_visible: true } }) // send every event to admin await db.notification.create({ type: 'admin_email' })