From 3ca818f0161c4d0a04c425650f9e3bcac36a7790 Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Thu, 6 Jun 2019 23:54:32 +0200
Subject: [PATCH] .

---
 .gitignore                                    |   3 +
 .sequelizerc                                  |   7 ++
 .vscode/vscode-kanban.json                    |  51 +++++++-
 assets/style.less                             |  20 +++-
 components/Calendar.vue                       |   5 +-
 components/Event.vue                          |  23 ++--
 components/Home.vue                           |   5 +-
 components/List.vue                           |   5 +-
 components/Nav.vue                            |   5 +-
 db.sqlite                                     | Bin 69632 -> 0 bytes
 locales/it.js                                 |  17 ++-
 .../20190521100417-act_ids_comment_data.js    |  30 -----
 migrations/20190522104158-bigint.js           |  27 -----
 migrations/20190527205032-tag_id_weight.js    |  29 -----
 models/index.js                               |  37 ------
 nuxt.config.js                                |  21 ++--
 package.json                                  |  47 ++++----
 pages/about.vue                               |   9 +-
 pages/add/_edit.vue                           |  22 ++--
 pages/admin.vue                               |   3 +-
 pages/embed/list.vue                          |   4 +-
 pages/event/_id.vue                           |   1 -
 pages/export.vue                              |  17 ++-
 pages/index.vue                               |  21 ++++
 pages/login.vue                               |  27 +++--
 pages/register.vue                            |  22 +++-
 plugins/element-ui.js                         |   4 +-
 plugins/filters.js                            |  18 ++-
 plugins/initialize.js                         |  10 +-
 plugins/vue-awesome.js                        |   1 +
 server/api/auth.js                            |  22 +++-
 server/api/config/config.json                 |  14 ---
 server/api/controller/bot.js                  |  22 ++--
 server/api/controller/event.js                |   2 +-
 server/api/controller/export.js               |   5 +-
 server/api/controller/settings.js             |  32 ++---
 server/api/controller/user.js                 |  27 +++--
 server/api/db.js                              |   6 -
 server/api/index.js                           |  44 ++++---
 server/api/mail.js                            |  16 +--
 server/api/model.js                           |  14 ---
 server/api/models/comment.js                  |  13 ++
 server/api/models/event.js                    | 112 +++++-------------
 server/api/models/eventnotification.js        |  16 +++
 server/api/models/index.js                    |  28 +++--
 server/api/models/notification.js             |  17 +++
 server/api/models/place.js                    |  15 +++
 server/api/models/setting.js                  |  14 +++
 server/api/models/settings.js                 |   9 --
 server/api/models/tag.js                      |  19 +++
 server/api/models/user.js                     |  61 +++++-----
 server/api/views/feed/rss.pug                 |  23 ++++
 config.js => server/config.example.js         |  59 ++++-----
 server/firstrun.js                            |  41 +++++++
 server/index.js                               |  23 +---
 .../20190605135434-create-comment.js          |  38 ++++++
 .../migrations/20190605141112-create-user.js  |  45 +++++++
 .../migrations/20190605141850-create-event.js |  66 +++++++++++
 .../migrations/20190605142103-create-place.js |  33 ++++++
 .../20190605142152-create-notification.js     |  37 ++++++
 .../migrations/20190605142317-create-tag.js   |  29 +++++
 ...0190605142409-create-event-notification.js |  38 ++++++
 .../20190605142619-create-setting.js          |  27 +++++
 .../20190605160024-create-event-tag.js        |  32 +++++
 server/notifier.js                            |   4 +-
 store/index.js                                |  27 +++--
 66 files changed, 989 insertions(+), 532 deletions(-)
 create mode 100644 .sequelizerc
 delete mode 100644 db.sqlite
 delete mode 100644 migrations/20190521100417-act_ids_comment_data.js
 delete mode 100644 migrations/20190522104158-bigint.js
 delete mode 100644 migrations/20190527205032-tag_id_weight.js
 delete mode 100644 models/index.js
 delete mode 100644 server/api/config/config.json
 delete mode 100644 server/api/db.js
 delete mode 100644 server/api/model.js
 create mode 100644 server/api/models/comment.js
 create mode 100644 server/api/models/eventnotification.js
 create mode 100644 server/api/models/notification.js
 create mode 100644 server/api/models/place.js
 create mode 100644 server/api/models/setting.js
 delete mode 100644 server/api/models/settings.js
 create mode 100644 server/api/models/tag.js
 create mode 100644 server/api/views/feed/rss.pug
 rename config.js => server/config.example.js (51%)
 create mode 100644 server/firstrun.js
 create mode 100644 server/migrations/20190605135434-create-comment.js
 create mode 100644 server/migrations/20190605141112-create-user.js
 create mode 100644 server/migrations/20190605141850-create-event.js
 create mode 100644 server/migrations/20190605142103-create-place.js
 create mode 100644 server/migrations/20190605142152-create-notification.js
 create mode 100644 server/migrations/20190605142317-create-tag.js
 create mode 100644 server/migrations/20190605142409-create-event-notification.js
 create mode 100644 server/migrations/20190605142619-create-setting.js
 create mode 100644 server/migrations/20190605160024-create-event-tag.js

diff --git a/.gitignore b/.gitignore
index 8412a7ad..7b99f646 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,7 @@
 # Created by .ignore support plugin (hsz.mobi)
+### Gancio production configuration
+server/config.js
+
 ### Node template
 # Logs
 logs
diff --git a/.sequelizerc b/.sequelizerc
new file mode 100644
index 00000000..cf1a6883
--- /dev/null
+++ b/.sequelizerc
@@ -0,0 +1,7 @@
+const path = require('path')
+
+module.exports = {
+  'config':          path.resolve('server' ,'config.js'),
+  'migrations-path': path.resolve('server', 'migrations'),
+  'models-path':     path.resolve('server', 'api', 'models')
+}
diff --git a/.vscode/vscode-kanban.json b/.vscode/vscode-kanban.json
index afb914a9..a487fe65 100644
--- a/.vscode/vscode-kanban.json
+++ b/.vscode/vscode-kanban.json
@@ -150,6 +150,15 @@
       "title": "risolvere le modali quando il js e' disabilitato",
       "type": "bug"
     },
+    {
+      "assignedTo": {
+        "name": "lesion"
+      },
+      "creation_time": "2019-06-01T21:00:22.155Z",
+      "id": "28",
+      "references": [],
+      "title": "activitypub stream"
+    },
     {
       "assignedTo": {
         "name": "lesion"
@@ -168,6 +177,15 @@
       "references": [],
       "title": "check password reset"
     },
+    {
+      "assignedTo": {
+        "name": "lesion"
+      },
+      "creation_time": "2019-06-01T21:23:46.941Z",
+      "id": "30",
+      "references": [],
+      "title": "choose listening port"
+    },
     {
       "assignedTo": {
         "name": "lesion"
@@ -195,6 +213,15 @@
       "references": [],
       "title": "creazione script di backup"
     },
+    {
+      "assignedTo": {
+        "name": "lesion"
+      },
+      "creation_time": "2019-06-01T21:00:07.431Z",
+      "id": "27",
+      "references": [],
+      "title": "eventi ricorrenti"
+    },
     {
       "assignedTo": {
         "name": "lesion"
@@ -250,6 +277,15 @@
       "references": [],
       "title": "rifare il calendario o solo il popup"
     },
+    {
+      "assignedTo": {
+        "name": "lesion"
+      },
+      "creation_time": "2019-06-01T21:15:42.190Z",
+      "id": "29",
+      "references": [],
+      "title": "settings di istanza (default filter, eg, eventi ricorrenti)"
+    },
     {
       "assignedTo": {
         "name": "lesion"
@@ -261,6 +297,15 @@
       "references": [],
       "title": "traduzione in inglese"
     },
+    {
+      "assignedTo": {
+        "name": "lesion"
+      },
+      "creation_time": "2019-05-29T13:10:04.463Z",
+      "id": "26",
+      "references": [],
+      "title": "v-calendar colori e eventi multidays..."
+    },
     {
       "assignedTo": {
         "name": "lesion"
@@ -277,10 +322,10 @@
       "assignedTo": {
         "name": "lesion"
       },
-      "creation_time": "2019-05-29T13:10:04.463Z",
-      "id": "26",
+      "creation_time": "2019-06-05T20:39:59.287Z",
+      "id": "31",
       "references": [],
-      "title": "v-calendar colori e eventi multidays..."
+      "title": "scroll h su mobile"
     }
   ]
 }
\ No newline at end of file
diff --git a/assets/style.less b/assets/style.less
index f185afee..09f8e442 100644
--- a/assets/style.less
+++ b/assets/style.less
@@ -1,6 +1,10 @@
+@background: #222C32;
+@success: #c7ffbc;
+// @info 
+
 html, body {
   margin: 0px;
-  background-color: #222C32 !important;
+  background-color: @background !important;
   width: 100%;
   overflow-x: hidden;
   box-sizing: border-box;
@@ -11,6 +15,20 @@ html, body {
   box-sizing: border-box;
 }
 
+.el-form-item {
+  margin-bottom: 5px;
+}
+.el-divider__text {
+  background-color: @background;
+  color: white;
+  border-radius: 5px;
+}
+
+.el-card {
+  max-width: 600px;
+  margin: 30px auto;
+}
+
 .el-dialog {
   margin-top: 0px !important;
   border-radius: 0px;
diff --git a/components/Calendar.vue b/components/Calendar.vue
index 5ecd0b44..e42e27f4 100644
--- a/components/Calendar.vue
+++ b/components/Calendar.vue
@@ -52,17 +52,18 @@ export default {
           start: event.start_datetime, end: event.end_datetime
         }
         e.highlight = { 
-          color: 'red' // : sample(['purple', 'red', 'green', 'blue']),
+          color: sample(['purple', 'red', 'green', 'blue']),
         }
       } else {
         e.dates = event.start_datetime
-        e.dot = { color: 'rgba(102,10,20)' }
+        e.dot = { color: sample(['purple', 'red', 'green', 'blue']) }
       }
       return e
     }
   },
   computed: {
     ...mapGetters(['filteredEvents']),
+    ...mapState(['events']),
     attributes () {
       return [
         { key: 'today', dates: new Date(),
diff --git a/components/Event.vue b/components/Event.vue
index dd2fa9fc..c65600ef 100644
--- a/components/Event.vue
+++ b/components/Event.vue
@@ -12,7 +12,7 @@
           //- date / place
           .date 
             div {{event|event_when}}
-            div {{event.place.name}}
+            div @{{event.place.name}}
 
           //- p(v-if='showDescription') {{event.description}}
 
@@ -54,6 +54,7 @@ export default {
 }
 </script>
 <style lang='less'>
+@import '../assets/style.less';
 
 @media only screen and (min-width: 574px) {
   .event {
@@ -83,21 +84,18 @@ export default {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
-    background-color: #222;
+    background-color: #111214;
 
   }
 
   .content-info {
-    font-size: 12px;
-    font-size: 0.8em;
     padding: 0.8em 1em;
-    max-height: 200px;
-    color: rgb(255, 122, 204);
 
     h2 {
-      color: yellow;
+      color: @success;
       font-size: 16px;
-      font-size: 1.1rem;
+      font-size: 1.2rem;
+      font-weight: 400;
       margin: 0px;
     }
 
@@ -109,9 +107,10 @@ export default {
     }
 
     .date {
-      font-weight: 800;
-      font-size: 16px;
-      font-size: 1rem;
+      font-weight: 300;
+      font-size: 12px;
+      font-size: 0.95rem;
+      color: #ff917a;
     }    
   }
 
@@ -124,7 +123,7 @@ export default {
     justify-content: center;
 
     li {
-      background: #40484D;
+      background: #1B1F21;
       display: inline-block;
       padding: 2px 10px;
       color: rgba(255,255,255,0.7);
diff --git a/components/Home.vue b/components/Home.vue
index b7620aa1..f9c386cf 100644
--- a/components/Home.vue
+++ b/components/Home.vue
@@ -4,11 +4,10 @@
     a(href='#totop')
       el-button.top.d-block.d-sm-none(icon='el-icon-top' circle type='primary' plain)
     a.totop(name='totop')
+    no-ssr
+      Calendar
     .row.m-0
 
-      no-ssr
-        Calendar.col-sm-12.col-lg-8.col-xl-6
-
       .p-0.col-sm-6.col-lg-4.col-xl-3(v-for='event in filteredEvents')
         a(:id='event.newDay' v-if='event.newDay')
           .d-block.d-sm-none
diff --git a/components/List.vue b/components/List.vue
index f412e963..7a1706cf 100644
--- a/components/List.vue
+++ b/components/List.vue
@@ -17,17 +17,16 @@ div#list
 </template>
 <script>
 import { mapGetters } from 'vuex'
-const { SHARED_CONF } = require('@/config')
 
 export default {
   name: 'List',
   data () {
-    return { SHARED_CONF }
+    return { }
   },
   props: {
     title: {
       type: String,
-      default: SHARED_CONF.title
+      default: ''
     },
     events: {
       type: Array,
diff --git a/components/Nav.vue b/components/Nav.vue
index 013fdb2f..4c50afc4 100644
--- a/components/Nav.vue
+++ b/components/Nav.vue
@@ -1,8 +1,9 @@
 <template lang="pug">
   el-menu.d-grid.nav(mode='horizontal' router background-color="#222C32")
 
-    el-menu-item(v-if='!$auth.loggedIn' index='/login' :title="$t('common.login')")
-      v-icon(color='lightgreen' name='user')
+    nuxt-link(to='/login')
+      el-menu-item(v-if='!$auth.loggedIn' index='/login' :title="$t('common.login')")
+        v-icon(color='lightgreen' name='user')
 
     el-menu-item(index='/add' :title="$t('common.add_event')")
       v-icon(color='lightgreen' name='plus')
diff --git a/db.sqlite b/db.sqlite
deleted file mode 100644
index 2ad224f1f0719c35d78bc084c3415593d7d922cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 69632
zcmeI(U2oG?7{KwEv`JrRQzlhbHB~awMC+9f0z(r*(-wl+vXvClbXzZ`#3ZIz%S(x!
z0vEez8QS$e#lFXGxY|eIYC;-!dyZ3Aab7m6Y|>=?BaR&(JI;B2&pF2lPIn$`xxQmO
zYImBpZ(L6-B{VJZxnU#{i8oR%NC_W*$djpXL)Kc~^Knn#BtDwHy^#4cv6OtBSiH3O
zEc5%q=EB?g&AIRAr)DqBe3<$*{dVfN)WhWKsb9vOgn9%J_!k6@E?!9MtE<}avTr|Z
zIG*GCZfoBQ*Gu`5l`C6DId^-@GOA&9)mX3o;5@Gy-{ea9FLR~!Yd3C~#{E*^Uaquf
zd~NMrHmZkqqw7?SuXeVJvQ_Iiw(rz)e$}`mCoC84Sw?ZYY!r95wq$qrpgwlDdF8#7
zo?q1xZmaG*^PV(hcB<H2za4B>!Zua1;j;@bRx@cmo7G-AK~UDA)AEaL-+koPY~O9S
zyy2R~XrRLfsE|G1_PbuyC|lo^jXT!e-0oJ{SZg^?*CvZlUhSwh7V1@_P%K+tSfx`O
zqh#H+N>(v%?VKDX4Op+b^{Q!X7o`<jmgFa&+sWtdSgL0Cz5)(w<kYRc$p7&j`VT(i
z8}+4M8W;vN+yK+eFQxQvv*QvvY+uO^*JX~k7lNMq(~}^{zP%qD6t2%l6B<@4y9xT@
zf14?3WZB*y7**jYiF5=xGRTgs-?bl%P0z`@n&y?ozZ++ASO8qfhR+s`o}W+aYirsI
zsglVf(sv>o^U-8P_MP<R(~jTY&fIQ!yHJ!D-?NHkv47+?e5WIkpUf&w({>wCFFC5?
zG~0(xrPi*?{L?=}$v*%2fmEsiEE^Ma1oQag`Cj+C6~ta^H=8noy>LAjjX116OR#p$
zcMn}@aQ9(FhI<Gk?Uu>!al11doAXSj*MWd1h*93j8Jw2hX*SxidK3HbbYvcVFq_tw
zm$l=KaMa4Ay6??Ixm1;+l65p7W4Bm%uxkxmYHIDq2#yINH`nG;`mN=0Gn8sxFbure
z7eCIV^_3Ov=iMNlz{~3`)6tlEm1pSyzUw!JdvM+HY904LUB^y4a<kj;U3CSOnnH0;
zt|9ALQ_?549lxS>_-<2nhL>KI*;ak@4!3FVJCy_5e;lP({cdcJbiK-<>$x%s476Z^
zB*+_fJ*U%u$?ETYYTu|U)cDRPCp>7_HD}xzgPmtPrFm3H1^GX22Kn!uqPLum=09@w
za4`3GWMgo)YuPGi{p0zh`>Ryc>mA3F#`f=)`U$+vjdV)?Y-L=h@3p^@?X6SylPP^;
zL)#0&KKW4QIZwJytL6-BPDLOFcCM=^FUu><<I+@G*LCe>GB{_D-(Ybr^7^1tgjsqg
z#}QYF(~nm|Hflf}*q-;a-H};$z_;Vn<l531eQ}XdVAq?j8khZ}P*tmuGdMPyw&%C&
z?Uwp5D}!zFPs*3W=}|s@1y@GXG^bPgr~0^@2E3JQuu96ei5c~cVnHpI)Pe^B2q1s}
z0tg_000IagfB*sr#8qHU1;+RPxTcr55I_I{1Q0*~0R#|0009IL2n5vqe=YMSA^&(F
zfB*srAb<b@2q1s}0tg_0K%4|-wdBfd?@yHY{ePSiODqT=fB*srAb<b@2q1s}0tk#2
z;P?NdU8qF>0R#|0009ILKmY**5I`VK0=?h=ze;3Y#VIOcK>z^+5I_I{1Q0*~0R#|0
zAeI83Xp4#WmlGFNa2I7+ciT0)<<wleeeG)Y=H}Jwo7ZlRddBbnW7!`F3IPNVKmY**
z5I_I{1Q0*~frtRV|BrC6fdB#sAb<b@2q1s}0tg_0Kr98g{~yb=5)=XmAb<b@2q1s}
z0tg_000I#KzW+x!*gyaQ1Q0*~0R#|0009ILKp>U^eE*MSS_ujP1Q0*~0R#|0009IL
zKmdV=0Du1<;a~#+1Q0*~0R#|0009ILKmdVQ3UL2FmT4s@1Q0*~0R#|0009ILKmY**
zA_Cn1k8rSo00IagfB*srAb<b@2q1t!ECsm#AIr276aok!fB*srAb<b@2q1s}0uh0}
z`~OR_BO_%|iu!MX^HS!es6%F@%t%Q~NlBTOl9X~z3J(MjKmY**5I_I{1Q0*~0R#~E
Hp9}m2^WW$y

diff --git a/locales/it.js b/locales/it.js
index 99abf698..c87f8e98 100644
--- a/locales/it.js
+++ b/locales/it.js
@@ -80,11 +80,11 @@ const it = {
 
   event: {
     anon: 'Anonimo',
-    anon_description: `Puoi inserire un evento senza rigistrarti o fare il login, 
+    anon_description: `Puoi inserire un evento senza registrarti o fare il login, 
       ma in questo caso dovrai aspettare che qualcuno lo legga confermando che si
-      tratta di un evento adatto a questo spazio, delegando questa scelta.<br/><br/> 
-      Puoi fare il <a href='/login'>login</a> o <a href='/registrarti'>registrarti</a>,
-      altrimenti vai avanti e riceverai una risposta il prima possibile.`,
+      tratta di un evento adatto a questo spazio, delegando questa scelta. Inoltre non sarà possibile modificarlo.<br/><br/> 
+      Puoi invece fare il <a href='/login'>login</a> o <a href='/registrarti'>registrarti</a>,
+      altrimenti vai avanti e riceverai una risposta il prima possibile. `,
     multidate_description: 'tanti giorni',
     date_description: `Quand'è il gancio?`,
     dates_description: 'Che giorni?',
@@ -97,7 +97,7 @@ const it = {
     time_end_description: 'Se vuoi puoi specificare un orario di fine.',
     added: 'Evento aggiunto',
     added_anon: 'Evento aggiunto, verrà confermato quanto prima.',
-    where_description: `Dov'è il gancio?<br/>Se il posto non è presente, scrivilo e premi invio. `,
+    where_description: `Dov'è il gancio? Se il posto non è presente, scrivilo e <b>premi invio</b>. `,
     confirmed: 'Evento confermato'
   },
 
@@ -119,6 +119,13 @@ const it = {
 
   err: {
     register_error: 'Errore nella registrazione'
+  },
+
+  firstrun: {
+    basic: `Inserisci titolo e descrizione della tua istanza di gancio.`,
+    database: `Gancio ha bisogno di un database postgresql!`,
+    smtp: `Inserisci un account SMTP relativo a questa istanza di gancio.`,
+
   }
 }
 
diff --git a/migrations/20190521100417-act_ids_comment_data.js b/migrations/20190521100417-act_ids_comment_data.js
deleted file mode 100644
index 817bf390..00000000
--- a/migrations/20190521100417-act_ids_comment_data.js
+++ /dev/null
@@ -1,30 +0,0 @@
-'use strict';
-
-module.exports = {
-  up: (queryInterface, Sequelize) => {
-    /*
-      Add altering commands here.
-      Return a promise to correctly handle asynchronicity.
-
-      Example:
-      return queryInterface.createTable('users', { id: Sequelize.INTEGER });
-    */
-   const a = queryInterface.addColumn('events', 'activitypub_ids', Sequelize.ARRAY(Sequelize.DOUBLE), { index: true })
-   const b = queryInterface.addColumn('comments', 'data', Sequelize.JSON)
-   return Promise.all([a, b])
-   
-  },
-  
-  down: (queryInterface, Sequelize) => {
-    /*
-    Add reverting commands here.
-    Return a promise to correctly handle asynchronicity.
-    
-    Example:
-    return queryInterface.dropTable('users');
-    */
-    const b = queryInterface.removeColumn('comments', 'data')
-    const a = queryInterface.removeColumn('events', 'activitypub_ids')
-    return Promise.all([a, b])
-  }
-};
diff --git a/migrations/20190522104158-bigint.js b/migrations/20190522104158-bigint.js
deleted file mode 100644
index 8a49325b..00000000
--- a/migrations/20190522104158-bigint.js
+++ /dev/null
@@ -1,27 +0,0 @@
-'use strict';
-
-module.exports = {
-  up: (queryInterface, Sequelize) => {
-    /*
-      Add altering commands here.
-      Return a promise to correctly handle asynchronicity.
-
-      Example:
-      return queryInterface.createTable('users', { id: Sequelize.INTEGER });
-    */
-   const a = queryInterface.changeColumn('events', 'activitypub_id', { type: Sequelize.BIGINT, index: true })
-   const b = queryInterface.changeColumn('events', 'activitypub_ids', { type: Sequelize.ARRAY(Sequelize.BIGINT), index: true, defaultValue: [] })
-   const c = queryInterface.changeColumn('comments', 'activitypub_id', { type: Sequelize.BIGINT, index: true})
-   return Promise.all([a, b, c])
-  },
-
-  down: (queryInterface, Sequelize) => {
-    /*
-      Add reverting commands here.
-      Return a promise to correctly handle asynchronicity.
-
-      Example:
-      return queryInterface.dropTable('users');
-    */
-  }
-};
diff --git a/migrations/20190527205032-tag_id_weight.js b/migrations/20190527205032-tag_id_weight.js
deleted file mode 100644
index 49457fa7..00000000
--- a/migrations/20190527205032-tag_id_weight.js
+++ /dev/null
@@ -1,29 +0,0 @@
-'use strict';
-
-module.exports = {
-  up: async (queryInterface, Sequelize) => {
-    /*
-      Add altering commands here.
-      Return a promise to correctly handle asynchronicity.
-
-      Example:
-      return queryInterface.createTable('users', { id: Sequelize.INTEGER });
-    */
-    await queryInterface.addColumn('tags', 'weigth', Sequelize.INTEGER)
-    await queryInterface.sequelize.query('update "tags" SET weigth=subquery.c from (SELECT COUNT(*) as c, "tagTag" from "tagEvent" group by "tagTag") as subquery  where "subquery"."tagTag"="tags"."tag";')
-    await queryInterface.addColumn('places', 'weigth', Sequelize.INTEGER)
-    await queryInterface.sequelize.query('update "places" SET weigth=subquery.c from (SELECT COUNT(*) as c, "placeId" from "events" group by "placeId") as subquery  where "subquery"."placeId"="places"."id";')
-  },
-  
-  down: async (queryInterface, Sequelize) => {
-    /*
-    Add reverting commands here.
-    Return a promise to correctly handle asynchronicity.
-    
-    Example:
-    return queryInterface.dropTable('users');
-    */
-   await queryInterface.removeColumn('tags', 'weigth', Sequelize.INTEGER)   
-   await queryInterface.removeColumn('places', 'weigth', Sequelize.INTEGER)   
-  }
-};
diff --git a/models/index.js b/models/index.js
deleted file mode 100644
index c1a3d6d5..00000000
--- a/models/index.js
+++ /dev/null
@@ -1,37 +0,0 @@
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-const Sequelize = require('sequelize');
-const basename = path.basename(__filename);
-const env = process.env.NODE_ENV || 'development';
-const config = require(__dirname + '/../config/config.json')[env];
-const db = {};
-
-let sequelize;
-if (config.use_env_variable) {
-  sequelize = new Sequelize(process.env[config.use_env_variable], config);
-} else {
-  sequelize = new Sequelize(config.database, config.username, config.password, config);
-}
-
-fs
-  .readdirSync(__dirname)
-  .filter(file => {
-    return (file.indexOf('.') !== 0) && (file !== basename) && (file.slice(-3) === '.js');
-  })
-  .forEach(file => {
-    const model = sequelize['import'](path.join(__dirname, file));
-    db[model.name] = model;
-  });
-
-Object.keys(db).forEach(modelName => {
-  if (db[modelName].associate) {
-    db[modelName].associate(db);
-  }
-});
-
-db.sequelize = sequelize;
-db.Sequelize = Sequelize;
-
-module.exports = db;
diff --git a/nuxt.config.js b/nuxt.config.js
index 36a30f9f..8d00adf6 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -1,21 +1,21 @@
-const { SHARED_CONF } = require('./config')
+const config = require('./server/config').SHARED_CONF
 
 module.exports = {
   mode: 'universal',
-
   /*
    ** Headers of the page
    */
   head: {
-    title: SHARED_CONF.title,
+    title: config.title,
     meta: [
       { charset: 'utf-8' },
       { name: 'viewport', content: 'width=device-width, initial-scale=1' },
-      { hid: 'description', name: 'description', content: SHARED_CONF.description }
+      { hid: 'description', name: 'description', content: config.description }
     ],
     link: [{ rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }]
   },
-  
+  dev: (process.env.NODE_ENV !== 'production'),
+
   serverMiddleware: [
     { path: '/api', handler: '@/server/api/index.js' }
   ],
@@ -32,6 +32,7 @@ module.exports = {
     'bootstrap/dist/css/bootstrap.css',
     'element-ui/lib/theme-chalk/index.css',
   ],
+
   /*
    ** Plugins to load before mounting the App
    */
@@ -41,7 +42,6 @@ module.exports = {
     '@/plugins/i18n',       // localization plugin
     '@/plugins/vue-awesome', // icon
     { src: '@/plugins/v-calendar', ssr: false }, // calendar, TO-REDO
-    '@/plugins/initialize'
   ],
 
   /*
@@ -56,8 +56,8 @@ module.exports = {
    ** Axios module configuration
    */
   axios: {
-    baseURL: SHARED_CONF.baseurl + '/api',
-    browserBaseURL: SHARED_CONF.baseurl + '/api',
+    baseURL: config.baseurl + '/api',
+    browserBaseURL: config.baseurl + '/api',
     prefix: '/api',
     // credentials: true
     // See https://github.com/nuxt-community/axios-module#options
@@ -68,7 +68,7 @@ module.exports = {
         endpoints: {
           login: { url: '/auth/login', method: 'post', propertyName: 'token' },
           logout: false,
-          user: { url: '/auth/user', method: 'get', propertyName: false }
+          user: { url: '/auth/user', method: 'get', propertyName: false },
         },
       }
     }
@@ -79,6 +79,9 @@ module.exports = {
    ** Build configuration
    */
   build: {
+    // babel: {
+    //   presets: ['@nuxt/babel-preset-app']
+    // },
     transpile: [/^element-ui/, /^vue-awesome/],
     splitChunks: {
       layouts: true
diff --git a/package.json b/package.json
index 34dfb391..f9b48cd3 100644
--- a/package.json
+++ b/package.json
@@ -13,19 +13,20 @@
     "precommit": "npm run lint"
   },
   "dependencies": {
-    "@nuxtjs/auth": "^4.5.3",
-    "@nuxtjs/axios": "^5.4.1",
-    "axios": "^0.18.0",
+    "@nuxt/babel-preset-app": "^2.8.1",
+    "@nuxtjs/auth": "^4.6.5",
+    "@nuxtjs/axios": "^5.5.3",
+    "axios": "^0.19.0",
     "bcrypt": "^3.0.5",
     "body-parser": "^1.18.3",
     "bootstrap": "4.3.1",
     "cookie-parser": "^1.4.4",
     "cors": "^2.8.5",
     "cross-env": "^5.2.0",
-    "dayjs": "^1.8.11",
-    "element-ui": "^2.8.2",
-    "email-templates": "^5.0.4",
-    "express": "^4.16.4",
+    "dayjs": "^1.8.14",
+    "element-ui": "^2.9.1",
+    "email-templates": "^5.1.0",
+    "express": "^4.17.1",
     "express-jwt": "^5.3.1",
     "ics": "^2.13.2",
     "js-cookie": "^2.2.0",
@@ -35,36 +36,36 @@
     "mastodon-api": "^1.3.0",
     "morgan": "^1.9.1",
     "multer": "^1.4.1",
-    "nuxt": "^2.4.0",
-    "pg": "^7.10.0",
-    "sequelize": "^5.2.1",
+    "nuxt": "^2.8.1",
+    "pg": "^7.11.0",
+    "sequelize": "^5.8.7",
     "sequelize-cli": "^5.4.0",
     "sharp": "^0.22.0",
-    "sqlite3": "^4.0.6",
-    "v-calendar": "^1.0.0-beta.13",
-    "vue-awesome": "^3.5.1",
-    "vue-custom-element": "^3.2.6",
+    "sqlite3": "^4.0.8",
+    "v-calendar": "^1.0.0-beta.14",
+    "vue-awesome": "^3.5.3",
+    "vue-custom-element": "^3.2.7",
     "vue-i18n": "^8.10.0",
-    "vuex-persist": "^2.0.0"
+    "vuex-persist": "^2.0.1"
   },
   "devDependencies": {
     "@nuxtjs/eslint-config": "^0.0.1",
     "babel-eslint": "^10.0.1",
     "eslint": "^5.15.1",
-    "eslint-config-prettier": "^4.1.0",
+    "eslint-config-prettier": "^4.3.0",
     "eslint-config-standard": ">=12.0.0",
     "eslint-loader": "^2.1.2",
-    "eslint-plugin-import": ">=2.16.0",
-    "eslint-plugin-jest": ">=22.3.0",
-    "eslint-plugin-node": ">=8.0.1",
+    "eslint-plugin-import": ">=2.17.3",
+    "eslint-plugin-jest": ">=22.6.4",
+    "eslint-plugin-node": ">=9.1.0",
     "eslint-plugin-nuxt": ">=0.4.2",
-    "eslint-plugin-prettier": "^3.0.1",
+    "eslint-plugin-prettier": "^3.1.0",
     "eslint-plugin-promise": ">=4.0.1",
     "eslint-plugin-standard": ">=4.0.0",
     "eslint-plugin-vue": "^5.2.2",
-    "nodemon": "^1.18.9",
-    "prettier": "^1.16.4",
+    "nodemon": "^1.19.1",
+    "prettier": "^1.17.1",
     "pug-plain-loader": "^1.0.0",
-    "webpack-cli": "^3.3.1"
+    "webpack-cli": "^3.3.2"
   }
 }
diff --git a/pages/about.vue b/pages/about.vue
index 43c5aab2..f0fd2b6d 100644
--- a/pages/about.vue
+++ b/pages/about.vue
@@ -1,7 +1,10 @@
 <template lang="pug">
-  el-dialog(:title='$t("common.info")' visible
-    :before-close='close')
-    h5 Chi siamo
+  el-card
+
+    nuxt-link.float-right(to='/')
+      v-icon(name='times' color='red')
+    h3 {{$t('common.info')}}
+
     p.
       Gancio e' un progetto dell'<a href='https://autistici.org/underscore'>underscore hacklab</a> e uno dei
       servizi di <a href='https://cisti.org'>cisti.org</a>.
diff --git a/pages/add/_edit.vue b/pages/add/_edit.vue
index 06e9d46b..11642eeb 100644
--- a/pages/add/_edit.vue
+++ b/pages/add/_edit.vue
@@ -1,5 +1,9 @@
 <template lang="pug">
-  el-dialog(:before-close='close' :visible='open' :title="edit?$t('common.edit_event'):$t('common.add_event')")
+  el-card
+    nuxt-link.float-right(to='/')
+      v-icon(name='times' color='red')
+    h5 {{edit?$t('common.edit_event'):$t('common.add_event')}}
+
     el-form(v-loading='loading')
       el-tabs.mb-2(v-model='activeTab')
 
@@ -12,14 +16,7 @@
         //- WHERE
         el-tab-pane
           span(slot='label') <v-icon name='map-marker-alt'/> {{$t('common.where')}} 
-          div {{$t('common.where')}} 
-            el-popover(
-              placement="top-start"
-              width="400"
-              trigger="click")
-              v-icon(slot='reference' color='#ff9fc4' name='question-circle')
-              slot
-                p(v-html="$t('event.where_description')") 
+          p(v-html="$t('event.where_description')") 
 
           el-select.mb-3(v-model='event.place.name'
             @change='placeChoosed'
@@ -27,7 +24,7 @@
             default-first-option
           )
             el-option(v-for='place in places' :label='place.name' :value='place.name' :key='place.id')
-              span {{place.name}} - {{place.weigth}}
+              span {{place.name}}
           div {{$t("common.address")}}
           el-input.mb-3(ref='address' v-model='event.place.address'
             :disabled='places_name.indexOf(event.place.name)>-1'
@@ -190,11 +187,6 @@ export default {
   },
   methods: {
     ...mapActions(['addEvent', 'updateEvent', 'updateMeta']),
-    close (done) {
-      
-      this.$router.replace('/')
-      done()
-    },
     eventToAttribute(event) {
       let e = {
         key: event.id,
diff --git a/pages/admin.vue b/pages/admin.vue
index b15bbb01..b6f41b0d 100644
--- a/pages/admin.vue
+++ b/pages/admin.vue
@@ -130,7 +130,8 @@ export default {
       const users = await $axios.$get('/users')
       const events = await $axios.$get('/event/unconfirmed')
       const settings = await $axios.$get('/settings')
-      return { users, events, settings, mastodon_instance: settings.mastodon_auth && settings.mastodon_auth.instance}
+
+      return { users, events, settings, mastodon_instance: settings && settings.mastodon_auth && settings.mastodon_auth.instance || ''}
     } catch ( e ) {
       console.error(e)
     }
diff --git a/pages/embed/list.vue b/pages/embed/list.vue
index 5d224613..9a90b221 100644
--- a/pages/embed/list.vue
+++ b/pages/embed/list.vue
@@ -3,15 +3,15 @@
 </template>
 <script>
 import { mapState } from 'vuex'
-import { SHARED_CONF } from '../../config'
 import List from '../../components/List'
 import moment from 'dayjs'
 
 export default {
   layout: 'iframe',
   components: { List },
+  computed: mapState(['config']),
   async asyncData ({ $axios, req, res }) {
-    const title = req.query.title || SHARED_CONF.title
+    const title = req.query.title || config.title
     const tags = req.query.tags
     const places = req.query.places
     const now = new Date()
diff --git a/pages/event/_id.vue b/pages/event/_id.vue
index 21e4916b..5bba3acc 100644
--- a/pages/event/_id.vue
+++ b/pages/event/_id.vue
@@ -53,7 +53,6 @@
 </template>
 <script>
 import { mapState, mapActions, mapGetters } from 'vuex'
-import config from '@/config'
 
 export default {
   name: 'Event',
diff --git a/pages/export.vue b/pages/export.vue
index bfeab302..bacef4b8 100644
--- a/pages/export.vue
+++ b/pages/export.vue
@@ -1,5 +1,11 @@
 <template lang="pug">
-  el-dialog(:title='$t("common.export")' visible :before-close='close')
+  el-card
+
+    nuxt-link.float-right(to='/')
+      v-icon(name='times' color='red')
+    h5 {{$t('common.export')}}
+
+
     p {{$t('export.intro')}}
     Search
     //- li(v-if='filters.tags.length') {{$t('common.tags')}}:
@@ -59,7 +65,6 @@ import Search from '@/components/Search'
 
 import {intersection} from 'lodash'
 import { Message } from 'element-ui'
-const { SHARED_CONF } = require('@/config')
 
 export default {
   name: 'Export',
@@ -68,7 +73,7 @@ export default {
     return {
       type: 'email',
       notification: { email: '' },
-      list: { title: SHARED_CONF.title },
+      list: { title: 'Gancio' },
     }
   },
   // filters,
@@ -76,7 +81,7 @@ export default {
     async add_notification () {
       if (!this.notification.email){
         Message({message:'Inserisci una mail', type: 'error'})
-        return this.$refs.email.focus()
+        // return this.$refs.email.focus()
       }
       // await api.addNotification({ ...this.notification, filters: this.filters})
       // this.$refs.modal.hide()
@@ -103,7 +108,7 @@ export default {
         params.push(`places=${this.filters.places}`)
       }
 
-      return `<iframe src="${SHARED_CONF.baseurl}/embed/list?${params.join('&')}"></iframe>`
+      return `<iframe src="/embed/list?${params.join('&')}"></iframe>`
     },
     link () {
       const tags = this.filters.tags.join(',')
@@ -119,7 +124,7 @@ export default {
         }
       }
 
-      return `${SHARED_CONF.baseurl}/api/export/${this.type}${query}`
+      return `/api/export/${this.type}${query}`
     },    
     showLink () {
       return (['feed', 'ics'].indexOf(this.type)>-1)
diff --git a/pages/index.vue b/pages/index.vue
index e87a8145..53009c3b 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -2,13 +2,34 @@
   #home
     Nav
     Home
+    
+
 </template>
 <script>
 import Home from '~/components/Home.vue'
 import Nav from '~/components/Nav.vue'
+import { mapState } from 'vuex'
 
 export default {
   name: 'Index',
+  async asyncData ({ redirect, store }) {
+    // console.error('diocane', store.state.settings)
+    // const firstRun = store.state.settings.firstRun
+    // if (firstRun!==true) {
+    //   redirect('/firstrun')
+    // }
+  },
+  async fetch ({ store, $axios }) {
+    const now = new Date()
+    const events = await $axios.$get(`/event/${now.getMonth()}/${now.getFullYear()}`)
+    console.error(events)
+    store.commit('setEvents', events)
+    const { tags, places } = await $axios.$get('/event/meta')
+    store.commit('update', { tags, places })
+    // const settings = await $axios.$get('/settings')
+    // store.commit('setSettings', settings)
+  },
+  computed: mapState(['events']),
   components: { Nav, Home },
 }
 </script>
diff --git a/pages/login.vue b/pages/login.vue
index 518a4982..0ba3f347 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -1,17 +1,24 @@
 <template lang='pug'>
 
-  el-dialog(:title='$t("common.login")' :before-close='close' visible)
+  el-card
 
-    el-form(v-loading='loading')
+    nuxt-link.float-right(to='/')
+      v-icon(name='times' color='red')
+    h5 {{$t('common.login')}}
+
+    el-form(v-loading='loading' method='POST' action='/api/auth/login')
       p(v-html="$t('login.description')")
 
-      el-input.mb-2(v-model='email' type='email' :placeholder='$t("common.email")' autocomplete='email' ref='email')
-        i.el-icon-user(slot='prepend')
+      el-input.mb-2(v-model='email' type='email' name='email'
+        :placeholder='$t("common.email")' autocomplete='email' ref='email')
+        v-icon(name='user' slot='prepend')
 
-      el-input.mb-1(v-model='password'  @keyup.enter.native="submit" type='password' :placeholder='$t("common.password")')
-        i.el-icon-lock(slot='prepend')
+      el-input.mb-1(v-model='password'  @keyup.enter.native="submit" name='password'
+        type='password' :placeholder='$t("common.password")')
+        v-icon(name='lock' slot='prepend')
 
-      el-button.mr-1(plain type="success" :disabled='!email || !password' @click='submit') {{$t('common.login')}}
+      el-button.mr-1(plain type="success" native-type='submit'
+        :disabled='disabled' @click='submit') {{$t('common.login')}}
 
       nuxt-link(to='/register')
         el-button.mt-1(plain type="primary") {{$t('login.not_registered')}}
@@ -35,6 +42,12 @@ export default {
       loading: false
     }
   },
+  computed: {
+    disabled () {
+      if (process.server) return false
+      return !this.email || !this.password
+    }
+  },
   methods: {
     close () {
       this.$router.replace('/')
diff --git a/pages/register.vue b/pages/register.vue
index 9a57800e..f1800613 100644
--- a/pages/register.vue
+++ b/pages/register.vue
@@ -1,18 +1,25 @@
 <template lang='pug'>
-  el-dialog(:title="$t('common.register')" visible :before-close='() => $router.replace("/")' @open='$refs.email.focus()')
-    el-form
+  el-card
+
+    nuxt-link.float-right(to='/')
+      v-icon(name='times' color='red')
+    h5 {{$t('common.register')}}
+
+    el-form(method='POST' action='/api/user')
       p(v-html="$t('register.description')")
       el-input.mb-2(ref='email' v-model='user.email' type='email' required
-        :placeholder='$t("common.email")' autocomplete='email')
+        :placeholder='$t("common.email")' autocomplete='email' name='email')
         span(slot='prepend') @
 
-      el-input.mb-2(v-model='user.password' type="password" placeholder="Password")
+      el-input.mb-2(v-model='user.password' type="password" placeholder="Password" name='password')
         v-icon(name='lock' slot='prepend')
 
       el-input.mb-2(v-model='user.description' type="textarea" rows='3' :placeholder="$t('common.description')")
           v-icon(name='envelope-open-text')
 
-      el-button(plain type="success" icon='el-icon-arrow-right' :disabled='!user.password || !user.email || !user.description' @click='register') {{$t('common.send')}}
+      el-button(plain type="success" native-type='submit'
+        :disabled='disabled'
+        @click='register') {{$t('common.send')}} <v-icon name='chevron-right'/>
 </template>
 
 <script>
@@ -28,7 +35,10 @@ export default {
     }
   },
   computed: {
-    
+    disabled () {
+      if (process.server) return false
+      return !this.user.password || !this.user.email || !this.user.description
+    }
   },
   methods: {
     ...mapActions(['login']),
diff --git a/plugins/element-ui.js b/plugins/element-ui.js
index 9a7f39fd..7293e6fe 100644
--- a/plugins/element-ui.js
+++ b/plugins/element-ui.js
@@ -1,6 +1,6 @@
 import Vue from 'vue'
 import { Button, Select, Tag, Option, Table, FormItem, Card, Row, Col, Upload, Checkbox,
-  Form, Tabs, TabPane, Switch, Input, Loading, TimeSelect, Badge, ButtonGroup, Divider,
+  Form, Tabs, TabPane, Switch, Input, Loading, TimeSelect, Badge, ButtonGroup, Divider, Step, Steps,
   TableColumn, ColorPicker, Pagination, Popover, Tooltip, Dialog, Calendar, Carousel, CarouselItem,
   Container, Footer , Timeline, TimelineItem, Menu, MenuItem } from 'element-ui'
 import localeEn from 'element-ui/lib/locale/lang/en'
@@ -11,6 +11,8 @@ locale.use(localeIt)
 export default () => {
   Vue.use(Button)
   Vue.use(Divider)
+  Vue.use(Step)
+  Vue.use(Steps)
   Vue.use(Checkbox)
   Vue.use(Upload)
   Vue.use(ButtonGroup)
diff --git a/plugins/filters.js b/plugins/filters.js
index 6661c538..34e223d3 100644
--- a/plugins/filters.js
+++ b/plugins/filters.js
@@ -3,21 +3,31 @@ import moment from 'dayjs'
 import 'dayjs/locale/it'
 moment.locale('it')
 
+function short_hour(datetime) {
+  if (datetime.minute() === 0) {
+    return 'h' + datetime.format('HH')
+  } else {
+    return 'h' + datetime.format('HH:mm')
+  }
+}
+
 export default (a) => {
   Vue.filter('linkify', value => value.replace(/(https?:\/\/[^\s]+)/g, '<a href="$1">$1</a>'))
   Vue.filter('datetime', value => moment(value).format('ddd, D MMMM HH:mm'))
   Vue.filter('short_datetime', value => moment(value).format('D/MM HH:mm'))
   Vue.filter('hour', value => moment(value).format('HH:mm'))
-  Vue.filter('day', value => moment(value).format('ddd, D MMM'))
+  Vue.filter('day', value => moment(value).format('dddd, D MMMM'))
   Vue.filter('month', value => moment(value).format('MMM'))
   Vue.filter('event_when', event => {
+    const start = moment(event.start_datetime)
+    const end = moment(event.end_datetime)
     if (event.multidate) {
-      return moment(event.start_datetime).format('ddd, D MMMM HH:mm') + ' - ' + moment(event.end_datetime).format('ddd, D MMMM')
+      return `${start.format('ddd, D MMMM')} (${short_hour(start)}) - ${end.format('ddd, D MMMM')} (${short_hour(end)})`
     } else {
       if (event.end_datetime && event.end_datetime !== event.start_datetime)
-        return moment(event.start_datetime).format('dddd, D MMMM HH:mm') + '-' + moment(event.end_datetime).format('HH:mm')
+        return `${start.format('ddd, D MMMM')} (${short_hour(start)}-${short_hour(end)}`
       else
-        return moment(event.start_datetime).format('dddd, D MMMM HH:mm')
+        return `${start.format('dddd, D MMMM')} (${short_hour(start)})`
     }
   })
 }
\ No newline at end of file
diff --git a/plugins/initialize.js b/plugins/initialize.js
index 1545d1b2..821bfe83 100644
--- a/plugins/initialize.js
+++ b/plugins/initialize.js
@@ -1,9 +1,9 @@
 
 // TOFIX: not needed in any case (eg. embed)
 export default async ({ store, $axios }) => {
-  const now = new Date()
-  const events = await $axios.$get(`/event/${now.getMonth()}/${now.getFullYear()}`)
-  store.commit('setEvents', events)
-  const { tags, places } = await $axios.$get('/event/meta')
-  store.commit('update', { tags, places })
+  // const now = new Date()
+  // const events = await $axios.$get(`/event/${now.getMonth()}/${now.getFullYear()}`)
+  // store.commit('setEvents', events)
+  // const { tags, places } = await $axios.$get('/event/meta')
+  // store.commit('update', { tags, places })
 }
diff --git a/plugins/vue-awesome.js b/plugins/vue-awesome.js
index d9320c7d..2dac2a63 100644
--- a/plugins/vue-awesome.js
+++ b/plugins/vue-awesome.js
@@ -24,6 +24,7 @@ import 'vue-awesome/icons/tags'
 import 'vue-awesome/icons/chevron-right'
 import 'vue-awesome/icons/chevron-left'
 import 'vue-awesome/icons/search'
+import 'vue-awesome/icons/times'
 
 import Icon from 'vue-awesome/components/Icon'
 
diff --git a/server/api/auth.js b/server/api/auth.js
index 21dcb8a5..7e7a8cdc 100644
--- a/server/api/auth.js
+++ b/server/api/auth.js
@@ -1,22 +1,25 @@
 const { Op } = require('sequelize')
-const config = require('../../config')
-const User = require('./models/user')
+const { user: User } = require('./models')
+const Settings = require('./controller/settings')
 
 const Auth = {
   async fillUser(req, res, next) {
     if (!req.user) return next()
     req.user = await User.findOne({
       where: { id: { [Op.eq]: req.user.id }, is_active: true }
+    }).catch(e => {
+      res.sendStatus(404)
+      return next(false)
     })
     next()
   },
   async isAuth(req, res, next) {
-    console.error('ma sono dentro auth ?!?!', req.user)
     if (!req.user) {
       return res
         .status(403)
         .send({ message: 'Failed to authenticate token ' })
     }
+    
     req.user = await User.findOne({
       where: { id: { [Op.eq]: req.user.id }, is_active: true }
     })
@@ -28,9 +31,22 @@ const Auth = {
     next()
   },
   isAdmin(req, res, next) {
+    if (!req.user) {
+      return res
+        .status(403)
+        .send({ message: 'Failed to authenticate token ' })
+    }
     if (req.user.is_admin && req.user.is_active) return next()
     return res.status(403).send({ message: 'Admin needed' })
+  },
+  async adminOrFirstRun(req, res, next) {
+    if (req.user && req.user.is_admin && req.user.is_active) return next()
+    const settings = await Settings.settings()
+    if (!settings.firstRun) {
+      return next()
+    }
   }
+
 }
 
 module.exports = Auth
diff --git a/server/api/config/config.json b/server/api/config/config.json
deleted file mode 100644
index b0b61bda..00000000
--- a/server/api/config/config.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "development": {
-    "storage": "/home/les/dev/hacklab/gancio/db.sqlite",
-    "dialect": "sqlite",
-    "logging": false
-  },
-  "production": {
-    "username": "docker",
-    "password": "docker",
-    "database": "gancio",
-    "host": "db",
-    "dialect": "postgres"
-  }
-}
diff --git a/server/api/controller/bot.js b/server/api/controller/bot.js
index ff21e12f..cadd6d5e 100644
--- a/server/api/controller/bot.js
+++ b/server/api/controller/bot.js
@@ -1,12 +1,10 @@
-const { User, Event, Comment, Tag } = require('../model')
-const { SHARED_CONF } = require('../../../config')
-const Mastodon = require('mastodon-api')
-// const Sequelize = require('sequelize')
-// const Op = Sequelize.Op
-const settingsController = require('./settings')
 const fs = require('fs')
 const path = require('path')
 const moment = require('moment')
+const { event: Event, comment: Comment, tag: Tag } = require('../model')
+const config = require('../../config').SHARED_CONF
+const Mastodon = require('mastodon-api')
+const settingsController = require('./settings')
 moment.locale('it')
 
 const botController = {
@@ -47,7 +45,7 @@ const botController = {
     const { access_token, instance } = mastodon_auth
     const bot = new Mastodon({ access_token, api_url: `https://${instance}/api/v1/` })
     const status = `${event.title} @ ${event.place.name} ${moment(event.start_datetime).format('ddd, D MMMM HH:mm')} - 
-${event.description.length > 200 ? event.description.substr(0, 200) + '...' : event.description} - ${event.tags.map(t => '#' + t.tag).join(' ')} ${SHARED_CONF.baseurl}/event/${event.id}`
+${event.description.length > 200 ? event.description.substr(0, 200) + '...' : event.description} - ${event.tags.map(t => '#' + t.tag).join(' ')} ${config.baseurl}/event/${event.id}`
 
     let media
     if (event.image_path) {
@@ -58,9 +56,9 @@ ${event.description.length > 200 ? event.description.substr(0, 200) + '...' : ev
     }
     return bot.post('statuses', { status, visibility: 'direct', media_ids: media ? [media.data.id] : [] })
   },
+
+  // TOFIX: enable message deletion
   async message (msg) {
-    console.log(msg)
-    console.log(msg.data.accounts)
     const replyid = msg.data.in_reply_to_id || msg.data.last_status.in_reply_to_id
     if (!replyid) return
     const event = await Event.findOne({ where: { activitypub_id: replyid } })
@@ -71,9 +69,9 @@ ${event.description.length > 200 ? event.description.substr(0, 200) + '...' : ev
     }
     const comment = await Comment.create({
       activitypub_id: msg.data.last_status.id, 
-      text: msg.data.last_status.content,
+      // text: msg.data.last_status.content,
       data: msg.data,
-      author: msg.data.accounts[0].username 
+      // author: msg.data.accounts[0].username 
     })
     event.addComment(comment)
     // const comment = await Comment.findOne( { where: {activitypub_id: msg.data.in_reply_to}} )
@@ -93,5 +91,5 @@ ${event.description.length > 200 ? event.description.substr(0, 200) + '...' : ev
   }
 }
 
-setTimeout(botController.initialize, 2000)
+// setTimeout(botController.initialize, 2000)
 module.exports = botController
diff --git a/server/api/controller/event.js b/server/api/controller/event.js
index 2d11824d..68d7ba75 100644
--- a/server/api/controller/event.js
+++ b/server/api/controller/event.js
@@ -2,7 +2,7 @@ const crypto = require('crypto')
 const moment = require('moment')
 const { Op } = require('sequelize')
 const lodash = require('lodash')
-const { User, Event, Comment, Tag, Place, Notification } = require('../model')
+const { event: Event, comment: Comment, tag: Tag, place: Place, notification: Notification } = require('../models')
 const Sequelize = require('sequelize')
 
 const eventController = {
diff --git a/server/api/controller/export.js b/server/api/controller/export.js
index 56f31cff..e7a647bd 100644
--- a/server/api/controller/export.js
+++ b/server/api/controller/export.js
@@ -1,6 +1,6 @@
-const { Event, Comment, Tag, Place } = require('../model')
+const { event: Event, place: Place } = require('../models')
 const { Op } = require('sequelize')
-const config = require('../../../config')
+const config = require('../../config').SHARED_CONF
 const moment = require('moment')
 const ics = require('ics')
 
@@ -65,7 +65,6 @@ const exportController = {
     })
     res.type('text/calendar; charset=UTF-8')
     const { error, value } = ics.createEvents(eventsMap)
-    console.log(error, value)
     res.send(value)
   }
 }
diff --git a/server/api/controller/settings.js b/server/api/controller/settings.js
index ea1012df..72929779 100644
--- a/server/api/controller/settings.js
+++ b/server/api/controller/settings.js
@@ -1,10 +1,11 @@
-const { Settings } = require('../model')
-const { SHARED_CONF } = require('../../../config')
 const Mastodon = require('mastodon-api')
+const { setting: Setting } = require('../models')
+const config = require('../../config').SHARED_CONF
 
 const settingsController = {
+
   async setAdminSetting (key, value) {
-    await Settings.findOrCreate({ where: { key },
+    await Setting.findOrCreate({ where: { key },
       defaults: { value } })
       .spread((settings, created) => {
         if (!created) return settings.update({ value })
@@ -16,11 +17,15 @@ const settingsController = {
     res.json(settings)
   },
 
+  async getConfig (req, res) {
+    res.json(config)
+  },
+
   async getAuthURL(req, res) {
     const instance = req.body.instance
-    const callback = `${SHARED_CONF.baseurl}/api/settings/oauth`
+    const callback = `${config.baseurl}/api/settings/oauth`
     const { client_id, client_secret } = await Mastodon.createOAuthApp(`https://${instance}/api/v1/apps`,
-      SHARED_CONF.title, 'read write', callback)
+      config.title, 'read write', callback)
     const url = await Mastodon.getAuthorizationUrl(client_id, client_secret,
       `https://${instance}`, 'read write', callback)
 
@@ -31,19 +36,16 @@ const settingsController = {
   async code(req, res) {
     const code = req.query.code
     let client_id, client_secret, instance
-    const callback = `${SHARED_CONF.baseurl}/api/settings/oauth`
-    console.error('sono dentro CODEEEEEEEEEE', code)
+    const callback = `${config.baseurl}/api/settings/oauth`
 
     const settings = await settingsController.settings()
 
-    console.log(settings);
     ({ client_id, client_secret, instance } = settings.mastodon_auth)
 
     try {
       const token = await Mastodon.getAccessToken(client_id, client_secret, code,
         `https://${instance}`, callback)
       const mastodon_auth = { client_id, client_secret, access_token: token, instance }
-      console.error(mastodon_auth)
       await settingsController.setAdminSetting('mastodon_auth', mastodon_auth)
       
       res.redirect('/admin')
@@ -53,13 +55,11 @@ const settingsController = {
   },
 
   async settings () {
-    const settings = await Settings.findAll()
-    const map = {}
-    settings.forEach(setting => {
-      map[setting.key] = setting.value
-    })
-    return map
-  }
+    console.error('ma sono dentro settings ?!?!')
+    const settings = await Setting.findAll()
+    return settings
+  },
+
 }
 
 module.exports = settingsController
diff --git a/server/api/controller/user.js b/server/api/controller/user.js
index 6fc85777..c69a791f 100644
--- a/server/api/controller/user.js
+++ b/server/api/controller/user.js
@@ -4,14 +4,14 @@ const crypto = require('crypto')
 const jwt = require('jsonwebtoken')
 const { Op } = require('sequelize')
 const jsonwebtoken = require('jsonwebtoken')
-const User = require('../models/user')
-const { SECRET_CONF, SHARED_CONF } = require('../../../config')
+const { SECRET_CONF, SHARED_CONF } = require('../../config')
 const mail = require('../mail')
-const { Event, Tag, Place } = require('../models/event')
+const { user: User, event: Event, tag: Tag, place: Place } = require('../models')
 const eventController = require('./event')
 
 const userController = {
   async login(req, res) {
+
     // find the user
     const user = await User.findOne({ where: { email: { [Op.eq]: req.body && req.body.email } } })
     if (!user) {
@@ -33,7 +33,7 @@ const userController = {
           },
           SECRET_CONF.secret
         )
-      
+
         res.json({token: accessToken})        
       }
     }
@@ -89,7 +89,9 @@ const userController = {
       eventDetails.image_path = req.file.filename
     }
 
+    console.error('prima la creazione di evento')
     let event = await Event.create(eventDetails)
+    console.error('dopo la creazione di evento')
 
     // create place if needs to
     let place
@@ -195,7 +197,10 @@ const userController = {
   },
 
   async current(req, res) {
-    res.json(req.user)
+    if (req.user)
+      res.json(req.user)
+    else 
+      res.sendStatus(404)
   },
 
   async getAll(req, res) {
@@ -219,7 +224,6 @@ const userController = {
   },
 
   async register(req, res) {
-    
     const n_users = await User.count()
     try {
 
@@ -234,14 +238,17 @@ const userController = {
       try {
         mail.send([user.email, SECRET_CONF.admin], 'register', { user, config: SHARED_CONF })
       } catch (e) {
-        console.error(e)
         return res.status(400).json(e)
       }
-      const payload = { email: user.email }
+      const payload = {
+        id: user.id,
+        email: user.email,
+        scope: [user.is_admin ? 'admin' : 'user']
+      }
       const token = jwt.sign(payload, SECRET_CONF.secret)
-      res.json({ user, token })
+      res.json({ token })
+      // res.redirect('/')
     } catch (e) {
-      console.error(e)
       res.status(404).json(e)
     }
   }
diff --git a/server/api/db.js b/server/api/db.js
deleted file mode 100644
index 35d0eb72..00000000
--- a/server/api/db.js
+++ /dev/null
@@ -1,6 +0,0 @@
-const Sequelize = require('sequelize')
-const { SECRET_CONF } = require('../../config.js')
-
-const db = new Sequelize(SECRET_CONF.db)
-// db.sync()
-module.exports = db
diff --git a/server/api/index.js b/server/api/index.js
index 779dfc45..ecf699c3 100644
--- a/server/api/index.js
+++ b/server/api/index.js
@@ -1,27 +1,16 @@
 const express = require('express')
 const multer = require('multer')
+const cookieParser = require('cookie-parser')
+const bodyParser = require('body-parser')
+const expressJwt = require('express-jwt')
+
 const { fillUser, isAuth, isAdmin } = require('./auth')
 const eventController = require('./controller/event')
 const exportController = require('./controller/export')
 const userController = require('./controller/user')
 const settingsController = require('./controller/settings')
-const { SECRET_CONF } = require('../../config')
-const cookieParser = require('cookie-parser')
 
-const expressJwt = require('express-jwt')
-const jwt = expressJwt({
-  secret: SECRET_CONF.secret,
-  credentialsRequired: false,
-  getToken: req => {
-    if (req.headers.authorization && req.headers.authorization.split(' ')[0] === 'Bearer') {
-      return req.headers.authorization.split(' ')[1];
-    } else if (req.cookies && req.cookies['auth._token.local']) {
-      const tmp = req.cookies['auth._token.local'].split(' ');
-      return tmp[1]
-    }
-    return null 
-  }
-})
+const { SECRET_CONF } = require('../config')
 
 const storage = require('./storage')({
   destination: 'uploads/'
@@ -30,6 +19,24 @@ const storage = require('./storage')({
 const upload = multer({ storage })
 const api = express.Router()
 api.use(cookieParser())
+api.use(bodyParser.urlencoded({ extended: false }))
+api.use(bodyParser.json())
+
+const jwt = expressJwt({
+  secret: SECRET_CONF.secret,
+  credentialsRequired: false,
+  // getToken: req => {
+  //   // if (req.headers.authorization && req.headers.authorization.split(' ')[0] === 'Bearer') {
+  //     // return req.headers.authorization.split(' ')[1];
+  //   if (req.cookies && req.cookies['token']) {
+  //     console.error(req.cookies['token'])
+  //     return req.cookies['token']
+  //   }
+  //   return null 
+  // }
+})
+
+
 // AUTH
 api.post('/auth/login', userController.login)
 api.post('/auth/logout', userController.logout)
@@ -77,8 +84,9 @@ api.get('/event/unconfirmed', jwt, isAuth, isAdmin, eventController.getUnconfirm
 api.post('/event/notification', eventController.addNotification)
 api.delete('/event/notification/:code', eventController.delNotification)
 
-api.get('/settings', settingsController.getAdminSettings)
-api.post('/settings', settingsController.setAdminSetting)
+api.get('/config', settingsController.getConfig)
+api.get('/settings', jwt, fillUser, isAdmin, settingsController.getAdminSettings)
+api.post('/settings', jwt, fillUser, isAdmin, settingsController.setAdminSetting)
 
 // get event
 api.get('/event/:event_id', eventController.get)
diff --git a/server/api/mail.js b/server/api/mail.js
index f86e286e..d07d923d 100644
--- a/server/api/mail.js
+++ b/server/api/mail.js
@@ -1,8 +1,8 @@
 const Email = require('email-templates')
 const path = require('path')
-const { SECRET_CONF, SHARED_CONF } = require('../../config')
 const moment = require('moment')
-moment.locale(SHARED_CONF.locale)
+const config = require('../config')
+moment.locale(config.SHARED_CONF.locale)
 
 const mail = {
   send (addresses, template, locals) {
@@ -16,25 +16,25 @@ const mail = {
         }
       },
       message: {
-        from: `${SHARED_CONF.title} <${SECRET_CONF.smtp.auth.user}>`
+        from: `${config.SHARED_CONF.title} <${config.SECRET_CONF.smtp.auth.user}>`
       },
       send: true,
       i18n: {
         directory: path.join(__dirname, '..', '..', 'locales', 'email'),
-        defaultLocale: SHARED_CONF.locale
+        defaultLocale: config.SHARED_CONF.locale
       },
-      transport: SECRET_CONF.smtp
+      transport: config.SECRET_CONF.smtp
     })
     return email.send({
       template,
       message: {
         to: addresses,
-        bcc: SECRET_CONF.admin
+        bcc: config.SECRET_CONF.admin
       },
       locals: {
         ...locals,
-        locale: SHARED_CONF.locale,
-        config: SHARED_CONF,
+        locale: config.SHARED_CONF.locale,
+        config: config.SHARED_CONF,
         datetime: datetime => moment(datetime).format('ddd, D MMMM HH:mm')
       }
     })
diff --git a/server/api/model.js b/server/api/model.js
deleted file mode 100644
index 303fa1dd..00000000
--- a/server/api/model.js
+++ /dev/null
@@ -1,14 +0,0 @@
-const User = require('./models/user')
-const { Event, Comment, Tag, Place, Notification, EventNotification } = require('./models/event')
-const Settings = require('./models/settings')
-
-module.exports = {
-  User,
-  Event,
-  Comment,
-  Tag,
-  Place,
-  Notification,
-  EventNotification,
-  Settings
-}
diff --git a/server/api/models/comment.js b/server/api/models/comment.js
new file mode 100644
index 00000000..b3a03004
--- /dev/null
+++ b/server/api/models/comment.js
@@ -0,0 +1,13 @@
+'use strict';
+module.exports = (sequelize, DataTypes) => {
+  const comment = sequelize.define('comment', {
+    activitypub_id: DataTypes.BIGINT,
+    data: DataTypes.JSON
+  }, {});
+  comment.associate = function(models) {
+    comment.belongsTo(models.event)
+    // Event.hasMany(Comment)    
+    // associations can be defined here
+  };
+  return comment;
+};
\ No newline at end of file
diff --git a/server/api/models/event.js b/server/api/models/event.js
index dab0f5e0..e1d2fe4c 100644
--- a/server/api/models/event.js
+++ b/server/api/models/event.js
@@ -1,81 +1,31 @@
-const Sequelize = require('sequelize')
-const db = require('../db')
-const User = require('./user')
-
-const Event = db.define('event', {
-  title: Sequelize.STRING,
-  description: Sequelize.TEXT,
-  multidate: Sequelize.BOOLEAN,
-  start_datetime: { type: Sequelize.DATE, index: true },
-  end_datetime: { type: Sequelize.DATE, index: true },
-  image_path: Sequelize.STRING,
-  is_visible: Sequelize.BOOLEAN,
-  activitypub_id: { type: Sequelize.BIGINT, index: true },
-  activitypub_ids: { 
-    type: Sequelize.ARRAY(Sequelize.BIGINT),
-    index: true,
-    defaultValue: []
-  }
-})
-
-const Tag = db.define('tag', {
-  tag: { type: Sequelize.STRING, index: true, unique: true, primaryKey: true },
-  weigth: { type: Sequelize.INTEGER, defaultValue: 0 },
-  color: { type: Sequelize.STRING }
-})
-
-const Comment = db.define('comment', {
-  activitypub_id: { type: Sequelize.BIGINT, index: true },
-  data: Sequelize.JSON,
-  // url: Sequelize.STRING,
-  author: Sequelize.STRING,
-  text: Sequelize.STRING
-})
-
-const Notification = db.define('notification', {
-  filters: Sequelize.JSON,
-  email: Sequelize.STRING,
-  remove_code: Sequelize.STRING,
-  type: {
-    type: Sequelize.ENUM,
-    values: ['mail', 'admin_email', 'mastodon']
-  }
-})
-
-const Place = db.define('place', {
-  name: { type: Sequelize.STRING, unique: true, index: true },
-  weigth: { type: Sequelize.INTEGER, defaultValue: 0 },
-  address: { type: Sequelize.STRING }
-})
-
-Comment.belongsTo(Event)
-Event.hasMany(Comment)
-
-Event.belongsToMany(Tag, { through: 'tagEvent' })
-Tag.belongsToMany(Event, { through: 'tagEvent' })
-
-const EventNotification = db.define('EventNotification', {
-  status: {
-    type: Sequelize.ENUM,
-    values: ['new', 'sent', 'error'],
-    defaultValue: 'new',
-    index: true
-  }
-})
-
-Event.belongsToMany(Notification, { through: EventNotification })
-Notification.belongsToMany(Event, { through: EventNotification })
-
-Event.belongsTo(User)
-Event.belongsTo(Place)
-
-User.hasMany(Event)
-Place.hasMany(Event)
-
-async function init() {
-  await Notification.findOrCreate({ where: { type: 'mastodon', filters: { is_visible: true } } })
-  // await Notification.findOrCreate({ where: { type: 'admin_email', filters: { is_visible: false } } })
-}
-
-init()
-module.exports = { Event, Comment, Tag, Place, Notification, EventNotification }
+'use strict';
+module.exports = (sequelize, DataTypes) => {
+  const event = sequelize.define('event', {
+    title: DataTypes.STRING,
+    slug: DataTypes.STRING,
+    description: DataTypes.TEXT,
+    multidate: DataTypes.BOOLEAN,
+    start_datetime: { 
+      type: DataTypes.DATE,
+      index: true
+    },
+    end_datetime: DataTypes.DATE,
+    image_path: DataTypes.STRING,
+    is_visible: DataTypes.BOOLEAN,
+    activitypub_id: {
+      type: DataTypes.BIGINT,
+      index: true
+    }
+  }, {});
+  event.associate = function(models) {
+    event.belongsTo(models.place)
+    event.belongsTo(models.user)
+    event.belongsToMany(models.tag, { through: 'event_tags' })
+    event.belongsToMany(models.notification, { through: 'event_notification' })
+    event.hasMany(models.comment)
+    // Tag.belongsToMany(Event, { through: 'tagEvent' })    
+    // Event.hasMany(models.Tag)
+    // associations can be defined here
+  };
+  return event;
+};
\ No newline at end of file
diff --git a/server/api/models/eventnotification.js b/server/api/models/eventnotification.js
new file mode 100644
index 00000000..c8eda950
--- /dev/null
+++ b/server/api/models/eventnotification.js
@@ -0,0 +1,16 @@
+'use strict';
+module.exports = (sequelize, DataTypes) => {
+  const eventNotification = sequelize.define('eventNotification', {
+    status: {
+      type: DataTypes.ENUM,
+      values: ['new', 'sent', 'error'],
+      defaultValue: 'new',
+      index: true
+    }
+  }, {});
+  
+  eventNotification.associate = function(models) {
+    // associations can be defined here
+  };
+  return eventNotification;
+};
\ No newline at end of file
diff --git a/server/api/models/index.js b/server/api/models/index.js
index 6d76a99a..8f5a10f5 100644
--- a/server/api/models/index.js
+++ b/server/api/models/index.js
@@ -1,29 +1,31 @@
-const fs = require('fs')
-const path = require('path')
-const Sequelize = require('sequelize')
-const basename = path.basename(__filename)
-const config = require('../../../config')
-const db = {}
+'use strict';
 
-const sequelize = new Sequelize(config.db)
+const fs = require('fs');
+const path = require('path');
+const Sequelize = require('sequelize');
+const basename = path.basename(__filename);
+const config = require(__dirname + '/../../config.js').SECRET_CONF.db
+const db = {};
+
+let sequelize = new Sequelize(config);
 
 fs
   .readdirSync(__dirname)
   .filter(file => {
-    return (file.indexOf('.') !== 0) && (file !== basename) && (file.slice(-3) === '.js')
+    return (file.indexOf('.') !== 0) && (file !== basename) && (file.slice(-3) === '.js');
   })
   .forEach(file => {
-    const model = sequelize['import'](path.join(__dirname, file))
+    const model = sequelize['import'](path.join(__dirname, file));
     db[model.name] = model;
   });
 
 Object.keys(db).forEach(modelName => {
   if (db[modelName].associate) {
-    db[modelName].associate(db)
+    db[modelName].associate(db);
   }
-})
+});
 
-db.sequelize = sequelize
-db.Sequelize = Sequelize
+db.sequelize = sequelize;
+db.Sequelize = Sequelize;
 
 module.exports = db;
diff --git a/server/api/models/notification.js b/server/api/models/notification.js
new file mode 100644
index 00000000..a1ec32f3
--- /dev/null
+++ b/server/api/models/notification.js
@@ -0,0 +1,17 @@
+'use strict';
+module.exports = (sequelize, DataTypes) => {
+  const notification = sequelize.define('notification', {
+    filters: DataTypes.JSON,
+    email: DataTypes.STRING,
+    remove_code: DataTypes.STRING,
+    type: {
+      type: DataTypes.ENUM,
+      values: ['mail', 'admin_email', 'mastodon']
+    }
+  }, {});
+  notification.associate = function(models) {
+    notification.belongsToMany(models.event, { through: 'event_notification' })    
+    // associations can be defined here
+  };
+  return notification;
+};
\ No newline at end of file
diff --git a/server/api/models/place.js b/server/api/models/place.js
new file mode 100644
index 00000000..70cb0323
--- /dev/null
+++ b/server/api/models/place.js
@@ -0,0 +1,15 @@
+'use strict';
+module.exports = (sequelize, DataTypes) => {
+  const place = sequelize.define('place', {
+    name: DataTypes.STRING,
+    address: DataTypes.STRING,
+    weigth: DataTypes.INTEGER
+  }, {});
+
+  place.associate = function(models) {
+    // associations can be defined here
+    place.hasMany(models.event)
+  };
+
+  return place;
+};
\ No newline at end of file
diff --git a/server/api/models/setting.js b/server/api/models/setting.js
new file mode 100644
index 00000000..f12acfca
--- /dev/null
+++ b/server/api/models/setting.js
@@ -0,0 +1,14 @@
+'use strict';
+module.exports = (sequelize, DataTypes) => {
+  const setting = sequelize.define('setting', {
+    key: { 
+      type: DataTypes.STRING,
+      primaryKey: true,
+      allowNull: false,
+      index: true,
+    },
+    value: DataTypes.JSON
+  }, {});
+
+  return setting;
+};
\ No newline at end of file
diff --git a/server/api/models/settings.js b/server/api/models/settings.js
deleted file mode 100644
index 148b7bdb..00000000
--- a/server/api/models/settings.js
+++ /dev/null
@@ -1,9 +0,0 @@
-const db = require('../db')
-const Sequelize = require('sequelize')
-
-const Settings = db.define('settings', {
-  key: { type: Sequelize.STRING, primaryKey: true, index: true },
-  value: Sequelize.JSON
-})
-
-module.exports = Settings
diff --git a/server/api/models/tag.js b/server/api/models/tag.js
new file mode 100644
index 00000000..bb6752ac
--- /dev/null
+++ b/server/api/models/tag.js
@@ -0,0 +1,19 @@
+'use strict';
+module.exports = (sequelize, DataTypes) => {
+  const tag = sequelize.define('tag', {
+    tag: {
+      type: DataTypes.STRING,
+      index: true,
+      primaryKey: true
+    },
+    weigth: DataTypes.INTEGER,
+    color: DataTypes.STRING
+  }, {});
+
+  tag.associate = function(models) {
+    tag.belongsToMany(models.event, { through: 'event_tags' })
+    // associations can be defined here
+  };
+
+  return tag;
+};
\ No newline at end of file
diff --git a/server/api/models/user.js b/server/api/models/user.js
index 697acb7d..31cea58e 100644
--- a/server/api/models/user.js
+++ b/server/api/models/user.js
@@ -1,34 +1,39 @@
-const Sequelize = require('sequelize')
+'use strict';
 const bcrypt = require('bcrypt')
-const db = require('../db')
 
-const User = db.define('user', {
-  email: {
-    type: Sequelize.STRING,
-    unique: { msg: 'err.register_error' },
-    index: true,
-    allowNull: false
-  },
-  description: Sequelize.TEXT,
-  password: Sequelize.STRING,
-  recover_code: Sequelize.STRING,
-  is_admin: Sequelize.BOOLEAN,
-  is_active: Sequelize.BOOLEAN,
-  mastodon_auth: Sequelize.JSON
-})
+module.exports = (sequelize, DataTypes) => {
+  const user = sequelize.define('user', {
+    email: {
+      type: DataTypes.STRING,
+      unique: { msg: 'err.register_error' },
+      index: true,
+      allowNull: false
+    },
+    description: DataTypes.TEXT,
+    password: DataTypes.STRING,
+    recover_code: DataTypes.STRING,
+    is_admin: DataTypes.BOOLEAN,
+    is_active: DataTypes.BOOLEAN
+  }, {});
 
-User.prototype.comparePassword = async function (pwd) {
-  if (!this.password) return false
-  const ret = await bcrypt.compare(pwd, this.password)
-  return ret
-}
+  user.associate = function(models) {
+    // associations can be defined here
+    user.hasMany(models.event)
+  };
 
-User.beforeSave(async (user, options) => {
-  if (user.changed('password')) {
-    const salt = await bcrypt.genSalt(10)
-    const hash = await bcrypt.hash(user.password, salt)
-    user.password = hash
+  user.prototype.comparePassword = async function (pwd) {
+    if (!this.password) return false
+    const ret = await bcrypt.compare(pwd, this.password)
+    return ret
   }
-})
+  
+  user.beforeSave(async (user, options) => {
+    if (user.changed('password')) {
+      const salt = await bcrypt.genSalt(10)
+      const hash = await bcrypt.hash(user.password, salt)
+      user.password = hash
+    }
+  })
 
-module.exports = User
+  return user;
+};
\ No newline at end of file
diff --git a/server/api/views/feed/rss.pug b/server/api/views/feed/rss.pug
new file mode 100644
index 00000000..26429080
--- /dev/null
+++ b/server/api/views/feed/rss.pug
@@ -0,0 +1,23 @@
+doctype xml
+rss(version='2.0')
+    channel
+        title #{config.title}
+        link #{config.baseurl}
+        description #{config.description}
+        language #{config.locale}
+        //- if events.length
+            lastBuildDate= new Date(posts[0].publishedAt).toUTCString()
+        each event in events
+            item
+                title= event.title
+                link #{config.baseurl}/event/#{event.id}
+                description
+                    | <![CDATA[
+                    | <h4>#{event.title}</h4>
+                    | <strong>#{event.place.name} - #{event.place.address}</strong>
+                    | #{moment(event.start_datetime).format("dddd, D MMMM HH:mm")}<br/>
+                    | <img src="#{config.apiurl}/../uploads/#{event.image_path}"/>
+                    | <pre>!{event.description}</pre>
+                    | ]]>
+                pubDate= new Date(event.createdAt).toUTCString()
+                guid(isPermaLink='false') #{config.baseurl}/event/#{event.id}
\ No newline at end of file
diff --git a/config.js b/server/config.example.js
similarity index 51%
rename from config.js
rename to server/config.example.js
index a36eaf36..733eedff 100644
--- a/config.js
+++ b/server/config.example.js
@@ -3,8 +3,6 @@
  */
 const env = process.env.NODE_ENV || 'development'
 
-
-console.log(__dirname + '/db.sqlite')
 /**
  * Database configuration
  * `development` configuration is enabled running `yarn dev`
@@ -15,44 +13,47 @@ const DB_CONF = {
   development: {
     storage: __dirname + '/db.sqlite',
     dialect: 'sqlite',
-    logging: false
   },
   production: {
-    storage: __dirname + '/db.sqlite',
-    dialect: 'sqlite',
-    logging: false    
-    // username: 'docker',
-    // password: 'docker',
-    // database: 'gancio',
-    // host: 'db',
-    // dialect: 'postgres',
-    // logging: false
-  }
+    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 GANCIO_CONF = {
+const SHARED_CONF = {
   locale: 'it',
   title: 'GANCIO',
   description: 'A calendar for radical communities',
-  baseurl: '',
-  db: DB_CONF[env],
 
-  admin_email: process.env.ADMIN_EMAIL,
-
-  smtp: {
-    host: process.env.SMTP_HOST,
-    secure: true,
-    auth: {
-      user: process.env.SMTP_USER,
-      pass: process.env.SMTP_PASS
-    }
-  },
-
-  secret: 'notsosecret'
+  baseurl: env === 'development' ? 'http://localhost:3000': 'https://gancio.example.com',
+  env
 }
 
-module.exports = GANCIO_CONF
\ No newline at end of file
+module.exports = { SHARED_CONF, SECRET_CONF }
\ No newline at end of file
diff --git a/server/firstrun.js b/server/firstrun.js
new file mode 100644
index 00000000..e6fe7f56
--- /dev/null
+++ b/server/firstrun.js
@@ -0,0 +1,41 @@
+// check config.js existance
+const fs = require('fs')
+const path = require('path')
+
+const config_path = path.join(__dirname, 'config.js')
+
+if (!fs.existsSync(config_path)) {
+  console.error(`Configuration file not found at '${config_path}. Please copy 'config.example.js' and modify it.`)
+  process.exit(1)
+}
+
+const { SECRET_CONF, SHARED_CONF } = require(config_path)
+if (!SECRET_CONF.secret) {
+  console.error(`Please specify a random 'secret' in '${config_path}'!`)
+  process.exit(1);
+}
+
+const Sequelize = require('sequelize')
+let db
+try {
+  db = new Sequelize(SECRET_CONF.db)
+} catch(e) {
+  console.error(`DB Error: check '${SHARED_CONF.env}' configuration.\n (sequelize error -> ${e})`)
+  process.exit(1)
+}
+
+
+// return db existence
+module.exports = db.authenticate()
+.then ( () => {
+  require('./api/models')
+  if (SHARED_CONF.env === 'development') {
+    console.error('DB Force sync')
+    return db.sync({force: true})
+  }
+})
+.catch(e => {
+  console.error(e)
+  console.error(`DB Error: check '${SHARED_CONF.env}' configuration\n (sequelize error -> ${e})`)
+  process.exit(1)
+})
diff --git a/server/index.js b/server/index.js
index 4ffd53f5..29018e2b 100644
--- a/server/index.js
+++ b/server/index.js
@@ -1,23 +1,12 @@
+const firstRun = require('./firstrun')
 const express = require('express')
 const consola = require('consola')
 const morgan = require('morgan')
-const bodyParser = require('body-parser')
-const cookieParser = require('cookie-parser')
 const path = require('path')
-const { Nuxt, Builder } = require('nuxt')
 const app = express()
-const cors = require('cors')
-const notifier = require('./notifier')
-
-const corsConfig = {
-  allowedHeaders: ['Authorization'],
-  exposeHeaders: ['Authorization']
-}
-
-
+const { Nuxt, Builder } = require('nuxt')
 // Import and Set Nuxt.js options
 const config = require('../nuxt.config.js')
-config.dev = !(process.env.NODE_ENV === 'production')
 
 async function start() {
   // Init Nuxt.js
@@ -34,12 +23,8 @@ async function start() {
   }
 
   // Give nuxt middleware to express
-  app.use(cors(corsConfig))
   app.use(morgan('dev'))
   app.use('/media/', express.static(path.join(__dirname, '..', 'uploads')))
-  app.use(cookieParser())
-  app.use(bodyParser.urlencoded({ extended: false }))
-  app.use(bodyParser.json())
   app.use(nuxt.render)
 
   // Listen the server
@@ -49,5 +34,5 @@ async function start() {
     badge: true
   })
 }
-start()
-notifier.startLoop(20)
+
+firstRun.then(start)
\ No newline at end of file
diff --git a/server/migrations/20190605135434-create-comment.js b/server/migrations/20190605135434-create-comment.js
new file mode 100644
index 00000000..e477eaa7
--- /dev/null
+++ b/server/migrations/20190605135434-create-comment.js
@@ -0,0 +1,38 @@
+'use strict';
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    return queryInterface.createTable('comments', {
+      id: {
+        allowNull: false,
+        autoIncrement: true,
+        primaryKey: true,
+        type: Sequelize.INTEGER
+      },
+      eventId: {
+        type: Sequelize.INTEGER,
+        references: {
+          model: 'event',
+          key: 'id'
+        }
+      },
+      activitypub_id: {
+        type: Sequelize.BIGINT,
+        index: true,
+      },
+      data: {
+        type: Sequelize.JSON
+      },
+      createdAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      },
+      updatedAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      }
+    });
+  },
+  down: (queryInterface, Sequelize) => {
+    return queryInterface.dropTable('comments');
+  }
+};
\ No newline at end of file
diff --git a/server/migrations/20190605141112-create-user.js b/server/migrations/20190605141112-create-user.js
new file mode 100644
index 00000000..35e3cbdf
--- /dev/null
+++ b/server/migrations/20190605141112-create-user.js
@@ -0,0 +1,45 @@
+'use strict';
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    return queryInterface.createTable('users', {
+      id: {
+        allowNull: false,
+        autoIncrement: true,
+        primaryKey: true,
+        type: Sequelize.INTEGER
+      },
+      email: {
+        type: Sequelize.STRING,
+        unique: { msg: 'err.register_error' },
+        index: true,
+        allowNull: false
+      },
+      description: {
+        type: Sequelize.TEXT
+      },
+      password: {
+        type: Sequelize.STRING
+      },
+      recover_code: {
+        type: Sequelize.STRING
+      },
+      is_admin: {
+        type: Sequelize.BOOLEAN
+      },
+      is_active: {
+        type: Sequelize.BOOLEAN
+      },
+      createdAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      },
+      updatedAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      }
+    });
+  },
+  down: (queryInterface, Sequelize) => {
+    return queryInterface.dropTable('users');
+  }
+};
\ No newline at end of file
diff --git a/server/migrations/20190605141850-create-event.js b/server/migrations/20190605141850-create-event.js
new file mode 100644
index 00000000..a4c341ff
--- /dev/null
+++ b/server/migrations/20190605141850-create-event.js
@@ -0,0 +1,66 @@
+'use strict';
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    return queryInterface.createTable('events', {
+      id: {
+        allowNull: false,
+        autoIncrement: true,
+        primaryKey: true,
+        type: Sequelize.INTEGER
+      },
+      title: {
+        type: Sequelize.STRING
+      },
+      slug: {
+        type: Sequelize.STRING,
+        index: true,
+      },
+      description: {
+        type: Sequelize.TEXT
+      },
+      multidate: {
+        type: Sequelize.BOOLEAN
+      },
+      start_datetime: {
+        type: Sequelize.DATE
+      },
+      end_datetime: {
+        type: Sequelize.DATE
+      },
+      image_path: {
+        type: Sequelize.STRING
+      },
+      is_visible: {
+        type: Sequelize.BOOLEAN
+      },
+      activitypub_id: {
+        type: Sequelize.BIGINT
+      },
+      userId: {
+        type: Sequelize.INTEGER,
+        references: {
+          model: 'users',
+          key: 'id'
+        }
+      },
+      placeId: {
+        type: Sequelize.INTEGER,
+        references: {
+          model: 'places',
+          key: 'id'
+        }
+      },
+      createdAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      },
+      updatedAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      }
+    });
+  },
+  down: (queryInterface, Sequelize) => {
+    return queryInterface.dropTable('events');
+  }
+};
\ No newline at end of file
diff --git a/server/migrations/20190605142103-create-place.js b/server/migrations/20190605142103-create-place.js
new file mode 100644
index 00000000..ee73e440
--- /dev/null
+++ b/server/migrations/20190605142103-create-place.js
@@ -0,0 +1,33 @@
+'use strict';
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    return queryInterface.createTable('places', {
+      id: {
+        allowNull: false,
+        autoIncrement: true,
+        primaryKey: true,
+        type: Sequelize.INTEGER
+      },
+      name: {
+        type: Sequelize.STRING
+      },
+      address: {
+        type: Sequelize.STRING
+      },
+      weigth: {
+        type: Sequelize.INTEGER
+      },
+      createdAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      },
+      updatedAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      }
+    });
+  },
+  down: (queryInterface, Sequelize) => {
+    return queryInterface.dropTable('places');
+  }
+};
\ No newline at end of file
diff --git a/server/migrations/20190605142152-create-notification.js b/server/migrations/20190605142152-create-notification.js
new file mode 100644
index 00000000..9b86a8ba
--- /dev/null
+++ b/server/migrations/20190605142152-create-notification.js
@@ -0,0 +1,37 @@
+'use strict';
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    return queryInterface.createTable('notifications', {
+      id: {
+        allowNull: false,
+        autoIncrement: true,
+        primaryKey: true,
+        type: Sequelize.INTEGER
+      },
+      filters: {
+        type: Sequelize.JSON
+      },
+      email: {
+        type: Sequelize.STRING
+      },
+      remove_code: {
+        type: Sequelize.STRING
+      },
+      type: {
+        type: Sequelize.ENUM,
+        values: ['mail', 'admin_email', 'mastodon']        
+      },
+      createdAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      },
+      updatedAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      }
+    });
+  },
+  down: (queryInterface, Sequelize) => {
+    return queryInterface.dropTable('notifications');
+  }
+};
\ No newline at end of file
diff --git a/server/migrations/20190605142317-create-tag.js b/server/migrations/20190605142317-create-tag.js
new file mode 100644
index 00000000..82271aaf
--- /dev/null
+++ b/server/migrations/20190605142317-create-tag.js
@@ -0,0 +1,29 @@
+'use strict';
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    return queryInterface.createTable('tags', {
+      tag: {
+        type: Sequelize.STRING,
+        allowNull: false,
+        primaryKey: true
+      },
+      weigth: {
+        type: Sequelize.INTEGER
+      },
+      color: {
+        type: Sequelize.STRING
+      },
+      createdAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      },
+      updatedAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      }
+    });
+  },
+  down: (queryInterface, Sequelize) => {
+    return queryInterface.dropTable('tags');
+  }
+};
\ No newline at end of file
diff --git a/server/migrations/20190605142409-create-event-notification.js b/server/migrations/20190605142409-create-event-notification.js
new file mode 100644
index 00000000..c855cc95
--- /dev/null
+++ b/server/migrations/20190605142409-create-event-notification.js
@@ -0,0 +1,38 @@
+'use strict';
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    return queryInterface.createTable('event_notification', {
+      eventId: {
+        type: Sequelize.INTEGER,
+        references: {
+          model: 'events',
+          key: 'id'
+        }
+      },
+      notificationId: {
+        type: Sequelize.INTEGER,
+        references: {
+          model: 'notifications',
+          key: 'id'
+        }
+      },
+      status: {
+        type: Sequelize.ENUM,
+        values: ['new', 'sent', 'error'],
+        defaultValue: 'new',
+        index: true
+      },
+      createdAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      },
+      updatedAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      }
+    });
+  },
+  down: (queryInterface, Sequelize) => {
+    return queryInterface.dropTable('event_notification');
+  }
+};
\ No newline at end of file
diff --git a/server/migrations/20190605142619-create-setting.js b/server/migrations/20190605142619-create-setting.js
new file mode 100644
index 00000000..b8940f9c
--- /dev/null
+++ b/server/migrations/20190605142619-create-setting.js
@@ -0,0 +1,27 @@
+'use strict';
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    return queryInterface.createTable('settings', {
+      key: {
+        type: Sequelize.STRING,
+        primaryKey: true,
+        allowNull: false,
+        index: true,
+      },
+      value: {
+        type: Sequelize.JSON
+      },
+      createdAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      },
+      updatedAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      }
+    });
+  },
+  down: (queryInterface, Sequelize) => {
+    return queryInterface.dropTable('settings');
+  }
+};
\ No newline at end of file
diff --git a/server/migrations/20190605160024-create-event-tag.js b/server/migrations/20190605160024-create-event-tag.js
new file mode 100644
index 00000000..0e856610
--- /dev/null
+++ b/server/migrations/20190605160024-create-event-tag.js
@@ -0,0 +1,32 @@
+'use strict';
+module.exports = {
+  up: (queryInterface, Sequelize) => {
+    return queryInterface.createTable('event_tags', {
+      eventId: {
+        type: Sequelize.INTEGER,
+        references: {
+          model: 'events',
+          key: 'id'
+        }
+      },
+      tagTag: {
+        type: Sequelize.STRING,
+        references: {
+          model: 'tags',
+          key: 'tag'
+        }
+      },
+      createdAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      },
+      updatedAt: {
+        allowNull: false,
+        type: Sequelize.DATE
+      }
+    });
+  },
+  down: (queryInterface, Sequelize) => {
+    return queryInterface.dropTable('event_tags');
+  }
+};
\ No newline at end of file
diff --git a/server/notifier.js b/server/notifier.js
index a92eff40..ebaebd8e 100644
--- a/server/notifier.js
+++ b/server/notifier.js
@@ -1,10 +1,10 @@
 // const mail = require('./mail')
 const bot = require('./api/controller/bot')
 const settingsController = require('./api/controller/settings')
-// const config = require('./api/config.js')
+const config = require('./config.js')
 
 const { Event, Notification, EventNotification,
-  User, Place, Tag } = require('./api/model')
+  User, Place, Tag } = require('./api/models')
 let settings
 
 async function sendNotification (notification, event, eventNotification) {
diff --git a/store/index.js b/store/index.js
index 8077d43b..40d42868 100644
--- a/store/index.js
+++ b/store/index.js
@@ -2,29 +2,26 @@ import moment from 'dayjs'
 import intersection from 'lodash/intersection'
 import map from 'lodash/map'
 
-
 export const state = () => ({
+  config: {},
   events: [],
-  user: {},
-  locale: 'it',
-  logged: false,
-  token: '',
   tags: [],
   places: [],
+  settings: {},
   filters: {
     tags: [],
-    places: []
+    places: [],
+    show_past_events: false,
+    show_recurrent_events: false,
+    show_pinned_event: false
   },
-  show_past_events: false,
 })
 
 export const getters = {
-  token: state => state.token,
 
   // filter current + future events only
   // plus, filter matches search tag/place
   filteredEvents: (state) => {
-
     let events = state.events
 
     // TOFIX: use lodash
@@ -95,6 +92,12 @@ export const mutations = {
   },
   showPastEvents (state, show) {
     state.show_past_events = show
+  },
+  setSettings (state, settings) {
+    state.settings = settings
+  },
+  setConfig (state, config) {
+    state.config = config
   }
 }
 
@@ -130,5 +133,11 @@ export const actions = {
   },
   showPastEvents({ commit }, show) {
     commit('showPastEvents', show)
+  },
+  setSettings({ commit }, settings) {
+    commit('setSettings', settings)
+  },
+  setConfig({ commit }, config) {
+    commit('setConfig', config)
   }
 }