From 0d6ee8dc4f7c914e3a1dd5140174214714afe44f Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Wed, 1 Jun 2022 14:09:22 +0200
Subject: [PATCH] add cohorts  and back to home in default template

---
 layouts/default.vue | 25 ++++++++++++++++++++++---
 pages/g/_cohort.vue | 13 +------------
 pages/p/_place.vue  |  7 -------
 pages/tag/_tag.vue  |  7 -------
 4 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/layouts/default.vue b/layouts/default.vue
index 32333b17..209425ae 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -4,9 +4,12 @@
     <Confirm/>
     <Nav/>
     <v-main app>
+      <div class="ml-1 mb-1 mt-1" v-if='showCohorts || showBack'>
+        <v-btn v-show='showBack' text color='primary' to='/'><v-icon v-text='mdiChevronLeft'/></v-btn>
+        <v-btn v-for='cohort in cohorts' text color='primary' :key='cohort.id' :to='`/g/${cohort.name}`'>{{cohort.name}}</v-btn>
+      </div>      
       <v-fade-transition hide-on-leave>
-        <nuxt keep-alive :keep-alive-props="{ max: 10, include: ['Index'] }"/>
-        <!-- <nuxt /> -->
+        <nuxt />
       </v-fade-transition>
     </v-main>
     <Footer/>
@@ -21,6 +24,7 @@ import Snackbar from '../components/Snackbar'
 import Footer from '../components/Footer'
 import Confirm from '../components/Confirm'
 import { mapState } from 'vuex'
+import { mdiChevronLeft } from '@mdi/js'
 
 export default {
   head () {
@@ -30,9 +34,24 @@ export default {
       }
     }
   },
+  data () {
+    return { cohorts: [], mdiChevronLeft }
+  },  
+  async fetch () {
+    this.cohorts = await this.$axios.$get('cohorts')
+  },  
   name: 'Default',
   components: { Nav, Snackbar, Footer, Confirm },
-  computed: mapState(['settings', 'locale']),
+  computed: {
+    ...mapState(['settings', 'locale']),
+    showBack () {
+      return ['tag-tag', 'g-cohort', 'p-place', 'search', 'announcement-id'].includes(this.$route.name)
+    },
+    showCohorts () {
+      if (!this.cohorts || this.cohorts.length === 0) return false
+      return ['tag-tag', 'index', 'g-cohort', 'p-place'].includes(this.$route.name)
+    }
+  },
   created () {
     this.$vuetify.theme.dark = this.settings['theme.is_dark']
   }
diff --git a/pages/g/_cohort.vue b/pages/g/_cohort.vue
index bfdee688..308b2339 100644
--- a/pages/g/_cohort.vue
+++ b/pages/g/_cohort.vue
@@ -1,9 +1,5 @@
 <template>
   <v-container id='home' fluid>
-    <div class="mt-3 mb-1 ml-1">
-      <v-btn text color='primary' to='/'><v-icon v-text='mdiChevronLeft'/></v-btn>
-      <v-btn v-for='cohort in cohorts' text color='primary' :key='cohort.id' :to='`/g/${cohort.name}`' v-text='cohort.name' />
-    </div>
 
     <h1 class='d-block text-h3 font-weight-black text-center align-center text-uppercase mt-10 mb-12 mx-auto w-100 text-underline'><u>{{cohort}}</u></h1>
 
@@ -15,23 +11,16 @@
 </template>
 <script>
 
-import { mdiChevronLeft } from '@mdi/js'
 import Event from '@/components/Event'
 
 export default {
   name: 'Tag',
   components: { Event },
-  data ({ $route }) {
-    return { mdiChevronLeft, cohort: $route.params.cohort, cohorts: [] }
-  },
-  async fetch () {
-    this.cohorts = await this.$axios.$get('/cohorts')
-  },
   async asyncData ({ $axios, params, error }) {
     try {
       const cohort = params.cohort
       const events = await $axios.$get(`/cohorts/${cohort}`)
-      return { events }
+      return { events, cohort }
     } catch (e) {
       console.error(e)
       error({ statusCode: 400, message: 'Error!' })
diff --git a/pages/p/_place.vue b/pages/p/_place.vue
index e53aa3fe..47792734 100644
--- a/pages/p/_place.vue
+++ b/pages/p/_place.vue
@@ -1,8 +1,5 @@
 <template>
   <v-container id='home' fluid>
-    <div class="mt-3 mb-1 ml-1">
-      <v-btn text color='primary' to='/'><v-icon v-text='mdiChevronLeft'/></v-btn>
-    </div>
 
     <h1 class='d-block text-h4 font-weight-black text-center text-uppercase mt-5 mx-auto w-100 text-underline'><u>{{place.name}}</u></h1>
     <span class="d-block text-subtitle text-center w-100 mb-14">{{place.address}}</span>
@@ -15,15 +12,11 @@
 </template>
 <script>
 
-import { mdiChevronLeft } from '@mdi/js'
 import Event from '@/components/Event'
 
 export default {
   name: 'Tag',
   components: { Event },
-  data () {
-    return { mdiChevronLeft }
-  },
   asyncData ({ $axios, params, error }) {
     try {
       const place = params.place
diff --git a/pages/tag/_tag.vue b/pages/tag/_tag.vue
index e3f0d299..96196e57 100644
--- a/pages/tag/_tag.vue
+++ b/pages/tag/_tag.vue
@@ -1,8 +1,5 @@
 <template>
   <v-container id='home' fluid>
-    <div class="mt-3 mb-1 ml-1">
-      <v-btn text color='primary' to='/'><v-icon v-text='mdiChevronLeft'/></v-btn>
-    </div>
 
     <h1 class='d-block text-h3 font-weight-black text-center align-center text-uppercase mt-5 mb-16 mx-auto w-100 text-underline'><u>{{tag}}</u></h1>
 
@@ -14,15 +11,11 @@
 </template>
 <script>
 
-import { mdiChevronLeft } from '@mdi/js'
 import Event from '@/components/Event'
 
 export default {
   name: 'Tag',
   components: { Event },
-  data () {
-    return { mdiChevronLeft }
-  },
   async asyncData ({ $axios, params, error }) {
     try {
       const tag = params.tag