From 985febebd9196a361bf6301e83c9fe6e0ea70e91 Mon Sep 17 00:00:00 2001 From: Traxus Date: Tue, 25 Apr 2023 00:41:29 -0400 Subject: [PATCH] Signed-off-by: Traxus --- src/pages/blog/[slug].tsx | 9 +++++---- src/pages/blog/index.tsx | 13 ++++++++----- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/pages/blog/[slug].tsx b/src/pages/blog/[slug].tsx index 81fc008..2c56eeb 100644 --- a/src/pages/blog/[slug].tsx +++ b/src/pages/blog/[slug].tsx @@ -73,7 +73,7 @@ export const getStaticPaths: GetStaticPaths = async () => { postsSlugsJson = await getAllBlogPostsSlugs() } - return postsSlugsJson + return postsSlugsJson } const posts = await postsSlugsJsonFromSource() @@ -102,7 +102,7 @@ export const getStaticProps: GetStaticProps = async ( //===== \/ START NEXT_PUBLIC_DATOCMS_BYPASS \/ ==================================================== //const post = await (await cms().SingleBlogPost({ slug })).blogPost - const post: any = await getSingleBlogPostBySlugFromSource(slug) + const post: any = await getSingleBlogPostBySlugFromSource(slug) /* const allBlogPosts = await serverGetBlogPosts({ @@ -120,7 +120,7 @@ export const getStaticProps: GetStaticProps = async ( let relatedBlogPostsFromSource = [] if (process.env.NEXT_PUBLIC_DATOCMS_BYPASS_TYPE === 'local_json') { - relatedBlogPostsFromSource = await getRelatedBlogPosts(post, 3) + relatedBlogPostsFromSource = await getRelatedBlogPosts(post, 3) } else { const allBlogPosts = await serverGetBlogPosts({ filterSlugs: [slug], @@ -130,7 +130,8 @@ export const getStaticProps: GetStaticProps = async ( relatedBlogPostsFromSource = allBlogPosts.data.filter((p) => p.category.some((c) => post?.category.some( - (postCategory: any) => c.slug === postCategory.slug) + (postCategory: any) => c.slug === postCategory.slug + ) ) ) } diff --git a/src/pages/blog/index.tsx b/src/pages/blog/index.tsx index e3da135..97d8fa3 100644 --- a/src/pages/blog/index.tsx +++ b/src/pages/blog/index.tsx @@ -115,13 +115,16 @@ const BlogIndexPage = ({ } : undefined, getNextPageParam: (lastPage) => - lastPage.pagination.nextPage ?? undefined + lastPage.pagination.nextPage ?? undefined } ) let queriedPostsHasResults = false - if (typeof queriedPosts !== 'undefined' && 'pages' in queriedPosts === true) { + if ( + typeof queriedPosts !== 'undefined' && + 'pages' in queriedPosts === true) + { if (0 in queriedPosts.pages === true) { if ('pagination' in queriedPosts.pages[0]) { if ('total' in queriedPosts.pages[0].pagination) { @@ -168,7 +171,7 @@ const BlogIndexPage = ({ @@ -183,10 +186,10 @@ const BlogIndexPage = ({ ))} )) - ): ( + ) : (

No results.

) - ): ( + ) : (

Loading...

)}