:recycle: depluralize api and frontend getters and routes

plugins/cia-endpoints/cia-end-points.php

@@ -25,28 +25,28 @@ add_action( 'rest_api_init', function () {
      * The standard wordpress post_types
      */
     $page_controller = new Make_Endpoint_For('page');
-    $page_controller->register_custom_route('pages');
+    $page_controller->register_custom_route('page');
 
     $media_controller = new Make_Endpoint_For('media');
     $media_controller->register_custom_route('media');
 
     $post_controller = new Make_Endpoint_For('post');
-    $post_controller->register_custom_route('posts');
+    $post_controller->register_custom_route('post');
 
     /**
      * Craft in America custom post_types
      */
     $episode_controller = new Make_Endpoint_For('episode');
-    $episode_controller->register_custom_route('episodes');
+    $episode_controller->register_custom_route('episode');
 
     $artist_controller = new Make_Endpoint_For('artist');
-    $artist_controller->register_custom_route('artists');
+    $artist_controller->register_custom_route('artist');
 
     $event_controller = new Make_Endpoint_For('event');
-    $event_controller->register_custom_route('events');
+    $event_controller->register_custom_route('event');
 
     $exhibition_controller = new Make_Endpoint_For('exhibition');
-    $exhibition_controller->register_custom_route('exhibitions');
+    $exhibition_controller->register_custom_route('exhibition');
 
     $sticky_controller = new Make_Sticky_Endpoint();
     $sticky_controller->register_custom_route('sticky');
@@ -55,25 +55,25 @@ add_action( 'rest_api_init', function () {
      * Craft in America custom sort_types
      */
     $sort_controller = new Make_Sort_By('artist', 'by_alpha');
-    $sort_controller->register_custom_route('artists/by-alpha');
+    $sort_controller->register_custom_route('artist/by-alpha');
     $sort_controller = new Make_Sort_By('artist', 'by_material');
-    $sort_controller->register_custom_route('artists/by-material');
+    $sort_controller->register_custom_route('artist/by-material');
     $sort_controller = new Make_Sort_By('event', 'by_past');
-    $sort_controller->register_custom_route('events/by-past');
+    $sort_controller->register_custom_route('event/by-past');
     $sort_controller = new Make_Sort_By('exhibition', 'by_past');
-    $sort_controller->register_custom_route('exhibitions/by-past');
+    $sort_controller->register_custom_route('exhibition/by-past');
     $sort_controller = new Make_Sort_By('event', 'by_current');
-    $sort_controller->register_custom_route('events/by-current');
+    $sort_controller->register_custom_route('event/by-current');
     $sort_controller = new Make_Sort_By('exhibition', 'by_current');
-    $sort_controller->register_custom_route('exhibitions/by-current');
+    $sort_controller->register_custom_route('exhibition/by-current');
     $sort_controller = new Make_Sort_By('event', 'by_upcoming');
-    $sort_controller->register_custom_route('events/by-upcoming');
+    $sort_controller->register_custom_route('event/by-upcoming');
     $sort_controller = new Make_Sort_By('exhibition', 'by_upcoming');
-    $sort_controller->register_custom_route('exhibitions/by-upcoming');
+    $sort_controller->register_custom_route('exhibition/by-upcoming');
     $sort_controller = new Make_Sort_By('event', 'by_current_and_upcoming');
-    $sort_controller->register_custom_route('events/by-current-and-upcoming');
+    $sort_controller->register_custom_route('event/by-current-and-upcoming');
     $sort_controller = new Make_Sort_By('exhibition', 'by_current_and_upcoming');
-    $sort_controller->register_custom_route('exhibitions/by-current-and-upcoming');
+    $sort_controller->register_custom_route('exhibition/by-current-and-upcoming');
 });
 
 /**
@@ -83,22 +83,22 @@ add_action( 'rest_api_init', function () {
  */
 add_filter('wp_rest_cache/allowed_endpoints', function () {
     // The standard wordpress post_types
-    if ( !isset($allowed_endpoints['craft/v2']) || !in_array('posts', $allowed_endpoints['craft/v2']) )
-        $allowed_endpoints['craft/v2'][] = 'posts';
-    if ( !isset($allowed_endpoints['craft/v2']) || !in_array('pages', $allowed_endpoints['craft/v2']) )
-        $allowed_endpoints['craft/v2'][] = 'pages';
+    if ( !isset($allowed_endpoints['craft/v2']) || !in_array('post', $allowed_endpoints['craft/v2']) )
+        $allowed_endpoints['craft/v2'][] = 'post';
+    if ( !isset($allowed_endpoints['craft/v2']) || !in_array('page', $allowed_endpoints['craft/v2']) )
+        $allowed_endpoints['craft/v2'][] = 'page';
     if ( !isset($allowed_endpoints['craft/v2']) || !in_array('media', $allowed_endpoints['craft/v2']) )
         $allowed_endpoints['craft/v2'][] = 'media';
 
     // Craft in America custom post_types
-    if ( !isset($allowed_endpoints['craft/v2']) || !in_array('episodes', $allowed_endpoints['craft/v2']) )
-        $allowed_endpoints['craft/v2'][] = 'episodes';
-    if ( !isset($allowed_endpoints['craft/v2']) || !in_array('events', $allowed_endpoints['craft/v2']) )
-        $allowed_endpoints['craft/v2'][] = 'events';
-    if ( !isset($allowed_endpoints['craft/v2']) || !in_array('exhibitions', $allowed_endpoints['craft/v2']) )
-        $allowed_endpoints['craft/v2'][] = 'exhibitions';
-    if ( !isset($allowed_endpoints['craft/v2']) || !in_array('artists', $allowed_endpoints['craft/v2']) )
-        $allowed_endpoints['craft/v2'][] = 'artists';
+    if ( !isset($allowed_endpoints['craft/v2']) || !in_array('episode', $allowed_endpoints['craft/v2']) )
+        $allowed_endpoints['craft/v2'][] = 'episode';
+    if ( !isset($allowed_endpoints['craft/v2']) || !in_array('event', $allowed_endpoints['craft/v2']) )
+        $allowed_endpoints['craft/v2'][] = 'event';
+    if ( !isset($allowed_endpoints['craft/v2']) || !in_array('exhibition', $allowed_endpoints['craft/v2']) )
+        $allowed_endpoints['craft/v2'][] = 'exhibition';
+    if ( !isset($allowed_endpoints['craft/v2']) || !in_array('artist', $allowed_endpoints['craft/v2']) )
+        $allowed_endpoints['craft/v2'][] = 'artist';
 
     return $allowed_endpoints;
 }, 10, 1);

vue-theme/src/pages/list.vue

@@ -13,7 +13,7 @@
 
         .posts(v-if="posts && loaded" :class="{ 'is-grid': grid }")
             section(v-for="(post, i) in posts" :key="post.slug").shadow.post
-                card(:content="post" :type="type" :wide="type == 'exhibitions' && i > 1 || type == 'events' && i > 1 ")
+                card(:content="post" :type="type" :wide="type == 'exhibition' && i > 1 || type == 'event' && i > 1 ")
 
         footer
             p {{ `${type} count: ${Object.values(posts).length}` }}
@@ -47,16 +47,16 @@ export default {
             return typeFromRoute(this.$route)
         },
         dispatchName() {
-            let type = convertTitleCase(this.type)
+            let type = convertTitleCase(this.type) + 's'
             return this.sortBy ? `getAll${type.split('/')[0]}` : `getAll${type}`
         },
         loaded() {
-            let type = convertTitleCase(this.type)
+            let type = convertTitleCase(this.type) + 's'
             if (!type) return
             return this[`all${type}Loaded`]
         },
         posts() {
-            let type = convertTitleCase(this.type)
+            let type = convertTitleCase(this.type) + 's'
             if (!type) return
             return this[`all${type}`]
         },
@@ -71,7 +71,7 @@ export default {
                       .filter(p => p)
                       .pop()
 
-            // console.log('Gettings posts:', this.type)
+            console.log('Gettings posts:', this.type)
             // if (!Object.values(sortTypes).includes(sort)) {
             //     console.log('Sort not found:', sort)
             //     sort = null
@@ -81,13 +81,13 @@ export default {
             if (this.type && this.dispatchName) {
                 this.$store.dispatch(this.dispatchName, sort)
 
-                if (this.type == 'events') {
+                if (this.type == 'event') {
                     this.$store.dispatch(
                         'getAllExhibitions',
                         sortTypes.currentAndUpcoming,
                     )
                 }
-                if (this.type == 'exhibitions') {
+                if (this.type == 'exhibition') {
                     this.$store.dispatch(
                         'getAllEvents',
                         sortTypes.currentAndUpcoming,

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

@@ -1,4 +1,5 @@
 import { convertTitleCase, postTypes } from '@/utils/helpers'
+import { capitalize } from '@vue/shared'
 import { mapGetters, mapState } from 'vuex'
 
 /**
@@ -8,7 +9,8 @@ import { mapGetters, mapState } from 'vuex'
  */
 const getterHelper = {}
 for (let type of postTypes) {
-    const capitalized = convertTitleCase(type)
+    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`

vue-theme/src/pages/single.vue

@@ -15,7 +15,7 @@
             //- p(v-if="post.type") type: {{ post.type }}
             //- p(v-if="post.subtypes") subtypes: {{ post.subtypes }}
 
-            .date-info(v-if="['exhibitions', 'events'].includes(type)")
+            .date-info(v-if="['exhibition', 'event'].includes(type)")
                 p start: {{ dateFrom(post.start) }}
                 p end: {{ dateFrom(post.end) }}
 
@@ -23,13 +23,13 @@
         section.content(v-html="post.content")
 
         //- related artists section for episodes
-        section(v-if="type === 'episodes' && post" :post="post")
+        section(v-if="type === 'episode' && post" :post="post")
             h2.t-up featured in this episode
             ul
                 li.f-row.between(v-for="artist in p2pPostsByType['artist']")
-                    card(:content="artist" type="artists" :wide="true" :hide-type="true")
+                    card(:content="artist" type="artist" :wide="true" :hide-type="true")
             
-        credits(v-if="type === 'episodes' && post" :post="post")
+        credits(v-if="type === 'episode' && post" :post="post")
 
         //- end of article icon     
         footer.f-col
@@ -196,7 +196,7 @@ export default {
              * which is derived from the route
              * !: posts watcher fires when this finishes
              */
-            let type = convertTitleCase(this.type)
+            let type = convertTitleCase(this.type) + 's'
 
             if (!this.$store.state[this.type]) return
 

vue-theme/src/router/routes.js

@@ -9,23 +9,23 @@ export default [
     { path: '/', component: indexPage },
     // List Pages
     {
-        path: '/episodes',
+        path: '/episode',
         component: listPage,
         props: { sidebar: false, grid: true, sortBy: null },
     },
     {
-        path: '/artists',
+        path: '/artist',
         component: listPage,
         props: { sidebar: true, grid: true, sortBy: null },
     },
     // Sorted List Pages
     {
-        path: `/artists/${sortTypes.alpha}`,
+        path: `/artist/${sortTypes.alpha}`,
         component: listPage,
         props: { sidebar: true, grid: true, sortBy: `${sortTypes.alpha}` },
     },
     {
-        path: `/artists/${sortTypes.material}`,
+        path: `/artist/${sortTypes.material}`,
         component: listPage,
         props: { sidebar: true, grid: true, sortBy: `${sortTypes.material}` },
     },

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

@@ -20,7 +20,7 @@ const actions = {
     getAllArtists({ commit }, sortType) {
         commit('CLEAR_ARTISTS')
         commit('ARTISTS_LOADED', false)
-        return api.getByType('artists', sortType, artists => {
+        return api.getByType('artist', sortType, artists => {
             commit('STORE_FETCHED_ARTISTS', { artists })
             commit('ARTISTS_LOADED', true)
         })
@@ -28,7 +28,7 @@ const actions = {
     getSingleArtist({ commit }, id) {
         commit('CLEAR_SINGLE_ARTISTS')
         commit('ARTISTS_LOADED', false)
-        api.getSingleType('artists', id, artist => {
+        api.getSingleType('artist', id, artist => {
             commit('STORE_FETCHED_SINGLE_ARTIST', artist)
             commit('ARTISTS_LOADED', true)
         })

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

@@ -20,7 +20,7 @@ const actions = {
     getAllEpisodes({ commit }, sortType) {
         commit('CLEAR_EPISODES')
         commit('EPISODES_LOADED', false)
-        return api.getByType('episodes', sortType, episodes => {
+        return api.getByType('episode', sortType, episodes => {
             commit('STORE_FETCHED_EPISODES', { episodes })
             commit('EPISODES_LOADED', true)
         })
@@ -29,7 +29,7 @@ const actions = {
         console.log('clearing single ep from getSingle')
         commit('CLEAR_SINGLE_EPISODES')
         commit('EPISODES_LOADED', false)
-        api.getSingleType('episodes', id, episode => {
+        api.getSingleType('episode', id, episode => {
             commit('STORE_FETCHED_SINGLE_EPISODE', episode)
             commit('EPISODES_LOADED', true)
         })

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

@@ -27,7 +27,7 @@ const actions = {
     getAllEvents({ commit }, sortType) {
         commit('CLEAR_EVENTS')
         commit('EVENTS_LOADED', false)
-        return api.getByType('events', sortType, events => {
+        return api.getByType('event', sortType, events => {
             commit('STORE_FETCHED_EVENTS', { events })
             commit('EVENTS_LOADED', true)
         })
@@ -35,7 +35,7 @@ const actions = {
     getSingleEvent({ commit }, id) {
         commit('CLEAR_SINGLE_EVENTS')
         commit('EVENTS_LOADED', false)
-        api.getSingleType('events', id, event => {
+        api.getSingleType('event', id, event => {
             commit('STORE_FETCHED_SINGLE_EVENT', event)
             commit('EVENTS_LOADED', true)
         })

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

@@ -29,7 +29,7 @@ const actions = {
     getAllExhibitions({ commit }, sortType) {
         commit('CLEAR_EXHIBITIONS')
         commit('EXHIBITIONS_LOADED', false)
-        return api.getByType('exhibitions', sortType, exhibitions => {
+        return api.getByType('exhibition', sortType, exhibitions => {
             commit('STORE_FETCHED_EXHIBITIONS', { exhibitions })
             commit('EXHIBITIONS_LOADED', true)
         })
@@ -37,7 +37,7 @@ const actions = {
     getSingleExhibition({ commit }, id) {
         commit('CLEAR_SINGLE_EXHIBITIONS')
         commit('EXHIBITIONS_LOADED', false)
-        api.getSingleType('exhibitions', id, exhibition => {
+        api.getSingleType('exhibition', id, exhibition => {
             commit('STORE_FETCHED_SINGLE_EXHIBITION', exhibition)
             commit('EXHIBITIONS_LOADED', true)
         })

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

@@ -17,7 +17,7 @@ const getters = {
 const actions = {
     async getAllPages({ commit }, sortType) {
         commit('PAGES_LOADED', false)
-        return await api.getByType('pages', sortType, pages => {
+        return await api.getByType('page', sortType, pages => {
             commit('STORE_FETCHED_PAGES', { pages })
             commit('PAGES_LOADED', true)
         })
@@ -25,7 +25,7 @@ const actions = {
     getSinglePage({ commit }, id) {
         commit('CLEAR_SINGLE_PAGE')
         commit('PAGES_LOADED', false)
-        api.getSingleType('pages', id, page => {
+        api.getSingleType('page', id, page => {
             commit('STORE_FETCHED_SINGLE_PAGE', page)
             commit('PAGES_LOADED', true)
         })

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

@@ -15,7 +15,7 @@ const actions = {
     getAllPosts({ commit }, sortType) {
         commit('CLEAR_POSTS')
         commit('POSTS_LOADED', false)
-        return api.getByType('posts', sortType, posts => {
+        return api.getByType('post', sortType, posts => {
             commit('STORE_FETCHED_POSTS', { posts })
             commit('POSTS_LOADED', true)
         })
@@ -23,7 +23,7 @@ const actions = {
     getSinglePost({ commit }, id) {
         commit('CLEAR_SINGLE_POSTS')
         commit('POSTS_LOADED', false)
-        api.getSingleType('posts', id, post => {
+        api.getSingleType('post', id, post => {
             commit('STORE_FETCHED_SINGLE_POST', post)
             commit('POSTS_LOADED', true)
         })

vue-theme/src/utils/api.js

@@ -64,7 +64,7 @@ export default {
     },
     getPosts(limit = 5, cb) {
         axios
-            .get(SETTINGS.API_BASE_PATH + 'posts')
+            .get(SETTINGS.API_BASE_PATH + 'post')
             .then(response => {
                 cb(response.data)
             })

vue-theme/src/utils/helpers.js

@@ -26,12 +26,12 @@ const sortTypes = {
  */
 const postTypes = [
     'sticky',
-    'episodes',
-    'artists',
-    'exhibitions',
-    'events',
-    'posts',
-    'pages',
+    'episode',
+    'artist',
+    'exhibition',
+    'event',
+    'post',
+    'page',
 ]
 
 /**
@@ -50,7 +50,7 @@ const typeFromRoute = route => {
 
         // Only take the first match
         type = type[0]
-        // console.log(`type derived from route.path: ${type}`)
+        console.log(`type derived from route.path: ${type}`)
     }
 
     return type