From d1a56e5135c4e183a8ae5a7748e96a4d6121dd9f Mon Sep 17 00:00:00 2001 From: lesion Date: Sun, 9 Jun 2019 01:53:24 +0200 Subject: [PATCH] . --- components/Event.vue | 11 +++++------ locales/email/en.json | 4 +++- locales/email/es.json | 4 +++- locales/email/it.json | 5 +++-- locales/email/zh.json | 4 +++- server/api/controller/bot.js | 4 ++-- server/emails/register/html.pug | 2 +- server/emails/register/subject.pug | 2 +- server/emails/register/text.pug | 7 ++++++- server/notifier.js | 2 +- 10 files changed, 28 insertions(+), 17 deletions(-) diff --git a/components/Event.vue b/components/Event.vue index a026ae11..74a13bc1 100644 --- a/components/Event.vue +++ b/components/Event.vue @@ -11,8 +11,8 @@ //- date / place .date - div {{event|event_when}} - div @{{event.place.name}} + div {{event|event_when}} + div {{event.place.name}} //- p(v-if='showDescription') {{event.description}} @@ -108,14 +108,13 @@ export default { .date { font-weight: 400; - font-size: 12px; - font-size: 0.95rem; - color: #ff917a; + font-size: 1rem; + color: white; } } .tags { - font-size: 12px; + font-size: 15px; padding: 1px; margin-bottom: 0; display:flex; diff --git a/locales/email/en.json b/locales/email/en.json index 7dca66f0..d3a2116c 100644 --- a/locales/email/en.json +++ b/locales/email/en.json @@ -3,5 +3,7 @@ "recover_email": "recover_email", "press here": "press here", "register.request": "register.request", - "email.registration": "email.registration" + "email.registration": "email.registration", + "email.register.subject": "email.register.subject", + "email.register": "email.register" } \ No newline at end of file diff --git a/locales/email/es.json b/locales/email/es.json index 7dca66f0..d3a2116c 100644 --- a/locales/email/es.json +++ b/locales/email/es.json @@ -3,5 +3,7 @@ "recover_email": "recover_email", "press here": "press here", "register.request": "register.request", - "email.registration": "email.registration" + "email.registration": "email.registration", + "email.register.subject": "email.register.subject", + "email.register": "email.register" } \ No newline at end of file diff --git a/locales/email/it.json b/locales/email/it.json index ae40e113..d8dac1a5 100644 --- a/locales/email/it.json +++ b/locales/email/it.json @@ -1,6 +1,7 @@ { "recover_email": "recover_email", "press here": "press here", - "register.request": "register.request", - "email.registration": "porcodio" + "email.register.subject": "Richiesta registrazione ricevuta", + "email.register": "Abbiamo ricevuto la richiesta di registrazione. La confermeremo quanto prima.\n Ciao", + "email.registration": "email.registration" } \ No newline at end of file diff --git a/locales/email/zh.json b/locales/email/zh.json index 7dca66f0..d3a2116c 100644 --- a/locales/email/zh.json +++ b/locales/email/zh.json @@ -3,5 +3,7 @@ "recover_email": "recover_email", "press here": "press here", "register.request": "register.request", - "email.registration": "email.registration" + "email.registration": "email.registration", + "email.register.subject": "email.register.subject", + "email.register": "email.register" } \ No newline at end of file diff --git a/server/api/controller/bot.js b/server/api/controller/bot.js index a4acf850..b1300e57 100644 --- a/server/api/controller/bot.js +++ b/server/api/controller/bot.js @@ -1,7 +1,7 @@ const fs = require('fs') const path = require('path') const moment = require('moment') -const { event: Event, comment: Comment, tag: Tag } = require('../model') +const { event: Event, comment: Comment } = require('../models') const config = require('../../config').SHARED_CONF const Mastodon = require('mastodon-api') const settingsController = require('./settings') @@ -90,5 +90,5 @@ ${event.description.length > 200 ? event.description.substr(0, 200) + '...' : ev } } -// setTimeout(botController.initialize, 2000) +return setTimeout(botController.initialize, 2000) module.exports = botController diff --git a/server/emails/register/html.pug b/server/emails/register/html.pug index 6137f5b3..3366c365 100644 --- a/server/emails/register/html.pug +++ b/server/emails/register/html.pug @@ -1,4 +1,4 @@ -p= t('email.registration') +p= t('email.register') hr small #{config.title} / #{config.description} diff --git a/server/emails/register/subject.pug b/server/emails/register/subject.pug index 88d6807a..f955ffa1 100644 --- a/server/emails/register/subject.pug +++ b/server/emails/register/subject.pug @@ -1 +1 @@ -| [Gancio] #{t('register.request')} +| [Gancio] #{t('email.register.subject')} diff --git a/server/emails/register/text.pug b/server/emails/register/text.pug index 1a72986e..7785b0cf 100644 --- a/server/emails/register/text.pug +++ b/server/emails/register/text.pug @@ -1 +1,6 @@ -| dioicane ciao \ No newline at end of file +p= t('email.register') + +hr +small #{config.title} / #{config.description} +br +small #{config.baseurl} \ No newline at end of file diff --git a/server/notifier.js b/server/notifier.js index 50c4061b..0a40082f 100644 --- a/server/notifier.js +++ b/server/notifier.js @@ -1,7 +1,7 @@ // const mail = require('./mail') const bot = require('./api/controller/bot') const settingsController = require('./api/controller/settings') -const config = require('./config.js') +// const config = require('./config.js') const { Event, Notification, EventNotification, User, Place, Tag } = require('./api/models')