:recycle: forcing sort on exhibition and event routes | tweaking list loading order

vue-theme/src/pages/list.vue

@@ -53,6 +53,7 @@ export default {
             return typeFromRoute(this.$route)
         },
         pType() {
+            if(!this.type) return
             console.log(this.type, `${convertTitleCase(this.type)}s`)
             return this.sortBy ? `${convertTitleCase(this.type.split('/')[0])}s` : `${convertTitleCase(this.type)}s`
         },
@@ -105,6 +106,8 @@ export default {
             this.$store.commit('SET_HERO', { url: null, heroType: null })
         },
         async checkAndSetHero(type) {
+            this.clearHero()
+
             if (!this['allPagesLoaded']) {
                 await this.$store.dispatch('getAllPages', { sortType: null, params: null })
             }
@@ -117,9 +120,6 @@ export default {
                 page => page.slug == type + 's',
             )[0]
 
-            // Clear the hero and bail
-            if(!page) return this.clearHero()
-
             let json = { url: page.featured, heroType:'image' }
             if (
                 page.hero &&
@@ -135,11 +135,6 @@ export default {
             json.text = page && page.excerpt ? page.excerpt : page.title
             this.$store.commit('SET_HERO', json)
         },
-        scrollTo(hashtag) {
-            setTimeout(() => {
-                location.href = hashtag
-            }, TIMEOUT)
-        },
         setIntersectionLoader() {
             console.warn('setting up intersection handler for:', this.type)
             window.removeEventListener("load", e => {}, false)
@@ -165,21 +160,18 @@ export default {
             console.log('?:', path.pop())
 
             // Always reset the page count
-            this.setIntersectionLoader()
             this.page = 1
             
-            this.clearHero()
             this.checkAndSetHero(this.type)
             
             // TODO: Track last loaded page per post type
             // Less http calls
             this.getPosts(true)
+
+            this.setIntersectionLoader()
         },
     },
     mounted() {
-        if (this.$route.hash) {
-            setTimeout(() => this.scrollTo(this.$route.hash), TIMEOUT)
-        }
         this.setIntersectionLoader()
     },
     created() {

vue-theme/src/router/routes.js

@@ -29,6 +29,16 @@ export default [
         component: listPage,
         props: { sidebar: true, grid: true, sortBy: `${sortTypes.material}` },
     },
+    {
+        path: `/event`,
+        component: listPage,
+        props: { sidebar: true, sortBy: `${sortTypes.currentAndUpcoming}` },
+    },
+    {
+        path: `/exhibition`,
+        component: listPage,
+        props: { sidebar: true, sortBy: `${sortTypes.currentAndUpcoming}` },
+    },
     {
         path: `/:type/${sortTypes.past}`,
         component: listPage,
@@ -60,14 +70,14 @@ export default [
         props: { sidebar: true, sortBy: `${sortTypes.material}` },
     },
     {
-        path: '/:type/by-episode',
+        path: `/:type/${sortTypes.episode}`,
         component: listPage,
-        props: { sidebar: true, sortBy: 'by-episode' },
+        props: { sidebar: true, sortBy: `${sortTypes.episode}` },
     },
     {
-        path: '/:type/by-artist',
+        path: `/:type/${sortTypes.artist}`,
         component: listPage,
-        props: { sidebar: true, sortBy: 'by-artist' },
+        props: { sidebar: true, sortBy: `${sortTypes.artist}` },
     },
     {
         path: '/:type',