From 253d4bcc85c402ed42385c3d15c521c13cb2fcff Mon Sep 17 00:00:00 2001
From: les <les@box.lan>
Date: Thu, 10 Nov 2022 08:48:48 +0100
Subject: [PATCH] minor on collections / announcement layout

---
 layouts/default.vue | 42 +++++++++++++++++++-----------------------
 pages/index.vue     | 29 +++++++++++++++++------------
 2 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/layouts/default.vue b/layouts/default.vue
index 6e439c48..29bb08f4 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -4,13 +4,13 @@
     <Confirm/>
     <Nav/>
     <v-main>
-        <div v-if='showCollections || showBack'>
+        <!-- <div v-if='showCollections || showBack'>
           <v-btn class='ml-2 mt-2' v-if='showBack' outlined color='primary' to='/'><v-icon v-text='mdiChevronLeft'></v-icon></v-btn>
           <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>
+        </div> -->
+        <!-- <v-fade-transition hide-on-leave> -->
           <nuxt />
-        </v-fade-transition>
+        <!-- </v-fade-transition> -->
     </v-main>
     <Footer/>
 
@@ -35,28 +35,24 @@ export default {
       link: [{ rel: 'icon', type: 'image/png', href: this.settings.baseurl + '/logo.png' }],
     }
   },
-  data () {
-    return { collections: [], mdiChevronLeft }
-  },  
-  async fetch () {
-    if (this.$route.name && ['tag-tag', 'index', 'g-collection', 'p-place'].includes(this.$route.name)) {
-      this.collections = await this.$axios.$get('collections').catch(_e => [])
-    } else {
-      this.collections = []
-    }
-
-  },  
+  // async fetch () {
+  //   if (this.$route.name && ['tag-tag', 'index', 'g-collection', 'p-place'].includes(this.$route.name)) {
+  //     this.collections = await this.$axios.$get('collections').catch(_e => [])
+  //   } else {
+  //     this.collections = []
+  //   }
+  // },  
   name: 'Default',
   components: { Nav, Snackbar, Footer, Confirm },
   computed: {
-    ...mapState(['settings', 'locale']),
-    showBack () {
-      return ['tag-tag', 'collection-collection', 'place-place', 'search', 'announcement-id'].includes(this.$route.name)
-    },
-    showCollections () {
-      if (!this.collections || this.collections.length === 0) return false
-      return ['tag-tag', 'index', 'g-collection', 'p-place'].includes(this.$route.name)
-    }
+    ...mapState(['settings']),
+    // showBack () {
+    //   return ['tag-tag', 'collection-collection', 'place-place', 'search', 'announcement-id'].includes(this.$route.name)
+    // },
+    // showCollections () {
+    //   if (!this.collections || this.collections.length === 0) return false
+    //   return ['tag-tag', 'index', 'g-collection', 'p-place'].includes(this.$route.name)
+    // }
   },
   created () {
     this.$vuetify.theme.dark = this.settings['theme.is_dark']
diff --git a/pages/index.vue b/pages/index.vue
index 6299f571..1c4be164 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1,14 +1,16 @@
 <template lang="pug">
-v-container.pa-0
+v-container.px-2.px-sm-6.pt-0
+  div(v-if='collections.length')
+    v-btn.mr-2(outlined v-for='collection in collections' color='primary' :key='collection.id' :to='`/collection/${collection.name}`') {{collection.name}}
 
   //- Announcements
-  #announcements.ma-2(v-if='announcements.length')
+  #announcements.mt-2.mt-sm-4(v-if='announcements.length')
     Announcement(v-for='announcement in announcements' :key='`a_${announcement.id}`' :announcement='announcement')
 
   //- Calendar and search bar
   //- v-row.ma-2(v-if='!settings.hide_calendar')
     //- .calh.col-xl-5.col-lg-5.col-md-7.col-sm-10.col-xs-12.pa-0.mx-sm-2.mx-0.my-0.mt-sm-2
-  .calh.mx-2.mx-sm-4.mt-2.mt-sm-4(v-if='!settings.hide_calendar')
+  .calh.mt-2.mt-sm-4(v-if='!settings.hide_calendar')
     //- this is needed as v-calendar does not support SSR
     //- https://github.com/nathanreyes/v-calendar/issues/336
     client-only(placeholder='Loading...')
@@ -30,7 +32,7 @@ v-container.pa-0
 
 
   //- Events
-  #events.ma-sm-4.ma-2
+  #events.mt-sm-4.mt-2
     Event(:event='event' @destroy='destroy' v-for='(event, idx) in visibleEvents' :lazy='idx>2' :key='event.id')
 </template>
 
@@ -46,13 +48,15 @@ export default {
   name: 'Index',
   components: { Event, Announcement, Calendar },
   middleware: 'setup',
-  async asyncData ({ $api }) {
-    const events = await $api.getEvents({
-      start: dayjs().startOf('month').unix(),
-      end: null,
-      show_recurrent: true
-    })
-    return { events }
+  async asyncData ({ $api, $axios }) {
+    const  [collections, events] = await Promise.all([
+        $axios.$get('collections').catch(_e => []),
+        $api.getEvents({
+          start: dayjs().startOf('month').unix(),
+          end: null,
+          show_recurrent: true
+        })])
+    return { events, collections }
   },
   data ({ $store }) {
     return {
@@ -64,7 +68,8 @@ export default {
       start: dayjs().startOf('month').unix(),
       end: null,
       selectedDay: null,
-      show_recurrent: $store.state.settings.recurrent_event_visible
+      show_recurrent: $store.state.settings.recurrent_event_visible,
+      collections: []
     }
   },
   head () {