:recycle: simplifying getPosts in list template

vue-theme/src/pages/list.vue

@@ -91,38 +91,19 @@ export default {
                       .filter(p => p)
                       .pop()
 
-            // Don't dispatch if there's no type
-            if (this.type && this.dispatchName && clear) {
-                this.$store.dispatch(
-                    this.dispatchName,
-                    { sortType: sort, params }
-                )
+            let dispatchParams = { sortType: sort, params }
+            let dispatchAction = this.dispatchName
 
-                if (this.type == 'event') {
-                    this.$store.dispatch(
-                        'getAllExhibitions',
-                        {
-                            sortType: sortTypes.currentAndUpcoming,
-                            params 
-                        }
-                    )
+            if(this.dispatchName && clear) {
+                if (this.type && ['event', 'exhibitions'].includes(this.type)) {
+                    dispatchParams.sortType = sortTypes.currentAndUpcoming
                 }
-                if (this.type == 'exhibition') {
-                    this.$store.dispatch(
-                        'getAllEvents',
-                        {
-                            sortType: sortTypes.currentAndUpcoming,
-                            params 
-                        }
-                    )
-                }
-            // Add to existing
-            } else if (!clear && this.getMoreName) {
-                this.$store.dispatch(
-                    this.getMoreName,
-                    { sortType: sort, params }
-                )
             }
+            // Add to existing except episodes
+            else if (!clear && this.getMoreName && this.type != 'episode') {
+                dispatchAction = this.getMoreName
+            }
+            this.$store.dispatch(dispatchAction, dispatchParams)
         },
         clearHero() {
             this.$store.commit('SET_HERO', { url: null, heroType: null })
@@ -143,22 +124,20 @@ export default {
             // Clear the hero and bail
             if(!page) return this.clearHero()
 
-            let hero = { url: page.featured, heroType:'image' }
+            let json = { url: page.featured, heroType:'image' }
             if (
                 page.hero &&
                 JSON.parse(page.hero) &&
                 JSON.parse(page.hero).url
             ) {
-                hero = JSON.parse(page.hero)
-                hero.heroType = 'video'
+                json = JSON.parse(page.hero)
+                heson.heroType = 'video'
             }
             // No featured or youTube
-            if (!hero.url) {
-                hero.heroType = null
-            }
+            if (!json.url) { json.heroType = null }
             // Set the hero text to the post title or excerpt
-            hero.text = page && page.excerpt ? page.excerpt : page.title
-            this.$store.commit('SET_HERO', hero)
+            json.text = page && page.excerpt ? page.excerpt : page.title
+            this.$store.commit('SET_HERO', json)
         },
         scrollTo(hashtag) {
             setTimeout(() => {
@@ -166,9 +145,10 @@ export default {
             }, TIMEOUT)
         },
         setIntersectionLoader() {
-            console.warn('setting up intersection handler...')
+            console.warn('setting up intersection handler...', this.type)
             window.removeEventListener("load", e => {}, false)
             const footerEl = document.querySelector(".footer-wrapper footer")
+            console.log('footer for intersection:', footerEl)
             if(!footerEl) return
             window.addEventListener("load", e => {
                 const observer = new IntersectionObserver(this.loadMorePosts, {
@@ -184,17 +164,18 @@ export default {
             // only grab the hero if moving to another list page
             // eg. list page -> list page
             const path = to.fullPath.split('/').filter(p => p)
-            if (path.length <= 1) {
-                this.clearHero()
-                this.checkAndSetHero(this.type)
-                
-                // TODO: Track last loaded page per post type
-                // Less http calls
-                this.page = 1
-                this.setIntersectionLoader()
 
-                this.getPosts(true)
-            }
+            // !:Only fires navigating TO list page
+            if (path.length > 1) return
+            
+            this.clearHero()
+            this.checkAndSetHero(this.type)
+            
+            // TODO: Track last loaded page per post type
+            // Less http calls
+            this.page = 1
+            this.setIntersectionLoader()
+            this.getPosts(true)
         },
     },
     mounted() {

vue-theme/src/pages/single.vue

@@ -181,9 +181,7 @@ export default {
                 json.heroType = 'video'
             }
             // No featured or youTube
-            if (!json.url) {
-                json.heroType = null
-            }
+            if (!json.url) { json.heroType = null }
             // Set the hero text to the post title
             json.text = post.title
             this.$store.commit('SET_HERO', json)