From afa6ad2a6b3fbb650e3ef9fc7ab48e80b4c93d03 Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Tue, 2 Apr 2019 23:23:45 +0200
Subject: [PATCH 01/14] init

---
 README.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 00000000..0ffa0472
--- /dev/null
+++ b/README.md
@@ -0,0 +1,22 @@
+# gancio
+
+> My well-made Nuxt.js project
+
+## Build Setup
+
+``` bash
+# install dependencies
+$ yarn install
+
+# serve with hot reload at localhost:3000
+$ yarn run dev
+
+# build for production and launch server
+$ yarn run build
+$ yarn start
+
+# generate static project
+$ yarn run generate
+```
+
+For detailed explanation on how things work, checkout [Nuxt.js docs](https://nuxtjs.org).

From 88b43f9bb117376a9b475ba5375efe4199d177a4 Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Wed, 3 Apr 2019 00:25:12 +0200
Subject: [PATCH 02/14] start with nuxt

---
 .editorconfig                     |  13 ++
 .gitignore                        |  84 +++++++++
 .prettierrc                       |   4 +
 assets/README.md                  |   7 +
 components/Calendar.vue           |  94 ++++++++++
 components/Event.vue              |  64 +++++++
 components/Home.vue               | 100 +++++++++++
 components/Logo.vue               |  79 +++++++++
 components/Nav.vue                |  50 ++++++
 components/README.md              |   7 +
 components/Search.vue             |  39 ++++
 db.sqlite                         | Bin 0 -> 69632 bytes
 layouts/README.md                 |   7 +
 layouts/default.vue               |  85 +++++++++
 middleware/README.md              |   8 +
 nuxt.config.js                    |  80 +++++++++
 package.json                      |  58 ++++++
 pages/Login.vue                   |  65 +++++++
 pages/README.md                   |   6 +
 pages/Register.vue                |  60 +++++++
 pages/event/_id.vue               | 121 +++++++++++++
 pages/index.vue                   |   2 +
 pages/new_event.vue               | 215 +++++++++++++++++++++++
 plugins/README.md                 |   7 +
 plugins/api.js                    |  82 +++++++++
 plugins/bootstrap-vue.js          |   6 +
 plugins/element-ui.js             |  26 +++
 plugins/filters.js                |   8 +
 plugins/i18n.js                   |  25 +++
 plugins/magic-grid.js             |   6 +
 plugins/v-calendar.js             |   9 +
 plugins/vue-awesome.js            |  24 +++
 server/api/auth.js                |  48 +++++
 server/api/config.js              |  27 +++
 server/api/config/config.json     |  14 ++
 server/api/controller/bot.js      |  82 +++++++++
 server/api/controller/event.js    | 169 ++++++++++++++++++
 server/api/controller/export.js   |  64 +++++++
 server/api/controller/settings.js |  27 +++
 server/api/controller/user.js     | 283 ++++++++++++++++++++++++++++++
 server/api/db.js                  |   5 +
 server/api/index.js               |  86 +++++++++
 server/api/mail.js                |  44 +++++
 server/api/model.js               |  14 ++
 server/api/models/event.js        |  72 ++++++++
 server/api/models/index.js        |  37 ++++
 server/api/models/settings.js     |   9 +
 server/api/models/user.js         |  34 ++++
 server/api/storage.js             |  62 +++++++
 server/index.js                   |  36 ++++
 static/README.md                  |  11 ++
 static/favicon.ico                | Bin 0 -> 1150 bytes
 store/README.md                   |  10 ++
 store/index.js                    | 167 ++++++++++++++++++
 54 files changed, 2742 insertions(+)
 create mode 100644 .editorconfig
 create mode 100644 .gitignore
 create mode 100644 .prettierrc
 create mode 100644 assets/README.md
 create mode 100644 components/Calendar.vue
 create mode 100644 components/Event.vue
 create mode 100644 components/Home.vue
 create mode 100644 components/Logo.vue
 create mode 100644 components/Nav.vue
 create mode 100644 components/README.md
 create mode 100644 components/Search.vue
 create mode 100644 db.sqlite
 create mode 100644 layouts/README.md
 create mode 100644 layouts/default.vue
 create mode 100644 middleware/README.md
 create mode 100644 nuxt.config.js
 create mode 100644 package.json
 create mode 100644 pages/Login.vue
 create mode 100644 pages/README.md
 create mode 100644 pages/Register.vue
 create mode 100644 pages/event/_id.vue
 create mode 100644 pages/index.vue
 create mode 100644 pages/new_event.vue
 create mode 100644 plugins/README.md
 create mode 100644 plugins/api.js
 create mode 100644 plugins/bootstrap-vue.js
 create mode 100644 plugins/element-ui.js
 create mode 100644 plugins/filters.js
 create mode 100644 plugins/i18n.js
 create mode 100644 plugins/magic-grid.js
 create mode 100644 plugins/v-calendar.js
 create mode 100644 plugins/vue-awesome.js
 create mode 100644 server/api/auth.js
 create mode 100644 server/api/config.js
 create mode 100644 server/api/config/config.json
 create mode 100644 server/api/controller/bot.js
 create mode 100644 server/api/controller/event.js
 create mode 100644 server/api/controller/export.js
 create mode 100644 server/api/controller/settings.js
 create mode 100644 server/api/controller/user.js
 create mode 100644 server/api/db.js
 create mode 100644 server/api/index.js
 create mode 100644 server/api/mail.js
 create mode 100644 server/api/model.js
 create mode 100644 server/api/models/event.js
 create mode 100644 server/api/models/index.js
 create mode 100644 server/api/models/settings.js
 create mode 100644 server/api/models/user.js
 create mode 100644 server/api/storage.js
 create mode 100644 server/index.js
 create mode 100644 static/README.md
 create mode 100644 static/favicon.ico
 create mode 100644 store/README.md
 create mode 100644 store/index.js

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..5d126348
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,13 @@
+# editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..f935a370
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,84 @@
+# Created by .ignore support plugin (hsz.mobi)
+### Node template
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# TypeScript v1 declaration files
+typings/
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+
+# next.js build output
+.next
+
+# nuxt.js build output
+.nuxt
+
+# Nuxt generate
+dist
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless
+
+# IDE
+.idea
+
+# Service worker
+sw.*
diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 00000000..b2095be8
--- /dev/null
+++ b/.prettierrc
@@ -0,0 +1,4 @@
+{
+  "semi": false,
+  "singleQuote": true
+}
diff --git a/assets/README.md b/assets/README.md
new file mode 100644
index 00000000..34766f93
--- /dev/null
+++ b/assets/README.md
@@ -0,0 +1,7 @@
+# ASSETS
+
+**This directory is not required, you can delete it if you don't want to use it.**
+
+This directory contains your un-compiled assets such as LESS, SASS, or JavaScript.
+
+More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/assets#webpacked).
diff --git a/components/Calendar.vue b/components/Calendar.vue
new file mode 100644
index 00000000..3dfcfb31
--- /dev/null
+++ b/components/Calendar.vue
@@ -0,0 +1,94 @@
+<template lang="pug">
+    v-calendar#calendar.card(
+      show-caps
+      :popover-expanded='true'
+      :attributes='attributes'
+      :from-page.sync='page'
+      is-expanded is-inline)
+      div(slot='popover', slot-scope='{ customData }')
+        router-link(:to="`/event/${customData.id}`") {{customData.start_datetime|hour}} - {{customData.title}} @{{customData.place.name}}
+</template>
+<script>
+import { mapState, mapActions } from 'vuex'
+// import filters from '@/filters'
+import moment from 'dayjs'
+import { intersection } from 'lodash'
+
+export default {
+  name: 'Calendar',
+  // filters,
+  data () {
+    const month = moment().month()+1
+    const year = moment().year()
+    return {
+      page: { month, year},
+    }
+  },
+  
+  // async mounted () {
+    // await this.updateEvents(this.page)
+  // },
+  watch: {
+    page () {
+      this.updateEvents(this.page)
+    }
+  },
+  methods: {
+    ...mapActions(['updateEvents']),
+    eventToAttribute(event) {
+      let e = {
+        key: event.id,
+        customData: event,
+        order: event.start_datetime,
+        popover: {
+          slot: 'popover',
+          visibility: 'hover'
+        }
+      }
+      
+      let color = event.tags && event.tags.length && event.tags[0].color ? event.tags[0].color : 'rgba(170,170,250,0.7)'
+      if (event.past) color = 'rgba(200,200,200,0.5)'
+      if (event.multidate) {
+        e.dates = {
+          start: event.start_datetime, end: event.end_datetime
+        }
+        e.highlight = { backgroundColor: color,
+          borderColor: 'transparent',
+          borderWidth: '4px' }
+      } else {
+        e.dates = event.start_datetime
+        e.dot = { backgroundColor: color, borderColor: color, borderWidth: '3px' }
+      }
+      return e
+    }
+  },
+  computed: {
+    filteredEvents () {
+      return this.$store.getters.filteredEvents
+    },
+    ...mapState(['events', 'filters', 'user', 'logged']),
+    attributes () {
+      return [
+        { key: 'todaly', dates: new Date(),
+          highlight: {
+            backgroundColor: '#aaffaa'
+          },
+          popover: {label: this.$t('Today')}
+        }, 
+        ...this.filteredEvents.map(this.eventToAttribute)
+      ]
+    }
+  }
+}
+</script>
+
+<style>
+#calendar {
+  margin-bottom: 0em;
+  margin-top: 0.3em;
+}
+
+#calendar a { 
+  color: blue;
+}
+</style>
diff --git a/components/Event.vue b/components/Event.vue
new file mode 100644
index 00000000..db25a65b
--- /dev/null
+++ b/components/Event.vue
@@ -0,0 +1,64 @@
+<template lang="pug">
+  b-card(bg-variant='dark' text-variant='white' :class="{ withImg: event.image_path ? true : false }"
+    @click='$router.push("/event/" + event.id)'
+     :img-src='imgPath')
+      strong {{event.title}}
+      div <v-icon name='clock'/> {{event.start_datetime|datetime}}
+      //- span <v-icon name='map-marker-alt'/> {{event.place.name}}
+      br
+      el-tag.mr-1(:color='tag.color || "grey"' v-for='tag in event.tags' :key='tag.tag'
+        size='small' @click.stop='addSearchTag(tag)') {{tag.tag}}
+</template>
+<script>
+import { mapState, mapActions } from 'vuex'
+// import api from '@/server/api'
+// import filters from '@/filters'
+
+export default {
+  props: ['event'],
+  computed: {
+    ...mapState(['user']),
+    imgPath() {
+      return this.event.image_path && '/uploads/thumb/' + this.event.image_path
+    },
+    mine() {
+      return this.event.userId === this.user.id
+    }
+  },
+  // filters: {
+  //   datetime: this.datetime
+  // },
+  methods: {
+    ...mapActions(['delEvent', 'addSearchTag']),
+    async remove() {
+      // await api.delEvent(this.event.id)
+      // this.delEvent(this.event.id)
+    }
+  }
+}
+</script>
+<style scoped>
+/* .card::before {
+  border-top: 4px solid black;
+  content: ''
+} */
+
+.el-card {
+  border: none;
+}
+
+.el-card img {
+  width: 100%;
+}
+
+.card-columns .card {
+  margin-top: 0.2em;
+  margin-bottom: 0em;
+}
+
+.card-img {
+  height: 180px;
+
+  object-fit: cover;
+}
+</style>
diff --git a/components/Home.vue b/components/Home.vue
new file mode 100644
index 00000000..2cdda1dd
--- /dev/null
+++ b/components/Home.vue
@@ -0,0 +1,100 @@
+<template lang="pug">
+  div
+    magic-grid(:animate="false" useMin :gap=5 :maxCols=4
+      :maxColWidth='400' ref='magicgrid')
+      div.mt-1.item
+        //- Search#search
+        no-ssr
+          Calendar
+    Event.item.mt-1(v-for='event in events'
+      :key='event.id'
+      :event='event')
+</template>
+
+<script>
+import { mapState } from 'vuex'
+import axios from 'axios'
+// import filters from '@/filters.js'
+import Event from '@/components/Event'
+import Calendar from '@/components/Calendar'
+// import { intersection } from 'lodash'
+// import moment from 'dayjs'
+// import Search from '@/components/Search'
+
+export default {
+  name: 'Home',
+  // async asyncData ({req}) {
+  //   console.log('dentro asyncData')
+  //   const { data } = await axios.get('http://localhost:3000/api/event/2019/2')
+  //   return { events: data }
+  // },
+  components: { Event, Calendar }, // , Calendar, Search },
+  computed: {
+    ...mapState(['events', 'filters']),
+    filteredEvents() {
+      return this.events
+      // return this.$store.getters.filteredEvents
+        .filter(e => !e.past)
+        .sort((a, b) => a.start_datetime > b.start_datetime)
+    }
+  },
+  watch: {
+    filteredEvents() {
+      // this.$nextTick(this.$refs.magicgrid.positionItems) TOFIX
+    }
+  }
+}
+</script>
+<style>
+#search {
+  display: inline-flex;
+}
+
+.item {
+  width: 100%;
+  max-width: 400px;
+  margin-top: 4px;
+  position: absolute;
+  cursor: pointer;
+}
+
+.card-columns {
+  column-count: 1;
+  column-gap: 0.2em;
+}
+@media (min-width: 576px) {
+  .container {
+    max-width: none;
+  }
+  .card-columns {
+    column-count: 2;
+  }
+}
+
+@media (min-width: 950px) {
+  .container {
+    max-width: 1400px;
+  }
+  .card-columns {
+    column-count: 3;
+  }
+}
+
+/* .item {
+  transition: all .2s;
+  display: inline-block;
+  width: 100%;
+} */
+/* .list-enter, .list-leave-to {
+  opacity: 0;
+  transform: translateY(30px);
+}
+.list-leave-active {
+  position: absolute;
+  top: 0px;
+  width: 0px;
+  left: 0px;
+  height: 0px;
+  z-index: -10;
+} */
+</style>
diff --git a/components/Logo.vue b/components/Logo.vue
new file mode 100644
index 00000000..6c728541
--- /dev/null
+++ b/components/Logo.vue
@@ -0,0 +1,79 @@
+<template>
+  <div class="VueToNuxtLogo">
+    <div class="Triangle Triangle--two" />
+    <div class="Triangle Triangle--one" />
+    <div class="Triangle Triangle--three" />
+    <div class="Triangle Triangle--four" />
+  </div>
+</template>
+
+<style>
+.VueToNuxtLogo {
+  display: inline-block;
+  animation: turn 2s linear forwards 1s;
+  transform: rotateX(180deg);
+  position: relative;
+  overflow: hidden;
+  height: 180px;
+  width: 245px;
+}
+
+.Triangle {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 0;
+  height: 0;
+}
+
+.Triangle--one {
+  border-left: 105px solid transparent;
+  border-right: 105px solid transparent;
+  border-bottom: 180px solid #41b883;
+}
+
+.Triangle--two {
+  top: 30px;
+  left: 35px;
+  animation: goright 0.5s linear forwards 3.5s;
+  border-left: 87.5px solid transparent;
+  border-right: 87.5px solid transparent;
+  border-bottom: 150px solid #3b8070;
+}
+
+.Triangle--three {
+  top: 60px;
+  left: 35px;
+  animation: goright 0.5s linear forwards 3.5s;
+  border-left: 70px solid transparent;
+  border-right: 70px solid transparent;
+  border-bottom: 120px solid #35495e;
+}
+
+.Triangle--four {
+  top: 120px;
+  left: 70px;
+  animation: godown 0.5s linear forwards 3s;
+  border-left: 35px solid transparent;
+  border-right: 35px solid transparent;
+  border-bottom: 60px solid #fff;
+}
+
+@keyframes turn {
+  100% {
+    transform: rotateX(0deg);
+  }
+}
+
+@keyframes godown {
+  100% {
+    top: 180px;
+  }
+}
+
+@keyframes goright {
+  100% {
+    left: 70px;
+  }
+}
+</style>
diff --git a/components/Nav.vue b/components/Nav.vue
new file mode 100644
index 00000000..892755e5
--- /dev/null
+++ b/components/Nav.vue
@@ -0,0 +1,50 @@
+<template lang="pug">
+  b-navbar(type="dark" variant="dark" toggleable='md')
+    b-navbar-toggle(target='nav_collapse')
+    b-navbar-brand(to='/') <img id='logo' src='gancio_logo.svg'/>
+    b-collapse#nav_collapse(is-nav)
+      b-navbar-nav
+        b-nav-item(v-if='!logged' to='/login'  v-b-tooltip :title='$t("Login")') <v-icon color='lightgreen' name='lock' /> 
+          span.d-md-none  {{$t('User')}}
+        b-nav-item(to='/new_event' v-b-tooltip :title='$t("Add Event")' ) <v-icon color='lightgreen' name='plus'/> 
+          span.d-md-none  {{$t('Add Event')}}
+        b-nav-item(v-if='logged' to='/settings' v-b-tooltip :title='$t("Settings")') <v-icon color='orange' name='cog'/>
+          span.d-md-none  {{$t('Settings')}}
+        b-nav-item(v-if='user.is_admin' to='/admin' v-b-tooltip :title='$t("Admin")') <v-icon color='lightblue' name='tools'/>
+          span.d-md-none  {{$t('Admin')}}
+        b-nav-item(to='/export' v-b-tooltip :title='$t("Export")') <v-icon name='file-export' color='yellow'/>
+          span.d-md-none  {{$t('Export')}}
+        b-nav-item(v-if='logged' @click='logout' v-b-tooltip :title='$t("Logout")') <v-icon color='red' name='sign-out-alt'/>
+          span.d-md-none  {{$t('Logout')}}
+    b-navbar-nav.ml-auto
+        b-nav-item(to='/about')
+          span  {{$t('Info')}} <v-icon color='#ff9fc4' name='question-circle'/>
+
+</template>
+<script>
+import {mapState, mapActions} from 'vuex'
+export default {
+  name: 'Nav',
+  computed: {
+    ...mapState(['logged', 'user','filters']),
+    filters_tags: {
+      set (value) {
+        this.setSearchTags(value)
+      },
+      get () {
+        return this.filters.tags
+      }
+    },
+    filters_places: {
+      set (value) {
+        this.setSearchPlaces(value)
+      },
+      get () {
+        return this.filters.places
+      }
+    },
+  },
+  methods: mapActions(['logout']),
+}
+</script>
+
diff --git a/components/README.md b/components/README.md
new file mode 100644
index 00000000..a079f106
--- /dev/null
+++ b/components/README.md
@@ -0,0 +1,7 @@
+# COMPONENTS
+
+**This directory is not required, you can delete it if you don't want to use it.**
+
+The components directory contains your Vue.js Components.
+
+_Nuxt.js doesn't supercharge these components._
diff --git a/components/Search.vue b/components/Search.vue
new file mode 100644
index 00000000..fbc3ed2d
--- /dev/null
+++ b/components/Search.vue
@@ -0,0 +1,39 @@
+<template lang="pug">
+  div
+    el-select.mr-1(v-model='filters_places' multiple filterable collapse-tags
+      default-first-option :placeholder='$t("Where")')
+      el-option(v-for='place in places' :value='place.name'
+        :label='place.name' :key='place.id')
+    el-select(v-model='filters_tags' multiple filterable collapse-tags
+      default-first-option :placeholder='$t("Tags")')
+      el-option(v-for='tag in tags' :key='tag.tag'
+        :label='tag.tag' :value='tag.tag') 
+</template>
+
+<script>
+import {mapState, mapActions} from 'vuex'
+
+export default {
+  name :'Search',
+  methods: mapActions(['setSearchPlaces', 'setSearchTags']),
+  computed: {
+    ...mapState(['tags', 'places', 'filters']),
+    filters_tags: {
+      set (value) {
+        this.setSearchTags(value)
+      },
+      get () {
+        return this.filters.tags
+      }
+    },
+    filters_places: {
+      set (value) {
+        this.setSearchPlaces(value)
+      },
+      get () {
+        return this.filters.places
+      }
+    },    
+  }
+}
+</script>
diff --git a/db.sqlite b/db.sqlite
new file mode 100644
index 0000000000000000000000000000000000000000..2ad224f1f0719c35d78bc084c3415593d7d922cc
GIT binary patch
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

literal 0
HcmV?d00001

diff --git a/layouts/README.md b/layouts/README.md
new file mode 100644
index 00000000..cad1ad57
--- /dev/null
+++ b/layouts/README.md
@@ -0,0 +1,7 @@
+# LAYOUTS
+
+**This directory is not required, you can delete it if you don't want to use it.**
+
+This directory contains your Application Layouts.
+
+More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/views#layouts).
diff --git a/layouts/default.vue b/layouts/default.vue
new file mode 100644
index 00000000..2fafd1c0
--- /dev/null
+++ b/layouts/default.vue
@@ -0,0 +1,85 @@
+<template lang='pug'>
+  #app
+    Nav
+    Home
+    transition(name="fade" mode="out-in")
+      //- router-view(name='modal')
+      nuxt
+</template>
+
+<script>
+// import moment from 'dayjs'
+// import api from './api'
+// import { mapActions } from 'vuex';
+// import Register from './components/Register.vue'
+// import Login from './components/Login.vue'
+// import Settings from './components/Settings.vue'
+// import newEvent from './components/newEvent.vue'
+// import eventDetail from './components/EventDetail.vue'
+import Home from '~/components/Home.vue'
+import Nav from '~/components/Nav.vue'
+
+export default {
+  name: 'App',
+  // mounted () {
+  //   this.updateMeta()
+  // },
+  // methods: mapActions(['updateMeta']),
+  // components: { Nav, Register, Login, Home, Settings, newEvent, eventDetail },
+  components: { Nav, Home },
+}
+</script>
+
+<style>
+#logo {
+  max-height: 40px;
+}
+
+.navbar-brand {
+  padding: 0px;
+}
+
+#search,
+#search ul {
+  align-items: baseline;
+}
+
+html, body {
+  scrollbar-face-color: #313543;
+  scrollbar-track-color: rgba(0, 0, 0, 0.1); 
+  font-family: Lato,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,sans-serif;
+  color: #2c3e50;
+  background: black;
+}
+
+::-webkit-scrollbar {
+  width: 7px;
+  height: 7px; }
+::-webkit-scrollbar-thumb {
+  background: #313543;
+  border: 0px none #ffffff;
+  border-radius: 6px; }
+::-webkit-scrollbar-thumb:hover {
+  background: #353a49; }
+::-webkit-scrollbar-thumb:active {
+  background: #313543; }
+::-webkit-scrollbar-track {
+  border: 0px none #ffffff;
+  border-radius: 6px;
+  background: rgba(0, 0, 0, 0.1); }
+::-webkit-scrollbar-track:hover {
+  background: #282c37; }
+::-webkit-scrollbar-track:active {
+  background: #282c37; }
+::-webkit-scrollbar-corner {
+  background: transparent; }
+
+
+/* .column {
+  margin-top: 3px;
+  margin-right: 3px;
+  margin-bottom: 3px;
+  width: 350px;
+} */
+
+</style>
diff --git a/middleware/README.md b/middleware/README.md
new file mode 100644
index 00000000..01595ded
--- /dev/null
+++ b/middleware/README.md
@@ -0,0 +1,8 @@
+# MIDDLEWARE
+
+**This directory is not required, you can delete it if you don't want to use it.**
+
+This directory contains your application middleware.
+Middleware let you define custom functions that can be run before rendering either a page or a group of pages.
+
+More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/routing#middleware).
diff --git a/nuxt.config.js b/nuxt.config.js
new file mode 100644
index 00000000..952fe72d
--- /dev/null
+++ b/nuxt.config.js
@@ -0,0 +1,80 @@
+const pkg = require('./package')
+
+module.exports = {
+  mode: 'universal',
+
+  /*
+   ** Headers of the page
+   */
+  head: {
+    title: pkg.name,
+    meta: [
+      { charset: 'utf-8' },
+      { name: 'viewport', content: 'width=device-width, initial-scale=1' },
+      { hid: 'description', name: 'description', content: pkg.description }
+    ],
+    link: [{ rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }]
+  },
+
+  serverMiddleware: [{ path: '/api', handler: '@/server/api/index.js' }],
+
+  /*
+   ** Customize the progress-bar color
+   */
+  loading: { color: '#fff' },
+
+  /*
+   ** Global CSS
+   */
+  css: [
+    'element-ui/lib/theme-chalk/index.css',
+    'bootstrap/dist/css/bootstrap.css',
+    'bootstrap-vue/dist/bootstrap-vue.css',
+    'v-calendar/lib/v-calendar.min.css'
+  ],
+
+  /*
+   ** Plugins to load before mounting the App
+   */
+  plugins: ['@/plugins/element-ui', '@/plugins/filters',
+    '@/plugins/i18n', '@/plugins/bootstrap-vue',
+    '@/plugins/vue-awesome',
+    { src: '@/plugins/v-calendar', ssr: false },
+    '@/plugins/magic-grid'],
+
+  /*
+   ** Nuxt.js modules
+   */
+  modules: [
+    // Doc: https://axios.nuxtjs.org/usage
+    '@nuxtjs/axios'
+  ],
+  /*
+   ** Axios module configuration
+   */
+  axios: {
+    // See https://github.com/nuxt-community/axios-module#options
+  },
+
+  /*
+   ** Build configuration
+   */
+  build: {
+    transpile: [/^element-ui/, /^vue-awesome/, /^vue-magic-grid/],
+
+    /*
+     ** You can extend webpack config here
+     */
+    extend(config, ctx) {
+      // Run ESLint on save
+      // if (ctx.isDev && ctx.isClient) {
+      //   config.module.rules.push({
+      //     enforce: 'pre',
+      //     test: /\.(js|vue)$/,
+      //     loader: 'eslint-loader',
+      //     exclude: /(node_modules)/
+      //   })
+      // }
+    }
+  }
+}
diff --git a/package.json b/package.json
new file mode 100644
index 00000000..08665b1d
--- /dev/null
+++ b/package.json
@@ -0,0 +1,58 @@
+{
+  "name": "gancio",
+  "version": "1.0.0",
+  "description": "My well-made Nuxt.js project",
+  "author": "lesion",
+  "private": true,
+  "scripts": {
+    "dev": "cross-env NODE_ENV=development nodemon server/index.js --watch server",
+    "build": "nuxt build",
+    "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"
+  },
+  "dependencies": {
+    "@nuxtjs/axios": "^5.3.6",
+    "axios": "^0.18.0",
+    "bcrypt": "^3.0.5",
+    "bootstrap-vue": "^2.0.0-rc.16",
+    "cors": "^2.8.5",
+    "cross-env": "^5.2.0",
+    "dayjs": "^1.8.11",
+    "element-ui": "^2.4.11",
+    "email-templates": "^5.0.4",
+    "express": "^4.16.4",
+    "ics": "^2.13.2",
+    "jsonwebtoken": "^8.5.1",
+    "mastodon-api": "^1.3.0",
+    "multer": "^1.4.1",
+    "nuxt": "^2.4.0",
+    "sequelize": "^5.2.1",
+    "sharp": "^0.22.0",
+    "sqlite3": "^4.0.6",
+    "v-calendar": "^0.9.7",
+    "vue-awesome": "^3.5.1",
+    "vue-i18n": "^8.10.0",
+    "vue-magic-grid": "^0.0.4"
+  },
+  "devDependencies": {
+    "@nuxtjs/eslint-config": "^0.0.1",
+    "babel-eslint": "^10.0.1",
+    "eslint": "^5.15.1",
+    "eslint-config-prettier": "^4.1.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-nuxt": ">=0.4.2",
+    "eslint-plugin-prettier": "^3.0.1",
+    "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",
+    "pug-plain-loader": "^1.0.0"
+  }
+}
diff --git a/pages/Login.vue b/pages/Login.vue
new file mode 100644
index 00000000..6c36308a
--- /dev/null
+++ b/pages/Login.vue
@@ -0,0 +1,65 @@
+<template lang='pug'>
+  b-modal(@shown="$refs.email.focus()" :title='$t("Login")' hide-footer
+    @hidden='$router.replace("/")' :visible='true' ref='modal')
+    el-form(v-loading='loading')
+      p(v-html="$t('login_explanation')")
+      el-input.mb-2(v-model='email' type='email' :placeholder='$t("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("Password")')
+        v-icon(name="lock" slot='prepend')
+      el-button.mr-1(plain type="success" @click='submit') {{$t('Login')}}
+      router-link(to='/register')
+        el-button.mt-1(plain type="primary") {{$t('Not registered?')}}
+      a.float-right(href='#' @click='forgot') {{$t('Forgot password?')}}
+</template>
+
+<script>
+import { mapActions } from 'vuex'
+import { Message } from 'element-ui'
+import api from '@/plugins/api'
+
+export default {
+  name: 'Login',
+  data () {
+    return {
+      password: '',
+      email: '',
+      loading: false
+    }
+  },
+  methods: {
+    ...mapActions(['login']),
+    async forgot () {
+      if (!this.email) {
+        Message({ message: this.$t('Insert your email'), type: 'error' })
+        this.$refs.email.focus()
+        return
+      }
+      this.loading = true
+      await api.forgotPassword(this.email)
+      this.loading = false
+      Message({ message: this.$t('Check your email!'), type: 'success' })
+    },
+    async submit (e) {
+      e.preventDefault()
+      try {
+        this.loading = true
+        const user = await api.login(this.email, this.password)
+        this.loading = false
+        if (!user) {
+          Message({ message: this.$t('Login error'), type: 'error' })
+          return;
+        }
+        this.login(user)
+        Message({ message: this.$t('Logged'), type: 'success' })
+      } catch (e) {
+        Message({ message: this.$t('Login error'), type: 'error' })
+        this.loading = false
+        return
+      }
+      this.email = this.password = ''
+      this.$refs.modal.hide()
+    }
+  }
+}
+</script>
diff --git a/pages/README.md b/pages/README.md
new file mode 100644
index 00000000..1d5d48b2
--- /dev/null
+++ b/pages/README.md
@@ -0,0 +1,6 @@
+# PAGES
+
+This directory contains your Application Views and Routes.
+The framework reads all the `*.vue` files inside this directory and creates the router of your application.
+
+More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/routing).
diff --git a/pages/Register.vue b/pages/Register.vue
new file mode 100644
index 00000000..ce0afef8
--- /dev/null
+++ b/pages/Register.vue
@@ -0,0 +1,60 @@
+<template lang='pug'>
+  b-modal(hide-footer @hidden='$router.replace("/")' ref='modal'
+    :title="$t('Register')" :visible='true' @shown='$refs.email.focus()')
+    el-form
+      p(v-html="$t('register_explanation')")
+      el-input.mb-2(ref='email' v-model='user.email' type='email'
+        :placeholder='$t("Email")' autocomplete='email')
+        span(slot='prepend') @
+      
+      el-input.mb-2(v-model='user.password' type="password" placeholder="Password")
+        v-icon(name='lock' slot='prepend')
+
+      el-input.mb-2(v-model='user.description' type="textarea" rows='3' :placeholder="$t('Description')")
+          v-icon(name='envelope-open-text')
+
+      
+      el-button.float-right(plain type="success" icon='el-icon-arrow-right' @click='register') {{$t('Send')}}
+</template>
+
+<script>
+import api from '~/plugins/api'
+import { mapActions } from 'vuex';
+import { Message } from 'element-ui'
+
+export default {
+  name: 'Register',
+  data () {
+    return {
+      error: {},
+      user: { }
+    }
+  },
+  methods: {
+    ...mapActions(['login']),
+    async register () {
+      try {
+        const user = await api.register(this.user)
+        if (!user.is_admin) {
+          this.$refs.modal.hide()
+          Message({
+            message: this.$t('registration_complete'),
+            type: 'success'
+          })
+        } else {
+          Message({
+            message: this.$t('admin_registration_complete'),
+            type: 'success'
+          })
+        }
+      } catch (e) {
+        Message({
+          message: e,
+          type: 'error'
+        })
+        console.error(e)
+      }
+    }
+  }
+}
+</script>
diff --git a/pages/event/_id.vue b/pages/event/_id.vue
new file mode 100644
index 00000000..f7e1aa6f
--- /dev/null
+++ b/pages/event/_id.vue
@@ -0,0 +1,121 @@
+<template lang="pug">
+  b-modal#eventDetail(ref='eventDetail' hide-body hide-header hide-footer @hidden='$router.replace("/")' size='lg' :visible='true')
+    b-card(no-body, :img-src='imgPath' v-loading='loading')
+      el-button.close_button(circle icon='el-icon-close' type='success'
+        @click='$refs.eventDetail.hide()')
+      b-card-header
+        h3 {{event.title}}
+        v-icon(name='clock')
+        span  {{event.start_datetime|datetime}}
+        br
+        v-icon(name='map-marker-alt')
+        //- span  {{event.place.name}} - {{event.place.address}}
+        br
+      b-card-body(v-if='event.description || event.tags')
+        pre(v-html='event.description')
+        br
+        el-tag.mr-1(:color='tag.color || "grey"' v-for='tag in event.tags'
+          size='mini' :key='tag.tag') {{tag.tag}}
+        .ml-auto(v-if='mine')
+          hr
+          el-button(v-if='event.is_visible' plain type='warning' @click.prevents='toggle' icon='el-icon-view') {{$t('Unconfirm')}}
+          el-button(v-else plain type='success' @click.prevents='toggle' icon='el-icon-view') {{$t('Confirm')}}
+          el-button(plain type='danger' @click.prevent='remove' icon='el-icon-remove') {{$t('Remove')}} 
+          el-button(plain type='primary' @click='$router.replace("/edit/"+event.id)') <v-icon color='orange' name='edit'/> {{$t('Edit')}}
+
+    //- COMMENTS ... 
+    //- b-navbar(type="dark" variant="dark" toggleable='lg')
+    //- template(slot='footer')
+      //- b-navbar-nav
+        //- b-button(variant='success') {{$t('Share')}} <v-icon name='share'/>
+        //- b-nav-item( {{$t('')}})
+      //- b-card-footer.text-right
+        //- span.mr-3 {{event.comments.length}} <v-icon name='comments'/>
+        //- a(href='#', @click='remove')
+          v-icon(color='orange' name='times')
+      //- b-card-footer(v-for='comment in event.comments')
+        strong {{comment.author}}
+        div(v-html='comment.text')
+
+</template>
+<script>
+import { mapState, mapActions } from 'vuex';
+import api from '@/plugins/api'
+//import filters from '@/filters'
+
+export default {
+  name: 'Event',
+  computed: {
+    ...mapState(['user']),
+    imgPath () {
+      return this.event.image_path && process.env.VUE_APP_API + '/uploads/' + this.event.image_path
+    },    
+    mine () {
+      return this.event.userId === this.user.id || this.user.is_admin
+    }
+  },
+  data () {
+    return {
+      event: { comments: [], place: {}, title: ''},
+      id: null,
+      loading: true,
+    }
+  },
+  mounted () {
+    this.id = this.$route.params.id
+    this.load()
+  },
+  methods: {
+    ...mapActions(['delEvent']),
+    async load () {
+      const event = await api.getEvent(this.id)
+      this.event = event
+      this.loading = false
+    },
+    async remove () {
+      await api.delEvent(this.event.id)
+      this.delEvent(this.event.id)
+      this.$refs.eventDetail.hide()
+    },
+    async toggle () {
+      try {
+        if (this.event.is_visible) {
+
+          await api.unconfirmEvent(this.id)
+          this.event.is_visible = false
+        } else {
+          await api.confirmEvent(this.id)
+          this.event.is_visible = true
+        }
+      } catch (e) {
+
+      }
+    }
+  }
+}
+</script>
+<style>
+#eventDetail .modal-body {
+  padding: 0px;
+  width: 100%;
+}
+
+#eventDetail .close_button:hover {
+  background-color: rgba(200, 100, 100, 0.4);
+}
+
+#eventDetail .card {
+  border: 0px;
+}
+
+#eventDetail .close_button {
+  background-color: rgba(100, 100, 100, 0.4);
+  color: red;
+  font-size: 20px;
+  border: none;
+  position: absolute;
+  top: 10px;
+  right: 10px;
+}
+</style>
+
diff --git a/pages/index.vue b/pages/index.vue
new file mode 100644
index 00000000..28d95324
--- /dev/null
+++ b/pages/index.vue
@@ -0,0 +1,2 @@
+<template lang="pug">
+</template>
diff --git a/pages/new_event.vue b/pages/new_event.vue
new file mode 100644
index 00000000..d5be35cb
--- /dev/null
+++ b/pages/new_event.vue
@@ -0,0 +1,215 @@
+<template lang="pug">
+  b-modal(ref='modal' @hidden='$router.replace("/")' size='lg' :visible='true'
+    :title="edit?$t('Edit event'):$t('New event')" hide-footer)
+    el-form
+      el-tabs.mb-2(v-model='activeTab' v-loading='sending')
+
+        //- NOT LOGGED EVENT
+        el-tab-pane(v-if='!logged')
+          span(slot='label') {{$t('anon_newevent')}} <v-icon name='user-secret'/>
+          p(v-html="$t('anon_newevent_explanation')")
+          el-button.float-right(@click='next' :disabled='!couldProceed') {{$t('Next')}}
+
+        //- WHERE
+        el-tab-pane
+          span(slot='label') {{$t('Where')}} <v-icon name='map-marker-alt'/>
+          div {{$t('where_explanation')}}
+          el-select.mb-3(v-model='event.place.name' @change='placeChoosed' filterable allow-create default-first-option)
+            el-option(v-for='place in places_name' :label='place' :value='place' :key='place.id')
+          div {{$t("Address")}}
+          el-input.mb-3(ref='address' v-model='event.place.address' @keydown.native.enter='next')
+          el-button.float-right(@click='next' :disabled='!couldProceed') {{$t('Next')}}
+
+        //- WHEN
+        el-tab-pane
+          span(slot='label') {{$t('When')}} <v-icon name='clock'/>
+          span {{event.multidate ? $t('dates_explanation') : $t('date_explanation')}}
+            el-switch.float-right(v-model='event.multidate' :active-text="$t('multidate_explanation')")
+          v-date-picker.mb-3(:mode='event.multidate ? "range" : "single"' v-model='date' is-inline
+            is-expanded :min-date='new Date()' @input='date ? $refs.time_start.focus() : false')
+          div {{$t('time_start_explanation')}}
+          el-time-select.mb-3(ref='time_start'
+            v-model="time.start"
+            :picker-options="{ start: '00:00', step: '00:30', end: '24:00'}")
+          div {{$t('time_end_explanation')}}
+          el-time-select(v-model='time.end'
+            :picker-options="{start: '00:00', step: '00:30', end: '24:00'}")
+          el-button.float-right(@click='next' :disabled='!couldProceed') {{$t('Next')}}
+
+        //- WHAT
+        el-tab-pane
+          span(slot='label') {{$t('What')}} <v-icon name='file-alt'/>
+          span {{$t('what_explanation')}}
+          el-input.mb-3(v-model='event.title' ref='title')
+          span {{$t('description_explanation')}}
+          el-input.mb-3(v-model='event.description' type='textarea' :rows='9')
+          span {{$t('tag_explanation')}}
+          br 
+          el-select(v-model='event.tags' multiple filterable allow-create
+            default-first-option placeholder='Tag')
+            el-option(v-for='tag in tags' :key='tag.tag'
+              :label='tag' :value='tag') 
+
+          el-button.float-right(@click.native='next' :disabled='!couldProceed') {{$t('Next')}}
+
+        el-tab-pane
+          span(slot='label') {{$t('Media')}} <v-icon name='image'/>
+          span {{$t('media_explanation')}}
+          b-form-file.mb-2(v-model='event.image', :placeholder='$t("Poster")' accept='image/*')
+          el-button.float-right(@click='done') {{edit?$t('Edit'):$t('Send')}}
+
+
+
+</template>
+<script>
+import api from '@/plugins/api'
+import { mapActions, mapState } from 'vuex'
+import moment from 'dayjs'
+import Calendar from '@/components/Calendar'
+import { Message } from 'element-ui'
+export default {
+  components: { Calendar },
+  data() {
+    return {
+      event: { 
+        place: { name: '', address: '' },
+        title: '', description: '', tags: [],
+        multidate: false,
+      },
+      visible: true,
+      id: null,
+      activeTab: "0",
+      date: null,
+      time: { start: '20:00', end: null },
+      edit: false,
+      sending: false,
+    }
+  },
+  name: 'newEvent',
+  watch: {
+    'time.start' (value) {
+      let [h, m] = value.split(':')
+      this.time.end = (Number(h)+1) + ':' + m
+    }
+  },
+  async mounted () {
+    if (this.$route.params.id) {
+      this.id = this.$route.params.id
+      this.edit = true
+      const event = await api.getEvent(this.id)
+      // this.event.place = {name: event.place.name, address: event.place.address }
+      this.event.place.name = event.place.name
+      this.event.place.address = event.place.address || ''
+      this.event.multidate = event.multidate
+      this.date = event.start_datetime
+      this.time.start = moment(event.start_datetime).format('HH:mm')
+      this.time.end = moment(event.end_datetime).format('HH:mm')
+      this.event.title = event.title
+      this.event.description = event.description.replace(/(<([^>]+)>)/ig, '')
+      this.event.id = event.id
+      if (event.tags) {
+        this.event.tags = event.tags.map(t => t.tag)
+      }
+
+    }
+    this.updateMeta()
+  },
+  computed: {
+    ...mapState({
+      tags: state => state.tags.map(t => t.tag ),
+      places_name: state => state.places.map(p => p.name ),
+      places: state => state.places,
+      user: state => state.user,
+      logged: state => state.logged
+    }),
+    couldProceed () {
+      const t = this.logged ? -1 : 0
+      switch(Number(this.activeTab)) {
+        case 0+t:
+          return true
+        case 1+t:
+          return this.event.place.name.length>0 && 
+            this.event.place.address.length>0
+        case 2+t:
+          if (this.date && this.time.start) return true
+          break
+        case 3+t:
+          return this.event.title.length>0
+          break
+        case 4+t:
+          return true
+          break
+      }
+    }
+  },
+  methods: {
+    ...mapActions(['addEvent', 'updateEvent', 'updateMeta']),
+    next () {
+      this.activeTab = String(Number(this.activeTab)+1)
+      if (this.activeTab === "2") {
+        this.$refs.title.focus()
+      }
+    },
+    prev () {
+      this.activeTab = String(Number(this.activeTab-1))
+    },
+    placeChoosed () {
+      const place = this.places.find( p => p.name === this.event.place.name )
+      if (place && place.address) {
+        this.event.place.address = place.address
+      }
+      this.$refs.address.focus()
+    },
+    async done () {
+      let start_datetime, end_datetime
+      const [ start_hour, start_minute ] = this.time.start.split(':')
+      if (!this.time.end) {
+        this.time.end = this.time.start
+      }
+      const [ end_hour, end_minute ] = this.time.end.split(':')
+      if (this.event.multidate) {
+        start_datetime = moment(this.date.start)
+          .set('hour', start_hour).set('minute', start_minute)
+        end_datetime = moment(this.date.end)
+          .set('hour', end_hour).set('minute', end_minute)
+      } else {
+        console.log(this.date)
+        start_datetime = moment(this.date).set('hour', start_hour).set('minute', start_minute)
+        end_datetime = moment(this.date).set('hour', end_hour).set('minute', end_minute)
+      }
+      const formData = new FormData()
+
+      if (this.event.image) {
+        formData.append('image', this.event.image, this.event.image.name)
+      }
+      formData.append('title', this.event.title)
+      formData.append('place_name', this.event.place.name)
+      formData.append('place_address', this.event.place.address)
+      formData.append('description', this.event.description)
+      formData.append('multidate', this.event.multidate)
+      formData.append('start_datetime', start_datetime)
+      formData.append('end_datetime', end_datetime)
+      if (this.edit) {
+        formData.append('id', this.event.id)
+      }
+      if (this.event.tags)
+        this.event.tags.forEach(tag => formData.append('tags[]', tag))
+      this.sending = true
+      try {
+        if (this.edit) {
+          await this.updateEvent(formData)
+        } else {
+          await this.addEvent(formData)
+        }
+        this.updateMeta()
+        this.sending = false
+        this.$refs.modal.hide()
+        Message({ type: 'success', message: this.logged ? this.$t('new_event_added') : this.$t('new_anon_event_added')})
+      } catch (e) {
+        this.sending = false
+        console.error(e)
+      }
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/plugins/README.md b/plugins/README.md
new file mode 100644
index 00000000..ca1f9d8a
--- /dev/null
+++ b/plugins/README.md
@@ -0,0 +1,7 @@
+# PLUGINS
+
+**This directory is not required, you can delete it if you don't want to use it.**
+
+This directory contains Javascript plugins that you want to run before mounting the root Vue.js application.
+
+More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/plugins).
diff --git a/plugins/api.js b/plugins/api.js
new file mode 100644
index 00000000..72a7dc82
--- /dev/null
+++ b/plugins/api.js
@@ -0,0 +1,82 @@
+import axios from 'axios'
+import { getters } from '@/store'
+const api = axios.create({
+  baseURL: process.env.NODE_ENV === 'development' ? 'http://localhost:3000/api' : '/api',
+  withCredentials: true,
+  responseType: 'json',
+  headers: {
+    'Access-Control-Allow-Origin': '*',
+    'Access-Control-Allow-Credentials': 'true',
+    'Accept': 'application/json',
+    'Content-Type': 'application/json'
+  }
+})
+
+function get(path) {
+  return api.get(path) //, { headers: { 'Authorization': getters.token } })
+    .then(res => res.data)
+    // .catch((e) => {
+    // if (e.response.status === 403) {
+    //   // store.commit('logout') // TOFIX
+    //   return false
+    // }
+    // throw e.response && e.response.data &&
+    //   e.response.data.errors && e.response.data.errors[0].message
+    // })
+}
+
+function post(path, data) {
+  return api.post(path, data, { headers: { 'Authorization': getters.token } })
+    .then(res => res.data)
+    // .catch((e) => {
+    //   if (e.response.status === 403) {
+    //     // store.commit('logout') // TOFIX
+    //     return false
+    //   }
+    //   throw e.response && e.response.data &&
+    //     e.response.data.errors && e.response.data.errors[0].message
+    // })
+}
+function put(path, data) {
+  return api.put(path, data, { headers: { 'Authorization': getters.token } })
+    .then(ret => ret.data)
+}
+
+function del(path) {
+  return api.delete(path, { headers: { 'Authorization': getters.token } }).then(ret => ret.data)
+}
+
+export default {
+  login: (email, password) => post('/login', { email, password }),
+  register: user => post('/user', user),
+
+  // password recovery
+  forgotPassword: email => post('/user/recover', { email }),
+  checkRecoverCode: recover_code => post('/user/check_recover_code', { recover_code }),
+  recoverPassword: (recover_code, password) => post('/user/recover_password', { recover_code, password }),
+
+  getAllEvents: (month, year) => get(`/event/${year}/${month}/`),
+  getUnconfirmedEvents: () => get('/event/unconfirmed'),
+
+  confirmEvent: id => get(`/event/confirm/${id}`),
+  unconfirmEvent: id => get(`/event/unconfirm/${id}`),
+
+  addNotification: notification => post('/event/notification', notification),
+  delNotification: code => del(`/event/notification/${code}`),
+
+  addEvent: event => post('/user/event', event),
+  updateEvent: event => put('/user/event', event),
+
+  updatePlace: place => put('/place', place),
+  delEvent: eventId => del(`/user/event/${eventId}`),
+  getEvent: eventId => get(`/event/${eventId}`),
+  getMeta: () => get('/event/meta'),
+  getUser: () => get('/user'),
+  getUsers: () => get('/users'),
+  updateTag: tag => put('/tag', tag),
+  updateUser: user => put('/user', user),
+  getAuthURL: mastodonInstance => post('/user/getauthurl', mastodonInstance),
+  setCode: code => post('/user/code', code),
+  getAdminSettings: () => get('/settings')
+  // setAdminSetting: (key, value) => post('/settings', { key, value })
+}
diff --git a/plugins/bootstrap-vue.js b/plugins/bootstrap-vue.js
new file mode 100644
index 00000000..24f906d9
--- /dev/null
+++ b/plugins/bootstrap-vue.js
@@ -0,0 +1,6 @@
+import Vue from 'vue'
+import BootstrapVue from 'bootstrap-vue'
+
+export default () => {
+  Vue.use(BootstrapVue)
+}
diff --git a/plugins/element-ui.js b/plugins/element-ui.js
new file mode 100644
index 00000000..53fc4940
--- /dev/null
+++ b/plugins/element-ui.js
@@ -0,0 +1,26 @@
+import Vue from 'vue'
+import { Button, Select, Tag, Option, Table, FormItem, Card,
+  Form, Tabs, TabPane, Switch, Input, Loading, TimeSelect,
+  TableColumn, ColorPicker, Pagination, Popover } from 'element-ui'
+// import locale from 'element-ui/lib/locale/lang/en'
+
+export default () => {
+  Vue.use(Button)
+  Vue.use(Popover)
+  Vue.use(Card)
+  Vue.use(Select)
+  Vue.use(Tag)
+  Vue.use(Input)
+  Vue.use(Tabs)
+  Vue.use(TabPane)
+  Vue.use(Option)
+  Vue.use(Switch)
+  Vue.use(ColorPicker)
+  Vue.use(Table)
+  Vue.use(TableColumn)
+  Vue.use(Pagination)
+  Vue.use(FormItem)
+  Vue.use(Form)
+  Vue.use(TimeSelect)
+  Vue.use(Loading.directive)
+}
diff --git a/plugins/filters.js b/plugins/filters.js
new file mode 100644
index 00000000..3e317fc8
--- /dev/null
+++ b/plugins/filters.js
@@ -0,0 +1,8 @@
+import Vue from 'vue'
+import moment from 'dayjs'
+import 'dayjs/locale/it'
+moment.locale('it')
+
+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'))
diff --git a/plugins/i18n.js b/plugins/i18n.js
new file mode 100644
index 00000000..af35c413
--- /dev/null
+++ b/plugins/i18n.js
@@ -0,0 +1,25 @@
+import Vue from 'vue'
+import VueI18n from 'vue-i18n'
+
+Vue.use(VueI18n)
+
+export default ({ app, store }) => {
+  // Set i18n instance on app
+  // This way we can use it in middleware and pages asyncData/fetch
+  app.i18n = new VueI18n({
+    locale: store.state.locale,
+    fallbackLocale: 'en'
+    // messages: {
+    //   'en': require('~/locales/en.json'),
+    //   'fr': require('~/locales/fr.json')
+    // }
+  })
+
+  app.i18n.path = (link) => {
+    if (app.i18n.locale === app.i18n.fallbackLocale) {
+      return `/${link}`
+    }
+
+    return `/${app.i18n.locale}/${link}`
+  }
+}
diff --git a/plugins/magic-grid.js b/plugins/magic-grid.js
new file mode 100644
index 00000000..c240181d
--- /dev/null
+++ b/plugins/magic-grid.js
@@ -0,0 +1,6 @@
+import Vue from 'vue'
+import MagicGrid from 'vue-magic-grid'
+
+export default () => {
+  Vue.use(MagicGrid)
+}
diff --git a/plugins/v-calendar.js b/plugins/v-calendar.js
new file mode 100644
index 00000000..fd7f3431
--- /dev/null
+++ b/plugins/v-calendar.js
@@ -0,0 +1,9 @@
+import Vue from 'vue'
+import VCalendar from 'v-calendar'
+import 'v-calendar/lib/v-calendar.min.css'
+
+export default () => {
+  Vue.use(VCalendar, {
+    firstDayOfWeek: 2
+  })
+}
diff --git a/plugins/vue-awesome.js b/plugins/vue-awesome.js
new file mode 100644
index 00000000..333743f7
--- /dev/null
+++ b/plugins/vue-awesome.js
@@ -0,0 +1,24 @@
+import Vue from 'vue'
+import 'vue-awesome/icons/lock'
+import 'vue-awesome/icons/user'
+import 'vue-awesome/icons/plus'
+import 'vue-awesome/icons/cog'
+import 'vue-awesome/icons/tools'
+import 'vue-awesome/icons/file-export'
+import 'vue-awesome/icons/sign-out-alt'
+import 'vue-awesome/icons/clock'
+import 'vue-awesome/icons/map-marker-alt'
+import 'vue-awesome/icons/file-alt'
+import 'vue-awesome/icons/image'
+import 'vue-awesome/icons/tag'
+import 'vue-awesome/icons/users'
+import 'vue-awesome/icons/calendar'
+import 'vue-awesome/icons/edit'
+import 'vue-awesome/icons/envelope-open-text'
+import 'vue-awesome/icons/user-secret'
+import 'vue-awesome/icons/question-circle'
+import Icon from 'vue-awesome/components/Icon'
+
+export default () => {
+  Vue.component('v-icon', Icon)
+}
diff --git a/server/api/auth.js b/server/api/auth.js
new file mode 100644
index 00000000..0727af5d
--- /dev/null
+++ b/server/api/auth.js
@@ -0,0 +1,48 @@
+const jwt = require('jsonwebtoken')
+const { Op } = require('sequelize')
+const config = require('./config')
+const User = require('./models/user')
+
+const Auth = {
+  fillUser(req, res, next) {
+    const token =
+      req.body.token || req.params.token || req.headers['x-access-token']
+    if (!token) return next()
+    jwt.verify(token, config.secret, async (err, decoded) => {
+      if (err) return next()
+      req.user = await User.findOne({
+        where: { email: { [Op.eq]: decoded.email }, is_active: true }
+      })
+      next()
+    })
+  },
+  isAuth(req, res, next) {
+    const token =
+      (req.body && req.body.token) ||
+      req.params.token ||
+      req.headers['x-access-token']
+    if (!token) return res.status(403).send({ message: 'Token not found' })
+    jwt.verify(token, config.secret, async (err, decoded) => {
+      if (err) {
+        return res
+          .status(403)
+          .send({ message: 'Failed to authenticate token ' + err })
+      }
+      req.user = await User.findOne({
+        where: { email: { [Op.eq]: decoded.email }, is_active: true }
+      })
+      if (!req.user) {
+        return res
+          .status(403)
+          .send({ message: 'Failed to authenticate token ' + err })
+      }
+      next()
+    })
+  },
+  isAdmin(req, res, next) {
+    if (req.user.is_admin && req.user.is_active) return next()
+    return res.status(403).send({ message: 'Admin needed' })
+  }
+}
+
+module.exports = Auth
diff --git a/server/api/config.js b/server/api/config.js
new file mode 100644
index 00000000..e0f2b99f
--- /dev/null
+++ b/server/api/config.js
@@ -0,0 +1,27 @@
+/* backend configuration */
+const env = process.env.NODE_ENV || 'development'
+const db = require('./config/config.json')[env]
+
+module.exports = {
+  locale: process.env.LOCALE || 'it',
+  title: process.env.TITLE || 'GANCIO',
+  description: process.env.DESCRIPTION || 'A calendar for radical communities',
+  baseurl: process.env.BASE_URL || 'http://localhost:8080',
+  apiurl:
+    env === 'production'
+      ? process.env.BASE_URL + '/api'
+      : 'http://localhost:9000',
+  db,
+  admin: process.env.ADMIN_EMAIL,
+
+  smtp: {
+    host: process.env.SMTP_HOST,
+    secure: true,
+    auth: {
+      user: process.env.SMTP_USER,
+      pass: process.env.SMTP_PASS
+    }
+  },
+
+  secret: process.env.SECRET || 'notsosecret'
+}
diff --git a/server/api/config/config.json b/server/api/config/config.json
new file mode 100644
index 00000000..b0b61bda
--- /dev/null
+++ b/server/api/config/config.json
@@ -0,0 +1,14 @@
+{
+  "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
new file mode 100644
index 00000000..bedcae91
--- /dev/null
+++ b/server/api/controller/bot.js
@@ -0,0 +1,82 @@
+// const { User, Event, Comment, Tag } = require('../model')
+const config = require('../config')
+const Mastodon = require('mastodon-api')
+// const Sequelize = require('sequelize')
+// const Op = Sequelize.Op
+const fs = require('fs')
+const path = require('path')
+const moment = require('moment')
+moment.locale('it')
+
+const botController = {
+  bots: [],
+  // async initialize () {
+  //   console.log('initialize bots')
+  //   const botUsers = await User.findAll({ where: { mastodon_auth: { [Op.ne]: null } } })
+  //   console.log(botUsers)
+  //   botController.bots = botUsers.map(user => {
+  //     console.log('initialize bot ', user.name)
+  //     console.log('.. ', user.mastodon_auth)
+  //     const { client_id, client_secret, access_token } = user.mastodon_auth
+  //     const bot = new Mastodon({ access_token, api_url: `https://${user.mastodon_instance}/api/v1/` })
+  //     const listener = bot.stream('streaming/direct')
+  //     listener.on('message', botController.message)
+  //     listener.on('error', botController.error)
+  //     return { email: user.email, bot }
+  //   })
+  // console.log(botController.bots)
+  // },
+  // add (user, token) {
+  //   const bot = new Mastodon({ access_token: user.mastodon_auth.access_token, api_url: `https://${user.mastodon_instance}/api/v1/` })
+  //   const listener = bot.stream('streaming/direct')
+  //   listener.on('message', botController.message)
+  //   listener.on('error', botController.error)
+  //   botController.bots.push({ email: user.email, bot })
+  // },
+  async post (mastodon_auth, event) {
+    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(' ')} ${config.baseurl}/event/${event.id}`
+
+    let media
+    if (event.image_path) {
+      const file = path.join(__dirname, '..', '..', 'uploads', event.image_path)
+      if (fs.statSync(file)) {
+        media = await bot.post('media', { file: fs.createReadStream(file) })
+      }
+    }
+    return bot.post('statuses', { status, visibility: 'public', media_ids: media ? [media.data.id] : [] })
+  }
+  // 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 } })
+  // if (!event) {
+  // check for comment..
+  // const comment = await Comment.findOne( {where: { }})
+  // }
+  // const comment = await Comment.create({activitypub_id: msg.data.last_status.id, text: msg.data.last_status.content, author: msg.data.accounts[0].username })
+  // event.addComment(comment)
+  // console.log(event)
+  // const comment = await Comment.findOne( { where: {activitypub_id: msg.data.in_reply_to}} )
+  // console.log('dentro message ', data)
+
+  // add comment to specified event
+  // let comment
+  // if (!event) {
+  // const comment = await Comment.findOne({where: {activitypub_id: req.body.id}, include: Event})
+  // event = comment.event
+  // }
+  // const comment = new Comment(req.body)
+  // event.addComment(comment)
+  // },
+  // error (err) {
+  //   console.log('error ', err)
+  // }
+}
+
+// setTimeout(botController.initialize, 2000)
+module.exports = botController
diff --git a/server/api/controller/event.js b/server/api/controller/event.js
new file mode 100644
index 00000000..d1c97801
--- /dev/null
+++ b/server/api/controller/event.js
@@ -0,0 +1,169 @@
+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 eventController = {
+
+  async addComment(req, res) {
+    // comment could be added to an event or to another comment
+    let event = await Event.findOne({ where: { activitypub_id: { [Op.eq]: req.body.id } } })
+    if (!event) {
+      const comment = await Comment.findOne({ where: { activitypub_id: { [Op.eq]: req.body.id } }, include: Event })
+      event = comment.event
+    }
+    const comment = new Comment(req.body)
+    event.addComment(comment)
+    res.json(comment)
+  },
+
+  async getMeta(req, res) {
+    const places = await Place.findAll()
+    const tags = await Tag.findAll()
+    res.json({ tags, places })
+  },
+
+  async getNotifications(event) {
+    function match(event, filters) {
+      // matches if no filter specified
+      if (!filters) return true
+
+      // check for visibility
+      if (typeof filters.is_visible !== 'undefined' && filters.is_visible !== event.is_visible) return false
+
+      if (!filters.tags && !filters.places) return true
+      if (!filters.tags.length && !filters.places.length) return true
+      if (filters.tags.length) {
+        const m = lodash.intersection(event.tags.map(t => t.tag), filters.tags)
+        if (m.length > 0) return true
+      }
+      if (filters.places.length) {
+        if (filters.places.find(p => p === event.place.name)) {
+          return true
+        }
+      }
+    }
+    const notifications = await Notification.findAll()
+
+    // get notification that matches with selected event
+    return notifications.filter(notification => match(event, notification.filters))
+  },
+
+  async updateTag(req, res) {
+    const tag = await Tag.findByPk(req.body.tag)
+    if (tag) {
+      res.json(await tag.update(req.body))
+    } else {
+      res.sendStatus(404)
+    }
+  },
+
+  async updatePlace(req, res) {
+    const place = await Place.findByPk(req.body.id)
+    await place.update(req.body)
+    res.json(place)
+  },
+
+  async get(req, res) {
+    const id = req.params.event_id
+    const event = await Event.findByPk(id, { include: [User, Tag, Comment, Place] })
+    res.json(event)
+  },
+
+  async confirm(req, res) {
+    const id = req.params.event_id
+    const event = await Event.findByPk(id)
+
+    try {
+      await event.update({ is_visible: true })
+      // insert notification
+      const notifications = await eventController.getNotifications(event)
+      await event.setNotifications(notifications)
+      res.sendStatus(200)
+    } catch (e) {
+      res.sendStatus(404)
+    }
+  },
+
+  async unconfirm(req, res) {
+    const id = req.params.event_id
+    const event = await Event.findByPk(id)
+
+    try {
+      await event.update({ is_visible: false })
+      res.sendStatus(200)
+    } catch (e) {
+      res.sendStatus(404)
+    }
+  },
+
+  async getUnconfirmed(req, res) {
+    const events = await Event.findAll({
+      where: {
+        is_visible: false
+      },
+      order: [['start_datetime', 'ASC']],
+      include: [Tag, Place]
+    })
+    res.json(events)
+  },
+
+  async addNotification(req, res) {
+    try {
+      const notification = {
+        filters: { is_visible: true },
+        email: req.body.email,
+        type: 'mail',
+        remove_code: crypto.randomBytes(16).toString('hex')
+      }
+      await Notification.create(notification)
+      res.sendStatus(200)
+    } catch (e) {
+      res.sendStatus(404)
+    }
+  },
+
+  async delNotification(req, res) {
+    const remove_code = req.params.code
+    try {
+      const notification = await Notification.findOne({ where: { remove_code: { [Op.eq]: remove_code } } })
+      await notification.destroy()
+    } catch (e) {
+      return res.sendStatus(404)
+    }
+    res.sendStatus(200)
+  },
+
+  async getAll(req, res) {
+    console.log('sono qui dentro !')
+    // this is due how v-calendar shows dates
+    const start = moment().year(req.params.year).month(req.params.month)
+      .startOf('month').startOf('isoWeek')
+    let end = moment().year(req.params.year).month(req.params.month).endOf('month')
+    const shownDays = end.diff(start, 'days')
+    if (shownDays <= 34) end = end.add(1, 'week')
+    end = end.endOf('isoWeek')
+    const events = await Event.findAll({
+      // where: {
+        // is_visible: true,
+        // [Op.and]: [
+          // { start_datetime: { [Op.gte]: start } },
+          // { start_datetime: { [Op.lte]: end } }
+        // ]
+      // },
+      // order: [['start_datetime', 'ASC']],
+      // include: [
+        // { model: User, required: false },
+        // Comment,
+        // Tag,
+        // { model: Place, required: false }
+      // ]
+    })
+    console.log(events)
+    res.json(events)
+  }
+
+}
+
+module.exports = eventController
diff --git a/server/api/controller/export.js b/server/api/controller/export.js
new file mode 100644
index 00000000..3f54ecf2
--- /dev/null
+++ b/server/api/controller/export.js
@@ -0,0 +1,64 @@
+const { Event, Comment, Tag, Place } = require('../model')
+const { Op } = require('sequelize')
+const config = require('../config')
+const moment = require('moment')
+const ics = require('ics')
+
+const exportController = {
+
+  async export (req, res) {
+    console.log('type ', req.params.type)
+    const type = req.params.type
+    const tags = req.query.tags
+    const places = req.query.places
+    const whereTag = {}
+    const wherePlace = {}
+    const yesterday = moment().subtract('1', 'day')
+    if (tags) {
+      whereTag.tag = tags.split(',')
+    }
+    if (places) {
+      wherePlace.name = places.split(',')
+    }
+    const events = await Event.findAll({
+      where: { is_visible: true, start_datetime: { [Op.gte]: yesterday } },
+      include: [Comment, {
+        model: Tag,
+        where: whereTag
+      }, { model: Place, where: wherePlace } ]
+    })
+    switch (type) {
+      case 'feed':
+        return exportController.feed(res, events.slice(0, 20))
+      case 'ics':
+        return exportController.ics(res, events)
+    }
+  },
+
+  async feed (res, events) {
+    res.type('application/rss+xml; charset=UTF-8')
+    res.render('feed/rss.pug', { events, config, moment })
+  },
+
+  async ics (res, events) {
+    const eventsMap = events.map(e => {
+      const tmpStart = moment(e.start_datetime)
+      const tmpEnd = moment(e.end_datetime)
+      const start = [tmpStart.year(), tmpStart.month() + 1, tmpStart.date(), tmpStart.hour(), tmpStart.minute()]
+      const end = [tmpEnd.year(), tmpEnd.month() + 1, tmpEnd.date(), tmpEnd.hour(), tmpEnd.minute()]
+      return {
+        start,
+        end,
+        title: e.title,
+        description: e.description,
+        location: e.place.name + ' ' + e.place.address
+      }
+    })
+    res.type('text/calendar; charset=UTF-8')
+    const { error, value } = ics.createEvents(eventsMap)
+    console.log(error, value)
+    res.send(value)
+  }
+}
+
+module.exports = exportController
diff --git a/server/api/controller/settings.js b/server/api/controller/settings.js
new file mode 100644
index 00000000..85f32819
--- /dev/null
+++ b/server/api/controller/settings.js
@@ -0,0 +1,27 @@
+const { Settings } = require('../model')
+
+const settingsController = {
+  async setAdminSetting (key, value) {
+    await Settings.findOrCreate({ where: { key },
+      defaults: { value } })
+      .spread((settings, created) => {
+        if (!created) return settings.update({ value })
+      })
+  },
+
+  async getAdminSettings (req, res) {
+    const settings = await settingsController.settings()
+    res.json(settings)
+  },
+
+  async settings () {
+    const settings = await Settings.findAll()
+    const map = {}
+    settings.forEach(setting => {
+      map[setting.key] = setting.value
+    })
+    return map
+  }
+}
+
+module.exports = settingsController
diff --git a/server/api/controller/user.js b/server/api/controller/user.js
new file mode 100644
index 00000000..923e2414
--- /dev/null
+++ b/server/api/controller/user.js
@@ -0,0 +1,283 @@
+const jwt = require('jsonwebtoken')
+const Mastodon = require('mastodon-api')
+
+const User = require('../models/user')
+const { Event, Tag, Place } = require('../models/event')
+const settingsController = require('./settings')
+const eventController = require('./event')
+const config = require('../config')
+const mail = require('../mail')
+const { Op } = require('sequelize')
+const fs = require('fs')
+const path = require('path')
+const crypto = require('crypto')
+
+const userController = {
+  async login (req, res) {
+    // find the user
+    const user = await User.findOne({ where: { email: { [Op.eq]: req.body.email } } })
+    if (!user) {
+      res.status(404).json({ success: false, message: 'AUTH_FAIL' })
+    } else if (user) {
+      if (!user.is_active) {
+        res.status(403).json({ success: false, message: 'NOT_CONFIRMED' })
+      // check if password matches
+      } else if (!await user.comparePassword(req.body.password)) {
+        res.status(403).json({ success: false, message: 'AUTH_FAIL' })
+      } else {
+        // if user is found and password is right
+        // create a token
+        const payload = { email: user.email }
+        var token = jwt.sign(payload, config.secret)
+        res.json({
+          success: true,
+          message: 'Enjoy your token!',
+          token,
+          user
+        })
+      }
+    }
+  },
+
+  async setToken (req, res) {
+    req.user.mastodon_auth = req.body
+    await req.user.save()
+    res.json(req.user)
+  },
+
+  async delEvent (req, res) {
+    const event = await Event.findByPk(req.params.id)
+    // check if event is mine (or user is admin)
+    if (event && (req.user.is_admin || req.user.id === event.userId)) {
+      if (event.image_path) {
+        const old_path = path.resolve(__dirname, '..', '..', 'uploads', event.image_path)
+        const old_thumb_path = path.resolve(__dirname, '..', '..', 'uploads', 'thumb', event.image_path)
+        await fs.unlink(old_path)
+        await fs.unlink(old_thumb_path)
+      }
+      await event.destroy()
+      res.sendStatus(200)
+    } else {
+      res.sendStatus(403)
+    }
+  },
+
+  // ADD EVENT
+  async addEvent (req, res) {
+    const body = req.body
+
+    // remove description tag and create anchor tags
+    const description = body.description
+      .replace(/(<([^>]+)>)/ig, '')
+      .replace(/(https?:\/\/[^\s]+)/g, '<a href="$1">$1</a>')
+
+    const eventDetails = {
+      title: body.title,
+      description,
+      multidate: body.multidate,
+      start_datetime: body.start_datetime,
+      end_datetime: body.end_datetime,
+      is_visible: !!req.user
+    }
+
+    if (req.file) {
+      eventDetails.image_path = req.file.filename
+    }
+
+    let event = await Event.create(eventDetails)
+
+    // create place
+    let place
+    try {
+      place = await Place.findOrCreate({ where: { name: body.place_name },
+        defaults: { address: body.place_address } })
+        .spread((place, created) => place)
+      await event.setPlace(place)
+    } catch (e) {
+      console.error(e)
+    }
+
+    // create/assign tags
+    if (body.tags) {
+      await Tag.bulkCreate(body.tags.map(t => ({ tag: t })), { ignoreDuplicates: true })
+      const tags = await Tag.findAll({ where: { tag: { [Op.in]: body.tags } } })
+      await event.addTags(tags)
+    }
+    if (req.user) await req.user.addEvent(event)
+    event = await Event.findByPk(event.id, { include: [User, Tag, Place] })
+
+    // insert notifications
+    const notifications = await eventController.getNotifications(event)
+    await event.setNotifications(notifications)
+
+    return res.json(event)
+  },
+
+  async updateEvent (req, res) {
+    const body = req.body
+    const event = await Event.findByPk(body.id)
+    if (!req.user.is_admin && event.userId !== req.user.id) {
+      return res.sendStatus(403)
+    }
+
+    if (req.file) {
+      if (event.image_path) {
+        const old_path = path.resolve(__dirname, '..', '..', 'uploads', event.image_path)
+        const old_thumb_path = path.resolve(__dirname, '..', '..', 'uploads', 'thumb', event.image_path)
+        await fs.unlink(old_path, e => console.error(e))
+        await fs.unlink(old_thumb_path, e => console.error(e))
+      }
+      body.image_path = req.file.filename
+    }
+
+    body.description = body.description
+      .replace(/(<([^>]+)>)/ig, '') // remove all tags from description
+      .replace(/(https?:\/\/[^\s]+)/g, '<a href="$1">$1</a>') // add links
+
+    await event.update(body)
+    let place
+    try {
+      place = await Place.findOrCreate({ where: { name: body.place_name },
+        defaults: { address: body.place_address } })
+        .spread((place, created) => place)
+    } catch (e) {
+      console.log('error', e)
+    }
+    await event.setPlace(place)
+    await event.setTags([])
+    if (body.tags) {
+      await Tag.bulkCreate(body.tags.map(t => ({ tag: t })), { ignoreDuplicates: true })
+      const tags = await Tag.findAll({ where: { tag: { [Op.in]: body.tags } } })
+      await event.addTags(tags)
+    }
+    const newEvent = await Event.findByPk(event.id, { include: [User, Tag, Place] })
+    return res.json(newEvent)
+  },
+
+  async getAuthURL (req, res) {
+    const instance = req.body.instance
+    const is_admin = req.body.admin && req.user.is_admin
+    const callback = `${config.baseurl}/${is_admin ? 'admin/oauth' : 'settings'}`
+    const { client_id, client_secret } = await Mastodon.createOAuthApp(`https://${instance}/api/v1/apps`,
+      config.title, 'read write', callback)
+    const url = await Mastodon.getAuthorizationUrl(client_id, client_secret,
+      `https://${instance}`, 'read write', callback)
+
+    if (is_admin) {
+      await settingsController.setAdminSetting('mastodon_auth', { client_id, client_secret, instance })
+    } else {
+      req.user.mastodon_auth = { client_id, client_secret, instance }
+      await req.user.save()
+    }
+    res.json(url)
+  },
+
+  async code (req, res) {
+    const { code, is_admin } = req.body
+    let client_id, client_secret, instance
+    const callback = `${config.baseurl}/${is_admin ? 'admin/oauth' : 'settings'}`
+
+    if (is_admin) {
+      const settings = await settingsController.settings();
+      ({ client_id, client_secret, instance } = settings.mastodon_auth)
+    } else {
+      ({ client_id, client_secret, instance } = req.user.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 }
+      if (is_admin) {
+        await settingsController.setAdminSetting('mastodon_auth', mastodon_auth)
+        res.json(instance)
+      } else {
+        req.user.mastodon_auth = mastodon_auth
+        await req.user.save()
+        // await bot.add(req.user, token)
+        res.json(req.user)
+      }
+    } catch (e) {
+      res.json(e)
+    }
+  },
+
+  async forgotPassword (req, res) {
+    const email = req.body.email
+    const user = await User.findOne({ where: { email: { [Op.eq]: email } } })
+    if (!user) return res.sendStatus(200)
+
+    user.recover_code = crypto.randomBytes(16).toString('hex')
+    mail.send(user.email, 'recover', { user, config })
+    await user.save()
+    res.sendStatus(200)
+  },
+
+  async checkRecoverCode (req, res) {
+    const recover_code = req.body.recover_code
+    if (!recover_code) return res.sendStatus(400)
+    const user = await User.findOne({ where: { recover_code: { [Op.eq]: recover_code } } })
+    if (!user) return res.sendStatus(400)
+    res.json(user)
+  },
+
+  async updatePasswordWithRecoverCode (req, res) {
+    const recover_code = req.body.recover_code
+    if (!recover_code) return res.sendStatus(400)
+    const password = req.body.password
+    const user = await User.findOne({ where: { recover_code: { [Op.eq]: recover_code } } })
+    if (!user) return res.sendStatus(400)
+    user.password = password
+    await user.save()
+    res.sendStatus(200)
+  },
+
+  async current (req, res) {
+    res.json(req.user)
+  },
+
+  async getAll (req, res) {
+    const users = await User.findAll({
+      order: [['createdAt', 'DESC']]
+    })
+    res.json(users)
+  },
+
+  async update (req, res) {
+    const user = await User.findByPk(req.body.id)
+    if (user) {
+      if (!user.is_active && req.body.is_active) {
+        await mail.send(user.email, 'confirm', { user, config })
+      }
+      await user.update(req.body)
+      res.json(user)
+    } else {
+      res.sendStatus(400)
+    }
+  },
+
+  async register (req, res) {
+    const n_users = await User.count()
+    try {
+      if (n_users === 0) {
+        // the first registered user will be an active admin
+        req.body.is_active = req.body.is_admin = true
+      } else {
+        req.body.is_active = false
+      }
+      const user = await User.create(req.body)
+      try {
+        mail.send([user.email, config.admin], 'register', { user, config })
+      } catch (e) {
+        return res.status(400).json(e)
+      }
+      const payload = { email: user.email }
+      const token = jwt.sign(payload, config.secret)
+      res.json({ user, token })
+    } catch (e) {
+      res.status(404).json(e)
+    }
+  }
+}
+
+module.exports = userController
diff --git a/server/api/db.js b/server/api/db.js
new file mode 100644
index 00000000..7de7ec67
--- /dev/null
+++ b/server/api/db.js
@@ -0,0 +1,5 @@
+const Sequelize = require('sequelize')
+const conf = require('./config.js')
+const db = new Sequelize(conf.db)
+// db.sync({force: true})
+module.exports = db
diff --git a/server/api/index.js b/server/api/index.js
new file mode 100644
index 00000000..ebf7fb8b
--- /dev/null
+++ b/server/api/index.js
@@ -0,0 +1,86 @@
+const express = require('express')
+const multer = require('multer')
+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 botController = require('./controller/bot')
+
+const storage = require('./storage')({
+  destination: 'uploads/'
+})
+
+const upload = multer({ storage })
+const api = express.Router()
+// login
+api.post('/login', userController.login)
+api.post('/user/recover', userController.forgotPassword)
+api.post('/user/check_recover_code', userController.checkRecoverCode)
+api.post('/user/recover_password', userController.updatePasswordWithRecoverCode)
+
+api
+  .route('/user')
+  // register
+  .post(userController.register)
+  // get current user
+  .get(isAuth, userController.current)
+  // update user (eg. confirm)
+  .put(isAuth, isAdmin, userController.update)
+
+// get all users
+api.get('/users', isAuth, isAdmin, userController.getAll)
+
+// update a tag (modify color)
+api.put('/tag', isAuth, isAdmin, eventController.updateTag)
+
+// update a place (modify address..)
+api.put('/place', isAuth, isAdmin, eventController.updatePlace)
+
+api
+  .route('/user/event')
+  // add event
+  .post(fillUser, upload.single('image'), userController.addEvent)
+  // update event
+  .put(isAuth, upload.single('image'), userController.updateEvent)
+
+// remove event
+api.delete('/user/event/:id', isAuth, userController.delEvent)
+
+// get tags/places
+api.get('/event/meta', eventController.getMeta)
+
+// get unconfirmed events
+api.get('/event/unconfirmed', isAuth, isAdmin, eventController.getUnconfirmed)
+
+// add event notification
+api.post('/event/notification', eventController.addNotification)
+api.delete('/event/notification/:code', eventController.delNotification)
+
+api.get('/settings', settingsController.getAdminSettings)
+api.post('/settings', settingsController.setAdminSetting)
+
+// get event
+api.get('/event/:event_id', eventController.get)
+
+// confirm event
+api.get('/event/confirm/:event_id', isAuth, isAdmin, eventController.confirm)
+api.get(
+  '/event/unconfirm/:event_id',
+  isAuth,
+  isAdmin,
+  eventController.unconfirm
+)
+
+// export events (rss/ics)
+api.get('/export/:type', exportController.export)
+
+// get events in this range
+api.get('/event/:year/:month', eventController.getAll)
+
+// mastodon oauth auth
+api.post('/user/getauthurl', isAuth, userController.getAuthURL)
+api.post('/user/code', isAuth, userController.code)
+
+module.exports = api
diff --git a/server/api/mail.js b/server/api/mail.js
new file mode 100644
index 00000000..4f38ee11
--- /dev/null
+++ b/server/api/mail.js
@@ -0,0 +1,44 @@
+const Email = require('email-templates')
+const path = require('path')
+const config = require('./config')
+const moment = require('moment')
+moment.locale('it')
+
+const mail = {
+  send (addresses, template, locals) {
+    const email = new Email({
+      views: { root: path.join(__dirname, 'emails') },
+      juice: true,
+      juiceResources: {
+        preserveImportant: true,
+        webResources: {
+          relativeTo: path.join(__dirname, 'emails')
+        }
+      },
+      message: {
+        from: `${config.title} <${config.smtp.auth.user}>`
+      },
+      send: true,
+      i18n: {
+        locales: ['en', 'es', 'it'],
+        defaultLocale: config.locale
+      },
+      transport: config.smtp
+    })
+    return email.send({
+      template,
+      message: {
+        to: addresses,
+        bcc: config.admin
+      },
+      locals: {
+        ...locals,
+        locale: config.locale,
+        config,
+        datetime: datetime => moment(datetime).format('ddd, D MMMM HH:mm')
+      }
+    })
+  }
+}
+
+module.exports = mail
diff --git a/server/api/model.js b/server/api/model.js
new file mode 100644
index 00000000..303fa1dd
--- /dev/null
+++ b/server/api/model.js
@@ -0,0 +1,14 @@
+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/event.js b/server/api/models/event.js
new file mode 100644
index 00000000..35524b74
--- /dev/null
+++ b/server/api/models/event.js
@@ -0,0 +1,72 @@
+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,
+  activitypub_id: { type: Sequelize.INTEGER, index: true },
+  is_visible: Sequelize.BOOLEAN
+})
+
+const Tag = db.define('tag', {
+  tag: { type: Sequelize.STRING, index: true, unique: true, primaryKey: true },
+  color: { type: Sequelize.STRING }
+})
+
+const Comment = db.define('comment', {
+  activitypub_id: { type: Sequelize.INTEGER, index: true },
+  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 },
+  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 }
diff --git a/server/api/models/index.js b/server/api/models/index.js
new file mode 100644
index 00000000..c1a3d6d5
--- /dev/null
+++ b/server/api/models/index.js
@@ -0,0 +1,37 @@
+'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/server/api/models/settings.js b/server/api/models/settings.js
new file mode 100644
index 00000000..148b7bdb
--- /dev/null
+++ b/server/api/models/settings.js
@@ -0,0 +1,9 @@
+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/user.js b/server/api/models/user.js
new file mode 100644
index 00000000..2fcfbac5
--- /dev/null
+++ b/server/api/models/user.js
@@ -0,0 +1,34 @@
+const bcrypt = require('bcrypt')
+const db = require('../db')
+const Sequelize = require('sequelize')
+
+const User = db.define('user', {
+  email: {
+    type: Sequelize.STRING,
+    unique: { msg: 'Email already exists' },
+    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
+})
+
+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
diff --git a/server/api/storage.js b/server/api/storage.js
new file mode 100644
index 00000000..da58bae4
--- /dev/null
+++ b/server/api/storage.js
@@ -0,0 +1,62 @@
+const fs = require('fs')
+const os = require('os')
+const path = require('path')
+const crypto = require('crypto')
+const mkdirp = require('mkdirp')
+const sharp = require('sharp')
+
+function getDestination(req, file, cb) {
+  cb(null, os.tmpdir())
+}
+
+function DiskStorage(opts) {
+  if (typeof opts.destination === 'string') {
+    mkdirp.sync(opts.destination)
+    this.getDestination = function ($0, $1, cb) { cb(null, opts.destination) }
+  } else {
+    this.getDestination = (opts.destination || getDestination)
+  }
+}
+
+DiskStorage.prototype._handleFile = function _handleFile(req, file, cb) {
+  const that = this
+  that.getDestination(req, file, function (err, destination) {
+    if (err) return cb(err)
+
+    const filename = crypto.randomBytes(16).toString('hex') + '.jpg'
+    const finalPath = path.join(destination, filename)
+    const thumbPath = path.join(destination, 'thumb', filename)
+    const outStream = fs.createWriteStream(finalPath)
+    const thumbStream = fs.createWriteStream(thumbPath)
+    const resizer = sharp().resize(800).jpeg({ quality: 80 })
+    const thumbnailer = sharp().resize(400).jpeg({ quality: 60 })
+
+    file.stream.pipe(thumbnailer).pipe(thumbStream)
+    thumbStream.on('error', e => console.log('thumbStream error ', e))
+
+    file.stream.pipe(resizer).pipe(outStream)
+    outStream.on('error', cb)
+    outStream.on('finish', function () {
+      cb(null, {
+        destination,
+        filename,
+        path: finalPath,
+        size: outStream.bytesWritten
+      })
+    })
+  })
+}
+
+DiskStorage.prototype._removeFile = function _removeFile(req, file, cb) {
+  let path = file.path
+
+  delete file.destination
+  delete file.filename
+  delete file.path
+
+  fs.unlink(path, cb)
+}
+
+module.exports = function (opts) {
+  return new DiskStorage(opts)
+}
diff --git a/server/index.js b/server/index.js
new file mode 100644
index 00000000..ebcf3d73
--- /dev/null
+++ b/server/index.js
@@ -0,0 +1,36 @@
+const express = require('express')
+const consola = require('consola')
+const { Nuxt, Builder } = require('nuxt')
+const app = express()
+const cors = require('cors')
+
+// 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
+  const nuxt = new Nuxt(config)
+
+  const { host, port } = nuxt.options.server
+
+  // Build only in dev mode
+  if (config.dev) {
+    const builder = new Builder(nuxt)
+    await builder.build()
+  } else {
+    await nuxt.ready()
+  }
+
+  // Give nuxt middleware to express
+  app.use(cors())
+  app.use(nuxt.render)
+
+  // Listen the server
+  app.listen(port, host)
+  consola.ready({
+    message: `Server listening on http://${host}:${port}`,
+    badge: true
+  })
+}
+start()
diff --git a/static/README.md b/static/README.md
new file mode 100644
index 00000000..cf004353
--- /dev/null
+++ b/static/README.md
@@ -0,0 +1,11 @@
+# STATIC
+
+**This directory is not required, you can delete it if you don't want to use it.**
+
+This directory contains your static files.
+Each file inside this directory is mapped to `/`.
+Thus you'd want to delete this README.md before deploying to production.
+
+Example: `/static/robots.txt` is mapped as `/robots.txt`.
+
+More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/assets#static).
diff --git a/static/favicon.ico b/static/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..382fecbbf96d6e1e614e0e2cc8b73e355bd946cc
GIT binary patch
literal 1150
zcmZQzU<5(|0R|wcz>vYhz#zuJz@P!dKp~(AL>x#lFaYI-8)(_-RMWh}@jndLuXgyK
z;A{Fn&J#OMi823Q&|nS5g-td!^Y<rkwCr%a57Q5#^Qx?{>-RSMpI2!G(|^BVz5@p+
zJll3Uhal^3+~)8<DcB6djI<OBnBM;d&9))PaRGG0eq=LBdTmkkC-|HF&##5LyV2$V
zvR)9oV~3-D^A4xK$Y!L*nZwP<%CUs_xxxBxQIm~6x_%J9b*JMDWc}3(?f=Jnnf^}-
zGlRRku)$^~HoYLRp8dWe%{v|6Bb$+(Yxys?1ZsDq&4<c1TTxv4LE<etoC=WjH*a)Y
zSkP$w0u*P3jkbmO^n&E}?{8pf+39#4VusVl?wxL8g^kw9xkXkpX3k7wC8QrD-@L=w
z1EjxohjTHA-|)YIskGI>0K_I1H1Blkn|X#f`-nA@7V7^0XJCNg21cM?f%pJ31V3PB
ZU;yC{{0s~~<bn7;1H)gSdJu-`0RTsU0uulL

literal 0
HcmV?d00001

diff --git a/store/README.md b/store/README.md
new file mode 100644
index 00000000..1972d277
--- /dev/null
+++ b/store/README.md
@@ -0,0 +1,10 @@
+# STORE
+
+**This directory is not required, you can delete it if you don't want to use it.**
+
+This directory contains your Vuex Store files.
+Vuex Store option is implemented in the Nuxt.js framework.
+
+Creating a file in this directory automatically activates the option in the framework.
+
+More information about the usage of this directory in [the documentation](https://nuxtjs.org/guide/vuex-store).
diff --git a/store/index.js b/store/index.js
new file mode 100644
index 00000000..e16fe1ac
--- /dev/null
+++ b/store/index.js
@@ -0,0 +1,167 @@
+import moment from 'dayjs'
+import { intersection } from 'lodash'
+import api from '~/plugins/api'
+import Vue from 'vue'
+
+Vue.config.errorHandler = function (err, vm, info) {
+  // handle error
+  // `info` is a Vue-specific error info, e.g. which lifecycle hook
+  // the error was found in. Only available in 2.2.0+
+  console.error(err)
+  console.error(info)
+}
+
+export const state = () => ({
+  events: [],
+  user: {},
+  logged: false,
+  token: '',
+  tags: [],
+  places: [],
+  filters: {
+    tags: [],
+    places: []
+  }
+})
+
+export const getters = {
+  token: state => state.token,
+  // filter current + future events only
+  // plus, filter matches search tag/place
+  filteredEvents: (state) => {
+    const events = state.events.map((e) => {
+      const end_datetime = e.end_datetime || moment(e.start_datetime).add('3', 'hour')
+      const past = (moment().diff(end_datetime, 'minutes') > 0)
+      e.past = past
+      return e
+    })
+    if (!state.filters.tags.length && !state.filters.places.length) {
+      return events
+    }
+    return events.filter((e) => {
+      if (state.filters.tags.length) {
+        const m = intersection(e.tags.map(t => t.tag), state.filters.tags)
+        if (m.length > 0) return true
+      }
+      if (state.filters.places.length) {
+        if (state.filters.places.find(p => p === e.place.name)) {
+          return true
+        }
+      }
+      return 0
+    })
+  }
+
+}
+
+export const mutations = {
+  logout(state) {
+    state.logged = false
+    state.token = ''
+    state.user = {}
+  },
+  login(state, user) {
+    state.logged = true
+    state.user = user.user
+    state.token = user.token
+  },
+  setEvents(state, events) {
+    state.events = events
+  },
+  addEvent(state, event) {
+    state.events.push(event)
+  },
+  updateEvent(state, event) {
+    state.events = state.events.map((e) => {
+      if (e.id !== event.id) return e
+      return event
+    })
+  },
+  delEvent(state, eventId) {
+    state.events = state.events.filter(ev => ev.id !== eventId)
+  },
+  update(state, { tags, places }) {
+    state.tags = tags
+    state.places = places
+  },
+  // search
+  addSearchTag(state, tag) {
+    if (!state.filters.tags.find(t => t === tag.tag)) {
+      state.filters.tags.push(tag.tag)
+    } else {
+      state.filters.tags = state.filters.tags.filter(t => t !== tag.tag)
+    }
+  },
+  setSearchTags(state, tags) {
+    state.filters.tags = tags
+  },
+  addSearchPlace(state, place) {
+    if (state.filters.places.find(p => p.name === place.name)) {
+      state.filters.places.push(place)
+    }
+  },
+  setSearchPlaces(state, places) {
+    state.filters.places = places
+  }
+}
+
+export const actions = {
+  // called on server request
+  // get current month's event
+  async nuxtServerInit({ commit }, { req }) {
+    // set user if logged! TODO
+
+    const now = new Date()
+    const events = await api.getAllEvents(now.getMonth() - 1, now.getFullYear())
+    commit('setEvents', events)
+  },
+  async updateEvents({ commit }, date) {
+    console.log('dentro updateEvents ', date.month, api)
+    try {
+      const events = await api.getAllEvents(date.month - 1, date.year)
+      console.log('dopo getAll events', events)
+      commit('setEvents', events)
+    } catch (e) {
+      console.log(e)
+    }
+  },
+  async updateMeta({ commit }) {
+    const { tags, places } = await api.getMeta()
+    commit('update', { tags, places })
+  },
+  async addEvent({ commit }, formData) {
+    const event = await api.addEvent(formData)
+    if (this.state.logged) {
+      commit('addEvent', event)
+    }
+  },
+  async updateEvent({ commit }, formData) {
+    const event = await api.updateEvent(formData)
+    commit('updateEvent', event)
+  },
+  delEvent({ commit }, eventId) {
+    commit('delEvent', eventId)
+  },
+  login({ commit }, user) {
+    commit('login', user)
+  },
+  logout({ commit }) {
+    commit('logout')
+  },
+  // search
+  addSearchTag({ commit }, tag) {
+    commit('addSearchTag', tag)
+  },
+  setSearchTags({ commit }, tags) {
+    commit('setSearchTags', tags)
+  },
+  addSearchPlace({ commit }, place) {
+    commit('addSearchPlace', place)
+  },
+  setSearchPlaces({ commit }, places) {
+    commit('setSearchPlaces', places)
+  }
+}
+// export const getters = {
+//   filteredEvents: state => state.events
+// }

From 35fa25c060a48420d57260ee551ef5acd8ef473d Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Fri, 5 Apr 2019 00:10:19 +0200
Subject: [PATCH 03/14] working on ssr

---
 package.json                         |   1 +
 pages/about.vue                      |  34 +++++
 pages/admin.vue                      | 196 +++++++++++++++++++++++++++
 pages/{Register.vue => register.vue} |   4 +-
 plugins/api.js                       |   2 +-
 server/api/controller/user.js        |  53 ++++----
 server/index.js                      |  11 +-
 7 files changed, 271 insertions(+), 30 deletions(-)
 create mode 100644 pages/about.vue
 create mode 100644 pages/admin.vue
 rename pages/{Register.vue => register.vue} (95%)

diff --git a/package.json b/package.json
index 08665b1d..c5211d39 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
     "@nuxtjs/axios": "^5.3.6",
     "axios": "^0.18.0",
     "bcrypt": "^3.0.5",
+    "body-parser": "^1.18.3",
     "bootstrap-vue": "^2.0.0-rc.16",
     "cors": "^2.8.5",
     "cross-env": "^5.2.0",
diff --git a/pages/about.vue b/pages/about.vue
new file mode 100644
index 00000000..81805c9e
--- /dev/null
+++ b/pages/about.vue
@@ -0,0 +1,34 @@
+<template lang="pug">
+  b-modal(hide-footer @hidden='$router.replace("/")' :title='$t("About")' 
+    :visible='true' size='lg')
+    h5 Chi siamo
+    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>.
+
+    h5 Cos'è gancio?
+    p.
+      Uno strumento di condivisione di eventi per comunità radicali.
+      Dentro gancio puoi trovare e inserire eventi.
+      Gancio, come tutto <a href='https://cisti.org'>cisti.org</a> è uno strumento
+      antisessista, antirazzista, antifascista e anticapitalista, riflettici quando
+      pubblichi un evento.
+
+    h5 Ok, ma cosa vuol dire gancio?
+    blockquote.
+      Se vieni a Torino e dici: "ehi, ci diamo un gancio alle 8?" nessuno si presenterà con i guantoni per fare a mazzate.
+      Darsi un gancio vuol dire beccarsi alle ore X in un posto Y
+    p 
+      small A: a che ora è il gancio in radio per andare al presidio?
+    p
+      small B: non so ma domani non posso venire, ho gia' un gancio per caricare il bar.
+
+
+    h5 Contatti
+    p.
+      Hai scritto una nuova interfaccia per gancio? Vuoi aprire un nuovo nodo di gancio nella tua città?
+      C'è qualcosa che vorresti migliorare? Per contribuire i sorgenti sono liberi e disponibili 
+      <a href='https://git.lattuga.net/cisti/gancio'>qui</a>. Aiuti e suggerimenti sono sempre benvenuti, puoi scriverci
+      su underscore chicciola autistici.org
+
+</template>
\ No newline at end of file
diff --git a/pages/admin.vue b/pages/admin.vue
new file mode 100644
index 00000000..330b93f4
--- /dev/null
+++ b/pages/admin.vue
@@ -0,0 +1,196 @@
+<template lang="pug">
+  b-modal(hide-footer @hidden='$router.replace("/")' :title='$t("Admin")' 
+    :visible='true' size='lg')
+    el-tabs(tabPosition='left' v-model='tab')
+
+      //- USERS
+      el-tab-pane.pt-1
+        template(slot='label')
+          v-icon(name='users')
+          span.ml-1 {{$t('Users')}}
+        el-table(:data='paginatedUsers' small)
+          el-table-column(label='Email')
+            template(slot-scope='data')
+              el-popover(trigger='hover' :content='data.row.description' width='400')
+                span(slot='reference') {{data.row.email}}
+          el-table-column(label='Azioni')
+            template(slot-scope='data')
+              el-button.mr-1(size='mini'
+                :type='data.row.is_active?"warning":"success"'
+                @click='toggle(data.row)') {{data.row.is_active?$t('Deactivate'):$t('Activate')}}
+              el-button(size='mini'
+                :type='data.row.is_admin?"danger":"warning"'
+                @click='toggleAdmin(data.row)') {{data.row.is_admin?$t('Remove Admin'):$t('Admin')}}
+        el-pagination(:page-size='perPage' :currentPage.sync='userPage' :total='users.length')
+
+      //- PLACES
+      el-tab-pane.pt-1
+        template(slot='label')
+          v-icon(name='map-marker-alt')
+          span.ml-1 {{$t('Places')}}
+        p {{$t('admin_place_explanation')}}
+        el-form.mb-2(:inline='true' label-width='120px')
+          el-form-item(:label="$t('Name')")
+            el-input.mr-1(:placeholder='$t("Name")' v-model='place.name')
+          el-form-item(:label="$t('Address')")
+            el-input.mr-1(:placeholder='$t("Address")' v-model='place.address')
+          el-button(variant='primary' @click='savePlace') {{$t('Save')}}
+        b-table(selectable :items='places' :fields='placeFields' striped hover 
+          small selectedVariant='success'  primary-key='id' 
+          select-mode="single" @row-selected='placeSelected'
+          :per-page='perPage' :current-page='placePage')
+        el-pagination(:page-size='perPage' :currentPage.sync='placePage' :total='places.length')
+
+      //- EVENTS
+      el-tab-pane.pt-1
+        template(slot='label')
+          v-icon(name='calendar')
+          span.ml-1 {{$t('Events')}}
+        p {{$t('event_confirm_explanation')}}
+        el-table(:data='paginatedEvents' small primary-key='id' v-loading='loading')
+          el-table-column(:label='$t("Name")')
+            template(slot-scope='data') {{data.row.title}}
+          el-table-column(:label='$t("Where")')
+            template(slot-scope='data') {{data.row.place.name}}
+          el-table-column(:label='$t("Confirm")')
+            template(slot-scope='data')
+              el-button(type='primary' @click='confirm(data.row.id)' size='mini') {{$t('Confirm')}}
+              el-button(type='success' @click='preview(data.row.id)' size='mini') {{$t('Preview')}}
+
+        el-pagination(:page-size='perPage' :currentPage.sync='eventPage' :total='events.length')
+
+      //- TAGS
+      el-tab-pane.pt-1
+        template(slot='label')
+          v-icon(name='tag')
+          span  {{$t('Tags')}}
+        p {{$t('admin_tag_explanation')}}
+          el-tag(v-if='tag.tag' :color='tag.color || "grey"' size='mini') {{tag.tag}}
+        el-form(:inline='true' label-width='120px')
+          el-form-item(:label="$t('Color')")
+            el-color-picker(v-model='tag.color' @change='updateColor')
+        el-table(:data='paginatedTags' striped small hover
+          highlight-current-row @current-change="tagSelected")
+          el-table-column(label='Tag')
+            template(slot-scope='data')
+              el-tag(:color='data.row.color || "grey"' size='mini') {{data.row.tag}}
+        el-pagination(:page-size='perPage' :currentPage.sync='tagPage' :total='tags.length')
+
+      //- SETTINGS
+      el-tab-pane.pt-1
+        template(slot='label')
+          v-icon(name='tools')
+          span  {{$t('Settings')}}
+        el-form(inline)
+          span {{$t('admin_mastodon_explanation')}}
+          el-input(v-model="mastodon_instance")
+            span(slot='prepend') {{$t('Mastodon instance')}}
+            el-button(slot='append' @click='associate' variant='success' type='success') {{$t('Associate')}}
+
+</template>
+<script>
+import { mapState } from 'vuex'
+import api from '@/plugins/api'
+import { Message } from 'element-ui'
+
+export default {
+  name: 'Admin',
+  data () {
+    return {
+      perPage: 10,
+      users: [],
+      userFields: ['email', 'action'],
+      placeFields: ['name', 'address'],
+      placePage: 1,
+      userPage: 1,
+      eventPage: 1,
+      tagPage: 1,
+      tagFields: ['tag', 'color'],
+      description: '',
+      place: {name: '', address: '' },
+      tag: {name: '', color: ''},
+      events: [],
+      loading: false,
+      mastodon_instance: '',
+      settings: {},
+      tab: "0",
+    }
+  },
+  async mounted () {
+    const code = this.$route.query.code
+    if (code) {
+      this.tab = "4"
+      const instance = await api.setCode({code, is_admin: true})
+    }
+    // this.users = await api.getUsers()
+    // this.events = await api.getUnconfirmedEvents()
+    // this.settings = await api.getAdminSettings()
+    this.mastodon_instance = this.settings.mastodon_auth && this.settings.mastodon_auth.instance
+  },
+  computed: {
+    ...mapState(['tags', 'places']),
+    paginatedEvents () {
+      return this.events.slice((this.eventPage-1) * this.perPage,
+        this.eventPage * this.perPage)
+    },
+    paginatedTags () {
+      return this.tags.slice((this.tagPage-1) * this.perPage,
+        this.tagPage * this.perPage)
+    },
+    paginatedUsers () {
+      return this.users.slice((this.userPage-1) * this.perPage,
+        this.userPage * this.perPage)
+    }
+  },
+  methods: {
+    placeSelected (items) {
+      if (items.length === 0 ) {
+        this.place.name = this.place.address = ''
+        return
+      }
+      const item = items[0]
+      this.place.name = item.name
+      this.place.address = item.address
+      this.place.id = item.id
+    },
+    tagSelected (tag) {
+      this.tag = tag
+    },
+    async savePlace () {
+      const place = await api.updatePlace(this.place)
+    },
+    async toggle(user) {
+      user.is_active = !user.is_active
+      const newuser = await api.updateUser(user)
+    },
+    async toggleAdmin(user) {
+      user.is_admin = !user.is_admin
+      const newuser = await api.updateUser(user)
+    },
+    async updateColor () {
+      const newTag = await api.updateTag(this.tag)
+    },
+    preview (id) {
+      this.$router.push(`/event/${id}`)
+    },
+    async associate () {
+      if (!this.mastodon_instance) return
+      const url = await api.getAuthURL({instance: this.mastodon_instance, admin: true})
+      setTimeout( () => window.location.href=url, 100);
+    },
+    async confirm (id) {
+      try {
+        this.loading = true
+        await api.confirmEvent(id)
+        this.loading = false
+        Message({
+          message: this.$t('event_confirmed'),
+          type: 'success'
+        })
+        this.events = this.events.filter(e => e.id !== id)
+      } catch (e) {
+      }
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/pages/Register.vue b/pages/register.vue
similarity index 95%
rename from pages/Register.vue
rename to pages/register.vue
index ce0afef8..86891161 100644
--- a/pages/Register.vue
+++ b/pages/register.vue
@@ -18,8 +18,8 @@
 </template>
 
 <script>
-import api from '~/plugins/api'
-import { mapActions } from 'vuex';
+import api from '@/plugins/api'
+import { mapActions } from 'vuex'
 import { Message } from 'element-ui'
 
 export default {
diff --git a/plugins/api.js b/plugins/api.js
index 72a7dc82..fe6664c5 100644
--- a/plugins/api.js
+++ b/plugins/api.js
@@ -55,7 +55,7 @@ export default {
   checkRecoverCode: recover_code => post('/user/check_recover_code', { recover_code }),
   recoverPassword: (recover_code, password) => post('/user/recover_password', { recover_code, password }),
 
-  getAllEvents: (month, year) => get(`/event/${year}/${month}/`),
+  getAllEvents: (month, year) => get(`/event/${year}/${month}`),
   getUnconfirmedEvents: () => get('/event/unconfirmed'),
 
   confirmEvent: id => get(`/event/confirm/${id}`),
diff --git a/server/api/controller/user.js b/server/api/controller/user.js
index 923e2414..3e8c1938 100644
--- a/server/api/controller/user.js
+++ b/server/api/controller/user.js
@@ -1,21 +1,21 @@
-const jwt = require('jsonwebtoken')
-const Mastodon = require('mastodon-api')
-
-const User = require('../models/user')
-const { Event, Tag, Place } = require('../models/event')
-const settingsController = require('./settings')
-const eventController = require('./event')
-const config = require('../config')
-const mail = require('../mail')
-const { Op } = require('sequelize')
 const fs = require('fs')
 const path = require('path')
 const crypto = require('crypto')
+const jwt = require('jsonwebtoken')
+const Mastodon = require('mastodon-api')
+const { Op } = require('sequelize')
+
+const User = require('../models/user')
+const config = require('../config')
+const mail = require('../mail')
+const { Event, Tag, Place } = require('../models/event')
+const settingsController = require('./settings')
+const eventController = require('./event')
 
 const userController = {
-  async login (req, res) {
+  async login(req, res) {
     // find the user
-    const user = await User.findOne({ where: { email: { [Op.eq]: req.body.email } } })
+    const user = await User.findOne({ where: { email: { [Op.eq]: req.body && req.body.email } } })
     if (!user) {
       res.status(404).json({ success: false, message: 'AUTH_FAIL' })
     } else if (user) {
@@ -28,7 +28,7 @@ const userController = {
         // if user is found and password is right
         // create a token
         const payload = { email: user.email }
-        var token = jwt.sign(payload, config.secret)
+        const token = jwt.sign(payload, config.secret)
         res.json({
           success: true,
           message: 'Enjoy your token!',
@@ -39,13 +39,13 @@ const userController = {
     }
   },
 
-  async setToken (req, res) {
+  async setToken(req, res) {
     req.user.mastodon_auth = req.body
     await req.user.save()
     res.json(req.user)
   },
 
-  async delEvent (req, res) {
+  async delEvent(req, res) {
     const event = await Event.findByPk(req.params.id)
     // check if event is mine (or user is admin)
     if (event && (req.user.is_admin || req.user.id === event.userId)) {
@@ -63,7 +63,7 @@ const userController = {
   },
 
   // ADD EVENT
-  async addEvent (req, res) {
+  async addEvent(req, res) {
     const body = req.body
 
     // remove description tag and create anchor tags
@@ -113,7 +113,7 @@ const userController = {
     return res.json(event)
   },
 
-  async updateEvent (req, res) {
+  async updateEvent(req, res) {
     const body = req.body
     const event = await Event.findByPk(body.id)
     if (!req.user.is_admin && event.userId !== req.user.id) {
@@ -154,7 +154,7 @@ const userController = {
     return res.json(newEvent)
   },
 
-  async getAuthURL (req, res) {
+  async getAuthURL(req, res) {
     const instance = req.body.instance
     const is_admin = req.body.admin && req.user.is_admin
     const callback = `${config.baseurl}/${is_admin ? 'admin/oauth' : 'settings'}`
@@ -172,7 +172,7 @@ const userController = {
     res.json(url)
   },
 
-  async code (req, res) {
+  async code(req, res) {
     const { code, is_admin } = req.body
     let client_id, client_secret, instance
     const callback = `${config.baseurl}/${is_admin ? 'admin/oauth' : 'settings'}`
@@ -202,7 +202,7 @@ const userController = {
     }
   },
 
-  async forgotPassword (req, res) {
+  async forgotPassword(req, res) {
     const email = req.body.email
     const user = await User.findOne({ where: { email: { [Op.eq]: email } } })
     if (!user) return res.sendStatus(200)
@@ -213,7 +213,7 @@ const userController = {
     res.sendStatus(200)
   },
 
-  async checkRecoverCode (req, res) {
+  async checkRecoverCode(req, res) {
     const recover_code = req.body.recover_code
     if (!recover_code) return res.sendStatus(400)
     const user = await User.findOne({ where: { recover_code: { [Op.eq]: recover_code } } })
@@ -221,7 +221,7 @@ const userController = {
     res.json(user)
   },
 
-  async updatePasswordWithRecoverCode (req, res) {
+  async updatePasswordWithRecoverCode(req, res) {
     const recover_code = req.body.recover_code
     if (!recover_code) return res.sendStatus(400)
     const password = req.body.password
@@ -232,18 +232,18 @@ const userController = {
     res.sendStatus(200)
   },
 
-  async current (req, res) {
+  async current(req, res) {
     res.json(req.user)
   },
 
-  async getAll (req, res) {
+  async getAll(req, res) {
     const users = await User.findAll({
       order: [['createdAt', 'DESC']]
     })
     res.json(users)
   },
 
-  async update (req, res) {
+  async update(req, res) {
     const user = await User.findByPk(req.body.id)
     if (user) {
       if (!user.is_active && req.body.is_active) {
@@ -256,7 +256,8 @@ const userController = {
     }
   },
 
-  async register (req, res) {
+  async register(req, res) {
+    console.error('register !!', req)
     const n_users = await User.count()
     try {
       if (n_users === 0) {
diff --git a/server/index.js b/server/index.js
index ebcf3d73..79bda006 100644
--- a/server/index.js
+++ b/server/index.js
@@ -1,8 +1,13 @@
 const express = require('express')
 const consola = require('consola')
+const bodyParser = require('body-parser')
 const { Nuxt, Builder } = require('nuxt')
 const app = express()
 const cors = require('cors')
+const corsConfig = {
+  allowedHeaders: ['Authorization'],
+  exposeHeaders: ['Authorization']
+}
 
 // Import and Set Nuxt.js options
 const config = require('../nuxt.config.js')
@@ -23,7 +28,11 @@ async function start() {
   }
 
   // Give nuxt middleware to express
-  app.use(cors())
+  app.use(cors(corsConfig))
+  // app.use(morgan('dev'))
+  // app.set('views', path.join)
+  app.use(bodyParser.urlencoded({ extended: false }))
+  app.use(bodyParser.json())
   app.use(nuxt.render)
 
   // Listen the server

From eed3896396e12c9f56db14d2300b3446a5a41c12 Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Tue, 23 Apr 2019 13:45:52 +0000
Subject: [PATCH 04/14] keep going with api porting in nuxt

---
 .eslintrc.js            |  24 +++++++
 components/Calendar.vue |  15 ++---
 components/Event.vue    |  19 +++---
 components/Home.vue     |   2 +-
 nuxt.config.js          |  11 +++-
 package.json            |   7 +-
 pages/Login.vue         |   6 +-
 pages/admin.vue         |   4 ++
 pages/event/_id.vue     |  44 +++++++++----
 pages/new_event.vue     |   3 +-
 pages/register.vue      |   6 +-
 plugins/api.js          | 142 ++++++++++++++++++++--------------------
 plugins/element-ui.js   |   5 +-
 plugins/vuex-persist.js |   8 +++
 server/api/auth.js      |   5 +-
 server/index.js         |   3 +-
 store/index.js          |  23 +++----
 17 files changed, 191 insertions(+), 136 deletions(-)
 create mode 100644 .eslintrc.js
 create mode 100644 plugins/vuex-persist.js

diff --git a/.eslintrc.js b/.eslintrc.js
new file mode 100644
index 00000000..f5beea15
--- /dev/null
+++ b/.eslintrc.js
@@ -0,0 +1,24 @@
+module.exports = {
+  root: true,
+  env: {
+    browser: true,
+    node: true
+  },
+  parserOptions: {
+    parser: 'babel-eslint'
+  },
+  extends: [
+    '@nuxtjs',
+    // 'plugin:nuxt/recommended',
+    // 'plugin:prettier/recommended',
+    // 'prettier',
+    // 'prettier/vue'
+  ],
+  plugins: [
+    'prettier'
+  ],
+  // add your custom rules here
+  rules: {
+    'nuxt/no-cjs-in-config': 'off'
+  }
+}
diff --git a/components/Calendar.vue b/components/Calendar.vue
index 3dfcfb31..7787d5f4 100644
--- a/components/Calendar.vue
+++ b/components/Calendar.vue
@@ -1,12 +1,11 @@
 <template lang="pug">
     v-calendar#calendar.card(
       show-caps
-      :popover-expanded='true'
       :attributes='attributes'
       :from-page.sync='page'
       is-expanded is-inline)
-      div(slot='popover', slot-scope='{ customData }')
-        router-link(:to="`/event/${customData.id}`") {{customData.start_datetime|hour}} - {{customData.title}} @{{customData.place.name}}
+      //- div(slot='popover', slot-scope='{ customData }')
+      //- router-link(:to="`/event/${customData.id}`") {{customData.start_datetime|hour}} - {{customData.title}} @{{customData.place.name}}
 </template>
 <script>
 import { mapState, mapActions } from 'vuex'
@@ -40,10 +39,10 @@ export default {
         key: event.id,
         customData: event,
         order: event.start_datetime,
-        popover: {
-          slot: 'popover',
-          visibility: 'hover'
-        }
+        // popover: {
+        //   slot: 'popover',
+        //   visibility: 'hover'
+        // }
       }
       
       let color = event.tags && event.tags.length && event.tags[0].color ? event.tags[0].color : 'rgba(170,170,250,0.7)'
@@ -73,7 +72,7 @@ export default {
           highlight: {
             backgroundColor: '#aaffaa'
           },
-          popover: {label: this.$t('Today')}
+          // popover: {label: this.$t('Today')}
         }, 
         ...this.filteredEvents.map(this.eventToAttribute)
       ]
diff --git a/components/Event.vue b/components/Event.vue
index db25a65b..e2cd72bd 100644
--- a/components/Event.vue
+++ b/components/Event.vue
@@ -1,13 +1,14 @@
 <template lang="pug">
-  b-card(bg-variant='dark' text-variant='white' :class="{ withImg: event.image_path ? true : false }"
-    @click='$router.push("/event/" + event.id)'
-     :img-src='imgPath')
-      strong {{event.title}}
-      div <v-icon name='clock'/> {{event.start_datetime|datetime}}
-      //- span <v-icon name='map-marker-alt'/> {{event.place.name}}
-      br
-      el-tag.mr-1(:color='tag.color || "grey"' v-for='tag in event.tags' :key='tag.tag'
-        size='small' @click.stop='addSearchTag(tag)') {{tag.tag}}
+  nuxt-link(:to='`/event/${event.id}`')
+    //- @click='$router.push("/event/" + event.id)'
+    b-card(bg-variant='dark' text-variant='white' :class="{ withImg: event.image_path ? true : false }"
+      :img-src='imgPath')
+        strong {{event.title}}
+        div <v-icon name='clock'/> {{event.start_datetime|datetime}}
+        //- span <v-icon name='map-marker-alt'/> {{event.place.name}}
+        br
+        el-tag.mr-1(:color='tag.color || "grey"' v-for='tag in event.tags' :key='tag.tag'
+          size='small' @click.stop='addSearchTag(tag)') {{tag.tag}}
 </template>
 <script>
 import { mapState, mapActions } from 'vuex'
diff --git a/components/Home.vue b/components/Home.vue
index 2cdda1dd..f8d2dbde 100644
--- a/components/Home.vue
+++ b/components/Home.vue
@@ -40,7 +40,7 @@ export default {
   },
   watch: {
     filteredEvents() {
-      // this.$nextTick(this.$refs.magicgrid.positionItems) TOFIX
+      this.$nextTick(this.$refs.magicgrid.positionItems)
     }
   }
 }
diff --git a/nuxt.config.js b/nuxt.config.js
index 952fe72d..e89df3e1 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -16,7 +16,9 @@ module.exports = {
     link: [{ rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }]
   },
 
-  serverMiddleware: [{ path: '/api', handler: '@/server/api/index.js' }],
+  serverMiddleware: [
+    { path: '/api', handler: '@/server/api/index.js' }
+  ],
 
   /*
    ** Customize the progress-bar color
@@ -39,7 +41,8 @@ module.exports = {
   plugins: ['@/plugins/element-ui', '@/plugins/filters',
     '@/plugins/i18n', '@/plugins/bootstrap-vue',
     '@/plugins/vue-awesome',
-    { src: '@/plugins/v-calendar', ssr: false },
+    '@/plugins/v-calendar',
+    { src: '@/plugins/vuex-persist', ssr: false },
     '@/plugins/magic-grid'],
 
   /*
@@ -53,6 +56,8 @@ module.exports = {
    ** Axios module configuration
    */
   axios: {
+    prefix: '/api',
+    credentials: true
     // See https://github.com/nuxt-community/axios-module#options
   },
 
@@ -60,7 +65,7 @@ module.exports = {
    ** Build configuration
    */
   build: {
-    transpile: [/^element-ui/, /^vue-awesome/, /^vue-magic-grid/],
+    transpile: [/^element-ui/, /^vue-awesome/, /^vue-magic-grid/, /^vuex-persist/],
 
     /*
      ** You can extend webpack config here
diff --git a/package.json b/package.json
index c5211d39..729e4b36 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "precommit": "npm run lint"
   },
   "dependencies": {
-    "@nuxtjs/axios": "^5.3.6",
+    "@nuxtjs/axios": "^5.4.1",
     "axios": "^0.18.0",
     "bcrypt": "^3.0.5",
     "body-parser": "^1.18.3",
@@ -27,15 +27,18 @@
     "ics": "^2.13.2",
     "jsonwebtoken": "^8.5.1",
     "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",
     "sharp": "^0.22.0",
     "sqlite3": "^4.0.6",
     "v-calendar": "^0.9.7",
     "vue-awesome": "^3.5.1",
     "vue-i18n": "^8.10.0",
-    "vue-magic-grid": "^0.0.4"
+    "vue-magic-grid": "^0.0.4",
+    "vuex-persist": "^2.0.0"
   },
   "devDependencies": {
     "@nuxtjs/eslint-config": "^0.0.1",
diff --git a/pages/Login.vue b/pages/Login.vue
index 6c36308a..6ed16bbe 100644
--- a/pages/Login.vue
+++ b/pages/Login.vue
@@ -16,7 +16,7 @@
 <script>
 import { mapActions } from 'vuex'
 import { Message } from 'element-ui'
-import api from '@/plugins/api'
+// import api from '@/plugins/api'
 
 export default {
   name: 'Login',
@@ -36,7 +36,7 @@ export default {
         return
       }
       this.loading = true
-      await api.forgotPassword(this.email)
+      // await api.forgotPassword(this.email)
       this.loading = false
       Message({ message: this.$t('Check your email!'), type: 'success' })
     },
@@ -44,7 +44,7 @@ export default {
       e.preventDefault()
       try {
         this.loading = true
-        const user = await api.login(this.email, this.password)
+        const user = await this.$axios.$post('/login', { email: this.email, password: this.password })
         this.loading = false
         if (!user) {
           Message({ message: this.$t('Login error'), type: 'error' })
diff --git a/pages/admin.vue b/pages/admin.vue
index 330b93f4..3ffdcc39 100644
--- a/pages/admin.vue
+++ b/pages/admin.vue
@@ -127,6 +127,10 @@ export default {
     // this.settings = await api.getAdminSettings()
     this.mastodon_instance = this.settings.mastodon_auth && this.settings.mastodon_auth.instance
   },
+  async asyncData ({ $axios, params }) {
+    const users = await $axios.$get('/users')
+    return { users }
+  },
   computed: {
     ...mapState(['tags', 'places']),
     paginatedEvents () {
diff --git a/pages/event/_id.vue b/pages/event/_id.vue
index f7e1aa6f..6873a2cf 100644
--- a/pages/event/_id.vue
+++ b/pages/event/_id.vue
@@ -1,8 +1,9 @@
 <template lang="pug">
   b-modal#eventDetail(ref='eventDetail' hide-body hide-header hide-footer @hidden='$router.replace("/")' size='lg' :visible='true')
     b-card(no-body, :img-src='imgPath' v-loading='loading')
-      el-button.close_button(circle icon='el-icon-close' type='success'
-        @click='$refs.eventDetail.hide()')
+      nuxt-link(to='/')
+        el-button.close_button(circle icon='el-icon-close' type='success'
+          @click='$refs.eventDetail.hide()')
       b-card-header
         h3 {{event.title}}
         v-icon(name='clock')
@@ -40,7 +41,7 @@
 </template>
 <script>
 import { mapState, mapActions } from 'vuex';
-import api from '@/plugins/api'
+// import api from '@/plugins/api'
 //import filters from '@/filters'
 
 export default {
@@ -61,17 +62,25 @@ export default {
       loading: true,
     }
   },
-  mounted () {
-    this.id = this.$route.params.id
-    this.load()
+  // mounted () {
+  //   this.id = this.$route.params.id
+  //   this.load()
+  // },
+  async asyncData ( { $axios, params }) {
+    console.error('daje dentro asyncData!')
+    console.error('async data porcod')
+    const event = await $axios.$get(`/event/${params.id}`)
+    // this.event = event
+    // this.loading = false
+    return { event, id: params.id, loading: false }
   },
   methods: {
     ...mapActions(['delEvent']),
-    async load () {
-      const event = await api.getEvent(this.id)
-      this.event = event
-      this.loading = false
-    },
+    // async load () {
+    //   const event = await this.api.getEvent(this.id)
+    //   this.event = event
+    //   this.loading = false
+    // },
     async remove () {
       await api.delEvent(this.event.id)
       this.delEvent(this.event.id)
@@ -80,11 +89,12 @@ export default {
     async toggle () {
       try {
         if (this.event.is_visible) {
-
-          await api.unconfirmEvent(this.id)
+          await this.$axios.$get(`/event/unconfirm/${this.id}`)
+          // await api.unconfirmEvent(this.id)
           this.event.is_visible = false
         } else {
-          await api.confirmEvent(this.id)
+          await this.$axios.$get(`/event/confirm/${this.id}`)
+          // await api.confirmEvent(this.id)
           this.event.is_visible = true
         }
       } catch (e) {
@@ -95,6 +105,12 @@ export default {
 }
 </script>
 <style>
+
+/* #eventDetail {
+  display: block !important;
+  opacity: 1;
+} */
+
 #eventDetail .modal-body {
   padding: 0px;
   width: 100%;
diff --git a/pages/new_event.vue b/pages/new_event.vue
index d5be35cb..e0c9bf23 100644
--- a/pages/new_event.vue
+++ b/pages/new_event.vue
@@ -62,7 +62,7 @@
 
 </template>
 <script>
-import api from '@/plugins/api'
+// import api from '@/plugins/api'
 import { mapActions, mapState } from 'vuex'
 import moment from 'dayjs'
 import Calendar from '@/components/Calendar'
@@ -110,7 +110,6 @@ export default {
       if (event.tags) {
         this.event.tags = event.tags.map(t => t.tag)
       }
-
     }
     this.updateMeta()
   },
diff --git a/pages/register.vue b/pages/register.vue
index 86891161..e746181b 100644
--- a/pages/register.vue
+++ b/pages/register.vue
@@ -6,14 +6,13 @@
       el-input.mb-2(ref='email' v-model='user.email' type='email'
         :placeholder='$t("Email")' autocomplete='email')
         span(slot='prepend') @
-      
+
       el-input.mb-2(v-model='user.password' type="password" placeholder="Password")
         v-icon(name='lock' slot='prepend')
 
       el-input.mb-2(v-model='user.description' type="textarea" rows='3' :placeholder="$t('Description')")
           v-icon(name='envelope-open-text')
 
-      
       el-button.float-right(plain type="success" icon='el-icon-arrow-right' @click='register') {{$t('Send')}}
 </template>
 
@@ -34,7 +33,8 @@ export default {
     ...mapActions(['login']),
     async register () {
       try {
-        const user = await api.register(this.user)
+        const user = await this.$axios.$post('/user', this.user) //api.register(this.user)
+        console.log(user)
         if (!user.is_admin) {
           this.$refs.modal.hide()
           Message({
diff --git a/plugins/api.js b/plugins/api.js
index fe6664c5..1bf5669c 100644
--- a/plugins/api.js
+++ b/plugins/api.js
@@ -1,82 +1,80 @@
-import axios from 'axios'
-import { getters } from '@/store'
-const api = axios.create({
-  baseURL: process.env.NODE_ENV === 'development' ? 'http://localhost:3000/api' : '/api',
-  withCredentials: true,
-  responseType: 'json',
-  headers: {
-    'Access-Control-Allow-Origin': '*',
-    'Access-Control-Allow-Credentials': 'true',
-    'Accept': 'application/json',
-    'Content-Type': 'application/json'
-  }
-})
+// import axios from 'axios'
+// import { getters } from '@/store'
+// const api = axios.create({
+//   baseURL: process.env.NODE_ENV === 'development' ? 'http://localhost:3000/api' : '/api',
+//   withCredentials: true,
+//   responseType: 'json',
+//   headers: {
+//   //   'Access-Control-Allow-Origin': '*',
+//   //   'Access-Control-Allow-Credentials': 'true',
+//   //   'Accept': 'application/json',
+//     'Content-Type': 'application/json'
+//   }
+// })
 
-function get(path) {
-  return api.get(path) //, { headers: { 'Authorization': getters.token } })
-    .then(res => res.data)
-    // .catch((e) => {
-    // if (e.response.status === 403) {
-    //   // store.commit('logout') // TOFIX
-    //   return false
-    // }
-    // throw e.response && e.response.data &&
-    //   e.response.data.errors && e.response.data.errors[0].message
-    // })
-}
+// export default function ({ $axios }) {
+//   function get(path) {
+//     return $axios.$get(path, { headers: { 'Authorization': 'Bearer ' + getters.token } })
+//   }
 
-function post(path, data) {
-  return api.post(path, data, { headers: { 'Authorization': getters.token } })
-    .then(res => res.data)
-    // .catch((e) => {
-    //   if (e.response.status === 403) {
-    //     // store.commit('logout') // TOFIX
-    //     return false
-    //   }
-    //   throw e.response && e.response.data &&
-    //     e.response.data.errors && e.response.data.errors[0].message
-    // })
-}
-function put(path, data) {
-  return api.put(path, data, { headers: { 'Authorization': getters.token } })
-    .then(ret => ret.data)
-}
+//   function post(path, data) {
+//     return $axios.$post(path, data)
+//   }
 
-function del(path) {
-  return api.delete(path, { headers: { 'Authorization': getters.token } }).then(ret => ret.data)
-}
+  // function post(path, data) {
+  //   return api.post(path, data) // , { headers: { 'Authorization': getters.token } })
+  //     .then(res => res.data)
+  //     .catch((e) => {
+  //       console.error(e)
+  //       if (e.response.status === 403) {
+  //         // store.commit('logout') // TOFIX
+  //         return false
+  //       }
+  //       throw e.response && e.response.data &&
+  //         e.response.data.errors && e.response.data.errors[0].message
+  //     })
+  // }
+  // function put(path, data) {
+  //   return api.put(path, data, { headers: { 'Authorization': getters.token } })
+  //     .then(ret => ret.data)
+  // }
 
-export default {
-  login: (email, password) => post('/login', { email, password }),
-  register: user => post('/user', user),
+  // function del(path) {
+  //   return api.delete(path, { headers: { 'Authorization': getters.token } }).then(ret => ret.data)
+  // }
 
-  // password recovery
-  forgotPassword: email => post('/user/recover', { email }),
-  checkRecoverCode: recover_code => post('/user/check_recover_code', { recover_code }),
-  recoverPassword: (recover_code, password) => post('/user/recover_password', { recover_code, password }),
+  // return {
+    // login: (email, password) => post('/login', { email, password }),
+    // register: user => post('/user', user)
 
-  getAllEvents: (month, year) => get(`/event/${year}/${month}`),
-  getUnconfirmedEvents: () => get('/event/unconfirmed'),
+  //   // password recovery
+  //   forgotPassword: email => post('/user/recover', { email }),
+  //   checkRecoverCode: recover_code => post('/user/check_recover_code', { recover_code }),
+  //   recoverPassword: (recover_code, password) => post('/user/recover_password', { recover_code, password }),
 
-  confirmEvent: id => get(`/event/confirm/${id}`),
-  unconfirmEvent: id => get(`/event/unconfirm/${id}`),
+  //   getAllEvents: (month, year) => get(`/event/${year}/${month}`),
+  //   getUnconfirmedEvents: () => get('/event/unconfirmed'),
 
-  addNotification: notification => post('/event/notification', notification),
-  delNotification: code => del(`/event/notification/${code}`),
+  //   confirmEvent: id => get(`/event/confirm/${id}`),
+  //   unconfirmEvent: id => get(`/event/unconfirm/${id}`),
 
-  addEvent: event => post('/user/event', event),
-  updateEvent: event => put('/user/event', event),
+  //   addNotification: notification => post('/event/notification', notification),
+  //   delNotification: code => del(`/event/notification/${code}`),
 
-  updatePlace: place => put('/place', place),
-  delEvent: eventId => del(`/user/event/${eventId}`),
-  getEvent: eventId => get(`/event/${eventId}`),
-  getMeta: () => get('/event/meta'),
-  getUser: () => get('/user'),
-  getUsers: () => get('/users'),
-  updateTag: tag => put('/tag', tag),
-  updateUser: user => put('/user', user),
-  getAuthURL: mastodonInstance => post('/user/getauthurl', mastodonInstance),
-  setCode: code => post('/user/code', code),
-  getAdminSettings: () => get('/settings')
-  // setAdminSetting: (key, value) => post('/settings', { key, value })
-}
+  //   addEvent: event => post('/user/event', event),
+  //   updateEvent: event => put('/user/event', event),
+
+  //   updatePlace: place => put('/place', place),
+  //   delEvent: eventId => del(`/user/event/${eventId}`),
+  //   getEvent: eventId => get(`/event/${eventId}`),
+  //   getMeta: () => get('/event/meta'),
+  //   getUser: () => get('/user'),
+  //   getUsers: () => get('/users'),
+  //   updateTag: tag => put('/tag', tag),
+  //   updateUser: user => put('/user', user),
+  //   getAuthURL: mastodonInstance => post('/user/getauthurl', mastodonInstance),
+  //   setCode: code => post('/user/code', code),
+  //   getAdminSettings: () => get('/settings')
+  //   // setAdminSetting: (key, value) => post('/settings', { key, value })
+//   }
+// }
diff --git a/plugins/element-ui.js b/plugins/element-ui.js
index 53fc4940..de888549 100644
--- a/plugins/element-ui.js
+++ b/plugins/element-ui.js
@@ -2,7 +2,10 @@ import Vue from 'vue'
 import { Button, Select, Tag, Option, Table, FormItem, Card,
   Form, Tabs, TabPane, Switch, Input, Loading, TimeSelect,
   TableColumn, ColorPicker, Pagination, Popover } from 'element-ui'
-// import locale from 'element-ui/lib/locale/lang/en'
+import localeEn from 'element-ui/lib/locale/lang/en'
+import localeIt from 'element-ui/lib/locale/lang/it'
+import locale from 'element-ui/lib/locale'
+locale.use(localeIt)
 
 export default () => {
   Vue.use(Button)
diff --git a/plugins/vuex-persist.js b/plugins/vuex-persist.js
new file mode 100644
index 00000000..8f0700ff
--- /dev/null
+++ b/plugins/vuex-persist.js
@@ -0,0 +1,8 @@
+// ~/plugins/vuex-persist.js
+import VuexPersistence from 'vuex-persist'
+
+export default ({ store }) => {
+  return new VuexPersistence({
+    reducer: state => ({ logged: state.logged, user: state.user, token: state.token })
+  }).plugin(store)
+}
diff --git a/server/api/auth.js b/server/api/auth.js
index 0727af5d..9bcffee7 100644
--- a/server/api/auth.js
+++ b/server/api/auth.js
@@ -6,7 +6,7 @@ const User = require('./models/user')
 const Auth = {
   fillUser(req, res, next) {
     const token =
-      req.body.token || req.params.token || req.headers['x-access-token']
+      req.body.token || req.params.token || req.headers.authorization
     if (!token) return next()
     jwt.verify(token, config.secret, async (err, decoded) => {
       if (err) return next()
@@ -20,7 +20,8 @@ const Auth = {
     const token =
       (req.body && req.body.token) ||
       req.params.token ||
-      req.headers['x-access-token']
+      req.headers.authorization
+    console.error('sono dentro isAuth ', token, req.headers)
     if (!token) return res.status(403).send({ message: 'Token not found' })
     jwt.verify(token, config.secret, async (err, decoded) => {
       if (err) {
diff --git a/server/index.js b/server/index.js
index 79bda006..edb79306 100644
--- a/server/index.js
+++ b/server/index.js
@@ -1,5 +1,6 @@
 const express = require('express')
 const consola = require('consola')
+const morgan = require('morgan')
 const bodyParser = require('body-parser')
 const { Nuxt, Builder } = require('nuxt')
 const app = express()
@@ -29,7 +30,7 @@ async function start() {
 
   // Give nuxt middleware to express
   app.use(cors(corsConfig))
-  // app.use(morgan('dev'))
+  app.use(morgan('dev'))
   // app.set('views', path.join)
   app.use(bodyParser.urlencoded({ extended: false }))
   app.use(bodyParser.json())
diff --git a/store/index.js b/store/index.js
index e16fe1ac..f2172b0f 100644
--- a/store/index.js
+++ b/store/index.js
@@ -51,7 +51,6 @@ export const getters = {
       return 0
     })
   }
-
 }
 
 export const mutations = {
@@ -112,40 +111,34 @@ export const actions = {
     // set user if logged! TODO
 
     const now = new Date()
-    const events = await api.getAllEvents(now.getMonth() - 1, now.getFullYear())
+    // const events = await api.getAllEvents(now.getMonth() - 1, now.getFullYear())
+    const events = await this.$axios.$get(`/event/${now.getMonth() - 1}/${now.getFullYear()}`)
     commit('setEvents', events)
   },
-  async updateEvents({ commit }, date) {
-    console.log('dentro updateEvents ', date.month, api)
-    try {
-      const events = await api.getAllEvents(date.month - 1, date.year)
-      console.log('dopo getAll events', events)
-      commit('setEvents', events)
-    } catch (e) {
-      console.log(e)
-    }
-  },
   async updateMeta({ commit }) {
-    const { tags, places } = await api.getMeta()
+    const { tags, places } = await this.$axios.$get('/event/meta')
     commit('update', { tags, places })
   },
   async addEvent({ commit }, formData) {
-    const event = await api.addEvent(formData)
+    console.log('ciao addEvent')
+    const event = await this.$axios.$post('/user/event', formData) // .addEvent(formData)
     if (this.state.logged) {
       commit('addEvent', event)
     }
   },
   async updateEvent({ commit }, formData) {
-    const event = await api.updateEvent(formData)
+    const event = await this.$axios.$put('/user/event', formData)
     commit('updateEvent', event)
   },
   delEvent({ commit }, eventId) {
     commit('delEvent', eventId)
   },
   login({ commit }, user) {
+    this.$axios.setToken(user.token)
     commit('login', user)
   },
   logout({ commit }) {
+    this.$axios.setToken(false)
     commit('logout')
   },
   // search

From 3b80dd5f73b3327bcd9a40f672647428daddcd64 Mon Sep 17 00:00:00 2001
From: les <les@pop-os.localdomain>
Date: Fri, 26 Apr 2019 23:14:43 +0200
Subject: [PATCH 05/14] auth.nuxt.js plugin

---
 .vscode/vscode-kanban.json       | 142 +++++++++++++++++++++++++++++++
 components/Nav.vue               |  28 +++---
 layouts/default.vue              |  14 ---
 locales/it.json                  |  46 ++++++++++
 nuxt.config.js                   |  18 +++-
 package.json                     |   4 +
 pages/{new_event.vue => add.vue} |  56 ++++++------
 pages/admin.vue                  |  26 +++---
 pages/export.vue                 | 133 +++++++++++++++++++++++++++++
 pages/{Login.vue => login.vue}   |  30 +++----
 pages/register.vue               |  32 +++----
 pages/settings.vue               |  60 +++++++++++++
 plugins/i18n.js                  |  20 ++---
 server/api/auth.js               |   1 -
 server/api/controller/event.js   |   2 +-
 server/api/controller/user.js    |  24 ++++--
 server/api/index.js              |  12 ++-
 server/api/models/user.js        |   2 +-
 server/index.js                  |   3 +-
 store/index.js                   |  24 ++----
 20 files changed, 528 insertions(+), 149 deletions(-)
 create mode 100644 .vscode/vscode-kanban.json
 create mode 100644 locales/it.json
 rename pages/{new_event.vue => add.vue} (80%)
 create mode 100644 pages/export.vue
 rename pages/{Login.vue => login.vue} (58%)
 create mode 100644 pages/settings.vue

diff --git a/.vscode/vscode-kanban.json b/.vscode/vscode-kanban.json
new file mode 100644
index 00000000..47a6e887
--- /dev/null
+++ b/.vscode/vscode-kanban.json
@@ -0,0 +1,142 @@
+{
+  "done": [],
+  "in-progress": [],
+  "testing": [
+    {
+      "assignedTo": {
+        "name": "lesion"
+      },
+      "category": "feature",
+      "creation_time": "2019-04-23T19:47:35.777Z",
+      "id": "5",
+      "prio": 3,
+      "references": [],
+      "title": "server side auth"
+    }
+  ],
+  "todo": [
+    {
+      "assignedTo": {
+        "name": "lesion"
+      },
+      "category": "feature",
+      "creation_time": "2019-04-23T19:50:00.973Z",
+      "id": "7",
+      "prio": 1,
+      "references": [],
+      "title": "export page",
+      "type": "bug"
+    },
+    {
+      "assignedTo": {
+        "name": "lesion"
+      },
+      "category": "feature",
+      "creation_time": "2019-04-23T19:55:59.993Z",
+      "id": "10",
+      "prio": 1,
+      "references": [],
+      "title": "gestione errori form aggiungi evento",
+      "type": "bug"
+    },
+    {
+      "assignedTo": {
+        "name": "lesion"
+      },
+      "category": "feature",
+      "creation_time": "2019-04-23T19:50:55.458Z",
+      "id": "8",
+      "prio": 1,
+      "references": [],
+      "title": "rivedere ux / messaggi utente",
+      "type": "bug"
+    },
+    {
+      "assignedTo": {
+        "name": "lesion"
+      },
+      "category": "feature",
+      "creation_time": "2019-04-23T19:56:46.263Z",
+      "id": "11",
+      "prio": 1,
+      "references": [],
+      "title": "get comments / media from mastodon"
+    },
+    {
+      "assignedTo": {
+        "name": "lesion"
+      },
+      "category": "feature",
+      "creation_time": "2019-04-23T19:45:27.613Z",
+      "description": {
+        "content": "probabilmente devo far diventare il campo senza timezone",
+        "mime": "text/markdown"
+      },
+      "id": "2",
+      "prio": 0,
+      "references": [],
+      "title": "check date timezone",
+      "type": "bug"
+    },
+    {
+      "assignedTo": {
+        "name": "lesion"
+      },
+      "category": "feature",
+      "creation_time": "2019-04-23T19:48:54.407Z",
+      "description": {
+        "content": "probabilmente lato client dovrei aggiungere una classe css al body per capire se js e' attivo o meno e poi lavorare di css",
+        "mime": "text/markdown"
+      },
+      "id": "6",
+      "prio": 0,
+      "references": [],
+      "title": "risolvere le modali quando il js e' disabilitato",
+      "type": "bug"
+    },
+    {
+      "assignedTo": {
+        "name": "lesion"
+      },
+      "category": "feature",
+      "creation_time": "2019-04-23T19:46:46.332Z",
+      "id": "3",
+      "prio": 0,
+      "references": [],
+      "title": "export lista"
+    },
+    {
+      "assignedTo": {
+        "name": "lesion"
+      },
+      "category": "feature",
+      "creation_time": "2019-04-23T19:44:56.705Z",
+      "id": "1",
+      "references": [],
+      "title": "popup sul calendario"
+    },
+    {
+      "assignedTo": {
+        "name": "lesion"
+      },
+      "category": "feature",
+      "creation_time": "2019-04-23T19:47:10.704Z",
+      "id": "4",
+      "prio": 0,
+      "references": [],
+      "title": "traduzione in inglese"
+    },
+    {
+      "assignedTo": {
+        "name": "lesion"
+      },
+      "category": "feature",
+      "creation_time": "2019-04-23T19:51:05.917Z",
+      "id": "9",
+      "prio": -1,
+      "references": [],
+      "title": "documentare sorgenti",
+      "type": "bug"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/components/Nav.vue b/components/Nav.vue
index 892755e5..67a682e2 100644
--- a/components/Nav.vue
+++ b/components/Nav.vue
@@ -4,21 +4,21 @@
     b-navbar-brand(to='/') <img id='logo' src='gancio_logo.svg'/>
     b-collapse#nav_collapse(is-nav)
       b-navbar-nav
-        b-nav-item(v-if='!logged' to='/login'  v-b-tooltip :title='$t("Login")') <v-icon color='lightgreen' name='lock' /> 
-          span.d-md-none  {{$t('User')}}
-        b-nav-item(to='/new_event' v-b-tooltip :title='$t("Add Event")' ) <v-icon color='lightgreen' name='plus'/> 
-          span.d-md-none  {{$t('Add Event')}}
-        b-nav-item(v-if='logged' to='/settings' v-b-tooltip :title='$t("Settings")') <v-icon color='orange' name='cog'/>
-          span.d-md-none  {{$t('Settings')}}
-        b-nav-item(v-if='user.is_admin' to='/admin' v-b-tooltip :title='$t("Admin")') <v-icon color='lightblue' name='tools'/>
-          span.d-md-none  {{$t('Admin')}}
-        b-nav-item(to='/export' v-b-tooltip :title='$t("Export")') <v-icon name='file-export' color='yellow'/>
-          span.d-md-none  {{$t('Export')}}
-        b-nav-item(v-if='logged' @click='logout' v-b-tooltip :title='$t("Logout")') <v-icon color='red' name='sign-out-alt'/>
-          span.d-md-none  {{$t('Logout')}}
+        b-nav-item(v-if='!$auth.loggedIn' to='/login'  v-b-tooltip :title='$t("common.login")') <v-icon color='lightgreen' name='lock' /> 
+          span.d-md-none  {{$t('common.login')}}
+        b-nav-item(to='/add' v-b-tooltip :title='$t("common.add_event")' ) <v-icon color='lightgreen' name='plus'/> 
+          span.d-md-none  {{$t('common.add_event')}}
+        b-nav-item(v-if='$auth.loggedIn' to='/settings' v-b-tooltip :title='$t("common.settings")') <v-icon color='orange' name='cog'/>
+          span.d-md-none  {{$t('common.settings')}}
+        b-nav-item(v-if='$auth.hasScope(`admin`)' to='/admin' v-b-tooltip :title='$t("common.admin")') <v-icon color='lightblue' name='tools'/>
+          span.d-md-none  {{$t('common.admin')}}
+        b-nav-item(to='/export' v-b-tooltip :title='$t("common.export")') <v-icon name='file-export' color='yellow'/>
+          span.d-md-none  {{$t('common.export')}}
+        b-nav-item(v-if='auth.loggedIn' @click='logout' v-b-tooltip :title='$t("common.logout")') <v-icon color='red' name='sign-out-alt'/>
+          span.d-md-none  {{$t('common.logout')}}
     b-navbar-nav.ml-auto
         b-nav-item(to='/about')
-          span  {{$t('Info')}} <v-icon color='#ff9fc4' name='question-circle'/>
+          span  {{$t('common.info')}} <v-icon color='#ff9fc4' name='question-circle'/>
 
 </template>
 <script>
@@ -26,7 +26,7 @@ import {mapState, mapActions} from 'vuex'
 export default {
   name: 'Nav',
   computed: {
-    ...mapState(['logged', 'user','filters']),
+    ...mapState(['filters', 'auth']),
     filters_tags: {
       set (value) {
         this.setSearchTags(value)
diff --git a/layouts/default.vue b/layouts/default.vue
index 2fafd1c0..fe2d459b 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -3,29 +3,15 @@
     Nav
     Home
     transition(name="fade" mode="out-in")
-      //- router-view(name='modal')
       nuxt
 </template>
 
 <script>
-// import moment from 'dayjs'
-// import api from './api'
-// import { mapActions } from 'vuex';
-// import Register from './components/Register.vue'
-// import Login from './components/Login.vue'
-// import Settings from './components/Settings.vue'
-// import newEvent from './components/newEvent.vue'
-// import eventDetail from './components/EventDetail.vue'
 import Home from '~/components/Home.vue'
 import Nav from '~/components/Nav.vue'
 
 export default {
   name: 'App',
-  // mounted () {
-  //   this.updateMeta()
-  // },
-  // methods: mapActions(['updateMeta']),
-  // components: { Nav, Register, Login, Home, Settings, newEvent, eventDetail },
   components: { Nav, Home },
 }
 </script>
diff --git a/locales/it.json b/locales/it.json
new file mode 100644
index 00000000..efa952cb
--- /dev/null
+++ b/locales/it.json
@@ -0,0 +1,46 @@
+{
+  "common": {
+    "login": "Entra",
+    "email": "Email",
+    "password": "Password",
+    "register": "Registrati",
+    "send": "Invia",
+    "description": "Descrizione",
+    "info": "Info",
+    "add_event": "Aggiungi evento",
+    "export": "Esporta",
+    "settings": "Impostazioni",
+    "admin": "Amministra",
+    "logout": "Esci",
+    "where": "Dove",
+    "when": "Quando",
+    "next": "Avanti",
+    "what": "Cosa",
+    "address": "Indirizzo",
+    "media": "Media"
+  },
+
+  "login": {
+    "description": "Entrando puoi pubblicare nuovi eventi.",
+    "not_registered": "Non sei registrata?",
+    "forgot_password": "Ho dimenticato la password",
+    "insert_email": "Inserisci la mail",
+    "check_email": "Controlla la tua casella di posta (anche la cartella spam)",
+    "error": "Errore nel login"
+  },
+
+  "register": {
+    "description": "I movimenti hanno bisogno di organizzarsi e autofinanziarsi. <br/>Questo è un dono per voi, usatelo solo per eventi non commerciali e ovviamente antifascisti, antisessisti, antirazzisti. <br/>Prima di poter pubblicare <strong>dobbiamo approvare l'account</strong>, considera che <strong>dietro questo sito ci sono delle persone</strong> di carne e sangue, scrivici quindi due righe per farci capire che eventi vorresti pubblicare.",
+    "complete": "",
+    "admin_complete": ""
+  },
+
+  "event": {
+    "anon": "",
+    "anon_description": "",
+    "where_description" : "Dov'è il gancio? Se è un luogo fisico, scrivi il suo nome del per esteso (tipo 'Mezcal Squat'), se è una Piazza/Via metti quella (tipo 'Piazza Castello, Torino'). Se trovi già il luogo dell'evento premilo e l'indirizzo verrà autocompletato.",
+    "address_description": "",
+    "tag_description": "Puoi inserire un tag (es. concerto, corteo)"
+  }
+}
+
diff --git a/nuxt.config.js b/nuxt.config.js
index e89df3e1..29c34492 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -15,7 +15,7 @@ module.exports = {
     ],
     link: [{ rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }]
   },
-
+  
   serverMiddleware: [
     { path: '/api', handler: '@/server/api/index.js' }
   ],
@@ -50,7 +50,8 @@ module.exports = {
    */
   modules: [
     // Doc: https://axios.nuxtjs.org/usage
-    '@nuxtjs/axios'
+    '@nuxtjs/axios',
+    '@nuxtjs/auth'
   ],
   /*
    ** Axios module configuration
@@ -61,6 +62,19 @@ module.exports = {
     // See https://github.com/nuxt-community/axios-module#options
   },
 
+  auth: {
+    strategies: {
+      local: {
+        endpoints: {
+          login: { url: '/auth/login', method: 'post', propertyName: 'token' },
+          logout: { url: '/auth/logout', method: 'post' },
+          user: { url: '/auth/user', method: 'get', propertyName: 'user' }
+        },
+        // tokenRequired: true,
+        // tokenType: 'bearer',
+      }
+    }
+  },
   /*
    ** Build configuration
    */
diff --git a/package.json b/package.json
index 729e4b36..ecb78137 100644
--- a/package.json
+++ b/package.json
@@ -13,18 +13,22 @@
     "precommit": "npm run lint"
   },
   "dependencies": {
+    "@nuxtjs/auth": "^4.5.3",
     "@nuxtjs/axios": "^5.4.1",
     "axios": "^0.18.0",
     "bcrypt": "^3.0.5",
     "body-parser": "^1.18.3",
     "bootstrap-vue": "^2.0.0-rc.16",
+    "cookie-parser": "^1.4.4",
     "cors": "^2.8.5",
     "cross-env": "^5.2.0",
     "dayjs": "^1.8.11",
     "element-ui": "^2.4.11",
     "email-templates": "^5.0.4",
     "express": "^4.16.4",
+    "express-jwt": "^5.3.1",
     "ics": "^2.13.2",
+    "js-cookie": "^2.2.0",
     "jsonwebtoken": "^8.5.1",
     "mastodon-api": "^1.3.0",
     "morgan": "^1.9.1",
diff --git a/pages/new_event.vue b/pages/add.vue
similarity index 80%
rename from pages/new_event.vue
rename to pages/add.vue
index e0c9bf23..ae5c2ac1 100644
--- a/pages/new_event.vue
+++ b/pages/add.vue
@@ -1,62 +1,62 @@
 <template lang="pug">
   b-modal(ref='modal' @hidden='$router.replace("/")' size='lg' :visible='true'
-    :title="edit?$t('Edit event'):$t('New event')" hide-footer)
+    :title="edit?$t('common.edit_event'):$t('common.add_event')" hide-footer)
     el-form
       el-tabs.mb-2(v-model='activeTab' v-loading='sending')
 
         //- NOT LOGGED EVENT
         el-tab-pane(v-if='!logged')
-          span(slot='label') {{$t('anon_newevent')}} <v-icon name='user-secret'/>
-          p(v-html="$t('anon_newevent_explanation')")
-          el-button.float-right(@click='next' :disabled='!couldProceed') {{$t('Next')}}
+          span(slot='label') {{$t('event.anon')}} <v-icon name='user-secret'/>
+          p(v-html="$t('event.anon_description')")
+          el-button.float-right(@click='next' :disabled='!couldProceed') {{$t('common.next')}}
 
         //- WHERE
         el-tab-pane
-          span(slot='label') {{$t('Where')}} <v-icon name='map-marker-alt'/>
-          div {{$t('where_explanation')}}
+          span(slot='label') {{$t('common.where')}} <v-icon name='map-marker-alt'/>
+          div {{$t('common.where')}} 
           el-select.mb-3(v-model='event.place.name' @change='placeChoosed' filterable allow-create default-first-option)
             el-option(v-for='place in places_name' :label='place' :value='place' :key='place.id')
-          div {{$t("Address")}}
-          el-input.mb-3(ref='address' v-model='event.place.address' @keydown.native.enter='next')
-          el-button.float-right(@click='next' :disabled='!couldProceed') {{$t('Next')}}
+          div {{$t("common.address")}}
+          el-input.mb-3(ref='address' v-model='event.place.address' :disabled='places_name.indexOf(event.place.name)>-1' @keydown.native.enter='next')
+          el-button.float-right(@click='next' :disabled='!couldProceed') {{$t('common.next')}}
 
         //- WHEN
         el-tab-pane
-          span(slot='label') {{$t('When')}} <v-icon name='clock'/>
-          span {{event.multidate ? $t('dates_explanation') : $t('date_explanation')}}
-            el-switch.float-right(v-model='event.multidate' :active-text="$t('multidate_explanation')")
+          span(slot='label') {{$t('common.when')}} <v-icon name='clock'/>
+          span {{event.multidate ? $t('event.dates_description') : $t('event.date_description')}}
+            el-switch.float-right(v-model='event.multidate' :active-text="$t('event.multidate_description')")
           v-date-picker.mb-3(:mode='event.multidate ? "range" : "single"' v-model='date' is-inline
             is-expanded :min-date='new Date()' @input='date ? $refs.time_start.focus() : false')
-          div {{$t('time_start_explanation')}}
+          div {{$t('event.time_start_description')}}
           el-time-select.mb-3(ref='time_start'
             v-model="time.start"
             :picker-options="{ start: '00:00', step: '00:30', end: '24:00'}")
-          div {{$t('time_end_explanation')}}
+          div {{$t('event.time_end_description')}}
           el-time-select(v-model='time.end'
             :picker-options="{start: '00:00', step: '00:30', end: '24:00'}")
-          el-button.float-right(@click='next' :disabled='!couldProceed') {{$t('Next')}}
+          el-button.float-right(@click='next' :disabled='!couldProceed') {{$t('common.next')}}
 
         //- WHAT
         el-tab-pane
-          span(slot='label') {{$t('What')}} <v-icon name='file-alt'/>
-          span {{$t('what_explanation')}}
+          span(slot='label') {{$t('common.what')}} <v-icon name='file-alt'/>
+          span {{$t('event.what_description')}}
           el-input.mb-3(v-model='event.title' ref='title')
-          span {{$t('description_explanation')}}
+          span {{$t('event.description_description')}}
           el-input.mb-3(v-model='event.description' type='textarea' :rows='9')
-          span {{$t('tag_explanation')}}
+          span {{$t('event.tag_description')}}
           br 
           el-select(v-model='event.tags' multiple filterable allow-create
             default-first-option placeholder='Tag')
             el-option(v-for='tag in tags' :key='tag.tag'
               :label='tag' :value='tag') 
 
-          el-button.float-right(@click.native='next' :disabled='!couldProceed') {{$t('Next')}}
+          el-button.float-right(@click.native='next' :disabled='!couldProceed') {{$t('common.next')}}
 
         el-tab-pane
-          span(slot='label') {{$t('Media')}} <v-icon name='image'/>
-          span {{$t('media_explanation')}}
-          b-form-file.mb-2(v-model='event.image', :placeholder='$t("Poster")' accept='image/*')
-          el-button.float-right(@click='done') {{edit?$t('Edit'):$t('Send')}}
+          span(slot='label') {{$t('common.media')}} <v-icon name='image'/>
+          span {{$t('event.media_description')}}
+          b-form-file.mb-2(v-model='event.image', :placeholder='$t("common.poster")' accept='image/*')
+          el-button.float-right(@click='done') {{edit?$t('common.edit'):$t('common.send')}}
 
 
 
@@ -121,6 +121,12 @@ export default {
       user: state => state.user,
       logged: state => state.logged
     }),
+    disableAddress () {
+      console.log('dentro disable Address')
+      const ret = this.places_name.find(p => p.name === this.event.place.name)
+      console.log(ret)
+      return ret
+    },
     couldProceed () {
       const t = this.logged ? -1 : 0
       switch(Number(this.activeTab)) {
@@ -203,7 +209,7 @@ export default {
         this.updateMeta()
         this.sending = false
         this.$refs.modal.hide()
-        Message({ type: 'success', message: this.logged ? this.$t('new_event_added') : this.$t('new_anon_event_added')})
+        Message({ type: 'success', message: this.logged ? this.$t('event.added') : this.$t('event.added_anon')})
       } catch (e) {
         this.sending = false
         console.error(e)
diff --git a/pages/admin.vue b/pages/admin.vue
index 3ffdcc39..0b83f1a1 100644
--- a/pages/admin.vue
+++ b/pages/admin.vue
@@ -95,6 +95,7 @@ import { Message } from 'element-ui'
 
 export default {
   name: 'Admin',
+  middleware: ['auth'],
   data () {
     return {
       perPage: 10,
@@ -116,18 +117,19 @@ export default {
       tab: "0",
     }
   },
-  async mounted () {
-    const code = this.$route.query.code
-    if (code) {
-      this.tab = "4"
-      const instance = await api.setCode({code, is_admin: true})
-    }
-    // this.users = await api.getUsers()
-    // this.events = await api.getUnconfirmedEvents()
-    // this.settings = await api.getAdminSettings()
-    this.mastodon_instance = this.settings.mastodon_auth && this.settings.mastodon_auth.instance
-  },
-  async asyncData ({ $axios, params }) {
+  // async mounted () {
+  //   const code = this.$route.query.code
+  //   if (code) {
+  //     this.tab = "4"
+  //     const instance = await api.setCode({code, is_admin: true})
+  //   }
+  //   // this.users = await api.getUsers()
+  //   // this.events = await api.getUnconfirmedEvents()
+  //   // this.settings = await api.getAdminSettings()
+  //   this.mastodon_instance = this.settings.mastodon_auth && this.settings.mastodon_auth.instance
+  // },
+  async asyncData ({ $axios, params, store }) {
+    console.log(store.state)
     const users = await $axios.$get('/users')
     return { users }
   },
diff --git a/pages/export.vue b/pages/export.vue
new file mode 100644
index 00000000..10ea1d07
--- /dev/null
+++ b/pages/export.vue
@@ -0,0 +1,133 @@
+<template lang="pug">
+  b-modal(ref='modal' @hidden='$router.replace("/")' 
+    :title='$t("Export")' :visible='true' size='lg' hide-footer)
+    p {{$t('export_intro')}}
+    
+    li(v-if='filters.tags.length') {{$t('Tags')}}:
+      el-tag.ml-1(color='#409EFF' size='mini' v-for='tag in filters.tags' :key='tag.tag') {{tag}}
+    li(v-if='filters.places.length') {{$t('Places')}}:
+      el-tag.ml-1(color='#409EFF' size='mini' v-for='place in filters.places' :key='place.id') {{place}}
+    el-tabs.mt-2(tabPosition='left' v-model='type')
+
+      el-tab-pane.pt-1(label='email' name='email')
+        p(v-html='$t(`export_email_explanation`)')
+        el-form(@submit.native.prevent)
+          //- el-switch(v-model='notification.notify_on_add' :active-text="$t('notify_on_insert')")
+          //- br
+          //- el-switch.mt-2(v-model='notification.send_notification' :active-text="$t('send_notification')") 
+          el-input.mt-2(v-model='notification.email' :placeholder="$t('Insert your address')" ref='email')
+          el-button.mt-2.float-right(native-type= 'submit' type='success' @click='add_notification') {{$t('Send')}}
+
+      el-tab-pane.pt-1(label='feed rss' name='feed')
+        span(v-html='$t(`export_feed_explanation`)')
+        el-input(v-model='link')
+          el-button(slot='append' plain type="primary" icon='el-icon-document' v-clipboard:copy="link") {{$t("Copy")}}
+
+      el-tab-pane.pt-1(label='ics/ical' name='ics')
+        p(v-html='$t(`export_ical_explanation`)')
+        el-input(v-model='link')
+          el-button(slot='append' plain type="primary" icon='el-icon-document' v-clipboard:copy="link") {{$t("Copy")}}
+
+      el-tab-pane.pt-1(label='list' name='list')
+        p(v-html='$t(`export_list_explanation`)')
+        el-card.mb-1(no-body header='Eventi')
+          b-list-group#list(flush)
+            b-list-group-item.flex-column.align-items-start(v-for="event in filteredEvents" :key='event.id'
+              :to='`/event/${event.id}`')
+                //- b-media
+                  img(v-if='event.image_path' slot="aside" :src="imgPath(event)" alt="Meia Aside" style='max-height: 60px')
+                small.float-right {{event.start_datetime|datetime}}
+                strong.mb-1 {{event.title}}
+                br
+                small.float-right {{event.place.name}}
+                el-tag.mr-1(:color='tag.color || "grey"' size='mini' v-for='tag in event.tags' :key='tag.tag') {{tag.tag}}
+        el-input.mb-1(type='textarea' v-model='script')
+        el-button.float-right(plain type="primary" icon='el-icon-document' v-clipboard:copy="script") Copy
+
+
+      el-tab-pane.pt-1(label='calendar' name='calendar')
+        p(v-html='$t(`export_calendar_explanation`)')
+        Calendar.mb-1
+        el-input.mb-1(type='textarea' v-model='script')
+        el-button.float-right(plain type="primary" icon='el-icon-document' v-clipboard:copy="script") Copy
+
+</template>
+<script>
+import { mapState } from 'vuex'
+import path from 'path'
+// import filters from '../filters'
+import Calendar from '@/components/Calendar'
+import {intersection} from 'lodash'
+// import api from '@/api'
+import { Message } from 'element-ui'
+
+export default {
+  name: 'Export',
+  components: { Calendar },
+  data () {
+    return {
+      type: 'email',
+      link: '',
+      export_list: true,
+      script: `<iframe>Ti piacerebbe</iframe>`,
+      notification: { email: '' },
+    }
+  },
+  // filters,
+  mounted () {
+    this.link = this.loadLink()
+  },
+  watch: {
+    type (value) {
+      this.link = this.loadLink()
+    }
+  },
+  methods: {
+    async add_notification () {
+      if (!this.notification.email){
+        Message({message:'Inserisci una mail', type: 'error'})
+        return this.$refs.email.focus()
+      }
+      await api.addNotification({ ...this.notification, filters: this.filters})
+      this.$refs.modal.hide()
+      Message({message: this.$t('email_notification_activated'), type: 'success'})
+    },
+    loadLink () {
+      const tags = this.filters.tags.join(',')
+      const places = this.filters.places.join(',')
+      let query = ''
+      if (tags || places) { 
+        query = '?'
+        if (tags) { 
+          query += 'tags=' + tags
+          if (places) { query += '&places=' + places }
+        } else {
+          query += 'places=' + places
+        }
+      }
+
+      return `${process.env.VUE_APP_API}/api/export/${this.type}${query}`
+    },
+    imgPath (event) {
+      return event.image_path && event.image_path
+    },
+  },
+  computed: {
+    ...mapState(['filters', 'user', 'logged', 'events']),
+    filteredEvents () {
+      return this.$store.getters.filteredEvents.filter(e => !e.past)
+    },
+    showLink () {
+      return (['feed', 'ics'].indexOf(this.type)>-1)
+    },
+  }
+}
+</script>
+<style>
+#list {
+  max-height: 400px;
+  overflow-y: scroll;
+}
+</style>
+
+
diff --git a/pages/Login.vue b/pages/login.vue
similarity index 58%
rename from pages/Login.vue
rename to pages/login.vue
index 6ed16bbe..eac775f2 100644
--- a/pages/Login.vue
+++ b/pages/login.vue
@@ -1,19 +1,20 @@
 <template lang='pug'>
-  b-modal(@shown="$refs.email.focus()" :title='$t("Login")' hide-footer
+  b-modal(@shown="$refs.email.focus()" :title='$t("common.login")' hide-footer
     @hidden='$router.replace("/")' :visible='true' ref='modal')
     el-form(v-loading='loading')
-      p(v-html="$t('login_explanation')")
-      el-input.mb-2(v-model='email' type='email' :placeholder='$t("Email")' autocomplete='email' ref='email')
+      p(v-html="$t('login.description')")
+      el-input.mb-2(v-model='email' type='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("Password")')
+      el-input.mb-1(v-model='password'  @keyup.enter.native="submit" type='password' :placeholder='$t("common.password")')
         v-icon(name="lock" slot='prepend')
-      el-button.mr-1(plain type="success" @click='submit') {{$t('Login')}}
+      el-button.mr-1(plain type="success" @click='submit') {{$t('common.login')}}
       router-link(to='/register')
-        el-button.mt-1(plain type="primary") {{$t('Not registered?')}}
-      a.float-right(href='#' @click='forgot') {{$t('Forgot password?')}}
+        el-button.mt-1(plain type="primary") {{$t('login.not_registered')}}
+      a.float-right(href='#' @click='forgot') {{$t('login.forgot_password')}}
 </template>
 
 <script>
+const Cookie = process.client ? require('js-cookie') : undefined
 import { mapActions } from 'vuex'
 import { Message } from 'element-ui'
 // import api from '@/plugins/api'
@@ -31,29 +32,24 @@ export default {
     ...mapActions(['login']),
     async forgot () {
       if (!this.email) {
-        Message({ message: this.$t('Insert your email'), type: 'error' })
+        Message({ message: this.$t('login.insert_email'), type: 'error' })
         this.$refs.email.focus()
         return
       }
       this.loading = true
       // await api.forgotPassword(this.email)
       this.loading = false
-      Message({ message: this.$t('Check your email!'), type: 'success' })
+      Message({ message: this.$t('login.check_email'), type: 'success' })
     },
     async submit (e) {
       e.preventDefault()
       try {
         this.loading = true
-        const user = await this.$axios.$post('/login', { email: this.email, password: this.password })
+        await this.$auth.loginWith('local', { data: { email: this.email, password: this.password } })
         this.loading = false
-        if (!user) {
-          Message({ message: this.$t('Login error'), type: 'error' })
-          return;
-        }
-        this.login(user)
-        Message({ message: this.$t('Logged'), type: 'success' })
+        Message({ message: this.$t('login.ok'), type: 'success' })
       } catch (e) {
-        Message({ message: this.$t('Login error'), type: 'error' })
+        Message({ message: this.$t('login.error') + e, type: 'error' })
         this.loading = false
         return
       }
diff --git a/pages/register.vue b/pages/register.vue
index e746181b..c3b28087 100644
--- a/pages/register.vue
+++ b/pages/register.vue
@@ -1,19 +1,19 @@
 <template lang='pug'>
   b-modal(hide-footer @hidden='$router.replace("/")' ref='modal'
-    :title="$t('Register')" :visible='true' @shown='$refs.email.focus()')
+    :title="$t('common.register')" :visible='true' @shown='$refs.email.focus()')
     el-form
-      p(v-html="$t('register_explanation')")
+      p(v-html="$t('register.description')")
       el-input.mb-2(ref='email' v-model='user.email' type='email'
-        :placeholder='$t("Email")' autocomplete='email')
+        :placeholder='$t("common.email")' autocomplete='email')
         span(slot='prepend') @
 
       el-input.mb-2(v-model='user.password' type="password" placeholder="Password")
         v-icon(name='lock' slot='prepend')
 
-      el-input.mb-2(v-model='user.description' type="textarea" rows='3' :placeholder="$t('Description')")
+      el-input.mb-2(v-model='user.description' type="textarea" rows='3' :placeholder="$t('common.description')")
           v-icon(name='envelope-open-text')
 
-      el-button.float-right(plain type="success" icon='el-icon-arrow-right' @click='register') {{$t('Send')}}
+      el-button.float-right(plain type="success" icon='el-icon-arrow-right' @click='register') {{$t('common.send')}}
 </template>
 
 <script>
@@ -33,23 +33,15 @@ export default {
     ...mapActions(['login']),
     async register () {
       try {
-        const user = await this.$axios.$post('/user', this.user) //api.register(this.user)
-        console.log(user)
-        if (!user.is_admin) {
-          this.$refs.modal.hide()
-          Message({
-            message: this.$t('registration_complete'),
-            type: 'success'
-          })
-        } else {
-          Message({
-            message: this.$t('admin_registration_complete'),
-            type: 'success'
-          })
-        }
+        const user = await this.$axios.$post('/user', this.user)
+        this.$refs.modal.hide()
+        Message({
+          message: this.$t(`register.${user.is_admin && 'admin_'}complete`),
+          type: 'success'
+        })
       } catch (e) {
         Message({
-          message: e,
+          message: this.$t('register.error') + e,
           type: 'error'
         })
         console.error(e)
diff --git a/pages/settings.vue b/pages/settings.vue
new file mode 100644
index 00000000..b9f38b27
--- /dev/null
+++ b/pages/settings.vue
@@ -0,0 +1,60 @@
+<template lang="pug">
+  b-modal(:title="$t('common.settings')" hide-footer @hidden='$router.replace("/")' :visible='true')
+      h5 {{user.name}}
+      el-input(v-model="mastodon_instance" @enter.native='associate')
+        span(slot='prepend') {{$t('settings.mastodon_instance')}}
+        el-button(v-if='!user.mastodon_auth' slot='append' @click='associate' type='success') {{$t('settings.associate')}}
+        el-button(v-else slot='append' @click='deassociate' variant='success') {{$t('settings.unassociate')}}
+      el-input.mt-2(v-model='password' type='password')
+        span(slot='prepend') {{$t('settings.change_password')}}
+        el-button(slot='append' @click='change' type='success') {{$t('settings.change')}}
+</template>
+<script>
+import { mapState, mapActions } from 'vuex'
+export default {
+  props: ['code'],
+  data () {
+    return {
+      mastodon_instance: '',
+      password: '',
+      user: {}
+    }
+  },
+  computed: mapState(['oauth', 'user']),
+  async asyncData ({ $axios, params }) {
+    // const code = this.$route.query.code
+    // if (code) {
+      // const res = await api.setCode({code})
+    // }
+    const user = await $axios.$get('/user')
+    user.mastodon_auth = ''
+    return { user } //, mastodon_instance: user.mastodon_auth.instance }
+    // this.user = user
+    // this.mastodon_instance = user.mastodon_auth.instance
+  },
+  methods: {
+      async change () {
+        if (!this.password) return
+        const user = this.user
+        user.password = this.password
+        try {
+          await api.updateUser(user)
+        } catch (e) {
+          console.log(e)
+        }
+      },
+      async deassociate () {
+        const user = this.user
+        user.mastodon_auth = ''
+        this.mastodon_instance = ''
+        await api.updateUser(user)
+      },
+      async associate () {
+        if (!this.mastodon_instance) return
+        const url = await this.$axios.$post('/user/getauthurl', {instance: this.mastodon_instance})
+        setTimeout( () => window.location.href=url, 100);
+    }
+  }
+}
+</script>
+
diff --git a/plugins/i18n.js b/plugins/i18n.js
index af35c413..c3a14c31 100644
--- a/plugins/i18n.js
+++ b/plugins/i18n.js
@@ -8,18 +8,18 @@ export default ({ app, store }) => {
   // This way we can use it in middleware and pages asyncData/fetch
   app.i18n = new VueI18n({
     locale: store.state.locale,
-    fallbackLocale: 'en'
-    // messages: {
-    //   'en': require('~/locales/en.json'),
+    fallbackLocale: 'it',
+    messages: {
+      'it': require('~/locales/it.json')
     //   'fr': require('~/locales/fr.json')
-    // }
+    }
   })
 
-  app.i18n.path = (link) => {
-    if (app.i18n.locale === app.i18n.fallbackLocale) {
-      return `/${link}`
-    }
+  // app.i18n.path = (link) => {
+  //   if (app.i18n.locale === app.i18n.fallbackLocale) {
+  //     return `/${link}`
+  //   }
 
-    return `/${app.i18n.locale}/${link}`
-  }
+  //   return `/${app.i18n.locale}/${link}`
+  // }
 }
diff --git a/server/api/auth.js b/server/api/auth.js
index 9bcffee7..fc74a8b4 100644
--- a/server/api/auth.js
+++ b/server/api/auth.js
@@ -21,7 +21,6 @@ const Auth = {
       (req.body && req.body.token) ||
       req.params.token ||
       req.headers.authorization
-    console.error('sono dentro isAuth ', token, req.headers)
     if (!token) return res.status(403).send({ message: 'Token not found' })
     jwt.verify(token, config.secret, async (err, decoded) => {
       if (err) {
diff --git a/server/api/controller/event.js b/server/api/controller/event.js
index d1c97801..d6925fec 100644
--- a/server/api/controller/event.js
+++ b/server/api/controller/event.js
@@ -160,7 +160,7 @@ const eventController = {
         // { model: Place, required: false }
       // ]
     })
-    console.log(events)
+    // console.log(events)
     res.json(events)
   }
 
diff --git a/server/api/controller/user.js b/server/api/controller/user.js
index 3e8c1938..432f5813 100644
--- a/server/api/controller/user.js
+++ b/server/api/controller/user.js
@@ -4,7 +4,7 @@ const crypto = require('crypto')
 const jwt = require('jsonwebtoken')
 const Mastodon = require('mastodon-api')
 const { Op } = require('sequelize')
-
+const jsonwebtoken = require('jsonwebtoken')
 const User = require('../models/user')
 const config = require('../config')
 const mail = require('../mail')
@@ -27,18 +27,24 @@ const userController = {
       } else {
         // if user is found and password is right
         // create a token
-        const payload = { email: user.email }
-        const token = jwt.sign(payload, config.secret)
-        res.json({
-          success: true,
-          message: 'Enjoy your token!',
-          token,
-          user
-        })
+        const accessToken = jsonwebtoken.sign({ user:
+          {
+            id: user.id,
+            email: user.email,
+            scope: [user.is_admin ? 'admin' : 'user']
+          }},
+          config.secret
+        )
+      
+        res.json({token: accessToken})        
       }
     }
   },
 
+  async logout(req, res) {
+
+  },
+
   async setToken(req, res) {
     req.user.mastodon_auth = req.body
     await req.user.save()
diff --git a/server/api/index.js b/server/api/index.js
index ebf7fb8b..19f253c1 100644
--- a/server/api/index.js
+++ b/server/api/index.js
@@ -5,8 +5,10 @@ const eventController = require('./controller/event')
 const exportController = require('./controller/export')
 const userController = require('./controller/user')
 const settingsController = require('./controller/settings')
+const config = require('./config')
 
 // const botController = require('./controller/bot')
+const jwt = require('express-jwt')({secret: config.secret})
 
 const storage = require('./storage')({
   destination: 'uploads/'
@@ -14,8 +16,12 @@ const storage = require('./storage')({
 
 const upload = multer({ storage })
 const api = express.Router()
-// login
-api.post('/login', userController.login)
+
+// AUTH
+api.post('/auth/login', userController.login)
+api.post('/auth/logout', userController.logout)
+api.get('/auth/user', jwt, userController.current)
+
 api.post('/user/recover', userController.forgotPassword)
 api.post('/user/check_recover_code', userController.checkRecoverCode)
 api.post('/user/recover_password', userController.updatePasswordWithRecoverCode)
@@ -25,7 +31,7 @@ api
   // register
   .post(userController.register)
   // get current user
-  .get(isAuth, userController.current)
+  // .get(isAuth, userController.current)
   // update user (eg. confirm)
   .put(isAuth, isAdmin, userController.update)
 
diff --git a/server/api/models/user.js b/server/api/models/user.js
index 2fcfbac5..e6a13ff3 100644
--- a/server/api/models/user.js
+++ b/server/api/models/user.js
@@ -1,6 +1,6 @@
+const Sequelize = require('sequelize')
 const bcrypt = require('bcrypt')
 const db = require('../db')
-const Sequelize = require('sequelize')
 
 const User = db.define('user', {
   email: {
diff --git a/server/index.js b/server/index.js
index edb79306..42ebd858 100644
--- a/server/index.js
+++ b/server/index.js
@@ -2,6 +2,7 @@ const express = require('express')
 const consola = require('consola')
 const morgan = require('morgan')
 const bodyParser = require('body-parser')
+const cookieParser = require('cookie-parser')
 const { Nuxt, Builder } = require('nuxt')
 const app = express()
 const cors = require('cors')
@@ -31,7 +32,7 @@ async function start() {
   // Give nuxt middleware to express
   app.use(cors(corsConfig))
   app.use(morgan('dev'))
-  // app.set('views', path.join)
+  app.use(cookieParser())
   app.use(bodyParser.urlencoded({ extended: false }))
   app.use(bodyParser.json())
   app.use(nuxt.render)
diff --git a/store/index.js b/store/index.js
index f2172b0f..bd568e4a 100644
--- a/store/index.js
+++ b/store/index.js
@@ -1,19 +1,11 @@
 import moment from 'dayjs'
 import { intersection } from 'lodash'
-import api from '~/plugins/api'
 import Vue from 'vue'
 
-Vue.config.errorHandler = function (err, vm, info) {
-  // handle error
-  // `info` is a Vue-specific error info, e.g. which lifecycle hook
-  // the error was found in. Only available in 2.2.0+
-  console.error(err)
-  console.error(info)
-}
-
 export const state = () => ({
   events: [],
   user: {},
+  locale: 'it',
   logged: false,
   token: '',
   tags: [],
@@ -109,18 +101,20 @@ export const actions = {
   // get current month's event
   async nuxtServerInit({ commit }, { req }) {
     // set user if logged! TODO
-
     const now = new Date()
     // const events = await api.getAllEvents(now.getMonth() - 1, now.getFullYear())
     const events = await this.$axios.$get(`/event/${now.getMonth() - 1}/${now.getFullYear()}`)
     commit('setEvents', events)
   },
+  async updateEvents({ commit }, page) {
+    const events = await this.$axios.$get(`/event/${page.month}/${page.year}`)
+    commit('setEvents', events)
+  },
   async updateMeta({ commit }) {
     const { tags, places } = await this.$axios.$get('/event/meta')
     commit('update', { tags, places })
   },
   async addEvent({ commit }, formData) {
-    console.log('ciao addEvent')
     const event = await this.$axios.$post('/user/event', formData) // .addEvent(formData)
     if (this.state.logged) {
       commit('addEvent', event)
@@ -133,14 +127,6 @@ export const actions = {
   delEvent({ commit }, eventId) {
     commit('delEvent', eventId)
   },
-  login({ commit }, user) {
-    this.$axios.setToken(user.token)
-    commit('login', user)
-  },
-  logout({ commit }) {
-    this.$axios.setToken(false)
-    commit('logout')
-  },
   // search
   addSearchTag({ commit }, tag) {
     commit('addSearchTag', tag)

From ac5ef6e324d1abdd6c0dfdd3cdd438980076a004 Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Mon, 29 Apr 2019 00:27:29 +0200
Subject: [PATCH 06/14] mille storie

commenti da mastodon, widget con custom widget test...
---
 .vscode/vscode-kanban.json       |  72 +++++++++++++------
 components/Calendar.vue          |  47 +++++++++----
 components/Event.vue             |   6 +-
 components/Home.vue              |  28 +++++---
 components/List.vue              |  34 +++++++++
 components/Nav.vue               |   7 +-
 layouts/iframe.vue               |   3 +
 locales/it.json                  |  28 +++++++-
 nuxt.config.js                   |   6 +-
 package.json                     |   4 +-
 pages/{add.vue => add/_edit.vue} |  16 +++--
 pages/admin.vue                  | 115 ++++++++++++++++++-------------
 pages/embed/list.vue             |  22 ++++++
 pages/event/_id.vue              |  51 +++++++++-----
 pages/export.vue                 |  59 +++++++++-------
 pages/settings.vue               |   2 +-
 plugins/element-ui.js            |   8 ++-
 plugins/v-calendar.js            |   4 +-
 plugins/vuex-persist.js          |  15 ++--
 server/api/auth.js               |  51 +++++---------
 server/api/config.js             |   4 +-
 server/api/controller/bot.js     |  72 +++++++++++--------
 server/api/controller/event.js   |  29 ++++----
 server/api/controller/export.js  |   2 +
 server/api/controller/user.js    |   4 +-
 server/api/index.js              |  35 ++++------
 server/api/models/event.js       |  15 ++--
 server/cron.js                   |  65 +++++++++++++++++
 server/index.js                  |   2 +
 store/index.js                   |  10 +--
 widgets/examples/index.html      |  17 +++++
 widgets/list/index.html          |   0
 widgets/list/index.js            |  12 ++++
 widgets/list/style.css           |   3 +
 34 files changed, 573 insertions(+), 275 deletions(-)
 create mode 100644 components/List.vue
 create mode 100644 layouts/iframe.vue
 rename pages/{add.vue => add/_edit.vue} (94%)
 create mode 100644 pages/embed/list.vue
 create mode 100644 server/cron.js
 create mode 100644 widgets/examples/index.html
 create mode 100644 widgets/list/index.html
 create mode 100644 widgets/list/index.js
 create mode 100644 widgets/list/style.css

diff --git a/.vscode/vscode-kanban.json b/.vscode/vscode-kanban.json
index 47a6e887..9d48a542 100644
--- a/.vscode/vscode-kanban.json
+++ b/.vscode/vscode-kanban.json
@@ -1,6 +1,39 @@
 {
-  "done": [],
-  "in-progress": [],
+  "done": [
+    {
+      "assignedTo": {
+        "name": "lesion"
+      },
+      "category": "feature",
+      "creation_time": "2019-04-23T19:50:00.973Z",
+      "description": {
+        "content": "- export page ok\n- usare un'altra api per retrieve di eventi (perche' devo mostrarli tutti, non solo quelli del mese corrente)\n- non devo fare il load degli eventi nel nuxtServerInit (o dentro il layout normale oppure nelle pagine, tipo nella home)",
+        "mime": "text/markdown"
+      },
+      "details": {
+        "content": "- export page ok\n- usare un'altra api per retrieve di eventi (perche' devo mostrarli tutti, non solo quelli del mese corrente)\n- non devo fare il load degli eventi nel nuxtServerInit (o dentro il layout normale oppure nelle pagine, tipo nella home)\n",
+        "mime": "text/markdown"
+      },
+      "id": "7",
+      "prio": 1,
+      "references": [],
+      "title": "export page",
+      "type": "bug"
+    }
+  ],
+  "in-progress": [
+    {
+      "assignedTo": {
+        "name": "lesion"
+      },
+      "category": "feature",
+      "creation_time": "2019-04-23T19:46:46.332Z",
+      "id": "3",
+      "prio": 0,
+      "references": [],
+      "title": "export lista"
+    }
+  ],
   "testing": [
     {
       "assignedTo": {
@@ -15,18 +48,6 @@
     }
   ],
   "todo": [
-    {
-      "assignedTo": {
-        "name": "lesion"
-      },
-      "category": "feature",
-      "creation_time": "2019-04-23T19:50:00.973Z",
-      "id": "7",
-      "prio": 1,
-      "references": [],
-      "title": "export page",
-      "type": "bug"
-    },
     {
       "assignedTo": {
         "name": "lesion"
@@ -99,21 +120,19 @@
         "name": "lesion"
       },
       "category": "feature",
-      "creation_time": "2019-04-23T19:46:46.332Z",
-      "id": "3",
-      "prio": 0,
+      "creation_time": "2019-04-23T19:44:56.705Z",
+      "id": "1",
       "references": [],
-      "title": "export lista"
+      "title": "popup sul calendario"
     },
     {
       "assignedTo": {
         "name": "lesion"
       },
-      "category": "feature",
-      "creation_time": "2019-04-23T19:44:56.705Z",
-      "id": "1",
+      "creation_time": "2019-04-27T19:44:33.769Z",
+      "id": "12",
       "references": [],
-      "title": "popup sul calendario"
+      "title": "rifare il calendario o solo il popup"
     },
     {
       "assignedTo": {
@@ -137,6 +156,15 @@
       "references": [],
       "title": "documentare sorgenti",
       "type": "bug"
+    },
+    {
+      "assignedTo": {
+        "name": "lesion"
+      },
+      "creation_time": "2019-04-28T09:25:50.701Z",
+      "id": "13",
+      "references": [],
+      "title": "test altra visualizzazione"
     }
   ]
 }
\ No newline at end of file
diff --git a/components/Calendar.vue b/components/Calendar.vue
index 7787d5f4..d3c06ff1 100644
--- a/components/Calendar.vue
+++ b/components/Calendar.vue
@@ -1,15 +1,24 @@
 <template lang="pug">
     v-calendar#calendar.card(
+      title-position='left'
+      locale='it'
+      is-dark
       show-caps
       :attributes='attributes'
       :from-page.sync='page'
       is-expanded is-inline)
-      //- div(slot='popover', slot-scope='{ customData }')
-      //- router-link(:to="`/event/${customData.id}`") {{customData.start_datetime|hour}} - {{customData.title}} @{{customData.place.name}}
+      div(slot='popover', slot-scope='{ customData, attributes }')
+        p {{attributes}}
+        //- router-link(:to="`/event/${customData.id}`") {{customData.start_datetime|hour}} - {{customData.title}}
+        //- div(v-if='customData.days && customData.days[selectedEvent]')
+          p {{customData.days[customData.selectedEvent].title}}
+          p {{customData.days[customData.selectedEvent].tags}}
+          el-button(@click='customData.selectedEvent=customData.selectedEvent+1') {{customData.selectedEvent}}/{{customData.days.length}} 
+            v-icon(name='clock' @click='customData.selectedEvent=customData.selectedEvent+1')
+        //- @{{customData.place.name}}
 </template>
 <script>
 import { mapState, mapActions } from 'vuex'
-// import filters from '@/filters'
 import moment from 'dayjs'
 import { intersection } from 'lodash'
 
@@ -21,12 +30,11 @@ export default {
     const year = moment().year()
     return {
       page: { month, year},
+      selectedEvent: {},
+      daysWithEvents: {}
     }
   },
   
-  // async mounted () {
-    // await this.updateEvents(this.page)
-  // },
   watch: {
     page () {
       this.updateEvents(this.page)
@@ -34,17 +42,28 @@ export default {
   },
   methods: {
     ...mapActions(['updateEvents']),
+    nextEvent () {
+
+    },
     eventToAttribute(event) {
       let e = {
         key: event.id,
         customData: event,
         order: event.start_datetime,
-        // popover: {
-        //   slot: 'popover',
-        //   visibility: 'hover'
-        // }
       }
-      
+      const day = moment(event.start_datetime).date()
+      if (!this.daysWithEvents[day]) {
+        this.daysWithEvents[day] = []
+        e.popover = {
+          slot: 'popover',
+          visibility: 'hover',
+          isInteractive: true,
+          hideIndicator: true,
+        }
+        e.customData.days = this.daysWithEvents[day]
+      }
+      this.daysWithEvents[day].push({title: event.title, when: event.start_datetime, tags: event.tags })
+
       let color = event.tags && event.tags.length && event.tags[0].color ? event.tags[0].color : 'rgba(170,170,250,0.7)'
       if (event.past) color = 'rgba(200,200,200,0.5)'
       if (event.multidate) {
@@ -65,14 +84,14 @@ export default {
     filteredEvents () {
       return this.$store.getters.filteredEvents
     },
-    ...mapState(['events', 'filters', 'user', 'logged']),
+    ...mapState(['events', 'filters']),
     attributes () {
       return [
-        { key: 'todaly', dates: new Date(),
+        { key: 'today', dates: new Date(),
           highlight: {
             backgroundColor: '#aaffaa'
           },
-          // popover: {label: this.$t('Today')}
+          popover: {label: this.$t('common.today')}
         }, 
         ...this.filteredEvents.map(this.eventToAttribute)
       ]
diff --git a/components/Event.vue b/components/Event.vue
index e2cd72bd..3a375e10 100644
--- a/components/Event.vue
+++ b/components/Event.vue
@@ -5,9 +5,9 @@
       :img-src='imgPath')
         strong {{event.title}}
         div <v-icon name='clock'/> {{event.start_datetime|datetime}}
-        //- span <v-icon name='map-marker-alt'/> {{event.place.name}}
+        span <v-icon name='map-marker-alt'/> {{event.place.name}}
         br
-        el-tag.mr-1(:color='tag.color || "grey"' v-for='tag in event.tags' :key='tag.tag'
+        el-tag.mr-1(:color='tag.color' v-for='tag in event.tags' :key='tag.tag'
           size='small' @click.stop='addSearchTag(tag)') {{tag.tag}}
 </template>
 <script>
@@ -20,7 +20,7 @@ export default {
   computed: {
     ...mapState(['user']),
     imgPath() {
-      return this.event.image_path && '/uploads/thumb/' + this.event.image_path
+      return this.event.image_path && '/media/thumb/' + this.event.image_path
     },
     mine() {
       return this.event.userId === this.user.id
diff --git a/components/Home.vue b/components/Home.vue
index f8d2dbde..edac84d1 100644
--- a/components/Home.vue
+++ b/components/Home.vue
@@ -1,18 +1,18 @@
 <template lang="pug">
-  div
-    magic-grid(:animate="false" useMin :gap=5 :maxCols=4
+  div(v-loading='loading')
+    magic-grid(:animate="true" useMin :gap=5 :maxCols=4
       :maxColWidth='400' ref='magicgrid')
       div.mt-1.item
         //- Search#search
         no-ssr
           Calendar
-    Event.item.mt-1(v-for='event in events'
-      :key='event.id'
-      :event='event')
+      Event.item.mt-1(v-for='event in events'
+        :key='event.id'
+        :event='event')
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapState, mapActions } from 'vuex'
 import axios from 'axios'
 // import filters from '@/filters.js'
 import Event from '@/components/Event'
@@ -23,10 +23,13 @@ import Calendar from '@/components/Calendar'
 
 export default {
   name: 'Home',
-  // async asyncData ({req}) {
-  //   console.log('dentro asyncData')
-  //   const { data } = await axios.get('http://localhost:3000/api/event/2019/2')
-  //   return { events: data }
+  data () {
+    return { loading: true }
+  },
+  // created () {
+  //   const now = new Date()
+  //   const page = { month: now.getMonth() - 1, year: now.getFullYear() }
+  //   this.updateEvents(page)
   // },
   components: { Event, Calendar }, // , Calendar, Search },
   computed: {
@@ -38,9 +41,14 @@ export default {
         .sort((a, b) => a.start_datetime > b.start_datetime)
     }
   },
+  mounted () {
+    this.loading = false
+  },
+  methods: mapActions(['updateEvents']),
   watch: {
     filteredEvents() {
       this.$nextTick(this.$refs.magicgrid.positionItems)
+      this.loading = false
     }
   }
 }
diff --git a/components/List.vue b/components/List.vue
new file mode 100644
index 00000000..a9dea5fc
--- /dev/null
+++ b/components/List.vue
@@ -0,0 +1,34 @@
+<template lang="pug">
+  div#gancio-widget
+    //- el-card.mb-1(no-body header='Eventi')
+    //- b-list-group#list(flush)
+    p minimal {{minimal}}
+    ul
+      li.flex-column.align-items-start(v-for="event in events" :key='event.id'
+          :to='`/event/${event.id}`' target='_parent')
+          img(v-if='event.image_path' slot="aside" :src="`http://localhost:3000/media/${event.image_path}`" alt="Meia Aside" style='max-height: 60px')
+          strong.mb-1 {{event.title}}
+          br
+          small.float-right {{event.place.name}}
+          //- el-tag.mr-1(v-if='showtags' :color='tag.color || "rgba(64,158,255,.1)"' size='mini' v-for='tag in event.tags' :key='tag.tag') {{tag.tag}}    
+</template>
+<script>
+import axios from 'axios'
+export default {
+  name: 'List',
+  data () {
+    return {
+      events: []
+    }
+  },
+  props: {
+    minimal: {
+      type: Boolean,
+      default: false
+    }
+  },
+  async mounted () {
+    this.events = (await axios.get('http://localhost:3000/api/export/json')).data
+  }
+}
+</script>
\ No newline at end of file
diff --git a/components/Nav.vue b/components/Nav.vue
index 67a682e2..d10cf8c7 100644
--- a/components/Nav.vue
+++ b/components/Nav.vue
@@ -10,12 +10,13 @@
           span.d-md-none  {{$t('common.add_event')}}
         b-nav-item(v-if='$auth.loggedIn' to='/settings' v-b-tooltip :title='$t("common.settings")') <v-icon color='orange' name='cog'/>
           span.d-md-none  {{$t('common.settings')}}
-        b-nav-item(v-if='$auth.hasScope(`admin`)' to='/admin' v-b-tooltip :title='$t("common.admin")') <v-icon color='lightblue' name='tools'/>
+        b-nav-item(v-if='$auth.user.is_admin' to='/admin' v-b-tooltip :title='$t("common.admin")') <v-icon color='lightblue' name='tools'/>
           span.d-md-none  {{$t('common.admin')}}
         b-nav-item(to='/export' v-b-tooltip :title='$t("common.export")') <v-icon name='file-export' color='yellow'/>
           span.d-md-none  {{$t('common.export')}}
-        b-nav-item(v-if='auth.loggedIn' @click='logout' v-b-tooltip :title='$t("common.logout")') <v-icon color='red' name='sign-out-alt'/>
+        b-nav-item(v-if='$auth.loggedIn' @click='logout' v-b-tooltip :title='$t("common.logout")') <v-icon color='red' name='sign-out-alt'/>
           span.d-md-none  {{$t('common.logout')}}
+        b-nav-item
     b-navbar-nav.ml-auto
         b-nav-item(to='/about')
           span  {{$t('common.info')}} <v-icon color='#ff9fc4' name='question-circle'/>
@@ -26,7 +27,7 @@ import {mapState, mapActions} from 'vuex'
 export default {
   name: 'Nav',
   computed: {
-    ...mapState(['filters', 'auth']),
+    ...mapState(['filters']),
     filters_tags: {
       set (value) {
         this.setSearchTags(value)
diff --git a/layouts/iframe.vue b/layouts/iframe.vue
new file mode 100644
index 00000000..858c52d1
--- /dev/null
+++ b/layouts/iframe.vue
@@ -0,0 +1,3 @@
+<template lang="pug">
+    nuxt
+</template>
diff --git a/locales/it.json b/locales/it.json
index efa952cb..6f37cec2 100644
--- a/locales/it.json
+++ b/locales/it.json
@@ -17,7 +17,25 @@
     "next": "Avanti",
     "what": "Cosa",
     "address": "Indirizzo",
-    "media": "Media"
+    "media": "Media",
+    "today": "Oggi",
+    "users": "Utenti",
+    "places": "Posti",
+    "events": "Eventi",
+    "tags": "Etichette",
+    "deactivate": "Disattiva",
+    "activate": "Attiva",
+    "remove_admin": "Rimuovi Admin",
+    "name": "Nome",
+    "save": "Salva",
+    "confirm": "Conferma",
+    "tag": "Etichetta",
+    "color": "Colore",
+    "associate": "Associa",
+    "hide": "Nascondi",
+    "remove": "Elimina",
+    "edit": "Modifica",
+    "actions": "Azioni"
   },
 
   "login": {
@@ -41,6 +59,14 @@
     "where_description" : "Dov'è il gancio? Se è un luogo fisico, scrivi il suo nome del per esteso (tipo 'Mezcal Squat'), se è una Piazza/Via metti quella (tipo 'Piazza Castello, Torino'). Se trovi già il luogo dell'evento premilo e l'indirizzo verrà autocompletato.",
     "address_description": "",
     "tag_description": "Puoi inserire un tag (es. concerto, corteo)"
+  },
+
+  "admin": {
+    "event_confirm_description": "Qui puoi confermare gli eventi inseriti da utenti non iscritti",
+    "tag_description": "Cambia il colore delle etichette",
+    "place_description": "Modifica l'indirizzo di un posto",
+    "mastodon_description": "Puoi associare un account mastodon a questa istanza di gancio. Tutti gli eventi verranno pubblicati li'",
+    "mastodon_instance": "Istanza mastodon"
   }
 }
 
diff --git a/nuxt.config.js b/nuxt.config.js
index 29c34492..30bdf1da 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -41,8 +41,8 @@ module.exports = {
   plugins: ['@/plugins/element-ui', '@/plugins/filters',
     '@/plugins/i18n', '@/plugins/bootstrap-vue',
     '@/plugins/vue-awesome',
-    '@/plugins/v-calendar',
-    { src: '@/plugins/vuex-persist', ssr: false },
+    { src: '@/plugins/v-calendar', ssr: false },
+    { src: '@/plugins/vuex-persist.js', ssr: false },
     '@/plugins/magic-grid'],
 
   /*
@@ -68,7 +68,7 @@ module.exports = {
         endpoints: {
           login: { url: '/auth/login', method: 'post', propertyName: 'token' },
           logout: { url: '/auth/logout', method: 'post' },
-          user: { url: '/auth/user', method: 'get', propertyName: 'user' }
+          user: { url: '/auth/user', method: 'get', propertyName: false }
         },
         // tokenRequired: true,
         // tokenType: 'bearer',
diff --git a/package.json b/package.json
index ecb78137..73aa6086 100644
--- a/package.json
+++ b/package.json
@@ -40,6 +40,7 @@
     "sqlite3": "^4.0.6",
     "v-calendar": "^0.9.7",
     "vue-awesome": "^3.5.1",
+    "vue-custom-element": "^3.2.6",
     "vue-i18n": "^8.10.0",
     "vue-magic-grid": "^0.0.4",
     "vuex-persist": "^2.0.0"
@@ -61,6 +62,7 @@
     "eslint-plugin-vue": "^5.2.2",
     "nodemon": "^1.18.9",
     "prettier": "^1.16.4",
-    "pug-plain-loader": "^1.0.0"
+    "pug-plain-loader": "^1.0.0",
+    "webpack-cli": "^3.3.1"
   }
 }
diff --git a/pages/add.vue b/pages/add/_edit.vue
similarity index 94%
rename from pages/add.vue
rename to pages/add/_edit.vue
index ae5c2ac1..f9a8ae44 100644
--- a/pages/add.vue
+++ b/pages/add/_edit.vue
@@ -5,7 +5,7 @@
       el-tabs.mb-2(v-model='activeTab' v-loading='sending')
 
         //- NOT LOGGED EVENT
-        el-tab-pane(v-if='!logged')
+        el-tab-pane(v-if='!$auth.loggedIn')
           span(slot='label') {{$t('event.anon')}} <v-icon name='user-secret'/>
           p(v-html="$t('event.anon_description')")
           el-button.float-right(@click='next' :disabled='!couldProceed') {{$t('common.next')}}
@@ -13,7 +13,14 @@
         //- WHERE
         el-tab-pane
           span(slot='label') {{$t('common.where')}} <v-icon name='map-marker-alt'/>
-          div {{$t('common.where')}} 
+          div {{$t('common.where')}}
+            el-popover(
+              placement="top-start"
+              width="400"
+              trigger="hover")
+              v-icon(slot='reference' color='#ff9fc4' name='question-circle')
+              slot
+                p {{$t('event.where_description')}}
           el-select.mb-3(v-model='event.place.name' @change='placeChoosed' filterable allow-create default-first-option)
             el-option(v-for='place in places_name' :label='place' :value='place' :key='place.id')
           div {{$t("common.address")}}
@@ -119,7 +126,6 @@ export default {
       places_name: state => state.places.map(p => p.name ),
       places: state => state.places,
       user: state => state.user,
-      logged: state => state.logged
     }),
     disableAddress () {
       console.log('dentro disable Address')
@@ -128,7 +134,7 @@ export default {
       return ret
     },
     couldProceed () {
-      const t = this.logged ? -1 : 0
+      const t = this.$auth.loggedIn ? -1 : 0
       switch(Number(this.activeTab)) {
         case 0+t:
           return true
@@ -209,7 +215,7 @@ export default {
         this.updateMeta()
         this.sending = false
         this.$refs.modal.hide()
-        Message({ type: 'success', message: this.logged ? this.$t('event.added') : this.$t('event.added_anon')})
+        Message({ type: 'success', message: this.$auth.loggedIn ? this.$t('event.added') : this.$t('event.added_anon')})
       } catch (e) {
         this.sending = false
         console.error(e)
diff --git a/pages/admin.vue b/pages/admin.vue
index 0b83f1a1..edc22def 100644
--- a/pages/admin.vue
+++ b/pages/admin.vue
@@ -1,5 +1,5 @@
 <template lang="pug">
-  b-modal(hide-footer @hidden='$router.replace("/")' :title='$t("Admin")' 
+  b-modal(hide-footer @hidden='$router.replace("/")' :title='$t("common.admin")' 
     :visible='true' size='lg')
     el-tabs(tabPosition='left' v-model='tab')
 
@@ -7,55 +7,56 @@
       el-tab-pane.pt-1
         template(slot='label')
           v-icon(name='users')
-          span.ml-1 {{$t('Users')}}
+          span.ml-1 {{$t('common.users')}}
         el-table(:data='paginatedUsers' small)
           el-table-column(label='Email')
             template(slot-scope='data')
               el-popover(trigger='hover' :content='data.row.description' width='400')
                 span(slot='reference') {{data.row.email}}
-          el-table-column(label='Azioni')
+          el-table-column(:label="$t('common.actions')")
             template(slot-scope='data')
               el-button.mr-1(size='mini'
                 :type='data.row.is_active?"warning":"success"'
-                @click='toggle(data.row)') {{data.row.is_active?$t('Deactivate'):$t('Activate')}}
+                @click='toggle(data.row)') {{data.row.is_active?$t('common.deactivate'):$t('common.activate')}}
               el-button(size='mini'
                 :type='data.row.is_admin?"danger":"warning"'
-                @click='toggleAdmin(data.row)') {{data.row.is_admin?$t('Remove Admin'):$t('Admin')}}
+                @click='toggleAdmin(data.row)') {{data.row.is_admin?$t('common.remove_admin'):$t('common.admin')}}
         el-pagination(:page-size='perPage' :currentPage.sync='userPage' :total='users.length')
 
       //- PLACES
       el-tab-pane.pt-1
         template(slot='label')
           v-icon(name='map-marker-alt')
-          span.ml-1 {{$t('Places')}}
-        p {{$t('admin_place_explanation')}}
+          span.ml-1 {{$t('common.places')}}
+        p {{$t('admin.place_description')}}
         el-form.mb-2(:inline='true' label-width='120px')
-          el-form-item(:label="$t('Name')")
-            el-input.mr-1(:placeholder='$t("Name")' v-model='place.name')
-          el-form-item(:label="$t('Address')")
-            el-input.mr-1(:placeholder='$t("Address")' v-model='place.address')
-          el-button(variant='primary' @click='savePlace') {{$t('Save')}}
-        b-table(selectable :items='places' :fields='placeFields' striped hover 
-          small selectedVariant='success'  primary-key='id' 
-          select-mode="single" @row-selected='placeSelected'
-          :per-page='perPage' :current-page='placePage')
+          el-form-item(:label="$t('common.name')")
+            el-input.mr-1(:placeholder='$t("common.name")' v-model='place.name')
+          el-form-item(:label="$t('common.address')")
+            el-input.mr-1(:placeholder='$t("common.address")' v-model='place.address')
+          el-button(variant='primary' @click='savePlace') {{$t('common.save')}}
+        el-table(:data='paginatedPlaces' small)
+          el-table-column(:label="$t('common.name')")
+            template(slot-scope='data') {{data.row.name}}
+          el-table-column(:label="$t('common.address')")
+            template(slot-scope='data') {{data.row.address}}
         el-pagination(:page-size='perPage' :currentPage.sync='placePage' :total='places.length')
 
       //- EVENTS
       el-tab-pane.pt-1
         template(slot='label')
           v-icon(name='calendar')
-          span.ml-1 {{$t('Events')}}
-        p {{$t('event_confirm_explanation')}}
+          span.ml-1 {{$t('common.events')}}
+        p {{$t('admin.event_confirm_description')}}
         el-table(:data='paginatedEvents' small primary-key='id' v-loading='loading')
-          el-table-column(:label='$t("Name")')
+          el-table-column(:label='$t("common.name")')
             template(slot-scope='data') {{data.row.title}}
-          el-table-column(:label='$t("Where")')
+          el-table-column(:label='$t("common.where")')
             template(slot-scope='data') {{data.row.place.name}}
-          el-table-column(:label='$t("Confirm")')
+          el-table-column(:label='$t("common.confirm")')
             template(slot-scope='data')
-              el-button(type='primary' @click='confirm(data.row.id)' size='mini') {{$t('Confirm')}}
-              el-button(type='success' @click='preview(data.row.id)' size='mini') {{$t('Preview')}}
+              el-button(type='primary' @click='confirm(data.row.id)' size='mini') {{$t('common.confirm')}}
+              el-button(type='success' @click='preview(data.row.id)' size='mini') {{$t('common.preview')}}
 
         el-pagination(:page-size='perPage' :currentPage.sync='eventPage' :total='events.length')
 
@@ -63,29 +64,29 @@
       el-tab-pane.pt-1
         template(slot='label')
           v-icon(name='tag')
-          span  {{$t('Tags')}}
-        p {{$t('admin_tag_explanation')}}
-          el-tag(v-if='tag.tag' :color='tag.color || "grey"' size='mini') {{tag.tag}}
+          span  {{$t('common.tags')}}
+        p {{$t('admin.tag_description')}}
+          el-tag(v-if='tag.tag' :color='tag.color' size='mini') {{tag.tag}}
         el-form(:inline='true' label-width='120px')
-          el-form-item(:label="$t('Color')")
+          el-form-item(:label="$t('common.color')")
             el-color-picker(v-model='tag.color' @change='updateColor')
         el-table(:data='paginatedTags' striped small hover
           highlight-current-row @current-change="tagSelected")
-          el-table-column(label='Tag')
+          el-table-column(:label="$t('common.tag')")
             template(slot-scope='data')
-              el-tag(:color='data.row.color || "grey"' size='mini') {{data.row.tag}}
+              el-tag(:color='data.row.color' size='mini') {{data.row.tag}}
         el-pagination(:page-size='perPage' :currentPage.sync='tagPage' :total='tags.length')
 
       //- SETTINGS
       el-tab-pane.pt-1
         template(slot='label')
           v-icon(name='tools')
-          span  {{$t('Settings')}}
-        el-form(inline)
-          span {{$t('admin_mastodon_explanation')}}
+          span  {{$t('common.settings')}}
+        el-form(inline @submit.prevent.stop='associatemastodon_instance')
+          span {{$t('admin.mastodon_description')}}
           el-input(v-model="mastodon_instance")
-            span(slot='prepend') {{$t('Mastodon instance')}}
-            el-button(slot='append' @click='associate' variant='success' type='success') {{$t('Associate')}}
+            span(slot='prepend') {{$t('admin.mastodon_instance')}}
+            el-button(slot='append' @click='associate' :disabled='!mastodon_instance.length') {{$t('common.associate')}}
 
 </template>
 <script>
@@ -117,21 +118,28 @@ export default {
       tab: "0",
     }
   },
-  // async mounted () {
-  //   const code = this.$route.query.code
-  //   if (code) {
-  //     this.tab = "4"
-  //     const instance = await api.setCode({code, is_admin: true})
-  //   }
+  async mounted () {
+    console.log('sono dentro mounted', this.$route)
+    const code = this.$route.query.code
+
+    if (code) {
+      this.tab = "4"
+      const instance = await this.$axios.$post('/user/code', {code, is_admin: true})
+    }
   //   // this.users = await api.getUsers()
   //   // this.events = await api.getUnconfirmedEvents()
   //   // this.settings = await api.getAdminSettings()
-  //   this.mastodon_instance = this.settings.mastodon_auth && this.settings.mastodon_auth.instance
-  // },
+  },
   async asyncData ({ $axios, params, store }) {
     console.log(store.state)
-    const users = await $axios.$get('/users')
-    return { users }
+    try {
+      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}
+    } catch ( e ) {
+      console.error(e)
+    }
   },
   computed: {
     ...mapState(['tags', 'places']),
@@ -146,7 +154,11 @@ export default {
     paginatedUsers () {
       return this.users.slice((this.userPage-1) * this.perPage,
         this.userPage * this.perPage)
-    }
+    },
+    paginatedPlaces () {
+      return this.places.slice((this.placePage-1) * this.perPage,
+        this.placePage * this.perPage)
+    },    
   },
   methods: {
     placeSelected (items) {
@@ -160,7 +172,7 @@ export default {
       this.place.id = item.id
     },
     tagSelected (tag) {
-      this.tag = tag
+      this.tag = { color: tag.color, tag: tag.tag }
     },
     async savePlace () {
       const place = await api.updatePlace(this.place)
@@ -174,20 +186,25 @@ export default {
       const newuser = await api.updateUser(user)
     },
     async updateColor () {
-      const newTag = await api.updateTag(this.tag)
+      // try {
+      //   const newTag = await this.$axios.$put('/tag', this.tag)
+      // } catch (e) {
+      //   console.log(e)
+      // }
     },
     preview (id) {
       this.$router.push(`/event/${id}`)
     },
     async associate () {
       if (!this.mastodon_instance) return
-      const url = await api.getAuthURL({instance: this.mastodon_instance, admin: true})
+
+      const url = await this.$axios.$post('/user/getauthurl', {instance: this.mastodon_instance, admin: true})
       setTimeout( () => window.location.href=url, 100);
     },
     async confirm (id) {
       try {
         this.loading = true
-        await api.confirmEvent(id)
+        await this.$axios.$get(`/event/confirm/${id}`)
         this.loading = false
         Message({
           message: this.$t('event_confirmed'),
diff --git a/pages/embed/list.vue b/pages/embed/list.vue
new file mode 100644
index 00000000..8816a8e1
--- /dev/null
+++ b/pages/embed/list.vue
@@ -0,0 +1,22 @@
+<template lang="pug">
+  div
+    p porcodio
+</template>
+<script>
+import { mapState } from 'vuex'
+// import List from '../../components/List'
+import moment from 'dayjs'
+
+export default {
+  name: 'diocane',
+  layout: 'iframe',
+  // components: { List },
+  async asyncData ({ $axios, req, res }) {
+    const show_tags = req.query.showtags
+    const tags = req.query.tags
+    const places = req.query.places
+    const events = await $axios.$get('/export/json')
+    return { events, show_tags }
+  },
+}
+</script>
diff --git a/pages/event/_id.vue b/pages/event/_id.vue
index 6873a2cf..935612cf 100644
--- a/pages/event/_id.vue
+++ b/pages/event/_id.vue
@@ -3,26 +3,26 @@
     b-card(no-body, :img-src='imgPath' v-loading='loading')
       nuxt-link(to='/')
         el-button.close_button(circle icon='el-icon-close' type='success'
-          @click='$refs.eventDetail.hide()')
+          @click.prevent='$refs.eventDetail.hide()')
       b-card-header
         h3 {{event.title}}
         v-icon(name='clock')
         span  {{event.start_datetime|datetime}}
         br
         v-icon(name='map-marker-alt')
-        //- span  {{event.place.name}} - {{event.place.address}}
+        span  {{event.place.name}} - {{event.place.address}}
         br
       b-card-body(v-if='event.description || event.tags')
         pre(v-html='event.description')
         br
-        el-tag.mr-1(:color='tag.color || "grey"' v-for='tag in event.tags'
+        el-tag.mr-1(:color='tag.color' v-for='tag in event.tags'
           size='mini' :key='tag.tag') {{tag.tag}}
-        .ml-auto(v-if='mine')
+        div(v-if='mine')
           hr
-          el-button(v-if='event.is_visible' plain type='warning' @click.prevents='toggle' icon='el-icon-view') {{$t('Unconfirm')}}
-          el-button(v-else plain type='success' @click.prevents='toggle' icon='el-icon-view') {{$t('Confirm')}}
-          el-button(plain type='danger' @click.prevent='remove' icon='el-icon-remove') {{$t('Remove')}} 
-          el-button(plain type='primary' @click='$router.replace("/edit/"+event.id)') <v-icon color='orange' name='edit'/> {{$t('Edit')}}
+          el-button(v-if='event.is_visible' plain type='warning' @click.prevents='toggle' icon='el-icon-view') {{$t('common.hide')}}
+          el-button(v-else plain type='success' @click.prevents='toggle' icon='el-icon-view') {{$t('common.confirm')}}
+          el-button(plain type='danger' @click.prevent='remove' icon='el-icon-remove') {{$t('common.remove')}} 
+          el-button(plain type='primary' @click='$router.replace("/edit/"+event.id)') <v-icon color='orange' name='edit'/> {{$t('common.edit')}}
 
     //- COMMENTS ... 
     //- b-navbar(type="dark" variant="dark" toggleable='lg')
@@ -34,10 +34,17 @@
         //- span.mr-3 {{event.comments.length}} <v-icon name='comments'/>
         //- a(href='#', @click='remove')
           v-icon(color='orange' name='times')
-      //- b-card-footer(v-for='comment in event.comments')
-        strong {{comment.author}}
-        div(v-html='comment.text')
+    //- el-footer(v-for='comment in event.comments')
+      strong {{comment.author}}
+      div(v-html='comment.text')
 
+    //- el-timeline
+    //-   el-timeline-item(v-for='comment in event.comments')
+    //-     p(v-html='comment.text')
+    //-     a.el-timeline-item__timestamp(href='') {{comment.createdAt}}
+    strong {{$t('common.comments')}}
+      div.text.item(v-for='comment in event.comments')
+        span(v-html='comment.text')
 </template>
 <script>
 import { mapState, mapActions } from 'vuex';
@@ -46,13 +53,27 @@ import { mapState, mapActions } from 'vuex';
 
 export default {
   name: 'Event',
+  head () {
+    return {
+      title: this.event.title,
+      meta: [
+        // hid is used as unique identifier. Do not use `vmid` for it as it will not work
+        { hid: 'description', name: 'description', content: this.event.description },
+        { hid: 'og-description', name: 'og:description', content: this.event.description },
+        { hid: 'og-title', property: 'og:title', content: this.event.title },   
+        { hid: 'og-url', property: 'og:url', content: `event/${this.event.id}` },   
+        { property: 'og:type', content: 'event'},
+        { property: 'og:image', content: this.imgPath }
+      ]
+    }
+  },
   computed: {
-    ...mapState(['user']),
+    ...mapState([]),
     imgPath () {
-      return this.event.image_path && process.env.VUE_APP_API + '/uploads/' + this.event.image_path
+      return this.event.image_path && '/media/' + this.event.image_path
     },    
     mine () {
-      return this.event.userId === this.user.id || this.user.is_admin
+      return this.event.userId === this.$auth.user.id || this.$auth.user.is_admin
     }
   },
   data () {
@@ -90,11 +111,9 @@ export default {
       try {
         if (this.event.is_visible) {
           await this.$axios.$get(`/event/unconfirm/${this.id}`)
-          // await api.unconfirmEvent(this.id)
           this.event.is_visible = false
         } else {
           await this.$axios.$get(`/event/confirm/${this.id}`)
-          // await api.confirmEvent(this.id)
           this.event.is_visible = true
         }
       } catch (e) {
diff --git a/pages/export.vue b/pages/export.vue
index 10ea1d07..f722e2de 100644
--- a/pages/export.vue
+++ b/pages/export.vue
@@ -1,53 +1,58 @@
 <template lang="pug">
   b-modal(ref='modal' @hidden='$router.replace("/")' 
-    :title='$t("Export")' :visible='true' size='lg' hide-footer)
-    p {{$t('export_intro')}}
+    :title='$t("common.export")' :visible='true' size='lg' hide-footer)
+    p {{$t('export.intro')}}
     
-    li(v-if='filters.tags.length') {{$t('Tags')}}:
+    li(v-if='filters.tags.length') {{$t('common.tags')}}:
       el-tag.ml-1(color='#409EFF' size='mini' v-for='tag in filters.tags' :key='tag.tag') {{tag}}
-    li(v-if='filters.places.length') {{$t('Places')}}:
+    li(v-if='filters.places.length') {{$t('common.places')}}:
       el-tag.ml-1(color='#409EFF' size='mini' v-for='place in filters.places' :key='place.id') {{place}}
     el-tabs.mt-2(tabPosition='left' v-model='type')
 
       el-tab-pane.pt-1(label='email' name='email')
-        p(v-html='$t(`export_email_explanation`)')
+        p(v-html='$t(`export.email_description`)')
         el-form(@submit.native.prevent)
           //- el-switch(v-model='notification.notify_on_add' :active-text="$t('notify_on_insert')")
           //- br
           //- el-switch.mt-2(v-model='notification.send_notification' :active-text="$t('send_notification')") 
-          el-input.mt-2(v-model='notification.email' :placeholder="$t('Insert your address')" ref='email')
+          el-input.mt-2(v-model='notification.email' :placeholder="$t('common.insert_your_address')" ref='email')
           el-button.mt-2.float-right(native-type= 'submit' type='success' @click='add_notification') {{$t('Send')}}
 
       el-tab-pane.pt-1(label='feed rss' name='feed')
-        span(v-html='$t(`export_feed_explanation`)')
+        span(v-html='$t(`export.feed_description`)')
         el-input(v-model='link')
-          el-button(slot='append' plain type="primary" icon='el-icon-document' v-clipboard:copy="link") {{$t("Copy")}}
+          el-button(slot='append' plain type="primary" icon='el-icon-document' v-clipboard:copy="link") {{$t("common.copy")}}
 
       el-tab-pane.pt-1(label='ics/ical' name='ics')
-        p(v-html='$t(`export_ical_explanation`)')
+        p(v-html='$t(`export.ical_description`)')
         el-input(v-model='link')
-          el-button(slot='append' plain type="primary" icon='el-icon-document' v-clipboard:copy="link") {{$t("Copy")}}
+          el-button(slot='append' plain type="primary" icon='el-icon-document' v-clipboard:copy="link") {{$t("common.opy")}}
 
       el-tab-pane.pt-1(label='list' name='list')
-        p(v-html='$t(`export_list_explanation`)')
-        el-card.mb-1(no-body header='Eventi')
-          b-list-group#list(flush)
-            b-list-group-item.flex-column.align-items-start(v-for="event in filteredEvents" :key='event.id'
-              :to='`/event/${event.id}`')
-                //- b-media
-                  img(v-if='event.image_path' slot="aside" :src="imgPath(event)" alt="Meia Aside" style='max-height: 60px')
-                small.float-right {{event.start_datetime|datetime}}
-                strong.mb-1 {{event.title}}
-                br
-                small.float-right {{event.place.name}}
-                el-tag.mr-1(:color='tag.color || "grey"' size='mini' v-for='tag in event.tags' :key='tag.tag') {{tag.tag}}
+        p(v-html='$t(`export.list_description`)')
+        //- el-form-item(:label="$t('export.show_tags')")
+        el-switch(v-model='list.show_tags')
+        
+        iframe(:src='`http://localhost:3000/embed/list?tags=cia&showtags=${list.show_tags?"true":""}`' height='300')
+        //- el-card.mb-1(no-body header='Eventi')
+        //-   b-list-group#list(flush)
+        //-     b-list-group-item.flex-column.align-items-start(v-for="event in filteredEvents" :key='event.id'
+        //-       :to='`/event/${event.id}`')
+        //-         //- b-media
+        //-           img(v-if='event.image_path' slot="aside" :src="imgPath(event)" alt="Meia Aside" style='max-height: 60px')
+        //-         small.float-right {{event.start_datetime|datetime}}
+        //-         strong.mb-1 {{event.title}}
+        //-         br
+        //-         small.float-right {{event.place.name}}
+        //-         el-tag.mr-1(:color='tag.color || "grey"' size='mini' v-for='tag in event.tags' :key='tag.tag') {{tag.tag}}
         el-input.mb-1(type='textarea' v-model='script')
         el-button.float-right(plain type="primary" icon='el-icon-document' v-clipboard:copy="script") Copy
 
 
       el-tab-pane.pt-1(label='calendar' name='calendar')
-        p(v-html='$t(`export_calendar_explanation`)')
-        Calendar.mb-1
+        p(v-html='$t(`export.calendar_description`)')
+        //- no-ssr
+          Calendar.mb-1
         el-input.mb-1(type='textarea' v-model='script')
         el-button.float-right(plain type="primary" icon='el-icon-document' v-clipboard:copy="script") Copy
 
@@ -57,13 +62,14 @@ import { mapState } from 'vuex'
 import path from 'path'
 // import filters from '../filters'
 import Calendar from '@/components/Calendar'
+import List from '@/components/List'
 import {intersection} from 'lodash'
 // import api from '@/api'
 import { Message } from 'element-ui'
 
 export default {
   name: 'Export',
-  components: { Calendar },
+  components: { List },
   data () {
     return {
       type: 'email',
@@ -71,6 +77,7 @@ export default {
       export_list: true,
       script: `<iframe>Ti piacerebbe</iframe>`,
       notification: { email: '' },
+      list: { show_tags: true },
     }
   },
   // filters,
@@ -113,7 +120,7 @@ export default {
     },
   },
   computed: {
-    ...mapState(['filters', 'user', 'logged', 'events']),
+    ...mapState(['filters', 'events']),
     filteredEvents () {
       return this.$store.getters.filteredEvents.filter(e => !e.past)
     },
diff --git a/pages/settings.vue b/pages/settings.vue
index b9f38b27..cd22a133 100644
--- a/pages/settings.vue
+++ b/pages/settings.vue
@@ -26,7 +26,7 @@ export default {
     // if (code) {
       // const res = await api.setCode({code})
     // }
-    const user = await $axios.$get('/user')
+    const user = await $axios.$get('/auth/user')
     user.mastodon_auth = ''
     return { user } //, mastodon_instance: user.mastodon_auth.instance }
     // this.user = user
diff --git a/plugins/element-ui.js b/plugins/element-ui.js
index de888549..9ac5c326 100644
--- a/plugins/element-ui.js
+++ b/plugins/element-ui.js
@@ -1,7 +1,8 @@
 import Vue from 'vue'
 import { Button, Select, Tag, Option, Table, FormItem, Card,
   Form, Tabs, TabPane, Switch, Input, Loading, TimeSelect,
-  TableColumn, ColorPicker, Pagination, Popover } from 'element-ui'
+  TableColumn, ColorPicker, Pagination, Popover, Tooltip,
+  Container, Footer , Timeline, TimelineItem} from 'element-ui'
 import localeEn from 'element-ui/lib/locale/lang/en'
 import localeIt from 'element-ui/lib/locale/lang/it'
 import locale from 'element-ui/lib/locale'
@@ -9,6 +10,11 @@ locale.use(localeIt)
 
 export default () => {
   Vue.use(Button)
+  Vue.use(Container)
+  Vue.use(Timeline)
+  Vue.use(TimelineItem)
+  Vue.use(Footer)
+  Vue.use(Tooltip)
   Vue.use(Popover)
   Vue.use(Card)
   Vue.use(Select)
diff --git a/plugins/v-calendar.js b/plugins/v-calendar.js
index fd7f3431..403da668 100644
--- a/plugins/v-calendar.js
+++ b/plugins/v-calendar.js
@@ -1,9 +1,9 @@
 import Vue from 'vue'
 import VCalendar from 'v-calendar'
-import 'v-calendar/lib/v-calendar.min.css'
+// import 'v-calendar/lib/v-calendar.min.css'
 
 export default () => {
   Vue.use(VCalendar, {
     firstDayOfWeek: 2
   })
-}
+}
\ No newline at end of file
diff --git a/plugins/vuex-persist.js b/plugins/vuex-persist.js
index 8f0700ff..a0cf9450 100644
--- a/plugins/vuex-persist.js
+++ b/plugins/vuex-persist.js
@@ -1,8 +1,9 @@
-// ~/plugins/vuex-persist.js
-import VuexPersistence from 'vuex-persist'
+// // ~/plugins/vuex-persist.js
+// import VuexPersistence from 'vuex-persist'
 
-export default ({ store }) => {
-  return new VuexPersistence({
-    reducer: state => ({ logged: state.logged, user: state.user, token: state.token })
-  }).plugin(store)
-}
+// export default ({ store }) => {
+//   const per = new VuexPersistence({
+//     reducer: state => ({ logged: state.logged, user: state.user, token: state.token })
+//   }).plugin(store)
+//   store.dispatch('login')
+// }
diff --git a/server/api/auth.js b/server/api/auth.js
index fc74a8b4..85f9abb4 100644
--- a/server/api/auth.js
+++ b/server/api/auth.js
@@ -1,43 +1,30 @@
-const jwt = require('jsonwebtoken')
 const { Op } = require('sequelize')
 const config = require('./config')
 const User = require('./models/user')
 
 const Auth = {
-  fillUser(req, res, next) {
-    const token =
-      req.body.token || req.params.token || req.headers.authorization
-    if (!token) return next()
-    jwt.verify(token, config.secret, async (err, decoded) => {
-      if (err) return next()
-      req.user = await User.findOne({
-        where: { email: { [Op.eq]: decoded.email }, is_active: true }
-      })
-      next()
+  async fillUser(req, res, next) {
+    if (!req.user) return next(new Error('ERROR! No user'))
+    req.user = await User.findOne({
+      where: { id: { [Op.eq]: req.user.id }, is_active: true }
     })
+    next()
   },
-  isAuth(req, res, next) {
-    const token =
-      (req.body && req.body.token) ||
-      req.params.token ||
-      req.headers.authorization
-    if (!token) return res.status(403).send({ message: 'Token not found' })
-    jwt.verify(token, config.secret, async (err, decoded) => {
-      if (err) {
-        return res
-          .status(403)
-          .send({ message: 'Failed to authenticate token ' + err })
-      }
-      req.user = await User.findOne({
-        where: { email: { [Op.eq]: decoded.email }, is_active: true }
-      })
-      if (!req.user) {
-        return res
-          .status(403)
-          .send({ message: 'Failed to authenticate token ' + err })
-      }
-      next()
+  async isAuth(req, res, next) {
+    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 }
     })
+    if (!req.user) {
+      return res
+        .status(403)
+        .send({ message: 'Failed to authenticate token ' + err })
+    }
+    next()
   },
   isAdmin(req, res, next) {
     if (req.user.is_admin && req.user.is_active) return next()
diff --git a/server/api/config.js b/server/api/config.js
index e0f2b99f..b9acb27a 100644
--- a/server/api/config.js
+++ b/server/api/config.js
@@ -6,11 +6,11 @@ module.exports = {
   locale: process.env.LOCALE || 'it',
   title: process.env.TITLE || 'GANCIO',
   description: process.env.DESCRIPTION || 'A calendar for radical communities',
-  baseurl: process.env.BASE_URL || 'http://localhost:8080',
+  baseurl: process.env.BASE_URL || 'http://localhost:3000',
   apiurl:
     env === 'production'
       ? process.env.BASE_URL + '/api'
-      : 'http://localhost:9000',
+      : 'http://localhost:3000/api',
   db,
   admin: process.env.ADMIN_EMAIL,
 
diff --git a/server/api/controller/bot.js b/server/api/controller/bot.js
index bedcae91..edaadd32 100644
--- a/server/api/controller/bot.js
+++ b/server/api/controller/bot.js
@@ -1,17 +1,29 @@
-// const { User, Event, Comment, Tag } = require('../model')
+const { User, Event, Comment, Tag } = require('../model')
 const config = 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')
 moment.locale('it')
 
 const botController = {
-  bots: [],
-  // async initialize () {
-  //   console.log('initialize bots')
+  bot: null,
+  async initialize () {
+    console.log('initialize bot')
+    const settings = await settingsController.settings()
+    if (!settings.mastodon_auth) return
+    const mastodon_auth = settings.mastodon_auth
+    console.log('instance ', `https://${mastodon_auth.instance}/api/v1/`)
+    botController.bot = new Mastodon({ 
+      access_token: mastodon_auth.access_token,
+      api_url: `https://${mastodon_auth.instance}/api/v1`
+    })
+    const listener = botController.bot.stream('/streaming/direct')
+    listener.on('message', botController.message)
+    listener.on('error', botController.error)
   //   const botUsers = await User.findAll({ where: { mastodon_auth: { [Op.ne]: null } } })
   //   console.log(botUsers)
   //   botController.bots = botUsers.map(user => {
@@ -21,7 +33,6 @@ const botController = {
   //     const bot = new Mastodon({ access_token, api_url: `https://${user.mastodon_instance}/api/v1/` })
   //     const listener = bot.stream('streaming/direct')
   //     listener.on('message', botController.message)
-  //     listener.on('error', botController.error)
   //     return { email: user.email, bot }
   //   })
   // console.log(botController.bots)
@@ -32,8 +43,9 @@ const botController = {
   //   listener.on('message', botController.message)
   //   listener.on('error', botController.error)
   //   botController.bots.push({ email: user.email, bot })
-  // },
+  },
   async post (mastodon_auth, event) {
+    console.log('dentro post!')
     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')} - 
@@ -41,28 +53,30 @@ ${event.description.length > 200 ? event.description.substr(0, 200) + '...' : ev
 
     let media
     if (event.image_path) {
-      const file = path.join(__dirname, '..', '..', 'uploads', event.image_path)
+      const file = path.join(__dirname, '..', '..', '..', 'uploads', event.image_path)
       if (fs.statSync(file)) {
         media = await bot.post('media', { file: fs.createReadStream(file) })
       }
     }
-    return bot.post('statuses', { status, visibility: 'public', media_ids: media ? [media.data.id] : [] })
-  }
-  // 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 } })
-  // if (!event) {
-  // check for comment..
-  // const comment = await Comment.findOne( {where: { }})
-  // }
-  // const comment = await Comment.create({activitypub_id: msg.data.last_status.id, text: msg.data.last_status.content, author: msg.data.accounts[0].username })
-  // event.addComment(comment)
-  // console.log(event)
-  // const comment = await Comment.findOne( { where: {activitypub_id: msg.data.in_reply_to}} )
-  // console.log('dentro message ', data)
+    return bot.post('statuses', { status, visibility: 'direct', media_ids: media ? [media.data.id] : [] })
+  },
+  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 } })
+    if (!event) {
+      console.error('associated event not found !')
+      // check for comment..
+      // const comment = await Comment.findOne( {where: { }})
+      return 
+    }
+    const comment = await Comment.create({activitypub_id: msg.data.last_status.id, text: msg.data.last_status.content, author: msg.data.accounts[0].username })
+    event.addComment(comment)
+    console.log(event)
+    // const comment = await Comment.findOne( { where: {activitypub_id: msg.data.in_reply_to}} )
+    // console.log('dentro message ', data)
 
   // add comment to specified event
   // let comment
@@ -72,11 +86,11 @@ ${event.description.length > 200 ? event.description.substr(0, 200) + '...' : ev
   // }
   // const comment = new Comment(req.body)
   // event.addComment(comment)
-  // },
-  // error (err) {
-  //   console.log('error ', err)
-  // }
+  },
+  error (err) {
+    console.log('error ', err)
+  }
 }
 
-// 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 d6925fec..ea3ba750 100644
--- a/server/api/controller/event.js
+++ b/server/api/controller/event.js
@@ -136,7 +136,6 @@ const eventController = {
   },
 
   async getAll(req, res) {
-    console.log('sono qui dentro !')
     // this is due how v-calendar shows dates
     const start = moment().year(req.params.year).month(req.params.month)
       .startOf('month').startOf('isoWeek')
@@ -145,20 +144,20 @@ const eventController = {
     if (shownDays <= 34) end = end.add(1, 'week')
     end = end.endOf('isoWeek')
     const events = await Event.findAll({
-      // where: {
-        // is_visible: true,
-        // [Op.and]: [
-          // { start_datetime: { [Op.gte]: start } },
-          // { start_datetime: { [Op.lte]: end } }
-        // ]
-      // },
-      // order: [['start_datetime', 'ASC']],
-      // include: [
-        // { model: User, required: false },
-        // Comment,
-        // Tag,
-        // { model: Place, required: false }
-      // ]
+      where: {
+        is_visible: true,
+        [Op.and]: [
+          { start_datetime: { [Op.gte]: start } },
+          { start_datetime: { [Op.lte]: end } }
+        ]
+      },
+      order: [['start_datetime', 'ASC']],
+      include: [
+        { model: User, required: false },
+        Comment,
+        Tag,
+        { model: Place, required: false }
+      ]
     })
     // console.log(events)
     res.json(events)
diff --git a/server/api/controller/export.js b/server/api/controller/export.js
index 3f54ecf2..541433c7 100644
--- a/server/api/controller/export.js
+++ b/server/api/controller/export.js
@@ -32,6 +32,8 @@ const exportController = {
         return exportController.feed(res, events.slice(0, 20))
       case 'ics':
         return exportController.ics(res, events)
+      case 'json':
+        return res.json(events)
     }
   },
 
diff --git a/server/api/controller/user.js b/server/api/controller/user.js
index 432f5813..a101d1c3 100644
--- a/server/api/controller/user.js
+++ b/server/api/controller/user.js
@@ -27,12 +27,12 @@ const userController = {
       } else {
         // if user is found and password is right
         // create a token
-        const accessToken = jsonwebtoken.sign({ user:
+        const accessToken = jsonwebtoken.sign(
           {
             id: user.id,
             email: user.email,
             scope: [user.is_admin ? 'admin' : 'user']
-          }},
+          },
           config.secret
         )
       
diff --git a/server/api/index.js b/server/api/index.js
index 19f253c1..2a176419 100644
--- a/server/api/index.js
+++ b/server/api/index.js
@@ -7,7 +7,7 @@ const userController = require('./controller/user')
 const settingsController = require('./controller/settings')
 const config = require('./config')
 
-// const botController = require('./controller/bot')
+const botController = require('./controller/bot')
 const jwt = require('express-jwt')({secret: config.secret})
 
 const storage = require('./storage')({
@@ -20,7 +20,7 @@ const api = express.Router()
 // AUTH
 api.post('/auth/login', userController.login)
 api.post('/auth/logout', userController.logout)
-api.get('/auth/user', jwt, userController.current)
+api.get('/auth/user', jwt, fillUser, userController.current)
 
 api.post('/user/recover', userController.forgotPassword)
 api.post('/user/check_recover_code', userController.checkRecoverCode)
@@ -33,32 +33,32 @@ api
   // get current user
   // .get(isAuth, userController.current)
   // update user (eg. confirm)
-  .put(isAuth, isAdmin, userController.update)
+  .put(jwt, isAuth, isAdmin, userController.update)
 
 // get all users
-api.get('/users', isAuth, isAdmin, userController.getAll)
+api.get('/users', jwt, isAuth, isAdmin, userController.getAll)
 
 // update a tag (modify color)
-api.put('/tag', isAuth, isAdmin, eventController.updateTag)
+api.put('/tag', jwt, isAuth, isAdmin, eventController.updateTag)
 
 // update a place (modify address..)
-api.put('/place', isAuth, isAdmin, eventController.updatePlace)
+api.put('/place', jwt, isAuth, isAdmin, eventController.updatePlace)
 
 api
   .route('/user/event')
   // add event
-  .post(fillUser, upload.single('image'), userController.addEvent)
+  .post(jwt, fillUser, upload.single('image'), userController.addEvent)
   // update event
-  .put(isAuth, upload.single('image'), userController.updateEvent)
+  .put(jwt, isAuth, upload.single('image'), userController.updateEvent)
 
 // remove event
-api.delete('/user/event/:id', isAuth, userController.delEvent)
+api.delete('/user/event/:id', jwt, isAuth, userController.delEvent)
 
 // get tags/places
 api.get('/event/meta', eventController.getMeta)
 
 // get unconfirmed events
-api.get('/event/unconfirmed', isAuth, isAdmin, eventController.getUnconfirmed)
+api.get('/event/unconfirmed', jwt, isAuth, isAdmin, eventController.getUnconfirmed)
 
 // add event notification
 api.post('/event/notification', eventController.addNotification)
@@ -71,22 +71,17 @@ api.post('/settings', settingsController.setAdminSetting)
 api.get('/event/:event_id', eventController.get)
 
 // confirm event
-api.get('/event/confirm/:event_id', isAuth, isAdmin, eventController.confirm)
-api.get(
-  '/event/unconfirm/:event_id',
-  isAuth,
-  isAdmin,
-  eventController.unconfirm
-)
+api.get('/event/confirm/:event_id', jwt, isAuth, isAdmin, eventController.confirm)
+api.get('/event/unconfirm/:event_id', jwt, isAuth, isAdmin, eventController.unconfirm)
 
 // export events (rss/ics)
 api.get('/export/:type', exportController.export)
 
 // get events in this range
-api.get('/event/:year/:month', eventController.getAll)
+api.get('/event/:month/:year', eventController.getAll)
 
 // mastodon oauth auth
-api.post('/user/getauthurl', isAuth, userController.getAuthURL)
-api.post('/user/code', isAuth, userController.code)
+api.post('/user/getauthurl', jwt, isAuth, userController.getAuthURL)
+api.post('/user/code', jwt, isAuth, userController.code)
 
 module.exports = api
diff --git a/server/api/models/event.js b/server/api/models/event.js
index 35524b74..d9c4541e 100644
--- a/server/api/models/event.js
+++ b/server/api/models/event.js
@@ -9,8 +9,9 @@ const Event = db.define('event', {
   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.INTEGER, index: true },
-  is_visible: Sequelize.BOOLEAN
+  // activitypub_ids: { type: Sequelize.ARRAY, index}
 })
 
 const Tag = db.define('tag', {
@@ -20,6 +21,8 @@ const Tag = db.define('tag', {
 
 const Comment = db.define('comment', {
   activitypub_id: { type: Sequelize.INTEGER, index: true },
+  url: Sequelize.STRING,
+  media_attachments: { type: Sequelize.ARRAY(Sequelize.STRING) },
   author: Sequelize.STRING,
   text: Sequelize.STRING
 })
@@ -63,10 +66,10 @@ 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 } } })
-// }
+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()
+init()
 module.exports = { Event, Comment, Tag, Place, Notification, EventNotification }
diff --git a/server/cron.js b/server/cron.js
new file mode 100644
index 00000000..354fd40d
--- /dev/null
+++ b/server/cron.js
@@ -0,0 +1,65 @@
+// const mail = require('./mail')
+const bot = require('./api/controller/bot')
+const settingsController = require('./api/controller/settings')
+const config = require('./api/config.js')
+
+const { Event, Notification, EventNotification,
+  User, Place, Tag } = require('./api/model')
+let settings
+
+async function sendNotification (notification, event, eventNotification) {
+  const promises = []
+  switch (notification.type) {
+    // case 'mail':
+      // return mail.send(notification.email, 'event', { event, config, notification })
+  //  case 'admin_email':
+   //   const admins = await User.findAll({ where: { is_admin: true } })
+    //  const admin_emails = admins.map(admin => admin.email)
+    //  return mail.send(admin_emails, 'event', { event, to_confirm: true, notification })
+    case 'mastodon':
+      // instance publish
+      if (settings.mastodon_auth.instance && settings.mastodon_auth.access_token) {
+        const b = bot.post(settings.mastodon_auth, event).then(b => {
+          console.log('ho postato admin post cose', b.data.id)
+          event.activitypub_id = b.data.id
+          return event.save()
+        })
+        promises.push(b)
+      }
+      // user publish
+      if (event.user && event.user.mastodon_auth && event.user.mastodon_auth.access_token) {
+        const b = bot.post(event.user.mastodon_auth, event).then(ret => {
+          event.activitypub_id = ret.id
+          return event.save()
+        })
+        promises.push(b)
+      }
+      break
+  }
+  return Promise.all(promises)
+}
+
+async function loop () {
+  settings = await settingsController.settings()
+  // get all event notification in queue
+  const eventNotifications = await EventNotification.findAll({ where: { status: 'new' } })
+  const promises = eventNotifications.map(async e => {
+    const event = await Event.findByPk(e.eventId, { include: [User, Place, Tag] })
+    if (!event.place) return
+    const notification = await Notification.findByPk(e.notificationId)
+    try {
+      await sendNotification(notification, event, e)
+      e.status = 'sent'
+      return e.save()
+    } catch (err) {
+      console.error(err)
+      e.status = 'error'
+      return e.save()
+    }
+  })
+
+  return Promise.all(promises)
+}
+
+setInterval(loop, 260000)
+loop()
diff --git a/server/index.js b/server/index.js
index 42ebd858..9033002f 100644
--- a/server/index.js
+++ b/server/index.js
@@ -3,6 +3,7 @@ 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')
@@ -32,6 +33,7 @@ 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())
diff --git a/store/index.js b/store/index.js
index bd568e4a..d9dd6ceb 100644
--- a/store/index.js
+++ b/store/index.js
@@ -103,11 +103,13 @@ export const actions = {
     // set user if logged! TODO
     const now = new Date()
     // const events = await api.getAllEvents(now.getMonth() - 1, now.getFullYear())
-    const events = await this.$axios.$get(`/event/${now.getMonth() - 1}/${now.getFullYear()}`)
+    const events = await this.$axios.$get(`/event/${now.getMonth()}/${now.getFullYear()}`)
     commit('setEvents', events)
+    const { tags, places } = await this.$axios.$get('/event/meta')
+    commit('update', { tags, places })    
   },
   async updateEvents({ commit }, page) {
-    const events = await this.$axios.$get(`/event/${page.month}/${page.year}`)
+    const events = await this.$axios.$get(`/event/${page.month-1}/${page.year}`)
     commit('setEvents', events)
   },
   async updateMeta({ commit }) {
@@ -116,9 +118,7 @@ export const actions = {
   },
   async addEvent({ commit }, formData) {
     const event = await this.$axios.$post('/user/event', formData) // .addEvent(formData)
-    if (this.state.logged) {
-      commit('addEvent', event)
-    }
+    commit('addEvent', event)
   },
   async updateEvent({ commit }, formData) {
     const event = await this.$axios.$put('/user/event', formData)
diff --git a/widgets/examples/index.html b/widgets/examples/index.html
new file mode 100644
index 00000000..e31c88d8
--- /dev/null
+++ b/widgets/examples/index.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>Gancio Widget Example</title>
+    <script src="https://unpkg.com/vue"></script>
+    <script src='dist/gancio-widget.min.js'></script>
+    <link rel="stylesheet" href="../list/style.css">
+</head>
+<body>
+
+    <gancio-widget minimal></gancio-widget>
+    
+</body>
+</html>
\ No newline at end of file
diff --git a/widgets/list/index.html b/widgets/list/index.html
new file mode 100644
index 00000000..e69de29b
diff --git a/widgets/list/index.js b/widgets/list/index.js
new file mode 100644
index 00000000..0b47f6d7
--- /dev/null
+++ b/widgets/list/index.js
@@ -0,0 +1,12 @@
+import Vue from 'vue'
+import vueCustomElement from 'vue-custom-element'
+import App from '../../components/List'
+// import router from './router'
+// import store from '../../store'
+
+Vue.use(vueCustomElement)
+
+// App.store = store
+// App.router = router
+Vue.customElement('gancio-widget', App)
+export default App
diff --git a/widgets/list/style.css b/widgets/list/style.css
new file mode 100644
index 00000000..87eb01f5
--- /dev/null
+++ b/widgets/list/style.css
@@ -0,0 +1,3 @@
+#gancio-widget {
+    border: 1px solid black;
+}
\ No newline at end of file

From e50e5434bc177f66456ac1a7d287f0d9b786d373 Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Tue, 30 Apr 2019 01:04:24 +0200
Subject: [PATCH 07/14] comment from mastodon to gancio

---
 .vscode/vscode-kanban.json   | 49 ++++++++++++++----------
 components/Nav.vue           |  2 +-
 locales/it.json              |  8 ++--
 pages/event/_id.vue          | 74 ++++++++++++++++++------------------
 server/api/controller/bot.js |  7 +++-
 server/api/db.js             |  2 +-
 server/api/models/event.js   |  6 +--
 7 files changed, 81 insertions(+), 67 deletions(-)

diff --git a/.vscode/vscode-kanban.json b/.vscode/vscode-kanban.json
index 9d48a542..9e4d1a8f 100644
--- a/.vscode/vscode-kanban.json
+++ b/.vscode/vscode-kanban.json
@@ -32,6 +32,17 @@
       "prio": 0,
       "references": [],
       "title": "export lista"
+    },
+    {
+      "assignedTo": {
+        "name": "lesion"
+      },
+      "category": "feature",
+      "creation_time": "2019-04-23T19:56:46.263Z",
+      "id": "11",
+      "prio": 1,
+      "references": [],
+      "title": "get comments / media from mastodon"
     }
   ],
   "testing": [
@@ -72,17 +83,6 @@
       "title": "rivedere ux / messaggi utente",
       "type": "bug"
     },
-    {
-      "assignedTo": {
-        "name": "lesion"
-      },
-      "category": "feature",
-      "creation_time": "2019-04-23T19:56:46.263Z",
-      "id": "11",
-      "prio": 1,
-      "references": [],
-      "title": "get comments / media from mastodon"
-    },
     {
       "assignedTo": {
         "name": "lesion"
@@ -115,6 +115,15 @@
       "title": "risolvere le modali quando il js e' disabilitato",
       "type": "bug"
     },
+    {
+      "assignedTo": {
+        "name": "lesion"
+      },
+      "creation_time": "2019-04-29T10:01:01.632Z",
+      "id": "14",
+      "references": [],
+      "title": "gestione errori quando non c'e' un evento"
+    },
     {
       "assignedTo": {
         "name": "lesion"
@@ -134,6 +143,15 @@
       "references": [],
       "title": "rifare il calendario o solo il popup"
     },
+    {
+      "assignedTo": {
+        "name": "lesion"
+      },
+      "creation_time": "2019-04-28T09:25:50.701Z",
+      "id": "13",
+      "references": [],
+      "title": "test altra visualizzazione"
+    },
     {
       "assignedTo": {
         "name": "lesion"
@@ -156,15 +174,6 @@
       "references": [],
       "title": "documentare sorgenti",
       "type": "bug"
-    },
-    {
-      "assignedTo": {
-        "name": "lesion"
-      },
-      "creation_time": "2019-04-28T09:25:50.701Z",
-      "id": "13",
-      "references": [],
-      "title": "test altra visualizzazione"
     }
   ]
 }
\ No newline at end of file
diff --git a/components/Nav.vue b/components/Nav.vue
index d10cf8c7..67f0f3f7 100644
--- a/components/Nav.vue
+++ b/components/Nav.vue
@@ -10,7 +10,7 @@
           span.d-md-none  {{$t('common.add_event')}}
         b-nav-item(v-if='$auth.loggedIn' to='/settings' v-b-tooltip :title='$t("common.settings")') <v-icon color='orange' name='cog'/>
           span.d-md-none  {{$t('common.settings')}}
-        b-nav-item(v-if='$auth.user.is_admin' to='/admin' v-b-tooltip :title='$t("common.admin")') <v-icon color='lightblue' name='tools'/>
+        b-nav-item(v-if='$auth.user && $auth.user.is_admin' to='/admin' v-b-tooltip :title='$t("common.admin")') <v-icon color='lightblue' name='tools'/>
           span.d-md-none  {{$t('common.admin')}}
         b-nav-item(to='/export' v-b-tooltip :title='$t("common.export")') <v-icon name='file-export' color='yellow'/>
           span.d-md-none  {{$t('common.export')}}
diff --git a/locales/it.json b/locales/it.json
index 6f37cec2..00c1e34a 100644
--- a/locales/it.json
+++ b/locales/it.json
@@ -35,7 +35,9 @@
     "hide": "Nascondi",
     "remove": "Elimina",
     "edit": "Modifica",
-    "actions": "Azioni"
+    "actions": "Azioni",
+    "resources": "Risorse",
+    "add": "Aggiungi"
   },
 
   "login": {
@@ -58,7 +60,8 @@
     "anon_description": "",
     "where_description" : "Dov'è il gancio? Se è un luogo fisico, scrivi il suo nome del per esteso (tipo 'Mezcal Squat'), se è una Piazza/Via metti quella (tipo 'Piazza Castello, Torino'). Se trovi già il luogo dell'evento premilo e l'indirizzo verrà autocompletato.",
     "address_description": "",
-    "tag_description": "Puoi inserire un tag (es. concerto, corteo)"
+    "tag_description": "Puoi inserire un tag (es. concerto, corteo)",
+    "added": "Avento aggiunto"
   },
 
   "admin": {
@@ -69,4 +72,3 @@
     "mastodon_instance": "Istanza mastodon"
   }
 }
-
diff --git a/pages/event/_id.vue b/pages/event/_id.vue
index 935612cf..7fd32d5f 100644
--- a/pages/event/_id.vue
+++ b/pages/event/_id.vue
@@ -14,7 +14,6 @@
         br
       b-card-body(v-if='event.description || event.tags')
         pre(v-html='event.description')
-        br
         el-tag.mr-1(:color='tag.color' v-for='tag in event.tags'
           size='mini' :key='tag.tag') {{tag.tag}}
         div(v-if='mine')
@@ -24,27 +23,17 @@
           el-button(plain type='danger' @click.prevent='remove' icon='el-icon-remove') {{$t('common.remove')}} 
           el-button(plain type='primary' @click='$router.replace("/edit/"+event.id)') <v-icon color='orange' name='edit'/> {{$t('common.edit')}}
 
-    //- COMMENTS ... 
-    //- b-navbar(type="dark" variant="dark" toggleable='lg')
-    //- template(slot='footer')
-      //- b-navbar-nav
-        //- b-button(variant='success') {{$t('Share')}} <v-icon name='share'/>
-        //- b-nav-item( {{$t('')}})
-      //- b-card-footer.text-right
-        //- span.mr-3 {{event.comments.length}} <v-icon name='comments'/>
-        //- a(href='#', @click='remove')
-          v-icon(color='orange' name='times')
-    //- el-footer(v-for='comment in event.comments')
-      strong {{comment.author}}
-      div(v-html='comment.text')
-
-    //- el-timeline
-    //-   el-timeline-item(v-for='comment in event.comments')
-    //-     p(v-html='comment.text')
-    //-     a.el-timeline-item__timestamp(href='') {{comment.createdAt}}
-    strong {{$t('common.comments')}}
-      div.text.item(v-for='comment in event.comments')
-        span(v-html='comment.text')
+    b-card-body(v-if='event.activitypub_id')
+      strong {{$t('common.resources')}} - 
+      a(:href='`https://mastodon.cisti.org/web/statuses/${event.activitypub_id}`') {{$t('common.add')}}
+    b-card-header(v-for='comment in event.comments' :key='comment.id')
+      img.avatar(:src='comment.data.last_status.account.avatar') 
+      strong  {{comment.author}} 
+      a.float-right(:href='comment.data.last_status.url')
+        small  {{comment.data.last_status.created_at|datetime}}
+      div.mt-1(v-html='comment_filter(comment.text)')
+      img(v-for='img in comment.data.last_status.media_attachments' :src='img.preview_url')
+      //- span {{comment}}
 </template>
 <script>
 import { mapState, mapActions } from 'vuex';
@@ -74,7 +63,7 @@ export default {
     },    
     mine () {
       return this.event.userId === this.$auth.user.id || this.$auth.user.is_admin
-    }
+    },
   },
   data () {
     return {
@@ -83,25 +72,25 @@ export default {
       loading: true,
     }
   },
-  // mounted () {
-  //   this.id = this.$route.params.id
-  //   this.load()
-  // },
   async asyncData ( { $axios, params }) {
-    console.error('daje dentro asyncData!')
-    console.error('async data porcod')
     const event = await $axios.$get(`/event/${params.id}`)
-    // this.event = event
-    // this.loading = false
     return { event, id: params.id, loading: false }
   },
   methods: {
     ...mapActions(['delEvent']),
-    // async load () {
-    //   const event = await this.api.getEvent(this.id)
-    //   this.event = event
-    //   this.loading = false
-    // },
+    comment_filter (value) {
+      console.log('dentro comment_filter')
+      return value.replace(/<a.*href="([^">]+).*>(?:.(?!\<\/a\>))*.<\/a>/, (orig, url) => {
+        // get extension
+        const ext = url.slice(-4)
+        console.log('dentro il replace ', ext)
+        if (['.mp3', '.ogg'].indexOf(ext)>-1) {
+          return `<audio controls><source src='${url}'></audio>`
+        } else {
+          return orig
+        }
+      })
+    },
     async remove () {
       await api.delEvent(this.event.id)
       this.delEvent(this.event.id)
@@ -125,6 +114,15 @@ export default {
 </script>
 <style>
 
+#eventDetail .avatar {
+  height: 40px;
+  border-radius: 5px;
+}
+
+#eventDetail .image {
+  max-height: 200px;
+}
+
 /* #eventDetail {
   display: block !important;
   opacity: 1;
@@ -144,10 +142,10 @@ export default {
 }
 
 #eventDetail .close_button {
-  background-color: rgba(100, 100, 100, 0.4);
+  background-color: rgba(100, 100, 100, 0.3);
   color: red;
   font-size: 20px;
-  border: none;
+  border: 1px dashed rgba(20,20,20,0.3);
   position: absolute;
   top: 10px;
   right: 10px;
diff --git a/server/api/controller/bot.js b/server/api/controller/bot.js
index edaadd32..0e2a732c 100644
--- a/server/api/controller/bot.js
+++ b/server/api/controller/bot.js
@@ -72,7 +72,12 @@ ${event.description.length > 200 ? event.description.substr(0, 200) + '...' : ev
       // const comment = await Comment.findOne( {where: { }})
       return 
     }
-    const comment = await Comment.create({activitypub_id: msg.data.last_status.id, text: msg.data.last_status.content, author: msg.data.accounts[0].username })
+    const comment = await Comment.create({
+      activitypub_id: msg.data.last_status.id, 
+      text: msg.data.last_status.content,
+      data: msg.data,
+      author: msg.data.accounts[0].username 
+    })
     event.addComment(comment)
     console.log(event)
     // const comment = await Comment.findOne( { where: {activitypub_id: msg.data.in_reply_to}} )
diff --git a/server/api/db.js b/server/api/db.js
index 7de7ec67..11a71f42 100644
--- a/server/api/db.js
+++ b/server/api/db.js
@@ -1,5 +1,5 @@
 const Sequelize = require('sequelize')
 const conf = require('./config.js')
 const db = new Sequelize(conf.db)
-// db.sync({force: true})
+db.sync()
 module.exports = db
diff --git a/server/api/models/event.js b/server/api/models/event.js
index d9c4541e..7c5e7f34 100644
--- a/server/api/models/event.js
+++ b/server/api/models/event.js
@@ -10,7 +10,7 @@ const Event = db.define('event', {
   end_datetime: { type: Sequelize.DATE, index: true },
   image_path: Sequelize.STRING,
   is_visible: Sequelize.BOOLEAN,
-  activitypub_id: { type: Sequelize.INTEGER, index: true },
+  activitypub_id: { type: Sequelize.STRING, index: true },
   // activitypub_ids: { type: Sequelize.ARRAY, index}
 })
 
@@ -20,9 +20,9 @@ const Tag = db.define('tag', {
 })
 
 const Comment = db.define('comment', {
-  activitypub_id: { type: Sequelize.INTEGER, index: true },
+  activitypub_id: { type: Sequelize.STRING, index: true },
+  data: Sequelize.JSON,
   url: Sequelize.STRING,
-  media_attachments: { type: Sequelize.ARRAY(Sequelize.STRING) },
   author: Sequelize.STRING,
   text: Sequelize.STRING
 })

From 69792b518e453b31c6ef778d6b1cdd2385750b77 Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Tue, 30 Apr 2019 15:16:50 +0200
Subject: [PATCH 08/14] clean configuration

---
 .gitignore                      |  2 ++
 .vscode/vscode-kanban.json      | 57 ++++++++++++++++++++------------
 config.js                       | 58 +++++++++++++++++++++++++++++++++
 nuxt.config.js                  |  5 +--
 server/api/auth.js              |  2 +-
 server/api/config.js            | 27 ---------------
 server/api/controller/bot.js    |  7 +---
 server/api/controller/export.js |  2 +-
 server/api/controller/user.js   |  2 +-
 server/api/db.js                |  2 +-
 server/api/index.js             |  2 +-
 server/api/mail.js              |  4 +--
 server/api/models/index.js      | 34 ++++++++-----------
 server/cron.js                  |  1 -
 14 files changed, 121 insertions(+), 84 deletions(-)
 create mode 100644 config.js
 delete mode 100644 server/api/config.js

diff --git a/.gitignore b/.gitignore
index f935a370..8412a7ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,8 @@ pids
 # Directory for instrumented libs generated by jscoverage/JSCover
 lib-cov
 
+uploads
+
 # Coverage directory used by tools like istanbul
 coverage
 
diff --git a/.vscode/vscode-kanban.json b/.vscode/vscode-kanban.json
index 9e4d1a8f..c40aba7d 100644
--- a/.vscode/vscode-kanban.json
+++ b/.vscode/vscode-kanban.json
@@ -1,5 +1,16 @@
 {
   "done": [
+    {
+      "assignedTo": {
+        "name": "lesion"
+      },
+      "category": "feature",
+      "creation_time": "2019-04-23T19:47:35.777Z",
+      "id": "5",
+      "prio": 3,
+      "references": [],
+      "title": "server side auth"
+    },
     {
       "assignedTo": {
         "name": "lesion"
@@ -19,19 +30,6 @@
       "references": [],
       "title": "export page",
       "type": "bug"
-    }
-  ],
-  "in-progress": [
-    {
-      "assignedTo": {
-        "name": "lesion"
-      },
-      "category": "feature",
-      "creation_time": "2019-04-23T19:46:46.332Z",
-      "id": "3",
-      "prio": 0,
-      "references": [],
-      "title": "export lista"
     },
     {
       "assignedTo": {
@@ -43,21 +41,31 @@
       "prio": 1,
       "references": [],
       "title": "get comments / media from mastodon"
-    }
-  ],
-  "testing": [
+    },
     {
       "assignedTo": {
         "name": "lesion"
       },
       "category": "feature",
-      "creation_time": "2019-04-23T19:47:35.777Z",
-      "id": "5",
-      "prio": 3,
+      "creation_time": "2019-04-23T19:46:46.332Z",
+      "id": "3",
+      "prio": 0,
       "references": [],
-      "title": "server side auth"
+      "title": "export lista"
     }
   ],
+  "in-progress": [
+    {
+      "assignedTo": {
+        "name": "lesion"
+      },
+      "creation_time": "2019-04-30T12:31:20.056Z",
+      "id": "15",
+      "references": [],
+      "title": "test deploy"
+    }
+  ],
+  "testing": [],
   "todo": [
     {
       "assignedTo": {
@@ -174,6 +182,15 @@
       "references": [],
       "title": "documentare sorgenti",
       "type": "bug"
+    },
+    {
+      "assignedTo": {
+        "name": "lesion"
+      },
+      "creation_time": "2019-04-30T12:46:42.208Z",
+      "id": "16",
+      "references": [],
+      "title": "riesco a rimuovere bootstrap-vue e usare solo element ?"
     }
   ]
 }
\ No newline at end of file
diff --git a/config.js b/config.js
new file mode 100644
index 00000000..a36eaf36
--- /dev/null
+++ b/config.js
@@ -0,0 +1,58 @@
+/**
+ * GANCIO CONFIGURATION
+ */
+const env = process.env.NODE_ENV || 'development'
+
+
+console.log(__dirname + '/db.sqlite')
+/**
+ * Database configuration
+ * `development` configuration is enabled running `yarn dev`
+ * while `production` with `yarn start`
+ * ref: http://docs.sequelizejs.com/class/lib/sequelize.js~Sequelize.html#instance-constructor-constructor
+ */
+const DB_CONF = {
+  development: {
+    storage: __dirname + '/db.sqlite',
+    dialect: 'sqlite',
+    logging: false
+  },
+  production: {
+    storage: __dirname + '/db.sqlite',
+    dialect: 'sqlite',
+    logging: false    
+    // username: 'docker',
+    // password: 'docker',
+    // database: 'gancio',
+    // host: 'db',
+    // dialect: 'postgres',
+    // logging: false
+  }
+}
+
+
+/**
+ * Main Gancio configuration
+ */
+const GANCIO_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'
+}
+
+module.exports = GANCIO_CONF
\ No newline at end of file
diff --git a/nuxt.config.js b/nuxt.config.js
index 30bdf1da..0dbc9c6e 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -57,6 +57,7 @@ module.exports = {
    ** Axios module configuration
    */
   axios: {
+    baseURL: '',
     prefix: '/api',
     credentials: true
     // See https://github.com/nuxt-community/axios-module#options
@@ -70,11 +71,11 @@ module.exports = {
           logout: { url: '/auth/logout', method: 'post' },
           user: { url: '/auth/user', method: 'get', propertyName: false }
         },
-        // tokenRequired: true,
-        // tokenType: 'bearer',
       }
     }
   },
+
+
   /*
    ** Build configuration
    */
diff --git a/server/api/auth.js b/server/api/auth.js
index 85f9abb4..b974c7be 100644
--- a/server/api/auth.js
+++ b/server/api/auth.js
@@ -1,5 +1,5 @@
 const { Op } = require('sequelize')
-const config = require('./config')
+const config = require('../../config')
 const User = require('./models/user')
 
 const Auth = {
diff --git a/server/api/config.js b/server/api/config.js
deleted file mode 100644
index b9acb27a..00000000
--- a/server/api/config.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/* backend configuration */
-const env = process.env.NODE_ENV || 'development'
-const db = require('./config/config.json')[env]
-
-module.exports = {
-  locale: process.env.LOCALE || 'it',
-  title: process.env.TITLE || 'GANCIO',
-  description: process.env.DESCRIPTION || 'A calendar for radical communities',
-  baseurl: process.env.BASE_URL || 'http://localhost:3000',
-  apiurl:
-    env === 'production'
-      ? process.env.BASE_URL + '/api'
-      : 'http://localhost:3000/api',
-  db,
-  admin: process.env.ADMIN_EMAIL,
-
-  smtp: {
-    host: process.env.SMTP_HOST,
-    secure: true,
-    auth: {
-      user: process.env.SMTP_USER,
-      pass: process.env.SMTP_PASS
-    }
-  },
-
-  secret: process.env.SECRET || 'notsosecret'
-}
diff --git a/server/api/controller/bot.js b/server/api/controller/bot.js
index 0e2a732c..9d1a08c6 100644
--- a/server/api/controller/bot.js
+++ b/server/api/controller/bot.js
@@ -1,5 +1,5 @@
 const { User, Event, Comment, Tag } = require('../model')
-const config = require('../config')
+const config = require('../../../config')
 const Mastodon = require('mastodon-api')
 // const Sequelize = require('sequelize')
 // const Op = Sequelize.Op
@@ -12,11 +12,9 @@ moment.locale('it')
 const botController = {
   bot: null,
   async initialize () {
-    console.log('initialize bot')
     const settings = await settingsController.settings()
     if (!settings.mastodon_auth) return
     const mastodon_auth = settings.mastodon_auth
-    console.log('instance ', `https://${mastodon_auth.instance}/api/v1/`)
     botController.bot = new Mastodon({ 
       access_token: mastodon_auth.access_token,
       api_url: `https://${mastodon_auth.instance}/api/v1`
@@ -45,7 +43,6 @@ const botController = {
   //   botController.bots.push({ email: user.email, bot })
   },
   async post (mastodon_auth, event) {
-    console.log('dentro post!')
     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')} - 
@@ -67,7 +64,6 @@ ${event.description.length > 200 ? event.description.substr(0, 200) + '...' : ev
     if (!replyid) return
     const event = await Event.findOne({ where: { activitypub_id: replyid } })
     if (!event) {
-      console.error('associated event not found !')
       // check for comment..
       // const comment = await Comment.findOne( {where: { }})
       return 
@@ -79,7 +75,6 @@ ${event.description.length > 200 ? event.description.substr(0, 200) + '...' : ev
       author: msg.data.accounts[0].username 
     })
     event.addComment(comment)
-    console.log(event)
     // const comment = await Comment.findOne( { where: {activitypub_id: msg.data.in_reply_to}} )
     // console.log('dentro message ', data)
 
diff --git a/server/api/controller/export.js b/server/api/controller/export.js
index 541433c7..ab74a4f9 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 { Op } = require('sequelize')
-const config = require('../config')
+const config = require('../../../config')
 const moment = require('moment')
 const ics = require('ics')
 
diff --git a/server/api/controller/user.js b/server/api/controller/user.js
index a101d1c3..5c66a0e1 100644
--- a/server/api/controller/user.js
+++ b/server/api/controller/user.js
@@ -6,7 +6,7 @@ const Mastodon = require('mastodon-api')
 const { Op } = require('sequelize')
 const jsonwebtoken = require('jsonwebtoken')
 const User = require('../models/user')
-const config = require('../config')
+const config = require('../../../config')
 const mail = require('../mail')
 const { Event, Tag, Place } = require('../models/event')
 const settingsController = require('./settings')
diff --git a/server/api/db.js b/server/api/db.js
index 11a71f42..948b87c3 100644
--- a/server/api/db.js
+++ b/server/api/db.js
@@ -1,5 +1,5 @@
 const Sequelize = require('sequelize')
-const conf = require('./config.js')
+const conf = require('../../config.js')
 const db = new Sequelize(conf.db)
 db.sync()
 module.exports = db
diff --git a/server/api/index.js b/server/api/index.js
index 2a176419..1dcc10f3 100644
--- a/server/api/index.js
+++ b/server/api/index.js
@@ -5,7 +5,7 @@ const eventController = require('./controller/event')
 const exportController = require('./controller/export')
 const userController = require('./controller/user')
 const settingsController = require('./controller/settings')
-const config = require('./config')
+const config = require('../../config')
 
 const botController = require('./controller/bot')
 const jwt = require('express-jwt')({secret: config.secret})
diff --git a/server/api/mail.js b/server/api/mail.js
index 4f38ee11..7f28f3f4 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 config = require('./config')
+const config = require('../../config')
 const moment = require('moment')
-moment.locale('it')
+moment.locale(config.locale)
 
 const mail = {
   send (addresses, template, locals) {
diff --git a/server/api/models/index.js b/server/api/models/index.js
index c1a3d6d5..6d76a99a 100644
--- a/server/api/models/index.js
+++ b/server/api/models/index.js
@@ -1,37 +1,29 @@
-'use strict';
+const fs = require('fs')
+const path = require('path')
+const Sequelize = require('sequelize')
+const basename = path.basename(__filename)
+const config = require('../../../config')
+const db = {}
 
-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);
-}
+const sequelize = new Sequelize(config.db)
 
 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/cron.js b/server/cron.js
index 354fd40d..96575aa5 100644
--- a/server/cron.js
+++ b/server/cron.js
@@ -20,7 +20,6 @@ async function sendNotification (notification, event, eventNotification) {
       // instance publish
       if (settings.mastodon_auth.instance && settings.mastodon_auth.access_token) {
         const b = bot.post(settings.mastodon_auth, event).then(b => {
-          console.log('ho postato admin post cose', b.data.id)
           event.activitypub_id = b.data.id
           return event.save()
         })

From 6099d538c0e9f4f0526d3cf83398c39e6fdacb65 Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Thu, 30 May 2019 12:04:14 +0200
Subject: [PATCH 09/14] .

---
 .vscode/vscode-kanban.json        |  90 +++++++++++--
 README.md                         |  30 +++--
 assets/style.less                 |  55 ++++++++
 components/Calendar.vue           |  57 +++-----
 components/Event.vue              | 170 +++++++++++++++++-------
 components/Home.vue               | 116 ++++------------
 components/List.vue               |  89 ++++++++++---
 components/Nav.vue                |  92 +++++++------
 components/Search.vue             |  65 +++++++--
 layouts/default.vue               |  73 +---------
 locales/email/en.json             |   5 +
 locales/email/es.json             |   5 +
 locales/email/it.json             |   5 +
 locales/email/zh.json             |   5 +
 locales/it.json                   |  74 -----------
 nuxt.config.js                    |  45 +++----
 package.json                      |  10 +-
 pages/about.vue                   |  29 ++--
 pages/add/_edit.vue               | 162 ++++++++++++++++-------
 pages/admin.vue                   |  63 +++++----
 pages/embed/list.vue              |  18 ++-
 pages/event/_id.vue               | 212 +++++++++++++++++++-----------
 pages/export.vue                  | 112 +++++++---------
 pages/index.vue                   |  13 ++
 pages/login.vue                   |  30 +++--
 pages/register.vue                |  20 +--
 pages/settings.vue                |  70 ++++------
 plugins/api.js                    |  80 -----------
 plugins/bootstrap-vue.js          |   6 -
 plugins/element-ui.js             |  21 ++-
 plugins/filters.js                |  21 ++-
 plugins/i18n.js                   |   3 +-
 plugins/magic-grid.js             |   6 -
 plugins/v-calendar.js             |   1 -
 plugins/vue-awesome.js            |   8 ++
 server/api/auth.js                |   2 +-
 server/api/controller/bot.js      |   6 +-
 server/api/controller/event.js    |  32 ++++-
 server/api/controller/settings.js |  38 ++++++
 server/api/controller/user.js     |  95 ++++---------
 server/api/db.js                  |   7 +-
 server/api/index.js               |  25 +++-
 server/api/mail.js                |  22 ++--
 server/api/models/event.js        |  14 +-
 server/api/storage.js             |   4 +-
 server/cron.js                    |  11 +-
 store/index.js                    | 101 +++++++-------
 47 files changed, 1220 insertions(+), 998 deletions(-)
 create mode 100644 assets/style.less
 create mode 100644 locales/email/en.json
 create mode 100644 locales/email/es.json
 create mode 100644 locales/email/it.json
 create mode 100644 locales/email/zh.json
 delete mode 100644 locales/it.json
 delete mode 100644 plugins/api.js
 delete mode 100644 plugins/bootstrap-vue.js
 delete mode 100644 plugins/magic-grid.js

diff --git a/.vscode/vscode-kanban.json b/.vscode/vscode-kanban.json
index c40aba7d..cfcc8869 100644
--- a/.vscode/vscode-kanban.json
+++ b/.vscode/vscode-kanban.json
@@ -52,6 +52,24 @@
       "prio": 0,
       "references": [],
       "title": "export lista"
+    },
+    {
+      "assignedTo": {
+        "name": "lesion"
+      },
+      "creation_time": "2019-04-30T12:46:42.208Z",
+      "id": "16",
+      "references": [],
+      "title": "riesco a rimuovere bootstrap-vue e usare solo element ?"
+    },
+    {
+      "assignedTo": {
+        "name": "lesion"
+      },
+      "creation_time": "2019-04-28T09:25:50.701Z",
+      "id": "13",
+      "references": [],
+      "title": "test altra visualizzazione"
     }
   ],
   "in-progress": [
@@ -123,6 +141,42 @@
       "title": "risolvere le modali quando il js e' disabilitato",
       "type": "bug"
     },
+    {
+      "assignedTo": {
+        "name": "lesion"
+      },
+      "creation_time": "2019-05-27T15:42:35.467Z",
+      "id": "21",
+      "references": [],
+      "title": "all'admin deve mostrare un badge se ci sono pending operation"
+    },
+    {
+      "assignedTo": {
+        "name": "lesion"
+      },
+      "creation_time": "2019-05-27T15:16:22.839Z",
+      "id": "20",
+      "references": [],
+      "title": "check password reset"
+    },
+    {
+      "assignedTo": {
+        "name": "lesion"
+      },
+      "creation_time": "2019-05-27T15:45:39.093Z",
+      "id": "23",
+      "references": [],
+      "title": "colori te prego!"
+    },
+    {
+      "assignedTo": {
+        "name": "lesion"
+      },
+      "creation_time": "2019-05-27T15:45:18.012Z",
+      "id": "22",
+      "references": [],
+      "title": "filtri per luogo!"
+    },
     {
       "assignedTo": {
         "name": "lesion"
@@ -132,6 +186,24 @@
       "references": [],
       "title": "gestione errori quando non c'e' un evento"
     },
+    {
+      "assignedTo": {
+        "name": "lesion"
+      },
+      "creation_time": "2019-05-02T16:15:07.106Z",
+      "id": "19",
+      "references": [],
+      "title": "modifica eventi multigiorno"
+    },
+    {
+      "assignedTo": {
+        "name": "lesion"
+      },
+      "creation_time": "2019-05-02T11:50:28.476Z",
+      "id": "18",
+      "references": [],
+      "title": "notifiche email / iscrizione / evento da confermare"
+    },
     {
       "assignedTo": {
         "name": "lesion"
@@ -146,19 +218,19 @@
       "assignedTo": {
         "name": "lesion"
       },
-      "creation_time": "2019-04-27T19:44:33.769Z",
-      "id": "12",
+      "creation_time": "2019-04-30T22:00:29.237Z",
+      "id": "17",
       "references": [],
-      "title": "rifare il calendario o solo il popup"
+      "title": "porcoddio la config arriva anche al client ovviamente, devo separare!"
     },
     {
       "assignedTo": {
         "name": "lesion"
       },
-      "creation_time": "2019-04-28T09:25:50.701Z",
-      "id": "13",
+      "creation_time": "2019-04-27T19:44:33.769Z",
+      "id": "12",
       "references": [],
-      "title": "test altra visualizzazione"
+      "title": "rifare il calendario o solo il popup"
     },
     {
       "assignedTo": {
@@ -187,10 +259,10 @@
       "assignedTo": {
         "name": "lesion"
       },
-      "creation_time": "2019-04-30T12:46:42.208Z",
-      "id": "16",
+      "creation_time": "2019-05-27T20:42:22.581Z",
+      "id": "24",
       "references": [],
-      "title": "riesco a rimuovere bootstrap-vue e usare solo element ?"
+      "title": "copy to clipboard"
     }
   ]
 }
\ No newline at end of file
diff --git a/README.md b/README.md
index 0ffa0472..85d0598c 100644
--- a/README.md
+++ b/README.md
@@ -1,22 +1,34 @@
-# gancio
+## gancio
+### event manager for radical communities
 
-> My well-made Nuxt.js project
+> :warning: Gancio is under heavy development,
+> if something is not working as expected, it's expected :D
 
-## Build Setup
 
+## Install
 ``` bash
 # install dependencies
 $ yarn install
 
-# serve with hot reload at localhost:3000
-$ yarn run dev
-
 # build for production and launch server
-$ yarn run build
+$ yarn build
 $ yarn start
 
-# generate static project
-$ yarn run generate
 ```
 
+##### nginx setup
+https://nuxtjs.org/faq/nginx-proxy
+
 For detailed explanation on how things work, checkout [Nuxt.js docs](https://nuxtjs.org).
+
+
+## Hacking
+
+``` bash
+$ yarn dev
+
+```
+
+#### Add a new icon
+
+plugin/vue-awesome.js
diff --git a/assets/style.less b/assets/style.less
new file mode 100644
index 00000000..f185afee
--- /dev/null
+++ b/assets/style.less
@@ -0,0 +1,55 @@
+html, body {
+  margin: 0px;
+  background-color: #222C32 !important;
+  width: 100%;
+  overflow-x: hidden;
+  box-sizing: border-box;
+  font-family: BlinkMacSystemFont,-apple-system,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,Helvetica,Arial,sans-serif !important;  
+}
+
+* {
+  box-sizing: border-box;
+}
+
+.el-dialog {
+  margin-top: 0px !important;
+  border-radius: 0px;
+  width: 100%;
+
+  .el-dialog__body {
+    word-break: break-word;
+  }
+}
+
+.el-select-dropdown {
+  max-width: 100%;
+  left: 0px;
+}
+
+.page-enter-active, .page-leave-active {
+  transition: opacity .2s, transform .3s;
+}
+.page-enter, .page-leave-active {
+  transition: opacity .3s, transform .2s;
+  opacity: 0;
+  // transform: translateY(30px);
+}
+
+pre {
+  font-family: BlinkMacSystemFont,-apple-system,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,Helvetica,Arial,sans-serif !important;
+  margin-bottom: 0px;
+  white-space: pre-line;
+  font-family: unset;
+}
+
+.el-popover {
+  word-break: normal;
+}
+
+@media only screen and (min-width: 768px) {
+  .el-dialog {
+    margin-top: 10vh !important;
+    width: 700px;
+    border-radius: 3px;
+  }
+}
diff --git a/components/Calendar.vue b/components/Calendar.vue
index d3c06ff1..fb0b8a92 100644
--- a/components/Calendar.vue
+++ b/components/Calendar.vue
@@ -1,37 +1,29 @@
 <template lang="pug">
-    v-calendar#calendar.card(
+  #calendar
+    v-calendar(
       title-position='left'
       locale='it'
       is-dark
-      show-caps
       :attributes='attributes'
       :from-page.sync='page'
-      is-expanded is-inline)
-      div(slot='popover', slot-scope='{ customData, attributes }')
-        p {{attributes}}
-        //- router-link(:to="`/event/${customData.id}`") {{customData.start_datetime|hour}} - {{customData.title}}
-        //- div(v-if='customData.days && customData.days[selectedEvent]')
-          p {{customData.days[customData.selectedEvent].title}}
-          p {{customData.days[customData.selectedEvent].tags}}
-          el-button(@click='customData.selectedEvent=customData.selectedEvent+1') {{customData.selectedEvent}}/{{customData.days.length}} 
-            v-icon(name='clock' @click='customData.selectedEvent=customData.selectedEvent+1')
-        //- @{{customData.place.name}}
+      is-expanded
+      show-clear-margin
+      is-inline
+      @dayclick='click')
+
 </template>
 <script>
-import { mapState, mapActions } from 'vuex'
+import { mapState, mapActions, mapGetters } from 'vuex'
 import moment from 'dayjs'
 import { intersection } from 'lodash'
 
 export default {
   name: 'Calendar',
-  // filters,
   data () {
     const month = moment().month()+1
     const year = moment().year()
     return {
       page: { month, year},
-      selectedEvent: {},
-      daysWithEvents: {}
     }
   },
   
@@ -42,8 +34,9 @@ export default {
   },
   methods: {
     ...mapActions(['updateEvents']),
-    nextEvent () {
-
+    click (day) {
+      const element = document.getElementById(day.day)
+      if (element) element.scrollIntoView();   //Even IE6 supports this
     },
     eventToAttribute(event) {
       let e = {
@@ -52,18 +45,6 @@ export default {
         order: event.start_datetime,
       }
       const day = moment(event.start_datetime).date()
-      if (!this.daysWithEvents[day]) {
-        this.daysWithEvents[day] = []
-        e.popover = {
-          slot: 'popover',
-          visibility: 'hover',
-          isInteractive: true,
-          hideIndicator: true,
-        }
-        e.customData.days = this.daysWithEvents[day]
-      }
-      this.daysWithEvents[day].push({title: event.title, when: event.start_datetime, tags: event.tags })
-
       let color = event.tags && event.tags.length && event.tags[0].color ? event.tags[0].color : 'rgba(170,170,250,0.7)'
       if (event.past) color = 'rgba(200,200,200,0.5)'
       if (event.multidate) {
@@ -71,7 +52,7 @@ export default {
           start: event.start_datetime, end: event.end_datetime
         }
         e.highlight = { backgroundColor: color,
-          borderColor: 'transparent',
+          // borderColor: 'transparent',
           borderWidth: '4px' }
       } else {
         e.dates = event.start_datetime
@@ -81,17 +62,13 @@ export default {
     }
   },
   computed: {
-    filteredEvents () {
-      return this.$store.getters.filteredEvents
-    },
-    ...mapState(['events', 'filters']),
+    ...mapGetters(['filteredEvents']),
     attributes () {
       return [
         { key: 'today', dates: new Date(),
           highlight: {
             backgroundColor: '#aaffaa'
           },
-          popover: {label: this.$t('common.today')}
         }, 
         ...this.filteredEvents.map(this.eventToAttribute)
       ]
@@ -102,11 +79,9 @@ export default {
 
 <style>
 #calendar {
-  margin-bottom: 0em;
-  margin-top: 0.3em;
+  margin: 0 auto;
+  max-width: 500px;
+  align-self: center;
 }
 
-#calendar a { 
-  color: blue;
-}
 </style>
diff --git a/components/Event.vue b/components/Event.vue
index 3a375e10..dd2fa9fc 100644
--- a/components/Event.vue
+++ b/components/Event.vue
@@ -1,65 +1,139 @@
 <template lang="pug">
-  nuxt-link(:to='`/event/${event.id}`')
-    //- @click='$router.push("/event/" + event.id)'
-    b-card(bg-variant='dark' text-variant='white' :class="{ withImg: event.image_path ? true : false }"
-      :img-src='imgPath')
-        strong {{event.title}}
-        div <v-icon name='clock'/> {{event.start_datetime|datetime}}
-        span <v-icon name='map-marker-alt'/> {{event.place.name}}
-        br
-        el-tag.mr-1(:color='tag.color' v-for='tag in event.tags' :key='tag.tag'
-          size='small' @click.stop='addSearchTag(tag)') {{tag.tag}}
+    nuxt-link.event(:to='`event/${event.id}`' :class='{ withImg: event.image_path }')
+      //- image
+      img(v-if='showImage && event.image_path' :src='`/media/thumb/${event.image_path}`')
+
+      .event-info
+        .content-info
+
+          //-  title
+          h2 {{event.title}}
+
+          //- date / place
+          .date 
+            div {{event|event_when}}
+            div {{event.place.name}}
+
+          //- p(v-if='showDescription') {{event.description}}
+
+            //- div(v-if='event.comments && event.comments.length')
+            //-   v-icon(name='comments' color='dark') 
+            //-   span  {{event.comments.length}} {{$t('common.comments')}}
+
+        ul.tags(v-if='showTags && event.tags')
+          li(v-for='tag in event.tags' :key='tag.tag') {{tag.tag}}
 </template>
 <script>
 import { mapState, mapActions } from 'vuex'
-// import api from '@/server/api'
-// import filters from '@/filters'
 
 export default {
-  props: ['event'],
-  computed: {
-    ...mapState(['user']),
-    imgPath() {
-      return this.event.image_path && '/media/thumb/' + this.event.image_path
+  props: {
+    event: Object,
+    showTags: {
+      type: Boolean,
+      default: true
     },
-    mine() {
-      return this.event.userId === this.user.id
+    showImage: {
+      type: Boolean,
+      default: true
+    },
+    showDescription: {
+      type: Boolean,
+      default: true
+    },
+    selected: {
+      type: Boolean,
+      default: false
     }
   },
-  // filters: {
-  //   datetime: this.datetime
-  // },
-  methods: {
-    ...mapActions(['delEvent', 'addSearchTag']),
-    async remove() {
-      // await api.delEvent(this.event.id)
-      // this.delEvent(this.event.id)
+  computed: {
+    date () { 
+      return new Date(this.event.start_datetime).getDate()
     }
   }
 }
 </script>
-<style scoped>
-/* .card::before {
-  border-top: 4px solid black;
-  content: ''
-} */
+<style lang='less'>
 
-.el-card {
-  border: none;
+@media only screen and (min-width: 574px) {
+  .event {
+    height: 100%;
+  }
+}
+.event {
+  padding: 3px;
+  display: flex;
+  flex-direction: column;
+
+  // height: 100%;
+
+  &:hover {
+    text-decoration: none;
+  }
+
+  img {
+    width: 100%;
+    max-height: 200px;
+    object-fit: cover;
+    object-position: top;
+  }
+
+  .event-info {
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    background-color: #222;
+
+  }
+
+  .content-info {
+    font-size: 12px;
+    font-size: 0.8em;
+    padding: 0.8em 1em;
+    max-height: 200px;
+    color: rgb(255, 122, 204);
+
+    h2 {
+      color: yellow;
+      font-size: 16px;
+      font-size: 1.1rem;
+      margin: 0px;
+    }
+
+    p {
+      max-height: 92px;
+      overflow: hidden;
+      color: white;
+      margin: 0px;
+    }
+
+    .date {
+      font-weight: 800;
+      font-size: 16px;
+      font-size: 1rem;
+    }    
+  }
+
+  .tags {
+    font-size: 12px;
+    padding: 1px;
+    margin-bottom: 0;
+    display:flex;
+    flex-wrap: wrap;
+    justify-content: center;
+
+    li {
+      background: #40484D;
+      display: inline-block;
+      padding: 2px 10px;
+      color: rgba(255,255,255,0.7);
+      margin: 1px;
+      text-align: center;
+      flex-grow: 1;
+    }
+
+  }
 }
 
-.el-card img {
-  width: 100%;
-}
-
-.card-columns .card {
-  margin-top: 0.2em;
-  margin-bottom: 0em;
-}
-
-.card-img {
-  height: 180px;
-
-  object-fit: cover;
-}
 </style>
diff --git a/components/Home.vue b/components/Home.vue
index edac84d1..db75cbab 100644
--- a/components/Home.vue
+++ b/components/Home.vue
@@ -1,108 +1,40 @@
 <template lang="pug">
-  div(v-loading='loading')
-    magic-grid(:animate="true" useMin :gap=5 :maxCols=4
-      :maxColWidth='400' ref='magicgrid')
-      div.mt-1.item
-        //- Search#search
-        no-ssr
-          Calendar
-      Event.item.mt-1(v-for='event in events'
-        :key='event.id'
-        :event='event')
+  section
+
+    .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
+            el-divider {{event.start_datetime|day}}
+        Event(
+          :id='event.start_datetime'
+          :key='event.id'
+          :event='event'
+        )
+
 </template>
 
 <script>
-import { mapState, mapActions } from 'vuex'
-import axios from 'axios'
-// import filters from '@/filters.js'
+import { mapGetters } from 'vuex'
 import Event from '@/components/Event'
 import Calendar from '@/components/Calendar'
-// import { intersection } from 'lodash'
-// import moment from 'dayjs'
-// import Search from '@/components/Search'
+import Search from '@/components/Search'
 
 export default {
   name: 'Home',
   data () {
-    return { loading: true }
+    return { }
   },
-  // created () {
-  //   const now = new Date()
-  //   const page = { month: now.getMonth() - 1, year: now.getFullYear() }
-  //   this.updateEvents(page)
-  // },
-  components: { Event, Calendar }, // , Calendar, Search },
-  computed: {
-    ...mapState(['events', 'filters']),
-    filteredEvents() {
-      return this.events
-      // return this.$store.getters.filteredEvents
-        .filter(e => !e.past)
-        .sort((a, b) => a.start_datetime > b.start_datetime)
-    }
-  },
-  mounted () {
-    this.loading = false
-  },
-  methods: mapActions(['updateEvents']),
-  watch: {
-    filteredEvents() {
-      this.$nextTick(this.$refs.magicgrid.positionItems)
-      this.loading = false
-    }
-  }
+  components: { Calendar, Event, Search },
+  computed: mapGetters(['filteredEvents']),
 }
 </script>
-<style>
-#search {
-  display: inline-flex;
-}
-
-.item {
+<style lang="less">
+section {
   width: 100%;
-  max-width: 400px;
-  margin-top: 4px;
-  position: absolute;
-  cursor: pointer;
+  max-width: 1500px;
+  margin: 0 auto;
 }
-
-.card-columns {
-  column-count: 1;
-  column-gap: 0.2em;
-}
-@media (min-width: 576px) {
-  .container {
-    max-width: none;
-  }
-  .card-columns {
-    column-count: 2;
-  }
-}
-
-@media (min-width: 950px) {
-  .container {
-    max-width: 1400px;
-  }
-  .card-columns {
-    column-count: 3;
-  }
-}
-
-/* .item {
-  transition: all .2s;
-  display: inline-block;
-  width: 100%;
-} */
-/* .list-enter, .list-leave-to {
-  opacity: 0;
-  transform: translateY(30px);
-}
-.list-leave-active {
-  position: absolute;
-  top: 0px;
-  width: 0px;
-  left: 0px;
-  height: 0px;
-  z-index: -10;
-} */
 </style>
diff --git a/components/List.vue b/components/List.vue
index a9dea5fc..f412e963 100644
--- a/components/List.vue
+++ b/components/List.vue
@@ -1,34 +1,83 @@
 <template lang="pug">
-  div#gancio-widget
-    //- el-card.mb-1(no-body header='Eventi')
-    //- b-list-group#list(flush)
-    p minimal {{minimal}}
-    ul
-      li.flex-column.align-items-start(v-for="event in events" :key='event.id'
-          :to='`/event/${event.id}`' target='_parent')
-          img(v-if='event.image_path' slot="aside" :src="`http://localhost:3000/media/${event.image_path}`" alt="Meia Aside" style='max-height: 60px')
-          strong.mb-1 {{event.title}}
-          br
-          small.float-right {{event.place.name}}
-          //- el-tag.mr-1(v-if='showtags' :color='tag.color || "rgba(64,158,255,.1)"' size='mini' v-for='tag in event.tags' :key='tag.tag') {{tag.tag}}    
+div#list
+  el-divider {{title}}
+  el-timeline
+    el-timeline-item(
+      v-for='event in events'
+      :key='event.id'
+      :timestamp='event|event_when'
+      placement='top' icon='el-icon-arrow-down' size='large'
+    )
+
+      div.float-right
+        small @{{event.place.name}}
+
+      a(:href='"/event/" + event.id' target='_blank') {{event.title}}
+      hr
 </template>
 <script>
-import axios from 'axios'
+import { mapGetters } from 'vuex'
+const { SHARED_CONF } = require('@/config')
+
 export default {
   name: 'List',
   data () {
-    return {
-      events: []
-    }
+    return { SHARED_CONF }
   },
   props: {
+    title: {
+      type: String,
+      default: SHARED_CONF.title
+    },
+    events: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    maxEvents: {
+      type: Number,
+      default: 0
+    },
     minimal: {
       type: Boolean,
       default: false
+    },
+    showTags: {
+      type: Boolean,
+      default: true,
+    },
+    showImage: {
+      type: Boolean,
+      default: true,
+    },
+    showDescription: {
+      type: Boolean,
+      default: true
     }
   },
-  async mounted () {
-    this.events = (await axios.get('http://localhost:3000/api/export/json')).data
-  }
 }
-</script>
\ No newline at end of file
+</script>
+<style lang='less'>
+  #list {
+    max-width: 500px;
+
+    .el-timeline {
+      padding-left: 5px;
+
+      hr {
+        margin-top: 4px;
+        margin-bottom: 4px;
+      }
+    }
+
+    .el-timeline-item {
+      padding-bottom: 1px;
+    }
+
+    .el-timeline-item__timestamp {
+      margin: 0px;
+      padding: 0px;
+    }
+  }
+</style>
diff --git a/components/Nav.vue b/components/Nav.vue
index 67f0f3f7..013fdb2f 100644
--- a/components/Nav.vue
+++ b/components/Nav.vue
@@ -1,51 +1,59 @@
 <template lang="pug">
-  b-navbar(type="dark" variant="dark" toggleable='md')
-    b-navbar-toggle(target='nav_collapse')
-    b-navbar-brand(to='/') <img id='logo' src='gancio_logo.svg'/>
-    b-collapse#nav_collapse(is-nav)
-      b-navbar-nav
-        b-nav-item(v-if='!$auth.loggedIn' to='/login'  v-b-tooltip :title='$t("common.login")') <v-icon color='lightgreen' name='lock' /> 
-          span.d-md-none  {{$t('common.login')}}
-        b-nav-item(to='/add' v-b-tooltip :title='$t("common.add_event")' ) <v-icon color='lightgreen' name='plus'/> 
-          span.d-md-none  {{$t('common.add_event')}}
-        b-nav-item(v-if='$auth.loggedIn' to='/settings' v-b-tooltip :title='$t("common.settings")') <v-icon color='orange' name='cog'/>
-          span.d-md-none  {{$t('common.settings')}}
-        b-nav-item(v-if='$auth.user && $auth.user.is_admin' to='/admin' v-b-tooltip :title='$t("common.admin")') <v-icon color='lightblue' name='tools'/>
-          span.d-md-none  {{$t('common.admin')}}
-        b-nav-item(to='/export' v-b-tooltip :title='$t("common.export")') <v-icon name='file-export' color='yellow'/>
-          span.d-md-none  {{$t('common.export')}}
-        b-nav-item(v-if='$auth.loggedIn' @click='logout' v-b-tooltip :title='$t("common.logout")') <v-icon color='red' name='sign-out-alt'/>
-          span.d-md-none  {{$t('common.logout')}}
-        b-nav-item
-    b-navbar-nav.ml-auto
-        b-nav-item(to='/about')
-          span  {{$t('common.info')}} <v-icon color='#ff9fc4' name='question-circle'/>
+  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')
+
+    el-menu-item(index='/add' :title="$t('common.add_event')")
+      v-icon(color='lightgreen' name='plus')
+
+    el-menu-item(v-if='$auth.loggedIn' index='/settings' :title="$t('common.settings')")
+      v-icon(color='orange' name='cog')
+
+    el-menu-item(v-if='$auth.user && $auth.user.is_admin' index='/admin' :title="$t('common.admin')")
+      v-icon(color='lightblue' name='tools')
+
+    el-menu-item(index='/export' :title="$t('common.share')")
+      v-icon(name='share' color='yellow')
+
+    el-menu-item(v-if='$auth.loggedIn' @click='logout' :title="$t('common.logout')")
+      v-icon(color='red' name='sign-out-alt')
+
+    el-popover(
+      placement="bottom"
+      trigger="click")
+      Search
+      el-menu-item(slot='reference')
+        v-icon(color='lightblue' name='search')
+
+    el-menu-item.float-right(index='/about' :title="$t('common.info')")
+      img#logo(src='/favicon.ico')
+
 
 </template>
 <script>
-import {mapState, mapActions} from 'vuex'
+import { Message } from 'element-ui'
+import Search from '@/components/Search'
+
 export default {
   name: 'Nav',
-  computed: {
-    ...mapState(['filters']),
-    filters_tags: {
-      set (value) {
-        this.setSearchTags(value)
-      },
-      get () {
-        return this.filters.tags
-      }
-    },
-    filters_places: {
-      set (value) {
-        this.setSearchPlaces(value)
-      },
-      get () {
-        return this.filters.places
-      }
-    },
-  },
-  methods: mapActions(['logout']),
+  components: { Search },
+  methods: {
+    logout () {
+      Message({
+        message: this.$t('common.logout_ok'),
+        type: 'success'
+      })
+      this.$auth.logout()
+    }
+  }
 }
 </script>
 
+<style>
+
+.el-menu.el-menu--horizontal {
+  border-bottom: none;
+}
+
+</style>
diff --git a/components/Search.vue b/components/Search.vue
index fbc3ed2d..16280382 100644
--- a/components/Search.vue
+++ b/components/Search.vue
@@ -1,23 +1,64 @@
 <template lang="pug">
-  div
-    el-select.mr-1(v-model='filters_places' multiple filterable collapse-tags
-      default-first-option :placeholder='$t("Where")')
-      el-option(v-for='place in places' :value='place.name'
-        :label='place.name' :key='place.id')
-    el-select(v-model='filters_tags' multiple filterable collapse-tags
-      default-first-option :placeholder='$t("Tags")')
-      el-option(v-for='tag in tags' :key='tag.tag'
-        :label='tag.tag' :value='tag.tag') 
+  div.ml-2.mt-1
+    el-switch.mb-1(v-if='$auth.loggedIn'
+      active-text='solo miei'
+      inactive-text='tutti'
+      inactive-color='lightgreen'
+      v-model='onlyMine'
+    )
+    el-switch.mt-1.mb-1.ml-2.d-block(
+      inactive-text='futuri'
+      active-text='anche passati'
+      inactive-color='lightgreen'
+      v-model='showPast'
+    )
+
+    el-select.search(v-model='filter' multiple 
+      filterable collapse-tags default-first-option
+      :placeholder='$t("common.search")')
+      el-option(v-for='(keyword, id) in keywords' :key='keyword.value'
+        :label='keyword.label' :value='keyword.value')
+
 </template>
 
 <script>
 import {mapState, mapActions} from 'vuex'
 
 export default {
+  data () {
+    return {
+      onlyMine: false,
+      withPast: true,
+    }
+  },
   name :'Search',
-  methods: mapActions(['setSearchPlaces', 'setSearchTags']),
+  methods: mapActions(['setSearchPlaces', 'setSearchTags', 'showPastEvents']),
   computed: {
-    ...mapState(['tags', 'places', 'filters']),
+    ...mapState(['tags', 'places', 'filters', 'show_past_events']),
+    keywords () {
+      const tags = this.tags.map( t => ({ value: 't' + t.tag, label: t.tag, count: +t.eventsCount }))
+      const places = this.places.map( p => ({ value: 'p' + p.id, label: p.name, count: +p.eventsCount }))
+      return tags.concat(places)
+    },
+    showPast : {
+      set (value) {
+        this.showPastEvents(value)
+      },
+      get () {
+        return this.show_past_events
+      }
+    },
+    filter: {
+      set (filters) {
+        const tags = filters.filter(f => f[0] === 't').map(t => t.slice(1))
+        this.setSearchTags(tags)
+        const places = filters.filter(f => f[0] === 'p').map(p => +p.slice(1))
+        this.setSearchPlaces(places)
+      },
+      get () {
+        return this.filters.tags.map(t => 't' + t).concat(this.filters.places.map(p => 'p' + p))
+      }
+    },
     filters_tags: {
       set (value) {
         this.setSearchTags(value)
@@ -37,3 +78,5 @@ export default {
   }
 }
 </script>
+<style lang="less">
+</style>
diff --git a/layouts/default.vue b/layouts/default.vue
index fe2d459b..1a2ea589 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -1,71 +1,6 @@
-<template lang='pug'>
-  #app
-    Nav
-    Home
-    transition(name="fade" mode="out-in")
-      nuxt
+<template>
+  <nuxt/>
 </template>
-
-<script>
-import Home from '~/components/Home.vue'
-import Nav from '~/components/Nav.vue'
-
-export default {
-  name: 'App',
-  components: { Nav, Home },
-}
-</script>
-
-<style>
-#logo {
-  max-height: 40px;
-}
-
-.navbar-brand {
-  padding: 0px;
-}
-
-#search,
-#search ul {
-  align-items: baseline;
-}
-
-html, body {
-  scrollbar-face-color: #313543;
-  scrollbar-track-color: rgba(0, 0, 0, 0.1); 
-  font-family: Lato,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,sans-serif;
-  color: #2c3e50;
-  background: black;
-}
-
-::-webkit-scrollbar {
-  width: 7px;
-  height: 7px; }
-::-webkit-scrollbar-thumb {
-  background: #313543;
-  border: 0px none #ffffff;
-  border-radius: 6px; }
-::-webkit-scrollbar-thumb:hover {
-  background: #353a49; }
-::-webkit-scrollbar-thumb:active {
-  background: #313543; }
-::-webkit-scrollbar-track {
-  border: 0px none #ffffff;
-  border-radius: 6px;
-  background: rgba(0, 0, 0, 0.1); }
-::-webkit-scrollbar-track:hover {
-  background: #282c37; }
-::-webkit-scrollbar-track:active {
-  background: #282c37; }
-::-webkit-scrollbar-corner {
-  background: transparent; }
-
-
-/* .column {
-  margin-top: 3px;
-  margin-right: 3px;
-  margin-bottom: 3px;
-  width: 350px;
-} */
-
+<style lang="less">
+@import '../assets/style.less';
 </style>
diff --git a/locales/email/en.json b/locales/email/en.json
new file mode 100644
index 00000000..fced2be4
--- /dev/null
+++ b/locales/email/en.json
@@ -0,0 +1,5 @@
+{
+  "registration_email": "registration_email",
+  "recover_email": "recover_email",
+  "press here": "press here"
+}
\ No newline at end of file
diff --git a/locales/email/es.json b/locales/email/es.json
new file mode 100644
index 00000000..fced2be4
--- /dev/null
+++ b/locales/email/es.json
@@ -0,0 +1,5 @@
+{
+  "registration_email": "registration_email",
+  "recover_email": "recover_email",
+  "press here": "press here"
+}
\ No newline at end of file
diff --git a/locales/email/it.json b/locales/email/it.json
new file mode 100644
index 00000000..fced2be4
--- /dev/null
+++ b/locales/email/it.json
@@ -0,0 +1,5 @@
+{
+  "registration_email": "registration_email",
+  "recover_email": "recover_email",
+  "press here": "press here"
+}
\ No newline at end of file
diff --git a/locales/email/zh.json b/locales/email/zh.json
new file mode 100644
index 00000000..fced2be4
--- /dev/null
+++ b/locales/email/zh.json
@@ -0,0 +1,5 @@
+{
+  "registration_email": "registration_email",
+  "recover_email": "recover_email",
+  "press here": "press here"
+}
\ No newline at end of file
diff --git a/locales/it.json b/locales/it.json
deleted file mode 100644
index 00c1e34a..00000000
--- a/locales/it.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-  "common": {
-    "login": "Entra",
-    "email": "Email",
-    "password": "Password",
-    "register": "Registrati",
-    "send": "Invia",
-    "description": "Descrizione",
-    "info": "Info",
-    "add_event": "Aggiungi evento",
-    "export": "Esporta",
-    "settings": "Impostazioni",
-    "admin": "Amministra",
-    "logout": "Esci",
-    "where": "Dove",
-    "when": "Quando",
-    "next": "Avanti",
-    "what": "Cosa",
-    "address": "Indirizzo",
-    "media": "Media",
-    "today": "Oggi",
-    "users": "Utenti",
-    "places": "Posti",
-    "events": "Eventi",
-    "tags": "Etichette",
-    "deactivate": "Disattiva",
-    "activate": "Attiva",
-    "remove_admin": "Rimuovi Admin",
-    "name": "Nome",
-    "save": "Salva",
-    "confirm": "Conferma",
-    "tag": "Etichetta",
-    "color": "Colore",
-    "associate": "Associa",
-    "hide": "Nascondi",
-    "remove": "Elimina",
-    "edit": "Modifica",
-    "actions": "Azioni",
-    "resources": "Risorse",
-    "add": "Aggiungi"
-  },
-
-  "login": {
-    "description": "Entrando puoi pubblicare nuovi eventi.",
-    "not_registered": "Non sei registrata?",
-    "forgot_password": "Ho dimenticato la password",
-    "insert_email": "Inserisci la mail",
-    "check_email": "Controlla la tua casella di posta (anche la cartella spam)",
-    "error": "Errore nel login"
-  },
-
-  "register": {
-    "description": "I movimenti hanno bisogno di organizzarsi e autofinanziarsi. <br/>Questo è un dono per voi, usatelo solo per eventi non commerciali e ovviamente antifascisti, antisessisti, antirazzisti. <br/>Prima di poter pubblicare <strong>dobbiamo approvare l'account</strong>, considera che <strong>dietro questo sito ci sono delle persone</strong> di carne e sangue, scrivici quindi due righe per farci capire che eventi vorresti pubblicare.",
-    "complete": "",
-    "admin_complete": ""
-  },
-
-  "event": {
-    "anon": "",
-    "anon_description": "",
-    "where_description" : "Dov'è il gancio? Se è un luogo fisico, scrivi il suo nome del per esteso (tipo 'Mezcal Squat'), se è una Piazza/Via metti quella (tipo 'Piazza Castello, Torino'). Se trovi già il luogo dell'evento premilo e l'indirizzo verrà autocompletato.",
-    "address_description": "",
-    "tag_description": "Puoi inserire un tag (es. concerto, corteo)",
-    "added": "Avento aggiunto"
-  },
-
-  "admin": {
-    "event_confirm_description": "Qui puoi confermare gli eventi inseriti da utenti non iscritti",
-    "tag_description": "Cambia il colore delle etichette",
-    "place_description": "Modifica l'indirizzo di un posto",
-    "mastodon_description": "Puoi associare un account mastodon a questa istanza di gancio. Tutti gli eventi verranno pubblicati li'",
-    "mastodon_instance": "Istanza mastodon"
-  }
-}
diff --git a/nuxt.config.js b/nuxt.config.js
index 0dbc9c6e..36a30f9f 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -1,4 +1,4 @@
-const pkg = require('./package')
+const { SHARED_CONF } = require('./config')
 
 module.exports = {
   mode: 'universal',
@@ -7,11 +7,11 @@ module.exports = {
    ** Headers of the page
    */
   head: {
-    title: pkg.name,
+    title: SHARED_CONF.title,
     meta: [
       { charset: 'utf-8' },
       { name: 'viewport', content: 'width=device-width, initial-scale=1' },
-      { hid: 'description', name: 'description', content: pkg.description }
+      { hid: 'description', name: 'description', content: SHARED_CONF.description }
     ],
     link: [{ rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }]
   },
@@ -23,27 +23,26 @@ module.exports = {
   /*
    ** Customize the progress-bar color
    */
-  loading: { color: '#fff' },
+  // loading: { color: '#fff' },
 
   /*
    ** Global CSS
    */
   css: [
-    'element-ui/lib/theme-chalk/index.css',
     'bootstrap/dist/css/bootstrap.css',
-    'bootstrap-vue/dist/bootstrap-vue.css',
-    'v-calendar/lib/v-calendar.min.css'
+    'element-ui/lib/theme-chalk/index.css',
   ],
-
   /*
    ** Plugins to load before mounting the App
    */
-  plugins: ['@/plugins/element-ui', '@/plugins/filters',
-    '@/plugins/i18n', '@/plugins/bootstrap-vue',
-    '@/plugins/vue-awesome',
-    { src: '@/plugins/v-calendar', ssr: false },
-    { src: '@/plugins/vuex-persist.js', ssr: false },
-    '@/plugins/magic-grid'],
+  plugins: [
+    '@/plugins/element-ui', // UI library -> https://element.eleme.io/#/en-US/
+    '@/plugins/filters',    // text filters, datetime, etc.
+    '@/plugins/i18n',       // localization plugin
+    '@/plugins/vue-awesome', // icon
+    { src: '@/plugins/v-calendar', ssr: false }, // calendar, TO-REDO
+    '@/plugins/initialize'
+  ],
 
   /*
    ** Nuxt.js modules
@@ -57,18 +56,18 @@ module.exports = {
    ** Axios module configuration
    */
   axios: {
-    baseURL: '',
+    baseURL: SHARED_CONF.baseurl + '/api',
+    browserBaseURL: SHARED_CONF.baseurl + '/api',
     prefix: '/api',
-    credentials: true
+    // credentials: true
     // See https://github.com/nuxt-community/axios-module#options
   },
-
   auth: {
     strategies: {
       local: {
         endpoints: {
           login: { url: '/auth/login', method: 'post', propertyName: 'token' },
-          logout: { url: '/auth/logout', method: 'post' },
+          logout: false,
           user: { url: '/auth/user', method: 'get', propertyName: false }
         },
       }
@@ -80,12 +79,14 @@ module.exports = {
    ** Build configuration
    */
   build: {
-    transpile: [/^element-ui/, /^vue-awesome/, /^vue-magic-grid/, /^vuex-persist/],
-
+    transpile: [/^element-ui/, /^vue-awesome/],
+    splitChunks: {
+      layouts: true
+    }
     /*
      ** You can extend webpack config here
      */
-    extend(config, ctx) {
+    // extend(config, ctx) {
       // Run ESLint on save
       // if (ctx.isDev && ctx.isClient) {
       //   config.module.rules.push({
@@ -95,6 +96,6 @@ module.exports = {
       //     exclude: /(node_modules)/
       //   })
       // }
-    }
+    // }
   }
 }
diff --git a/package.json b/package.json
index 73aa6086..417becf3 100644
--- a/package.json
+++ b/package.json
@@ -18,31 +18,33 @@
     "axios": "^0.18.0",
     "bcrypt": "^3.0.5",
     "body-parser": "^1.18.3",
-    "bootstrap-vue": "^2.0.0-rc.16",
+    "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.4.11",
+    "element-ui": "^2.8.2",
     "email-templates": "^5.0.4",
     "express": "^4.16.4",
     "express-jwt": "^5.3.1",
     "ics": "^2.13.2",
     "js-cookie": "^2.2.0",
     "jsonwebtoken": "^8.5.1",
+    "less": "^3.9.0",
+    "less-loader": "^5.0.0",
     "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",
+    "sequelize-cli": "^5.4.0",
     "sharp": "^0.22.0",
     "sqlite3": "^4.0.6",
-    "v-calendar": "^0.9.7",
+    "v-calendar": "^1.0.0-beta.10",
     "vue-awesome": "^3.5.1",
     "vue-custom-element": "^3.2.6",
     "vue-i18n": "^8.10.0",
-    "vue-magic-grid": "^0.0.4",
     "vuex-persist": "^2.0.0"
   },
   "devDependencies": {
diff --git a/pages/about.vue b/pages/about.vue
index 81805c9e..43c5aab2 100644
--- a/pages/about.vue
+++ b/pages/about.vue
@@ -1,6 +1,6 @@
 <template lang="pug">
-  b-modal(hide-footer @hidden='$router.replace("/")' :title='$t("About")' 
-    :visible='true' size='lg')
+  el-dialog(:title='$t("common.info")' visible
+    :before-close='close')
     h5 Chi siamo
     p.
       Gancio e' un progetto dell'<a href='https://autistici.org/underscore'>underscore hacklab</a> e uno dei
@@ -18,11 +18,9 @@
     blockquote.
       Se vieni a Torino e dici: "ehi, ci diamo un gancio alle 8?" nessuno si presenterà con i guantoni per fare a mazzate.
       Darsi un gancio vuol dire beccarsi alle ore X in un posto Y
-    p 
-      small A: a che ora è il gancio in radio per andare al presidio?
-    p
-      small B: non so ma domani non posso venire, ho gia' un gancio per caricare il bar.
-
+    li A: a che ora è il gancio in radio per andare al presidio?
+    li B: non so ma domani non posso venire, ho gia' un gancio per caricare il bar.
+    br
 
     h5 Contatti
     p.
@@ -31,4 +29,19 @@
       <a href='https://git.lattuga.net/cisti/gancio'>qui</a>. Aiuti e suggerimenti sono sempre benvenuti, puoi scriverci
       su underscore chicciola autistici.org
 
-</template>
\ No newline at end of file
+</template>
+<script>
+export default {
+  data () {
+    return {
+      open: true,
+    }
+  },
+  methods: {
+    close (done) {
+      this.$router.replace('/')
+      done()
+    }
+  }
+}
+</script>
diff --git a/pages/add/_edit.vue b/pages/add/_edit.vue
index f9a8ae44..37047935 100644
--- a/pages/add/_edit.vue
+++ b/pages/add/_edit.vue
@@ -1,8 +1,7 @@
 <template lang="pug">
-  b-modal(ref='modal' @hidden='$router.replace("/")' size='lg' :visible='true'
-    :title="edit?$t('common.edit_event'):$t('common.add_event')" hide-footer)
-    el-form
-      el-tabs.mb-2(v-model='activeTab' v-loading='sending')
+  el-dialog(:before-close='close' :visible='open' :title="edit?$t('common.edit_event'):$t('common.add_event')")
+    el-form(v-loading='loading')
+      el-tabs.mb-2(v-model='activeTab')
 
         //- NOT LOGGED EVENT
         el-tab-pane(v-if='!$auth.loggedIn')
@@ -12,19 +11,28 @@
 
         //- WHERE
         el-tab-pane
-          span(slot='label') {{$t('common.where')}} <v-icon name='map-marker-alt'/>
-          div {{$t('common.where')}}
+          span(slot='label') <v-icon name='map-marker-alt'/> {{$t('common.where')}} 
+          div {{$t('common.where')}} 
             el-popover(
               placement="top-start"
               width="400"
-              trigger="hover")
+              trigger="click")
               v-icon(slot='reference' color='#ff9fc4' name='question-circle')
               slot
-                p {{$t('event.where_description')}}
-          el-select.mb-3(v-model='event.place.name' @change='placeChoosed' filterable allow-create default-first-option)
+                p(v-html="$t('event.where_description')") 
+
+          el-select.mb-3(v-model='event.place.name'
+            @change='placeChoosed'
+            filterable allow-create
+            default-first-option
+          )
             el-option(v-for='place in places_name' :label='place' :value='place' :key='place.id')
-          div {{$t("common.address")}}
-          el-input.mb-3(ref='address' v-model='event.place.address' :disabled='places_name.indexOf(event.place.name)>-1' @keydown.native.enter='next')
+          br
+          br
+          div {{$t("common.address")}} {{event.place.name}}
+          el-input.mb-3(ref='address' v-model='event.place.address'
+            :disabled='places_name.indexOf(event.place.name)>-1'
+            @keydown.native.enter='next')
           el-button.float-right(@click='next' :disabled='!couldProceed') {{$t('common.next')}}
 
         //- WHEN
@@ -32,15 +40,27 @@
           span(slot='label') {{$t('common.when')}} <v-icon name='clock'/>
           span {{event.multidate ? $t('event.dates_description') : $t('event.date_description')}}
             el-switch.float-right(v-model='event.multidate' :active-text="$t('event.multidate_description')")
-          v-date-picker.mb-3(:mode='event.multidate ? "range" : "single"' v-model='date' is-inline
-            is-expanded :min-date='new Date()' @input='date ? $refs.time_start.focus() : false')
-          div {{$t('event.time_start_description')}}
-          el-time-select.mb-3(ref='time_start'
-            v-model="time.start"
-            :picker-options="{ start: '00:00', step: '00:30', end: '24:00'}")
-          div {{$t('event.time_end_description')}}
-          el-time-select(v-model='time.end'
-            :picker-options="{start: '00:00', step: '00:30', end: '24:00'}")
+
+          v-date-picker.mb-3(
+            :mode='event.multidate ? "range" : "single"'
+            :attributes='attributes'
+            v-model='date'
+            is-inline
+            is-expanded
+            :min-date='new Date()'
+          )
+          
+          el-row
+            el-col(:span='12')
+              div {{$t('event.time_start_description')}}
+              el-time-select.mb-3(ref='time_start'
+                v-model="time.start"
+                :picker-options="{ start: '00:00', step: '00:30', end: '24:00'}")
+              div {{$t('event.time_end_description')}}
+              el-time-select(v-model='time.end'
+                :picker-options="{start: '00:00', step: '00:30', end: '24:00'}")
+            el-col(:span='12')
+              List(:events='todayEvents' :title='$t("event.same_day")')
           el-button.float-right(@click='next' :disabled='!couldProceed') {{$t('common.next')}}
 
         //- WHAT
@@ -61,35 +81,45 @@
 
         el-tab-pane
           span(slot='label') {{$t('common.media')}} <v-icon name='image'/>
-          span {{$t('event.media_description')}}
-          b-form-file.mb-2(v-model='event.image', :placeholder='$t("common.poster")' accept='image/*')
-          el-button.float-right(@click='done') {{edit?$t('common.edit'):$t('common.send')}}
-
-
+          el-upload.text-center(
+            action=''
+            :limit="1"
+            :auto-upload='false'
+            drag
+            :on-change='uploadedFile'
+            :multiple='false'
+            :file-list="fileList"
+            )
+              i.el-icon-upload
+              div.el-upload__text {{$t('event.media_description')}}
+          el-button.float-right(@click='done' :disabled='!couldProceed') {{edit?$t('common.edit'):$t('common.send')}}
 
 </template>
 <script>
-// import api from '@/plugins/api'
-import { mapActions, mapState } from 'vuex'
+import { mapActions, mapState, mapGetters } from 'vuex'
 import moment from 'dayjs'
-import Calendar from '@/components/Calendar'
+import List from '@/components/List'
 import { Message } from 'element-ui'
+
 export default {
-  components: { Calendar },
+  name: 'Add',
+  components: { List },
   data() {
     return {
       event: { 
         place: { name: '', address: '' },
         title: '', description: '', tags: [],
         multidate: false,
+        image: false
       },
-      visible: true,
+      fileList: [],
+      open: true,
       id: null,
       activeTab: "0",
       date: null,
       time: { start: '20:00', end: null },
       edit: false,
-      sending: false,
+      loading: true,
     }
   },
   name: 'newEvent',
@@ -100,11 +130,10 @@ export default {
     }
   },
   async mounted () {
-    if (this.$route.params.id) {
-      this.id = this.$route.params.id
+    if (this.$route.params.edit) {
+      this.id = this.$route.params.edit
       this.edit = true
-      const event = await api.getEvent(this.id)
-      // this.event.place = {name: event.place.name, address: event.place.address }
+      const event = await this.$axios.$get('/event/'+ this.id)
       this.event.place.name = event.place.name
       this.event.place.address = event.place.address || ''
       this.event.multidate = event.multidate
@@ -119,6 +148,7 @@ export default {
       }
     }
     this.updateMeta()
+    this.loading = false
   },
   computed: {
     ...mapState({
@@ -126,12 +156,18 @@ export default {
       places_name: state => state.places.map(p => p.name ),
       places: state => state.places,
       user: state => state.user,
+      events: state => state.events
     }),
+    todayEvents () {
+      const date = moment(this.date)
+      return this.events.filter(e => date.isSame(moment(e.start_datetime), 'day'))
+    },
+    ...mapGetters(['filteredEvents']),
+    attributes () {
+      return this.events.filter(e => !e.past).map(this.eventToAttribute)
+    },
     disableAddress () {
-      console.log('dentro disable Address')
-      const ret = this.places_name.find(p => p.name === this.event.place.name)
-      console.log(ret)
-      return ret
+      return this.places_name.find(p => p.name === this.event.place.name)
     },
     couldProceed () {
       const t = this.$auth.loggedIn ? -1 : 0
@@ -143,18 +179,45 @@ export default {
             this.event.place.address.length>0
         case 2+t:
           if (this.date && this.time.start) return true
-          break
         case 3+t:
           return this.event.title.length>0
-          break
         case 4+t:
-          return true
-          break
+          return this.event.place.name.length>0 && 
+            this.event.place.address.length>0 && 
+            (this.date && this.time.start) &&
+             this.event.title.length>0   
       }
     }
   },
   methods: {
     ...mapActions(['addEvent', 'updateEvent', 'updateMeta']),
+    close (done) {
+      
+      this.$router.replace('/')
+      done()
+    },
+    eventToAttribute(event) {
+      let e = {
+        key: event.id,
+        customData: event,
+        order: event.start_datetime,
+      }
+      const day = moment(event.start_datetime).date()
+      let color = event.tags && event.tags.length && event.tags[0].color ? event.tags[0].color : 'rgba(170,170,250,0.7)'
+      if (event.past) color = 'rgba(200,200,200,0.5)'
+      if (event.multidate) {
+        e.dates = {
+          start: event.start_datetime, end: event.end_datetime
+        }
+        e.highlight = { backgroundColor: color,
+          // borderColor: 'transparent',
+          borderWidth: '4px' }
+      } else {
+        e.dates = event.start_datetime
+        e.dot = { backgroundColor: color, borderColor: color, borderWidth: '3px' }
+      }
+      return e
+    },    
     next () {
       this.activeTab = String(Number(this.activeTab)+1)
       if (this.activeTab === "2") {
@@ -171,6 +234,9 @@ export default {
       }
       this.$refs.address.focus()
     },
+    uploadedFile(file, fileList) {
+      this.event.image = file
+    },
     async done () {
       let start_datetime, end_datetime
       const [ start_hour, start_minute ] = this.time.start.split(':')
@@ -191,7 +257,7 @@ export default {
       const formData = new FormData()
 
       if (this.event.image) {
-        formData.append('image', this.event.image, this.event.image.name)
+        formData.append('image', this.event.image.raw, this.event.image.name)
       }
       formData.append('title', this.event.title)
       formData.append('place_name', this.event.place.name)
@@ -205,7 +271,7 @@ export default {
       }
       if (this.event.tags)
         this.event.tags.forEach(tag => formData.append('tags[]', tag))
-      this.sending = true
+      this.loading = true
       try {
         if (this.edit) {
           await this.updateEvent(formData)
@@ -213,11 +279,11 @@ export default {
           await this.addEvent(formData)
         }
         this.updateMeta()
-        this.sending = false
-        this.$refs.modal.hide()
+        this.loading = false
+        this.$router.replace('/')
         Message({ type: 'success', message: this.$auth.loggedIn ? this.$t('event.added') : this.$t('event.added_anon')})
       } catch (e) {
-        this.sending = false
+        this.loading = false
         console.error(e)
       }
     }
diff --git a/pages/admin.vue b/pages/admin.vue
index edc22def..fd8997b9 100644
--- a/pages/admin.vue
+++ b/pages/admin.vue
@@ -1,6 +1,5 @@
 <template lang="pug">
-  b-modal(hide-footer @hidden='$router.replace("/")' :title='$t("common.admin")' 
-    :visible='true' size='lg')
+  el-dialog(:title='$t("common.admin")' width='80%' :visible='open' :before-close='close')
     el-tabs(tabPosition='left' v-model='tab')
 
       //- USERS
@@ -35,7 +34,7 @@
           el-form-item(:label="$t('common.address')")
             el-input.mr-1(:placeholder='$t("common.address")' v-model='place.address')
           el-button(variant='primary' @click='savePlace') {{$t('common.save')}}
-        el-table(:data='paginatedPlaces' small)
+        el-table(:data='paginatedPlaces' small @current-change="val => place=val")
           el-table-column(:label="$t('common.name')")
             template(slot-scope='data') {{data.row.name}}
           el-table-column(:label="$t('common.address')")
@@ -61,26 +60,26 @@
         el-pagination(:page-size='perPage' :currentPage.sync='eventPage' :total='events.length')
 
       //- TAGS
-      el-tab-pane.pt-1
-        template(slot='label')
-          v-icon(name='tag')
-          span  {{$t('common.tags')}}
-        p {{$t('admin.tag_description')}}
-          el-tag(v-if='tag.tag' :color='tag.color' size='mini') {{tag.tag}}
-        el-form(:inline='true' label-width='120px')
-          el-form-item(:label="$t('common.color')")
-            el-color-picker(v-model='tag.color' @change='updateColor')
-        el-table(:data='paginatedTags' striped small hover
-          highlight-current-row @current-change="tagSelected")
-          el-table-column(:label="$t('common.tag')")
-            template(slot-scope='data')
-              el-tag(:color='data.row.color' size='mini') {{data.row.tag}}
-        el-pagination(:page-size='perPage' :currentPage.sync='tagPage' :total='tags.length')
+      //- el-tab-pane.pt-1
+      //-   template(slot='label')
+      //-     v-icon(name='tags')
+      //-     span  {{$t('common.tags')}}
+      //-   p {{$t('admin.tag_description')}}
+      //-     el-tag(v-if='tag.tag' :color='tag.color' size='mini') {{tag.tag}}
+      //-   el-form(:inline='true' label-width='120px')
+      //-     el-form-item(:label="$t('common.color')")
+      //-       el-color-picker(v-model='tag.color' @change='updateColor')
+      //-   el-table(:data='paginatedTags' striped small hover
+      //-     highlight-current-row @current-change="tagSelected")
+      //-     el-table-column(:label="$t('common.tag')")
+      //-       template(slot-scope='data')
+      //-         el-tag(:color='data.row.color' size='mini') {{data.row.tag}}
+      //-   el-pagination(:page-size='perPage' :currentPage.sync='tagPage' :total='tags.length')
 
       //- SETTINGS
       el-tab-pane.pt-1
         template(slot='label')
-          v-icon(name='tools')
+          v-icon(name='cog')
           span  {{$t('common.settings')}}
         el-form(inline @submit.prevent.stop='associatemastodon_instance')
           span {{$t('admin.mastodon_description')}}
@@ -91,7 +90,6 @@
 </template>
 <script>
 import { mapState } from 'vuex'
-import api from '@/plugins/api'
 import { Message } from 'element-ui'
 
 export default {
@@ -116,22 +114,18 @@ export default {
       mastodon_instance: '',
       settings: {},
       tab: "0",
+      open: true
     }
   },
   async mounted () {
-    console.log('sono dentro mounted', this.$route)
     const code = this.$route.query.code
 
     if (code) {
       this.tab = "4"
       const instance = await this.$axios.$post('/user/code', {code, is_admin: true})
     }
-  //   // this.users = await api.getUsers()
-  //   // this.events = await api.getUnconfirmedEvents()
-  //   // this.settings = await api.getAdminSettings()
   },
   async asyncData ({ $axios, params, store }) {
-    console.log(store.state)
     try {
       const users = await $axios.$get('/users')
       const events = await $axios.$get('/event/unconfirmed')
@@ -158,7 +152,7 @@ export default {
     paginatedPlaces () {
       return this.places.slice((this.placePage-1) * this.perPage,
         this.placePage * this.perPage)
-    },    
+    },
   },
   methods: {
     placeSelected (items) {
@@ -175,15 +169,15 @@ export default {
       this.tag = { color: tag.color, tag: tag.tag }
     },
     async savePlace () {
-      const place = await api.updatePlace(this.place)
+      // const place = await api.updatePlace(this.place)
     },
     async toggle(user) {
       user.is_active = !user.is_active
-      const newuser = await api.updateUser(user)
+      // const newuser = await api.updateUser(user)
     },
     async toggleAdmin(user) {
       user.is_admin = !user.is_admin
-      const newuser = await api.updateUser(user)
+      // const newuser = await api.updateUser(user)
     },
     async updateColor () {
       // try {
@@ -198,7 +192,7 @@ export default {
     async associate () {
       if (!this.mastodon_instance) return
 
-      const url = await this.$axios.$post('/user/getauthurl', {instance: this.mastodon_instance, admin: true})
+      const url = await this.$axios.$post('/settings/getauthurl', {instance: this.mastodon_instance})
       setTimeout( () => window.location.href=url, 100);
     },
     async confirm (id) {
@@ -207,13 +201,18 @@ export default {
         await this.$axios.$get(`/event/confirm/${id}`)
         this.loading = false
         Message({
-          message: this.$t('event_confirmed'),
+          message: this.$t('common.event_confirmed'),
           type: 'success'
         })
         this.events = this.events.filter(e => e.id !== id)
       } catch (e) {
       }
-    }
+    },
+    close (done) {
+      console.log('oppure qui !')
+      this.$router.replace('/')
+      // done()
+    }    
   }
 }
 </script>
\ No newline at end of file
diff --git a/pages/embed/list.vue b/pages/embed/list.vue
index 8816a8e1..7ca16b0c 100644
--- a/pages/embed/list.vue
+++ b/pages/embed/list.vue
@@ -1,22 +1,26 @@
 <template lang="pug">
-  div
-    p porcodio
+  List(:events="events" :title='title')
 </template>
 <script>
 import { mapState } from 'vuex'
-// import List from '../../components/List'
+import { SHARED_CONF } from '../../config'
+import List from '../../components/List'
 import moment from 'dayjs'
 
 export default {
-  name: 'diocane',
   layout: 'iframe',
-  // components: { List },
+  components: { List },
   async asyncData ({ $axios, req, res }) {
+    const title = req.query.title || SHARED_CONF.title
     const show_tags = req.query.showtags
     const tags = req.query.tags
     const places = req.query.places
-    const events = await $axios.$get('/export/json')
-    return { events, show_tags }
+    const now = new Date()
+
+    // TODO: filter future events based on tags/places/userid
+    const events = await $axios.$get(`/event/${now.getMonth()}/${now.getFullYear()}`)
+
+    return { show_tags, events, title }
   },
 }
 </script>
diff --git a/pages/event/_id.vue b/pages/event/_id.vue
index 7fd32d5f..34483559 100644
--- a/pages/event/_id.vue
+++ b/pages/event/_id.vue
@@ -1,54 +1,81 @@
 <template lang="pug">
-  b-modal#eventDetail(ref='eventDetail' hide-body hide-header hide-footer @hidden='$router.replace("/")' size='lg' :visible='true')
-    b-card(no-body, :img-src='imgPath' v-loading='loading')
-      nuxt-link(to='/')
-        el-button.close_button(circle icon='el-icon-close' type='success'
-          @click.prevent='$refs.eventDetail.hide()')
-      b-card-header
-        h3 {{event.title}}
-        v-icon(name='clock')
-        span  {{event.start_datetime|datetime}}
-        br
-        v-icon(name='map-marker-alt')
-        span  {{event.place.name}} - {{event.place.address}}
-        br
-      b-card-body(v-if='event.description || event.tags')
-        pre(v-html='event.description')
-        el-tag.mr-1(:color='tag.color' v-for='tag in event.tags'
-          size='mini' :key='tag.tag') {{tag.tag}}
-        div(v-if='mine')
-          hr
-          el-button(v-if='event.is_visible' plain type='warning' @click.prevents='toggle' icon='el-icon-view') {{$t('common.hide')}}
-          el-button(v-else plain type='success' @click.prevents='toggle' icon='el-icon-view') {{$t('common.confirm')}}
-          el-button(plain type='danger' @click.prevent='remove' icon='el-icon-remove') {{$t('common.remove')}} 
-          el-button(plain type='primary' @click='$router.replace("/edit/"+event.id)') <v-icon color='orange' name='edit'/> {{$t('common.edit')}}
+  el-card#eventDetail(
+    visible hide-header 
+    no-header :show-close='false' 
+    top='0vh !important'
+    :appendToBody='true')
 
-    b-card-body(v-if='event.activitypub_id')
-      strong {{$t('common.resources')}} - 
+    //- close button
+    nuxt-link.float-right(to='/')
+      el-button(circle  icon='el-icon-close' type='danger' size='small' plain)
+
+    //- title, where, when
+    h5.text-center {{event.title}}
+    div.nextprev
+      nuxt-link(v-if='prev' :to='`/event/${prev.id}`')
+        el-button(icon='el-icon-arrow-left' round size='small' type='success' plain)
+      nuxt-link.float-right(v-if='next' :to='`/event/${next.id}`')
+        el-button(icon='el-icon-arrow-right' round size='small' plain type='success') 
+  
+    //- image
+    img(:src='imgPath' v-if='event.image_path')
+
+    .info
+      div {{event|event_when}}
+      div {{event.place.name}} - {{event.place.address}}
+
+    //- description and tags
+    div(v-if='event.description || event.tags')
+      pre(v-html='event.description')
+      el-tag.mr-1(v-for='tag in event.tags'
+        size='mini' :key='tag.tag') {{tag.tag}}
+
+    //- show hide, confirm, delete, edit buttons when allowed
+    div(v-if='mine')
+      hr
+      el-button(v-if='event.is_visible' size='mini' plain type='warning' @click.prevents='toggle' icon='el-icon-view') {{$t('common.hide')}}
+      el-button(v-else plain type='success' size='mini' @click.prevents='toggle' icon='el-icon-view') {{$t('common.confirm')}}
+      el-button(plain type='danger' size='mini' @click.prevent='remove' icon='el-icon-remove') {{$t('common.remove')}}
+      el-button(plain type='primary' size='mini' @click='$router.replace(`/add/${event.id}`)' icon='el-icon-edit') {{$t('common.edit')}}
+
+    //- comments
+    .card-body(v-if='event.activitypub_id')
+      strong {{$t('common.related')}} - 
       a(:href='`https://mastodon.cisti.org/web/statuses/${event.activitypub_id}`') {{$t('common.add')}}
-    b-card-header(v-for='comment in event.comments' :key='comment.id')
+    .card-header(v-for='comment in event.comments' :key='comment.id')
       img.avatar(:src='comment.data.last_status.account.avatar') 
       strong  {{comment.author}} 
       a.float-right(:href='comment.data.last_status.url')
         small  {{comment.data.last_status.created_at|datetime}}
       div.mt-1(v-html='comment_filter(comment.text)')
       img(v-for='img in comment.data.last_status.media_attachments' :src='img.preview_url')
-      //- span {{comment}}
+
 </template>
 <script>
-import { mapState, mapActions } from 'vuex';
-// import api from '@/plugins/api'
-//import filters from '@/filters'
+import { mapState, mapActions, mapGetters } from 'vuex'
+import config from '@/config'
 
 export default {
   name: 'Event',
+  // transition: null,
+  // Watch for $route.query.page to call Component methods (asyncData, fetch, validate, layout, etc.)
+  // watchQuery: ['id'],
+  // Key for <NuxtChild> (transitions)
+  // key: to => to.fullPath,
+  // Called to know which transition to apply
+  // transition(to, from) {
+  //   console.log('dentro transition')
+  //   if (!from) return 'slide-left'
+  //   return +to.params.id < +from.params.id ? 'slide-right' : 'slide-left'
+  // },
+
   head () {
     return {
       title: this.event.title,
       meta: [
         // hid is used as unique identifier. Do not use `vmid` for it as it will not work
-        { hid: 'description', name: 'description', content: this.event.description },
-        { hid: 'og-description', name: 'og:description', content: this.event.description },
+        // { hid: 'description', name: 'description', content: this.event.description },
+        // { hid: 'og-description', name: 'og:description', content: this.event.description },
         { hid: 'og-title', property: 'og:title', content: this.event.title },   
         { hid: 'og-url', property: 'og:url', content: `event/${this.event.id}` },   
         { property: 'og:type', content: 'event'},
@@ -57,33 +84,43 @@ export default {
     }
   },
   computed: {
-    ...mapState([]),
+    ...mapGetters(['filteredEvents']),
+    next () {
+      let found = false
+      return this.filteredEvents.find(e => {
+        if (found) return e
+        if (e.id === this.event.id) found = true
+      })
+    },   
+    prev () {
+      let prev = false
+      this.filteredEvents.find(e => {
+        if (e.id === this.event.id) return true
+        prev = e
+      })
+      return prev
+    },
     imgPath () {
       return this.event.image_path && '/media/' + this.event.image_path
     },    
     mine () {
+      if (!this.$auth.user) return false
       return this.event.userId === this.$auth.user.id || this.$auth.user.is_admin
     },
   },
-  data () {
-    return {
-      event: { comments: [], place: {}, title: ''},
-      id: null,
-      loading: true,
-    }
-  },
   async asyncData ( { $axios, params }) {
     const event = await $axios.$get(`/event/${params.id}`)
-    return { event, id: params.id, loading: false }
+    return { event, id: params.id}
   },
   methods: {
     ...mapActions(['delEvent']),
+    keydown (e) {
+      console.error(e)
+    },
     comment_filter (value) {
-      console.log('dentro comment_filter')
       return value.replace(/<a.*href="([^">]+).*>(?:.(?!\<\/a\>))*.<\/a>/, (orig, url) => {
         // get extension
         const ext = url.slice(-4)
-        console.log('dentro il replace ', ext)
         if (['.mp3', '.ogg'].indexOf(ext)>-1) {
           return `<audio controls><source src='${url}'></audio>`
         } else {
@@ -92,9 +129,13 @@ export default {
       })
     },
     async remove () {
-      await api.delEvent(this.event.id)
-      this.delEvent(this.event.id)
-      this.$refs.eventDetail.hide()
+      try {
+        await this.$axios.delete(`/user/event/${this.id}`)
+        this.delEvent(Number(this.id))
+        this.$router.back()
+      } catch (e) {
+        console.error(e)
+      }
     },
     async toggle () {
       try {
@@ -106,49 +147,60 @@ export default {
           this.event.is_visible = true
         }
       } catch (e) {
-
+        console.error(e)
       }
     }
   }
 }
 </script>
-<style>
+<style lang='less'>
 
-#eventDetail .avatar {
-  height: 40px;
-  border-radius: 5px;
+#eventDetail {
+  max-width: 1000px;
+  border-radius: 0px;
+  margin: 0 auto;
+
+  pre {
+    color: #404246;
+    font-size: 1em;
+    font-family: BlinkMacSystemFont,-apple-system,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,Helvetica,Arial,sans-serif !important;
+  }
+
+  h5 {
+    font-size: 1.4em;
+    min-height: 40px;
+  }
+
+  .info {
+    margin: 10px;
+    font-size: 1.3em;
+    font-weight: 600;
+    text-align: center;
+  }
+
+  img {
+    width: 100%;
+    max-height: 89vh;
+    object-fit: contain;
+  }
+
+  .avatar {
+    width: auto;
+    height: 40px;
+    border-radius: 5px;
+  }
+
+  .nextprev {
+    font-size: 10px;
+    margin-bottom: 5px;
+  }
 }
 
-#eventDetail .image {
-  max-height: 200px;
+@media only screen and (max-width: 768px) {
+  #eventDetail {
+    font-size: 12px;
+  }
 }
 
-/* #eventDetail {
-  display: block !important;
-  opacity: 1;
-} */
-
-#eventDetail .modal-body {
-  padding: 0px;
-  width: 100%;
-}
-
-#eventDetail .close_button:hover {
-  background-color: rgba(200, 100, 100, 0.4);
-}
-
-#eventDetail .card {
-  border: 0px;
-}
-
-#eventDetail .close_button {
-  background-color: rgba(100, 100, 100, 0.3);
-  color: red;
-  font-size: 20px;
-  border: 1px dashed rgba(20,20,20,0.3);
-  position: absolute;
-  top: 10px;
-  right: 10px;
-}
 </style>
 
diff --git a/pages/export.vue b/pages/export.vue
index f722e2de..76c1907c 100644
--- a/pages/export.vue
+++ b/pages/export.vue
@@ -1,13 +1,12 @@
 <template lang="pug">
-  b-modal(ref='modal' @hidden='$router.replace("/")' 
-    :title='$t("common.export")' :visible='true' size='lg' hide-footer)
+  el-dialog(:title='$t("common.export")' visible :before-close='close')
     p {{$t('export.intro')}}
     
     li(v-if='filters.tags.length') {{$t('common.tags')}}:
-      el-tag.ml-1(color='#409EFF' size='mini' v-for='tag in filters.tags' :key='tag.tag') {{tag}}
+      el-tag.ml-1(size='mini' v-for='tag in filters.tags' :key='tag.tag') {{tag}}
     li(v-if='filters.places.length') {{$t('common.places')}}:
-      el-tag.ml-1(color='#409EFF' size='mini' v-for='place in filters.places' :key='place.id') {{place}}
-    el-tabs.mt-2(tabPosition='left' v-model='type')
+      el-tag.ml-1(size='mini' v-for='place in filters.places' :key='place.id') {{place}}
+    el-tabs.mt-2(v-model='type')
 
       el-tab-pane.pt-1(label='email' name='email')
         p(v-html='$t(`export.email_description`)')
@@ -15,57 +14,50 @@
           //- el-switch(v-model='notification.notify_on_add' :active-text="$t('notify_on_insert')")
           //- br
           //- el-switch.mt-2(v-model='notification.send_notification' :active-text="$t('send_notification')") 
-          el-input.mt-2(v-model='notification.email' :placeholder="$t('common.insert_your_address')" ref='email')
-          el-button.mt-2.float-right(native-type= 'submit' type='success' @click='add_notification') {{$t('Send')}}
+          el-input.mt-2(v-model='notification.email' :placeholder="$t('export.insert_your_address')" ref='email')
+          el-button.mt-2.float-right(native-type= 'submit' type='success' @click='add_notification') {{$t('common.send')}}
 
       el-tab-pane.pt-1(label='feed rss' name='feed')
         span(v-html='$t(`export.feed_description`)')
         el-input(v-model='link')
-          el-button(slot='append' plain type="primary" icon='el-icon-document' v-clipboard:copy="link") {{$t("common.copy")}}
+          el-button(slot='append' plain type="primary" icon='el-icon-document' ) {{$t("common.copy")}}
 
       el-tab-pane.pt-1(label='ics/ical' name='ics')
         p(v-html='$t(`export.ical_description`)')
         el-input(v-model='link')
-          el-button(slot='append' plain type="primary" icon='el-icon-document' v-clipboard:copy="link") {{$t("common.opy")}}
+          el-button(slot='append' plain type="primary" icon='el-icon-document') {{$t("common.copy")}}
 
       el-tab-pane.pt-1(label='list' name='list')
         p(v-html='$t(`export.list_description`)')
-        //- el-form-item(:label="$t('export.show_tags')")
-        el-switch(v-model='list.show_tags')
-        
-        iframe(:src='`http://localhost:3000/embed/list?tags=cia&showtags=${list.show_tags?"true":""}`' height='300')
-        //- el-card.mb-1(no-body header='Eventi')
-        //-   b-list-group#list(flush)
-        //-     b-list-group-item.flex-column.align-items-start(v-for="event in filteredEvents" :key='event.id'
-        //-       :to='`/event/${event.id}`')
-        //-         //- b-media
-        //-           img(v-if='event.image_path' slot="aside" :src="imgPath(event)" alt="Meia Aside" style='max-height: 60px')
-        //-         small.float-right {{event.start_datetime|datetime}}
-        //-         strong.mb-1 {{event.title}}
-        //-         br
-        //-         small.float-right {{event.place.name}}
-        //-         el-tag.mr-1(:color='tag.color || "grey"' size='mini' v-for='tag in event.tags' :key='tag.tag') {{tag.tag}}
-        el-input.mb-1(type='textarea' v-model='script')
-        el-button.float-right(plain type="primary" icon='el-icon-document' v-clipboard:copy="script") Copy
+
+        el-row
+          el-col.mr-2(:span='11')
+            el-input(v-model='list.title') Title
+          el-col.float-right(:span='12')
+            List(
+              :title='list.title'
+              :events='filteredEvents'
+            )
+        el-input.mb-1(type='textarea' v-model='listScript' readonly )
+        el-button.float-right(plain type="primary" icon='el-icon-document') {{$t('common.copy')}}
 
 
-      el-tab-pane.pt-1(label='calendar' name='calendar')
-        p(v-html='$t(`export.calendar_description`)')
-        //- no-ssr
-          Calendar.mb-1
-        el-input.mb-1(type='textarea' v-model='script')
-        el-button.float-right(plain type="primary" icon='el-icon-document' v-clipboard:copy="script") Copy
+      //- el-tab-pane.pt-1(label='calendar' name='calendar')
+      //-   p(v-html='$t(`export.calendar_description`)')
+      //-   //- no-ssr
+      //-     Calendar.mb-1
+      //-   el-input.mb-1(type='textarea' v-model='script')
+      //-   el-button.float-right(plain type="primary" icon='el-icon-document') Copy
 
 </template>
 <script>
-import { mapState } from 'vuex'
+import { mapState, mapGetters } from 'vuex'
 import path from 'path'
-// import filters from '../filters'
 import Calendar from '@/components/Calendar'
 import List from '@/components/List'
 import {intersection} from 'lodash'
-// import api from '@/api'
 import { Message } from 'element-ui'
+const { SHARED_CONF } = require('@/config')
 
 export default {
   name: 'Export',
@@ -73,33 +65,40 @@ export default {
   data () {
     return {
       type: 'email',
-      link: '',
-      export_list: true,
-      script: `<iframe>Ti piacerebbe</iframe>`,
       notification: { email: '' },
-      list: { show_tags: true },
+      list: { title: SHARED_CONF.title },
     }
   },
   // filters,
-  mounted () {
-    this.link = this.loadLink()
-  },
-  watch: {
-    type (value) {
-      this.link = this.loadLink()
-    }
-  },
   methods: {
     async add_notification () {
       if (!this.notification.email){
         Message({message:'Inserisci una mail', type: 'error'})
         return this.$refs.email.focus()
       }
-      await api.addNotification({ ...this.notification, filters: this.filters})
-      this.$refs.modal.hide()
+      // await api.addNotification({ ...this.notification, filters: this.filters})
+      // this.$refs.modal.hide()
       Message({message: this.$t('email_notification_activated'), type: 'success'})
     },
-    loadLink () {
+    imgPath (event) {
+      return event.image_path && event.image_path
+    },
+    close (done) {
+      this.$router.replace('/')
+      done()
+    }
+  },
+  computed: {
+    ...mapState(['filters', 'events']),
+    ...mapGetters(['filteredEvents']),
+    listScript () {
+      const params = []
+      if (this.list.title) {
+        params.push(`title=${this.list.title}`)
+      }
+      return `<iframe src="${SHARED_CONF.baseurl}/embed/list?${params.join('&')}"></iframe>`
+    },
+    link () {
       const tags = this.filters.tags.join(',')
       const places = this.filters.places.join(',')
       let query = ''
@@ -113,17 +112,8 @@ export default {
         }
       }
 
-      return `${process.env.VUE_APP_API}/api/export/${this.type}${query}`
-    },
-    imgPath (event) {
-      return event.image_path && event.image_path
-    },
-  },
-  computed: {
-    ...mapState(['filters', 'events']),
-    filteredEvents () {
-      return this.$store.getters.filteredEvents.filter(e => !e.past)
-    },
+      return `${SHARED_CONF.baseurl}/api/export/${this.type}${query}`
+    },    
     showLink () {
       return (['feed', 'ics'].indexOf(this.type)>-1)
     },
diff --git a/pages/index.vue b/pages/index.vue
index 28d95324..e87a8145 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1,2 +1,15 @@
 <template lang="pug">
+  #home
+    Nav
+    Home
 </template>
+<script>
+import Home from '~/components/Home.vue'
+import Nav from '~/components/Nav.vue'
+
+export default {
+  name: 'Index',
+  components: { Nav, Home },
+}
+</script>
+
diff --git a/pages/login.vue b/pages/login.vue
index eac775f2..518a4982 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -1,15 +1,21 @@
 <template lang='pug'>
-  b-modal(@shown="$refs.email.focus()" :title='$t("common.login")' hide-footer
-    @hidden='$router.replace("/")' :visible='true' ref='modal')
+
+  el-dialog(:title='$t("common.login")' :before-close='close' visible)
+
     el-form(v-loading='loading')
       p(v-html="$t('login.description')")
+
       el-input.mb-2(v-model='email' type='email' :placeholder='$t("common.email")' autocomplete='email' ref='email')
-        v-icon(name='user' slot='prepend')
+        i.el-icon-user(slot='prepend')
+
       el-input.mb-1(v-model='password'  @keyup.enter.native="submit" type='password' :placeholder='$t("common.password")')
-        v-icon(name="lock" slot='prepend')
-      el-button.mr-1(plain type="success" @click='submit') {{$t('common.login')}}
-      router-link(to='/register')
+        i.el-icon-lock(slot='prepend')
+
+      el-button.mr-1(plain type="success" :disabled='!email || !password' @click='submit') {{$t('common.login')}}
+
+      nuxt-link(to='/register')
         el-button.mt-1(plain type="primary") {{$t('login.not_registered')}}
+
       a.float-right(href='#' @click='forgot') {{$t('login.forgot_password')}}
 </template>
 
@@ -17,18 +23,22 @@
 const Cookie = process.client ? require('js-cookie') : undefined
 import { mapActions } from 'vuex'
 import { Message } from 'element-ui'
-// import api from '@/plugins/api'
+import get from 'lodash/get'
 
 export default {
   name: 'Login',
   data () {
     return {
+      open: true,
       password: '',
       email: '',
       loading: false
     }
   },
   methods: {
+    close () {
+      this.$router.replace('/')
+    },
     ...mapActions(['login']),
     async forgot () {
       if (!this.email) {
@@ -37,7 +47,7 @@ export default {
         return
       }
       this.loading = true
-      // await api.forgotPassword(this.email)
+      await this.$axios.$post('/user/recover', { email: this.email })
       this.loading = false
       Message({ message: this.$t('login.check_email'), type: 'success' })
     },
@@ -49,12 +59,12 @@ export default {
         this.loading = false
         Message({ message: this.$t('login.ok'), type: 'success' })
       } catch (e) {
-        Message({ message: this.$t('login.error') + e, type: 'error' })
+        e = get(e, 'response.data.message', e)
+        Message({ message: this.$t('login.error') + this.$t(e), type: 'error' })
         this.loading = false
         return
       }
       this.email = this.password = ''
-      this.$refs.modal.hide()
     }
   }
 }
diff --git a/pages/register.vue b/pages/register.vue
index c3b28087..b37d2917 100644
--- a/pages/register.vue
+++ b/pages/register.vue
@@ -1,9 +1,8 @@
 <template lang='pug'>
-  b-modal(hide-footer @hidden='$router.replace("/")' ref='modal'
-    :title="$t('common.register')" :visible='true' @shown='$refs.email.focus()')
+  el-dialog(:title="$t('common.register')" visible :before-close='() => $router.replace("/")' @open='$refs.email.focus()')
     el-form
       p(v-html="$t('register.description')")
-      el-input.mb-2(ref='email' v-model='user.email' type='email'
+      el-input.mb-2(ref='email' v-model='user.email' type='email' required
         :placeholder='$t("common.email")' autocomplete='email')
         span(slot='prepend') @
 
@@ -13,11 +12,10 @@
       el-input.mb-2(v-model='user.description' type="textarea" rows='3' :placeholder="$t('common.description')")
           v-icon(name='envelope-open-text')
 
-      el-button.float-right(plain type="success" icon='el-icon-arrow-right' @click='register') {{$t('common.send')}}
+      el-button(plain type="success" icon='el-icon-arrow-right' :disabled='!user.password || !user.email || !user.description' @click='register') {{$t('common.send')}}
 </template>
 
 <script>
-import api from '@/plugins/api'
 import { mapActions } from 'vuex'
 import { Message } from 'element-ui'
 
@@ -28,23 +26,29 @@ export default {
       error: {},
       user: { }
     }
+  },
+  computed: {
+    
   },
   methods: {
     ...mapActions(['login']),
     async register () {
       try {
         const user = await this.$axios.$post('/user', this.user)
-        this.$refs.modal.hide()
         Message({
           message: this.$t(`register.${user.is_admin && 'admin_'}complete`),
           type: 'success'
         })
+        this.$router.replace("/")
       } catch (e) {
+        console.log('DENTRO CATCH!!!', e)
+        const error = e && e.response && e.response.data && e.response.data.errors[0].message || e
+        console.error(error)
+        console.error(e)
         Message({
-          message: this.$t('register.error') + e,
+          message: this.$t('register.error') + error,
           type: 'error'
         })
-        console.error(e)
       }
     }
   }
diff --git a/pages/settings.vue b/pages/settings.vue
index cd22a133..fed9e4d4 100644
--- a/pages/settings.vue
+++ b/pages/settings.vue
@@ -1,58 +1,40 @@
 <template lang="pug">
-  b-modal(:title="$t('common.settings')" hide-footer @hidden='$router.replace("/")' :visible='true')
-      h5 {{user.name}}
-      el-input(v-model="mastodon_instance" @enter.native='associate')
-        span(slot='prepend') {{$t('settings.mastodon_instance')}}
-        el-button(v-if='!user.mastodon_auth' slot='append' @click='associate' type='success') {{$t('settings.associate')}}
-        el-button(v-else slot='append' @click='deassociate' variant='success') {{$t('settings.unassociate')}}
-      el-input.mt-2(v-model='password' type='password')
-        span(slot='prepend') {{$t('settings.change_password')}}
-        el-button(slot='append' @click='change' type='success') {{$t('settings.change')}}
+  el-dialog(:title="$t('common.settings')" :before-close='close' visible)
+    //- el-form
+      //- el-form-item {{$t('settings.change_password')}}
+    el-divider {{$t('settings.change_password')}}
+    el-input(v-model='password' type='password')
+      el-button(slot='append' @click='change' type='success') {{$t('common.send')}}
 </template>
 <script>
 import { mapState, mapActions } from 'vuex'
 export default {
-  props: ['code'],
   data () {
     return {
-      mastodon_instance: '',
       password: '',
-      user: {}
     }
   },
-  computed: mapState(['oauth', 'user']),
-  async asyncData ({ $axios, params }) {
-    // const code = this.$route.query.code
-    // if (code) {
-      // const res = await api.setCode({code})
-    // }
-    const user = await $axios.$get('/auth/user')
-    user.mastodon_auth = ''
-    return { user } //, mastodon_instance: user.mastodon_auth.instance }
-    // this.user = user
-    // this.mastodon_instance = user.mastodon_auth.instance
-  },
+  // computed: mapState(['user']),
+  // async asyncData ({ $axios, params }) {
+  //   const user = await $axios.$get('/auth/user')
+  //   user.mastodon_auth = ''
+  //   return { user }
+  // },
   methods: {
-      async change () {
-        if (!this.password) return
-        const user = this.user
-        user.password = this.password
-        try {
-          await api.updateUser(user)
-        } catch (e) {
-          console.log(e)
-        }
-      },
-      async deassociate () {
-        const user = this.user
-        user.mastodon_auth = ''
-        this.mastodon_instance = ''
-        await api.updateUser(user)
-      },
-      async associate () {
-        if (!this.mastodon_instance) return
-        const url = await this.$axios.$post('/user/getauthurl', {instance: this.mastodon_instance})
-        setTimeout( () => window.location.href=url, 100);
+    async change () {
+      if (!this.password) return
+      const user = this.user
+      user.password = this.password
+      try {
+        // this.$axios.
+        // await api.updateUser(user)
+      } catch (e) {
+        console.log(e)
+      }
+    },
+    close (done) {
+      this.$router.back()
+      done()
     }
   }
 }
diff --git a/plugins/api.js b/plugins/api.js
deleted file mode 100644
index 1bf5669c..00000000
--- a/plugins/api.js
+++ /dev/null
@@ -1,80 +0,0 @@
-// import axios from 'axios'
-// import { getters } from '@/store'
-// const api = axios.create({
-//   baseURL: process.env.NODE_ENV === 'development' ? 'http://localhost:3000/api' : '/api',
-//   withCredentials: true,
-//   responseType: 'json',
-//   headers: {
-//   //   'Access-Control-Allow-Origin': '*',
-//   //   'Access-Control-Allow-Credentials': 'true',
-//   //   'Accept': 'application/json',
-//     'Content-Type': 'application/json'
-//   }
-// })
-
-// export default function ({ $axios }) {
-//   function get(path) {
-//     return $axios.$get(path, { headers: { 'Authorization': 'Bearer ' + getters.token } })
-//   }
-
-//   function post(path, data) {
-//     return $axios.$post(path, data)
-//   }
-
-  // function post(path, data) {
-  //   return api.post(path, data) // , { headers: { 'Authorization': getters.token } })
-  //     .then(res => res.data)
-  //     .catch((e) => {
-  //       console.error(e)
-  //       if (e.response.status === 403) {
-  //         // store.commit('logout') // TOFIX
-  //         return false
-  //       }
-  //       throw e.response && e.response.data &&
-  //         e.response.data.errors && e.response.data.errors[0].message
-  //     })
-  // }
-  // function put(path, data) {
-  //   return api.put(path, data, { headers: { 'Authorization': getters.token } })
-  //     .then(ret => ret.data)
-  // }
-
-  // function del(path) {
-  //   return api.delete(path, { headers: { 'Authorization': getters.token } }).then(ret => ret.data)
-  // }
-
-  // return {
-    // login: (email, password) => post('/login', { email, password }),
-    // register: user => post('/user', user)
-
-  //   // password recovery
-  //   forgotPassword: email => post('/user/recover', { email }),
-  //   checkRecoverCode: recover_code => post('/user/check_recover_code', { recover_code }),
-  //   recoverPassword: (recover_code, password) => post('/user/recover_password', { recover_code, password }),
-
-  //   getAllEvents: (month, year) => get(`/event/${year}/${month}`),
-  //   getUnconfirmedEvents: () => get('/event/unconfirmed'),
-
-  //   confirmEvent: id => get(`/event/confirm/${id}`),
-  //   unconfirmEvent: id => get(`/event/unconfirm/${id}`),
-
-  //   addNotification: notification => post('/event/notification', notification),
-  //   delNotification: code => del(`/event/notification/${code}`),
-
-  //   addEvent: event => post('/user/event', event),
-  //   updateEvent: event => put('/user/event', event),
-
-  //   updatePlace: place => put('/place', place),
-  //   delEvent: eventId => del(`/user/event/${eventId}`),
-  //   getEvent: eventId => get(`/event/${eventId}`),
-  //   getMeta: () => get('/event/meta'),
-  //   getUser: () => get('/user'),
-  //   getUsers: () => get('/users'),
-  //   updateTag: tag => put('/tag', tag),
-  //   updateUser: user => put('/user', user),
-  //   getAuthURL: mastodonInstance => post('/user/getauthurl', mastodonInstance),
-  //   setCode: code => post('/user/code', code),
-  //   getAdminSettings: () => get('/settings')
-  //   // setAdminSetting: (key, value) => post('/settings', { key, value })
-//   }
-// }
diff --git a/plugins/bootstrap-vue.js b/plugins/bootstrap-vue.js
deleted file mode 100644
index 24f906d9..00000000
--- a/plugins/bootstrap-vue.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import Vue from 'vue'
-import BootstrapVue from 'bootstrap-vue'
-
-export default () => {
-  Vue.use(BootstrapVue)
-}
diff --git a/plugins/element-ui.js b/plugins/element-ui.js
index 9ac5c326..9a7f39fd 100644
--- a/plugins/element-ui.js
+++ b/plugins/element-ui.js
@@ -1,8 +1,8 @@
 import Vue from 'vue'
-import { Button, Select, Tag, Option, Table, FormItem, Card,
-  Form, Tabs, TabPane, Switch, Input, Loading, TimeSelect,
-  TableColumn, ColorPicker, Pagination, Popover, Tooltip,
-  Container, Footer , Timeline, TimelineItem} from 'element-ui'
+import { Button, Select, Tag, Option, Table, FormItem, Card, Row, Col, Upload, Checkbox,
+  Form, Tabs, TabPane, Switch, Input, Loading, TimeSelect, Badge, ButtonGroup, Divider,
+  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'
 import localeIt from 'element-ui/lib/locale/lang/it'
 import locale from 'element-ui/lib/locale'
@@ -10,6 +10,19 @@ locale.use(localeIt)
 
 export default () => {
   Vue.use(Button)
+  Vue.use(Divider)
+  Vue.use(Checkbox)
+  Vue.use(Upload)
+  Vue.use(ButtonGroup)
+  Vue.use(Calendar)
+  Vue.use(Row)
+  Vue.use(Col)
+  Vue.use(Carousel)
+  Vue.use(CarouselItem)
+  Vue.use(Badge)
+  Vue.use(Dialog)
+  Vue.use(Menu)
+  Vue.use(MenuItem)
   Vue.use(Container)
   Vue.use(Timeline)
   Vue.use(TimelineItem)
diff --git a/plugins/filters.js b/plugins/filters.js
index 3e317fc8..7f109ac1 100644
--- a/plugins/filters.js
+++ b/plugins/filters.js
@@ -3,6 +3,21 @@ import moment from 'dayjs'
 import 'dayjs/locale/it'
 moment.locale('it')
 
-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'))
+export default (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('month', value => moment(value).format('MMM'))
+  Vue.filter('event_when', event => {
+    if (event.multidate) {
+      return moment(event.start_datetime).format('dddd, D MMMM HH:mm') + ' - ' + moment(event.end_datetime).format('ddd, D MMMM')
+    } 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')
+      else
+        return moment(event.start_datetime).format('dddd, D MMMM HH:mm')
+    }
+  })
+}
\ No newline at end of file
diff --git a/plugins/i18n.js b/plugins/i18n.js
index c3a14c31..48c4037e 100644
--- a/plugins/i18n.js
+++ b/plugins/i18n.js
@@ -1,5 +1,6 @@
 import Vue from 'vue'
 import VueI18n from 'vue-i18n'
+import it from '@/locales/it.js'
 
 Vue.use(VueI18n)
 
@@ -10,7 +11,7 @@ export default ({ app, store }) => {
     locale: store.state.locale,
     fallbackLocale: 'it',
     messages: {
-      'it': require('~/locales/it.json')
+      it 
     //   'fr': require('~/locales/fr.json')
     }
   })
diff --git a/plugins/magic-grid.js b/plugins/magic-grid.js
deleted file mode 100644
index c240181d..00000000
--- a/plugins/magic-grid.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import Vue from 'vue'
-import MagicGrid from 'vue-magic-grid'
-
-export default () => {
-  Vue.use(MagicGrid)
-}
diff --git a/plugins/v-calendar.js b/plugins/v-calendar.js
index 403da668..2c88ed03 100644
--- a/plugins/v-calendar.js
+++ b/plugins/v-calendar.js
@@ -1,6 +1,5 @@
 import Vue from 'vue'
 import VCalendar from 'v-calendar'
-// import 'v-calendar/lib/v-calendar.min.css'
 
 export default () => {
   Vue.use(VCalendar, {
diff --git a/plugins/vue-awesome.js b/plugins/vue-awesome.js
index 333743f7..d9320c7d 100644
--- a/plugins/vue-awesome.js
+++ b/plugins/vue-awesome.js
@@ -17,6 +17,14 @@ import 'vue-awesome/icons/edit'
 import 'vue-awesome/icons/envelope-open-text'
 import 'vue-awesome/icons/user-secret'
 import 'vue-awesome/icons/question-circle'
+import 'vue-awesome/icons/share'
+import 'vue-awesome/icons/comment'
+import 'vue-awesome/icons/comments'
+import 'vue-awesome/icons/tags'
+import 'vue-awesome/icons/chevron-right'
+import 'vue-awesome/icons/chevron-left'
+import 'vue-awesome/icons/search'
+
 import Icon from 'vue-awesome/components/Icon'
 
 export default () => {
diff --git a/server/api/auth.js b/server/api/auth.js
index b974c7be..ccffb034 100644
--- a/server/api/auth.js
+++ b/server/api/auth.js
@@ -4,7 +4,7 @@ const User = require('./models/user')
 
 const Auth = {
   async fillUser(req, res, next) {
-    if (!req.user) return next(new Error('ERROR! No user'))
+    if (!req.user) return next()
     req.user = await User.findOne({
       where: { id: { [Op.eq]: req.user.id }, is_active: true }
     })
diff --git a/server/api/controller/bot.js b/server/api/controller/bot.js
index 9d1a08c6..bc509a03 100644
--- a/server/api/controller/bot.js
+++ b/server/api/controller/bot.js
@@ -1,5 +1,5 @@
 const { User, Event, Comment, Tag } = require('../model')
-const config = require('../../../config')
+const { SHARED_CONF } = require('../../../config')
 const Mastodon = require('mastodon-api')
 // const Sequelize = require('sequelize')
 // const Op = Sequelize.Op
@@ -13,7 +13,7 @@ const botController = {
   bot: null,
   async initialize () {
     const settings = await settingsController.settings()
-    if (!settings.mastodon_auth) return
+    if (!settings.mastodon_auth || !settings.mastodon_auth.access_token) return
     const mastodon_auth = settings.mastodon_auth
     botController.bot = new Mastodon({ 
       access_token: mastodon_auth.access_token,
@@ -46,7 +46,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(' ')} ${config.baseurl}/event/${event.id}`
+${event.description.length > 200 ? event.description.substr(0, 200) + '...' : event.description} - ${event.tags.map(t => '#' + t.tag).join(' ')} ${SHARED_CONF.baseurl}/event/${event.id}`
 
     let media
     if (event.image_path) {
diff --git a/server/api/controller/event.js b/server/api/controller/event.js
index ea3ba750..aafc38b6 100644
--- a/server/api/controller/event.js
+++ b/server/api/controller/event.js
@@ -3,6 +3,7 @@ const moment = require('moment')
 const { Op } = require('sequelize')
 const lodash = require('lodash')
 const { User, Event, Comment, Tag, Place, Notification } = require('../model')
+const Sequelize = require('sequelize')
 
 const eventController = {
 
@@ -19,8 +20,26 @@ const eventController = {
   },
 
   async getMeta(req, res) {
-    const places = await Place.findAll()
-    const tags = await Tag.findAll()
+    const places = await Place.findAll({
+      group: ['place.id'],
+      order: [[Sequelize.fn("COUNT", Sequelize.col('events.id')), 'DESC']],
+      attributes: {
+        include: [[Sequelize.fn("COUNT", Sequelize.col('events.id')), 'eventsCount']],
+        exclude: ['createdAt', 'updatedAt']
+      },
+      include: { model: Event, attributes: [] }
+    })
+
+    const tags = await Tag.findAll({
+      group: ['tag'],
+      order: [[Sequelize.fn("COUNT", Sequelize.col('events.id')), 'DESC']],
+      includeIgnoreAttributes:false,
+      attributes: {
+        include: [[Sequelize.fn("COUNT", Sequelize.col('events.id')), 'eventsCount']],
+        exclude: ['createdAt', 'updatedAt']
+      },
+      include: { model: Event, attributes: [] }})
+
     res.json({ tags, places })
   },
 
@@ -67,7 +86,14 @@ const eventController = {
 
   async get(req, res) {
     const id = req.params.event_id
-    const event = await Event.findByPk(id, { include: [User, Tag, Comment, Place] })
+    const event = await Event.findByPk(id, { include:
+      [
+        Tag,
+        Comment,
+        { model: Place, attributes: ['name', 'address'] }
+      ] ,
+      order: [ [Comment, 'id', 'DESC'] ]
+    })
     res.json(event)
   },
 
diff --git a/server/api/controller/settings.js b/server/api/controller/settings.js
index 85f32819..ea1012df 100644
--- a/server/api/controller/settings.js
+++ b/server/api/controller/settings.js
@@ -1,4 +1,6 @@
 const { Settings } = require('../model')
+const { SHARED_CONF } = require('../../../config')
+const Mastodon = require('mastodon-api')
 
 const settingsController = {
   async setAdminSetting (key, value) {
@@ -14,6 +16,42 @@ const settingsController = {
     res.json(settings)
   },
 
+  async getAuthURL(req, res) {
+    const instance = req.body.instance
+    const callback = `${SHARED_CONF.baseurl}/api/settings/oauth`
+    const { client_id, client_secret } = await Mastodon.createOAuthApp(`https://${instance}/api/v1/apps`,
+      SHARED_CONF.title, 'read write', callback)
+    const url = await Mastodon.getAuthorizationUrl(client_id, client_secret,
+      `https://${instance}`, 'read write', callback)
+
+    await settingsController.setAdminSetting('mastodon_auth', { client_id, client_secret, instance })
+    res.json(url)
+  },
+
+  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 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')
+    } catch (e) {
+      res.json(e)
+    }
+  },
+
   async settings () {
     const settings = await Settings.findAll()
     const map = {}
diff --git a/server/api/controller/user.js b/server/api/controller/user.js
index 5c66a0e1..00bf0728 100644
--- a/server/api/controller/user.js
+++ b/server/api/controller/user.js
@@ -2,14 +2,12 @@ const fs = require('fs')
 const path = require('path')
 const crypto = require('crypto')
 const jwt = require('jsonwebtoken')
-const Mastodon = require('mastodon-api')
 const { Op } = require('sequelize')
 const jsonwebtoken = require('jsonwebtoken')
 const User = require('../models/user')
-const config = require('../../../config')
+const { SECRET_CONF, SHARED_CONF } = require('../../../config')
 const mail = require('../mail')
 const { Event, Tag, Place } = require('../models/event')
-const settingsController = require('./settings')
 const eventController = require('./event')
 
 const userController = {
@@ -17,13 +15,13 @@ const userController = {
     // find the user
     const user = await User.findOne({ where: { email: { [Op.eq]: req.body && req.body.email } } })
     if (!user) {
-      res.status(404).json({ success: false, message: 'AUTH_FAIL' })
+      res.status(403).json({ success: false, message: 'auth.fail' })
     } else if (user) {
       if (!user.is_active) {
-        res.status(403).json({ success: false, message: 'NOT_CONFIRMED' })
+        res.status(403).json({ success: false, message: 'auth.not_confirmed' })
       // check if password matches
       } else if (!await user.comparePassword(req.body.password)) {
-        res.status(403).json({ success: false, message: 'AUTH_FAIL' })
+        res.status(403).json({ success: false, message: 'auth.fail' })
       } else {
         // if user is found and password is right
         // create a token
@@ -33,7 +31,7 @@ const userController = {
             email: user.email,
             scope: [user.is_admin ? 'admin' : 'user']
           },
-          config.secret
+          SECRET_CONF.secret
         )
       
         res.json({token: accessToken})        
@@ -58,8 +56,12 @@ const userController = {
       if (event.image_path) {
         const old_path = path.resolve(__dirname, '..', '..', 'uploads', event.image_path)
         const old_thumb_path = path.resolve(__dirname, '..', '..', 'uploads', 'thumb', event.image_path)
-        await fs.unlink(old_path)
-        await fs.unlink(old_thumb_path)
+        try {
+          await fs.unlink(old_path)
+          await fs.unlink(old_thumb_path)
+        } catch (e) {
+          console.error(e)
+        }
       }
       await event.destroy()
       res.sendStatus(200)
@@ -160,61 +162,14 @@ const userController = {
     return res.json(newEvent)
   },
 
-  async getAuthURL(req, res) {
-    const instance = req.body.instance
-    const is_admin = req.body.admin && req.user.is_admin
-    const callback = `${config.baseurl}/${is_admin ? 'admin/oauth' : 'settings'}`
-    const { client_id, client_secret } = await Mastodon.createOAuthApp(`https://${instance}/api/v1/apps`,
-      config.title, 'read write', callback)
-    const url = await Mastodon.getAuthorizationUrl(client_id, client_secret,
-      `https://${instance}`, 'read write', callback)
-
-    if (is_admin) {
-      await settingsController.setAdminSetting('mastodon_auth', { client_id, client_secret, instance })
-    } else {
-      req.user.mastodon_auth = { client_id, client_secret, instance }
-      await req.user.save()
-    }
-    res.json(url)
-  },
-
-  async code(req, res) {
-    const { code, is_admin } = req.body
-    let client_id, client_secret, instance
-    const callback = `${config.baseurl}/${is_admin ? 'admin/oauth' : 'settings'}`
-
-    if (is_admin) {
-      const settings = await settingsController.settings();
-      ({ client_id, client_secret, instance } = settings.mastodon_auth)
-    } else {
-      ({ client_id, client_secret, instance } = req.user.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 }
-      if (is_admin) {
-        await settingsController.setAdminSetting('mastodon_auth', mastodon_auth)
-        res.json(instance)
-      } else {
-        req.user.mastodon_auth = mastodon_auth
-        await req.user.save()
-        // await bot.add(req.user, token)
-        res.json(req.user)
-      }
-    } catch (e) {
-      res.json(e)
-    }
-  },
-
   async forgotPassword(req, res) {
     const email = req.body.email
     const user = await User.findOne({ where: { email: { [Op.eq]: email } } })
     if (!user) return res.sendStatus(200)
 
     user.recover_code = crypto.randomBytes(16).toString('hex')
-    mail.send(user.email, 'recover', { user, config })
+    mail.send(user.email, 'recover', { user, config: SHARED_CONF })
+
     await user.save()
     res.sendStatus(200)
   },
@@ -229,13 +184,17 @@ const userController = {
 
   async updatePasswordWithRecoverCode(req, res) {
     const recover_code = req.body.recover_code
-    if (!recover_code) return res.sendStatus(400)
     const password = req.body.password
+    if (!recover_code || !password) return res.sendStatus(400)
     const user = await User.findOne({ where: { recover_code: { [Op.eq]: recover_code } } })
     if (!user) return res.sendStatus(400)
     user.password = password
-    await user.save()
-    res.sendStatus(200)
+    try {
+      await user.save()
+      res.sendStatus(200)
+    } catch(e) {
+      res.sendStatus(400)
+    }
   },
 
   async current(req, res) {
@@ -253,7 +212,7 @@ const userController = {
     const user = await User.findByPk(req.body.id)
     if (user) {
       if (!user.is_active && req.body.is_active) {
-        await mail.send(user.email, 'confirm', { user, config })
+        await mail.send(user.email, 'confirm', { user, config: SHARED_CONF })
       }
       await user.update(req.body)
       res.json(user)
@@ -263,25 +222,29 @@ const userController = {
   },
 
   async register(req, res) {
-    console.error('register !!', req)
+    
     const n_users = await User.count()
     try {
+
+      // the first registered user will be an active admin
       if (n_users === 0) {
-        // the first registered user will be an active admin
         req.body.is_active = req.body.is_admin = true
       } else {
         req.body.is_active = false
       }
+
       const user = await User.create(req.body)
       try {
-        mail.send([user.email, config.admin], 'register', { user, config })
+        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 token = jwt.sign(payload, config.secret)
+      const token = jwt.sign(payload, SECRET_CONF.secret)
       res.json({ user, token })
     } catch (e) {
+      console.error(e)
       res.status(404).json(e)
     }
   }
diff --git a/server/api/db.js b/server/api/db.js
index 948b87c3..35d0eb72 100644
--- a/server/api/db.js
+++ b/server/api/db.js
@@ -1,5 +1,6 @@
 const Sequelize = require('sequelize')
-const conf = require('../../config.js')
-const db = new Sequelize(conf.db)
-db.sync()
+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 1dcc10f3..779dfc45 100644
--- a/server/api/index.js
+++ b/server/api/index.js
@@ -5,10 +5,23 @@ const eventController = require('./controller/event')
 const exportController = require('./controller/export')
 const userController = require('./controller/user')
 const settingsController = require('./controller/settings')
-const config = require('../../config')
+const { SECRET_CONF } = require('../../config')
+const cookieParser = require('cookie-parser')
 
-const botController = require('./controller/bot')
-const jwt = require('express-jwt')({secret: config.secret})
+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 storage = require('./storage')({
   destination: 'uploads/'
@@ -16,7 +29,7 @@ const storage = require('./storage')({
 
 const upload = multer({ storage })
 const api = express.Router()
-
+api.use(cookieParser())
 // AUTH
 api.post('/auth/login', userController.login)
 api.post('/auth/logout', userController.logout)
@@ -81,7 +94,7 @@ api.get('/export/:type', exportController.export)
 api.get('/event/:month/:year', eventController.getAll)
 
 // mastodon oauth auth
-api.post('/user/getauthurl', jwt, isAuth, userController.getAuthURL)
-api.post('/user/code', jwt, isAuth, userController.code)
+api.post('/settings/getauthurl', jwt, isAuth, isAdmin, settingsController.getAuthURL)
+api.get('/settings/oauth', jwt, isAuth, isAdmin, settingsController.code)
 
 module.exports = api
diff --git a/server/api/mail.js b/server/api/mail.js
index 7f28f3f4..f86e286e 100644
--- a/server/api/mail.js
+++ b/server/api/mail.js
@@ -1,40 +1,40 @@
 const Email = require('email-templates')
 const path = require('path')
-const config = require('../../config')
+const { SECRET_CONF, SHARED_CONF } = require('../../config')
 const moment = require('moment')
-moment.locale(config.locale)
+moment.locale(SHARED_CONF.locale)
 
 const mail = {
   send (addresses, template, locals) {
     const email = new Email({
-      views: { root: path.join(__dirname, 'emails') },
+      views: { root: path.join(__dirname, '..', 'emails') },
       juice: true,
       juiceResources: {
         preserveImportant: true,
         webResources: {
-          relativeTo: path.join(__dirname, 'emails')
+          relativeTo: path.join(__dirname, '..', 'emails')
         }
       },
       message: {
-        from: `${config.title} <${config.smtp.auth.user}>`
+        from: `${SHARED_CONF.title} <${SECRET_CONF.smtp.auth.user}>`
       },
       send: true,
       i18n: {
-        locales: ['en', 'es', 'it'],
-        defaultLocale: config.locale
+        directory: path.join(__dirname, '..', '..', 'locales', 'email'),
+        defaultLocale: SHARED_CONF.locale
       },
-      transport: config.smtp
+      transport: SECRET_CONF.smtp
     })
     return email.send({
       template,
       message: {
         to: addresses,
-        bcc: config.admin
+        bcc: SECRET_CONF.admin
       },
       locals: {
         ...locals,
-        locale: config.locale,
-        config,
+        locale: SHARED_CONF.locale,
+        config: SHARED_CONF,
         datetime: datetime => moment(datetime).format('ddd, D MMMM HH:mm')
       }
     })
diff --git a/server/api/models/event.js b/server/api/models/event.js
index 7c5e7f34..d5185c12 100644
--- a/server/api/models/event.js
+++ b/server/api/models/event.js
@@ -10,19 +10,23 @@ const Event = db.define('event', {
   end_datetime: { type: Sequelize.DATE, index: true },
   image_path: Sequelize.STRING,
   is_visible: Sequelize.BOOLEAN,
-  activitypub_id: { type: Sequelize.STRING, index: true },
-  // activitypub_ids: { type: Sequelize.ARRAY, index}
+  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 },
+  tag: { type: Sequelize.STRING, index: true, unique: true, },
   color: { type: Sequelize.STRING }
 })
 
 const Comment = db.define('comment', {
-  activitypub_id: { type: Sequelize.STRING, index: true },
+  activitypub_id: { type: Sequelize.BIGINT, index: true },
   data: Sequelize.JSON,
-  url: Sequelize.STRING,
+  // url: Sequelize.STRING,
   author: Sequelize.STRING,
   text: Sequelize.STRING
 })
diff --git a/server/api/storage.js b/server/api/storage.js
index da58bae4..0fba8074 100644
--- a/server/api/storage.js
+++ b/server/api/storage.js
@@ -28,8 +28,8 @@ DiskStorage.prototype._handleFile = function _handleFile(req, file, cb) {
     const thumbPath = path.join(destination, 'thumb', filename)
     const outStream = fs.createWriteStream(finalPath)
     const thumbStream = fs.createWriteStream(thumbPath)
-    const resizer = sharp().resize(800).jpeg({ quality: 80 })
-    const thumbnailer = sharp().resize(400).jpeg({ quality: 60 })
+    const resizer = sharp().resize(800).jpeg({ quality: 90 })
+    const thumbnailer = sharp().resize(400).jpeg({ quality: 90 })
 
     file.stream.pipe(thumbnailer).pipe(thumbStream)
     thumbStream.on('error', e => console.log('thumbStream error ', e))
diff --git a/server/cron.js b/server/cron.js
index 96575aa5..08a6c462 100644
--- a/server/cron.js
+++ b/server/cron.js
@@ -1,7 +1,7 @@
 // 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('./api/config.js')
 
 const { Event, Notification, EventNotification,
   User, Place, Tag } = require('./api/model')
@@ -25,15 +25,6 @@ async function sendNotification (notification, event, eventNotification) {
         })
         promises.push(b)
       }
-      // user publish
-      if (event.user && event.user.mastodon_auth && event.user.mastodon_auth.access_token) {
-        const b = bot.post(event.user.mastodon_auth, event).then(ret => {
-          event.activitypub_id = ret.id
-          return event.save()
-        })
-        promises.push(b)
-      }
-      break
   }
   return Promise.all(promises)
 }
diff --git a/store/index.js b/store/index.js
index d9dd6ceb..9ac0dbf2 100644
--- a/store/index.js
+++ b/store/index.js
@@ -1,6 +1,7 @@
 import moment from 'dayjs'
-import { intersection } from 'lodash'
-import Vue from 'vue'
+import intersection from 'lodash/intersection'
+import map from 'lodash/map'
+
 
 export const state = () => ({
   events: [],
@@ -13,51 +14,61 @@ export const state = () => ({
   filters: {
     tags: [],
     places: []
-  }
+  },
+  show_past_events: false,
 })
 
 export const getters = {
   token: state => state.token,
   // filter current + future events only
   // plus, filter matches search tag/place
+
   filteredEvents: (state) => {
-    const events = state.events.map((e) => {
-      const end_datetime = e.end_datetime || moment(e.start_datetime).add('3', 'hour')
-      const past = (moment().diff(end_datetime, 'minutes') > 0)
-      e.past = past
+
+    let events = state.events
+
+    // TOFIX: use lodash
+    if (state.filters.tags.length || state.filters.places.length){
+      events = events.filter((e) => {
+        if (state.filters.tags.length) {
+          const m = intersection(e.tags.map(t => t.tag), state.filters.tags)
+          if (m.length > 0) return true
+        }
+        if (state.filters.places.length) {
+          if (state.filters.places.find(p => p === e.place.id)) {
+            return true
+          }
+        }
+        return 0
+      })
+    }
+
+    if (!state.show_past_events) {
+      events = events.filter( e => !e.past )
+    }
+
+    let lastDay = null
+    events = map(events, e => {
+      const currentDay = moment(e.start_datetime).date()
+      console.log(currentDay)
+      e.newDay = (!lastDay || lastDay!==currentDay) && currentDay
+      lastDay = currentDay
       return e
     })
-    if (!state.filters.tags.length && !state.filters.places.length) {
-      return events
-    }
-    return events.filter((e) => {
-      if (state.filters.tags.length) {
-        const m = intersection(e.tags.map(t => t.tag), state.filters.tags)
-        if (m.length > 0) return true
-      }
-      if (state.filters.places.length) {
-        if (state.filters.places.find(p => p === e.place.name)) {
-          return true
-        }
-      }
-      return 0
-    })
+
+    return events
   }
 }
 
 export const mutations = {
-  logout(state) {
-    state.logged = false
-    state.token = ''
-    state.user = {}
-  },
-  login(state, user) {
-    state.logged = true
-    state.user = user.user
-    state.token = user.token
-  },
   setEvents(state, events) {
-    state.events = events
+    // set a `past` flag
+    state.events = events.map((e) => {
+      const end_datetime = e.end_datetime || moment(e.start_datetime).add('3', 'hour')
+      const past = (moment().diff(end_datetime, 'minutes') > 0)
+      e.past = !!past
+      return e
+    })
   },
   addEvent(state, event) {
     state.events.push(event)
@@ -69,7 +80,9 @@ export const mutations = {
     })
   },
   delEvent(state, eventId) {
-    state.events = state.events.filter(ev => ev.id !== eventId)
+    state.events = state.events.filter(ev => {
+      return ev.id !== eventId
+    })
   },
   update(state, { tags, places }) {
     state.tags = tags
@@ -93,21 +106,13 @@ export const mutations = {
   },
   setSearchPlaces(state, places) {
     state.filters.places = places
+  },
+  showPastEvents (state, show) {
+    state.show_past_events = show
   }
 }
 
 export const actions = {
-  // called on server request
-  // get current month's event
-  async nuxtServerInit({ commit }, { req }) {
-    // set user if logged! TODO
-    const now = new Date()
-    // const events = await api.getAllEvents(now.getMonth() - 1, now.getFullYear())
-    const events = await this.$axios.$get(`/event/${now.getMonth()}/${now.getFullYear()}`)
-    commit('setEvents', events)
-    const { tags, places } = await this.$axios.$get('/event/meta')
-    commit('update', { tags, places })    
-  },
   async updateEvents({ commit }, page) {
     const events = await this.$axios.$get(`/event/${page.month-1}/${page.year}`)
     commit('setEvents', events)
@@ -139,8 +144,8 @@ export const actions = {
   },
   setSearchPlaces({ commit }, places) {
     commit('setSearchPlaces', places)
+  },
+  showPastEvents({ commit }, show) {
+    commit('showPastEvents', show)
   }
 }
-// export const getters = {
-//   filteredEvents: state => state.events
-// }

From 745b9247c94d14dbdf019d204ed5383a067af32c Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Thu, 30 May 2019 12:12:51 +0200
Subject: [PATCH 10/14] .

---
 .vscode/vscode-kanban.json                    |  66 +++++----
 components/Calendar.vue                       |  23 ++--
 components/Home.vue                           |  22 ++-
 components/Search.vue                         |  26 +---
 layouts/iframe.vue                            |   4 +-
 locales/en.js                                 |   3 +
 locales/es.js                                 |   3 +
 locales/it.js                                 | 125 ++++++++++++++++++
 .../20190521100417-act_ids_comment_data.js    |  30 +++++
 migrations/20190522104158-bigint.js           |  27 ++++
 migrations/20190527205032-tag_id_weight.js    |  29 ++++
 models/index.js                               |  37 ++++++
 package.json                                  |   2 +-
 pages/add/_edit.vue                           |  15 +--
 pages/admin.vue                               |   4 +-
 pages/embed/list.vue                          |  11 +-
 pages/event/_id.vue                           |   4 +-
 pages/export.vue                              |  19 ++-
 pages/recover/_code.vue                       |  52 ++++++++
 pages/register.vue                            |   5 +-
 plugins/filters.js                            |   4 +-
 plugins/initialize.js                         |   9 ++
 server/api/auth.js                            |   1 +
 server/api/controller/bot.js                  |   1 +
 server/api/controller/event.js                |  36 ++---
 server/api/controller/export.js               |  19 ++-
 server/api/controller/user.js                 |  13 +-
 server/api/models/event.js                    |   4 +-
 server/api/models/user.js                     |   2 +-
 server/emails/confirm/html.pug                |   4 +
 server/emails/event/html.pug                  |  18 +++
 server/emails/event/subject.pug               |   1 +
 server/emails/mail.css                        |   8 ++
 server/emails/recover/html.pug                |   3 +
 server/emails/recover/subject.pug             |   1 +
 server/emails/register/html.pug               |   6 +
 server/emails/register/subject.pug            |   1 +
 server/index.js                               |   4 +
 server/{cron.js => notifier.js}               |  17 ++-
 static/favicon.ico                            | Bin 1150 -> 4286 bytes
 static/gancio.png                             | Bin 0 -> 4711 bytes
 store/index.js                                |  33 ++---
 widgets/examples/index.html                   |  17 ---
 widgets/list/index.html                       |   0
 widgets/list/index.js                         |  12 --
 widgets/list/style.css                        |   3 -
 46 files changed, 543 insertions(+), 181 deletions(-)
 create mode 100644 locales/en.js
 create mode 100644 locales/es.js
 create mode 100644 locales/it.js
 create mode 100644 migrations/20190521100417-act_ids_comment_data.js
 create mode 100644 migrations/20190522104158-bigint.js
 create mode 100644 migrations/20190527205032-tag_id_weight.js
 create mode 100644 models/index.js
 create mode 100644 pages/recover/_code.vue
 create mode 100644 plugins/initialize.js
 create mode 100644 server/emails/confirm/html.pug
 create mode 100644 server/emails/event/html.pug
 create mode 100644 server/emails/event/subject.pug
 create mode 100644 server/emails/mail.css
 create mode 100644 server/emails/recover/html.pug
 create mode 100644 server/emails/recover/subject.pug
 create mode 100644 server/emails/register/html.pug
 create mode 100644 server/emails/register/subject.pug
 rename server/{cron.js => notifier.js} (83%)
 create mode 100644 static/gancio.png
 delete mode 100644 widgets/examples/index.html
 delete mode 100644 widgets/list/index.html
 delete mode 100644 widgets/list/index.js
 delete mode 100644 widgets/list/style.css

diff --git a/.vscode/vscode-kanban.json b/.vscode/vscode-kanban.json
index cfcc8869..afb914a9 100644
--- a/.vscode/vscode-kanban.json
+++ b/.vscode/vscode-kanban.json
@@ -31,6 +31,18 @@
       "title": "export page",
       "type": "bug"
     },
+    {
+      "assignedTo": {
+        "name": "lesion"
+      },
+      "category": "feature",
+      "creation_time": "2019-04-23T19:55:59.993Z",
+      "id": "10",
+      "prio": 1,
+      "references": [],
+      "title": "gestione errori form aggiungi evento",
+      "type": "bug"
+    },
     {
       "assignedTo": {
         "name": "lesion"
@@ -73,6 +85,15 @@
     }
   ],
   "in-progress": [
+    {
+      "assignedTo": {
+        "name": "lesion"
+      },
+      "creation_time": "2019-04-30T22:00:29.237Z",
+      "id": "17",
+      "references": [],
+      "title": "porcoddio la config arriva anche al client ovviamente, devo separare!"
+    },
     {
       "assignedTo": {
         "name": "lesion"
@@ -85,18 +106,6 @@
   ],
   "testing": [],
   "todo": [
-    {
-      "assignedTo": {
-        "name": "lesion"
-      },
-      "category": "feature",
-      "creation_time": "2019-04-23T19:55:59.993Z",
-      "id": "10",
-      "prio": 1,
-      "references": [],
-      "title": "gestione errori form aggiungi evento",
-      "type": "bug"
-    },
     {
       "assignedTo": {
         "name": "lesion"
@@ -168,6 +177,24 @@
       "references": [],
       "title": "colori te prego!"
     },
+    {
+      "assignedTo": {
+        "name": "lesion"
+      },
+      "creation_time": "2019-05-27T20:42:22.581Z",
+      "id": "24",
+      "references": [],
+      "title": "copy to clipboard"
+    },
+    {
+      "assignedTo": {
+        "name": "lesion"
+      },
+      "creation_time": "2019-05-29T13:08:20.887Z",
+      "id": "25",
+      "references": [],
+      "title": "creazione script di backup"
+    },
     {
       "assignedTo": {
         "name": "lesion"
@@ -214,15 +241,6 @@
       "references": [],
       "title": "popup sul calendario"
     },
-    {
-      "assignedTo": {
-        "name": "lesion"
-      },
-      "creation_time": "2019-04-30T22:00:29.237Z",
-      "id": "17",
-      "references": [],
-      "title": "porcoddio la config arriva anche al client ovviamente, devo separare!"
-    },
     {
       "assignedTo": {
         "name": "lesion"
@@ -259,10 +277,10 @@
       "assignedTo": {
         "name": "lesion"
       },
-      "creation_time": "2019-05-27T20:42:22.581Z",
-      "id": "24",
+      "creation_time": "2019-05-29T13:10:04.463Z",
+      "id": "26",
       "references": [],
-      "title": "copy to clipboard"
+      "title": "v-calendar colori e eventi multidays..."
     }
   ]
 }
\ No newline at end of file
diff --git a/components/Calendar.vue b/components/Calendar.vue
index fb0b8a92..5ecd0b44 100644
--- a/components/Calendar.vue
+++ b/components/Calendar.vue
@@ -7,7 +7,6 @@
       :attributes='attributes'
       :from-page.sync='page'
       is-expanded
-      show-clear-margin
       is-inline
       @dayclick='click')
 
@@ -15,7 +14,7 @@
 <script>
 import { mapState, mapActions, mapGetters } from 'vuex'
 import moment from 'dayjs'
-import { intersection } from 'lodash'
+import { intersection, sample, get } from 'lodash'
 
 export default {
   name: 'Calendar',
@@ -45,18 +44,19 @@ export default {
         order: event.start_datetime,
       }
       const day = moment(event.start_datetime).date()
-      let color = event.tags && event.tags.length && event.tags[0].color ? event.tags[0].color : 'rgba(170,170,250,0.7)'
-      if (event.past) color = 'rgba(200,200,200,0.5)'
+      let color = event.past ? 'rgba(200,200,200,0.5)' : get(event, 'tags[0].color') || 'rgba(170,170,250,0.7)'
+
+      console.error(color)
       if (event.multidate) {
         e.dates = {
           start: event.start_datetime, end: event.end_datetime
         }
-        e.highlight = { backgroundColor: color,
-          // borderColor: 'transparent',
-          borderWidth: '4px' }
+        e.highlight = { 
+          color: 'red' // : sample(['purple', 'red', 'green', 'blue']),
+        }
       } else {
         e.dates = event.start_datetime
-        e.dot = { backgroundColor: color, borderColor: color, borderWidth: '3px' }
+        e.dot = { color: 'rgba(102,10,20)' }
       }
       return e
     }
@@ -84,4 +84,11 @@ export default {
   align-self: center;
 }
 
+.vc-highlight {
+  /* color: red; */
+  height: 22px !important;
+  opacity: 0.4;
+  border-radius: 15px;
+}
+
 </style>
diff --git a/components/Home.vue b/components/Home.vue
index db75cbab..b7620aa1 100644
--- a/components/Home.vue
+++ b/components/Home.vue
@@ -1,9 +1,14 @@
 <template lang="pug">
   section
 
+    a(href='#totop')
+      el-button.top.d-block.d-sm-none(icon='el-icon-top' circle type='primary' plain)
+    a.totop(name='totop')
     .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
@@ -20,14 +25,13 @@
 import { mapGetters } from 'vuex'
 import Event from '@/components/Event'
 import Calendar from '@/components/Calendar'
-import Search from '@/components/Search'
 
 export default {
   name: 'Home',
   data () {
     return { }
   },
-  components: { Calendar, Event, Search },
+  components: { Calendar, Event },
   computed: mapGetters(['filteredEvents']),
 }
 </script>
@@ -36,5 +40,19 @@ section {
   width: 100%;
   max-width: 1500px;
   margin: 0 auto;
+
+  .top {
+    position: fixed;
+    bottom: 10px;
+    right: 10px;
+    z-index: 1;
+    opacity: 0.7;
+    font-size: 16px;
+  }
+
+  .totop {
+    position: absolute;
+    top: 0px;
+  }
 }
 </style>
diff --git a/components/Search.vue b/components/Search.vue
index 16280382..5080cbd4 100644
--- a/components/Search.vue
+++ b/components/Search.vue
@@ -23,7 +23,6 @@
 
 <script>
 import {mapState, mapActions} from 'vuex'
-
 export default {
   data () {
     return {
@@ -35,10 +34,11 @@ export default {
   methods: mapActions(['setSearchPlaces', 'setSearchTags', 'showPastEvents']),
   computed: {
     ...mapState(['tags', 'places', 'filters', 'show_past_events']),
+    // TOFIX: optimize
     keywords () {
-      const tags = this.tags.map( t => ({ value: 't' + t.tag, label: t.tag, count: +t.eventsCount }))
-      const places = this.places.map( p => ({ value: 'p' + p.id, label: p.name, count: +p.eventsCount }))
-      return tags.concat(places)
+      const tags = this.tags.map( t => ({ value: 't' + t.tag, label: t.tag, weigth: t.weigth }))
+      const places = this.places.map( p => ({ value: 'p' + p.id, label: p.name, weigth: p.weigth }))
+      return tags.concat(places).sort((a, b) => b.weigth-a.weigth)
     },
     showPast : {
       set (value) {
@@ -59,24 +59,6 @@ export default {
         return this.filters.tags.map(t => 't' + t).concat(this.filters.places.map(p => 'p' + p))
       }
     },
-    filters_tags: {
-      set (value) {
-        this.setSearchTags(value)
-      },
-      get () {
-        return this.filters.tags
-      }
-    },
-    filters_places: {
-      set (value) {
-        this.setSearchPlaces(value)
-      },
-      get () {
-        return this.filters.places
-      }
-    },    
   }
 }
 </script>
-<style lang="less">
-</style>
diff --git a/layouts/iframe.vue b/layouts/iframe.vue
index 858c52d1..2cc8469e 100644
--- a/layouts/iframe.vue
+++ b/layouts/iframe.vue
@@ -1,3 +1,3 @@
-<template lang="pug">
-    nuxt
+<template>
+  <nuxt/>
 </template>
diff --git a/locales/en.js b/locales/en.js
new file mode 100644
index 00000000..f01ae3b9
--- /dev/null
+++ b/locales/en.js
@@ -0,0 +1,3 @@
+{
+  "registration_email": "registration_email"
+}
\ No newline at end of file
diff --git a/locales/es.js b/locales/es.js
new file mode 100644
index 00000000..f01ae3b9
--- /dev/null
+++ b/locales/es.js
@@ -0,0 +1,3 @@
+{
+  "registration_email": "registration_email"
+}
\ No newline at end of file
diff --git a/locales/it.js b/locales/it.js
new file mode 100644
index 00000000..99abf698
--- /dev/null
+++ b/locales/it.js
@@ -0,0 +1,125 @@
+const it = {
+  common: {
+    add_event: 'Nuovo evento',
+    next: 'Continua',
+    export: 'Esporta',
+    send: 'Invia',
+    where: 'Dove',
+    address: 'Indirizzo',
+    when: 'Quando',
+    what: 'Cosa',
+    media: 'Media',
+    login: 'Entra',
+    email: 'Email',
+    password: 'Password',
+    register: 'Registrati',
+    description: 'Descrizione',
+    remove: 'Elimina',
+    hide: 'Nascondi',
+    search: 'Cerca',
+    edit: 'Modifica',
+    info: 'Info',
+    confirm: 'Conferma',
+    admin: 'Amministra',
+    users: 'Utenti',
+    events: 'Eventi',
+    places: 'Luoghi',
+    settings: 'Opzioni',
+    actions: 'Azioni',
+    deactivate: 'Disattiva',
+    remove_admin: 'Rimuovi Admin',
+    activate: 'Attiva',
+    save: 'Salva',
+    preview: 'Anteprima',
+    logout: 'Esci',
+    share: 'Esporta',
+    name: 'Nome',
+    associate: 'Associa',
+    edit_event: 'Modifica evento',
+    related: 'Memoria storica',
+    add: 'Aggiungi',
+    logout_ok: 'Uscita correttamente',
+    copy: 'Copia'
+  },
+  
+  login: {
+    description: `Entrando puoi pubblicare nuovi eventi.`,
+    check_email: 'Controlla la tua posta (anche lo spam)',
+    not_registered: 'Non sei registrata?',
+    forgot_password: 'Dimenticato la password?',
+    error: 'Errore: ',
+    insert_email: 'Inserisci la mail',
+    ok: 'Tutto rego'
+  },
+
+  export: {
+    intro: `Contrariamente alle piattaforme del capitalismo, che fanno di tutto per tenere
+      i dati e gli utenti al loro interno, crediamo che le informazioni, come le persone,
+      debbano essere libere. Per questo puoi rimanere aggiornata sugli eventi che vuoi, come meglio credi, senza necessariamente passare da questo sito.`,
+    email_description: `Puoi ricevere via mail gli eventi che ti interessano.`,
+    insert_your_address: 'Indirizzo email',
+    feed_description: `Per seguire gli aggiornamenti da computer o smartphone senza la necessità di aprire periodicamente il sito, il metodo consigliato è quello dei Feed RSS.</p>
+
+      <p>Con i feed rss utilizzi un'apposita applicazione per ricevere aggiornamenti dai siti che più ti interessano.  È un buon metodo per seguire anche molti siti in modo molto rapido, senza necessità di creare un account o altre complicazioni.</p>
+    
+      <li>Se hai Android, ti consigliamo <a href="https://play.google.com/store/apps/details?id=net.frju.flym">Flym</a> o Feeder</li>
+      <li>Per iPhone/iPad puoi usare <a href="https://itunes.apple.com/ua/app/feeds4u/id1038456442?mt=8">Feed4U</a></li>
+      <li>Per il computer fisso/portatile consigliamo  Feedbro, da installare all'interno <a href="https://addons.mozilla.org/en-GB/firefox/addon/feedbroreader/">di Firefox </a>o <a href="https://chrome.google.com/webstore/detail/feedbro/mefgmmbdailogpfhfblcnnjfmnpnmdfa">di Chrome</a> e compatibile con tutti i principali sistemi operativi.</li>
+      <br/>
+      Aggiungendo questo link al tuo lettore di feed, rimarrai aggiornata.`,
+    ical_description: `I computer e gli smartphone sono comunemente attrezzati con un'applicazione per gestire un calendario. A questi programmi solitamente è possibile far importare un calendario remoto.`,
+    list_description: `Se hai un sito web e vuoi mostrare una lista di eventi, puoi usare il seguente codice`
+  },
+
+  register: {
+    description: `I movimenti hanno bisogno di organizzarsi e autofinanziarsi. <br/>Questo è un dono per voi, usatelo solo per eventi non commerciali e ovviamente antifascisti, antisessisti, antirazzisti. 
+      <br/>Prima di poter pubblicare <strong>dobbiamo approvare l'account</strong>, considera che <strong>dietro questo sito ci sono delle persone</strong> di
+      carne e sangue, scrivici quindi due righe per farci capire che eventi vorresti pubblicare.`,
+    error: 'Errore: '
+  },
+
+  event: {
+    anon: 'Anonimo',
+    anon_description: `Puoi inserire un evento senza rigistrarti 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.`,
+    multidate_description: 'tanti giorni',
+    date_description: `Quand'è il gancio?`,
+    dates_description: 'Che giorni?',
+    same_day: 'stesso giorno',
+    what_description: 'Nome evento',
+    description_description: 'Descrizione, dajene di copia/incolla',
+    tag_description: 'Tag...',
+    media_description: 'Puoi aggiungere un volantino',
+    time_start_description: 'Comincia alle',
+    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. `,
+    confirmed: 'Evento confermato'
+  },
+
+  admin: {
+    mastodon_instance: 'Istanza',
+    mastodon_description: 'Puoi associare un account mastodon a questa istanza di gancio, ogni evento verrà pubblicato lì.',
+    place_description: `Nel caso in cui un luogo sia errato o cambi indirizzo, puoi modificarlo. <br/>Considera che tutti gli eventi associati a questo luogo cambieranno indirizzo (anche quelli passati!)`,
+    event_confirm_description: 'Puoi confermare qui gli eventi inseriti da utenti anonimi'
+  },
+
+  auth: {
+    not_confirmed: 'Non abbiamo ancora confermato questa mail...',
+    fail: 'Autenticazione fallita. Sicura la password è giusta? E la mail?'
+  },
+
+  settings: {
+    change_password: 'Cambia password'
+  },
+
+  err: {
+    register_error: 'Errore nella registrazione'
+  }
+}
+
+export default it
\ No newline at end of file
diff --git a/migrations/20190521100417-act_ids_comment_data.js b/migrations/20190521100417-act_ids_comment_data.js
new file mode 100644
index 00000000..817bf390
--- /dev/null
+++ b/migrations/20190521100417-act_ids_comment_data.js
@@ -0,0 +1,30 @@
+'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
new file mode 100644
index 00000000..8a49325b
--- /dev/null
+++ b/migrations/20190522104158-bigint.js
@@ -0,0 +1,27 @@
+'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
new file mode 100644
index 00000000..49457fa7
--- /dev/null
+++ b/migrations/20190527205032-tag_id_weight.js
@@ -0,0 +1,29 @@
+'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
new file mode 100644
index 00000000..c1a3d6d5
--- /dev/null
+++ b/models/index.js
@@ -0,0 +1,37 @@
+'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/package.json b/package.json
index 417becf3..34dfb391 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "sequelize-cli": "^5.4.0",
     "sharp": "^0.22.0",
     "sqlite3": "^4.0.6",
-    "v-calendar": "^1.0.0-beta.10",
+    "v-calendar": "^1.0.0-beta.13",
     "vue-awesome": "^3.5.1",
     "vue-custom-element": "^3.2.6",
     "vue-i18n": "^8.10.0",
diff --git a/pages/add/_edit.vue b/pages/add/_edit.vue
index 37047935..06e9d46b 100644
--- a/pages/add/_edit.vue
+++ b/pages/add/_edit.vue
@@ -26,10 +26,9 @@
             filterable allow-create
             default-first-option
           )
-            el-option(v-for='place in places_name' :label='place' :value='place' :key='place.id')
-          br
-          br
-          div {{$t("common.address")}} {{event.place.name}}
+            el-option(v-for='place in places' :label='place.name' :value='place.name' :key='place.id')
+              span {{place.name}} - {{place.weigth}}
+          div {{$t("common.address")}}
           el-input.mb-3(ref='address' v-model='event.place.address'
             :disabled='places_name.indexOf(event.place.name)>-1'
             @keydown.native.enter='next')
@@ -89,9 +88,9 @@
             :on-change='uploadedFile'
             :multiple='false'
             :file-list="fileList"
-            )
-              i.el-icon-upload
-              div.el-upload__text {{$t('event.media_description')}}
+          )
+            i.el-icon-upload
+            div.el-upload__text {{$t('event.media_description')}}
           el-button.float-right(@click='done' :disabled='!couldProceed') {{edit?$t('common.edit'):$t('common.send')}}
 
 </template>
@@ -153,7 +152,7 @@ export default {
   computed: {
     ...mapState({
       tags: state => state.tags.map(t => t.tag ),
-      places_name: state => state.places.map(p => p.name ),
+      places_name: state => state.places.map(p => p.name ).sort((a, b) => b.weigth-a.weigth),
       places: state => state.places,
       user: state => state.user,
       events: state => state.events
diff --git a/pages/admin.vue b/pages/admin.vue
index fd8997b9..b15bbb01 100644
--- a/pages/admin.vue
+++ b/pages/admin.vue
@@ -27,7 +27,7 @@
         template(slot='label')
           v-icon(name='map-marker-alt')
           span.ml-1 {{$t('common.places')}}
-        p {{$t('admin.place_description')}}
+        p(v-html="$t('admin.place_description')")
         el-form.mb-2(:inline='true' label-width='120px')
           el-form-item(:label="$t('common.name')")
             el-input.mr-1(:placeholder='$t("common.name")' v-model='place.name')
@@ -201,7 +201,7 @@ export default {
         await this.$axios.$get(`/event/confirm/${id}`)
         this.loading = false
         Message({
-          message: this.$t('common.event_confirmed'),
+          message: this.$t('event.confirmed'),
           type: 'success'
         })
         this.events = this.events.filter(e => e.id !== id)
diff --git a/pages/embed/list.vue b/pages/embed/list.vue
index 7ca16b0c..5d224613 100644
--- a/pages/embed/list.vue
+++ b/pages/embed/list.vue
@@ -12,15 +12,18 @@ export default {
   components: { List },
   async asyncData ({ $axios, req, res }) {
     const title = req.query.title || SHARED_CONF.title
-    const show_tags = req.query.showtags
     const tags = req.query.tags
     const places = req.query.places
     const now = new Date()
 
-    // TODO: filter future events based on tags/places/userid
-    const events = await $axios.$get(`/event/${now.getMonth()}/${now.getFullYear()}`)
+    let params = []
+    if (places) params.push(`places=${places}`)
+    if (tags) params.push(`tags=${tags}`)
 
-    return { show_tags, events, title }
+    params = params.length ? `?${params.join('&')}` : ''
+    const events = await $axios.$get(`/export/json${params}`)
+
+    return { events, title }
   },
 }
 </script>
diff --git a/pages/event/_id.vue b/pages/event/_id.vue
index 34483559..21e4916b 100644
--- a/pages/event/_id.vue
+++ b/pages/event/_id.vue
@@ -13,9 +13,9 @@
     h5.text-center {{event.title}}
     div.nextprev
       nuxt-link(v-if='prev' :to='`/event/${prev.id}`')
-        el-button(icon='el-icon-arrow-left' round size='small' type='success' plain)
+        el-button(icon='el-icon-arrow-left' round type='success')
       nuxt-link.float-right(v-if='next' :to='`/event/${next.id}`')
-        el-button(icon='el-icon-arrow-right' round size='small' plain type='success') 
+        el-button(icon='el-icon-arrow-right' round type='success') 
   
     //- image
     img(:src='imgPath' v-if='event.image_path')
diff --git a/pages/export.vue b/pages/export.vue
index 76c1907c..bfeab302 100644
--- a/pages/export.vue
+++ b/pages/export.vue
@@ -1,11 +1,11 @@
 <template lang="pug">
   el-dialog(:title='$t("common.export")' visible :before-close='close')
     p {{$t('export.intro')}}
-    
-    li(v-if='filters.tags.length') {{$t('common.tags')}}:
-      el-tag.ml-1(size='mini' v-for='tag in filters.tags' :key='tag.tag') {{tag}}
-    li(v-if='filters.places.length') {{$t('common.places')}}:
-      el-tag.ml-1(size='mini' v-for='place in filters.places' :key='place.id') {{place}}
+    Search
+    //- li(v-if='filters.tags.length') {{$t('common.tags')}}:
+    //-   el-tag.ml-1(size='mini' v-for='tag in filters.tags' :key='tag.tag') {{tag}}
+    //- li(v-if='filters.places.length') {{$t('common.places')}}:
+    //-   el-tag.ml-1(size='mini' v-for='place in filters.places' :key='place.id') {{place}}
     el-tabs.mt-2(v-model='type')
 
       el-tab-pane.pt-1(label='email' name='email')
@@ -55,13 +55,15 @@ import { mapState, mapGetters } from 'vuex'
 import path from 'path'
 import Calendar from '@/components/Calendar'
 import List from '@/components/List'
+import Search from '@/components/Search'
+
 import {intersection} from 'lodash'
 import { Message } from 'element-ui'
 const { SHARED_CONF } = require('@/config')
 
 export default {
   name: 'Export',
-  components: { List },
+  components: { List, Search },
   data () {
     return {
       type: 'email',
@@ -96,6 +98,11 @@ export default {
       if (this.list.title) {
         params.push(`title=${this.list.title}`)
       }
+
+      if (this.filters.places) {
+        params.push(`places=${this.filters.places}`)
+      }
+
       return `<iframe src="${SHARED_CONF.baseurl}/embed/list?${params.join('&')}"></iframe>`
     },
     link () {
diff --git a/pages/recover/_code.vue b/pages/recover/_code.vue
new file mode 100644
index 00000000..9a595f15
--- /dev/null
+++ b/pages/recover/_code.vue
@@ -0,0 +1,52 @@
+<template lang="pug">
+  el-dialog(visible)
+    template(slot='title')
+      h5 <img src='/favicon.ico'/> {{$t('common.recover_password')}}
+    div(v-if='valid')
+      el-form
+        el-form-item {{$t('common.new_password')}}
+          el-input(type='password', v-model='new_password')
+        el-button(plain type="success" icon='el-icon-send', @click='change_password') {{$t('common.send')}}
+
+    div(v-else) {{$t('recover.not_valid_code')}}
+      
+    
+</template>
+<script>
+import { Message } from 'element-ui'
+
+export default {
+  name: 'Recover',
+  data () {
+    return { new_password: '' }
+  },
+  async asyncData({ params, $axios }) {
+    const code = params.code
+    try {
+      const valid = await $axios.$post('/user/check_recover_code', { recover_code: code })
+      return { valid, code }
+    }
+    catch (e) {
+      return { valid: false }
+    }
+  },
+  methods: {
+    async change_password () {
+      try {
+        const res = await this.$axios.$post('/user/recover_password', { recover_code: this.code, password: this.new_password })
+        Message({
+          type: 'success',
+          message: this.$t('Password changed!')
+        })        
+      } catch(e) {
+        Message({
+          type: 'warning',
+          message: e
+        })
+      }
+    }
+  }
+}
+</script>
+
+
diff --git a/pages/register.vue b/pages/register.vue
index b37d2917..9a57800e 100644
--- a/pages/register.vue
+++ b/pages/register.vue
@@ -41,12 +41,9 @@ export default {
         })
         this.$router.replace("/")
       } catch (e) {
-        console.log('DENTRO CATCH!!!', e)
         const error = e && e.response && e.response.data && e.response.data.errors[0].message || e
-        console.error(error)
-        console.error(e)
         Message({
-          message: this.$t('register.error') + error,
+          message: this.$t('register.error') + this.$t(error),
           type: 'error'
         })
       }
diff --git a/plugins/filters.js b/plugins/filters.js
index 7f109ac1..6661c538 100644
--- a/plugins/filters.js
+++ b/plugins/filters.js
@@ -4,7 +4,7 @@ import 'dayjs/locale/it'
 moment.locale('it')
 
 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'))
@@ -12,7 +12,7 @@ export default (a) => {
   Vue.filter('month', value => moment(value).format('MMM'))
   Vue.filter('event_when', event => {
     if (event.multidate) {
-      return moment(event.start_datetime).format('dddd, D MMMM HH:mm') + ' - ' + moment(event.end_datetime).format('ddd, D MMMM')
+      return moment(event.start_datetime).format('ddd, D MMMM HH:mm') + ' - ' + moment(event.end_datetime).format('ddd, D MMMM')
     } 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')
diff --git a/plugins/initialize.js b/plugins/initialize.js
new file mode 100644
index 00000000..1545d1b2
--- /dev/null
+++ b/plugins/initialize.js
@@ -0,0 +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 })
+}
diff --git a/server/api/auth.js b/server/api/auth.js
index ccffb034..21dcb8a5 100644
--- a/server/api/auth.js
+++ b/server/api/auth.js
@@ -11,6 +11,7 @@ const Auth = {
     next()
   },
   async isAuth(req, res, next) {
+    console.error('ma sono dentro auth ?!?!', req.user)
     if (!req.user) {
       return res
         .status(403)
diff --git a/server/api/controller/bot.js b/server/api/controller/bot.js
index bc509a03..ff21e12f 100644
--- a/server/api/controller/bot.js
+++ b/server/api/controller/bot.js
@@ -12,6 +12,7 @@ moment.locale('it')
 const botController = {
   bot: null,
   async initialize () {
+    console.error('dentro bot inizialiteds')
     const settings = await settingsController.settings()
     if (!settings.mastodon_auth || !settings.mastodon_auth.access_token) return
     const mastodon_auth = settings.mastodon_auth
diff --git a/server/api/controller/event.js b/server/api/controller/event.js
index aafc38b6..2d11824d 100644
--- a/server/api/controller/event.js
+++ b/server/api/controller/event.js
@@ -21,24 +21,22 @@ const eventController = {
 
   async getMeta(req, res) {
     const places = await Place.findAll({
-      group: ['place.id'],
-      order: [[Sequelize.fn("COUNT", Sequelize.col('events.id')), 'DESC']],
+      order: [[Sequelize.literal('weigth'), 'DESC']],
       attributes: {
-        include: [[Sequelize.fn("COUNT", Sequelize.col('events.id')), 'eventsCount']],
-        exclude: ['createdAt', 'updatedAt']
+        include: [[Sequelize.fn('count', Sequelize.col('events.placeId')) ,'weigth']], // <---- Here you will get the total count of user
+        exclude: ['weigth', 'createdAt', 'updatedAt']
       },
-      include: { model: Event, attributes: [] }
+      include: [{ model: Event, attributes: [] }],
+      group: ['place.id']
     })
 
     const tags = await Tag.findAll({
-      group: ['tag'],
-      order: [[Sequelize.fn("COUNT", Sequelize.col('events.id')), 'DESC']],
-      includeIgnoreAttributes:false,
+      order: [['weigth' , 'DESC']],
+      includeIgnoreAttributes: false,
       attributes: {
-        include: [[Sequelize.fn("COUNT", Sequelize.col('events.id')), 'eventsCount']],
         exclude: ['createdAt', 'updatedAt']
-      },
-      include: { model: Event, attributes: [] }})
+      }
+    })
 
     res.json({ tags, places })
   },
@@ -92,7 +90,7 @@ const eventController = {
         Comment,
         { model: Place, attributes: ['name', 'address'] }
       ] ,
-      order: [ [Comment, 'id', 'DESC'] ]
+      order: [ [Comment, 'id', 'DESC'], [Tag, 'weigth', 'DESC'] ]
     })
     res.json(event)
   },
@@ -177,15 +175,17 @@ const eventController = {
           { start_datetime: { [Op.lte]: end } }
         ]
       },
-      order: [['start_datetime', 'ASC']],
+      order: [
+        ['start_datetime', 'ASC'], 
+        [Tag, 'weigth', 'DESC']
+      ],
       include: [
-        { model: User, required: false },
-        Comment,
-        Tag,
-        { model: Place, required: false }
+        // { model: User, required: false },
+        // { type: Comment, required: false, attributes: ['']
+        { model: Tag, required: false, attributes: ['tag', 'weigth','color'] },
+        { model: Place, required: false, attributes: ['id', 'name', 'address'] }
       ]
     })
-    // console.log(events)
     res.json(events)
   }
 
diff --git a/server/api/controller/export.js b/server/api/controller/export.js
index ab74a4f9..56f31cff 100644
--- a/server/api/controller/export.js
+++ b/server/api/controller/export.js
@@ -8,6 +8,7 @@ const exportController = {
 
   async export (req, res) {
     console.log('type ', req.params.type)
+    console.error(req)
     const type = req.params.type
     const tags = req.query.tags
     const places = req.query.places
@@ -18,14 +19,20 @@ const exportController = {
       whereTag.tag = tags.split(',')
     }
     if (places) {
-      wherePlace.name = places.split(',')
+      wherePlace.id = places.split(',')
     }
+    console.error(places)
     const events = await Event.findAll({
-      where: { is_visible: true, start_datetime: { [Op.gte]: yesterday } },
-      include: [Comment, {
-        model: Tag,
-        where: whereTag
-      }, { model: Place, where: wherePlace } ]
+      order: ['start_datetime'],
+      where: { 
+        is_visible: true, 
+        start_datetime: { [Op.gte]: yesterday },
+        placeId: places.split(',')
+      },
+      attributes: {
+        exclude: ['createdAt', 'updatedAt']
+      },
+      include: [{model: Place, attributes: ['name', 'id', 'address', 'weigth']}]
     })
     switch (type) {
       case 'feed':
diff --git a/server/api/controller/user.js b/server/api/controller/user.js
index 00bf0728..6fc85777 100644
--- a/server/api/controller/user.js
+++ b/server/api/controller/user.js
@@ -74,17 +74,14 @@ const userController = {
   async addEvent(req, res) {
     const body = req.body
 
-    // remove description tag and create anchor tags
-    const description = body.description
-      .replace(/(<([^>]+)>)/ig, '')
-      .replace(/(https?:\/\/[^\s]+)/g, '<a href="$1">$1</a>')
-
     const eventDetails = {
       title: body.title,
-      description,
+      description: body.description.replace(/(<([^>]+)>)/ig, ''),
       multidate: body.multidate,
       start_datetime: body.start_datetime,
       end_datetime: body.end_datetime,
+
+      // publish this event if authenticated
       is_visible: !!req.user
     }
 
@@ -94,7 +91,7 @@ const userController = {
 
     let event = await Event.create(eventDetails)
 
-    // create place
+    // create place if needs to
     let place
     try {
       place = await Place.findOrCreate({ where: { name: body.place_name },
@@ -140,7 +137,7 @@ const userController = {
 
     body.description = body.description
       .replace(/(<([^>]+)>)/ig, '') // remove all tags from description
-      .replace(/(https?:\/\/[^\s]+)/g, '<a href="$1">$1</a>') // add links
+      // .replace(/(https?:\/\/[^\s]+)/g, '<a href="$1">$1</a>') // add links
 
     await event.update(body)
     let place
diff --git a/server/api/models/event.js b/server/api/models/event.js
index d5185c12..dab0f5e0 100644
--- a/server/api/models/event.js
+++ b/server/api/models/event.js
@@ -19,7 +19,8 @@ const Event = db.define('event', {
 })
 
 const Tag = db.define('tag', {
-  tag: { type: Sequelize.STRING, index: true, unique: true, },
+  tag: { type: Sequelize.STRING, index: true, unique: true, primaryKey: true },
+  weigth: { type: Sequelize.INTEGER, defaultValue: 0 },
   color: { type: Sequelize.STRING }
 })
 
@@ -43,6 +44,7 @@ const Notification = db.define('notification', {
 
 const Place = db.define('place', {
   name: { type: Sequelize.STRING, unique: true, index: true },
+  weigth: { type: Sequelize.INTEGER, defaultValue: 0 },
   address: { type: Sequelize.STRING }
 })
 
diff --git a/server/api/models/user.js b/server/api/models/user.js
index e6a13ff3..697acb7d 100644
--- a/server/api/models/user.js
+++ b/server/api/models/user.js
@@ -5,7 +5,7 @@ const db = require('../db')
 const User = db.define('user', {
   email: {
     type: Sequelize.STRING,
-    unique: { msg: 'Email already exists' },
+    unique: { msg: 'err.register_error' },
     index: true,
     allowNull: false
   },
diff --git a/server/emails/confirm/html.pug b/server/emails/confirm/html.pug
new file mode 100644
index 00000000..e0f26aa1
--- /dev/null
+++ b/server/emails/confirm/html.pug
@@ -0,0 +1,4 @@
+p= t('confirm_email')
+
+hr
+small #{config.baseurl}
diff --git a/server/emails/event/html.pug b/server/emails/event/html.pug
new file mode 100644
index 00000000..2fefccc6
--- /dev/null
+++ b/server/emails/event/html.pug
@@ -0,0 +1,18 @@
+h3 #{event.title}
+p Dove: #{event.place.name} - #{event.place.address}
+p Quando: #{datetime(event.start_datetime)}
+br
+if event.image_path
+  <img style="width: 100%" src="#{config.apiurl}/uploads/#{event.image_path}" />
+p #{event.description}
+
+each tag in event.tags
+  span ##{tag.tag} 
+br
+<a href="#{config.baseurl}/event/#{event.id}">#{config.baseurl}/event/#{event.id}</a>
+hr
+if to_confirm
+  p Puoi confermare questo evento <a href="#{config.baseurl}/admin/confirm/#{event.id}">qui</a>
+else
+  p Puoi eliminare queste notifiche <a href="#{config.baseurl}/del_notification/#{notification.remove_code}">qui</a>
+<a href="#{config.baseurl}">#{config.title} - #{config.description}</a>
diff --git a/server/emails/event/subject.pug b/server/emails/event/subject.pug
new file mode 100644
index 00000000..fd159324
--- /dev/null
+++ b/server/emails/event/subject.pug
@@ -0,0 +1 @@
+= `[${config.title}] ${event.title} @${event.place.name} ${datetime(event.start_datetime)}`
diff --git a/server/emails/mail.css b/server/emails/mail.css
new file mode 100644
index 00000000..6dd4fb48
--- /dev/null
+++ b/server/emails/mail.css
@@ -0,0 +1,8 @@
+table {
+  width: 100%;
+  border-collapse: collapse;
+}
+
+table, th, td {
+  border: 1px solid #555;
+}
diff --git a/server/emails/recover/html.pug b/server/emails/recover/html.pug
new file mode 100644
index 00000000..fd8cb11a
--- /dev/null
+++ b/server/emails/recover/html.pug
@@ -0,0 +1,3 @@
+p= t('recover_email')
+
+<a href="#{config.baseurl}/recover/#{user.recover_code}">#{t('press here')}</a>
\ No newline at end of file
diff --git a/server/emails/recover/subject.pug b/server/emails/recover/subject.pug
new file mode 100644
index 00000000..6d0067a6
--- /dev/null
+++ b/server/emails/recover/subject.pug
@@ -0,0 +1 @@
+= `[Gancio] Richiesta password recovery`
diff --git a/server/emails/register/html.pug b/server/emails/register/html.pug
new file mode 100644
index 00000000..8cdb9def
--- /dev/null
+++ b/server/emails/register/html.pug
@@ -0,0 +1,6 @@
+p= t('registration_email')
+
+hr
+small #{config.title} / #{config.description}
+br
+small #{config.baseurl}
\ No newline at end of file
diff --git a/server/emails/register/subject.pug b/server/emails/register/subject.pug
new file mode 100644
index 00000000..7d19cd3e
--- /dev/null
+++ b/server/emails/register/subject.pug
@@ -0,0 +1 @@
+= `[Gancio] Richiesta registrazione`
diff --git a/server/index.js b/server/index.js
index 9033002f..4ffd53f5 100644
--- a/server/index.js
+++ b/server/index.js
@@ -7,11 +7,14 @@ 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']
 }
 
+
 // Import and Set Nuxt.js options
 const config = require('../nuxt.config.js')
 config.dev = !(process.env.NODE_ENV === 'production')
@@ -47,3 +50,4 @@ async function start() {
   })
 }
 start()
+notifier.startLoop(20)
diff --git a/server/cron.js b/server/notifier.js
similarity index 83%
rename from server/cron.js
rename to server/notifier.js
index 08a6c462..a92eff40 100644
--- a/server/cron.js
+++ b/server/notifier.js
@@ -21,6 +21,7 @@ async function sendNotification (notification, event, eventNotification) {
       if (settings.mastodon_auth.instance && settings.mastodon_auth.access_token) {
         const b = bot.post(settings.mastodon_auth, event).then(b => {
           event.activitypub_id = b.data.id
+          // event.activitypub_ids.push(b.data.id)
           return event.save()
         })
         promises.push(b)
@@ -29,7 +30,8 @@ async function sendNotification (notification, event, eventNotification) {
   return Promise.all(promises)
 }
 
-async function loop () {
+async function notify() {
+  console.error('dentro il loop di notify')
   settings = await settingsController.settings()
   // get all event notification in queue
   const eventNotifications = await EventNotification.findAll({ where: { status: 'new' } })
@@ -51,5 +53,14 @@ async function loop () {
   return Promise.all(promises)
 }
 
-setInterval(loop, 260000)
-loop()
+let interval
+function startLoop(seconds) {
+  console.error('starting notifier loop')
+  interval = setInterval(notify, seconds*1000)
+}
+
+function stopLoop() {
+  stopInterval(interval)
+}
+
+module.exports = { startLoop, stopLoop }
\ No newline at end of file
diff --git a/static/favicon.ico b/static/favicon.ico
index 382fecbbf96d6e1e614e0e2cc8b73e355bd946cc..36b55d4a8ffc0352aa0c8daf717533f6b1b6c4aa 100644
GIT binary patch
literal 4286
zcmb`KT}WhQ7{|{tXpJAE((XDc=pwc(LSi_2lct0S?uBS#Z5K;{N;h?3c@c`S3sJIW
zP|#+(En#d}(p8jQc+rHpt((%KOQ2vZxw@p}M~zy|=+pmy=Da)SoH>qX2cPBVd*(UM
z`~2VYey^q-!@pCfH2&4T$kw!znx>rraA|db{v)sq<aizoft%nD@UH=%>H7#g2N-))
z=0~E-AOyrEjQtoCgJkUyRJ;fd)y>Grkd%}Zr?#<w-UiI|Fm?jLKLCfE$Hn9E$nfy6
z%+Jru?(VKATU}k1@$qr#?d_HF@^W+C8_30ebYo=*S^}o}$MD<?z5)02Z&jL!%BiU-
zX=-Xxd45OECk|-<+sHUo2W1Vo1;pUKuD`jtDeLR&I{W+kiJBo}V`Jj?`%zz81_i*$
z9)<HKz&OBfz5w<CwZq^#I15xvtV~Z&m;C&EsjI7#{{DUmhr^aOt*op_QBe`=ax9$Y
z!=+eWYJUdQH{ZiE`yr-x*faaaZh=5R<#-46&GtBc{0EHpuc1`hKjQg>s^_Zodc6{f
zMC|fXT3V{=b6uF%<|i?2#;~uczW^Qss$H7ihxPUKQc+PM+1c5acPg%?rY26Cj^g5C
zbNm&=)3{fe*7#S5p*Gv_puKv%!NEb<+uO6`-r3oarKKgAnVHeo-o(U&Y;A2>V$_ek
zygWS*^jK1p+UJbl@SO%~zI|$r6`#+i(j;AGWo21%LbnaD9}NE+DAl;vT4F0JE0fk$
z6;o4FEjgh(1a8IjIoGKF7qIT9ZEbBTO<XxUJ1f=I)xvqv($XSxb8~SqbU5tMT<>c!
z{VhZPCQ8*O(XykX!!akFqobpi_+T*T7@L-sW{HD_Iz!<<2~^*IZjY0$t}e%%bPfy*
zSmGBJ793-9a&jzj(EkT;EyB;Wq4bCBanje<=a`dD?ll~P$;n9>85xONBdTISL4iFl
z^^N{NW75BBkCUFB9+f8PvZSQMo|pY^%s;M8_5I)4;}Z72+Xj`DmD%%h{#}jsKi5XY
zXv44eIB9QhcPn#XTvb(-JumM_FGTe@2ksd9dnkRD*oKCN1M|9l!8IDw($^L5lRmH=
z^<OshISywnv4w?&2hJ<E`lj=bxw-#l0@^hI-_wBF+=ICX@Eq3Lsh8c|-4Y6g63T6C
zY{>HRvMeqx>if|2^t7z4t;zQGwq#~zn)C5atL!u$!co1S5%V2jJ6<uz>(AUn1A$s;
zY;2U~=4Rnp$8$9|H&?$GB9Em`Yip~%KXrC?n*Dzx&acFc^4)0Nrx3?`-j{&=@Bugu
z%z1eid=KQ>{N|X1&%9ULjrXtH06AX;?*raL?t>7x4qgP6fP2-;;7{-t;JE4cJCq4^
z`F<LBfs^qbv<eXSEchP04&DUUz#`zd90bp;U%=PkL(l`x1D@-8yLhj*_d8q`dlJ8l
zHh59*CBQq$Z-DF4uDuT5Jh%a<dj(ts?4M^qK6s$byS*D@Kg<DD*C@Fjc!qG?<L(kh
zjJ=NjoBLdz8(~un$B1(h>%uW-B0cqvciKyUb1PZn+T{LV>`|`T!dTvE*^ftM+$XtL
z^St1h#W}+7BYdWhce!&w?Q3{UY!dY76Dp!<wK$B6HZibw@&A*crg_K(Y)V9XNK^HK
RMxMLK$=uYS76wSD{XcClj|Bh#

literal 1150
zcmZQzU<5(|0R|wcz>vYhz#zuJz@P!dKp~(AL>x#lFaYI-8)(_-RMWh}@jndLuXgyK
z;A{Fn&J#OMi823Q&|nS5g-td!^Y<rkwCr%a57Q5#^Qx?{>-RSMpI2!G(|^BVz5@p+
zJll3Uhal^3+~)8<DcB6djI<OBnBM;d&9))PaRGG0eq=LBdTmkkC-|HF&##5LyV2$V
zvR)9oV~3-D^A4xK$Y!L*nZwP<%CUs_xxxBxQIm~6x_%J9b*JMDWc}3(?f=Jnnf^}-
zGlRRku)$^~HoYLRp8dWe%{v|6Bb$+(Yxys?1ZsDq&4<c1TTxv4LE<etoC=WjH*a)Y
zSkP$w0u*P3jkbmO^n&E}?{8pf+39#4VusVl?wxL8g^kw9xkXkpX3k7wC8QrD-@L=w
z1EjxohjTHA-|)YIskGI>0K_I1H1Blkn|X#f`-nA@7V7^0XJCNg21cM?f%pJ31V3PB
ZU;yC{{0s~~<bn7;1H)gSdJu-`0RTsU0uulL

diff --git a/static/gancio.png b/static/gancio.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef88fd64a93cf8b311b5fb799c86ecd96aeca587
GIT binary patch
literal 4711
zcmV-t5}56YP)<h;3K|Lk000e1NJLTq005W(005i_1^@s6gHvKR00004b3#c}2nYxW
zd<bNS00009a7bBm000&K000&K0bt2+3;+NC8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H15#&ikK~#90?VWp&9L0UdKeIaNeA0o0Ks;;<BpFLQBm^XJaEyaY
zOt1?O*f<G(;R@J1OxYlcGT24g*dpXrF~&I9P)RukKXC=H!4+a4IAEoMEfunbK+yxe
zb*J}9C*4W6y8Gpi-;8$eZuWL|rf0hMu0K`HuGrb%^vr&*yXV)x{&m18L0|%K8ZZku
z1vmjXDSWLiC7>M`AAYq2Ob*{41p0t(;0UlE=m)xhL%?oePxu;@UDf{%pf|_MY&rtl
z6=)QJHefDr9&j#j1}dtz1LG`KEuse%-OjK?B8-H%W5~aE1uEuIiSq&zI2l+FmJ5M7
zK#RpH<v|xJyy_Nl7cpW4b_9BSQ{bGyM7yj%0j>rv1<tfvBPS^{SajQft-uywQ~2-A
zKxY7AtCHZ5z(iZ8Yk&`<V<=B{%Ba}302_gIVOa~T3!pRa3Ro4Gz_Gw5ft%2Am8Vz^
zQYE<XbtUk60DDcGz>2`aan)VG_2?6w$33<YiY<JNgxApcuTX&rOatx&ZU!bM{8|sN
z99RadN1x210q{=r39KzVwjDSg?P6!6-R(R>)%PfyfTh4=0X$Xj;6k3pM9=ei;H%Vc
zvGxJa0MDVKdLvL@RK0VI17?P02KsO?GkvW+RqRB^aGQWtsKAya`C{%Zn7|(a52Jpo
zTI>XV20Q`05U8_rB%AHPpN2N)qQ0;*fmRcB9%Gb&?WlmFvZ?C*hCq9fROBYGu+{n+
z@C9l+K$idy0#5{bp|xzap{|RIf%l=J9c{ia(+r@(*;Z9LP<KWL`efOO`qgrCW#l3-
zfwuxbLR*<Q{tLJ#fR{(GF%`H9_y{U2-#S&;L&fja8S}ao*zUp%fpLL}it2H69&jjc
z0E+_n&l=wyhdNiU2d<zpUpST+pwdM}ubad7n}Cghx)+)PqXHB4zW;#XtxX>~!2id%
zt}yh6eFl9HIMrmG>d*rm1`eS0+K2wYUBDEy8$Je|NS}mu)o(F$?j7iWc}-YWhh=S`
zbs7~I6PT#8^ji!cZ><DA7QpXgzB2{51Na;&GSlospLo_XxE0t8Y^nD!5r@Dnz&A)f
z2J8Y}L+?ZMx*||lizf*Jiv%R5{8(b#5(2FPUl7<`<9lgJzrZU34+wlhV2+sm1DYi8
zXu`T|61ZJ7!o!mVfolZ@Vs7%iaX+xY2L)Ce64e2Le;4>`ffIAQ#<K)gCaBLgfg5CO
zjvdV-aJfJ^=0@KhbL<p>#|*Vp&kB54%#DXey2if}=&n<zZh^1Fwbq`L2%IBuFy?08
z9dqnO0-G}mt0Qa`XB2dO;|1=oQ>U`Pw?*exJ*E(tEU+f#hCdW@?4la2T+*^Z;Il=v
zR#kPLBJg6JdOaaJgWxfVKoH*Cp*Q@0L?7p)<5~p1n?YD>1+J5V$1?)c1y+nuuO$NS
zDY8yu3W3kZ-1PlY<-ZbW6L>nMuyzUDS}oQBuWgpp?#fq*MrU~PLSUxoliSdne{<C_
zZxMJdg|H3_{DY`(%*M5yDDmC?R)L#~Zb`=+Vb}P}m>*!dXdHbsF#cHzaV-~^Z}HlW
z5m+{)POAkzEq)HP7z935LmZb^9rMpA#C5-o?y#!PC4r}^>a$GXFQPvhPXP$D3v|Ya
zV@1_5H#8`$KGFF{tBCrq`UQR=aEa~uj5d<ar`<t(bi{W6M8lH5*}!?rz|{df-N1K@
zBN|rS2Fwn0(St{a1n)-!InP4F+*{Gr?{Sm;tAT6LpwY$=I9cL7*@r~^VH3hJRMM8K
zEE;v;ag#d%X|Sv(ZFst<r#en3zX(77a)VvtqKr4dlP>`p==p0jbSbIGRuba@7%|#F
zbal>p;-92$0G>r-nv$*%`e6VcPk5|N+R&)nX;kJHr=a(168caQ#gav@-RN4vs929C
zHNZ^ZN_1?x1^8d|TJI))#r-qDLa2mb*Av)%z!z(Ld^)fg_-Mk)ZUD{+^oMYP3FtWE
z{IJYM|DfKA8DCtr;P#+#@KHjP==~1DxOkc?E6*o^M{9g`2k=kPKWYy0MI$+Hs_}6r
z8tZgT!U_p+ode=J10DZeiDu@>(|LMKSdvEQ9-tz&o#FfK;rs1F-tRG8*#?<2!e{pZ
z&jY`M5n3>T+kpFPe7qT5t2iTJh5j{wPbWOqG*f{a(XRPyOLZ_!A1by3=pSuY_!|AY
z`u`n9BYPwI(Y$97<?wq+7!O<o+{?%wh~EGgP}NlqL*VrkPSd!uPwa%Vv;kj1Z*rqg
zMZRP&SJnJw1THirE)ngMi)KFh@L~HVkLB|7n!k=@3$v*%9a6~~Q4|-UU4ZQyJl4x0
zbPPHe(P^Q2A;L+^t;0@`FZ0mxgzcN_i<ZmcCUmdHOl)}v@Q49BNohgXWKJsZoSu=H
z8z-=j7&89%1!r9TI6hUAYs?wsrVwqpc9K2*y%U&Ku)tmd-do`LJoR~bXbW~3W)@d`
zy<l-oMEx!vx0pIqU?!p*2GFrkk<7)1G`q-@qXHAnDPbbu?&UypQ5DJTg3sqk#^mZ2
zY(8ctd0#MKqfthh8}ry>e6_$97&2Njsa%fu7R*tq1y(B?VI!2$iO!<&0&|lfT5eWC
zciPCxsw@d(QxX90Ecl$BWJuJ4%|Y|aXXP~mHX7w*y!YN!dLx0Eij!JV{}AK&%r@@Q
zGa3XIx17%721f;EYRfzuU8EP7yBO^vyU~=}MdJnLE<GjDFc%X~VXs-*{L%}|U3yFC
z>L3#tWNdVgkYn;+PiA^cz}pNNTWiQpqj-V2OSyzDG&R9`Lv|YFI7{dC)TeJW2yFPm
z0*@<{OPJe$-Il<7ZhChy)`E2hu-ky0H24<GUCJfk1OtX_wO-)oAzh|i!b}(QrU4si
zn26u`)@8~i%(MU-4A@A6?;hR8SPRx+z(yMU0N-tlwP5KIz-Fhg{fj)QXnKM9@t50_
zOC-;)Iuf>A6kcF%Q!Zg<+u<DsY^1>p%x%ggG^Juz_8PE}1}`wTIa0z*43`O!roju$
zZOSDymqb=fbhBv~XX(72Wb~O5m@Rz56SwJV_7==Wh_)v=`%0L}<7KO>I&A5@E-(PB
z0ltg9F>pQhwx9|7vo2n32X<wzPs8+CIHzf%jS;$lgJJ1LH%~Z-refHIx`L{=p4mtx
zO~a|cpA}l`WOTJKco&GY9EY6=?`CVk?gD;=-t+xoNxI9%NIZ|j0_!qh$jV0UG+zt0
z9C#%MyEZZ!)k6pe`6dKrYvDz+wP2^^WOsE=cC&DR(9vqDi?l(rwP1M(Y%4lmbBTSR
zdBIFfR8KQtBMrU<Qv`eKQfqMlRA8G87)!b*qG_5<U^8;G?V7-PK?P<aVaW^wHqzj`
z$O@e~+D^l$5ZED_%bR}+`Au)x3i_;tS%Hb2>7stjJOvlUI5gQz9=Im39)MDygR!i8
zK(}FUpl@RaAqz8dvTG~ovld5NFfg;O@eBht($H)I%WE9wn!pZ0MPR=(VDMZ6Hqy{+
z0-KSO-Tn0sDU?Ai*sBH%&NpBq4b3L7yj(ga<}^)m1S$esZor@ySTgeJBD-_4o0fhU
z+(l*$Je(_bB1~;9nM=!zob0;Rf(<|@u<%JTt0%Y>I|Kb@Yr&?IPk?3*ZiT-OYQX@O
z7%=)C12!7PHUCdN#$zt&Up3QlYwE1hf`vS1!07u7*l3hyYr&xLZgM;tv2qeH3*DRi
zX5icC_KAB@hk2X1DrTl12Cpl84prUIZI&Bhfk04jzWhxEp34;f#_$=4Rw`*6O2A~a
zD?PTjY8hp)zyjDMI@muigV7U#vw)S^>edk3P^VrqW!ia%?FtmYur3nJbdw7V*l2_S
z>?OeS)Fy!80{f)_!+&nTMx)qD;pwSO>F9r|SVHz4YcCZYKNN`<n0t(aAp#3@Ec0SU
z!>zy-8ErI*7npm*wqO81HDLTN4cKS|FEID0DX=FALoG6JsT8}?$P3IphIf$wfrfo#
z9qdm47G|{32<vFB(CM*2%@z#cdj?MMIRiG5(t~@89>zNHEm+9U$^L`=ffPG8xvIc(
zdFoSJV1WjUec!-IZZlvbDPCZ1(E=mSJ3dVI@Q)8kaZB1vgnfI=(F!97EYSF{XEL5-
z9B^w!8%cSop!0Z=F&^qiPTX(cM4uH6G0B@%_-@iAMsC3X0!@~-EaQnL0QY3Hkpuz0
zTEKZc$!JY<l)#k&lCca3T%7X-MSKk%JBlw>OR~rufk5C@10q``#l>tbL>GhDzR6>`
z{5K@bCn0bZI)#*#2ZG{U7pDO~0^VKF`Lc2VO(eGi4T0WYRl3lGZUg8P++^Tgz&td_
z(?wnZE=ZiPM0EP-l8h%6;K~4=&S)no<A7U$#S{~I+>fpiIDm?xJAB`Ril!@k-HR?(
ziLyp_kUmUmA{rrkKDs92W4N(F#jC*ijR<T$I^fT`<Z1^nKPYx;=Q!Xd;4{F?jJA5v
zoT#hOJoW3)1s5C8WPat0_OtQ<)V*YTo1K-w+=fyv348~*(ZI=<02c>#63Cr{hIOBh
z{^g$x93OtxN2NRJ0=5I|(P)kJVcCMV#4hs)`p0CGwZJ<Y`i8(%f!ziM{37sRKG)?z
z|9ET<^0%a_xxgYr0uzDjQdPo}gf-X|Sh}2Z0^>zp4kiTFCva)1ig@br0CokIewDfC
z0^0#YB0DH>LF&qQYH<yA1tw&9niY7+kibNsQ($)L%6Q_Kg?)jgUtK0JNno8}k)4&g
zLY|=ns1MGjz_KNI5x7X;h(VEU6F4(dr99RA9=ifNJxih!0-bMKoW;fvP61vNea!Y`
zXPxEqPs}8+kj20Y2JA$f1iU10nL(Rl72Dg(Ov)^<Kqp{7ftfvzA|?S(30!Z`=2*mb
z3zl7A0O7piLd<R{*8=>Dz{8?Ji=M`@y&$>Wh`;~>%~X9II=C~*4Z!n~eP8jhi0$;E
z#~BkCKmd;ex0|#X@?Kz>6rX#n*)g%%Y!;^GVpZU847x6=%YeWGzROI^@z`}!+?&f)
ziH2D}n3KpvV5z{ITq-}hXu<CKgokpyI)Qt06j_hJJ>o|6rpws$=Km!3tCRe?%c%TT
zG>Fg>PcQZaW+EkPeFSb1vr|e#OP|1fQhe%8*J;C^xCB_5|0RY9TrSX^b8EI+;7bB0
z6n0_max6N_VpCwn`r!o55m=M6$VA|fz)u7|AY*Tgb~ZY=-j7{z3GjT**E$@5$pTLn
zAhM|J5%`{Hrl0o0FF1c%fD3`YL%SqbR<-{CTU*<Rx-o7O=q*raB5+vXSEAkMJS!KU
zjfub?qI0z0M59@3$9xSfN2pp{-O#c%(})HbK8Bs}oM!|0poQ~BOhjAMW6_6`XvKDQ
znS$<+8<lBRYMPwAXsGtlr^lAs$L3D}uZu42{~~Y~?(8?T7+odZf$oLWOJ(VP^%DM}
zn^v^|$DrfBb}AcOwNu$KE&6P<u@v|y_Cti?5tt?Lbb;OFe~eI_N3h@3G)oykS1`p+
z-x;0k&O!ih2D(GYLUaYS$9;C7fuXljW0k%$0*eR}qnwQ<lgqjxgeO0q0_HMuPvD-w
z00QU@G%Mn4^l8bZt%Aoo9l)o650N0=%t?Vo1h6^K=64P{E;?elN@JM;^fx#Icr@vk
zoEBI_02>3%>N5{@YxG;L(pY0D`m}!|Izy0{rVv;}0ILGH7WJDwN%lPco{`yzit3Mn
z-&n3o@d&&_G{W_ucT*TGyMQ}Mnkjm;BQQ<iZh_5SV3|rM@Fmn)>=}wcN#Okgk4ydd
zGcT}8S&KeQ*_oVfMg(RGd|6<%7g%f=K)26cNRy4lokQT=0^btY;swSQG_>dRM(?Ai
z4x(W~?-KZ1Q3q}<Mw`I)qw!gn;9Dyv7!3m3jygoIz~a-O)o>k$`7OGNys<RgcG-`n
zhyOL&{l99rI*QeR!zSSEXk6HWuoST^VNy1r+qEnKUItd+;0%WsSYsRyoClm+RpyXy
zPtXVaAMggctM9U~?8@<+#_$5mPAf1yET^KIa7_o^hDNYXKtrD=pn1>QQ9*X0;yD<W
p-Dr-rt!NbOCR9{!(!`Ve{|`y(^g*eaeu@A9002ovPDHLkV1iBpt^fc4

literal 0
HcmV?d00001

diff --git a/store/index.js b/store/index.js
index 9ac0dbf2..8077d43b 100644
--- a/store/index.js
+++ b/store/index.js
@@ -20,9 +20,9 @@ export const state = () => ({
 
 export const getters = {
   token: state => state.token,
+
   // filter current + future events only
   // plus, filter matches search tag/place
-
   filteredEvents: (state) => {
 
     let events = state.events
@@ -50,7 +50,6 @@ export const getters = {
     let lastDay = null
     events = map(events, e => {
       const currentDay = moment(e.start_datetime).date()
-      console.log(currentDay)
       e.newDay = (!lastDay || lastDay!==currentDay) && currentDay
       lastDay = currentDay
       return e
@@ -88,22 +87,9 @@ export const mutations = {
     state.tags = tags
     state.places = places
   },
-  // search
-  addSearchTag(state, tag) {
-    if (!state.filters.tags.find(t => t === tag.tag)) {
-      state.filters.tags.push(tag.tag)
-    } else {
-      state.filters.tags = state.filters.tags.filter(t => t !== tag.tag)
-    }
-  },
   setSearchTags(state, tags) {
     state.filters.tags = tags
   },
-  addSearchPlace(state, place) {
-    if (state.filters.places.find(p => p.name === place.name)) {
-      state.filters.places.push(place)
-    }
-  },
   setSearchPlaces(state, places) {
     state.filters.places = places
   },
@@ -122,26 +108,23 @@ export const actions = {
     commit('update', { tags, places })
   },
   async addEvent({ commit }, formData) {
-    const event = await this.$axios.$post('/user/event', formData) // .addEvent(formData)
-    commit('addEvent', event)
+    const event = await this.$axios.$post('/user/event', formData)
+    if (event.user) {
+      commit('addEvent', event)
+    }
   },
   async updateEvent({ commit }, formData) {
     const event = await this.$axios.$put('/user/event', formData)
-    commit('updateEvent', event)
+    if (event.user) {
+      commit('updateEvent', event)
+    }
   },
   delEvent({ commit }, eventId) {
     commit('delEvent', eventId)
   },
-  // search
-  addSearchTag({ commit }, tag) {
-    commit('addSearchTag', tag)
-  },
   setSearchTags({ commit }, tags) {
     commit('setSearchTags', tags)
   },
-  addSearchPlace({ commit }, place) {
-    commit('addSearchPlace', place)
-  },
   setSearchPlaces({ commit }, places) {
     commit('setSearchPlaces', places)
   },
diff --git a/widgets/examples/index.html b/widgets/examples/index.html
deleted file mode 100644
index e31c88d8..00000000
--- a/widgets/examples/index.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <title>Gancio Widget Example</title>
-    <script src="https://unpkg.com/vue"></script>
-    <script src='dist/gancio-widget.min.js'></script>
-    <link rel="stylesheet" href="../list/style.css">
-</head>
-<body>
-
-    <gancio-widget minimal></gancio-widget>
-    
-</body>
-</html>
\ No newline at end of file
diff --git a/widgets/list/index.html b/widgets/list/index.html
deleted file mode 100644
index e69de29b..00000000
diff --git a/widgets/list/index.js b/widgets/list/index.js
deleted file mode 100644
index 0b47f6d7..00000000
--- a/widgets/list/index.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import Vue from 'vue'
-import vueCustomElement from 'vue-custom-element'
-import App from '../../components/List'
-// import router from './router'
-// import store from '../../store'
-
-Vue.use(vueCustomElement)
-
-// App.store = store
-// App.router = router
-Vue.customElement('gancio-widget', App)
-export default App
diff --git a/widgets/list/style.css b/widgets/list/style.css
deleted file mode 100644
index 87eb01f5..00000000
--- a/widgets/list/style.css
+++ /dev/null
@@ -1,3 +0,0 @@
-#gancio-widget {
-    border: 1px solid black;
-}
\ No newline at end of file

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 11/14] .

---
 .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)
   }
 }

From 74555531297dce710ab6237a285c2cd665e53e61 Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Fri, 7 Jun 2019 15:13:06 +0200
Subject: [PATCH 12/14] v0.9.3

---
 package.json | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index f9b48cd3..b0f3f008 100644
--- a/package.json
+++ b/package.json
@@ -1,9 +1,8 @@
 {
   "name": "gancio",
-  "version": "1.0.0",
+  "version": "0.9.3",
   "description": "My well-made Nuxt.js project",
   "author": "lesion",
-  "private": true,
   "scripts": {
     "dev": "cross-env NODE_ENV=development nodemon server/index.js --watch server",
     "build": "nuxt build",
@@ -12,8 +11,15 @@
     "lint": "eslint --ext .js,.vue --ignore-path .gitignore .",
     "precommit": "npm run lint"
   },
+  "bin": {
+    "gancio": "server/index.js"
+  },
+  "files": [
+    "server/*",
+    "nuxt.config.js",
+    "dist/*"
+  ],
   "dependencies": {
-    "@nuxt/babel-preset-app": "^2.8.1",
     "@nuxtjs/auth": "^4.6.5",
     "@nuxtjs/axios": "^5.5.3",
     "axios": "^0.19.0",
@@ -29,10 +35,8 @@
     "express": "^4.17.1",
     "express-jwt": "^5.3.1",
     "ics": "^2.13.2",
-    "js-cookie": "^2.2.0",
     "jsonwebtoken": "^8.5.1",
     "less": "^3.9.0",
-    "less-loader": "^5.0.0",
     "mastodon-api": "^1.3.0",
     "morgan": "^1.9.1",
     "multer": "^1.4.1",
@@ -44,9 +48,7 @@
     "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.1"
+    "vue-i18n": "^8.10.0"
   },
   "devDependencies": {
     "@nuxtjs/eslint-config": "^0.0.1",
@@ -63,6 +65,7 @@
     "eslint-plugin-promise": ">=4.0.1",
     "eslint-plugin-standard": ">=4.0.0",
     "eslint-plugin-vue": "^5.2.2",
+    "less-loader": "^5.0.0",
     "nodemon": "^1.19.1",
     "prettier": "^1.17.1",
     "pug-plain-loader": "^1.0.0",

From c408c44676e9e0794e0999cf0afc1b42e4815c7b Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Fri, 7 Jun 2019 17:02:33 +0200
Subject: [PATCH 13/14] .

---
 .eslintrc.js                                  |  6 ++-
 .sequelizerc                                  |  2 +-
 locales/it.js                                 | 10 +++--
 nuxt.config.js                                | 43 +++++++------------
 pages/admin.vue                               | 21 +++++++--
 pages/embed/list.vue                          |  6 +--
 pages/index.vue                               | 25 ++++-------
 pages/login.vue                               |  1 -
 pages/register.vue                            | 14 +++---
 pages/settings.vue                            | 14 +++---
 plugins/filters.js                            |  6 +--
 plugins/i18n.js                               |  3 +-
 plugins/v-calendar.js                         |  2 +-
 server/api/controller/bot.js                  | 18 ++++----
 server/api/controller/event.js                | 12 +++---
 server/api/controller/export.js               | 16 +++----
 server/api/controller/settings.js             | 24 +++++------
 server/api/controller/user.js                 | 31 ++++++-------
 server/api/index.js                           | 29 ++++++-------
 server/api/mail.js                            |  4 +-
 server/api/models/comment.js                  | 14 +++---
 server/api/models/event.js                    | 16 +++----
 server/api/models/eventnotification.js        | 14 +++---
 server/api/models/index.js                    | 36 ++++++++--------
 server/api/models/notification.js             | 14 +++---
 server/api/models/place.js                    | 12 +++---
 server/api/models/setting.js                  | 12 +++---
 server/api/models/tag.js                      | 12 +++---
 server/api/models/user.js                     | 18 +++++---
 server/firstrun.js                            | 32 +++++++-------
 server/index.js                               |  9 ++--
 ...lace.js => 20190605141800-create-place.js} |  0
 .../migrations/20190605141850-create-event.js | 10 ++---
 .../20190605142152-create-notification.js     | 10 ++---
 ...0190605142409-create-event-notification.js |  7 ++-
 ...nt.js => 20190605142434-create-comment.js} |  2 +-
 .../20190605142619-create-setting.js          | 10 ++---
 .../20190605160024-create-event-tag.js        |  8 ++--
 server/notifier.js                            | 10 ++---
 store/index.js                                | 16 +++----
 40 files changed, 270 insertions(+), 279 deletions(-)
 rename server/migrations/{20190605142103-create-place.js => 20190605141800-create-place.js} (100%)
 rename server/migrations/{20190605135434-create-comment.js => 20190605142434-create-comment.js} (96%)

diff --git a/.eslintrc.js b/.eslintrc.js
index f5beea15..6c7dde5c 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -19,6 +19,10 @@ module.exports = {
   ],
   // add your custom rules here
   rules: {
-    'nuxt/no-cjs-in-config': 'off'
+    'nuxt/no-cjs-in-config': 'off',
+    'camelcase': 'off',
+    'no-console': 'off',
+    'arrow-parens': 'off',
+    'import/order': 'off'
   }
 }
diff --git a/.sequelizerc b/.sequelizerc
index cf1a6883..31b6598f 100644
--- a/.sequelizerc
+++ b/.sequelizerc
@@ -1,7 +1,7 @@
 const path = require('path')
 
 module.exports = {
-  'config':          path.resolve('server' ,'config.js'),
+  'config':          path.resolve('config.js'),
   'migrations-path': path.resolve('server', 'migrations'),
   'models-path':     path.resolve('server', 'api', 'models')
 }
diff --git a/locales/it.js b/locales/it.js
index c87f8e98..da1d9e08 100644
--- a/locales/it.js
+++ b/locales/it.js
@@ -41,7 +41,7 @@ const it = {
     logout_ok: 'Uscita correttamente',
     copy: 'Copia'
   },
-  
+
   login: {
     description: `Entrando puoi pubblicare nuovi eventi.`,
     check_email: 'Controlla la tua posta (anche lo spam)',
@@ -75,7 +75,9 @@ const it = {
     description: `I movimenti hanno bisogno di organizzarsi e autofinanziarsi. <br/>Questo è un dono per voi, usatelo solo per eventi non commerciali e ovviamente antifascisti, antisessisti, antirazzisti. 
       <br/>Prima di poter pubblicare <strong>dobbiamo approvare l'account</strong>, considera che <strong>dietro questo sito ci sono delle persone</strong> di
       carne e sangue, scrivici quindi due righe per farci capire che eventi vorresti pubblicare.`,
-    error: 'Errore: '
+    error: 'Errore: ',
+    admin_complete: 'Sei il primo utente e quindi sei amministratore!',
+    complete: 'Confermeremo la registrazione quanto prima.'
   },
 
   event: {
@@ -124,9 +126,9 @@ const it = {
   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.`,
+    smtp: `Inserisci un account SMTP relativo a questa istanza di gancio.`
 
   }
 }
 
-export default it
\ No newline at end of file
+export default it
diff --git a/nuxt.config.js b/nuxt.config.js
index 8d00adf6..42ae54ef 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -1,4 +1,8 @@
-const config = require('./server/config').SHARED_CONF
+const argv = require('yargs').argv
+const path = require('path')
+const config_path = path.resolve(argv.config || './config.js')
+
+const config = require(config_path).SHARED_CONF
 
 module.exports = {
   mode: 'universal',
@@ -15,7 +19,6 @@ module.exports = {
     link: [{ rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }]
   },
   dev: (process.env.NODE_ENV !== 'production'),
-
   serverMiddleware: [
     { path: '/api', handler: '@/server/api/index.js' }
   ],
@@ -30,18 +33,20 @@ module.exports = {
    */
   css: [
     'bootstrap/dist/css/bootstrap.css',
-    'element-ui/lib/theme-chalk/index.css',
+    'element-ui/lib/theme-chalk/index.css'
   ],
-
+  env: {
+    config
+  },
   /*
    ** Plugins to load before mounting the App
    */
   plugins: [
     '@/plugins/element-ui', // UI library -> https://element.eleme.io/#/en-US/
-    '@/plugins/filters',    // text filters, datetime, etc.
-    '@/plugins/i18n',       // localization plugin
+    '@/plugins/filters', // text filters, datetime, etc.
+    '@/plugins/i18n', // localization plugin
     '@/plugins/vue-awesome', // icon
-    { src: '@/plugins/v-calendar', ssr: false }, // calendar, TO-REDO
+    { src: '@/plugins/v-calendar', ssr: false } // calendar, TO-REDO
   ],
 
   /*
@@ -58,7 +63,7 @@ module.exports = {
   axios: {
     baseURL: config.baseurl + '/api',
     browserBaseURL: config.baseurl + '/api',
-    prefix: '/api',
+    prefix: '/api'
     // credentials: true
     // See https://github.com/nuxt-community/axios-module#options
   },
@@ -68,37 +73,19 @@ 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 }
+        }
       }
     }
   },
 
-
   /*
    ** Build configuration
    */
   build: {
-    // babel: {
-    //   presets: ['@nuxt/babel-preset-app']
-    // },
     transpile: [/^element-ui/, /^vue-awesome/],
     splitChunks: {
       layouts: true
     }
-    /*
-     ** You can extend webpack config here
-     */
-    // extend(config, ctx) {
-      // Run ESLint on save
-      // if (ctx.isDev && ctx.isClient) {
-      //   config.module.rules.push({
-      //     enforce: 'pre',
-      //     test: /\.(js|vue)$/,
-      //     loader: 'eslint-loader',
-      //     exclude: /(node_modules)/
-      //   })
-      // }
-    // }
   }
 }
diff --git a/pages/admin.vue b/pages/admin.vue
index b6f41b0d..23e0c75a 100644
--- a/pages/admin.vue
+++ b/pages/admin.vue
@@ -1,5 +1,9 @@
 <template lang="pug">
-  el-dialog(:title='$t("common.admin")' width='80%' :visible='open' :before-close='close')
+  el-card(:title='$t("common.admin")' width='80%' :visible='open' :before-close='close')
+    nuxt-link.float-right(to='/')
+      v-icon(name='times' color='red')
+    h5 {{$t('common.admin')}}
+
     el-tabs(tabPosition='left' v-model='tab')
 
       //- USERS
@@ -81,9 +85,18 @@
         template(slot='label')
           v-icon(name='cog')
           span  {{$t('common.settings')}}
+
+        //- el-form(inline @submit.prevent.stop='save_settings' label-width='140px')
+        //-   p {{$t('settings.name_description')}}
+        //-   el-form-item(:label="$t('settings.name')")
+        //-     el-input(v-model="settings.title")
+        //-   el-form-item(:label="$t('settings.description')")
+        //-     el-input(v-model="settings.description")
+        //-   el-button(slot='append' @click='associate' :disabled='!mastodon_instance.length') {{$t('common.associate')}}
+        
         el-form(inline @submit.prevent.stop='associatemastodon_instance')
           span {{$t('admin.mastodon_description')}}
-          el-input(v-model="mastodon_instance")
+          el-input(v-model="settings.mastodon_instance")
             span(slot='prepend') {{$t('admin.mastodon_instance')}}
             el-button(slot='append' @click='associate' :disabled='!mastodon_instance.length') {{$t('common.associate')}}
 
@@ -111,7 +124,9 @@ export default {
       tag: {name: '', color: ''},
       events: [],
       loading: false,
-      mastodon_instance: '',
+      settings: {
+        mastodon_instance: '',
+      },
       settings: {},
       tab: "0",
       open: true
diff --git a/pages/embed/list.vue b/pages/embed/list.vue
index 9a90b221..1e711364 100644
--- a/pages/embed/list.vue
+++ b/pages/embed/list.vue
@@ -11,9 +11,9 @@ export default {
   components: { List },
   computed: mapState(['config']),
   async asyncData ({ $axios, req, res }) {
-    const title = req.query.title || config.title
-    const tags = req.query.tags
-    const places = req.query.places
+    const title = req && req.query && req.query.title || this.config.title
+    const tags = req && req.query && req.query.tags
+    const places = req && req.query && req.query.places
     const now = new Date()
 
     let params = []
diff --git a/pages/index.vue b/pages/index.vue
index 53009c3b..a74231c1 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -2,7 +2,6 @@
   #home
     Nav
     Home
-    
 
 </template>
 <script>
@@ -12,22 +11,16 @@ 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)
+    try {
+      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 })
+    } catch(e) {
+      console.error(e)
+    }
   },
   computed: mapState(['events']),
   components: { Nav, Home },
diff --git a/pages/login.vue b/pages/login.vue
index 0ba3f347..82742265 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -27,7 +27,6 @@
 </template>
 
 <script>
-const Cookie = process.client ? require('js-cookie') : undefined
 import { mapActions } from 'vuex'
 import { Message } from 'element-ui'
 import get from 'lodash/get'
diff --git a/pages/register.vue b/pages/register.vue
index f1800613..691355b2 100644
--- a/pages/register.vue
+++ b/pages/register.vue
@@ -5,26 +5,26 @@
       v-icon(name='times' color='red')
     h5 {{$t('common.register')}}
 
-    el-form(method='POST' action='/api/user')
+    el-form(@submit.native.prevent='register' 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' name='email')
         span(slot='prepend') @
 
-      el-input.mb-2(v-model='user.password' type="password" placeholder="Password" name='password')
+      el-input.mb-2(v-model='user.password' type="password" placeholder="Password" name='password' required)
         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" native-type='submit'
-        :disabled='disabled'
-        @click='register') {{$t('common.send')}} <v-icon name='chevron-right'/>
+        :disabled='disabled') {{$t('common.send')}} <v-icon name='chevron-right'/>
 </template>
 
 <script>
 import { mapActions } from 'vuex'
 import { Message } from 'element-ui'
+import get from 'lodash/get'
 
 export default {
   name: 'Register',
@@ -44,14 +44,14 @@ export default {
     ...mapActions(['login']),
     async register () {
       try {
-        const user = await this.$axios.$post('/user', this.user)
+        const { user } = await this.$axios.$post('/user', this.user)
         Message({
-          message: this.$t(`register.${user.is_admin && 'admin_'}complete`),
+          message: this.$t(`register.${user.is_admin ? 'admin_' : ''}complete`),
           type: 'success'
         })
         this.$router.replace("/")
       } catch (e) {
-        const error = e && e.response && e.response.data && e.response.data.errors[0].message || e
+        const error = get(e, 'e.response.data.errors[0].message', String(e))
         Message({
           message: this.$t('register.error') + this.$t(error),
           type: 'error'
diff --git a/pages/settings.vue b/pages/settings.vue
index fed9e4d4..80269052 100644
--- a/pages/settings.vue
+++ b/pages/settings.vue
@@ -1,5 +1,9 @@
 <template lang="pug">
-  el-dialog(:title="$t('common.settings')" :before-close='close' visible)
+  el-card
+    nuxt-link.float-right(to='/')
+      v-icon(name='times' color='red')
+    h5 {{$t('common.settings')}}
+
     //- el-form
       //- el-form-item {{$t('settings.change_password')}}
     el-divider {{$t('settings.change_password')}}
@@ -23,11 +27,11 @@ export default {
   methods: {
     async change () {
       if (!this.password) return
-      const user = this.user
-      user.password = this.password
+      // this.$auth.user.password = this.password
+      const user_data = { id : this.$auth.user.id, password: this.password }
       try {
-        // this.$axios.
-        // await api.updateUser(user)
+        const user = await this.$axios.$put('/user', user_data)
+        console.error(user)
       } catch (e) {
         console.log(e)
       }
diff --git a/plugins/filters.js b/plugins/filters.js
index 34e223d3..5dc4d672 100644
--- a/plugins/filters.js
+++ b/plugins/filters.js
@@ -23,11 +23,9 @@ export default (a) => {
     const end = moment(event.end_datetime)
     if (event.multidate) {
       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)
+    } else if (event.end_datetime && event.end_datetime !== event.start_datetime)
         return `${start.format('ddd, D MMMM')} (${short_hour(start)}-${short_hour(end)}`
       else
         return `${start.format('dddd, D MMMM')} (${short_hour(start)})`
-    }
   })
-}
\ No newline at end of file
+}
diff --git a/plugins/i18n.js b/plugins/i18n.js
index 48c4037e..03dc32b4 100644
--- a/plugins/i18n.js
+++ b/plugins/i18n.js
@@ -11,8 +11,7 @@ export default ({ app, store }) => {
     locale: store.state.locale,
     fallbackLocale: 'it',
     messages: {
-      it 
-    //   'fr': require('~/locales/fr.json')
+      it
     }
   })
 
diff --git a/plugins/v-calendar.js b/plugins/v-calendar.js
index 2c88ed03..14ecafaf 100644
--- a/plugins/v-calendar.js
+++ b/plugins/v-calendar.js
@@ -5,4 +5,4 @@ export default () => {
   Vue.use(VCalendar, {
     firstDayOfWeek: 2
   })
-}
\ No newline at end of file
+}
diff --git a/server/api/controller/bot.js b/server/api/controller/bot.js
index cadd6d5e..a1b8ba81 100644
--- a/server/api/controller/bot.js
+++ b/server/api/controller/bot.js
@@ -9,12 +9,12 @@ moment.locale('it')
 
 const botController = {
   bot: null,
-  async initialize () {
+  async initialize() {
     console.error('dentro bot inizialiteds')
     const settings = await settingsController.settings()
     if (!settings.mastodon_auth || !settings.mastodon_auth.access_token) return
     const mastodon_auth = settings.mastodon_auth
-    botController.bot = new Mastodon({ 
+    botController.bot = new Mastodon({
       access_token: mastodon_auth.access_token,
       api_url: `https://${mastodon_auth.instance}/api/v1`
     })
@@ -41,7 +41,7 @@ const botController = {
   //   listener.on('error', botController.error)
   //   botController.bots.push({ email: user.email, bot })
   },
-  async post (mastodon_auth, event) {
+  async post(mastodon_auth, event) {
     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')} - 
@@ -58,20 +58,20 @@ ${event.description.length > 200 ? event.description.substr(0, 200) + '...' : ev
   },
 
   // TOFIX: enable message deletion
-  async message (msg) {
+  async message(msg) {
     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 } })
     if (!event) {
       // check for comment..
       // const comment = await Comment.findOne( {where: { }})
-      return 
+      return
     }
     const comment = await Comment.create({
-      activitypub_id: msg.data.last_status.id, 
+      activitypub_id: msg.data.last_status.id,
       // text: msg.data.last_status.content,
-      data: msg.data,
-      // author: msg.data.accounts[0].username 
+      data: msg.data
+      // author: msg.data.accounts[0].username
     })
     event.addComment(comment)
     // const comment = await Comment.findOne( { where: {activitypub_id: msg.data.in_reply_to}} )
@@ -86,7 +86,7 @@ ${event.description.length > 200 ? event.description.substr(0, 200) + '...' : ev
   // const comment = new Comment(req.body)
   // event.addComment(comment)
   },
-  error (err) {
+  error(err) {
     console.log('error ', err)
   }
 }
diff --git a/server/api/controller/event.js b/server/api/controller/event.js
index 68d7ba75..fd83e4e2 100644
--- a/server/api/controller/event.js
+++ b/server/api/controller/event.js
@@ -23,7 +23,7 @@ const eventController = {
     const places = await Place.findAll({
       order: [[Sequelize.literal('weigth'), 'DESC']],
       attributes: {
-        include: [[Sequelize.fn('count', Sequelize.col('events.placeId')) ,'weigth']], // <---- Here you will get the total count of user
+        include: [[Sequelize.fn('count', Sequelize.col('events.placeId')) , 'weigth']], // <---- Here you will get the total count of user
         exclude: ['weigth', 'createdAt', 'updatedAt']
       },
       include: [{ model: Event, attributes: [] }],
@@ -31,7 +31,7 @@ const eventController = {
     })
 
     const tags = await Tag.findAll({
-      order: [['weigth' , 'DESC']],
+      order: [['weigth', 'DESC']],
       includeIgnoreAttributes: false,
       attributes: {
         exclude: ['createdAt', 'updatedAt']
@@ -89,8 +89,8 @@ const eventController = {
         Tag,
         Comment,
         { model: Place, attributes: ['name', 'address'] }
-      ] ,
-      order: [ [Comment, 'id', 'DESC'], [Tag, 'weigth', 'DESC'] ]
+      ],
+    order: [ [Comment, 'id', 'DESC'], [Tag, 'weigth', 'DESC'] ]
     })
     res.json(event)
   },
@@ -176,13 +176,13 @@ const eventController = {
         ]
       },
       order: [
-        ['start_datetime', 'ASC'], 
+        ['start_datetime', 'ASC'],
         [Tag, 'weigth', 'DESC']
       ],
       include: [
         // { model: User, required: false },
         // { type: Comment, required: false, attributes: ['']
-        { model: Tag, required: false, attributes: ['tag', 'weigth','color'] },
+        { model: Tag, required: false, attributes: ['tag', 'weigth', 'color'] },
         { model: Place, required: false, attributes: ['id', 'name', 'address'] }
       ]
     })
diff --git a/server/api/controller/export.js b/server/api/controller/export.js
index e7a647bd..f0b5ba26 100644
--- a/server/api/controller/export.js
+++ b/server/api/controller/export.js
@@ -1,12 +1,11 @@
 const { event: Event, place: Place } = require('../models')
 const { Op } = require('sequelize')
-const config = require('../../config').SHARED_CONF
 const moment = require('moment')
 const ics = require('ics')
 
 const exportController = {
 
-  async export (req, res) {
+  async export(req, res) {
     console.log('type ', req.params.type)
     console.error(req)
     const type = req.params.type
@@ -21,18 +20,17 @@ const exportController = {
     if (places) {
       wherePlace.id = places.split(',')
     }
-    console.error(places)
     const events = await Event.findAll({
       order: ['start_datetime'],
-      where: { 
-        is_visible: true, 
+      where: {
+        is_visible: true,
         start_datetime: { [Op.gte]: yesterday },
         placeId: places.split(',')
       },
       attributes: {
         exclude: ['createdAt', 'updatedAt']
       },
-      include: [{model: Place, attributes: ['name', 'id', 'address', 'weigth']}]
+      include: [{ model: Place, attributes: ['name', 'id', 'address', 'weigth'] }]
     })
     switch (type) {
       case 'feed':
@@ -44,12 +42,12 @@ const exportController = {
     }
   },
 
-  async feed (res, events) {
+  feed(res, events) {
     res.type('application/rss+xml; charset=UTF-8')
-    res.render('feed/rss.pug', { events, config, moment })
+    res.render('feed/rss.pug', { events, config: process.env.config, moment })
   },
 
-  async ics (res, events) {
+  ics(res, events) {
     const eventsMap = events.map(e => {
       const tmpStart = moment(e.start_datetime)
       const tmpEnd = moment(e.end_datetime)
diff --git a/server/api/controller/settings.js b/server/api/controller/settings.js
index 72929779..4830c85f 100644
--- a/server/api/controller/settings.js
+++ b/server/api/controller/settings.js
@@ -1,10 +1,11 @@
 const Mastodon = require('mastodon-api')
 const { setting: Setting } = require('../models')
-const config = require('../../config').SHARED_CONF
+
+const baseurl = process.env.baseurl
 
 const settingsController = {
 
-  async setAdminSetting (key, value) {
+  async setAdminSetting(key, value) {
     await Setting.findOrCreate({ where: { key },
       defaults: { value } })
       .spread((settings, created) => {
@@ -12,20 +13,16 @@ const settingsController = {
       })
   },
 
-  async getAdminSettings (req, res) {
+  async getAdminSettings(req, res) {
     const settings = await settingsController.settings()
     res.json(settings)
   },
 
-  async getConfig (req, res) {
-    res.json(config)
-  },
-
   async getAuthURL(req, res) {
     const instance = req.body.instance
-    const callback = `${config.baseurl}/api/settings/oauth`
+    const callback = `${baseurl}/api/settings/oauth`
     const { client_id, client_secret } = await Mastodon.createOAuthApp(`https://${instance}/api/v1/apps`,
-      config.title, 'read write', callback)
+      'gancio', 'read write', callback)
     const url = await Mastodon.getAuthorizationUrl(client_id, client_secret,
       `https://${instance}`, 'read write', callback)
 
@@ -36,7 +33,7 @@ const settingsController = {
   async code(req, res) {
     const code = req.query.code
     let client_id, client_secret, instance
-    const callback = `${config.baseurl}/api/settings/oauth`
+    const callback = `${baseurl}/api/settings/oauth`
 
     const settings = await settingsController.settings()
 
@@ -47,18 +44,17 @@ const settingsController = {
         `https://${instance}`, callback)
       const mastodon_auth = { client_id, client_secret, access_token: token, instance }
       await settingsController.setAdminSetting('mastodon_auth', mastodon_auth)
-      
+
       res.redirect('/admin')
     } catch (e) {
       res.json(e)
     }
   },
 
-  async settings () {
-    console.error('ma sono dentro settings ?!?!')
+  async settings() {
     const settings = await Setting.findAll()
     return settings
-  },
+  }
 
 }
 
diff --git a/server/api/controller/user.js b/server/api/controller/user.js
index c69a791f..f8668450 100644
--- a/server/api/controller/user.js
+++ b/server/api/controller/user.js
@@ -4,14 +4,13 @@ const crypto = require('crypto')
 const jwt = require('jsonwebtoken')
 const { Op } = require('sequelize')
 const jsonwebtoken = require('jsonwebtoken')
-const { SECRET_CONF, SHARED_CONF } = require('../../config')
 const mail = require('../mail')
 const { user: User, event: Event, tag: Tag, place: Place } = require('../models')
 const eventController = require('./event')
+const config = require('../../config')
 
 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) {
@@ -31,10 +30,10 @@ const userController = {
             email: user.email,
             scope: [user.is_admin ? 'admin' : 'user']
           },
-          SECRET_CONF.secret
+          config.SECRET_CONF.secret
         )
 
-        res.json({token: accessToken})        
+        res.json({ token: accessToken })
       }
     }
   },
@@ -89,9 +88,7 @@ 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
@@ -167,7 +164,7 @@ const userController = {
     if (!user) return res.sendStatus(200)
 
     user.recover_code = crypto.randomBytes(16).toString('hex')
-    mail.send(user.email, 'recover', { user, config: SHARED_CONF })
+    mail.send(user.email, 'recover', { user, config: config.SHARED_CONF })
 
     await user.save()
     res.sendStatus(200)
@@ -191,16 +188,13 @@ const userController = {
     try {
       await user.save()
       res.sendStatus(200)
-    } catch(e) {
+    } catch (e) {
       res.sendStatus(400)
     }
   },
 
-  async current(req, res) {
-    if (req.user)
-      res.json(req.user)
-    else 
-      res.sendStatus(404)
+  current(req, res) {
+    if (req.user) { res.json(req.user) } else { res.sendStatus(404) }
   },
 
   async getAll(req, res) {
@@ -212,9 +206,10 @@ const userController = {
 
   async update(req, res) {
     const user = await User.findByPk(req.body.id)
+    console.error(req.body.id)
     if (user) {
       if (!user.is_active && req.body.is_active) {
-        await mail.send(user.email, 'confirm', { user, config: SHARED_CONF })
+        await mail.send(user.email, 'confirm', { user, config: config.SHARED_CONF })
       }
       await user.update(req.body)
       res.json(user)
@@ -226,7 +221,6 @@ const userController = {
   async register(req, res) {
     const n_users = await User.count()
     try {
-
       // the first registered user will be an active admin
       if (n_users === 0) {
         req.body.is_active = req.body.is_admin = true
@@ -236,7 +230,7 @@ const userController = {
 
       const user = await User.create(req.body)
       try {
-        mail.send([user.email, SECRET_CONF.admin], 'register', { user, config: SHARED_CONF })
+        mail.send([user.email, config.SECRET_CONF.admin], 'register', { user, config: config.SHARED_CONF })
       } catch (e) {
         return res.status(400).json(e)
       }
@@ -245,9 +239,8 @@ const userController = {
         email: user.email,
         scope: [user.is_admin ? 'admin' : 'user']
       }
-      const token = jwt.sign(payload, SECRET_CONF.secret)
-      res.json({ token })
-      // res.redirect('/')
+      const token = jwt.sign(payload, config.SECRET_CONF.secret)
+      res.json({ token, user })
     } catch (e) {
       res.status(404).json(e)
     }
diff --git a/server/api/index.js b/server/api/index.js
index ecf699c3..29a74c13 100644
--- a/server/api/index.js
+++ b/server/api/index.js
@@ -3,6 +3,7 @@ const multer = require('multer')
 const cookieParser = require('cookie-parser')
 const bodyParser = require('body-parser')
 const expressJwt = require('express-jwt')
+const config = require('../config')
 
 const { fillUser, isAuth, isAdmin } = require('./auth')
 const eventController = require('./controller/event')
@@ -10,8 +11,6 @@ const exportController = require('./controller/export')
 const userController = require('./controller/user')
 const settingsController = require('./controller/settings')
 
-const { SECRET_CONF } = require('../config')
-
 const storage = require('./storage')({
   destination: 'uploads/'
 })
@@ -23,19 +22,20 @@ 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 
-  // }
+  secret: config.SECRET_CONF.secret,
+  credentialsRequired: false
 })
 
+function errorHandler(fn) {
+  return async (req, res) => {
+    try {
+      await fn(req, res)
+    } catch (e) {
+      console.error(String(e))
+      return res.status(500).json(e)
+    }
+  }
+}
 
 // AUTH
 api.post('/auth/login', userController.login)
@@ -84,7 +84,6 @@ api.get('/event/unconfirmed', jwt, isAuth, isAdmin, eventController.getUnconfirm
 api.post('/event/notification', eventController.addNotification)
 api.delete('/event/notification/:code', eventController.delNotification)
 
-api.get('/config', settingsController.getConfig)
 api.get('/settings', jwt, fillUser, isAdmin, settingsController.getAdminSettings)
 api.post('/settings', jwt, fillUser, isAdmin, settingsController.setAdminSetting)
 
@@ -99,7 +98,7 @@ api.get('/event/unconfirm/:event_id', jwt, isAuth, isAdmin, eventController.unco
 api.get('/export/:type', exportController.export)
 
 // get events in this range
-api.get('/event/:month/:year', eventController.getAll)
+api.get('/event/:month/:year', errorHandler(eventController.getAll))
 
 // mastodon oauth auth
 api.post('/settings/getauthurl', jwt, isAuth, isAdmin, settingsController.getAuthURL)
diff --git a/server/api/mail.js b/server/api/mail.js
index d07d923d..5875d47d 100644
--- a/server/api/mail.js
+++ b/server/api/mail.js
@@ -2,10 +2,10 @@ const Email = require('email-templates')
 const path = require('path')
 const moment = require('moment')
 const config = require('../config')
-moment.locale(config.SHARED_CONF.locale)
 
+moment.locale(config.SHARED_CONF.locale)
 const mail = {
-  send (addresses, template, locals) {
+  send(addresses, template, locals) {
     const email = new Email({
       views: { root: path.join(__dirname, '..', 'emails') },
       juice: true,
diff --git a/server/api/models/comment.js b/server/api/models/comment.js
index b3a03004..acba9a7c 100644
--- a/server/api/models/comment.js
+++ b/server/api/models/comment.js
@@ -1,13 +1,13 @@
-'use strict';
+'use strict'
 module.exports = (sequelize, DataTypes) => {
   const comment = sequelize.define('comment', {
     activitypub_id: DataTypes.BIGINT,
     data: DataTypes.JSON
-  }, {});
-  comment.associate = function(models) {
+  }, {})
+  comment.associate = function (models) {
     comment.belongsTo(models.event)
-    // Event.hasMany(Comment)    
+    // Event.hasMany(Comment)
     // associations can be defined here
-  };
-  return comment;
-};
\ No newline at end of file
+  }
+  return comment
+};
diff --git a/server/api/models/event.js b/server/api/models/event.js
index e1d2fe4c..8af98bdc 100644
--- a/server/api/models/event.js
+++ b/server/api/models/event.js
@@ -1,11 +1,11 @@
-'use strict';
+'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: { 
+    start_datetime: {
       type: DataTypes.DATE,
       index: true
     },
@@ -16,16 +16,16 @@ module.exports = (sequelize, DataTypes) => {
       type: DataTypes.BIGINT,
       index: true
     }
-  }, {});
-  event.associate = function(models) {
+  }, {})
+  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' })    
+    // Tag.belongsToMany(Event, { through: 'tagEvent' })
     // Event.hasMany(models.Tag)
     // associations can be defined here
-  };
-  return event;
-};
\ No newline at end of file
+  }
+  return event
+};
diff --git a/server/api/models/eventnotification.js b/server/api/models/eventnotification.js
index c8eda950..bc8f9ecb 100644
--- a/server/api/models/eventnotification.js
+++ b/server/api/models/eventnotification.js
@@ -1,4 +1,4 @@
-'use strict';
+'use strict'
 module.exports = (sequelize, DataTypes) => {
   const eventNotification = sequelize.define('eventNotification', {
     status: {
@@ -7,10 +7,10 @@ module.exports = (sequelize, DataTypes) => {
       defaultValue: 'new',
       index: true
     }
-  }, {});
-  
-  eventNotification.associate = function(models) {
+  }, {})
+
+  eventNotification.associate = function (models) {
     // associations can be defined here
-  };
-  return eventNotification;
-};
\ No newline at end of file
+  }
+  return eventNotification
+}
diff --git a/server/api/models/index.js b/server/api/models/index.js
index 8f5a10f5..d1a23202 100644
--- a/server/api/models/index.js
+++ b/server/api/models/index.js
@@ -1,31 +1,31 @@
-'use strict';
+const argv = require('yargs').argv
+const fs = require('fs')
+const path = require('path')
+const Sequelize = require('sequelize')
+const config_path = path.resolve(argv.config || './config.js')
+const basename = path.basename(__filename)
+const config = require(config_path).SECRET_CONF.db
+const 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);
+const 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));
-    db[model.name] = model;
-  });
+    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;
+module.exports = db
diff --git a/server/api/models/notification.js b/server/api/models/notification.js
index a1ec32f3..e49bc9f4 100644
--- a/server/api/models/notification.js
+++ b/server/api/models/notification.js
@@ -1,4 +1,4 @@
-'use strict';
+'use strict'
 module.exports = (sequelize, DataTypes) => {
   const notification = sequelize.define('notification', {
     filters: DataTypes.JSON,
@@ -8,10 +8,10 @@ module.exports = (sequelize, DataTypes) => {
       type: DataTypes.ENUM,
       values: ['mail', 'admin_email', 'mastodon']
     }
-  }, {});
-  notification.associate = function(models) {
-    notification.belongsToMany(models.event, { through: 'event_notification' })    
+  }, {})
+  notification.associate = function (models) {
+    notification.belongsToMany(models.event, { through: 'event_notification' })
     // associations can be defined here
-  };
-  return notification;
-};
\ No newline at end of file
+  }
+  return notification
+}
diff --git a/server/api/models/place.js b/server/api/models/place.js
index 70cb0323..a45e9704 100644
--- a/server/api/models/place.js
+++ b/server/api/models/place.js
@@ -1,15 +1,15 @@
-'use strict';
+'use strict'
 module.exports = (sequelize, DataTypes) => {
   const place = sequelize.define('place', {
     name: DataTypes.STRING,
     address: DataTypes.STRING,
     weigth: DataTypes.INTEGER
-  }, {});
+  }, {})
 
-  place.associate = function(models) {
+  place.associate = function (models) {
     // associations can be defined here
     place.hasMany(models.event)
-  };
+  }
 
-  return place;
-};
\ No newline at end of file
+  return place
+}
diff --git a/server/api/models/setting.js b/server/api/models/setting.js
index f12acfca..eef0d5a0 100644
--- a/server/api/models/setting.js
+++ b/server/api/models/setting.js
@@ -1,14 +1,14 @@
-'use strict';
+'use strict'
 module.exports = (sequelize, DataTypes) => {
   const setting = sequelize.define('setting', {
-    key: { 
+    key: {
       type: DataTypes.STRING,
       primaryKey: true,
       allowNull: false,
-      index: true,
+      index: true
     },
     value: DataTypes.JSON
-  }, {});
+  }, {})
 
-  return setting;
-};
\ No newline at end of file
+  return setting
+}
diff --git a/server/api/models/tag.js b/server/api/models/tag.js
index bb6752ac..ba8f9807 100644
--- a/server/api/models/tag.js
+++ b/server/api/models/tag.js
@@ -1,4 +1,4 @@
-'use strict';
+'use strict'
 module.exports = (sequelize, DataTypes) => {
   const tag = sequelize.define('tag', {
     tag: {
@@ -8,12 +8,12 @@ module.exports = (sequelize, DataTypes) => {
     },
     weigth: DataTypes.INTEGER,
     color: DataTypes.STRING
-  }, {});
+  }, {})
 
-  tag.associate = function(models) {
+  tag.associate = function (models) {
     tag.belongsToMany(models.event, { through: 'event_tags' })
     // associations can be defined here
-  };
+  }
 
-  return tag;
-};
\ No newline at end of file
+  return tag
+};
diff --git a/server/api/models/user.js b/server/api/models/user.js
index 31cea58e..09cd7272 100644
--- a/server/api/models/user.js
+++ b/server/api/models/user.js
@@ -1,4 +1,4 @@
-'use strict';
+'use strict'
 const bcrypt = require('bcrypt')
 
 module.exports = (sequelize, DataTypes) => {
@@ -14,19 +14,23 @@ module.exports = (sequelize, DataTypes) => {
     recover_code: DataTypes.STRING,
     is_admin: DataTypes.BOOLEAN,
     is_active: DataTypes.BOOLEAN
-  }, {});
+  }, {
+    defaultScope: {
+      exclude: ['password', 'recover_code']
+    }
+  })
 
-  user.associate = function(models) {
+  user.associate = function (models) {
     // associations can be defined here
     user.hasMany(models.event)
-  };
+  }
 
   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)
@@ -35,5 +39,5 @@ module.exports = (sequelize, DataTypes) => {
     }
   })
 
-  return user;
-};
\ No newline at end of file
+  return user
+};
diff --git a/server/firstrun.js b/server/firstrun.js
index e6fe7f56..502912dc 100644
--- a/server/firstrun.js
+++ b/server/firstrun.js
@@ -1,8 +1,9 @@
 // check config.js existance
 const fs = require('fs')
 const path = require('path')
+const argv = require('yargs').argv
 
-const config_path = path.join(__dirname, 'config.js')
+const config_path = path.resolve(argv.config || './config.js')
 
 if (!fs.existsSync(config_path)) {
   console.error(`Configuration file not found at '${config_path}. Please copy 'config.example.js' and modify it.`)
@@ -12,30 +13,29 @@ if (!fs.existsSync(config_path)) {
 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);
+  process.exit(1)
 }
 
 const Sequelize = require('sequelize')
 let db
 try {
   db = new Sequelize(SECRET_CONF.db)
-} catch(e) {
+} 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)
-})
+  .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 29018e2b..d205da28 100644
--- a/server/index.js
+++ b/server/index.js
@@ -1,13 +1,14 @@
-const firstRun = require('./firstrun')
+#!/bin/env node
+const path = require('path')
 const express = require('express')
 const consola = require('consola')
 const morgan = require('morgan')
-const path = require('path')
-const app = express()
 const { Nuxt, Builder } = require('nuxt')
+const firstRun = require('./firstrun')
 // Import and Set Nuxt.js options
 const config = require('../nuxt.config.js')
 
+const app = express()
 async function start() {
   // Init Nuxt.js
   const nuxt = new Nuxt(config)
@@ -35,4 +36,4 @@ async function start() {
   })
 }
 
-firstRun.then(start)
\ No newline at end of file
+firstRun.then(start)
diff --git a/server/migrations/20190605142103-create-place.js b/server/migrations/20190605141800-create-place.js
similarity index 100%
rename from server/migrations/20190605142103-create-place.js
rename to server/migrations/20190605141800-create-place.js
diff --git a/server/migrations/20190605141850-create-event.js b/server/migrations/20190605141850-create-event.js
index a4c341ff..2db6ee51 100644
--- a/server/migrations/20190605141850-create-event.js
+++ b/server/migrations/20190605141850-create-event.js
@@ -1,4 +1,4 @@
-'use strict';
+'use strict'
 module.exports = {
   up: (queryInterface, Sequelize) => {
     return queryInterface.createTable('events', {
@@ -13,7 +13,7 @@ module.exports = {
       },
       slug: {
         type: Sequelize.STRING,
-        index: true,
+        index: true
       },
       description: {
         type: Sequelize.TEXT
@@ -58,9 +58,9 @@ module.exports = {
         allowNull: false,
         type: Sequelize.DATE
       }
-    });
+    })
   },
   down: (queryInterface, Sequelize) => {
-    return queryInterface.dropTable('events');
+    return queryInterface.dropTable('events')
   }
-};
\ No newline at end of file
+}
diff --git a/server/migrations/20190605142152-create-notification.js b/server/migrations/20190605142152-create-notification.js
index 9b86a8ba..7ddd5129 100644
--- a/server/migrations/20190605142152-create-notification.js
+++ b/server/migrations/20190605142152-create-notification.js
@@ -1,4 +1,4 @@
-'use strict';
+'use strict'
 module.exports = {
   up: (queryInterface, Sequelize) => {
     return queryInterface.createTable('notifications', {
@@ -19,7 +19,7 @@ module.exports = {
       },
       type: {
         type: Sequelize.ENUM,
-        values: ['mail', 'admin_email', 'mastodon']        
+        values: ['mail', 'admin_email', 'mastodon']
       },
       createdAt: {
         allowNull: false,
@@ -29,9 +29,9 @@ module.exports = {
         allowNull: false,
         type: Sequelize.DATE
       }
-    });
+    })
   },
   down: (queryInterface, Sequelize) => {
-    return queryInterface.dropTable('notifications');
+    return queryInterface.dropTable('notifications')
   }
-};
\ No newline at end of file
+}
diff --git a/server/migrations/20190605142409-create-event-notification.js b/server/migrations/20190605142409-create-event-notification.js
index c855cc95..5cebe1e4 100644
--- a/server/migrations/20190605142409-create-event-notification.js
+++ b/server/migrations/20190605142409-create-event-notification.js
@@ -1,4 +1,3 @@
-'use strict';
 module.exports = {
   up: (queryInterface, Sequelize) => {
     return queryInterface.createTable('event_notification', {
@@ -30,9 +29,9 @@ module.exports = {
         allowNull: false,
         type: Sequelize.DATE
       }
-    });
+    })
   },
   down: (queryInterface, Sequelize) => {
-    return queryInterface.dropTable('event_notification');
+    return queryInterface.dropTable('event_notification')
   }
-};
\ No newline at end of file
+}
diff --git a/server/migrations/20190605135434-create-comment.js b/server/migrations/20190605142434-create-comment.js
similarity index 96%
rename from server/migrations/20190605135434-create-comment.js
rename to server/migrations/20190605142434-create-comment.js
index e477eaa7..120e0a62 100644
--- a/server/migrations/20190605135434-create-comment.js
+++ b/server/migrations/20190605142434-create-comment.js
@@ -11,7 +11,7 @@ module.exports = {
       eventId: {
         type: Sequelize.INTEGER,
         references: {
-          model: 'event',
+          model: 'events',
           key: 'id'
         }
       },
diff --git a/server/migrations/20190605142619-create-setting.js b/server/migrations/20190605142619-create-setting.js
index b8940f9c..fc95a51d 100644
--- a/server/migrations/20190605142619-create-setting.js
+++ b/server/migrations/20190605142619-create-setting.js
@@ -1,4 +1,4 @@
-'use strict';
+'use strict'
 module.exports = {
   up: (queryInterface, Sequelize) => {
     return queryInterface.createTable('settings', {
@@ -6,7 +6,7 @@ module.exports = {
         type: Sequelize.STRING,
         primaryKey: true,
         allowNull: false,
-        index: true,
+        index: true
       },
       value: {
         type: Sequelize.JSON
@@ -19,9 +19,9 @@ module.exports = {
         allowNull: false,
         type: Sequelize.DATE
       }
-    });
+    })
   },
   down: (queryInterface, Sequelize) => {
-    return queryInterface.dropTable('settings');
+    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
index 0e856610..c3c904ef 100644
--- a/server/migrations/20190605160024-create-event-tag.js
+++ b/server/migrations/20190605160024-create-event-tag.js
@@ -1,4 +1,4 @@
-'use strict';
+'use strict'
 module.exports = {
   up: (queryInterface, Sequelize) => {
     return queryInterface.createTable('event_tags', {
@@ -24,9 +24,9 @@ module.exports = {
         allowNull: false,
         type: Sequelize.DATE
       }
-    });
+    })
   },
   down: (queryInterface, Sequelize) => {
-    return queryInterface.dropTable('event_tags');
+    return queryInterface.dropTable('event_tags')
   }
-};
\ No newline at end of file
+}
diff --git a/server/notifier.js b/server/notifier.js
index ebaebd8e..24cb1075 100644
--- a/server/notifier.js
+++ b/server/notifier.js
@@ -7,13 +7,13 @@ const { Event, Notification, EventNotification,
   User, Place, Tag } = require('./api/models')
 let settings
 
-async function sendNotification (notification, event, eventNotification) {
+async function sendNotification(notification, event, eventNotification) {
   const promises = []
   switch (notification.type) {
     // case 'mail':
-      // return mail.send(notification.email, 'event', { event, config, notification })
+    // return mail.send(notification.email, 'event', { event, config, notification })
   //  case 'admin_email':
-   //   const admins = await User.findAll({ where: { is_admin: true } })
+    //   const admins = await User.findAll({ where: { is_admin: true } })
     //  const admin_emails = admins.map(admin => admin.email)
     //  return mail.send(admin_emails, 'event', { event, to_confirm: true, notification })
     case 'mastodon':
@@ -56,11 +56,11 @@ async function notify() {
 let interval
 function startLoop(seconds) {
   console.error('starting notifier loop')
-  interval = setInterval(notify, seconds*1000)
+  interval = setInterval(notify, seconds * 1000)
 }
 
 function stopLoop() {
   stopInterval(interval)
 }
 
-module.exports = { startLoop, stopLoop }
\ No newline at end of file
+module.exports = { startLoop, stopLoop }
diff --git a/store/index.js b/store/index.js
index 40d42868..48e082d2 100644
--- a/store/index.js
+++ b/store/index.js
@@ -14,7 +14,7 @@ export const state = () => ({
     show_past_events: false,
     show_recurrent_events: false,
     show_pinned_event: false
-  },
+  }
 })
 
 export const getters = {
@@ -25,7 +25,7 @@ export const getters = {
     let events = state.events
 
     // TOFIX: use lodash
-    if (state.filters.tags.length || state.filters.places.length){
+    if (state.filters.tags.length || state.filters.places.length) {
       events = events.filter((e) => {
         if (state.filters.tags.length) {
           const m = intersection(e.tags.map(t => t.tag), state.filters.tags)
@@ -41,13 +41,13 @@ export const getters = {
     }
 
     if (!state.show_past_events) {
-      events = events.filter( e => !e.past )
+      events = events.filter(e => !e.past)
     }
 
     let lastDay = null
     events = map(events, e => {
       const currentDay = moment(e.start_datetime).date()
-      e.newDay = (!lastDay || lastDay!==currentDay) && currentDay
+      e.newDay = (!lastDay || lastDay !== currentDay) && currentDay
       lastDay = currentDay
       return e
     })
@@ -90,20 +90,20 @@ export const mutations = {
   setSearchPlaces(state, places) {
     state.filters.places = places
   },
-  showPastEvents (state, show) {
+  showPastEvents(state, show) {
     state.show_past_events = show
   },
-  setSettings (state, settings) {
+  setSettings(state, settings) {
     state.settings = settings
   },
-  setConfig (state, config) {
+  setConfig(state, config) {
     state.config = config
   }
 }
 
 export const actions = {
   async updateEvents({ commit }, page) {
-    const events = await this.$axios.$get(`/event/${page.month-1}/${page.year}`)
+    const events = await this.$axios.$get(`/event/${page.month - 1}/${page.year}`)
     commit('setEvents', events)
   },
   async updateMeta({ commit }) {

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 14/14] .

---
 .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
       },