:sparkles: big commit | created single post endpoint to load blocks serperately

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

@@ -37,13 +37,13 @@ add_action( 'rest_api_init', function () {
      */
     $episode_controller = new Make_Endpoint_For('episode');
     $episode_controller->register_custom_route('episodes');
-    
+
     $artist_controller = new Make_Endpoint_For('artist');
     $artist_controller->register_custom_route('artists');
 
     $event_controller = new Make_Endpoint_For('event');
     $event_controller->register_custom_route('events');
-    
+
     $exhibition_controller = new Make_Endpoint_For('exhibition');
     $exhibition_controller->register_custom_route('exhibitions');
 

plugins/cia-endpoints/includes/class.make-endpoint.php

@@ -19,18 +19,29 @@ class Make_Endpoint_For extends WP_REST_Controller {
         register_rest_route( $namespace, '/' . $route, [
             array(
                 'methods'  => WP_REST_Server::READABLE,
-                'callback' => array( $this, 'get_items' )
+                'callback' => array( $this, 'get_all_items' )
             ),
         ]);
         register_rest_route( $namespace, '/' . $route . '/(?P<id>[\d]+)', [
             array(
                 'methods'  => WP_REST_Server::READABLE,
-                'callback' => array( $this, 'get_items' )
+                'callback' => array( $this, 'get_single_item' )
             ),
         ]);
     }
+    public function get_single_item( $request ) {
+        $args = array(
+            'numberposts' => 1,
+            'post_type' => $this->post_type
+        );
 
-    public function get_items( $request ) {
+        $params = $request->get_params();
+        if(intval($params['limit']) > 0) { $args['numberposts'] = intval($params['limit']); }
+        if(intval($params['id']) > 0) { $args['include'] = array($params['id']); }
+
+        return new WP_REST_Response( $this->prepare_single_item_for_response($args), 200 );
+    }
+    public function get_all_items( $request ) {
         $args = array(
             'numberposts' => -1,
             'post_type' => $this->post_type,
@@ -48,7 +59,7 @@ class Make_Endpoint_For extends WP_REST_Controller {
         // !: Add order asc/desc
         // !: Add orderby
 
-        return new WP_REST_Response( $this->prepare_item_for_response($args), 200 );
+        return new WP_REST_Response( $this->prepare_all_items_for_response($args), 200 );
     }
 
     private function _getAttachments($item, $galleries) {
@@ -75,8 +86,7 @@ class Make_Endpoint_For extends WP_REST_Controller {
         }
         return $attachment_map;
     }
-
-    public function prepare_item_for_response( $args ) {
+    public function prepare_single_item_for_response( $args ) {
         $collection = array();
 
         // https://developer.wordpress.org/reference/functions/get_posts/
@@ -84,18 +94,39 @@ class Make_Endpoint_For extends WP_REST_Controller {
             $filtered = default_post_format( $item );
 
             // Get those Block!
-            // $filtered[blocks] = get_rearrange_blocks(
-            //     parse_blocks( $item->post_content )
-            // );
+            $filtered[blocks] = get_rearrange_blocks(
+                parse_blocks( $item->post_content )
+            );
 
             // Galleries From blocks
-            // $media_ids = array();
-            // foreach ( get_attached_media( '', $item->ID ) as $attached_media ):
-            //     array_push($media_ids, $attached_media->ID);
-            // endforeach;
-            // $filtered[galleries] = get_ids_from_gallery_block(
-            //     parse_blocks( $item->post_content )
-            // );
+            $media_ids = array();
+            foreach ( get_attached_media( '', $item->ID ) as $attached_media ):
+                array_push($media_ids, $attached_media->ID);
+            endforeach;
+            $filtered[galleries] = get_ids_from_gallery_block(
+                parse_blocks( $item->post_content )
+            );
+
+            // Find all image info
+            $filtered[attached] = $this->_getAttachments( $item, $filtered[galleries] );
+
+            // For your hero URL
+            $filtered[hero] = get_post_meta( $item->ID, 'hero_header', true );
+
+            // $filtered[relatedto] = p2p_related_to( $item->ID, $item->post_type );
+
+            $collection[$item->ID] = $filtered;
+        }
+        wp_reset_postdata();
+
+        return $collection;
+    }
+    public function prepare_all_items_for_response( $args ) {
+        $collection = array();
+
+        // https://developer.wordpress.org/reference/functions/get_posts/
+        foreach( get_posts($args) as $item ) {
+            $filtered = default_post_format( $item );
 
             // Find all image info
             $filtered[attached] = $this->_getAttachments( $item, $filtered[galleries] );

vue-theme/package-lock.json

@@ -8,6 +8,7 @@
       "version": "1.0.0",
       "license": "UNLICENSED",
       "dependencies": {
+        "chokidar": "^3.5.1",
         "compression-webpack-plugin": "^3.1.0",
         "vue": "^3.0.5",
         "vue-router": "^4.0.2",
@@ -1953,8 +1954,6 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
       "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
-      "dev": true,
-      "optional": true,
       "dependencies": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -2323,8 +2322,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
       "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==",
-      "dev": true,
-      "optional": true,
       "engines": {
         "node": ">=8"
       }
@@ -2735,15 +2732,12 @@
       }
     },
     "node_modules/chokidar": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.0.tgz",
-      "integrity": "sha512-JgQM9JS92ZbFR4P90EvmzNpSGhpPBGBSj10PILeDyYFwp4h2/D9OM03wsJ4zW1fEp4ka2DGrnUeD7FuvQ2aZ2Q==",
-      "dev": true,
-      "optional": true,
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
+      "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
       "dependencies": {
         "anymatch": "~3.1.1",
         "braces": "~3.0.2",
-        "fsevents": "~2.3.1",
         "glob-parent": "~5.1.0",
         "is-binary-path": "~2.1.0",
         "is-glob": "~4.0.1",
@@ -2752,14 +2746,15 @@
       },
       "engines": {
         "node": ">= 8.10.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.1"
       }
     },
     "node_modules/chokidar/node_modules/braces": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
       "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
-      "optional": true,
       "dependencies": {
         "fill-range": "^7.0.1"
       },
@@ -2771,8 +2766,6 @@
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
       "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dev": true,
-      "optional": true,
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -2784,8 +2777,6 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
-      "optional": true,
       "engines": {
         "node": ">=0.12.0"
       }
@@ -2794,8 +2785,6 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "optional": true,
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -4760,7 +4749,6 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.1.tgz",
       "integrity": "sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==",
-      "dev": true,
       "optional": true,
       "os": [
         "darwin"
@@ -4854,8 +4842,6 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
       "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
-      "dev": true,
-      "optional": true,
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -5439,8 +5425,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
       "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dev": true,
-      "optional": true,
       "dependencies": {
         "binary-extensions": "^2.0.0"
       },
@@ -5551,7 +5535,6 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -5569,7 +5552,6 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
       "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-      "dev": true,
       "dependencies": {
         "is-extglob": "^2.1.1"
       },
@@ -6388,7 +6370,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -6793,8 +6774,6 @@
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
       "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
-      "dev": true,
-      "optional": true,
       "engines": {
         "node": ">=8.6"
       }
@@ -8263,8 +8242,6 @@
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
       "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
-      "dev": true,
-      "optional": true,
       "dependencies": {
         "picomatch": "^2.2.1"
       },
@@ -9606,7 +9583,6 @@
       "dev": true,
       "dependencies": {
         "source-map": "~0.5.1",
-        "uglify-to-browserify": "~1.0.0",
         "yargs": "~3.10.0"
       },
       "bin": {
@@ -10117,10 +10093,8 @@
       "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==",
       "dev": true,
       "dependencies": {
-        "chokidar": "^3.4.1",
         "graceful-fs": "^4.1.2",
-        "neo-async": "^2.5.0",
-        "watchpack-chokidar2": "^2.0.1"
+        "neo-async": "^2.5.0"
       },
       "optionalDependencies": {
         "chokidar": "^3.4.1",
@@ -10503,7 +10477,6 @@
         "anymatch": "^2.0.0",
         "async-each": "^1.0.1",
         "braces": "^2.3.2",
-        "fsevents": "^1.2.7",
         "glob-parent": "^3.1.0",
         "inherits": "^2.0.3",
         "is-binary-path": "^1.0.0",
@@ -12829,8 +12802,6 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
       "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
-      "dev": true,
-      "optional": true,
       "requires": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -13141,9 +13112,7 @@
     "binary-extensions": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
-      "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==",
-      "dev": true,
-      "optional": true
+      "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ=="
     },
     "bluebird": {
       "version": "3.7.2",
@@ -13514,11 +13483,9 @@
       }
     },
     "chokidar": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.0.tgz",
-      "integrity": "sha512-JgQM9JS92ZbFR4P90EvmzNpSGhpPBGBSj10PILeDyYFwp4h2/D9OM03wsJ4zW1fEp4ka2DGrnUeD7FuvQ2aZ2Q==",
-      "dev": true,
-      "optional": true,
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
+      "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
       "requires": {
         "anymatch": "~3.1.1",
         "braces": "~3.0.2",
@@ -13534,8 +13501,6 @@
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
           "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-          "dev": true,
-          "optional": true,
           "requires": {
             "fill-range": "^7.0.1"
           }
@@ -13544,8 +13509,6 @@
           "version": "7.0.1",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
           "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-          "dev": true,
-          "optional": true,
           "requires": {
             "to-regex-range": "^5.0.1"
           }
@@ -13553,16 +13516,12 @@
         "is-number": {
           "version": "7.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-          "dev": true,
-          "optional": true
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
         },
         "to-regex-range": {
           "version": "5.0.1",
           "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
           "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-          "dev": true,
-          "optional": true,
           "requires": {
             "is-number": "^7.0.0"
           }
@@ -15206,7 +15165,6 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.1.tgz",
       "integrity": "sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==",
-      "dev": true,
       "optional": true
     },
     "function-bind": {
@@ -15279,8 +15237,6 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
       "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
-      "dev": true,
-      "optional": true,
       "requires": {
         "is-glob": "^4.0.1"
       }
@@ -15760,8 +15716,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
       "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dev": true,
-      "optional": true,
       "requires": {
         "binary-extensions": "^2.0.0"
       }
@@ -15845,8 +15799,7 @@
     "is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
     },
     "is-fullwidth-code-point": {
       "version": "2.0.0",
@@ -15858,7 +15811,6 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
       "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-      "dev": true,
       "requires": {
         "is-extglob": "^2.1.1"
       }
@@ -16540,8 +16492,7 @@
     "normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "dev": true
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
     },
     "normalize-range": {
       "version": "0.1.2",
@@ -16863,9 +16814,7 @@
     "picomatch": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
-      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
-      "dev": true,
-      "optional": true
+      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="
     },
     "pify": {
       "version": "4.0.1",
@@ -18117,8 +18066,6 @@
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
       "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
-      "dev": true,
-      "optional": true,
       "requires": {
         "picomatch": "^2.2.1"
       }

vue-theme/package.json

@@ -40,6 +40,7 @@
     "webpack-dev-server": "^3.11.1"
   },
   "dependencies": {
+    "chokidar": "^3.5.1",
     "compression-webpack-plugin": "^3.1.0",
     "vue": "^3.0.5",
     "vue-router": "^4.0.2",

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

@@ -1,5 +1,5 @@
 import { convertTitleCase } from '@/utils/helpers'
-import { mapGetters } from 'vuex'
+import { mapGetters, mapState } from 'vuex'
 /**
  * A list of custom post types used to dispatch vuex actions
  * This makes ALL post type modules available for the
@@ -22,13 +22,20 @@ const postTypes = [
 const getterHelper = {}
 for(let type of postTypes) {
     const capitalized = convertTitleCase(type)
-    getterHelper[`all${capitalized}s`] = `all${capitalized}s` 
-    getterHelper[`all${capitalized}sLoaded`] = `all${capitalized}sLoaded` 
+    getterHelper[`all${capitalized}sBySlug`] = `all${capitalized}sBySlug`
+    getterHelper[`all${capitalized}s`] = `all${capitalized}s`
+    getterHelper[`all${capitalized}sLoaded`] = `all${capitalized}sLoaded`
+}
+
+const stateHelper = {}
+for(let type of postTypes) {
+    stateHelper[type] = type
 }
 
 const postTypeGetters = {
     computed: {
-        ...mapGetters(getterHelper)
+        ...mapGetters(getterHelper),
+        ...mapState(stateHelper)
     }
 }
 

vue-theme/src/pages/single.vue

@@ -13,7 +13,7 @@
 
     sidebar(v-if="sidebar" :type="`${type}`")
         .shadow
-            h1.t-up single slot 
+            h1.t-up single slot
             div
                 p body whatever
 </template>
@@ -25,12 +25,13 @@ import block from '@/components/content-block/block'
 
 import { postTypeGetters } from './mixin-post-types'
 
-import { convertTitleCase, typeFromRoute } from '@/utils/helpers'
+import { convertTitleCase, dePluralize, typeFromRoute } from '@/utils/helpers'
 
 export default {
     components: { sidebar, gallery, block },
     props: {
-        sidebar: { type: Boolean }
+        sidebar: { type: Boolean },
+        id: { type: Number }
     },
     mixins: [postTypeGetters],
     data() {
@@ -41,30 +42,20 @@ export default {
         }
     },
     computed: {
-        type() { // Checks for type and fixes Episodes route edge case 
+        type() { // Checks for type and fixes Episodes route edge case
             return typeFromRoute(this.$route)
         },
         /**
          * We get the actual post data using the slug
          */
         post() {
-            return this.posts[this.$route.params.slug]
-        },
-        /**
-         * We grab posts using the type derived from
-         * the route (See typeFromRoute() helper) and
-         * create a map keyed by post slug 
-         */
-        posts() {
-            let type = convertTitleCase(this.type)
-            
-            if(!type) return []
-            
-            // Return list keyed by slug
-            return Object.values(this[`all${type}`]).reduce((postsMap, post) => { 
-                postsMap[post.slug] = post
-                return postsMap
-            }, {})
+            const type = dePluralize(this.type)
+
+            // State not a getter!
+            const typeState = this[type]
+            if(!typeState[type]) return
+
+            return Object.values(typeState[type])[0]
         },
 
         idsForGallery() {
@@ -102,7 +93,7 @@ export default {
          * is set. We also need to set the activeImageID
          * to the image clicked
          * @param {number} galleryIndex
-         * @param {string} imageID 
+         * @param {string} imageID
          */
         openGallery(galleryIndex, imageID) {
             this.activeGalleryIndex = galleryIndex
@@ -113,10 +104,9 @@ export default {
          * Everytime the posts object changes
          * we use this to set a new HERO
          * in vuex
-         * @param {object} posts 
+         * @param {object} posts
          */
-        checkAndSetHero(posts) {
-            const post = posts[this.$route.params.slug]
+        checkAndSetHero(post) {
             if(!post || !post.hero) return
 
             const json = JSON.parse(post.hero)
@@ -131,11 +121,11 @@ export default {
         },
     },
     watch: {
-        posts(newVal, oldVal) {
+        post(newVal, oldVal) {
             this.checkAndSetHero(newVal)
         }
     },
-    created() {
+    async created() {
         /**
          * Conditionally load based on post type
          * which is derived from the route
@@ -143,9 +133,14 @@ export default {
          */
         let type = convertTitleCase(this.type)
         if(!this[`all${type}Loaded`] && type) {
-            // console.log('Retrieving...', type)
-            this.$store.dispatch(`getAll${type}`)
+            const res = await this.$store.dispatch(`getAll${type}`)
+            const post = Object.values(res).filter(post => post.slug == this.$route.params.slug)[0]
+            this.$store.dispatch(`getSingle${dePluralize(type)}`, post.id)
+        } else {
+            const post = Object.values(this.$store.state[this.type].all).filter(post => post.slug == this.$route.params.slug)[0]
+            this.$store.dispatch(`getSingle${dePluralize(type)}`, post.id)
         }
+
     }
 }
 </script>

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

@@ -1,47 +1,44 @@
 import api from '../../utils/api'
 
 const state = {
-    all: {},
+    all: [],
     loaded: false,
     artist: null,
 }
 
 const getters = {
     allArtists: state => state.all,
-    allArtistsLoaded: state => state.loaded,
-    artist: state => id => {
-        let field = typeof id === 'number' ? 'id' : 'slug'
-        let artist = state.all.filter(artist => artist[field] === id)
-        return (artist[0]) ? artist[0] : false
-    },
-    artistContent: state => id => {
-        let field = typeof id === 'number' ? 'id' : 'slug'
-        let artist = state.all.filter(artist => artist[field] === id)
-        return (artist[0]) ? artist[0].content.rendered : false
-    },
-    someArtists: state => limit => {
-        if (state.all.length < 1) return false
-
-        let all = [...state.all]
-
-        return all.splice(0, Math.min(limit, state.all.length))
-    },
+    allArtistsBySlug: state => Object.values(state.all).reduce((bySlug, artist) => {
+        bySlug[artist.slug] = artist
+        return bySlug
+    }, {}),
+    allArtistsLoaded: state => state.loaded
 }
 
 const actions = {
     getAllArtists({ commit }, sortType) {
         commit('CLEAR_ARTISTS')
         commit('ARTISTS_LOADED', false)
-        api.getByType('artists', sortType, artists => {
+        return api.getByType('artists', sortType, artists => {
             commit('STORE_FETCHED_ARTISTS', { artists })
             commit('ARTISTS_LOADED', true)
         })
+    },
+    getSingleArtist({ commit }, slug) {
+        commit('CLEAR_SINGLE_ARTIST')
+        commit('ARTISTS_LOADED', false)
+        api.getSingleType('artists', slug,  artist => {
+            commit('STORE_FETCHED_SINGLE_ARTIST', artist)
+            commit('ARTISTS_LOADED', true)
+        })
     }
 }
 
 const mutations = {
     STORE_FETCHED_ARTISTS(state, { artists }) { state.all = artists },
+    STORE_FETCHED_SINGLE_ARTIST(state, artist) { state.artist = artist },
     CLEAR_ARTISTS(state) { state.all = [] },
+    CLEAR_SINGLE_ARTIST(state) { state.artist = null },
     ARTISTS_LOADED(state, val) { state.loaded = val },
 }
 

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

@@ -9,38 +9,32 @@ const state = {
 const getters = {
     allEpisodes: state => state.all,
     allEpisodesLoaded: state => state.loaded,
-    episode: state => id => {
-        let field = typeof id === 'number' ? 'id' : 'slug'
-        let episode = state.all.filter(episode => episode[field] === id)
-        return (episode[0]) ? episode[0] : false
-    },
-    episodeContent: state => id => {
-        let field = typeof id === 'number' ? 'id' : 'slug'
-        let episode = state.all.filter(episode => episode[field] === id)
-
-        return (episode[0]) ? episode[0].content.rendered : false
-    },
-    someEpisodes: state => limit => {
-        if (state.all.length < 1) return false
-
-        let all = [...state.all]
-
-        return all.splice(0, Math.min(limit, state.all.length))
-    },
 }
 
 const actions = {
     getAllEpisodes({ commit }, sortType) {
+        commit('CLEAR_EPISODES')
         commit('EPISODES_LOADED', false)
-        api.getByType('episodes', sortType, episodes => {
+        return api.getByType('episodes', sortType, episodes => {
             commit('STORE_FETCHED_EPISODES', { episodes })
             commit('EPISODES_LOADED', true)
         })
+    },
+    getSingleEpisode({ commit }, slug) {
+        commit('CLEAR_SINGLE_EPISODE')
+        commit('EPISODES_LOADED', false)
+        api.getSingleType('episodes', slug,  episode => {
+            commit('STORE_FETCHED_SINGLE_EPISODE', episode)
+            commit('EPISODES_LOADED', true)
+        })
     }
 }
 
 const mutations = {
     STORE_FETCHED_EPISODES(state, { episodes }) { state.all = episodes },
+    STORE_FETCHED_SINGLE_EPISODE(state, episode) { state.episode = episode },
+    CLEAR_EPISODES(state) { state.all = [] },
+    CLEAR_SINGLE_EPISODE(state) { state.episode = null },
     EPISODES_LOADED(state, val) { state.loaded = val },
 }
 

vue-theme/src/utils/api.js

@@ -1,6 +1,6 @@
 import axios from 'axios'
 
-const SETTINGS = { 
+const SETTINGS = {
     LOADING_SEGMENTS: 2,
     API_BASE_PATH: '/wp-json/craft/v2/',
     API_MEDIA_PATH: '/wp-json/wp/v2/media/',
@@ -9,17 +9,24 @@ const SETTINGS = {
 export default {
     getByType(type, sortType, cb) {
         if (sortType) {
-            axios.get(SETTINGS.API_BASE_PATH + `sort/${type}/${sortType}`).then(response => {
+            return axios.get(SETTINGS.API_BASE_PATH + `sort/${type}/${sortType}`).then(response => {
                 cb(response.data)
+                return response.data
             }).catch(e => { cb(e) })
         }
 
         else {
-            axios.get(SETTINGS.API_BASE_PATH + `${type}`).then(response => {
+            return axios.get(SETTINGS.API_BASE_PATH + `${type}`).then(response => {
                 cb(response.data)
+                return response.data
             }).catch(e => { cb(e) })
         }
     },
+    getSingleType(type, id, cb) {
+        axios.get(SETTINGS.API_BASE_PATH + `${type}/${id}`).then(response => {
+            cb(response.data)
+        }).catch(e => { cb(e) })
+    },
     getSingleMedia(id, cb) {
         axios.get(SETTINGS.API_MEDIA_PATH + `${id}`).then(response => {
             cb(response.data)

vue-theme/src/utils/helpers.js

@@ -3,8 +3,13 @@ const convertTitleCase = (type) => {
     return type.charAt(0).toUpperCase() + type.slice(1)
 }
 
+const dePluralize = type => {
+    return type[type.length - 1] === 's' ? type.slice(0, -1) : type
+}
+
 const typeFromRoute = (route) => {
-    return route.params.type ? route.params.type : route.fullPath.slice(1)
+    const type = route.params.type ? route.params.type : route.fullPath.slice(1)
+    return type
 }
 
 const sortTypes = {
@@ -13,4 +18,4 @@ const sortTypes = {
     material: 'by-material',
 }
 
-export { convertTitleCase, typeFromRoute, sortTypes }
+export { convertTitleCase, dePluralize, typeFromRoute, sortTypes }