.

server/api/mail.js

@@ -8,6 +8,7 @@ const mail = {
   send(addresses, template, locals) {
     const email = new Email({
       views: { root: path.join(__dirname, '..', 'emails') },
+      htmlToText: false,
       juice: true,
       juiceResources: {
         preserveImportant: true,
@@ -25,7 +26,7 @@ const mail = {
       },
       transport: config.SECRET_CONF.smtp
     })
-    return email.send({
+    const msg = {
       template,
       message: {
         to: addresses,
@@ -37,7 +38,11 @@ const mail = {
         config: config.SHARED_CONF,
         datetime: datetime => moment(datetime).format('ddd, D MMMM HH:mm')
       }
-    })
+    }
+    return email.send(msg)
+      .catch(e => {
+        console.error(e)
+      })
   }
 }
 

server/api/models/user.js

@@ -5,7 +5,7 @@ module.exports = (sequelize, DataTypes) => {
   const user = sequelize.define('user', {
     email: {
       type: DataTypes.STRING,
-      unique: { msg: 'err.register_error' },
+      unique: true,
       index: true,
       allowNull: false
     },
@@ -16,7 +16,7 @@ module.exports = (sequelize, DataTypes) => {
     is_active: DataTypes.BOOLEAN
   }, {
     defaultScope: {
-      exclude: ['password', 'recover_code']
+      attributes: { exclude: ['password', 'recover_code'] }
     }
   })
 

server/config.example.js

@@ -1,59 +0,0 @@
-/**
- * GANCIO CONFIGURATION
- */
-const env = process.env.NODE_ENV || 'development'
-
-/**
- * Database configuration
- * `development` configuration is enabled running `yarn dev`
- * while `production` with `yarn start`
- * ref: http://docs.sequelizejs.com/class/lib/sequelize.js~Sequelize.html#instance-constructor-constructor
- */
-const DB_CONF = {
-  development: {
-    storage: __dirname + '/db.sqlite',
-    dialect: 'sqlite',
-  },
-  production: {
-    username: '',
-    password: '',
-    database: 'gancio',
-    host: 'localhost',
-    dialect: 'postgres',
-    logging: false
-  },
-}
-
-const SECRET_CONF = {
-  // where events/users confirmation email are sent
-  admin: 'gancio@example.com',
-
-  db: DB_CONF[env],
-
-  // jwt salt secret (generate it randomly)
-  secret: '',
-
-  // smtp account to send email
-  smtp: {
-    host: process.env.SMTP_HOST || 'mail.example.com',
-    secure: true,
-    auth: {
-      user: process.env.SMTP_USER || 'gancio@example.com',
-      pass: process.env.SMTP_PASS || ''
-    }
-  },
-}
-
-/**
- * Main Gancio configuration
- */
-const SHARED_CONF = {
-  locale: 'it',
-  title: 'GANCIO',
-  description: 'A calendar for radical communities',
-
-  baseurl: env === 'development' ? 'http://localhost:3000': 'https://gancio.example.com',
-  env
-}
-
-module.exports = { SHARED_CONF, SECRET_CONF }

server/emails/recover/html.pug

@@ -1,3 +1,3 @@
-p= t('recover_email')
+p= t('mail.recover')
 
 <a href="#{config.baseurl}/recover/#{user.recover_code}">#{t('press here')}</a>

server/emails/register/subject.pug

@@ -1 +1 @@
-= `[Gancio] Richiesta registrazione`
+| [Gancio] #{t('register.request')}

server/emails/register/text.pug

@@ -0,0 +1 @@
+| dioicane ciao

server/migrations/20190605141112-create-user.js

@@ -10,7 +10,7 @@ module.exports = {
       },
       email: {
         type: Sequelize.STRING,
-        unique: { msg: 'err.register_error' },
+        unique: true,
         index: true,
         allowNull: false
       },