Merge pull request #254 from WebDevStudios/bugfix/253-Move-root-api-t…

…o-lib Move root api folder to lib/wpapi
WebDevStudios · Mar 2, 2021 · 2ea4959 · 2ea4959 · vercel · Mar 2, 2021
2 parents 3a9cfaf + e0806fe
commit 2ea4959
Show file tree

Hide file tree

Showing 66 changed files with 59 additions and 59 deletions.
diff --git a/components/molecules/AlgoliaResults/AlgoliaResults.js b/components/molecules/AlgoliaResults/AlgoliaResults.js
@@ -1,5 +1,5 @@
-import {searchResultsClient} from '@/api/algolia/connector'
 import {WPContext} from '@/components/common/WordPressProvider'
+import {searchResultsClient} from '@/lib/algolia/connector'
 import PropTypes from 'prop-types'
 import React, {useContext} from 'react'
 import {Configure, InstantSearch} from 'react-instantsearch-dom'

diff --git a/components/molecules/AlgoliaSearch/components/Search.js b/components/molecules/AlgoliaSearch/components/Search.js
@@ -1,4 +1,4 @@
-import {searchClient} from '@/api/algolia/connector'
+import {searchClient} from '@/lib/algolia/connector'
 import PropTypes from 'prop-types'
 import React, {useCallback, useEffect, useState} from 'react'
 import {Configure, InstantSearch, SearchBox} from 'react-instantsearch-dom'

diff --git a/components/molecules/Comments/Comments.js b/components/molecules/Comments/Comments.js
@@ -1,9 +1,9 @@
+import Text from '@/components/atoms/Inputs/Text'
+import Form from '@/components/molecules/Form'
+import postComment from '@/lib/frontend/wp/comments/postComment'
 import PropTypes from 'prop-types'
 import React, {useState} from 'react'
 import * as Yup from 'yup'
-import Form from '@/components/molecules/Form'
-import Text from '@/components/atoms/Inputs/Text'
-import postComment from '@/api/frontend/wp/comments/postComment'
 
 /**
  * Render an individual comment component.

diff --git a/functions/formatBlockData.js b/functions/formatBlockData.js
@@ -1,5 +1,5 @@
-import getFormById from '@/api/wordpress/gravityForms/getFormById'
-import getMediaByID from '@/api/wordpress/media/getMediaByID'
+import getFormById from '@/lib/wordpress/gravityForms/getFormById'
+import getMediaByID from '@/lib/wordpress/media/getMediaByID'
 
 /**
  * Format and retrieve expanded block data.

diff --git a/functions/getPagePropTypes.js b/functions/getPagePropTypes.js
@@ -1,8 +1,8 @@
-import PropTypes from 'prop-types'
 import {
-  isValidPostType,
-  isHierarchicalPostType
-} from '@/api/wordpress/_global/postTypes'
+  isHierarchicalPostType,
+  isValidPostType
+} from '@/lib/wordpress/_global/postTypes'
+import PropTypes from 'prop-types'
 
 // Yoast SEO social prop types.
 export const seoSocialPropTypes = {

diff --git a/jsconfig.json b/jsconfig.json
@@ -2,7 +2,7 @@
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {
-      "@/api/*": ["api/*"],
+      "@/lib/*": ["lib/*"],
       "@/components/*": ["components/*"],
       "@/functions/*": ["functions/*"],
       "@/styles/*": ["styles/*"]

diff --git a/api/algolia/connector.js → lib/algolia/connector.js b/api/algolia/connector.js → lib/algolia/connector.js
diff --git a/api/apolloConfig.js → lib/apolloConfig.js b/api/apolloConfig.js → lib/apolloConfig.js
diff --git a/api/frontend/connector.js → lib/frontend/connector.js b/api/frontend/connector.js → lib/frontend/connector.js
@@ -1,6 +1,6 @@
 import {ApolloClient, InMemoryCache} from '@apollo/client'
-import {initializeApollo} from '../apolloConfig'
 import {RestLink} from 'apollo-link-rest'
+import {initializeApollo} from '../apolloConfig'
 
 let feApolloClient
 

diff --git a/api/frontend/wp/archive/getArchivePosts.js → lib/frontend/wp/archive/getArchivePosts.js b/api/frontend/wp/archive/getArchivePosts.js → lib/frontend/wp/archive/getArchivePosts.js
diff --git a/api/frontend/wp/archive/queryArchivePosts.js → lib/frontend/wp/archive/queryArchivePosts.js b/api/frontend/wp/archive/queryArchivePosts.js → lib/frontend/wp/archive/queryArchivePosts.js
@@ -1,5 +1,5 @@
+import {wpDataEndpoints} from '@/lib/wordpress/connector'
 import {gql} from '@apollo/client'
-import {wpDataEndpoints} from '@/api/wordpress/connector'
 
 // Query: retrieve archive posts by post type.
 const queryArchivePosts = gql`

diff --git a/...rontend/wp/comments/mutationAddComment.js → ...rontend/wp/comments/mutationAddComment.js b/...rontend/wp/comments/mutationAddComment.js → ...rontend/wp/comments/mutationAddComment.js
@@ -1,6 +1,6 @@
+import {wpDataEndpoints} from '@/lib/wordpress/connector'
+import commentsFields from '@/lib/wordpress/_partials/commentsFields'
 import {gql} from '@apollo/client'
-import {wpDataEndpoints} from '@/api/wordpress/connector'
-import commentsFields from '@/api/wordpress/_partials/commentsFields'
 
 // Mutation: Add a comment to the given post
 const mutationAddComment = gql`

diff --git a/api/frontend/wp/comments/postComment.js → lib/frontend/wp/comments/postComment.js b/api/frontend/wp/comments/postComment.js → lib/frontend/wp/comments/postComment.js
diff --git a/api/wordpress/_global/getFrontendPage.js → lib/wordpress/_global/getFrontendPage.js b/api/wordpress/_global/getFrontendPage.js → lib/wordpress/_global/getFrontendPage.js
diff --git a/api/wordpress/_global/getPostTypeArchive.js → lib/wordpress/_global/getPostTypeArchive.js b/api/wordpress/_global/getPostTypeArchive.js → lib/wordpress/_global/getPostTypeArchive.js
diff --git a/api/wordpress/_global/getPostTypeById.js → lib/wordpress/_global/getPostTypeById.js b/api/wordpress/_global/getPostTypeById.js → lib/wordpress/_global/getPostTypeById.js
diff --git a/...rdpress/_global/getPostTypeStaticPaths.js → ...rdpress/_global/getPostTypeStaticPaths.js b/...rdpress/_global/getPostTypeStaticPaths.js → ...rdpress/_global/getPostTypeStaticPaths.js
diff --git a/...rdpress/_global/getPostTypeStaticProps.js → ...rdpress/_global/getPostTypeStaticProps.js b/...rdpress/_global/getPostTypeStaticProps.js → ...rdpress/_global/getPostTypeStaticProps.js
@@ -1,12 +1,12 @@
-import {algoliaIndexName} from '@/api/algolia/connector'
-import getPostTypeById from './getPostTypeById'
-import getPostTypeArchive, {archiveQuerySeo} from './getPostTypeArchive'
-import {addApolloState} from '@/api/apolloConfig'
+import {algoliaIndexName} from '@/lib/algolia/connector'
+import {addApolloState} from '@/lib/apolloConfig'
 import getFrontendPage, {frontendPageSeo} from './getFrontendPage'
+import getPostTypeArchive, {archiveQuerySeo} from './getPostTypeArchive'
+import getPostTypeById from './getPostTypeById'
+import getPostTypeTaxonomyArchive from './getPostTypeTaxonomyArchive'
 import getSettingsCustomPage, {
   customPageQuerySeo
 } from './getSettingsCustomPage'
-import getPostTypeTaxonomyArchive from './getPostTypeTaxonomyArchive'
 
 /**
  * Retrieve static props by post type.

diff --git a/...ess/_global/getPostTypeTaxonomyArchive.js → ...ess/_global/getPostTypeTaxonomyArchive.js b/...ess/_global/getPostTypeTaxonomyArchive.js → ...ess/_global/getPostTypeTaxonomyArchive.js
diff --git a/...ordpress/_global/getSettingsCustomPage.js → ...ordpress/_global/getSettingsCustomPage.js b/...ordpress/_global/getSettingsCustomPage.js → ...ordpress/_global/getSettingsCustomPage.js
diff --git a/api/wordpress/_global/postCommentToPost.js → lib/wordpress/_global/postCommentToPost.js b/api/wordpress/_global/postCommentToPost.js → lib/wordpress/_global/postCommentToPost.js
diff --git a/api/wordpress/_global/postTypes.js → lib/wordpress/_global/postTypes.js b/api/wordpress/_global/postTypes.js → lib/wordpress/_global/postTypes.js
diff --git a/...wordpress/_global/processPostTypeQuery.js → ...wordpress/_global/processPostTypeQuery.js b/...wordpress/_global/processPostTypeQuery.js → ...wordpress/_global/processPostTypeQuery.js
diff --git a/...wordpress/_global/queryDefaultPageData.js → ...wordpress/_global/queryDefaultPageData.js b/...wordpress/_global/queryDefaultPageData.js → ...wordpress/_global/queryDefaultPageData.js
diff --git a/api/wordpress/_partials/allMenus.js → lib/wordpress/_partials/allMenus.js b/api/wordpress/_partials/allMenus.js → lib/wordpress/_partials/allMenus.js
diff --git a/api/wordpress/_partials/archivePageInfo.js → lib/wordpress/_partials/archivePageInfo.js b/api/wordpress/_partials/archivePageInfo.js → lib/wordpress/_partials/archivePageInfo.js
diff --git a/api/wordpress/_partials/authorPostFields.js → lib/wordpress/_partials/authorPostFields.js b/api/wordpress/_partials/authorPostFields.js → lib/wordpress/_partials/authorPostFields.js
diff --git a/...rdpress/_partials/categoriesPostFields.js → ...rdpress/_partials/categoriesPostFields.js b/...rdpress/_partials/categoriesPostFields.js → ...rdpress/_partials/categoriesPostFields.js
diff --git a/api/wordpress/_partials/commentsFields.js → lib/wordpress/_partials/commentsFields.js b/api/wordpress/_partials/commentsFields.js → lib/wordpress/_partials/commentsFields.js
diff --git a/...wordpress/_partials/commentsPostFields.js → ...wordpress/_partials/commentsPostFields.js b/...wordpress/_partials/commentsPostFields.js → ...wordpress/_partials/commentsPostFields.js
diff --git a/api/wordpress/_partials/defaultPageData.js → lib/wordpress/_partials/defaultPageData.js b/api/wordpress/_partials/defaultPageData.js → lib/wordpress/_partials/defaultPageData.js
diff --git a/api/wordpress/_partials/defaultSeoFields.js → lib/wordpress/_partials/defaultSeoFields.js b/api/wordpress/_partials/defaultSeoFields.js → lib/wordpress/_partials/defaultSeoFields.js
diff --git a/...ress/_partials/featuredImagePostFields.js → ...ress/_partials/featuredImagePostFields.js b/...ress/_partials/featuredImagePostFields.js → ...ress/_partials/featuredImagePostFields.js
diff --git a/api/wordpress/_partials/globalPostFields.js → lib/wordpress/_partials/globalPostFields.js b/api/wordpress/_partials/globalPostFields.js → lib/wordpress/_partials/globalPostFields.js
diff --git a/api/wordpress/_partials/seoPostFields.js → lib/wordpress/_partials/seoPostFields.js b/api/wordpress/_partials/seoPostFields.js → lib/wordpress/_partials/seoPostFields.js
diff --git a/api/wordpress/_partials/tagsPostFields.js → lib/wordpress/_partials/tagsPostFields.js b/api/wordpress/_partials/tagsPostFields.js → lib/wordpress/_partials/tagsPostFields.js
diff --git a/...dpress/categories/queryPostsByCategory.js → ...dpress/categories/queryPostsByCategory.js b/...dpress/categories/queryPostsByCategory.js → ...dpress/categories/queryPostsByCategory.js
diff --git a/...rdpress/comments/mutationCommentToPost.js → ...rdpress/comments/mutationCommentToPost.js b/...rdpress/comments/mutationCommentToPost.js → ...rdpress/comments/mutationCommentToPost.js
diff --git a/...rdpress/comments/queryCommentsByPostId.js → ...rdpress/comments/queryCommentsByPostId.js b/...rdpress/comments/queryCommentsByPostId.js → ...rdpress/comments/queryCommentsByPostId.js
diff --git a/api/wordpress/connector.js → lib/wordpress/connector.js b/api/wordpress/connector.js → lib/wordpress/connector.js
diff --git a/api/wordpress/gravityForms/fieldProps.js → lib/wordpress/gravityForms/fieldProps.js b/api/wordpress/gravityForms/fieldProps.js → lib/wordpress/gravityForms/fieldProps.js
diff --git a/api/wordpress/gravityForms/getFormById.js → lib/wordpress/gravityForms/getFormById.js b/api/wordpress/gravityForms/getFormById.js → lib/wordpress/gravityForms/getFormById.js
diff --git a/api/wordpress/gravityForms/queryFormById.js → lib/wordpress/gravityForms/queryFormById.js b/api/wordpress/gravityForms/queryFormById.js → lib/wordpress/gravityForms/queryFormById.js
diff --git a/api/wordpress/media/getMediaByID.js → lib/wordpress/media/getMediaByID.js b/api/wordpress/media/getMediaByID.js → lib/wordpress/media/getMediaByID.js
diff --git a/api/wordpress/media/queryMediaAttributes.js → lib/wordpress/media/queryMediaAttributes.js b/api/wordpress/media/queryMediaAttributes.js → lib/wordpress/media/queryMediaAttributes.js
diff --git a/api/wordpress/menus/getMenus.js → lib/wordpress/menus/getMenus.js b/api/wordpress/menus/getMenus.js → lib/wordpress/menus/getMenus.js
diff --git a/api/wordpress/pages/queryError404Page.js → lib/wordpress/pages/queryError404Page.js b/api/wordpress/pages/queryError404Page.js → lib/wordpress/pages/queryError404Page.js
diff --git a/api/wordpress/pages/queryPageById.js → lib/wordpress/pages/queryPageById.js b/api/wordpress/pages/queryPageById.js → lib/wordpress/pages/queryPageById.js
diff --git a/api/wordpress/posts/queryPostById.js → lib/wordpress/posts/queryPostById.js b/api/wordpress/posts/queryPostById.js → lib/wordpress/posts/queryPostById.js
diff --git a/api/wordpress/posts/queryPostsArchive.js → lib/wordpress/posts/queryPostsArchive.js b/api/wordpress/posts/queryPostsArchive.js → lib/wordpress/posts/queryPostsArchive.js
diff --git a/api/wordpress/tags/queryPostsByTag.js → lib/wordpress/tags/queryPostsByTag.js b/api/wordpress/tags/queryPostsByTag.js → lib/wordpress/tags/queryPostsByTag.js
diff --git a/api/wordpress/teams/queryTeamById.js → lib/wordpress/teams/queryTeamById.js b/api/wordpress/teams/queryTeamById.js → lib/wordpress/teams/queryTeamById.js
diff --git a/api/wordpress/teams/queryTeamsArchive.js → lib/wordpress/teams/queryTeamsArchive.js b/api/wordpress/teams/queryTeamsArchive.js → lib/wordpress/teams/queryTeamsArchive.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -75,7 +75,7 @@
     "postcss-preset-env": "^6.7.0",
     "prettier": "^2.2.1",
     "prop-types": "^15.7.2",
-    "react-instantsearch-dom": "^6.10.0",
+    "react-instantsearch-dom": "^6.10.1",
     "react-is": "^17.0.1",
     "react-syntax-highlighter": "^15.4.3",
     "react-twitter-embed": "^3.0.3",

diff --git a/pages/404.js b/pages/404.js
@@ -1,7 +1,7 @@
-import getPostTypeStaticProps from '@/api/wordpress/_global/getPostTypeStaticProps'
 import Container from '@/components/atoms/Container'
 import Layout from '@/components/common/Layout'
 import getPagePropTypes from '@/functions/getPagePropTypes'
+import getPostTypeStaticProps from '@/lib/wordpress/_global/getPostTypeStaticProps'
 import Page from './[...slug]'
 
 // Define route post type.

diff --git a/pages/[...slug].js b/pages/[...slug].js
@@ -1,10 +1,10 @@
-import getPostTypeStaticPaths from '@/api/wordpress/_global/getPostTypeStaticPaths'
-import getPostTypeStaticProps from '@/api/wordpress/_global/getPostTypeStaticProps'
 import Container from '@/components/atoms/Container'
 import RichText from '@/components/atoms/RichText'
 import Layout from '@/components/common/Layout'
 import Blocks from '@/components/molecules/Blocks'
 import getPagePropTypes from '@/functions/getPagePropTypes'
+import getPostTypeStaticPaths from '@/lib/wordpress/_global/getPostTypeStaticPaths'
+import getPostTypeStaticProps from '@/lib/wordpress/_global/getPostTypeStaticProps'
 
 // Define route post type.
 const postType = 'page'

diff --git a/pages/_app.js b/pages/_app.js
@@ -1,8 +1,8 @@
-import {useApollo} from '@/api/apolloConfig'
 import WordPressProvider from '@/components/common/WordPressProvider'
 import '@/styles/demo.css'
 import '@/styles/index.css'
 import {ApolloProvider} from '@apollo/client'
+import {useApollo} from 'lib/apolloConfig'
 import {DefaultSeo} from 'next-seo'
 import Error from 'next/error'
 import {useRouter} from 'next/router'

diff --git a/pages/api/preview.js b/pages/api/preview.js
@@ -1,6 +1,6 @@
-import {wpPreviewSecret} from '@/api/wordpress/connector'
-import getPostTypeById from '@/api/wordpress/_global/getPostTypeById'
-import {postTypes} from '@/api/wordpress/_global/postTypes'
+import {wpPreviewSecret} from '@/lib/wordpress/connector'
+import getPostTypeById from '@/lib/wordpress/_global/getPostTypeById'
+import {postTypes} from '@/lib/wordpress/_global/postTypes'
 
 /**
  * Provide post preview functionality.

diff --git a/pages/api/wp/archive.js b/pages/api/wp/archive.js
@@ -1,4 +1,4 @@
-import getPostTypeArchive from '@/api/wordpress/_global/getPostTypeArchive'
+import getPostTypeArchive from '@/lib/wordpress/_global/getPostTypeArchive'
 
 /**
  * Load more posts for an archive.

diff --git a/pages/api/wp/getWPUrl.js b/pages/api/wp/getWPUrl.js
@@ -1,4 +1,4 @@
-import {wpApiUrlBase} from '@/api/wordpress/connector'
+import {wpApiUrlBase} from '@/lib/wordpress/connector'
 
 /**
  * Load more posts for an archive.

diff --git a/pages/api/wp/postComment.js b/pages/api/wp/postComment.js
@@ -1,4 +1,4 @@
-import postCommentToPost from '@/api/wordpress/_global/postCommentToPost'
+import postCommentToPost from '@/lib/wordpress/_global/postCommentToPost'
 
 /**
  * Load more posts for an archive.

diff --git a/pages/blog/[[...slug]].js b/pages/blog/[[...slug]].js
@@ -1,6 +1,3 @@
-import getArchivePosts from '@/api/frontend/wp/archive/getArchivePosts'
-import getPostTypeStaticPaths from '@/api/wordpress/_global/getPostTypeStaticPaths'
-import getPostTypeStaticProps from '@/api/wordpress/_global/getPostTypeStaticProps'
 import Breadcrumbs from '@/components/atoms/Breadcrumbs'
 import Button from '@/components/atoms/Button'
 import Container from '@/components/atoms/Container'
@@ -10,6 +7,9 @@ import Blocks from '@/components/molecules/Blocks'
 import Card from '@/components/molecules/Card'
 import Comments from '@/components/molecules/Comments'
 import getPagePropTypes from '@/functions/getPagePropTypes'
+import getArchivePosts from '@/lib/frontend/wp/archive/getArchivePosts'
+import getPostTypeStaticPaths from '@/lib/wordpress/_global/getPostTypeStaticPaths'
+import getPostTypeStaticProps from '@/lib/wordpress/_global/getPostTypeStaticProps'
 
 // Define route post type.
 const postType = 'post'

diff --git a/pages/index.js b/pages/index.js
@@ -1,7 +1,7 @@
-import getPostTypeStaticProps from '@/api/wordpress/_global/getPostTypeStaticProps'
 import Container from '@/components/atoms/Container'
 import Layout from '@/components/common/Layout'
 import getPagePropTypes from '@/functions/getPagePropTypes'
+import getPostTypeStaticProps from '@/lib/wordpress/_global/getPostTypeStaticProps'
 import Page from './[...slug]'
 
 // Define route post type.

diff --git a/pages/search.js b/pages/search.js
@@ -1,11 +1,11 @@
-import PropTypes from 'prop-types'
-import getPostTypeStaticProps from '@/api/wordpress/_global/getPostTypeStaticProps'
+import Container from '@/components/atoms/Container'
 import Layout from '@/components/common/Layout'
 import AlgoliaResults from '@/components/molecules/AlgoliaResults'
+import {seoPropTypes} from '@/functions/getPagePropTypes'
 import parseQuerystring from '@/functions/parseQuerystring'
+import getPostTypeStaticProps from '@/lib/wordpress/_global/getPostTypeStaticProps'
 import {useRouter} from 'next/router'
-import {seoPropTypes} from '@/functions/getPagePropTypes'
-import Container from '@/components/atoms/Container'
+import PropTypes from 'prop-types'
 
 /**
  * Render the Search component.

diff --git a/pages/team/[[...slug]].js b/pages/team/[[...slug]].js
@@ -1,6 +1,3 @@
-import getArchivePosts from '@/api/frontend/wp/archive/getArchivePosts'
-import getPostTypeStaticPaths from '@/api/wordpress/_global/getPostTypeStaticPaths'
-import getPostTypeStaticProps from '@/api/wordpress/_global/getPostTypeStaticProps'
 import Breadcrumbs from '@/components/atoms/Breadcrumbs'
 import Button from '@/components/atoms/Button'
 import Container from '@/components/atoms/Container'
@@ -9,6 +6,9 @@ import Layout from '@/components/common/Layout'
 import Blocks from '@/components/molecules/Blocks'
 import Card from '@/components/molecules/Card'
 import getPagePropTypes from '@/functions/getPagePropTypes'
+import getArchivePosts from '@/lib/frontend/wp/archive/getArchivePosts'
+import getPostTypeStaticPaths from '@/lib/wordpress/_global/getPostTypeStaticPaths'
+import getPostTypeStaticProps from '@/lib/wordpress/_global/getPostTypeStaticProps'
 
 // Define route post type.
 const postType = 'team'