:recycle: showing subtype in list and hero

vue-theme/src/pages/list.vue

@@ -4,10 +4,9 @@
 
         header.center.t-up
             .title.f-row
-                h3(v-if="!isSearch") {{ type }}s 
-                h3(v-else-if="!hasSubtype") {{ type }}: {{ $route.query.type }}s 
-                h3(v-else-if="isSearch") Search results for: {{$route.query.s }} 
-                h3(v-else) {{ type }}s 
+                h3(v-if="!isSearch && !hasSubtype") {{ type }}s 
+                h3(v-else-if="hasSubtype") {{ type }}s: {{ $route.query.type }} 
+                h3(v-else) Search results for: {{$route.query.s }} 
                 span(v-if="sortBy")
                     h3 {{ sortBy.replace('-', ' ') }}
 
@@ -181,14 +180,17 @@ export default {
         // _setHeroInfo(post) {} from mixin
         // _clearHero(store) {} from mixin
         async checkAndSetHero(type) {
-            console.log('hero type :', type)
+            // console.log('hero type :', type)
             this._clearHero(this.$store)
             try {
                 const page = await this.getPage(type)
                 // We always set a hero no matter what
                 // Because the hero component will deal
                 // with how to render based on hero.url
-                this.$store.commit('SET_HERO', this._setHeroInfo(page))
+                const heroJson = this._setHeroInfo(page)
+                heroJson.subtype = this.$route.query.type
+                console.log(heroJson)
+                this.$store.commit('SET_HERO', heroJson)
             } catch (err) { console.error(err) }
         },
         setIntersectionLoader(cb) {

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

@@ -47,7 +47,7 @@ const scrollTop = {
 const heroUtils = {
     methods: {
         _setHeroInfo(post) {
-            let json = { url: post.featured, heroType:'image' }
+            let json = { url: post.featured, heroType: 'image' }
             if (
                 post.hero &&
                 JSON.parse(post.hero) &&
@@ -86,7 +86,6 @@ const heroUtils = {
             }
            
             // post.type == 'page' && post.slug == 'thing' || post.type == 'page' && post.slug == 'otherthing'
-
             return json
         },
         _clearHero(store) {

vue-theme/src/store/index.js

@@ -41,7 +41,6 @@ const state = {
 
 const mutations = {
     SET_HERO(state, hero) {
-        console.log(hero)
         if (!hero.url) {
             console.warn('No hero url to set')
             state.hero.url = null
@@ -50,7 +49,7 @@ const mutations = {
             state.hero.playbutton = false
         } else {
             // console.warn('Setting hero', hero)
-            state.hero.text = hero.text
+            state.hero.text = hero.subtype ? hero.subtype : hero.text
             state.hero.url = hero.url
             state.hero.type = hero.heroType