crowetic/commerce
1
0
Fork 1
mirror of https://github.com/vercel/commerce.git synced 2025-07-22 20:26:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

🔀 merge:Merge branch 'common' of github.com:KieIO/grocery-vercel-commerce into m2-datnguyen

Browse Source 
:%s
This commit is contained in:
unknown
2021-08-26 19:53:25 +07:00
parent 7cede5cc8c
commit 9073231b2e
4 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pages/index.tsx
View File

@@ -1,6 +1,6 @@
<<<<<<< HEAD
import { FeaturedProductCard, Layout, ProductCaroucel, RecipeCard } from 'src/components/common'
import { HomeBanner, HomeCTA, HomeSubscribe, HomeVideo } from 'src/components/modules/home';
import image5 from "../public/assets/images/image5.png"
import image6 from "../public/assets/images/image6.png"
import image7 from "../public/assets/images/image7.png"
@@ -113,23 +113,17 @@ const recipe:RecipeCardProps[] = [{
description:"The broth for Bun Bo Hue is prepared by slowly simmering various types of beef and pork bones (ox tail, beef shank, pork neck bones, pork feet,...",
imageSrc: image14.src
}]
=======
import { Layout } from 'src/components/common';
import { HomeBanner, HomeCTA, HomeSubscribe, HomeVideo } from 'src/components/modules/home';
>>>>>>> 499221a7b8217276dbba438808a6ad3ece216a4d
export default function Home() {
return (
<>
<<<<<<< HEAD
<CollectionCarcoucel data={dataTest} itemKey="product-1" title="VEGGIE" subTitle= "Last call! Shop deep deals on 100+ bulk picks while you can." />
<HomeRecipe data={recipe} itemKey="product-2" title="Special Recipes"/>
=======
<HomeBanner />
<HomeVideo />
<HomeCTA />
<HomeSubscribe />
>>>>>>> 499221a7b8217276dbba438808a6ad3ece216a4d
</>
)
}