From 24a99d0eb066a837522365dcf5f9c3bc94b30d1d Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Wed, 29 Jul 2020 02:18:46 +0200
Subject: [PATCH] minor

---
 components/Event.vue       | 20 +++++++++++---------
 components/FollowMe.vue    |  4 ++--
 components/admin/Theme.vue |  3 ---
 pages/Authorize.vue        |  6 +++---
 pages/Login.vue            | 20 ++++++++++----------
 pages/Register.vue         |  8 +++++---
 pages/event/_id.vue        | 10 +++++-----
 pages/settings.vue         |  6 +++---
 8 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/components/Event.vue b/components/Event.vue
index 33436cb4..984a3e51 100644
--- a/components/Event.vue
+++ b/components/Event.vue
@@ -1,10 +1,9 @@
 <template lang="pug">
   v-card.h-event.event.mt-1
     nuxt-link(:to='`/event/${event.id}`')
-      v-img.align-end(:src="`/media/thumb/${event.image_path}`"
-        gradient="to bottom, rgba(255,255,255,.1), rgba(255,255,255,.9)"
-        height="250" position="top top"
-        :class="settings['theme.is_dark']?'light--text':'dark--text'")
+      v-img.align-end.white--text(:src="`/media/thumb/${event.image_path}`"
+        gradient="to bottom, rgba(0,0,0,.1), rgba(0,0,0,.7)"
+        height="250" position="top top")
         v-card-title {{event.title}}
     //- v-list-item
       v-list-item-content
@@ -20,12 +19,15 @@
     v-card-actions
       v-chip.ml-1(v-for='tag in event.tags' link :key='tag' outlined color='primary' small) {{tag}}
       v-spacer
-      v-btn(icon)
-        v-icon mdi-bookmark
-      v-btn(icon color='yellow')
+      //- v-btn(icon color='yellow')
         v-icon mdi-share-variant
-      v-btn(icon color='primary' nuxt :to='`/event/${event.id}`')
-        v-icon mdi-chevron-right
+      v-menu(offset-y)
+        template(v-slot:activator="{on}")
+          v-btn(icon v-on='on' color='primary')
+            v-icon mdi-dots-vertical
+        v-list
+          v-list-item
+            v-list-item-title test
 
   //- <!-- //- v-card.event.h-event.mt-1(max-width="400")
   //-   p ciao
diff --git a/components/FollowMe.vue b/components/FollowMe.vue
index f7754bf9..d7cf82ff 100644
--- a/components/FollowMe.vue
+++ b/components/FollowMe.vue
@@ -1,9 +1,9 @@
 <template lang='pug'>
   div
     p(v-html="$t('event.follow_me_description', { title: settings.title, account: `@${settings.instance_name}@${domain}`})")
-    el-input(v-model='instance_hostname' ref='instance')
+    v-text-field(v-model='instance_hostname' ref='instance')
       a(slot='append' :href='link' target='_blank')
-        el-button(:disabled='(!couldGo || !proceed)' plain type="primary" icon='el-icon-document') {{$t("common.follow")}}
+        v-btn(:disabled='(!couldGo || !proceed)' plain type="primary" icon='el-icon-document') {{$t("common.follow")}}
     p.mt-2 <img class='instance_thumb' :src="instance.thumbnail"/> {{instance.title}}
 </template>
 <script>
diff --git a/components/admin/Theme.vue b/components/admin/Theme.vue
index 026be73d..f2e5e581 100644
--- a/components/admin/Theme.vue
+++ b/components/admin/Theme.vue
@@ -10,9 +10,6 @@
         v-btn(small @click='resetLogo') Reset
         v-img(:src='`${settings.baseurl}/favicon.ico?${logoKey}`'
           max-width="100px" max-height="80px" contain)
-      //- el-button-group
-        el-button(size='small' type='primary' plain) Select file
-        el-button(size='small' type='success' plain @click='resetLogo') Reset
 
     v-switch.mt-5(v-model='is_dark'
       inset
diff --git a/pages/Authorize.vue b/pages/Authorize.vue
index 6041d4c3..0222b476 100644
--- a/pages/Authorize.vue
+++ b/pages/Authorize.vue
@@ -1,5 +1,5 @@
 <template lang='pug'>
-  el-card.mt-5
+  v-card.mt-5
     h4(slot='header')
       nuxt-link(to='/')
         img(src='/favicon.ico')
@@ -13,9 +13,9 @@
       br
       br
       a(:href='authorizeURL')
-        el-button.mr-1(plain type='success' icon='el-icon-check') {{$t('common.authorize')}}
+        v-btn.mr-1(plain color='success') {{$t('common.authorize')}}
       a(href='/')
-        el-button.mt-1(plain type='danger') {{$t('common.cancel')}}
+        v-btn.mt-1(plain color='danger') {{$t('common.cancel')}}
 </template>
 
 <script>
diff --git a/pages/Login.vue b/pages/Login.vue
index 1eab67bd..3afe40d8 100644
--- a/pages/Login.vue
+++ b/pages/Login.vue
@@ -7,7 +7,7 @@
         v-card-subtitle(v-text="$t('login.description')")
 
         v-card-text
-          v-form
+          v-form(v-model='valid' ref='form')
             v-text-field(v-model='email' type='email'
               :rules='validators.email' autofocus
               :placeholder='$t("common.email")'
@@ -18,9 +18,13 @@
               type='password'
               :placeholder='$t("common.password")')
 
+          v-card-actions
+            v-spacer
+            v-btn(text @click='forgot' small) {{$t('login.forgot_password')}}
+
           v-card-actions
             v-btn(color='success'
-              :disabled='disabled'
+              :disabled='!valid'
               @click='submit') {{$t('common.login')}}
 
             v-btn(v-if='settings.allow_registration'
@@ -28,7 +32,6 @@
               text
               color='orange') {{$t('login.not_registered')}}
 
-            v-btn(text @click='forgot') {{$t('login.forgot_password')}}
 </template>
 
 <script>
@@ -42,19 +45,17 @@ export default {
       validators,
       password: '',
       email: '',
-      loading: false
+      loading: false,
+      valid: false
     }
   },
   computed: {
-    ...mapState(['settings']),
-    disabled () {
-      return !this.email || !this.password
-    }
+    ...mapState(['settings'])
   },
   methods: {
     async forgot () {
       if (!this.email) {
-        this.$root.$message({ message: this.$t('login.insert_email'), color: 'error' })
+      //   this.$root.$message({ message: this.$t('login.insert_email'), color: 'error' })
         this.$refs.email.focus()
         return
       }
@@ -64,7 +65,6 @@ export default {
       this.$root.$message({ message: this.$t('login.check_email'), color: 'success' })
     },
     async submit (e) {
-      if (this.disabled) { return false }
       e.preventDefault()
       try {
         this.loading = true
diff --git a/pages/Register.vue b/pages/Register.vue
index d74d5c70..f60d42cd 100644
--- a/pages/Register.vue
+++ b/pages/Register.vue
@@ -8,7 +8,7 @@
         v-card-text
 
           p(v-html="$t('register.description')")
-          v-form(ref='form')
+          v-form(ref='form' v-model='valid')
             v-text-field(ref='email'
               v-model='user.email' type='email'
               :rules="validators.email"
@@ -23,7 +23,8 @@
               :label="$t('common.description')")
 
         v-card-actions
-          v-btn(@click='register' color='primary') {{$t('common.send')}}
+          v-spacer
+          v-btn(@click='register' :disabled='!valid' color='primary') {{$t('common.send')}}
             v-icon mdi-chevron-right
 </template>
 
@@ -38,7 +39,8 @@ export default {
     return {
       validators,
       loading: false,
-      user: {}
+      user: {},
+      valid: false
     }
   },
   // https://nuxtjs.org/api/pages-validate/
diff --git a/pages/event/_id.vue b/pages/event/_id.vue
index f9595cc0..6231a7ed 100644
--- a/pages/event/_id.vue
+++ b/pages/event/_id.vue
@@ -64,11 +64,11 @@
           v-btn(type='text' @click='showFollowMe=true') {{$t('event.interact_with_me')}}
           span(v-if='settings.enable_resources && event.resources.length')  -  {{$tc('common.n_resources', event.resources.length)}}
 
-        v-dialog(:visible.sync='showFollowMe' destroy-on-close)
+        v-dialog(v-model='showFollowMe' destroy-on-close)
           h4(slot='title') {{$t('common.follow_me_title')}}
           FollowMe
 
-        v-dialog.showResource#resourceDialog(:visible.sync='showResources' fullscreen
+        v-dialog.showResource#resourceDialog(v-model='showResources' fullscreen
           width='95vw'
           destroy-on-close
           @keydown.native.right='$refs.carousel.next()'
@@ -78,9 +78,9 @@
               v-img(:src='attachment.url')
         v-card.mb-1(v-if='settings.enable_resources' v-for='resource in event.resources' :key='resource.id' :class='{disabled: resource.hidden}')
           span
-            el-dropdown.mr-2(v-if='$auth.user && $auth.user.is_admin')
-              el-button(circle icon='el-icon-more' size='mini')
-              el-dropdown-menu(slot='dropdown')
+            v-dropdown.mr-2(v-if='$auth.user && $auth.user.is_admin')
+              v-btn(circle icon='el-icon-more' size='mini')
+              v-menu(slot='dropdown')
                 el-dropdown-item(v-if='!resource.hidden' icon='el-icon-remove' @click.native='hideResource(resource, true)') {{$t('admin.hide_resource')}}
                 el-dropdown-item(v-else icon='el-icon-success' @click.native='hideResource(resource, false)') {{$t('admin.show_resource')}}
                 el-dropdown-item(icon='el-icon-delete' @click.native='deleteResource(resource)') {{$t('admin.delete_resource')}}
diff --git a/pages/settings.vue b/pages/settings.vue
index e754d27d..25b0a632 100644
--- a/pages/settings.vue
+++ b/pages/settings.vue
@@ -1,5 +1,5 @@
 <template lang="pug">
-  el-main
+  v-main
 
     p {{$auth.user.email}}
     //- el-form(action='/api/user' method='PUT' @submit.native.prevent='update_settings' inline label-width='200px')
@@ -7,9 +7,9 @@
     //-     el-input(v-model='password' type='password')
     //-   el-button(type='success' native-type='submit') {{$t('common.save')}}
 
-    el-divider {{$t('settings.danger_section')}}
+    p {{$t('settings.danger_section')}}
     p {{$t('settings.remove_account')}}
-    el-button(type='danger' @click='remove_account') {{$t('common.remove')}}
+    v-btn(color='danger' @click='remove_account') {{$t('common.remove')}}
 </template>
 <script>
 import { mapState } from 'vuex'