🐛 bug: fix code follow by review Ly Tran

:%s
This commit is contained in:
Quangnhankie
2021-10-21 16:10:58 +07:00
parent 29b56ec6a3
commit e4ad5bef4b
13 changed files with 94 additions and 50 deletions

View File

@@ -8,27 +8,29 @@ import { getAllPromies } from 'src/utils/funtion.utils';
import { PromiseWithKey } from 'src/utils/types.utils';
interface Props {
blogsResult: { blogs?: BlogCardProps[],featuredBlog?: BlogCardProps[] },
blogs?: BlogCardProps[],
featuredBlog?: BlogCardProps[],
totalItems: number
}
export default function BlogsPage({blogsResult,totalItems}:Props) {
let date = new Date(blogsResult.featuredBlog?.[0]?.createdAt ?? '' );
export default function BlogsPage({ blogs, featuredBlog, totalItems }:Props) {
let date = new Date(featuredBlog?.[0]?.createdAt ?? '' );
let fullDate = date.toLocaleString('en-us', { month: 'long' }) + " " + date.getDate()+","+date.getFullYear();
return(
<>
<BlogBreadCrumb />
<BlogHeading />
<FeaturedCardBlog
title={blogsResult.featuredBlog?.[0]?.title}
slug={blogsResult.featuredBlog?.[0]?.slug}
imgSrc={blogsResult.featuredBlog?.[0]?.imageSrc ?? ''}
content={blogsResult.featuredBlog?.[0]?.description}
imgAuthor={blogsResult.featuredBlog?.[0]?.authorAvatarAsset}
authorName={blogsResult.featuredBlog?.[0]?.authorName}
title={featuredBlog?.[0]?.title}
slug={featuredBlog?.[0]?.slug}
imgSrc={featuredBlog?.[0]?.imageSrc ?? ''}
content={featuredBlog?.[0]?.description}
imgAuthor={featuredBlog?.[0]?.authorAvatarAsset}
authorName={featuredBlog?.[0]?.authorName}
date={fullDate}
/>
<BlogsList blogList={blogsResult.blogs} total={totalItems} idFeatured={blogsResult.featuredBlog?.[0]?.id} />
<BlogsList blogList={blogs} total={totalItems} idFeatured={featuredBlog?.[0]?.id} />
</>
)
}
@@ -43,17 +45,16 @@ export async function getStaticProps({
let promisesWithKey = [] as PromiseWithKey[]
let props = {} as any;
const {featuredBlogs} = await commerce.getFeaturedBlog({
variables: {
take: DEFAULT_BLOG_PAGE_SIZE
take: 1
},
config,
preview,
})
// Blogs
const idFeaturedBlog = featuredBlogs[0].id;
const idFeaturedBlog = featuredBlogs?.[0]?.id;
const blogsPromise = commerce.getAllBlogs({
variables: {
excludeBlogIds: [idFeaturedBlog],
@@ -74,8 +75,9 @@ export async function getStaticProps({
return null
})
props['blogsResult']['featuredBlog'] = featuredBlogs;
props.featuredBlog = featuredBlogs;
console.log(props)
return {
props,
revalidate: 60