From b598f0d1054c4ff7a6f1cc3f83b63d30e7888f41 Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Mon, 21 Nov 2022 13:21:32 +0100
Subject: [PATCH] appbar, map dialog

---
 assets/style.css                 |  2 +-
 components/Appbar.vue            |  2 +-
 components/ImportDialog.vue      |  7 ++-
 components/Map.vue               | 35 ++++++++-------
 components/eventAdmin.vue        | 73 +++++++++++++++++++++++---------
 layouts/default.vue              |  2 -
 server/api/controller/plugins.js |  2 +-
 7 files changed, 79 insertions(+), 44 deletions(-)

diff --git a/assets/style.css b/assets/style.css
index 55f48432..ddfd06a5 100644
--- a/assets/style.css
+++ b/assets/style.css
@@ -10,7 +10,7 @@ li {
 }
 
 .v-main {
-  padding-top: 224px !important;
+  padding-top: 176px !important;
 }
 
 .v-dialog .theme--dark.v-card {
diff --git a/components/Appbar.vue b/components/Appbar.vue
index 5c0647c2..0d3e9db0 100644
--- a/components/Appbar.vue
+++ b/components/Appbar.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-app-bar shrink-on-scroll  promiment app src="/headerimage.png">
+  <v-app-bar prominent absolute app src="/headerimage.png">
     <template v-slot:img="{ props }">
       <v-img
         v-bind="props"
diff --git a/components/ImportDialog.vue b/components/ImportDialog.vue
index 094d7908..6868a8fc 100644
--- a/components/ImportDialog.vue
+++ b/components/ImportDialog.vue
@@ -14,6 +14,7 @@ v-card
             :error-messages='errorMessage')
         .col
           v-file-input(
+            :prepend-icon='mdiAttachment'
             v-model='file'
             accept=".ics"
             :label="$t('event.ics')"
@@ -22,12 +23,13 @@ v-card
 
   v-card-actions
     v-spacer
-    v-btn(text @click='$emit("close")' color='warning') {{$t('common.cancel')}}
-    v-btn(text @click='importGeneric' :loading='loading' :disabled='loading'
+    v-btn(outlined @click='$emit("close")' color='warning') {{$t('common.cancel')}}
+    v-btn(outlined @click='importGeneric' :loading='loading' :disabled='loading'
       color='primary') {{$t('common.import')}}
 
 </template>
 <script>
+import { mdiAttachment } from '@mdi/js'
 import ical from 'ical.js'
 import get from 'lodash/get'
 
@@ -35,6 +37,7 @@ export default {
   name: 'ImportDialog',
   data () {
     return {
+      mdiAttachment,
       file: null,
       errorMessage: '',
       error: false,
diff --git a/components/Map.vue b/components/Map.vue
index c0578e30..9762607d 100644
--- a/components/Map.vue
+++ b/components/Map.vue
@@ -1,25 +1,24 @@
 <template lang="pug">
 client-only(placeholder='Loading...' )
   v-card
-    v-card-text
-      v-container
-        LMap(ref="map"
-            id="leaflet-map"
-            :zoom="zoom"
-            :options="{attributionControl: false}"
-            :center="center")
-          LControlAttribution(position='bottomright' prefix="")
-          LTileLayer(
-              :url="url"
-              :attribution="attribution")
-          LMarker(
-            :lat-lng="marker.coordinates")
+    v-container
+      LMap(ref="map"
+          id="leaflet-map"
+          :zoom="zoom"
+          :options="{attributionControl: false}"
+          :center="center")
+        LControlAttribution(position='bottomright' prefix="")
+        LTileLayer(
+            :url="url"
+            :attribution="attribution")
+        LMarker(
+          :lat-lng="marker.coordinates")
 
-        v-row.my-4.d-flex.flex-column.align-center.text-center
-          .text-h6
-            v-icon(v-text='mdiMapMarker' )
-            nuxt-link.ml-2.text-decoration-none(v-text="event.place.name" :to='`/place/${event.place.name}`')
-            .mx-2(v-text="`${event.place.address}`")
+      v-row.my-4.d-flex.flex-column.align-center.text-center
+        .text-h6
+          v-icon(v-text='mdiMapMarker' )
+          nuxt-link.ml-2.text-decoration-none(v-text="event.place.name" :to='`/place/${event.place.name}`')
+          .mx-2(v-text="`${event.place.address}`")
     v-card-actions
       v-row
         //- p.my-4(v-text="$t('common.getting_there')")
diff --git a/components/eventAdmin.vue b/components/eventAdmin.vue
index ee596b46..259c5e3a 100644
--- a/components/eventAdmin.vue
+++ b/components/eventAdmin.vue
@@ -1,24 +1,59 @@
 <template lang='pug'>
-v-list(dense nav)
-  v-list-group(:append-icon='mdiChevronUp' :value='true')
-    template(v-slot:activator)
-      v-list-item.text-overline Admin actions
+span
+  v-list(dense nav)
+    v-list-group(:append-icon='mdiChevronUp' :value='true')
+      template(v-slot:activator)
+        v-list-item.text-overline Admin actions
 
-    //- Hide / confirm event
-    v-list-item(@click='toggle(false)')
-      v-list-item-content
-        v-list-item-title(v-text="$t(`common.${event.is_visible?'hide':'confirm'}`)")
+      //- Hide / confirm event
+      v-list-item(@click='toggle(false)')
+        v-list-item-icon
+          v-icon(v-if='event.is_visible' v-text='mdiEyeOff')
+          v-icon(v-else='event.is_visible' v-text='mdiEye')
+        v-list-item-content
+          v-list-item-title(v-text="$t(`common.${event.is_visible?'hide':'confirm'}`)")
+
+      //- Edit event
+      v-list-item(:to='`/add/${event.id}`')
+        v-list-item-icon
+          v-icon(v-text='mdiCalendarEdit')
+        v-list-item-content
+          v-list-item-title(v-text="$t('common.edit')")
+
+      //- Remove
+      v-list-item(@click='remove(false)')
+        v-list-item-icon
+          v-icon(v-text='mdiDelete')
+        v-list-item-content
+          v-list-item-title(v-text="$t('common.remove')")
+
+
+      template(v-if='event.parentId')
+        v-list-item.text-overline Recurring event actions <a href="https://gancio.org/">?</a>
+
+        //- Pause / Start to generate recurring event
+        v-list-item(@click='toggle(true)')
+          v-list-item-icon
+            v-icon(v-text='event.parent.is_visible ? mdiPause : mdiPlay')
+          v-list-item-content
+            v-list-item-title(v-text="$t(`common.${event.parent.is_visible ? 'pause': 'start'}`)")
+
+
+        //- Edit event
+        v-list-item(:to='`/add/${event.parentId}`')
+          v-list-item-icon
+            v-icon(v-text='mdiCalendarEdit')
+          v-list-item-content
+            v-list-item-title(v-text="$t('common.edit')")
+
+        //- Remove
+        v-list-item(@click='remove(true)')
+          v-list-item-icon
+            v-icon(v-text='mdiDeleteForever')
+          v-list-item-content
+            v-list-item-title(v-text="$t('common.remove')")
 
-    //- Edit event
-    v-list-item(:to='`/add/${event.id}`')
-      v-list-item-content
-        v-list-item-title(v-text="$t('common.edit')")
 
-    //- Remove
-    v-list-item(@click='remove(false)')
-      v-list-item-content
-        v-list-item-title(v-text="$t('common.remove')")
-        
   //- v-btn(text color='primary' v-if='event.is_visible' @click='toggle(false)') {{$t(`common.${event.parentId?'skip':'hide'}`)}}
   //- v-btn(text color='success' v-else @click='toggle(false)') <v-icon color='yellow' v-text='mdiAlert'></v-icon> {{$t('common.confirm')}}
   //- v-btn(text color='primary' @click='$router.push(`/add/${event.id}`)') {{$t('common.edit')}}
@@ -33,11 +68,11 @@ v-list(dense nav)
   //-   v-btn(text color='primary' @click='remove(true)') {{$t('common.remove')}}
 </template>
 <script>
-import { mdiChevronUp, mdiRepeat } from '@mdi/js'
+import { mdiChevronUp, mdiRepeat, mdiDelete, mdiCalendarEdit, mdiEyeOff, mdiEye, mdiPause, mdiPlay, mdiDeleteForever } from '@mdi/js'
 export default {
   name: 'EventAdmin',
   data () {
-    return { mdiChevronUp, mdiRepeat }
+    return { mdiChevronUp, mdiRepeat, mdiDelete, mdiCalendarEdit, mdiEyeOff, mdiEye, mdiPause, mdiPlay, mdiDeleteForever }
   },
   props: {
     event: {
diff --git a/layouts/default.vue b/layouts/default.vue
index 7ffc07ea..6e80c3e5 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -9,9 +9,7 @@
           <v-btn class='ml-2 mt-2' outlined v-for='collection in collections' color='primary' :key='collection.id' :to='`/collection/${collection.name}`'>{{collection.name}}</v-btn>
         </div> -->
         <!-- <v-fade-transition hide-on-leave> -->
-          <v-container>
             <nuxt />
-          </v-container>
         <!-- </v-fade-transition> -->
     </v-main>
     <Footer/>
diff --git a/server/api/controller/plugins.js b/server/api/controller/plugins.js
index 1b7a1cfc..82f55829 100644
--- a/server/api/controller/plugins.js
+++ b/server/api/controller/plugins.js
@@ -79,7 +79,7 @@ const pluginController = {
     }
 
     if (plugin.load && typeof plugin.load === 'function') {
-      plugin.load({ settings: settingsController.settings }, settings)
+      plugin.load({ helpers: require('../../helpers'), settings: settingsController.settings }, settings)
     }
   },