Merge branch 'staging' into develop

Author: ravewebdev

api/frontend/wp/comments/mutationAddComment.js

@@ -18,6 +18,7 @@ const mutationAddComment = gql`
       postId: $postId,
       content: $content
     ) @rest(type: "Comments", path: "${wpDataEndpoints.postComment}?{args}") {
+      success
       comment {
         ${commentsFields}
       }

api/wordpress/_global/getPostTypeArchive.js

@@ -1,44 +1,19 @@
 import {initializeWpApollo} from '../connector'
 import queryPostsArchive from '../posts/queryPostsArchive'
 import {postTypes} from './postTypes'
-import queryEventsArchive from '../events/queryEventsArchive'
-import queryCareersArchive from '../careers/queryCareersArchive'
-import queryServicesArchive from '../services/queryServicesArchive'
 import queryTeamsArchive from '../teams/queryTeamsArchive'
-import queryPortfoliosArchive from '../portfolios/queryPortfoliosArchive'
-import queryTestimonialsArchive from '../testimonials/queryTestimonialsArchive'
 import formatDefaultSeoData from '@/functions/formatDefaultSeoData'
 import getMenus from '../menus/getMenus'
 
 // Define SEO for archives.
 export const archiveSeo = {
-  career: {
-    title: 'Careers',
-    description: ''
-  },
-  event: {
-    title: 'Events',
-    description: ''
-  },
-  portfolio: {
-    title: 'Portfolio',
-    description: ''
-  },
   post: {
     title: 'Blog',
     description: ''
   },
-  service: {
-    title: 'Services',
-    description: ''
-  },
   team: {
     title: 'Team Members',
     description: ''
-  },
-  testimonial: {
-    title: 'Testimonials',
-    description: ''
   }
 }
 
@@ -64,13 +39,8 @@ export default async function getPostTypeArchive(
 ) {
   // Define single post query based on post type.
   const postTypeQuery = {
-    career: queryCareersArchive,
-    event: queryEventsArchive,
-    portfolio: queryPortfoliosArchive,
     post: queryPostsArchive,
-    service: queryServicesArchive,
-    team: queryTeamsArchive,
-    testimonial: queryTestimonialsArchive
+    team: queryTeamsArchive
   }
 
   // Retrieve post type query.

api/wordpress/_global/getPostTypeById.js

@@ -1,12 +1,7 @@
 import queryPostById from '../posts/queryPostById'
 import queryPageById from '../pages/queryPageById'
 import {isHierarchicalPostType} from './postTypes'
-import queryEventById from '../events/queryEventById'
-import queryCareerById from '../careers/queryCareerById'
-import queryServiceById from '../services/queryServiceById'
 import queryTeamById from '../teams/queryTeamById'
-import queryPortfolioById from '../portfolios/queryPortfolioById'
-import queryTestimonialById from '../testimonials/queryTestimonialById'
 import processPostTypeQuery from './processPostTypeQuery'
 
 /**
@@ -27,14 +22,9 @@ export default async function getPostTypeById(
 ) {
   // Define single post query based on post type.
   const postTypeQuery = {
-    career: queryCareerById,
-    event: queryEventById,
     page: queryPageById,
-    portfolio: queryPortfolioById,
     post: queryPostById,
-    service: queryServiceById,
-    team: queryTeamById,
-    testimonial: queryTestimonialById
+    team: queryTeamById
   }
 
   // Check if post type is hierarchical.

api/wordpress/_global/postCommentToPost.js

@@ -36,6 +36,7 @@ export default async function postCommentToPost(
   // Set up return object.
   const response = {
     apolloClient,
+    success: false,
     comment: null
   }
 
@@ -61,6 +62,7 @@ export default async function postCommentToPost(
         return null
       }
 
+      response.success = data.createComment.success
       response.comment = data.createComment.comment
     })
     .catch((error) => {

api/wordpress/_global/postTypes.js

@@ -1,17 +1,9 @@
 // Define valid WP post types (singular and plural GraphQL names).
 export const postTypes = {
-  career: {
-    pluralName: 'careers',
-    route: 'careers'
-  },
   comment: {
     pluralName: 'comments',
     route: null
   },
-  event: {
-    pluralName: 'events',
-    route: 'events'
-  },
   mediaItem: {
     pluralName: 'mediaItems',
     route: null
@@ -20,25 +12,13 @@ export const postTypes = {
     pluralName: 'pages',
     route: ''
   },
-  portfolio: {
-    pluralName: 'portfolios',
-    route: 'portfolio'
-  },
   post: {
     pluralName: 'posts',
     route: 'blog'
   },
-  service: {
-    pluralName: 'services',
-    route: 'service'
-  },
   team: {
     pluralName: 'teams',
     route: 'team'
-  },
-  testimonial: {
-    pluralName: 'testimonials',
-    route: 'testimonial'
   }
 }
 

api/wordpress/careers/queryCareerById.js

@@ -19,6 +19,7 @@ const mutationCommentToPost = gql`
         content: $content
       }
     ) {
+      success
       comment {
         ${commentsFields}
       }