From 802ec5cd8b295150686e8ce7613d31b33d7228bf Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Tue, 22 Oct 2019 23:49:21 +0200
Subject: [PATCH] [refactoring] remove el-card usage

---
 pages/about.vue     |  6 ++----
 pages/add/_edit.vue |  7 ++-----
 pages/admin.vue     |  5 +----
 pages/event/_id.vue | 44 ++++++++++++++++++++++++++++----------------
 pages/export.vue    |  7 ++-----
 pages/settings.vue  |  5 ++---
 6 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/pages/about.vue b/pages/about.vue
index e70c1bd8..9c750384 100644
--- a/pages/about.vue
+++ b/pages/about.vue
@@ -1,8 +1,6 @@
 <template lang="pug">
-  el-card
-    nuxt-link.float-right(to='/')
-      el-button(circle  icon='el-icon-close' type='danger' size='small' plain)    
-    h3 {{$t('common.info')}}
+  el-main
+    h4 <nuxt-link to='/'><img src='/favicon.ico'/></nuxt-link> {{$t('common.info')}}
 
     div(v-html='$t("about")')
     hr
diff --git a/pages/add/_edit.vue b/pages/add/_edit.vue
index 80786a9f..45831c96 100644
--- a/pages/add/_edit.vue
+++ b/pages/add/_edit.vue
@@ -1,9 +1,6 @@
 <template lang="pug">
   el-main
-    nuxt-link.float-right(to='/')
-      el-button(circle  icon='el-icon-close' type='danger' size='small' plain)
-
-    h5 {{edit?$t('common.edit_event'):$t('common.add_event')}}
+    h4 <nuxt-link to='/'><img src='/favicon.ico'/></nuxt-link> {{edit?$t('common.edit_event'):$t('common.add_event')}}
     el-form(v-loading='loading')
       client-only
         el-tabs.mb-2(v-model='activeTab')
@@ -60,7 +57,7 @@
               el-select.ml-2(v-if='event.type==="recurrent"' v-model='event.recurrent.frequency' placeholder='Frequenza')
                 el-option(:label="$t('event.each_week')" value='1w' key='1w')
                 el-option(:label="$t('event.each_2w')" value='2w' key='2w')
-                el-option(:label="$t('event.each_month')" value='1m' key='1m')
+                //- el-option(:label="$t('event.each_month')" value='1m' key='1m')
 
             v-date-picker.mb-2.mt-3(
               :mode='event.type === "multidate" ? "range" : event.type === "recurrent" ? "multiple" : "single"'
diff --git a/pages/admin.vue b/pages/admin.vue
index dfb8b272..3fa9dbe5 100644
--- a/pages/admin.vue
+++ b/pages/admin.vue
@@ -1,9 +1,6 @@
 <template lang="pug">
   el-main
-    nuxt-link.float-right(to='/')
-      el-button(circle  icon='el-icon-close' type='danger' size='small' plain)
-
-    h5 {{$t('common.admin')}}
+    h4 <nuxt-link to='/'><img src='/favicon.ico'/></nuxt-link> {{$t('common.admin')}}
 
     el-tabs(v-model='tab')
 
diff --git a/pages/event/_id.vue b/pages/event/_id.vue
index d11d11aa..deddf056 100644
--- a/pages/event/_id.vue
+++ b/pages/event/_id.vue
@@ -1,21 +1,23 @@
 <template lang="pug">
   el-main#eventDetail
 
-    nuxt-link.mr-2(to='/')
-      img#logo(src='/favicon.ico')
+    .head
+      nuxt-link.mr-2(to='/')
+        img#logo(src='/favicon.ico')
 
-    span.title {{event.title}}
+      span.title {{event.title}}
 
-    div.float-right
-      nuxt-link.mr-1(:to='`/event/${prev}`')
-        el-button(circle plain size='small' icon='el-icon-arrow-left' :disabled='!prev')
-      nuxt-link(:to='`/event/${next}`')
-        el-button(circle plain size='small' :disabled='!next' icon='el-icon-arrow-right')
+      div.float-right
+        nuxt-link.mr-1(:to='`/event/${prev}`')
+          el-button(circle plain size='small' icon='el-icon-arrow-left' :disabled='!prev')
+        nuxt-link(:to='`/event/${next}`')
+          el-button(circle plain size='small' :disabled='!next' icon='el-icon-arrow-right')
 
-    //- image
-    el-row.mt-3
+    el-row
       el-col(:md='18')
+        //- event image
         img.main.mb-3(:src='imgPath' v-if='event.image_path')
+        //- info for mobile screen
         div.d-block.d-lg-none
           span <b>{{event|when}}</b> - {{event|to}}<br/>
           span <b>{{event.place.name}}</b> - {{event.place.address}}
@@ -24,17 +26,16 @@
         el-tag.mr-1.mb-1(v-for='tag in event.tags'
           size='mini' :key='tag.tag') {{tag.tag}}
 
+      //- info & actions for desktop
       el-col.d-none.d-lg-block(:md='6')
-        el-menu.menu
-          //- el-divider {{$t('common.when')}}
-            //- When(:event='event')
-          el-divider {{$t('common.info')}}
+        el-menu.menu.mt-2
           p <b>{{event|when}}</b> - {{event|to}}
           p <b>{{event.place.name}}</b> - {{event.place.address}}
           el-divider {{$t('common.actions')}}
           el-menu-item(v-clipboard:success='copyLink'
             v-clipboard:copy='`${settings.baseurl}/event/${event.id}`') <i class='el-icon-paperclip'></i> {{$t('common.copy_link')}}
-          el-menu-item
+          //- TODO (ics of recurrent events)
+          el-menu-item(v-if='!event.recurrent')
             a.d-block(:href='`${settings.baseurl}/api/event/${event.id}.ics`') {{$t('common.add_to_calendar')}}
           //- el-button(plain size='mini' type='primary'
           //-   icon='el-icon-document' ) {{$t('common.send_via_mail')}}
@@ -196,7 +197,18 @@ export default {
 <style lang='less'>
 
 #eventDetail {
-  
+  background-color: white;
+  margin-bottom: 30px;
+  .head {
+    z-index: 1;
+    position: sticky;
+    top: 0px;
+    padding-top: 10px;
+    padding-bottom: 10px;
+    background-color: white;
+    border-bottom: 1px solid #e6e6e6;
+  }
+
   .menu {
     border-right: none;
     border-left: 1px solid #e6e6e6;
diff --git a/pages/export.vue b/pages/export.vue
index 8518ca1e..eb81635c 100644
--- a/pages/export.vue
+++ b/pages/export.vue
@@ -1,9 +1,6 @@
 <template lang="pug">
-  el-card
-
-    nuxt-link.float-right(to='/')
-      el-button(circle  icon='el-icon-close' type='danger' size='small' plain)
-    h5 {{$t('common.export')}}
+  el-main
+    h4 <nuxt-link to='/'><img src='/favicon.ico'/></nuxt-link> {{$t('common.export')}}
 
     p {{$t('export.intro')}}
     Search
diff --git a/pages/settings.vue b/pages/settings.vue
index e5d82ae7..906da722 100644
--- a/pages/settings.vue
+++ b/pages/settings.vue
@@ -1,8 +1,7 @@
 <template lang="pug">
   el-main
-    nuxt-link.float-right(to='/')
-      el-button(circle  icon='el-icon-close' type='danger' size='small' plain)
-    h5 {{$t('common.settings')}}
+    h4 <nuxt-link to='/'><img src='/favicon.ico'/></nuxt-link> {{$t('common.settings')}}
+
     el-divider {{$auth.user.email}}
     el-form(action='/api/user' method='PUT' @submit.native.prevent='update_settings' inline label-width='200px')