From d6501b1a5b057618a5d228f70ab9ff44eae87526 Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Sat, 8 Jun 2019 13:18:47 +0200
Subject: [PATCH] .

---
 .gitignore                                    |  2 +-
 README.md                                     | 31 ++++++++++++++-----
 server/config.example.js => config.example.js |  5 ++-
 locales/email/en.json                         |  3 +-
 locales/email/es.json                         |  3 +-
 locales/email/it.json                         |  3 +-
 locales/email/zh.json                         |  3 +-
 locales/it.js                                 |  9 ++++--
 package.json                                  |  4 ++-
 pages/event/_id.vue                           |  6 +---
 pages/recover/_code.vue                       |  8 +++--
 server/api/mail.js                            |  9 ++++--
 server/api/models/user.js                     |  4 +--
 server/emails/recover/html.pug                |  2 +-
 server/emails/register/subject.pug            |  2 +-
 server/emails/register/text.pug               |  1 +
 .../migrations/20190605141112-create-user.js  |  2 +-
 17 files changed, 63 insertions(+), 34 deletions(-)
 rename server/config.example.js => config.example.js (89%)
 create mode 100644 server/emails/register/text.pug

diff --git a/.gitignore b/.gitignore
index 7b99f646..b9a6eb25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 # Created by .ignore support plugin (hsz.mobi)
 ### Gancio production configuration
-server/config.js
+config.js
 
 ### Node template
 # Logs
diff --git a/README.md b/README.md
index 85d0598c..8c8b463f 100644
--- a/README.md
+++ b/README.md
@@ -6,13 +6,32 @@
 
 
 ## Install
+You will need `npm` or `yarn` installed in your system.
+
+
 ``` bash
+# clone this repo
+git clone https://git.lattuga.net/cisti/gancio.git
+cd gancio
+
 # install dependencies
-$ yarn install
+yarn install
+
+# edit configuration
+cp config.example.js config.js
+
+# - migrate/create test sqlite db
+yarn migrate:dev
+
+# testing with sqlite db
+yarn dev
+
+# - migrate/create production db
+yarn migrate
 
 # build for production and launch server
-$ yarn build
-$ yarn start
+yarn build
+yarn start
 
 ```
 
@@ -27,8 +46,4 @@ For detailed explanation on how things work, checkout [Nuxt.js docs](https://nux
 ``` bash
 $ yarn dev
 
-```
-
-#### Add a new icon
-
-plugin/vue-awesome.js
+```
\ No newline at end of file
diff --git a/server/config.example.js b/config.example.js
similarity index 89%
rename from server/config.example.js
rename to config.example.js
index 733eedff..38ba8953 100644
--- a/server/config.example.js
+++ b/config.example.js
@@ -51,9 +51,8 @@ const SHARED_CONF = {
   locale: 'it',
   title: 'GANCIO',
   description: 'A calendar for radical communities',
-
-  baseurl: env === 'development' ? 'http://localhost:3000': 'https://gancio.example.com',
+  baseurl: '' || 'http://localhost:3000',
   env
 }
 
-module.exports = { SHARED_CONF, SECRET_CONF }
\ No newline at end of file
+module.exports = { SHARED_CONF, SECRET_CONF, ...SECRET_CONF.db }
diff --git a/locales/email/en.json b/locales/email/en.json
index fced2be4..c22030f9 100644
--- a/locales/email/en.json
+++ b/locales/email/en.json
@@ -1,5 +1,6 @@
 {
   "registration_email": "registration_email",
   "recover_email": "recover_email",
-  "press here": "press here"
+  "press here": "press here",
+  "register.request": "register.request"
 }
\ No newline at end of file
diff --git a/locales/email/es.json b/locales/email/es.json
index fced2be4..c22030f9 100644
--- a/locales/email/es.json
+++ b/locales/email/es.json
@@ -1,5 +1,6 @@
 {
   "registration_email": "registration_email",
   "recover_email": "recover_email",
-  "press here": "press here"
+  "press here": "press here",
+  "register.request": "register.request"
 }
\ No newline at end of file
diff --git a/locales/email/it.json b/locales/email/it.json
index fced2be4..c22030f9 100644
--- a/locales/email/it.json
+++ b/locales/email/it.json
@@ -1,5 +1,6 @@
 {
   "registration_email": "registration_email",
   "recover_email": "recover_email",
-  "press here": "press here"
+  "press here": "press here",
+  "register.request": "register.request"
 }
\ No newline at end of file
diff --git a/locales/email/zh.json b/locales/email/zh.json
index fced2be4..c22030f9 100644
--- a/locales/email/zh.json
+++ b/locales/email/zh.json
@@ -1,5 +1,6 @@
 {
   "registration_email": "registration_email",
   "recover_email": "recover_email",
-  "press here": "press here"
+  "press here": "press here",
+  "register.request": "register.request"
 }
\ No newline at end of file
diff --git a/locales/it.js b/locales/it.js
index da1d9e08..b4b881e6 100644
--- a/locales/it.js
+++ b/locales/it.js
@@ -39,7 +39,9 @@ const it = {
     related: 'Memoria storica',
     add: 'Aggiungi',
     logout_ok: 'Uscita correttamente',
-    copy: 'Copia'
+    copy: 'Copia',
+    recover_password: 'Recupera password',
+    new_password: 'Nuova password'
   },
 
   login: {
@@ -77,7 +79,10 @@ const it = {
       carne e sangue, scrivici quindi due righe per farci capire che eventi vorresti pubblicare.`,
     error: 'Errore: ',
     admin_complete: 'Sei il primo utente e quindi sei amministratore!',
-    complete: 'Confermeremo la registrazione quanto prima.'
+    complete: 'Confermeremo la registrazione quanto prima.',
+    request: 'Richiesta di registrazione',
+    registration_email: `Ciao,
+    ci è arrivata una richiesta di registrazione su gancio, la confermeremo quanto prima.`
   },
 
   event: {
diff --git a/package.json b/package.json
index b0f3f008..42c985ff 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,9 @@
     "start": "cross-env NODE_ENV=production node server/index.js",
     "generate": "nuxt generate",
     "lint": "eslint --ext .js,.vue --ignore-path .gitignore .",
-    "precommit": "npm run lint"
+    "precommit": "npm run lint",
+    "migrate:dev": "sequelize db:migrate",
+    "migrate": "NODE_ENV=production sequelize db:migrate"
   },
   "bin": {
     "gancio": "server/index.js"
diff --git a/pages/event/_id.vue b/pages/event/_id.vue
index 5bba3acc..5e168453 100644
--- a/pages/event/_id.vue
+++ b/pages/event/_id.vue
@@ -1,9 +1,5 @@
 <template lang="pug">
-  el-card#eventDetail(
-    visible hide-header 
-    no-header :show-close='false' 
-    top='0vh !important'
-    :appendToBody='true')
+  el-card#eventDetail
 
     //- close button
     nuxt-link.float-right(to='/')
diff --git a/pages/recover/_code.vue b/pages/recover/_code.vue
index 9a595f15..01c337c9 100644
--- a/pages/recover/_code.vue
+++ b/pages/recover/_code.vue
@@ -1,7 +1,9 @@
 <template lang="pug">
-  el-dialog(visible)
-    template(slot='title')
-      h5 <img src='/favicon.ico'/> {{$t('common.recover_password')}}
+  el-card
+    nuxt-link.float-right(to='/')
+      el-button(circle  icon='el-icon-close' type='danger' size='small' plain)
+
+    h5 <img src='/favicon.ico'/> {{$t('common.recover_password')}}
     div(v-if='valid')
       el-form
         el-form-item {{$t('common.new_password')}}
diff --git a/server/api/mail.js b/server/api/mail.js
index 5875d47d..bba20259 100644
--- a/server/api/mail.js
+++ b/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)
+      })
   }
 }
 
diff --git a/server/api/models/user.js b/server/api/models/user.js
index 09cd7272..dff5f86b 100644
--- a/server/api/models/user.js
+++ b/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'] }
     }
   })
 
diff --git a/server/emails/recover/html.pug b/server/emails/recover/html.pug
index fd8cb11a..0ef71822 100644
--- a/server/emails/recover/html.pug
+++ b/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>
\ No newline at end of file
diff --git a/server/emails/register/subject.pug b/server/emails/register/subject.pug
index 7d19cd3e..88d6807a 100644
--- a/server/emails/register/subject.pug
+++ b/server/emails/register/subject.pug
@@ -1 +1 @@
-= `[Gancio] Richiesta registrazione`
+| [Gancio] #{t('register.request')}
diff --git a/server/emails/register/text.pug b/server/emails/register/text.pug
new file mode 100644
index 00000000..1a72986e
--- /dev/null
+++ b/server/emails/register/text.pug
@@ -0,0 +1 @@
+| dioicane ciao
\ No newline at end of file
diff --git a/server/migrations/20190605141112-create-user.js b/server/migrations/20190605141112-create-user.js
index 35e3cbdf..9f10631b 100644
--- a/server/migrations/20190605141112-create-user.js
+++ b/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
       },