bug: fix bug conflic

src/components/common/CardBlog/CardBlog.tsx

@@ -1,21 +1,27 @@
 import Link from 'next/link'
 import React from 'react'
-import { RecipeProps } from 'src/utils/types.utils'
+import { ROUTE } from 'src/utils/constanst.utils'
+import { BlogProps } from 'src/utils/types.utils'
 import s from './CardBlog.module.scss'
-export interface BlogCardProps extends RecipeProps {
-    link: string,
+export interface BlogCardProps extends BlogProps {
+  // todo: edit when intergrate API
+
 }
 
-const CardBlog = ({ imageSrc, title, description, link }: BlogCardProps) => {
+const CardBlog = ({ imageSrc, title, description, slug }: BlogCardProps) => {
   return (
     <div className={s.cardBlogWarpper}>
-      <Link href={link}>
-        <div className={s.image}>
-          <img src={imageSrc} alt="image cardblog" />
-        </div>
+      <Link href={`${ROUTE.BLOG_DETAIL}/${slug}`}>
+        <a>
+          <div className={s.image}>
+            <img src={imageSrc} alt="image cardblog" />
+          </div>
+        </a>
       </Link>
-      <Link href={link}>
-        <div className={s.title}>{title}</div>
+      <Link href={`${ROUTE.BLOG_DETAIL}/${slug}`}>
+        <a>
+          <div className={s.title}>{title}</div>
+        </a>
       </Link>
       <div className={s.description}>{description}</div>
     </div>

src/components/common/CollapseCommon/CollapseChild/CollapseChild.tsx

@@ -2,15 +2,13 @@ import s from './CollapseChild.module.scss'
 import { useState } from 'react'
 import classNames from 'classnames'
 import CollapseContent from './CollapseContent/CollapseContent'
-import Link from 'next/link'
 
 interface CollapseProps{
     title?: string,
     content: Array<string>,
     isToggle?: boolean,
-    link?: string,
 }
-const CollapseChild = ({title, content, isToggle=false, link="/"}: CollapseProps) => {
+const CollapseChild = ({title, content, isToggle=false}: CollapseProps) => {
     const [isActive, changeActive] = useState(isToggle)
 
     const handleToggle = () => {
@@ -24,9 +22,7 @@ const CollapseChild = ({title, content, isToggle=false, link="/"}: CollapseProps
             onClick = { handleToggle }
         >    
             <div className={s.title}>
-                <Link href={link}>
-                    <a>{title}</a>
-                </Link>
+                <h4>{title}</h4>
                 <div className={s.toggle}></div>
             </div>
             <div className={s.contentContainer}>

src/components/common/CollapseCommon/CollapseCommon.tsx

@@ -1,7 +1,7 @@
 import CollapseChild from './CollapseChild/CollapseChild'
 
 interface CollapseCommonProps{
-    data: {title: string, content: Array<string>, link: string}[],
+    data: {title: string, content: Array<string>}[],
 }
 
 const CollapseCommon = ({data}: CollapseCommonProps) => {
@@ -9,7 +9,7 @@ const CollapseCommon = ({data}: CollapseCommonProps) => {
         <section>
             {
                 data.map(item =>
-                    <CollapseChild key={item.title} title={item.title} content={item.content} link={item.link} />
+                    <CollapseChild key={item.title} title={item.title} content={item.content}/>
                 )
             }
         </section>

src/components/common/Layout/Layout.tsx

@@ -29,6 +29,10 @@ const Layout: FC<Props> = ({ children }) => {
             <div className={s.mainLayout}>
                 <Header />
                 <main >{children}</main>
+                <button onClick={toggle}>toggle card: {visibleCartDrawer.toString()}</button>
+                <CartDrawer
+                    visible={visibleCartDrawer}
+                    onClose={closeCartDrawer} />
                 <Footer />
             </div>
         </CommerceProvider>

src/components/common/RelevantBlogPosts/RelevantBlogPosts.tsx

@@ -20,34 +20,34 @@ interface RelevantProps {
 const recipe:BlogCardProps[] = [
 {
     title: "Want to Lose Weight? Here are 10 DEBM Diet Guidelines for Beginners",
+    slug: 'have-a-nice-lunch',
     description:"The DEBM diet stands for "+'"Delicious Happy Fun Diet"'+". This diet was popularized by Robert...",
     imageSrc: image15.src,
-    link: `${ROUTE.BLOG_DETAIL}`
 },{
     title: "9 Ways to Make an Aloe Vera Mask at Home",
+    slug: 'have-a-nice-lunch',
     description:"Aloe vera or  aloe vera  is a green plant, has thorns on the side of the skin with yellowish patches and...",
     imageSrc: image16.src,
-    link: `${ROUTE.BLOG_DETAIL}`
 },{
     title: "Don't Buy Wrong, Here Are 7 Ways to Choose a Ripe Dragon Fruit",
+    slug: 'have-a-nice-lunch',
     description:"Dragon fruit is a type of fruit that is a favorite for many people because of its delicious and fresh...",
     imageSrc: image17.src,
-    link: `${ROUTE.BLOG_DETAIL}`
 },{
     title: "Want to Lose Weight? Here are 10 DEBM Diet Guidelines for Beginners",
+    slug: 'have-a-nice-lunch',
     description:"The DEBM diet stands for "+'"Delicious Happy Fun Diet"'+". This diet was popularized by Robert...",
     imageSrc: image15.src,
-    link: `${ROUTE.BLOG_DETAIL}`
 },{
     title: "9 Ways to Make an Aloe Vera Mask at Home",
+    slug: 'have-a-nice-lunch',
     description:"Aloe vera or  aloe vera  is a green plant, has thorns on the side of the skin with yellowish patches and...",
     imageSrc: image16.src,
-    link: `${ROUTE.BLOG_DETAIL}`
 },{
     title: "Don't Buy Wrong, Here Are 7 Ways to Choose a Ripe Dragon Fruit",
+    slug: 'have-a-nice-lunch',
     description:"Dragon fruit is a type of fruit that is a favorite for many people because of its delicious and fresh...",
     imageSrc: image17.src,
-    link: `${ROUTE.BLOG_DETAIL}`
 }]
 
   const RelevantBlogPosts = ({ data = recipe, itemKey="detail-relevant", title="Relevant Blog Posts", bgcolor = "default" }: RelevantProps) => {
@@ -62,7 +62,7 @@ const recipe:BlogCardProps[] = [
             <HeadingCommon>{title}</HeadingCommon>
           </div>
           <div className={s.right}>
-            <ViewAllItem link="#"/>
+            <ViewAllItem link={ROUTE.BLOGS}/>
           </div>
         </div>
         <div className={s.bot}>