diff --git a/pages/test.tsx b/pages/test.tsx
index a16ef6ed1..769a94e53 100644
--- a/pages/test.tsx
+++ b/pages/test.tsx
@@ -1,102 +1,84 @@
import {
- CartDrawer,
+ FeaturedProductCard,
Layout
} from 'src/components/common';
-import MenuNavigationProductList from 'src/components/common/MenuNavigationProductList/MenuNavigationProductList';
// import { RecipeListPage } from 'src/components/modules/recipes';
import { OPTION_ALL, QUERY_KEY, ROUTE } from 'src/utils/constanst.utils';
-import { useModalCommon } from 'src/components/hooks';
+import { PRODUCT_DATA_TEST, PRODUCT_DATA_TEST_PAGE } from 'src/utils/demo-data';
const CATEGORY = [
{
- name: 'All',
- link: `${ROUTE.PRODUCTS}/?${QUERY_KEY.BRAND}=${OPTION_ALL}`,
+ name: 'All',
+ link: `${ROUTE.PRODUCTS}/?${QUERY_KEY.BRAND}=${OPTION_ALL}`,
},
{
- name: 'Veggie',
- link: `${ROUTE.PRODUCTS}/?${QUERY_KEY.BRAND}=veggie`,
+ name: 'Veggie',
+ link: `${ROUTE.PRODUCTS}/?${QUERY_KEY.BRAND}=veggie`,
},
{
- name: 'Seafood',
- link: `${ROUTE.PRODUCTS}/?${QUERY_KEY.BRAND}=seafood`,
+ name: 'Seafood',
+ link: `${ROUTE.PRODUCTS}/?${QUERY_KEY.BRAND}=seafood`,
},
{
- name: 'Frozen',
- link: `${ROUTE.PRODUCTS}/?${QUERY_KEY.BRAND}=frozen`,
+ name: 'Frozen',
+ link: `${ROUTE.PRODUCTS}/?${QUERY_KEY.BRAND}=frozen`,
},
{
- name: 'Coffee Bean',
- link: `${ROUTE.PRODUCTS}/?${QUERY_KEY.BRAND}=coffee-bean`,
+ name: 'Coffee Bean',
+ link: `${ROUTE.PRODUCTS}/?${QUERY_KEY.BRAND}=coffee-bean`,
},
{
- name: 'Sauce',
- link: `${ROUTE.PRODUCTS}/?${QUERY_KEY.BRAND}=sauce`,
+ name: 'Sauce',
+ link: `${ROUTE.PRODUCTS}/?${QUERY_KEY.BRAND}=sauce`,
},
]
const BRAND = [
{
- name: 'Maggi',
- link: `${ROUTE.PRODUCTS}/?${QUERY_KEY.BRAND}=veggie`,
+ name: 'Maggi',
+ link: `${ROUTE.PRODUCTS}/?${QUERY_KEY.BRAND}=veggie`,
},
{
- name: 'Cholimes',
- link: `${ROUTE.PRODUCTS}/?${QUERY_KEY.BRAND}=seafood`,
+ name: 'Cholimes',
+ link: `${ROUTE.PRODUCTS}/?${QUERY_KEY.BRAND}=seafood`,
},
{
- name: 'Chinsu',
- link: `${ROUTE.PRODUCTS}/?${QUERY_KEY.BRAND}=frozen`,
+ name: 'Chinsu',
+ link: `${ROUTE.PRODUCTS}/?${QUERY_KEY.BRAND}=frozen`,
}
];
const FEATURED = [
- {
- name: 'Best Sellers',
- link: `${ROUTE.PRODUCTS}/?${QUERY_KEY.BRAND}=veggie`,
- },
- {
- name: 'Sales',
- link: `${ROUTE.PRODUCTS}/?${QUERY_KEY.BRAND}=seafood`,
- },
- {
- name: 'New Item',
- link: `${ROUTE.PRODUCTS}/?${QUERY_KEY.BRAND}=frozen`,
- },
- {
- name: 'Viewed',
- link: `${ROUTE.PRODUCTS}/?${QUERY_KEY.BRAND}=viewed`,
- }
- ];
+ {
+ name: 'Best Sellers',
+ link: `${ROUTE.PRODUCTS}/?${QUERY_KEY.BRAND}=veggie`,
+ },
+ {
+ name: 'Sales',
+ link: `${ROUTE.PRODUCTS}/?${QUERY_KEY.BRAND}=seafood`,
+ },
+ {
+ name: 'New Item',
+ link: `${ROUTE.PRODUCTS}/?${QUERY_KEY.BRAND}=frozen`,
+ },
+ {
+ name: 'Viewed',
+ link: `${ROUTE.PRODUCTS}/?${QUERY_KEY.BRAND}=viewed`,
+ }
+];
-import CheckoutSuccess from 'src/components/modules/checkout/CheckoutSuccess/CheckoutSuccess'
-import LoadingCommon from 'src/components/common/LoadingCommon/LoadingCommon'
-import SkeletonParagraph from 'src/components/common/SkeletonCommon/SkeletonParagraph/SkeletonParagraph'
-import SkeletonImage from 'src/components/common/SkeletonCommon/SkeletonImage/SkeletonImage'
+const data = PRODUCT_DATA_TEST[0]
export default function Test() {
return (
<>
-
-
- Lorem ipsum dolor sit amet.
-
-
- {/* */}
-
- {/* */}
- {/**/}
- {/* toggle menu : {visibleMenuFilter.toString()}
- */}
- {/* */}
-
- Lorem ipsum, dolor sit amet consectetur adipisicing elit. Fugit maiores aut, delectus assumenda explicabo, dolore facilis, quasi quae sed obcaecati doloribus dolorum architecto aperiam nisi dignissimos consequuntur amet neque possimus.
-
-
-
- Lorem ipsum dolor sit amet consectetur adipisicing elit. Temporibus, porro aut. Quas, consequuntur! Officiis magni cum placeat magnam ut hic beatae error facere obcaecati. Labore eius explicabo fugit minus veritatis.
-
-
+
>
)
}
diff --git a/src/components/common/ButtonIconBuy/ButtonIconBuy.tsx b/src/components/common/ButtonIconBuy/ButtonIconBuy.tsx
index c93b8ca6f..7b2cdd9ce 100644
--- a/src/components/common/ButtonIconBuy/ButtonIconBuy.tsx
+++ b/src/components/common/ButtonIconBuy/ButtonIconBuy.tsx
@@ -3,7 +3,7 @@ import { IconBuy } from 'src/components/icons'
import ButtonCommon from '../ButtonCommon/ButtonCommon'
interface Props {
- type?: 'primary' | 'light' | 'ghost',
+ type?: 'primary' | 'light' | 'ghost' | 'lightBorderNone',
size?: 'default' | 'large' | 'small',
loading?: boolean,
disabled?: boolean,
diff --git a/src/components/common/FeaturedProductCard/FeaturedProductCard.module.scss b/src/components/common/FeaturedProductCard/FeaturedProductCard.module.scss
index eefd101c4..217b3944c 100644
--- a/src/components/common/FeaturedProductCard/FeaturedProductCard.module.scss
+++ b/src/components/common/FeaturedProductCard/FeaturedProductCard.module.scss
@@ -3,7 +3,7 @@
width: 59.8rem;
height: 28.8rem;
padding: 2.4rem;
- @apply bg-primary-light inline-flex justify-start items-center custom-border-radius ;
+ @apply bg-primary-light inline-flex justify-start items-center shape-common;
.left{
width: 24rem;
height: 24rem;
@@ -30,18 +30,15 @@
line-height: 2.4rem;
}
.priceWrapper{
- @apply flex justify-start;
+ @apply flex justify-start sm-headline;
.price{
- @apply font-bold;
- font-size: 2rem;
- line-height: 2.8rem;
- letter-spacing: -0.01em;
+ @apply font-bold sm-headline;
color: var(--text-active);
}
.originPrice{
+ @apply sm-headline;
+ font-weight: normal;
margin-left: 0.8rem;
- font-size: 2rem;
- line-height: 2.8rem;
color: var(--text-label);
text-decoration-line: line-through;
}
@@ -50,11 +47,18 @@
.buttonWarpper{
@apply flex;
.icon{
- width: 5.6rem;
+ button {
+ >div {
+ @apply bg-primary-light;
+ }
+ }
}
.button{
margin-left: 0.8rem;
- width: 20.6rem;
+ flex: 1;
+ button {
+ @apply w-full;
+ }
}
}
}
diff --git a/src/components/common/FeaturedProductCard/FeaturedProductCard.tsx b/src/components/common/FeaturedProductCard/FeaturedProductCard.tsx
index fb3d82d41..9cd84235a 100644
--- a/src/components/common/FeaturedProductCard/FeaturedProductCard.tsx
+++ b/src/components/common/FeaturedProductCard/FeaturedProductCard.tsx
@@ -4,6 +4,7 @@ import s from './FeaturedProductCard.module.scss'
import { LANGUAGE } from '../../../utils/language.utils'
import ButtonIconBuy from '../ButtonIconBuy/ButtonIconBuy'
import ButtonCommon from '../ButtonCommon/ButtonCommon'
+import { ImgWithLink } from '..'
interface FeaturedProductCardProps extends FeaturedProductProps {
buttonText?: string
}
@@ -19,7 +20,7 @@ const FeaturedProductCard = ({
return (
-
+
@@ -32,7 +33,7 @@ const FeaturedProductCard = ({
-
+
{buttonText}
diff --git a/src/styles/_base.scss b/src/styles/_base.scss
index a3ba0a6db..41d33bdf1 100644
--- a/src/styles/_base.scss
+++ b/src/styles/_base.scss
@@ -3,7 +3,7 @@
:root {
--primary: #5b9a74;
- --primary-light: #e0f6e8;
+ --primary-light: #e3f2e9;
--primary-lightest: #effaf4;
--info-dark: #00317a;