Merge branch 'main' of https://github.com/ReactBricks/nextjs-starter-reactbricks-ui

Author: paolozanotti-f2

pages/[[...slug]].tsx

@@ -93,20 +93,24 @@ export const getStaticProps: GetStaticProps = async (context) => {
   }
 
   const [page, header, footer] = await Promise.all([
-    fetchPage(cleanSlug, config.apiKey, context.locale, config.pageTypes).catch(
-      () => {
+    fetchPage(cleanSlug, config.apiKey, context.locale, config.pageTypes)
+      .then(({ author, ...page }) => page)
+      .catch(() => {
         errorPage = true
         return {}
-      }
-    ),
-    fetchPage('header', config.apiKey, context.locale).catch(() => {
-      errorHeader = true
-      return {}
-    }),
-    fetchPage('footer', config.apiKey, context.locale).catch(() => {
-      errorFooter = true
-      return {}
-    }),
+      }),
+    fetchPage('header', config.apiKey, context.locale)
+      .then(({ author, ...page }) => page)
+      .catch(() => {
+        errorHeader = true
+        return {}
+      }),
+    fetchPage('footer', config.apiKey, context.locale)
+      .then(({ author, ...page }) => page)
+      .catch(() => {
+        errorFooter = true
+        return {}
+      }),
   ])
 
   return {
@@ -127,7 +131,9 @@ export const getStaticPaths: GetStaticPaths = async (context) => {
     return { paths: [], fallback: true }
   }
 
-  const allPages = await fetchPages(config.apiKey)
+  const allPages = await fetchPages(config.apiKey, {
+    types: ['page', 'pokemon'],
+  })
 
   const paths = allPages
     .map((page) =>

pages/blog/index.tsx

@@ -118,19 +118,19 @@ export const getStaticProps: GetStaticProps = async (context) => {
       sort: '-publishedAt',
     })
 
-    header = await fetchPage('header', config.apiKey, context.locale).catch(
-      () => {
+    header = await fetchPage('header', config.apiKey, context.locale)
+      .then(({ author, ...page }) => page)
+      .catch(() => {
         errorHeader = true
         return {}
-      }
-    )
+      })
 
-    footer = await fetchPage('footer', config.apiKey, context.locale).catch(
-      () => {
+    footer = await fetchPage('footer', config.apiKey, context.locale)
+      .then(({ author, ...page }) => page)
+      .catch(() => {
         errorFooter = true
         return {}
-      }
-    )
+      })
 
     return { props: { posts, tags, header, footer, errorHeader, errorFooter } }
   } catch {

pages/blog/post/[[...slug]].tsx

@@ -112,14 +112,18 @@ export const getStaticProps: GetStaticProps = async (context) => {
       errorPage = true
       return {}
     }),
-    fetchPage('header', config.apiKey, context.locale).catch(() => {
-      errorHeader = true
-      return {}
-    }),
-    fetchPage('footer', config.apiKey, context.locale).catch(() => {
-      errorFooter = true
-      return {}
-    }),
+    fetchPage('header', config.apiKey, context.locale)
+      .then(({ author, ...page }) => page)
+      .catch(() => {
+        errorHeader = true
+        return {}
+      }),
+    fetchPage('footer', config.apiKey, context.locale)
+      .then(({ author, ...page }) => page)
+      .catch(() => {
+        errorFooter = true
+        return {}
+      }),
   ])
 
   return {

pages/blog/tag/[tag].tsx

@@ -74,8 +74,8 @@ const Page: React.FC<PageProps> = ({
 
               <div className="flex flex-wrap items-center">
                 {allTags?.map((tag) => (
-                    <TagListItem tag={tag} key={tag} />
-                  ))}
+                  <TagListItem tag={tag} key={tag} />
+                ))}
               </div>
 
               <hr className="mt-6 mb-10 dark:border-gray-600" />
@@ -129,14 +129,18 @@ export const getStaticProps: GetStaticProps = async (context) => {
         sort: '-publishedAt',
       }),
       fetchTags(process.env.API_KEY),
-      fetchPage('header', config.apiKey, context.locale).catch(() => {
-        errorHeader = true
-        return {}
-      }),
-      fetchPage('footer', config.apiKey, context.locale).catch(() => {
-        errorFooter = true
-        return {}
-      }),
+      fetchPage('header', config.apiKey, context.locale)
+        .then(({ author, ...page }) => page)
+        .catch(() => {
+          errorHeader = true
+          return {}
+        }),
+      fetchPage('footer', config.apiKey, context.locale)
+        .then(({ author, ...page }) => page)
+        .catch(() => {
+          errorFooter = true
+          return {}
+        }),
     ])
 
     return {

react-bricks/pageTypes.ts

@@ -50,7 +50,7 @@ const pageTypes: types.IPageType[] = [
     defaultStatus: types.PageStatus.Published,
     getDefaultContent: () => [],
     isEntity: true,
-    excludedBlockTypes: ['pokemon'],
+    allowedBlockTypes: ['header', 'footer'],
   },
 ]