Merge branch 'feature/33-post-archive-page-redirect' into develop

Author: ravewebdev

api/wordpress/pages/queryPageById.js

@@ -25,6 +25,7 @@ const queryPageById = gql`
   ) {
     page(id: $id, idType: $idType) {
       ...SinglePageFields
+      isPostsPage
     }
   }
   ${singlePageFragment}

package.json

@@ -58,9 +58,9 @@
     "dayjs": "^1.10.3",
     "deepmerge": "^4.2.2",
     "eslint": "^7.18.0",
-    "eslint-config-prettier": "^7.1.0",
+    "eslint-config-prettier": "^7.2.0",
     "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-jsdoc": "^31.0.6",
+    "eslint-plugin-jsdoc": "^31.0.7",
     "eslint-plugin-jsx-a11y": "^6.4.1",
     "eslint-plugin-prettier": "^3.3.1",
     "eslint-plugin-react": "^7.22.0",

pages/[...slug].js

@@ -47,7 +47,9 @@ export default function Page({post}) {
             />
           </article>
         </section>
-        {post.slug === 'form-demo' && <BlockGravityForm {...post?.blocks[0]} />}
+        {post?.slug === 'form-demo' && (
+          <BlockGravityForm {...post?.blocks[0]} />
+        )}
       </div>
     </Layout>
   )

pages/_app.js

@@ -3,10 +3,11 @@ import '@/styles/index.css'
 import {ApolloProvider} from '@apollo/client'
 import {DefaultSeo} from 'next-seo'
 import Error from 'next/error'
-import {useState} from 'react'
+import {useState, useEffect} from 'react'
 import PropTypes from 'prop-types'
 import AlgoliaProvider from '@/components/common/AlgoliaProvider'
 import MenuProvider from '@/components/common/MenuProvider'
+import {useRouter} from 'next/router'
 
 /**
  * Render the App component.
@@ -25,6 +26,17 @@ export default function App({Component, pageProps}) {
    */
   const apolloClient = useApollo(pageProps)
 
+  const router = useRouter()
+
+  // Redirect from WP blog archive to FE posts archive.
+  useEffect(() => {
+    if (!pageProps?.post?.isPostsPage) {
+      return
+    }
+
+    router.push('/blog')
+  }, [pageProps, router])
+
   // Check for errors.
   const error = pageProps?.error
   let errorMessage = pageProps?.errorMessage ?? 'An unknown error occurred.'

vercel.json

@@ -4685,10 +4685,10 @@ commander@^6.0.0, commander@^6.2.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.0.tgz#b990bfb8ac030aedc6d11bc04d1488ffef56db75"
   integrity sha512-zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q==
 
-[email protected].0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.1.0.tgz#4f6fac17718363653e1cb6d5ded3f093ce51ae4e"
-  integrity sha512-Q4dQ9niTWOF01ufvH/z6Z3RsBkwr7G42IsaFjuNliL6CY9ZeOEU3jRwTNY2mTY1ibAsASMrXnlQtx2tOb7Q8MA==
+[email protected].1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.1.1.tgz#c0581d520677e2cfab1a568e94ea0400df9fe4bd"
+  integrity sha512-vue7cRi1ZO5/72FJ+wZ5+siTSBlUv3ZksTk8bWD2IkaA6obitzMZP3yI65azTJLckwmi8lxfPP5Sd9oGuZ8e2g==
 
 commondir@^1.0.1:
   version "1.0.1"
@@ -5906,10 +5906,10 @@ escodegen@^1.12.0:
   optionalDependencies:
     source-map "~0.6.1"
 
-eslint-config-prettier@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-7.1.0.tgz#5402eb559aa94b894effd6bddfa0b1ca051c858f"
-  integrity sha512-9sm5/PxaFG7qNJvJzTROMM1Bk1ozXVTKI0buKOyb0Bsr1hrwi0H/TzxF/COtf1uxikIK8SwhX7K6zg78jAzbeA==
+eslint-config-prettier@^7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-7.2.0.tgz#f4a4bd2832e810e8cc7c1411ec85b3e85c0c53f9"
+  integrity sha512-rV4Qu0C3nfJKPOAhFujFxB7RMP+URFyQqqOZW9DMRD7ZDTFyjaIlETU3xzHELt++4ugC0+Jm084HQYkkJe+Ivg==
 
 eslint-import-resolver-node@^0.3.4:
   version "0.3.4"
@@ -5946,12 +5946,12 @@ eslint-plugin-import@^2.22.1:
     resolve "^1.17.0"
     tsconfig-paths "^3.9.0"
 
-eslint-plugin-jsdoc@^31.0.6:
-  version "31.0.6"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-31.0.6.tgz#8e6b57ea74b2ac262b9d78b18ae472866571303c"
-  integrity sha512-wGd83EcR+M0HHBgVx3f4gf78z5gMyEil6fqebpAFPeG9fgbUcP1XiWikTWSW3rJrjj7rQvCud6A/IRFMFzanLQ==
+eslint-plugin-jsdoc@^31.0.7:
+  version "31.0.7"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-31.0.7.tgz#a3ed0c1060521374f5c413e5a4bb90ef2ab9a60a"
+  integrity sha512-aAfVrXxgS+x9nW97DYZ1hEdKvobSqfT6S9xIU+pZYZ9mQW03B4l6s79CcAz6Q/RqYJj/nq+IOQO5ZFA8v7e0Og==
   dependencies:
-    comment-parser "1.1.0"
+    comment-parser "1.1.1"
     debug "^4.3.1"
     jsdoctypeparser "^9.0.0"
     lodash "^4.17.20"