:sparkles: page map to welcome index.vue | fixing some hero bugs

vue-theme/src/components/hero.vue

@@ -32,7 +32,6 @@ export default {
             showPlaybutton: state => state.hero.playbutton,
         }),
         heroIdFromUrl() {
-            console.log()
             const url = this.showHero.split('/')
             return url.pop()
         }
@@ -48,8 +47,8 @@ export default {
     },
     watch: {
         $route() {
-            console.log('remounting hero')
-            console.log(this.$store)
+            // console.log('remounting hero')
+            // console.log(this.$store)
             // Clear the hero between pages
             this.$store.commit('CLEAR_HERO')
         },

vue-theme/src/pages/index.vue

@@ -2,6 +2,9 @@
 <template lang="pug">
 .page--index.f-row.between
     article.f-grow
+        .f-row
+            h3(v-if="!allPagesLoaded ") loading...
+            .content(v-else-if="allPages['welcome']" v-html="allPages['welcome'].content")
         .f-row
             section(v-if="allEpisodesLoaded").shadow
                 router-link(:to="`./episodes`")
@@ -56,16 +59,16 @@ export default {
 .page--index
     article
         .f-row
-            &:nth-of-type(2)
+            &:nth-of-type(3)
                 margin: $ms-0 0
         section
             flex-grow: 1
-            &:nth-of-type(1)
+            &:nth-of-type(2)
                 flex-grow: 3
-            &:nth-of-type(2), &:nth-of-type(3)
+            &:nth-of-type(3), &:nth-of-type(4)
                 flex-grow: 1
                 margin: 0 0 0 $ms-0
-            &:nth-of-type(4), &:nth-of-type(5)
+            &:nth-of-type(5), &:nth-of-type(6)
                 flex-grow: 4
     footer
         img

vue-theme/src/pages/list.vue

@@ -93,7 +93,7 @@ export default {
             if(this.type !== sort || !Object.values(sortTypes).includes(sort)) sort = null
             
             // Don't dispatch if there's no type
-            if(this.type) {
+            if(this.type && this.dispatchName) {
                 this.$store.dispatch(this.dispatchName, sort)
                 this.checkAndSetHero()
             }
@@ -102,7 +102,7 @@ export default {
             const page = this.allPages[this.type]
             if(!page) return
             let json = { url: page.featured, heroType: 'image' }
-            if(page.hero && JSON.parse(page.hero).url) {
+            if(page.hero && JSON.parse(page.hero) && JSON.parse(page.hero).url) {
                 json = JSON.parse(page.hero)
                 json.heroType = 'video'
             }

vue-theme/src/pages/single.vue

@@ -145,7 +145,7 @@ export default {
         checkAndSetHero(post) {
             if(!post) return
             let json = { url: post.featured, heroType: 'image' }
-            if(post.hero && JSON.parse(post.hero).url) {
+            if(post.hero && JSON.parse(post.hero) && JSON.parse(post.hero).url) {
                 json = JSON.parse(post.hero)
                 json.heroType = 'video'
             }

vue-theme/src/store/index.js

@@ -32,7 +32,7 @@ const state = {
 const mutations = {
     SET_HERO(state, hero) {
         if (!hero) return
-        console.log(hero)
+
         if (hero.url) {
             state.hero.text = state.hero.url = hero.url
             state.hero.type = hero.type