feat: get blog list

pages/blogs.tsx

@@ -3,34 +3,32 @@ import { GetStaticPropsContext } from 'next';
 import { Layout } from 'src/components/common';
 import { BlogCardProps } from 'src/components/common/CardBlog/CardBlog';
 import { BlogBreadCrumb, BlogHeading, BlogsList, FeaturedCardBlog } from 'src/components/modules/blogs';
-import { DEFAULT_BLOG_PAGE_SIZE,DEFAULT_FEATURED_BLOG_PAGE_SIZE } from "src/utils/constanst.utils";
+import { DEFAULT_BLOG_PAGE_SIZE } from "src/utils/constanst.utils";
 import { getAllPromies } from 'src/utils/funtion.utils';
 import { PromiseWithKey } from 'src/utils/types.utils';
-import { getIdFeaturedBlog } from 'src/utils/funtion.utils';
-
 
 interface Props {
-    blogsResult: { blogs?: BlogCardProps[],featuredBlogs?: BlogCardProps[] },
+    blogsResult: { blogs?: BlogCardProps[],featuredBlog?: BlogCardProps[] },
     totalItems: number
 }
 export default function BlogsPage({blogsResult,totalItems}:Props) {
-
-    // let date = new Date(blogsResult?.featuredBlogs[0]?.createdAt ?? '' );
-    // let fullDate = date.toLocaleString('en-us', { month: 'long' }) + " " + date.getDate()+","+date.getFullYear();
-   
+    let date = new Date(blogsResult.featuredBlog?.[0]?.createdAt ?? '' );
+    let fullDate = date.toLocaleString('en-us', { month: 'long' }) + " " + date.getDate()+","+date.getFullYear();
+  
     return(
         <>
             <BlogBreadCrumb />
             <BlogHeading />
-            {/* <FeaturedCardBlog 
-            title={blogsResult?.featuredBlogs[0]?.title} 
-            imgSrc={blogsResult?.featuredBlogs[0]?.imageSrc ?? ''}
-            content={blogsResult?.featuredBlogs[0]?.description}
-            imgAuthor={blogsResult?.featuredBlogs[0]?.authorAvatarAsset}
-            authorName={blogsResult?.featuredBlogs[0]?.authorName}
+            <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}
             date={fullDate}
-            /> */}
-            <BlogsList blogList={blogsResult.blogs} total={totalItems} />
+            />
+            <BlogsList blogList={blogsResult.blogs} total={totalItems} idFeatured={blogsResult.featuredBlog?.[0]?.id} />
         </>
     )
 }
@@ -53,17 +51,12 @@ export async function getStaticProps({
     config,
     preview,
   })
- 
-  
-  // console.log(featuredBlogs[0].id);
-  // promisesWithKey.push({ key: 'blogsResult', promise: FeaturedBlogPromise })
-
   
  // Blogs
- const  idBlog = featuredBlogs[0].id;
- const blogsPromise = commerce.getAllBlogs({
+  const idFeaturedBlog = featuredBlogs[0].id;
+  const blogsPromise = commerce.getAllBlogs({
     variables: {
-      excludeBlogIds: [idBlog],
+      excludeBlogIds: [idFeaturedBlog],
       take: DEFAULT_BLOG_PAGE_SIZE
     },
     config,
@@ -71,7 +64,6 @@ export async function getStaticProps({
   })
   promisesWithKey.push({ key: 'blogsResult', promise: blogsPromise })
 
-  
 
   try {
     const promises = getAllPromies(promisesWithKey)
@@ -81,8 +73,9 @@ export async function getStaticProps({
       props[item.key] = item.keyResult ? rs[index][item.keyResult] : rs[index]
       return null
     })
-    props['blogsResult']['featuredBlog'] = featuredBlogs;
 
+    props['blogsResult']['featuredBlog'] = featuredBlogs;
+    
     return {
       props,
       revalidate: 60

pages/forgot-password.tsx

@@ -0,0 +1,10 @@
+import { FormForgot, Layout } from 'src/components/common'
+
+export default function NotFound() {
+  return (
+    <div>
+        <FormForgot/>
+    </div>
+  )
+}
+NotFound.Layout = Layout

pages/index.tsx

@@ -6,7 +6,9 @@ import { GetStaticPropsContext } from 'next';
 import { Layout } from 'src/components/common';
 import { FeaturedProductsCarousel, FreshProducts, HomeBanner, HomeCategories, HomeCollection, HomeCTA, HomeFeature, HomeRecipe, HomeSubscribe, HomeVideo } from 'src/components/modules/home';
 import HomeSpice from 'src/components/modules/home/HomeSpice/HomeSpice';
-import { CODE_FACET_DISCOUNT, CODE_FACET_FEATURED } from 'src/utils/constanst.utils';
+import { FACET } from 'src/utils/constanst.utils';
+import { FilterOneVatiant, getFacetIdByName } from 'src/utils/funtion.utils';
+import { CODE_FACET_DISCOUNT, CODE_FACET_FEATURED,COLLECTION_SLUG_SPICE } from 'src/utils/constanst.utils';
 import { getAllFacetValueIdsByParentCode, getAllFacetValuesForFeatuedProducts, getAllPromies, getFreshFacetId } from 'src/utils/funtion.utils';
 import { PromiseWithKey } from 'src/utils/types.utils';
 
@@ -16,19 +18,23 @@ interface Props {
   freshProducts: ProductCard[],
   featuredProducts: ProductCard[],
   collections: Collection[]
+  spiceProducts:ProductCard[]
+  veggie: ProductCard[],
+
 }
-export default function Home({ featuredAndDiscountFacetsValue,
+export default function Home({ featuredAndDiscountFacetsValue, veggie,
   freshProducts, featuredProducts,
-  collections }: Props) {
+  collections,spiceProducts }: Props) {
+
   return (
     <>
       <HomeBanner />
       <HomeFeature />
       <HomeCategories />
+      <HomeCollection data = {veggie}/>
       <FreshProducts data={freshProducts} collections={collections} />
-      <HomeCollection />
       <HomeVideo />
-      <HomeSpice />
+      {spiceProducts.length>0 && <HomeSpice data={spiceProducts}/>}
       <FeaturedProductsCarousel data={featuredProducts} featuredFacetsValue={featuredAndDiscountFacetsValue} />
       <HomeCTA />
       <HomeRecipe />
@@ -55,6 +61,8 @@ export async function getStaticProps({
     config,
     preview,
   })
+  
+
   props.featuredAndDiscountFacetsValue = getAllFacetValuesForFeatuedProducts(facets)
 
   // fresh products
@@ -72,7 +80,20 @@ export async function getStaticProps({
     props.freshProducts = []
   }
 
-
+  //veggie
+  const veggieProductvariables: ProductVariables = {
+    groupByProduct:false
+  }
+  const veggieId = getFacetIdByName(facets,FACET.CATEGORY.PARENT_NAME,FACET.CATEGORY.VEGGIE)
+  if (veggieId) {
+    veggieProductvariables.facetValueIds = [veggieId]
+  }
+  const veggieProductsPromise = commerce.getAllProducts({
+    variables: veggieProductvariables,
+    config,
+    preview,
+  })
+  promisesWithKey.push({ key: 'veggie', promise: veggieProductsPromise, keyResult: 'products'  })
   // featured products
   const allFeaturedFacetIds = getAllFacetValueIdsByParentCode(facets, CODE_FACET_FEATURED)
   const allDiscountFacetIds = getAllFacetValueIdsByParentCode(facets, CODE_FACET_DISCOUNT)
@@ -99,15 +120,24 @@ export async function getStaticProps({
   })
   promisesWithKey.push({ key: 'collections', promise: collectionsPromise, keyResult: 'collections'  })
 
+  // spiceProducts
+  const spiceProducts = commerce.getAllProducts({
+    variables: {
+      collectionSlug: COLLECTION_SLUG_SPICE,
+    },
+    config,
+    preview,
+  })
+  promisesWithKey.push({ key: 'spiceProducts', promise: spiceProducts, keyResult: 'products' })
+
   try {
     const promises = getAllPromies(promisesWithKey)
     const rs = await Promise.all(promises)
-
+    
     promisesWithKey.map((item, index) => {
-      props[item.key] = item.keyResult ? rs[index][item.keyResult] : rs[index]
+      props[item.key] = item.keyResult ? FilterOneVatiant(rs[index][item.keyResult]) : rs[index]
       return null
     })
-
     return {
       props,
       revalidate: 60,

pages/product/[slug].tsx

@@ -1,22 +1,43 @@
 
-import { Product } from '@framework/schema'
+import { Collection } from '@commerce/types/collection'
+import { Product, ProductCard } from '@commerce/types/product'
 import commerce from '@lib/api/commerce'
 import { GetStaticPathsContext, GetStaticPropsContext, InferGetStaticPropsType } from 'next'
+import { useEffect, useState } from 'react'
 import { Layout, RecipeDetail, RecommendedRecipes, RelevantBlogPosts } from 'src/components/common'
+import { useLocalStorage } from 'src/components/hooks/useLocalStorage'
 import { ProductInfoDetail, ReleventProducts, ViewedProducts } from 'src/components/modules/product-detail'
-import { MAX_PRODUCT_CAROUSEL, REVALIDATE_TIME } from 'src/utils/constanst.utils'
+import { LOCAL_STORAGE_KEY, MAX_PRODUCT_CAROUSEL, REVALIDATE_TIME } from 'src/utils/constanst.utils'
 import { BLOGS_DATA_TEST, INGREDIENT_DATA_TEST, RECIPE_DATA_TEST } from 'src/utils/demo-data'
 import { getAllPromies } from 'src/utils/funtion.utils'
+import { normalizeProductCard } from '@framework/utils/normalize';
 import { PromiseWithKey } from 'src/utils/types.utils'
-
-export default function Slug({ product, relevantProducts, collections }: InferGetStaticPropsType<typeof getStaticProps>) {
-
+interface Props {
+  relevantProducts: ProductCard[],
+  product: Product,
+  collections: Collection[]
+}
+export default function Slug({ product, relevantProducts, collections }: Props) {
+  const [local,setLocal] = useLocalStorage<Product[]>(LOCAL_STORAGE_KEY.VIEWEDPRODUCT, []);
+  const [viewed, setViewed] = useState<ProductCard[]>([])
+  useEffect(() => {
+    if(local){
+      if(!local.find(p => p.id === product.id)){
+        setLocal([...local, product])
+      }else{
+        setViewed(local.filter((p)=>p.id !== product.id).map((p)=>normalizeProductCard(p)))
+      }
+    }else{
+      setLocal([product])
+    }
+  }, [product])
+  
   return <>
-    <ProductInfoDetail productDetail={product} collections={collections}/>
+    <ProductInfoDetail productDetail={product}/>
     <RecipeDetail ingredients={INGREDIENT_DATA_TEST} />
     <RecommendedRecipes data={RECIPE_DATA_TEST} />
     <ReleventProducts data={relevantProducts} collections={collections}/>
-    <ViewedProducts />
+    <ViewedProducts data={viewed}/>
     <RelevantBlogPosts data={BLOGS_DATA_TEST} title="relevent blog posts" />
   </>
 }
@@ -68,7 +89,6 @@ export async function getStaticProps({
   })
   promisesWithKey.push({ key: 'collections', promise: collectionsPromise, keyResult: 'collections' })
 
-
   try {
     const promises = getAllPromies(promisesWithKey)
     const rs = await Promise.all(promises)

pages/reset-password.tsx

@@ -0,0 +1,10 @@
+import { FormResetPassword, Layout } from 'src/components/common'
+
+export default function NotFound() {
+  return (
+    <div>
+        <FormResetPassword/>
+    </div>
+  )
+}
+NotFound.Layout = Layout