From 91579e56ddf7abc67c96626096205ec1a61657e8 Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Mon, 4 Mar 2019 02:15:22 +0100
Subject: [PATCH] element ui usage

---
 app/controller/bot.js                 |  18 ++--
 app/mail.js                           |   2 +-
 client/package.json                   |   2 +-
 client/src/App.vue                    |  39 ++++---
 client/src/assets/main.css            |  14 +++
 client/src/components/Admin.vue       |  55 +++++-----
 client/src/components/Event.vue       |  17 +--
 client/src/components/EventDetail.vue |  68 ++++++------
 client/src/components/Export.vue      |  53 +++++-----
 client/src/components/Home.vue        |   5 +-
 client/src/components/Login.vue       |  27 ++---
 client/src/components/Settings.vue    |   2 +-
 client/src/components/newEvent.vue    | 144 ++++++++++++--------------
 client/src/locale/it.js               |  10 +-
 client/yarn.lock                      |  28 ++---
 views/feed/rss.pug                    |   4 +-
 16 files changed, 241 insertions(+), 247 deletions(-)

diff --git a/app/controller/bot.js b/app/controller/bot.js
index eaed5dac..885a91d2 100644
--- a/app/controller/bot.js
+++ b/app/controller/bot.js
@@ -43,23 +43,23 @@ ${event.description} - ${event.tags.map(t => '#' + t.tag).join(' ')} ${config.ba
     if (!replyid) return
     // const event = await Event.findOne({ where: { activitypub_id: replyid } })
     // if (!event) {
-      // check for comment..
-      // const comment = await Comment.findOne( {where: { }})
+    // 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)
+    // 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)
diff --git a/app/mail.js b/app/mail.js
index 0a776279..c02dc611 100644
--- a/app/mail.js
+++ b/app/mail.js
@@ -14,7 +14,7 @@ const mail = {
         }
       },
       message: {
-        from: `${config.title} <${config.admin}>`
+        from: `${config.title} <${config.smtp.auth.user}>`
       },
       send: true,
       i18n: {},
diff --git a/client/package.json b/client/package.json
index 31e18429..91fff9e9 100644
--- a/client/package.json
+++ b/client/package.json
@@ -10,7 +10,7 @@
   "dependencies": {
     "axios": "^0.18.0",
     "bootstrap-vue": "^2.0.0-rc.13",
-    "element-ui": "^2.6.0",
+    "element-ui": "^2.6.1",
     "mastodon-api": "^1.3.0",
     "moment": "^2.23.0",
     "node-sass": "^4.11.0",
diff --git a/client/src/App.vue b/client/src/App.vue
index d0a06d67..4ca5811d 100644
--- a/client/src/App.vue
+++ b/client/src/App.vue
@@ -2,30 +2,27 @@
   #app
     b-navbar(type="dark" variant="dark" toggleable='lg')
       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(v-if='logged')
-          b-nav-item(to='/new_event' v-b-tooltip :title='$t("Add Event")' ) <v-icon color='lightgreen' name='plus' scale='2'/> 
-          b-nav-item(to='/settings' v-b-tooltip :title='$t("Settings")') <v-icon color='orange' name='cog' scale='2'/>
-          b-nav-item(v-if='user.is_admin' to='/admin' v-b-tooltip :title='$t("Admin")') <v-icon color='lightblue' name='tools' scale='2'/>
-          b-nav-item(to='/export' v-b-tooltip :title='$t("Export")') <v-icon name='file-export' scale='2' color='yellow'/>
-          b-nav-item(variant='danger' @click='logout' v-b-tooltip :title='$t("Logout")') <v-icon color='red' name='sign-out-alt' scale='2'/>
-        b-navbar-nav(v-else)
-          b-nav-item(to='/login' v-b-tooltip :title='$t("Login")' ) <v-icon color='lightgreen' name='lock'/> Login
-          b-nav-item(to='/register' v-b-tooltip :title='$t("Register")' ) <v-icon color='orange' name='user'/> Register
-        b-navbar-nav.ml-auto
-          b-navbar-brand(to='/') <img id='logo' src='gancio_logo.svg'/>
+        b-navbar-nav
+          b-nav-item(v-if='!logged' to='/login'  v-b-tooltip :title='$t("Login")') <v-icon color='lightgreen' name='lock' /> {{$t('User')}}
+          //- b-nav-item(v-if='!logged' to='/register' v-b-tooltip :title='$t("Register")' ) <v-icon color='orange' name='user' scale='2'/>
+          b-nav-item(v-if='logged' to='/new_event' v-b-tooltip :title='$t("Add Event")' ) <v-icon color='lightgreen' name='plus'/> 
+          b-nav-item(v-if='logged' to='/settings' v-b-tooltip :title='$t("Settings")') <v-icon color='orange' name='cog'/>
+          b-nav-item(v-if='user.is_admin' to='/admin' v-b-tooltip :title='$t("Admin")') <v-icon color='lightblue' name='tools'/>
+          b-nav-item(to='/export' v-b-tooltip :title='$t("Export")') <v-icon name='file-export' color='yellow'/>
+          b-nav-item(v-if='logged' variant='danger' @click='logout' v-b-tooltip :title='$t("Logout")') <v-icon color='red' name='sign-out-alt'/>
         b-navbar-nav#search.ml-auto
-          b-nav-item <v-icon name='search' color='orange' scale='2'/>
+          b-nav-item <v-icon name='search' color='orange' />
           b-nav-form
-            typeahead.ml-1.mt-1(v-model='filters_places' 
-              textField='name' valueField='name'
-              updateOnMatchOnly
-              :data='places' multiple placeholder='Luogo')
-          b-nav-form
-            typeahead.ml-1.mt-1(v-model='filters_tags'
-              updateOnMatchOnly
-              textField='tag' valueField='tag'
-              :data='tags' multiple placeholder='Tags')
+            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') 
     Home
     transition(name="fade" mode="out-in")
       router-view(name='modal')
diff --git a/client/src/assets/main.css b/client/src/assets/main.css
index fead2671..672dc25a 100644
--- a/client/src/assets/main.css
+++ b/client/src/assets/main.css
@@ -9,4 +9,18 @@ pre {
   white-space: pre-line;
   font-family: unset;
   font-size: 1em;
+}
+
+.el-tag {
+  color: white;
+  font-size: 15px;
+  font-family: Lato;
+}
+
+.el-tag--info {
+  color: #909399
+}
+
+.el-tag:hover {
+  cursor: pointer;
 }
\ No newline at end of file
diff --git a/client/src/components/Admin.vue b/client/src/components/Admin.vue
index 6db50099..486f4449 100644
--- a/client/src/components/Admin.vue
+++ b/client/src/components/Admin.vue
@@ -1,47 +1,48 @@
 <template lang="pug">
-  b-modal(hide-footer hide-header
-    @hide='$router.replace("/")' size='lg' :visible='true')
-    h4.text-center Admin
-    b-tabs(pills)
-
-      b-tab.pt-1
-        template(slot='title')
+  el-dialog(@close='$router.replace("/")' :title='$t("Admin")' center width='900px' :visible='true')
+    el-tabs
+      el-tab-pane.pt-1
+        template(slot='label')
           v-icon(name='users')
-          span  {{$t('Users')}}
+          span.ml-1 {{$t('Users')}}
         b-table(:items='users' :fields='userFields' striped small hover
           :per-page='5' :current-page='userPage')
           template(slot='action' slot-scope='data')
-            b-button.mr-1(:variant='data.item.is_active?"warning":"success"' @click='toggle(data.item)') {{data.item.is_active?$t('Deactivate'):$t('Activate')}}
-            b-button(:variant='data.item.is_admin?"danger":"warning"' @click='toggleAdmin(data.item)') {{data.item.is_admin?$t('Remove Admin'):$t('Admin')}}
+            el-button.mr-1(size='mini' :type='data.item.is_active?"warning":"success"' @click='toggle(data.item)') {{data.item.is_active?$t('Deactivate'):$t('Activate')}}
+            el-button(size='mini' :type='data.item.is_admin?"danger":"warning"' @click='toggleAdmin(data.item)') {{data.item.is_admin?$t('Remove Admin'):$t('Admin')}}
         b-pagination(:per-page='5' v-model='userPage' :total-rows='users.length')
-      b-tab.pt-1
-        template(slot='title')
+      el-tab-pane.pt-1
+        template(slot='label')
           v-icon(name='map-marker-alt')
-          span  {{$t('Places')}}
+          span.ml-1 {{$t('Places')}}
         p You can change place's name or address
-        b-form.mb-2(inline)
-          b-input.mr-1(:placeholder='$t("Name")' v-model='place.name')
-          b-input.mr-1(:placeholder='$t("Address")' v-model='place.address')
-          b-button(variant='primary' @click='savePlace') {{$t('Save')}}
+        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='5' :current-page='placePage')
         b-pagination(:per-page='5' v-model='placePage' :total-rows='places.length')
-      b-tab.pt-1
-        template(slot='title')
+
+      el-tab-pane.pt-1
+        template(slot='label')
           v-icon(name='tag')
           span  {{$t('Tags')}}
         p You can choose colors of your tags
-        b-table(:items='tags' :fields='tagFields' 
-          striped small hover :per-page='10' :current-page='tagPage')
-          template(slot='tag' slot-scope='data')
-            b-badge(:style='{backgroundColor: data.item.color}') {{data.item.tag}}
-          template(slot='color' slot-scope='data')
-            el-color-picker(v-model='data.item.color' @change='updateColor(data.item)')
+        el-table(:data='tags' striped small hover :per-page='10' :current-page='tagPage')
+          el-table-column(label='Tag')
+            template(slot-scope='data')
+              el-tag(:color='data.row.color' size='mini') {{data.row.tag}}
+          el-table-column(label='Color')
+            template(slot-scope='data')
+              el-color-picker(v-model='data.row.color' @change='updateColor(data.row)')
         b-pagination(:per-page='10' v-model='tagPage' :total-rows='tags.length')
-      b-tab.pt-1
-        template(slot='title')
+      el-tab-pane.pt-1
+        template(slot='label')
           v-icon(name='tools')
           span  {{$t('Settings')}}
         
diff --git a/client/src/components/Event.vue b/client/src/components/Event.vue
index 0ca74601..f7b73152 100644
--- a/client/src/components/Event.vue
+++ b/client/src/components/Event.vue
@@ -6,8 +6,8 @@
       div <v-icon name='clock'/> {{event.start_datetime|datetime}}
       span <v-icon name='map-marker-alt'/> {{event.place.name}}
       br
-      b-badge(:style='{backgroundColor: tag.color}' v-for='tag in event.tags' href='#' 
-        @click.stop='addSearchTag(tag)') {{tag.tag}}
+      el-tag.mr-1(:color='tag.color' v-for='tag in event.tags'
+        size='mini' @click.stop='addSearchTag(tag)') {{tag.tag}}
 </template>
 <script>
 import { mapState, mapActions } from 'vuex';
@@ -43,8 +43,16 @@ export default {
   content: ''
 } */
 
+.el-card {
+  border: none;
+}
+
+.el-card img {
+  width: 100%;
+}
+
 .card-columns .card {
-  margin-top: 0.3em;
+  margin-top: 0.2em;
   margin-bottom: 0em;
 }
 
@@ -53,8 +61,5 @@ export default {
   object-fit: cover;
 }
 
-.badge {
-  margin-left: 0.1rem;
-}
 </style>
 
diff --git a/client/src/components/EventDetail.vue b/client/src/components/EventDetail.vue
index a001dae9..45cf30e8 100644
--- a/client/src/components/EventDetail.vue
+++ b/client/src/components/EventDetail.vue
@@ -1,25 +1,23 @@
 <template lang="pug">
-  b-modal#eventDetail(hide-footer hide-header
-    @hide='$router.replace("/")' size='lg' :visible='true')
-
-    b-card(bg-variant='dark' href='#' text-variant='white' 
-      no-body, :img-src='imgPath')
-      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 {{event.description}}
-        br
-        b-badge(:style='{backgroundColor: tag.color}' v-for='tag in event.tags') {{tag.tag}}
-      b-navbar(v-if='mine' type="dark" variant="dark" toggleable='lg')
-        b-navbar-nav.ml-auto
-          b-nav-item(@click.prevent='remove') <v-icon color='red' name='times'/> {{$t('Remove')}} 
-          b-nav-item(:to='"/edit/"+event.id') <v-icon color='orange' name='edit'/> {{$t('Edit')}}
+  el-dialog#eventDetail(@close='$router.replace("/")' :visible='true' top='4vh')
+    img(:src='imgPath')
+    el-card(v-loading='loading')
+      h4 {{event.title}}
+      h6 <v-icon name='clock' /> {{event.start_datetime|datetime}}
+      h6 <v-icon name='map-marker-alt' />  {{event.place.name}} - {{event.place.address}}
+    el-card(v-if='event.description || event.tags && event.tags.length')
+      pre.mb-2 {{event.description}}
+      el-tag.mr-1(:color='tag.color' v-for='tag in event.tags'
+        size='mini') {{tag.tag}}
+      .ml-auto(v-if='mine')
+        hr
+        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')}}
+    //- 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')
@@ -48,6 +46,7 @@ export default {
     return {
       event: { comments: [], place: {}},
       id: null,
+      loading: true,
     }
   },
   mounted () {
@@ -60,6 +59,7 @@ export default {
     async load () {
       const event = await api.getEvent(this.id)
       this.event = event
+      this.loading = false
     },
     async remove () {
       await api.delEvent(this.event.id)
@@ -70,23 +70,21 @@ export default {
 }
 </script>
 <style>
-#eventDetail .modal-body {
-  padding: 0px;
+#eventDetail .el-dialog {
+  min-width: 800px;
 }
 
-/* .card::before {
-  border-top: 4px solid black;
-  content: ''
-} */
-#eventDetail .card {
-  margin-left: -5px;
+#eventDetail .el-dialog__header {
+  display: none;
 }
-/* #eventDetail .card-img {
-  max-height: 150px;
-  object-fit: cover;
-} */
-#eventDetail .badge {
-  margin-left: 0.1rem;
+
+#eventDetail .el-dialog__body {
+  padding: 0px;
+  font-size: 17px;
+}
+
+#eventDetail img {
+  width: 100%;
 }
 </style>
 
diff --git a/client/src/components/Export.vue b/client/src/components/Export.vue
index 35f2146f..5595ef3f 100644
--- a/client/src/components/Export.vue
+++ b/client/src/components/Export.vue
@@ -1,38 +1,32 @@
 <template lang="pug">
-  b-modal(hide-footer hide-header
-    @hide='$router.replace("/")' size='lg' :visible='true' v-if='type')
-    h3.text-center Export
+  el-dialog(@close='$router.replace("/")' :title='$t("Export")' :visible='true' center width='600px')
     p {{$t('export_intro')}}
     
     li(v-if='filters.tags.length') {{$t('Tags')}}:
-      b-badge.ml-1(:style='{backgroundColor: tag.color}' v-for='tag in filters.tags') {{tag}}
+      el-tag.ml-1(color='#409EFF' size='mini' v-for='tag in filters.tags') {{tag}}
     li(v-if='filters.places.length') {{$t('Places')}}:
-      b-badge.ml-1(v-for='place in filters.places') {{place}}
-    b-tabs(pills vertical)
-      b-tab.pt-1(title='feed rss' :active="type === 'feed'" @click='type="feed"')
-        p(v-html='$t(`export_feed_explanation`)')
-        b-input-group.mb-2(v-if='showLink')
-          b-form-input( v-model='link' autocomplete='off')
-          b-input-group-append
-            b-button(variant="success" v-clipboard:copy="link") <v-icon name='clipboard'/> Copy 
+      el-tag.ml-1(color='#409EFF' size='mini' v-for='place in filters.places') {{place}}
+    el-tabs.mt-2(tabPosition='left' v-model='type')
+      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")}}
 
-      b-tab.pt-1(title='ics/ical' :active="type === 'ics'" @click='type="ics"')
+      el-tab-pane.pt-1(label='ics/ical' name='ics')
         p(v-html='$t(`export_ical_explanation`)')
-        b-input-group.mb-2(v-if='showLink')
-          b-form-input( v-model='link' autocomplete='off')
-          b-input-group-append
-            b-button(variant="success" v-clipboard:copy="link") <v-icon name='clipboard'/> Copy 
-
-      b-tab.pt-1(title='email' :active="type === 'email'" @click='type="email"')
+        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='email' name='email')
         p(v-html='$t(`export_email_explanation`)')
         b-form
           el-switch(v-model='mail.sendOnInsert' :active-text="$t('notify_on_insert')")
           br
-          el-switch(v-model='mail.reminder' :active-text="$t('send_reminder')") 
-          b-form-input.mt-1(v-model='mail.mail' :placeholder="$t('Insert your address')")
-          b-button.mt-1.float-right(variant='success' @click='activate_email') {{$t('Send')}}
+          el-switch.mt-2(v-model='mail.reminder' :active-text="$t('send_reminder')") 
+          el-input.mt-2(v-model='mail.mail' :placeholder="$t('Insert your address')")
+          el-button.mt-2.float-right(type='success' @click='activate_email') {{$t('Send')}}
 
-      b-tab.pt-1(title='list' :active="type === 'list'" @click='type="list"')
+      el-tab-pane.pt-1(label='list' name='list')
         p(v-html='$t(`export_list_explanation`)')
         b-card.mb-1(no-body header='Eventi')
           b-list-group#list(flush)
@@ -44,13 +38,16 @@
                 strong.mb-1 {{event.title}}
                 br
                 small.float-right {{event.place.name}}
-                b-badge.float-left.ml-1(:style='{backgroundColor: tag.color}' v-for='tag in event.tags') {{tag.tag}}
-        b-form-textarea(v-model='script')
+                el-tag.mr-1(:color='tag.color' size='mini' v-for='tag in event.tags') {{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
 
-      b-tab.pt-1(title='calendar' :active="type === 'calendar'" @click='type="calendar"')
+
+      el-tab-pane.pt-1(label='calendar' name='calendar')
         p(v-html='$t(`export_calendar_explanation`)')
-        Calendar
-        b-form-textarea(v-model='script')
+        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>
diff --git a/client/src/components/Home.vue b/client/src/components/Home.vue
index 2a6a4a8e..ad18b0c0 100644
--- a/client/src/components/Home.vue
+++ b/client/src/components/Home.vue
@@ -2,7 +2,6 @@
   b-container
     b-card-group(columns)
       Calendar
-      //- transition-group(name="list" tag="div")
       Event.item(v-for='event in filteredEvents'
         :key='event.id'
         :event='event')
@@ -30,7 +29,7 @@ export default {
 
 .card-columns {
   column-count: 1;
-  column-gap: 0.3em;
+  column-gap: 0.2em;
 }
 @media (min-width: 576px) {
   .container {
@@ -38,7 +37,6 @@ export default {
   }
   .card-columns {
     column-count: 2;
-    column-gap: 0.3em;
   }
 }
 
@@ -48,7 +46,6 @@ export default {
   }
   .card-columns {
     column-count: 3;
-    column-gap: 0.3em;
   }
 }
 
diff --git a/client/src/components/Login.vue b/client/src/components/Login.vue
index 1b71cece..7d607910 100644
--- a/client/src/components/Login.vue
+++ b/client/src/components/Login.vue
@@ -1,20 +1,15 @@
 <template lang='pug'>
-  b-modal(hide-header hide-footer @shown="$refs.email.focus()"
-    @hide='$router.replace("/")' :visible='true')
-    h4.text-center.center {{$t('Login')}}
-    b-form
-      //- p.text-muted Sign In to your account
-      b-input-group.mb-1
-        b-input-group-prepend
-          b-input-group-text
-            v-icon(name="user")
-        b-form-input(ref='email' v-model="email" type="text" class="form-control" placeholder="E-mail" autocomplete="email")
-      b-input-group.mb-3
-        b-input-group-prepend
-          b-input-group-text
-            v-icon(name="lock")
-        b-form-input(v-model="password" type="password" class="form-control" placeholder="Password" autocomplete="current-password")
-      b-button.float-right(variant="success"  @click='submit') Login
+  el-dialog(@show="$refs.email.focus()" :title='$t("Login")' center width='400px'
+    @close='$router.replace("/")' :visible='true')
+    el-form
+      span {{$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-2(v-model='password' type='password' :placeholder='$t("Password")')
+        v-icon(name="lock" slot='prepend')
+      router-link(to='/register')
+        a {{$t('Not registered?')}}
+      el-button.float-right(plain type="success" icon='el-icon-arrow-right' @click='submit') {{$t('Login')}}
 </template>
 
 <script>
diff --git a/client/src/components/Settings.vue b/client/src/components/Settings.vue
index b5777e9b..40b6e601 100644
--- a/client/src/components/Settings.vue
+++ b/client/src/components/Settings.vue
@@ -1,5 +1,5 @@
 <template lang="pug">
-  b-modal(hide-header hide-footer @hide='$router.push("/")' :visible='true')
+  b-modal(hide-header hide-footer @hide='$router.go(-1)' :visible='true')
     h4.text-center {{$t('Settings')}}
       b-form
         b-input-group.mt-1(prepend='Email')
diff --git a/client/src/components/newEvent.vue b/client/src/components/newEvent.vue
index dd593bcd..d9569335 100644
--- a/client/src/components/newEvent.vue
+++ b/client/src/components/newEvent.vue
@@ -1,68 +1,66 @@
 <template lang="pug">
-  b-modal(hide-header hide-footer no-close-on-backdrop
-    @hide='$router.replace("/")' no-close-on-esc size='lg' :visible='true')
-    h4.text-center.center {{edit?$t('Edit event'):$t('New event')}}
-    b-tabs#tabss(pills v-model='activeTab')
-      b-form
-      b-tab
-        template(slot='title')
-          v-icon(name='map-marker-alt')
-          span  {{$t('Where')}}
-        b-card-body
-          span.text-muted {{$t('where_explanation')}}
-          typeahead.mb-3(v-model='event.place.name' :data='places_name' @enter='placeChoosed')
-          span.text-muted {{$t('address_explanation')}}
-          b-form-input(ref='address' v-model='event.place.address' @keydown.native.enter='next')
-      b-tab
-        template(slot='title')
-          v-icon(name='clock')
-          span  {{$t('When')}}
-        b-card-body
+  el-dialog(@close='$router.replace("/")' :title="edit?$t('Edit event'):$t('New event')" center :close-on-press-escape='false' :visible='true')
+    el-tabs.mb-2(v-model='activeTab' v-loading='sending')
+
+      el-tab-pane
+        span(slot='label') {{$t('Where')}} <v-icon name='map-marker-alt'/>
+        p {{$t('where_explanation')}}
+        el-form(label-width='120px')
+          el-form-item(:label='$t("Where")')
+            el-select(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')
+          el-form-item(:label='$t("Address")')
+            el-input(ref='address' v-model='event.place.address' @keydown.native.enter='next')
+          el-button.float-right(@click='next' :disabled='!couldProceed') {{$t('Next')}}
+
+      el-tab-pane
+        span(slot='label') {{$t('When')}} <v-icon name='clock'/>
+        el-form(label-width='120px')
+          span {{event.multidate ? $t('dates_explanation') : $t('date_explanation')}}
           el-switch.float-right(v-model='event.multidate' :active-text="$t('multidate_explanation')")
-          span.text-muted {{event.multidate ? $t('dates_explanation') : $t('date_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')
-          b-row
-            b-col
-              label.text-muted {{$t('time_start_explanation')}}
-              el-time-select(ref='time_start'
-                v-model="time.start"
-                :picker-options="{ start: '00:00', step: '00:30', end: '24:00'}")
-            b-col.text-right
-              label.text-muted {{$t('time_end_explanation')}}
-              el-time-select(
-                v-model='time.end'
-                :picker-options="{start: '00:00', step: '00:30', end: '24:00'}"
-              )
-          
-      b-tab
-        template(slot='title')
-          v-icon(name='file-alt')
-          span  {{$t('What')}}
-        b-card-body
-          span.text-muted {{$t('what_explanation')}}
-          b-form-input.mb-3(v-model.trim='event.title' autocomplete='off')
-          span.text-muted {{$t('description_explanation')}}
-          b-form-textarea.mb-3(v-model='event.description' :rows='3')
-          span.text-muted {{$t('tag_explanation')}}
-          typeahead(v-model="event.tags" :data='tags' multiple)
-      b-tab
-        template(slot='title')
-          v-icon(name='image')
-          span  {{$t('Media')}}
-        b-card-body
-          span.text-muted {{$t('media_explanation')}}
-          b-form-file(v-model='event.image', :placeholder='$t("Poster")' accept='image/*')
-      b-button(v-if='activeTab==0' variant='danger' @click='$router.go(-1)') {{$t('Cancel')}}
-      b-button.float-left(v-else variant='danger' @click='prev') {{$t('Prev')}}
-      b-button.float-right(v-if='activeTab<3' variant='success' @click='next' :disabled='!couldProceed') {{$t('Next')}}
-      b-button.float-right(v-else variant='success' @click='done') {{edit?$t('Edit'):$t('Send')}}
+          el-form-item(:label="$t('time_start_explanation')")
+            el-time-select(ref='time_start'
+              v-model="time.start"
+              :picker-options="{ start: '00:00', step: '00:30', end: '24:00'}")
+          el-form-item(:label="$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')}}
+
+      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')
+        span {{$t('description_explanation')}}
+        el-input.mb-3(v-model='event.description' type='textarea' :rows='3')
+        span {{$t('tag_explanation')}}
+        br 
+        //- typeahead(v-model="event.tags" :data='tags' multiple)
+        el-select(v-model='event.tags' multiple filterable allow-create
+          default-first-option placeholder='Tag')
+          el-option(v-for='tag in tags' :key='tag'
+            :label='tag' :value='tag') 
+
+        el-button.float-right(@click='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 '@/api'
 import { mapActions, mapState } from 'vuex'
 import moment from 'moment'
+import Calendar from './Calendar'
 export default {
+  components: { Calendar },
   data() {
     return {
       event: { 
@@ -70,11 +68,13 @@ export default {
         title: '', description: '', tags: [],
         multidate: false,
       },
+      visible: true,
       id: null,
-      activeTab: 0,
+      activeTab: "0",
       date: null,
       time: { start: '00:00', end: null },
-      edit: false
+      edit: false,
+      sending: false,
     }
   },
   name: 'newEvent',
@@ -107,12 +107,12 @@ export default {
       places: state => state.places
     }),
     couldProceed () {
-      switch(this.activeTab) {
+      switch(Number(this.activeTab)) {
         case 0:
           return this.event.place.name.length>0 && 
             this.event.place.address.length>0
         case 1:
-          return true
+          if (this.date && this.time.start) return true
           break
         case 2:
           return this.event.title.length>0
@@ -126,12 +126,13 @@ export default {
   methods: {
     ...mapActions(['addEvent', 'updateEvent', 'updateMeta']),
     next () {
-      this.activeTab++
+      this.activeTab = String(Number(this.activeTab)+1)
     },
     prev () {
-      this.activeTab--
+      this.activeTab = String(Number(this.activeTab-1))
     },
     placeChoosed () {
+      console.log('dentro placeChoosed')
       const place = this.places.find( p => p.name === this.event.place.name )
       if (place && place.address) {
         this.event.place.address = place.address
@@ -173,7 +174,7 @@ export default {
       }
       if (this.event.tags)
         this.event.tags.forEach(tag => formData.append('tags[]', tag))
-
+      this.sending = true
       try {
         if (this.edit) {
           await this.updateEvent(formData)
@@ -181,26 +182,13 @@ export default {
           await this.addEvent(formData)
         }
         this.updateMeta()
+        this.sending = false
         this.$router.go(-1)
       } catch (e) {
+        this.sending = false
         console.error(e)
       }
     }
   }
 }
-</script>
-
-<style scope>
-#tabss ul {
-  justify-content: space-evenly;
-  background: linear-gradient( #fff, #FFF 22px, #007bff, #fff 23px, #fff)
-}
-
-#tabss ul .nav-link {
-  background-color: white;
-}
-
-#tabss ul .nav-link.active {
-  background-color: #007bff;
-}
-</style>
+</script>
\ No newline at end of file
diff --git a/client/src/locale/it.js b/client/src/locale/it.js
index 43f08222..a2bdff3d 100644
--- a/client/src/locale/it.js
+++ b/client/src/locale/it.js
@@ -12,13 +12,13 @@ const it = {
   description_explanation: 'Descrivi l\'evento, dajene di copia/incolla',
   date_explanation: 'Seleziona il giorno',
   dates_explanation: 'Seleziona i giorni',
-  time_start_explanation: 'Inserisci un orario di inizio',
-  time_end_explanation: 'Puoi inserire un orario di fine',
+  time_start_explanation: 'Orario di inizio',
+  time_end_explanation: 'Orario di fine',
   media_explanation: 'Se vuoi puoi mettere una locandina/manifesto',
   tag_explanation: 'Puoi inserire un tag (es. concerto, corteo)',
   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 qui.`,
+  debbano essere libere. Per questo puoi rimanere aggiornata sugli eventi che vuoi, come meglio credi, senza necessariamente passare da questo sito.`,
   export_feed_explanation: `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>
@@ -41,6 +41,7 @@ const it = {
   Login: 'Entra',
   SignIn: 'Registrati',
   Cancel: 'Annulla',
+  Copy: 'Copia',
   Next: 'Continua',
   Prev: 'Indietro',
   Username: 'Utente',
@@ -68,7 +69,8 @@ const it = {
   registration_email: `Ciao, la tua registrazione sarà confermata nei prossimi giorni. Riceverai una conferma non temere.`,
   register_explanation: `I movimenti hanno bisogno di organizzarsi e autofinanziarsi. <br/>Questo è un dono per voi, non possiamo più vedervi usare le piattaforme del capitalismo. Solo 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.`
+    carne e sangue, scrivici quindi due righe per farci capire che eventi vorresti pubblicare.`,
+  login_explanation: ``
 }
 
 export default it
diff --git a/client/yarn.lock b/client/yarn.lock
index 5c9861b7..877bcffc 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -10,33 +10,33 @@
     "@babel/highlight" "^7.0.0"
 
 "@babel/core@^7.0.0":
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.2.2.tgz#07adba6dde27bb5ad8d8672f15fde3e08184a687"
-  integrity sha512-59vB0RWt09cAct5EIe58+NzGP4TFSD3Bz//2/ELy3ZeTeKF6VTD1AXlH8BGGbCX0PuobZBsIzO7IAI9PH67eKw==
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.3.4.tgz#921a5a13746c21e32445bf0798680e9d11a6530b"
+  integrity sha512-jRsuseXBo9pN197KnDwhhaaBzyZr2oIcLHHTt2oDdQrej5Qp57dCCJafWx5ivU8/alEYDpssYqv1MUqcxwQlrA==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@babel/generator" "^7.2.2"
+    "@babel/generator" "^7.3.4"
     "@babel/helpers" "^7.2.0"
-    "@babel/parser" "^7.2.2"
+    "@babel/parser" "^7.3.4"
     "@babel/template" "^7.2.2"
-    "@babel/traverse" "^7.2.2"
-    "@babel/types" "^7.2.2"
+    "@babel/traverse" "^7.3.4"
+    "@babel/types" "^7.3.4"
     convert-source-map "^1.1.0"
     debug "^4.1.0"
     json5 "^2.1.0"
-    lodash "^4.17.10"
+    lodash "^4.17.11"
     resolve "^1.3.2"
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.2.2":
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.2.2.tgz#18c816c70962640eab42fe8cae5f3947a5c65ccc"
-  integrity sha512-I4o675J/iS8k+P38dvJ3IBGqObLXyQLTxtrR4u9cSUJOURvafeEWb/pFMOTwtNrmq73mJzyF6ueTbO1BtN0Zeg==
+"@babel/generator@^7.3.4":
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.3.4.tgz#9aa48c1989257877a9d971296e5b73bfe72e446e"
+  integrity sha512-8EXhHRFqlVVWXPezBW5keTiQi/rJMQTg/Y9uVCEZ0CAF3PKtCCaVRnp64Ii1ujhkoDhhF1fVsImoN4yJ2uz4Wg==
   dependencies:
-    "@babel/types" "^7.2.2"
+    "@babel/types" "^7.3.4"
     jsesc "^2.5.1"
-    lodash "^4.17.10"
+    lodash "^4.17.11"
     source-map "^0.5.0"
     trim-right "^1.0.1"
 
diff --git a/views/feed/rss.pug b/views/feed/rss.pug
index a2d335bd..1528be4b 100644
--- a/views/feed/rss.pug
+++ b/views/feed/rss.pug
@@ -17,7 +17,7 @@ rss(version='2.0', xmlns:atom='<a href="http://www.w3.org/2005/Atom" rel="nofoll
                     | <h4>#{event.title}</h4>
                     | <strong>#{event.place.name} - #{event.place.address}</strong>
                     | #{moment(event.start_datetime).format("ddd, D MMMM HH:mm")}<br/>
-                    | !{event.description}
+                    | <pre>!{event.description}</pre>
                     | ]]>
-                pubDate= new Date(event.start_datetime).toUTCString()
+                pubDate= new Date(event.createdAt).toUTCString()
                 guid(isPermaLink='false') <a href="#{config.baseurl}/event/#{event.id}" rel="nofollow">#{config.baseurl}/event/#{event.id}</a>
\ No newline at end of file