:recycle: depluralized more things | altered module system key

vue-theme/src/components/breadcrumb.vue

@@ -1,7 +1,7 @@
 <template lang="pug">
 //- breadcrumb links at top of page, needs link routing
 .breadcrumb.f-row.start.t-up
-    router-link(v-if="['events','exhibitions'].includes(type)" :to="`/${type}/by-current-and-upcoming`")
+    router-link(v-if="['event','exhibition'].includes(type)" :to="`/${type}/by-current-and-upcoming`")
         h5.t-up {{ type }}
     router-link(v-else :to="`/${type}`")
         h5.t-up {{ type }}

vue-theme/src/components/sidebars/events.vue

@@ -4,7 +4,7 @@ h3.t-up {{ listType }} events
 ul.t-up
     li(v-for="post in events")
         featured-image(:post="post", thumbsize="'standard'")
-        router-link(:to="`/events/${post.slug}`")
+        router-link(:to="`/event/${post.slug}`")
             p.t-up {{ post.title }}
         p {{ post.start }} – {{ post.end }}
 </template>

vue-theme/src/components/sidebars/exhibitions.vue

@@ -4,7 +4,7 @@ h3.t-up {{ listType }} exhibitions
 ul.t-up
     li(v-for="post in exhibitions")
         featured-image(:post="post", thumbsize="'standard'")
-        router-link(:to="`/exhibitions/${post.slug}`")
+        router-link(:to="`/exhibition/${post.slug}`")
             p.t-up {{ post.title }}
         p {{ post.start }} – {{ post.end }}
 </template>

vue-theme/src/components/sidebars/related.vue

@@ -3,19 +3,19 @@ h3.t-up related {{ postType }}s
 p.t-up
     ul
         li(v-for="relatedPost in postsByType[postType]")
-            router-link(v-if="relatedPost" :to="`/${relatedPost.type}s/${relatedPost.slug}`")
+            router-link(v-if="relatedPost" :to="`/${relatedPost.type}/${relatedPost.slug}`")
                 p {{ relatedPost.title }}
 </template>
 
 <script>
 export default {
     props: {
-        postsByType:{
-            required: true
-        }, 
-        postType:{
-            required: true
-        }, 
-    }
+        postsByType: {
+            required: true,
+        },
+        postType: {
+            required: true,
+        },
+    },
 }
-</script>
+</script>

vue-theme/src/components/sidebars/sidebar.vue

@@ -2,7 +2,7 @@
 aside.sidebar
     section
         //- if not single layout Artist sorting
-        .shadow(v-if="type === 'artists' && layout !== 'single'")
+        .shadow(v-if="type === 'artist' && layout !== 'single'")
             h3.t-up sort {{ type }} by
             ul.t-up
                 li(v-for="option in sortOptions")
@@ -15,7 +15,7 @@ aside.sidebar
             h3.t-up.t-b {{ type }} specific sidebar more
 
         //- if not single layout Exhibitions sorting
-        .shadow(v-if="type === 'exhibitions' && layout !== 'single'")
+        .shadow(v-if="type === 'exhibition' && layout !== 'single'")
             h3.t-up sort {{ type }} by
             ul.t-up
                 li(v-for="option in sortOptions")
@@ -23,11 +23,11 @@ aside.sidebar
                         p {{ option }}
                 //- temporary reminder
                 p 
-                    router-link(:to="`/exhibitions`")
+                    router-link(:to="`/exhibition`")
                         p by all
 
         //- if not single layout Events sorting
-        .shadow(v-if="type === 'events' && layout === 'list'")
+        .shadow(v-if="type === 'event' && layout === 'list'")
             h3.t-up sort {{ type }} by
             ul.t-up
                 li(v-for="option in sortOptions")
@@ -35,7 +35,7 @@ aside.sidebar
                         p {{ option }}
                 //- temporary reminder
                 p 
-                    router-link(:to="`/events`")
+                    router-link(:to="`/event`")
                         p by all
 
         //- p2p types and related posts
@@ -46,17 +46,17 @@ aside.sidebar
         slot
 
         //- single layout Exhibitions sidebar
-        .shadow(v-if="type === 'exhibitions' && layout === 'single'")
+        .shadow(v-if="type === 'exhibition' && layout === 'single'")
             events-sidebar
         //- single layout Events sindebar
-        .shadow(v-if="type === 'events' && layout === 'single'")
+        .shadow(v-if="type === 'event' && layout === 'single'")
             exhibitions-sidebar
 
         //- list layout Exhibition sidebar show events
-        .shadow(v-if="type === 'exhibitions' && layout === 'list'")
+        .shadow(v-if="type === 'exhibition' && layout === 'list'")
             events-sidebar
         //- list layout Events sidebar show exhibitions
-        .shadow(v-if="type === 'events' && layout === 'list'")
+        .shadow(v-if="type === 'event' && layout === 'list'")
             exhibitions-sidebar
 
 </template>
@@ -108,20 +108,20 @@ export default {
         sortOptions() {
             let opts = []
             switch (this.type) {
-                case 'artists':
+                case 'artist':
                     opts = [
                         Object.keys(this.sortTypes)[0],
                         Object.keys(this.sortTypes)[1],
                         Object.keys(this.sortTypes)[4],
                     ]
                     break
-                case 'shorts':
+                case 'short':
                     opts = [
                         Object.keys(this.sortTypes)[2],
                         Object.keys(this.sortTypes)[3],
                     ]
                     break
-                case 'guides':
+                case 'guide':
                     opts = [
                         Object.keys(this.sortTypes)[3],
                         Object.keys(this.sortTypes)[1],

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

@@ -9,11 +9,13 @@ import { mapGetters, mapState } from 'vuex'
  */
 const getterHelper = {}
 for (let type of postTypes) {
-    const capitalized = convertTitleCase(type) + 's'
-    console.log(capitalized)
-    getterHelper[`all${capitalized}BySlug`] = `all${capitalized}BySlug`
-    getterHelper[`all${capitalized}`] = `all${capitalized}`
-    getterHelper[`all${capitalized}Loaded`] = `all${capitalized}Loaded`
+    if (type != 'sticky') {
+        const capitalized = convertTitleCase(type) + 's'
+
+        getterHelper[`all${capitalized}BySlug`] = `all${capitalized}BySlug`
+        getterHelper[`all${capitalized}`] = `all${capitalized}`
+        getterHelper[`all${capitalized}Loaded`] = `all${capitalized}Loaded`
+    }
 }
 getterHelper[`upcomingAndCurrentEvents`] = `upcomingAndCurrentEvents`
 getterHelper[`pastEvents`] = `pastEvents`

vue-theme/src/pages/single.vue

@@ -34,13 +34,10 @@
         //- end of article icon     
         footer.f-col
             img(src="../star.svg")
-
-    sidebar(v-if="sidebar" :type="`${type}`" layout="single" :related="p2pPostsByType")
 </template>
 
 <script>
 import card from '@/components/card.vue'
-import sidebar from '@/components/sidebars/sidebar'
 import gallery from '@/components/gallery/'
 import credits from '@/components/credits'
 import breadcrumb from '@/components/breadcrumb'
@@ -52,9 +49,8 @@ import { convertTitleCase, dePluralize, typeFromRoute } from '@/utils/helpers'
 const TIMEOUT = 1
 
 export default {
-    components: { sidebar, gallery, credits, card, breadcrumb },
+    components: { gallery, credits, card, breadcrumb },
     props: {
-        sidebar: { type: Boolean },
         id: { type: Number },
     },
     mixins: [postTypeGetters, scrollTop],
@@ -75,7 +71,6 @@ export default {
          */
         post() {
             if (!this[this.type]) return
-
             const type = dePluralize(this.type)
 
             // State not a getter!
@@ -197,9 +192,8 @@ export default {
              * !: posts watcher fires when this finishes
              */
             let type = convertTitleCase(this.type) + 's'
-
+            // modules are NOT plural for some reason
             if (!this.$store.state[this.type]) return
-
             let allPostsOfType = this.$store.state[this.type].all
 
             /**
@@ -208,18 +202,16 @@ export default {
             if (!this[`all${type}Loaded`] && allPostsOfType.length < 1) {
                 const res = await this.$store.dispatch(`getAll${type}`)
                 allPostsOfType = res
-                // console.log(`reloaded ${type}...`)
+                console.log(`reloaded ${type}...`)
             }
-
-            if (Object.values(allPostsOfType).length < 1) return
-            const singlePostData = Object.values(allPostsOfType).filter(
+            if (allPostsOfType.length < 1) return
+            const singlePostData = allPostsOfType.filter(
                 post => post.slug == this.$route.params.slug,
             )[0]
-
-            // console.log(this)
             if (!singlePostData) return
+            // NOT plural
             await this.$store.dispatch(
-                `getSingle${dePluralize(type)}`,
+                `getSingle${convertTitleCase(this.type)}`,
                 singlePostData.id,
             )
         },
@@ -247,9 +239,9 @@ export default {
         },
     },
     mounted() {
-        if (this.$route.hash) {
-            setTimeout(() => this.scrollTo(this.$route.hash), TIMEOUT)
-        }
+        // if (this.$route.hash) {
+        //     setTimeout(() => this.scrollTo(this.$route.hash), TIMEOUT)
+        // }
     },
     async created() {
         await this.loadPostData()

vue-theme/src/router/routes.js

@@ -75,5 +75,9 @@ export default [
         props: { sidebar: true, sortBy: null },
     },
     // Single Pages
-    { path: '/:type/:slug', component: singlePage, props: { sidebar: true } },
+    {
+        path: '/:type/:slug',
+        component: singlePage,
+        props: { sidebar: true },
+    },
 ]

vue-theme/src/store/index.js

@@ -5,12 +5,12 @@ import Vuex from 'vuex'
 import * as actions from './actions'
 import * as getters from './getters'
 
-import pages from './modules/page'
-import posts from './modules/post'
-import artists from './modules/artist'
-import episodes from './modules/episode'
-import events from './modules/event'
-import exhibitions from './modules/exhibition'
+import page from './modules/page'
+import post from './modules/post'
+import artist from './modules/artist'
+import episode from './modules/episode'
+import event from './modules/event'
+import exhibition from './modules/exhibition'
 import sticky from './modules/sticky'
 
 const debug = process.env.NODE_ENV !== 'production'
@@ -72,12 +72,12 @@ const store = new Vuex.Store({
     mutations,
     state,
     modules: {
-        posts,
-        pages,
-        artists,
-        episodes,
-        events,
-        exhibitions,
+        post,
+        page,
+        artist,
+        episode,
+        event,
+        exhibition,
         sticky,
     },
     strict: debug,

vue-theme/src/store/modules/artist.js

@@ -28,6 +28,7 @@ const actions = {
     getSingleArtist({ commit }, id) {
         commit('CLEAR_SINGLE_ARTISTS')
         commit('ARTISTS_LOADED', false)
+        console.log(id)
         api.getSingleType('artist', id, artist => {
             commit('STORE_FETCHED_SINGLE_ARTIST', artist)
             commit('ARTISTS_LOADED', true)

vue-theme/src/store/modules/episode.js

@@ -26,7 +26,6 @@ const actions = {
         })
     },
     getSingleEpisode({ commit }, id) {
-        console.log('clearing single ep from getSingle')
         commit('CLEAR_SINGLE_EPISODES')
         commit('EPISODES_LOADED', false)
         api.getSingleType('episode', id, episode => {