:recycle: refactoring hero json set | adding back intersection loader on watcher

vue-theme/src/pages/list.vue

@@ -44,7 +44,8 @@ export default {
     data() {
         return {
             page: 0,
-            perPage: 9
+            perPage: 9,
+            keepFetching: true 
         }
     },
     computed: {
@@ -67,9 +68,10 @@ export default {
     },
     methods: {
         loadMorePosts() {
-            console.log(this.$route)
+            // 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...')
 
             console.warn(`loading more ${type} posts...`)
             this.page++
@@ -101,15 +103,33 @@ export default {
                 res = await this.$store.dispatch(dispatchAction, dispatchParams)
             }
 
+            // Stop trying to load more posts
             if(res && !res.length) {
                 console.warn('nothing left to get...')
+                this.keepFetching = false
             }
         },
-        clearHero() {
+        _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
+        },
         async checkAndSetHero(type) {
-            this.clearHero()
+            this._clearHero()
 
             if (!this['allPagesLoaded']) {
                 await this.$store.dispatch('getAllPages', { sortType: null, params: null })
@@ -124,20 +144,7 @@ export default {
             )[0]
             if(!page) return console.warn(`no page for ${type} found`)
 
-            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
-            this.$store.commit('SET_HERO', json)
+            this.$store.commit('SET_HERO', this._setHeroInfo(page))
         },
         setIntersectionLoader() {
             console.warn('setting up intersection handler for:', this.type)
@@ -166,20 +173,12 @@ export default {
             // Always reset the page count
             this.page = 0
             
-            // this.checkAndSetHero(this.type)
-            
-            // Load first page of results
-            // this.getPosts({ clear: false })
-            console.log("route", to, from)
-            // this.setIntersectionLoader()
+            this.setIntersectionLoader()
         },
     },
-    mounted() {
-    },
     created() {
         console.log('--- liiiist ---')
         this.setIntersectionLoader()
-        // this.checkAndSetHero(this.type)
     },
 }
 </script>