mirror of
https://github.com/vercel/commerce.git
synced 2025-07-05 04:31:22 +00:00
Remove conflict
This commit is contained in:
parent
ca41dcd194
commit
a772d3fca9
@ -5,14 +5,6 @@ import { HomeBanner, HomeCollection, HomeCTA, HomeSubscribe, HomeVideo, HomeCate
|
|||||||
export default function Home() {
|
export default function Home() {
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<<<<<<< HEAD
|
|
||||||
<div>This is home page</div>
|
|
||||||
<ViewAllItem link="/all"/>
|
|
||||||
<ItemWishList />
|
|
||||||
<Logo />
|
|
||||||
<SelectCommon option={OPTION_SORT}>Sort by</SelectCommon>
|
|
||||||
<SelectCommon option={OPTION_STATES} size={"large"} type={"custom"}>States</SelectCommon>
|
|
||||||
=======
|
|
||||||
<HomeBanner />
|
<HomeBanner />
|
||||||
<HomeFeature />
|
<HomeFeature />
|
||||||
<HomeCategories />
|
<HomeCategories />
|
||||||
@ -21,7 +13,6 @@ export default function Home() {
|
|||||||
<HomeCTA />
|
<HomeCTA />
|
||||||
<HomeRecipe />
|
<HomeRecipe />
|
||||||
<HomeSubscribe />
|
<HomeSubscribe />
|
||||||
>>>>>>> 08cd011b5ebb28ba4205d167dc07c81e3b9c3072
|
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -35,10 +35,6 @@ const SelectCommon = ({ type = 'default', size = 'base', option, children }: Pro
|
|||||||
setActive(!isActive)
|
setActive(!isActive)
|
||||||
}
|
}
|
||||||
|
|
||||||
const changeSelectedName = (props:string) => {
|
|
||||||
setSelectedName(props)
|
|
||||||
}
|
|
||||||
|
|
||||||
return(
|
return(
|
||||||
<>
|
<>
|
||||||
<div className={classNames({
|
<div className={classNames({
|
||||||
@ -68,7 +64,7 @@ const SelectCommon = ({ type = 'default', size = 'base', option, children }: Pro
|
|||||||
[s.selectOption] : true,
|
[s.selectOption] : true,
|
||||||
[s[size]] : !!size,
|
[s[size]] : !!size,
|
||||||
})}
|
})}
|
||||||
onClick = { changeSelectedName!.(item.name) }
|
onClick = { () => setSelectedName(item.name) }
|
||||||
>{item.name}</div>
|
>{item.name}</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -9,13 +9,10 @@ export { default as IconHome } from './IconHome'
|
|||||||
export { default as IconShopping } from './IconShopping'
|
export { default as IconShopping } from './IconShopping'
|
||||||
export { default as IconHeart } from './IconHeart'
|
export { default as IconHeart } from './IconHeart'
|
||||||
export { default as IconVector } from './IconVector'
|
export { default as IconVector } from './IconVector'
|
||||||
<<<<<<< HEAD
|
|
||||||
export { default as IconVectorDown } from './IconVectorDown'
|
export { default as IconVectorDown } from './IconVectorDown'
|
||||||
=======
|
|
||||||
export { default as IconFacebookColor } from './IconFacebookColor'
|
export { default as IconFacebookColor } from './IconFacebookColor'
|
||||||
export { default as IconGoogleColor } from './IconGoogleColor'
|
export { default as IconGoogleColor } from './IconGoogleColor'
|
||||||
export { default as IconApple } from './IconApple'
|
export { default as IconApple } from './IconApple'
|
||||||
export { default as ArrowLeft } from './ArrowLeft'
|
export { default as ArrowLeft } from './ArrowLeft'
|
||||||
export { default as ArrowRight } from './ArrowRight'
|
export { default as ArrowRight } from './ArrowRight'
|
||||||
export { default as Close } from './Close'
|
export { default as Close } from './Close'
|
||||||
>>>>>>> 08cd011b5ebb28ba4205d167dc07c81e3b9c3072
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user