:recycle: moving hero funcs to mixin | fixing fetch flag bug

vue-theme/src/pages/list.vue

@@ -40,7 +40,7 @@ export default {
         grid: { type: Boolean },
         sortBy: { type: String },
     },
-    mixins: [postTypeGetters, scrollTop],
+    mixins: [postTypeGetters, scrollTop, heroUtils],
     data() {
         return {
             page: 0,
@@ -71,7 +71,7 @@ export default {
             // console.log(this.$route)
             const type = typeFromRoute(this.$route)
             if(!type) return console.warn(`type: ${type} not found...`)
-            if(!keepFetching) return console.warn('nothing left to fetch...')
+            if(!this.keepFetching) return console.warn('nothing left to fetch...')
 
             console.warn(`loading more ${type} posts...`)
             this.page++
@@ -109,27 +109,10 @@ export default {
                 this.keepFetching = false
             }
         },
-        _clearHero() {
-            this.$store.commit('SET_HERO', { url: null, heroType: null })
-        },
-        _setHeroInfo(page) {
-            let json = { url: page.featured, heroType:'image' }
-            if (
-                page.hero &&
-                JSON.parse(page.hero) &&
-                JSON.parse(page.hero).url
-            ) {
-                json = JSON.parse(page.hero)
-                json.heroType = 'video'
-            }
-            // No featured or youTube
-            if (!json.url) { json.heroType = null }
-            // Set the hero text to the post title or excerpt
-            json.text = page && page.excerpt ? page.excerpt : page.title
-            return json
-        },
+        // _setHeroInfo(post) {} from mixin
+        // _clearHero(store) {} from mixin
         async checkAndSetHero(type) {
-            this._clearHero()
+            this._clearHero(this.$store)
 
             if (!this['allPagesLoaded']) {
                 await this.$store.dispatch('getAllPages', { sortType: null, params: null })

vue-theme/src/pages/mixin-post-types.js

@@ -41,5 +41,24 @@ const scrollTop = {
         window.scrollTo(0, 0)
     },
 }
-
-export { postTypeGetters, scrollTop }
+const heroUtils = {
+    methods: {
+        _setHeroInfo(post) {
+            let json = { url: post.featured, heroType:'image' }
+            if (
+                post.hero &&
+                JSON.parse(post.hero) &&
+                JSON.parse(post.hero).url
+            ) {
+                json = JSON.parse(post.hero)
+                json.heroType = 'video'
+            }
+            // No featured or youTube
+            if (!json.url) { json.heroType = null }
+            // Set the hero text to the post title or excerpt
+            json.text = post && post.excerpt ? post.excerpt : post.title
+            return json
+        },
+    }
+}
+export { postTypeGetters, scrollTop, heroUtils }

vue-theme/src/pages/single.vue

@@ -58,7 +58,7 @@ export default {
         sidebar: { type: Boolean },
         id: { type: Number },
     },
-    mixins: [postTypeGetters, scrollTop],
+    mixins: [postTypeGetters, scrollTop, heroUtils],
     data() {
         return {
             // Gallery control
@@ -159,9 +159,8 @@ export default {
         closeGallery() {
             this.activeGalleryIndex = this.activeImageID = -1
         },
-        clearHero() {
-            this.$store.commit('SET_HERO', { url: null, heroType: null })
-        },
+        // _setHeroInfo(post) {} from mixin
+        // _clearHero(store) {} from mixin
         /**
          * Everytime the posts object changes
          * we use this to set a new HERO
@@ -170,21 +169,7 @@ export default {
          */
         checkAndSetHero(post) {
             if (!post) return
-            console.log('single hero...')
-            let json = { url: post.featured, heroType: 'image' }
-            if (
-                post.hero &&
-                JSON.parse(post.hero) &&
-                JSON.parse(post.hero).url
-            ) {
-                json = JSON.parse(post.hero)
-                json.heroType = 'video'
-            }
-            // No featured or youTube
-            if (!json.url) { json.heroType = null }
-            // Set the hero text to the post title
-            json.text = post.title
-            this.$store.commit('SET_HERO', json)
+            this.$store.commit('SET_HERO', this._setHeroInfo(post))
         },
 
         /**
@@ -252,7 +237,7 @@ export default {
             //  navigating TO a single page
             const path = to.fullPath.split('/').filter(p => p)
             if (path.length > 1) {
-                this.clearHero()
+                this._clearHero(this.$store)
                 this.loadPostData()
             }
         },