Merge pull request #39 from KieIO/m6-lytran

M6 Ly: Fix header, style shape common, optimize images

pages/test.tsx

@@ -1,90 +1,33 @@
-import {
-  CartDrawer,
-  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';
-const CATEGORY = [
-  {
-      name: 'All',
-      link: `${ROUTE.PRODUCTS}/?${QUERY_KEY.BRAND}=${OPTION_ALL}`,
-  },
-  {
-      name: 'Veggie',
-      link: `${ROUTE.PRODUCTS}/?${QUERY_KEY.BRAND}=veggie`,
-  },
-  {
-      name: 'Seafood',
-      link: `${ROUTE.PRODUCTS}/?${QUERY_KEY.BRAND}=seafood`,
-  },
-  {
-      name: 'Frozen',
-      link: `${ROUTE.PRODUCTS}/?${QUERY_KEY.BRAND}=frozen`,
-  },
-  {
-      name: 'Coffee Bean',
-      link: `${ROUTE.PRODUCTS}/?${QUERY_KEY.BRAND}=coffee-bean`,
-  },
-  {
-      name: 'Sauce',
-      link: `${ROUTE.PRODUCTS}/?${QUERY_KEY.BRAND}=sauce`,
-  },
-]
-const BRAND = [
+import { ImgWithLink, Layout, StaticImage } from 'src/components/common'
+import TestImg from '../public/assets/images/image5.png'
 
-  {
-      name: 'Maggi',
-      link: `${ROUTE.PRODUCTS}/?${QUERY_KEY.BRAND}=veggie`,
-  },
-  {
-      name: 'Cholimes',
-      link: `${ROUTE.PRODUCTS}/?${QUERY_KEY.BRAND}=seafood`,
-  },
-  {
-      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`,
-    }
-  ];
 export default function Test() {
-  const { visible: visibleMenuFilter, openModal, closeModal: closeMenuFilter } = useModalCommon({ initialValue: false })
-  const toggle = () => {
-    if (visibleMenuFilter) {
-        closeMenuFilter()
-    } else {
-        openModal()
-    }
-}
   return (
     <>
-      {/* <BlogDetailPage /> */}
+      <ImgWithLink src="https://user-images.githubusercontent.com/76729908/131634880-8ae1437b-d3f8-421e-a546-d5a4f9a28e5f.png" alt="test" />
+      <StaticImage src={TestImg} />
+      <button className="shape-common" style={{padding: '2rem', background: 'pink'}}>
+        Lorem ipsum dolor
+      </button>
+
+      <button className="shape-common-border" style={{padding: '2rem'}}>
+        <div className="inner">
+          Lorem ipsum dolor sit
+        </div>
+      </button>
+
+      <div className="shape-common-lg" style={{ background: "blue" }}>
+        <div className="inner">
+          Lorem ipsum dolor sit amet consectetur adipisicing elit. Nam vel optio fuga nobis nostrum! Magnam tenetur, et doloremque unde enim dolorem aspernatur nobis vitae impedit iste iure distinctio labore, quidem illo itaque necessitatibus eligendi magni architecto illum cumque corrupti esse a. Eius tenetur voluptas autem corrupti, amet porro beatae ratione maiores! Dolorum earum placeat totam corporis sint quae quam at vero eos magni amet, nisi eum qui natus exercitationem ea eveniet esse aut in. Ipsa hic saepe veritatis quas dignissimos corrupti sapiente quis, mollitia ducimus, ipsum ratione quos doloribus quidem, dolor neque! Eligendi quibusdam aspernatur, maxime vitae incidunt ipsam itaque ab distinctio? Architecto ratione deserunt saepe sequi alias accusantium harum quae itaque aut odit voluptates, hic beatae similique expedita! Modi, sunt exercitationem! Mollitia, eius! Molestiae nostrum, quas, ratione deleniti, adipisci pariatur omnis veniam blanditiis iste quia laboriosam est labore doloribus officiis repellendus consequatur. Ducimus impedit voluptate doloribus repellendus exercitationem mollitia labore ab totam reiciendis distinctio. Nesciunt dolor officiis reiciendis esse nostrum modi inventore, cum, veritatis placeat doloribus iure perspiciatis tempora a mollitia soluta fugit! Aspernatur necessitatibus provident, reiciendis sapiente temporibus labore. Optio tempora ipsam blanditiis fugiat sint reiciendis, deleniti itaque fuga omnis aut architecto animi, aliquam quis aliquid ipsum necessitatibus dolorem sequi aperiam magni non! Atque deserunt autem nihil, in voluptatem, natus quibusdam fugiat velit aspernatur ullam quam quo consequuntur eius. Pariatur dolor obcaecati quam reprehenderit, est corporis ea beatae quia numquam nemo in eum voluptatem ullam sequi atque? Quos neque voluptatem maxime, repellat cupiditate accusantium, maiores in aperiam, eveniet asperiores eligendi velit iusto voluptates dolores. Nostrum officia commodi dolore asperiores sequi, molestiae quasi. Deserunt, molestiae voluptate. Perferendis earum consectetur adipisci ratione nisi nihil minus. Ipsum voluptas dolorum voluptates dolores reprehenderit nemo, exercitationem labore, quas voluptatibus officiis fuga ullam ab, eius quae. Quibusdam perferendis iusto nobis, cupiditate officiis sapiente molestiae distinctio magnam dolore voluptatum quos ratione fugiat autem corporis rerum esse possimus perspiciatis ex officia eos numquam blanditiis assumenda natus. At nihil excepturi et consectetur nobis dicta tempora dolorum neque, saepe minima mollitia, officiis ex atque reprehenderit blanditiis animi dolore ratione quam. Id animi facere repudiandae eos facilis? Dolorum quae illo nam tempora, quasi ut placeat beatae minus consequatur libero maiores repudiandae, voluptates sed natus animi a. Cum numquam atque explicabo temporibus consequatur odit voluptates tenetur pariatur optio nihil eligendi ab veniam nisi velit quaerat natus, ea facere eveniet corrupti! Iste temporibus placeat tenetur incidunt obcaecati quam nulla nemo cum accusantium quo velit, maiores, esse illum ipsam dolore enim sunt, aspernatur illo provident delectus officia sit officiis qui! Ullam quam numquam mollitia reprehenderit? Facere, quos amet praesentium officia nostrum veritatis, autem laborum quidem architecto eveniet voluptatum, nisi voluptate totam saepe. Obcaecati non vitae accusantium voluptates iure voluptatem nulla, quaerat culpa officia quasi mollitia doloremque. Deserunt officia aliquid totam quibusdam, doloribus quos porro sit alias, perspiciatis facilis exercitationem inventore adipisci aliquam saepe ipsam dignissimos. Minima iste dolorem esse optio necessitatibus voluptas deserunt sint quam, veniam nulla vitae eaque omnis alias! Natus ut, doloribus quia laboriosam id voluptates? Quibusdam aliquid ea nemo.
+        </div>
+      </div>
+      <div className="shape-common-lg-border" >
+        <div className="inner" style={{ background: "blue" }}>
+          Lorem ipsum dolor sit amet consectetur, adipisicing elit. Voluptate, maiores cum quam odit quia est magni aut reiciendis deleniti, ea quae, dolorem vero fuga veritatis culpa? Eum sunt quia et consequatur tenetur, atque eius illo quibusdam laudantium iusto quo cumque, ad dolor dicta eos inventore ipsa fugit voluptates similique incidunt doloribus? Dicta, ipsa? Suscipit porro dicta dolorum rem. Placeat provident quisquam excepturi obcaecati tempora, eaque incidunt accusantium suscipit velit ex quo, voluptatem eum inventore illum exercitationem beatae sint temporibus aliquid, unde expedita recusandae. Repudiandae, nesciunt natus adipisci, error consectetur, fugit magni ducimus est delectus voluptates cupiditate explicabo dolorem maxime hic. Natus, quidem beatae rem aliquam nobis illo reprehenderit, distinctio qui adipisci quaerat sapiente hic nisi ad. Voluptatem dolore eius eos doloribus quam repudiandae cum, culpa expedita error fugiat. Labore eius voluptatum reiciendis repellendus. Enim sapiente dolore tenetur totam esse laboriosam labore aperiam aspernatur! Magnam voluptas iure recusandae delectus, in impedit nobis aliquam debitis laudantium, explicabo quas molestiae quos rem quibusdam nemo placeat nam, dolore doloribus quaerat eum! Quam nesciunt architecto debitis consequuntur sint culpa exercitationem dicta numquam dolorum eius illum similique fuga magni veritatis sequi, et excepturi distinctio laborum quidem. Tempore debitis natus iure, enim molestiae provident? Sed dignissimos velit dolores quia recusandae quam? Beatae, officia dolor. Repellendus dicta provident veniam itaque beatae, eius labore sapiente aspernatur exercitationem ducimus quam est quas quaerat officia consequatur temporibus tempore! Iusto, voluptatum maxime provident, voluptatem ullam recusandae facere error, animi sequi quidem modi illo accusamus non consequuntur deserunt fuga sit labore cum dolorem delectus unde architecto! Mollitia consequuntur veniam sit nihil itaque praesentium temporibus inventore nemo odio necessitatibus eum corporis at et consequatur alias deserunt eligendi aliquid voluptatem quasi exercitationem, voluptatum quos aut voluptate ipsum? Error provident repellat fuga temporibus delectus rem, exercitationem doloremque voluptatem dignissimos, quod amet neque sed quidem nostrum deserunt est debitis obcaecati. Aspernatur veniam vel soluta labore expedita cum quo debitis ab exercitationem, saepe aliquam officia praesentium optio voluptatem atque. Voluptatem ullam et voluptas eligendi omnis fugiat? Ipsam laudantium beatae perspiciatis quis! Nemo optio, quia esse perspiciatis iste et veniam illum qui praesentium, expedita assumenda? Quae distinctio repellendus excepturi ut eos enim optio earum, laborum aperiam, sed sit alias incidunt voluptatibus? Officia, quos. Labore porro repellendus, suscipit praesentium possimus adipisci, quidem illum consequuntur ut id quae quas cum corrupti laboriosam nesciunt nisi dolorum ullam dolor nobis debitis, ipsam inventore? Doloribus dignissimos ipsa aliquid? Dolores nemo ab hic ipsum expedita maxime corporis recusandae inventore, aliquam voluptate voluptatibus dolor dignissimos suscipit explicabo, officia consequuntur officiis ipsam cumque debitis odio qui? Earum minus quaerat possimus ea laudantium laboriosam enim omnis molestias quod nesciunt vel vero officia, ad inventore voluptatem dicta dolorem rem voluptates ab quasi nisi, esse quis. Fuga ad animi reiciendis nulla officiis possimus adipisci ducimus eum, molestias neque enim doloremque nam recusandae labore commodi, quia sed illo fugit molestiae qui hic voluptate facere dignissimos. Dolor porro ab modi nam vitae architecto delectus quo et velit pariatur omnis quae in ullam ex quis rerum, corporis alias, nobis veritatis aperiam commodi hic!
+        </div>
+      </div>
+
 
-      {/* <RecipeListPage/> */}
-        {/*<MenuNavigation heading="CATEGORIES" categories={CATEGORY}/>*/}
-        <button onClick={toggle}>toggle menu : {visibleMenuFilter.toString()}</button>
-           <MenuNavigationProductList categories={CATEGORY}  brands={BRAND} featured={FEATURED} visible={visibleMenuFilter} onClose={closeMenuFilter}/> 
-           {/* <CartDrawer  /> */}
     </>
   )
 }

src/components/common/CustomShapeSvg/CustomShapeSvg.tsx

@@ -0,0 +1,21 @@
+
+const CustomShapeSvg = () => {
+    return (
+        <>
+            <svg width="0" height="0" viewBox="0 0 1 1" fill="none" xmlns="http://www.w3.org/2000/svg">
+                <clipPath id="svg-custom-shape" clipPathUnits="objectBoundingBox">
+                    <path
+                        d="M0.0172975 0.136181C0.0343229 -0.030626 0.360144 0.00272041 0.510753 0.00272041C0.640763 0.00272041 0.779987 0.0273237 0.944182 0.0678791C0.966966 0.0735065 0.986 0.126214 0.990073 0.19938C0.994835 0.284918 1 0.404512 1 0.520863C1 0.736726 0.993726 0.834689 0.982222 0.886228C0.943784 1.05844 0.733836 0.983992 0.493833 0.983992C0.30975 0.983992 0.127708 0.957276 0.052872 0.944826C0.0312385 0.941228 0.0126875 0.895116 0.00839312 0.826023C0.00415553 0.757843 0 0.662594 0 0.551233C0 0.345672 0.000272106 0.302988 0.0172975 0.136181Z"
+                        fill="#B5B5B5" />
+                </clipPath>
+            </svg>
+            <svg width="0" height="0" viewBox="0 0 1 1" fill="none" xmlns="http://www.w3.org/2000/svg">
+                <clipPath id="svg-custom-shape-lg" clipPathUnits="objectBoundingBox">
+                    <path d="M0.00309475 0.648049L0.016817 0.981984H0.165017L0.368106 0.987044C0.428484 0.985357 0.660022 0.997877 0.750058 0.998542C0.845065 0.999243 0.83562 1.00172 0.881179 0.998007C0.938818 0.993313 0.955418 0.966805 0.96914 0.941507C0.982862 0.916209 0.99209 0.790258 0.99384 0.76948C0.995632 0.748196 1.00207 0.572154 0.999329 0.425425C0.996584 0.278696 0.977373 0.0408933 0.96914 0.0257144C0.960907 0.0105355 0.546495 0.000416471 0.532773 0.000416471C0.519051 0.000416471 0.329256 -0.00466047 0.156356 0.0206377C-0.0165445 0.0459358 0.0135012 0.0186561 0.00526778 0.180564C-0.00116735 0.30711 -0.00147933 0.563722 0.00309475 0.648049Z" fill="#C4C4C4" />
+                </clipPath>
+            </svg>
+        </>
+    )
+}
+
+export default CustomShapeSvg

src/components/common/CustomShapeSvg/ViewAllItem.module.scss

@@ -0,0 +1,16 @@
+@import "../../../styles/utilities";
+
+.viewAll {
+    display: flex;
+    .content {
+        color: var(--primary);
+        margin: 0.8rem 0.8rem 0.8rem 0;
+        font-weight: bold;
+    }
+    .vector {
+        margin: 0.8rem 0rem 0.8rem 0rem;
+        svg path {
+            fill: var(--primary);
+        }
+    }
+}

src/components/common/EmptyCommon/EmptyCommon.module.scss

@@ -0,0 +1,16 @@
+@import "../../../styles/utilities";
+
+.empty {
+    padding: 1.6rem;
+    margin: auto;
+    .imgWrap {
+        min-width: 10rem;
+        text-align: center;
+    }
+
+    .description {
+        color: var(--disabled);
+        text-align: center;
+        margin-top: .8rem;
+    }
+}

src/components/common/EmptyCommon/EmptyCommon.tsx

@@ -0,0 +1,25 @@
+import { StaticImage } from '..';
+import EmptyImg from './empty.png';
+import s from './EmptyCommon.module.scss';
+
+
+interface Props {
+    description?: string
+}
+
+const EmptyCommon = ({ description = "No data to display" }: Props) => {
+    return (
+        <div className={s.empty}>
+            <div className={s.imgWrap}>
+                <StaticImage src={EmptyImg} alt="empty" />
+            </div>
+            {
+                description && <div className={s.description}>
+                    {description}
+                </div>
+            }
+        </div>
+    )
+}
+
+export default EmptyCommon

src/components/common/Header/Header.module.scss

@@ -1,10 +1,14 @@
 @import "../../../styles/utilities";
 
 .header {
-  @apply sticky bg-white shadow-md;
+  @apply sticky bg-white;
   top: 0;
+  left: 0;
   z-index: 9999;
   margin-bottom: 3.2rem;
+  @screen md {
+    @apply relative;
+  }
   &.full {
     @apply shadow-none;
     border: 1px solid var(--border-line);
@@ -17,3 +21,27 @@
     @apply font-logo;
   }
 }
+
+.headerSticky {
+  @apply sticky bg-white shadow-md;
+  display: none;
+  padding-left: 3.2rem;
+  padding-right: 3.2rem;
+  top: 0;
+  left: 0;
+  z-index: 10000;
+  transition: all 0.2s;
+  &.show {
+    display: block;
+    animation: showHeaderSticky 0.2s;
+  }
+}
+
+@keyframes showHeaderSticky {
+  0% {
+    transform: translateY(-7rem);
+  }
+  100% {
+    transform: none;
+  }
+}

src/components/common/Header/Header.tsx

@@ -1,5 +1,5 @@
 import classNames from 'classnames'
-import React, { memo, useEffect, useState } from 'react'
+import React, { memo, useEffect, useMemo, useRef, useState } from 'react'
 import { useModalCommon } from 'src/components/hooks'
 import { isMobile } from 'src/utils/funtion.utils'
 import ModalAuthenticate from '../ModalAuthenticate/ModalAuthenticate'
@@ -12,40 +12,57 @@ import s from './Header.module.scss'
 
 
 const Header = memo(() => {
+    const headeFullRef = useRef<HTMLDivElement>(null)
     const [isFullHeader, setIsFullHeader] = useState<boolean>(true)
     const { visible: visibleModalAuthen, closeModal: closeModalAuthen, openModal: openModalAuthen } = useModalCommon({ initialValue: false })
     const { visible: visibleModalInfo, closeModal: closeModalInfo, openModal: openModalInfo } = useModalCommon({ initialValue: false })
 
+    const headerHeight = useMemo(() => {
+        return headeFullRef.current?.offsetHeight
+    }, [headeFullRef.current])
+
     useEffect(() => {
+        const handleScroll = () => {
+            if (!isMobile()) {
+                if (!headerHeight || window.scrollY > headerHeight) {
+                    setIsFullHeader(false)
+                } else {
+                    setIsFullHeader(true)
+                }
+            }
+        }
         window.addEventListener('scroll', handleScroll)
         return () => {
             window.removeEventListener('scroll', handleScroll)
         }
-    }, [])
+    }, [headerHeight])
 
-    const handleScroll = () => {
-        if (!isMobile()) {
-            if (window.scrollY === 0) {
-                setIsFullHeader(true)
-            } else {
-                setIsFullHeader(false)
-            }
-        }
-    }
     return (
         <>
-            <header className={classNames({ [s.header]: true, [s.full]: isFullHeader })}>
-                <HeaderHighLight isShow={isFullHeader} />
+            <header ref={headeFullRef} className={classNames({ [s.header]: true, [s.full]: isFullHeader })}>
+                <HeaderHighLight />
                 <div className={s.menu}>
+                    <HeaderMenu
+                        isFull={isFullHeader}
+                        openModalAuthen={openModalAuthen}
+                        openModalInfo={openModalInfo} />
+                    <HeaderSubMenu />
+                </div>
+            </header>
+
+
+            <div className={classNames({
+                [s.headerSticky]: true,
+                [s.show]: !isFullHeader
+            })}>
                 <HeaderMenu isFull={isFullHeader}
                     openModalAuthen={openModalAuthen}
                     openModalInfo={openModalInfo} />
-                    <HeaderSubMenu isShow={isFullHeader} />
             </div>
-            </header>
+
             <HeaderSubMenuMobile />
             <ModalAuthenticate visible={visibleModalAuthen} closeModal={closeModalAuthen} />
-            <ModalCreateUserInfo demoVisible={visibleModalInfo} demoCloseModal={closeModalInfo}/>
+            <ModalCreateUserInfo demoVisible={visibleModalInfo} demoCloseModal={closeModalInfo} />
         </>
     )
 })

src/components/common/Header/components/HeaderHighLight/HeaderHighLight.module.scss

@@ -3,13 +3,7 @@
 .headerHighLight {
     @apply hidden;
     @screen md {
-        transform: translateY(-10rem);
-        height: 0;
-        &.show {
         @apply flex justify-between items-center spacing-horizontal bg-primary caption;
-            animation: showHeaderHightlight 0.2s;
-            height: unset;
-            transform: none;
         padding-top: 0.8rem;
         padding-bottom: 0.8rem;
         color: var(--white);
@@ -26,14 +20,4 @@
             }
         }
     }
-    }
-}
-
-@keyframes showHeaderHightlight {
-    0% {
-        transform: translateY(-4rem);
-    }
-    100% {
-        transform: none;
-    }
 }

src/components/common/Header/components/HeaderHighLight/HeaderHighLight.tsx

@@ -1,6 +1,5 @@
-import classNames from 'classnames'
 import Link from 'next/link'
-import { memo, useEffect, useRef } from 'react'
+import { memo } from 'react'
 import { ROUTE } from 'src/utils/constanst.utils'
 import s from './HeaderHighLight.module.scss'
 
@@ -19,14 +18,9 @@ const MENU = [
     },
 ]
 
-interface Props {
-    children?: any,
-    isShow: boolean,
-}
-
-const HeaderHighLight = memo(({ isShow }: Props) => {
+const HeaderHighLight = memo(() => {
     return (
-        <section className={classNames({ [s.headerHighLight]: true, [s.show]: isShow })}>
+        <section className={s.headerHighLight}>
             <div>
                 Free Shipping on order $49+ / Express $99+
             </div>

src/components/common/Header/components/HeaderMenu/HeaderMenu.module.scss

@@ -62,6 +62,11 @@
                     }
                 }
                 .btnCart {
+                    all: unset;
+                    cursor: pointer;
+                    &:focus-visible {
+                        outline: 2px solid #000;
+                    }
                     &:hover {
                         svg path {
                             fill: var(--primary);

src/components/common/Header/components/HeaderSubMenu/HeaderSubMenu.module.scss

@@ -3,9 +3,6 @@
 .headerSubMenu {
     @apply hidden;
     @screen md {
-        transform: translateY(-10rem);
-        height: 0;
-        &.show {
         @apply block;
         padding-bottom: 2.4rem;
         transform: none;
@@ -38,5 +35,4 @@
             }
         }
     }
-    }
 }

src/components/common/Header/components/HeaderSubMenu/HeaderSubMenu.tsx

@@ -53,16 +53,12 @@ const CATEGORY = [
         link: `${ROUTE.PRODUCTS}/?${QUERY_KEY.BRAND}=sauce`,
     },
 ]
-interface Props {
-    children?: any,
-    isShow: boolean,
-}
 
-const HeaderSubMenu = memo(({ isShow }: Props) => {
+const HeaderSubMenu = memo(() => {
     const router = useRouter()
 
     return (
-        <section className={classNames({ [s.headerSubMenu]: true, [s.show]: isShow })}>
+        <section className={s.headerSubMenu}>
             <ul className={s.menu}>
                 {/* todo: handle active item */}
                 <li>

src/components/common/ImgWithLink/ImgWithLink.module.scss

@@ -5,5 +5,8 @@
     height: 100%;
     img {
         object-fit: cover;
+        background-size: contain !important;
+        background-position: center !important;
+        background-repeat: no-repeat;
     }
 }

src/components/common/ImgWithLink/ImgWithLink.tsx

@@ -1,6 +1,7 @@
 import React from 'react'
 import s from './ImgWithLink.module.scss'
 import Image from 'next/image'
+import { BLUR_DATA_IMG } from 'src/utils/constanst.utils'
 
 export interface ImgWithLinkProps {
     src: string,
@@ -10,7 +11,12 @@ export interface ImgWithLinkProps {
 const ImgWithLink = ({ src, alt }: ImgWithLinkProps) => {
     return (
         <div className={s.imgWithLink}>
-            <Image src={src} alt={alt} layout="fill" className={s.imgWithLink} />
+            <Image src={src} alt={alt}
+                layout="fill"
+                className={s.imgWithLink}
+                placeholder="blur"
+                blurDataURL={BLUR_DATA_IMG}
+            />
         </div>
     )
 }

src/components/common/Layout/Layout.tsx

@@ -2,7 +2,7 @@ import { CommerceProvider } from '@framework'
 import { useRouter } from 'next/router'
 import { FC } from 'react'
 import { useModalCommon } from 'src/components/hooks'
-import { CartDrawer } from '..'
+import { CartDrawer, CustomShapeSvg } from '..'
 import Footer from '../Footer/Footer'
 import Header from '../Header/Header'
 import s from './Layout.module.scss'
@@ -30,6 +30,7 @@ const Layout: FC<Props> = ({ children }) => {
                 <Header />
                 <main >{children}</main>
                 <button onClick={toggle}>toggle card: {visibleCartDrawer.toString()}</button>
+                <CustomShapeSvg/>
                 <CartDrawer
                     visible={visibleCartDrawer}
                     onClose={closeCartDrawer} />

src/components/common/StaticImage/StaticImage.module.scss

@@ -0,0 +1,5 @@
+.staticImage {
+    img {
+        @apply w-full h-full;
+    }
+}

src/components/common/StaticImage/StaticImage.tsx

@@ -0,0 +1,16 @@
+import React from 'react'
+import s from './StaticImage.module.scss'
+import Image from 'next/image'
+
+export interface Props {
+    src: StaticImageData,
+    alt?: string,
+}
+
+const StaticImage = ({ src, alt }: Props) => {
+    return (
+        <Image src={src} alt={alt} placeholder='blur' className={s.staticImage}/>
+    )
+}
+
+export default StaticImage

src/components/common/index.ts

@@ -39,3 +39,6 @@ export { default as ImgWithLink} from './ImgWithLink/ImgWithLink'
 export { default as RecipeDetail} from './RecipeDetail/RecipeDetail'
 export { default as DrawerCommon} from './DrawerCommon/DrawerCommon'
 export { default as CartDrawer} from './CartDrawer/CartDrawer'
+export { default as StaticImage} from './StaticImage/StaticImage'
+export { default as EmptyCommon} from './EmptyCommon/EmptyCommon'
+export { default as CustomShapeSvg} from './CustomShapeSvg/CustomShapeSvg'

src/styles/_utilities.scss

@@ -112,6 +112,60 @@
         border-radius: 60% 2% 2% 2%/ 6% 50% 50% 50%;
     }
 
+    .shape-common {
+        position: relative;
+        $border: 2px;
+        margin: $border;
+        clip-path: url(#svg-custom-shape);
+    }
+
+    .shape-common-border {
+        position: relative;
+        $border: 2px;
+        margin: $border;
+
+        .inner {
+            background: var(--white);
+            clip-path: url(#svg-custom-shape);
+        }
+        &::before {
+            position: absolute;
+            content: "";
+            width: calc(100% + #{$border} * 2);
+            height: calc(100% + #{$border} * 2);
+            background-color: var(--primary);
+            top: calc(#{$border} * -1);
+            left: calc(#{$border} * -1);
+            clip-path: url(#svg-custom-shape);
+        }
+    }
+
+    .shape-common-lg {
+        clip-path: url(#svg-custom-shape-lg);
+        padding: 2rem;
+    }
+
+    .shape-common-lg-border {
+        position: relative;
+        $border: 2px;
+        margin: $border;
+
+        .inner {
+            padding: 2rem;
+            clip-path: url(#svg-custom-shape-lg);
+        }
+        &::before {
+            position: absolute;
+            content: "";
+            width: calc(100% + #{$border} * 2);
+            height: calc(100% + #{$border} * 2);
+            background-color: var(--primary);
+            top: calc(#{$border} * -1);
+            left: calc(#{$border} * -1);
+            clip-path: url(#svg-custom-shape-lg);
+        }
+    }
+
     .font-heading {
         font-family: var(--font-heading);
     }
@@ -135,7 +189,7 @@
 
         &::-webkit-scrollbar-thumb {
             border-radius: 10px;
-            background-color: var(--primary)
+            background-color: var(--primary);
         }
     }
 

src/utils/constanst.utils.ts

@@ -1,3 +1,5 @@
+export const BLUR_DATA_IMG = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMMAAADDCAMAAAAIoVWYAAAAgVBMVEUAAABYl3BZl3RZn3Bbm3RbmnRamXNbmnVbmnNamnRamXRbmnNYlnJbm3RamnRamXNamnRcmXRZmXNamnNcmXP///9bmnTr8+6YwKjB2cv1+fdvp4VloHyEs5e308KixrHW5txwpoWtzLnh7eaEs5bM4NSOup/W5t16rY6tzbrC2cuKR9FTAAAAFXRSTlMAIEAQv+9g35+AcN8wz5Cgr4BQn1CCHGjpAAAJqklEQVR42uya25aaMBSGEcRT1U6nzZEEEAS17/+AnUraiAmEbkGcLr47kYX87PNGb2JiYmJiYmJiYmJiYmLifyaYfRB4n5XtZrULccXube17nw1/H+J73hbeJ2Ixx1aWq5n3cvx2d1PBEjfzUipmm9Wy8pdwvn8PdBjMcSvLjfcaBOv7O50rZ9/gOtEH4u7UVzBFsA5tD/hDRXArTSYFQVd4Gpfi5szxc9QmbHITX0fC+cJRnYLqM9feqMzm2I1MkQVCX0PEtpZ0RBRF2EDEqAFyeAER21BHa5JW7pIX9FAzAkHNXLBinIKnJZjewrSKBLWSqzPDkbLTbGkoMFRkSOHyp+U4reAfCVlzxP5EqKuIvTcCe1zRdJ/sIFokaHJVK0YoEzMtoQGSo078VAXbezo7fCVGj5OMZAgfX6GoB7gYxxBVfT4Q1AfxUw0RbBfr1Wo+X+ErDPVDlZu+e8OzXc/rDd4BAbHX63DoGhFszPaOop7gwuFMww0JBPUFrUbT98Vi4W+HMccixBYk6g2Gb9mt9Dg78JDAUG9wc13Qq2P5S6wRZcJYmrI4SyhB/XHGBvP+VGzwzUiZo4FIhlzdfDNGykEo7DP5olcJ56EU6IAQ55JSelRu1duU+q7nsYFJCUcKXlCBFY/PFbNQRXKKngtnh75ELLFu7Z4Mv/TjTt/GkGCubt4fH9XEvYSco6dAelh6rOyjWi4kssPKJGOn/qzGVYp6g7fa9uaUCIyTtkKV9W8JH2wGazCQqPk+ad9tFEqNfQEkGjLrfeICoAHC5SFDLKxmYHol49Qw/r5gbo2GqG0lk9i+4ziSksZjjKkBvpJbzZC17SeozaXPcEPAF+M/rFN/ZBw1m8/IJlsiKAl857Fufqa4aJ/GTuiWEtAzmr+59AC82Xw7cfjFsTIERxpi6IKNqQF4n3qyTYzMtbA7E32IgjZRpv9uwS0rQTXwFeIKQBwxog4kj2+iSnBQ4ys2s4pOI6XMGGOJwIbsUw7YPfWjQft25MoiJln9GkLScTRoOzh+0eRgPoenaAhtri865JiLKYGYaYbfJTQhy4zxlnh4B8d0buROd3NNjrhGyS1p5mR7OHnL+swH1wdmfcbEVZboobaVcta8XHuuCbw+7G3lleP7IsYzuwPkLKGUJow01BDBTZeXLXU6hLfe0hpfuoiRM5awukuNuaqhGY7hzffMGntEKEsUlREgrdDxPt/y0nBR4/Rw44ETU2w8FUVU0rPO/oD5EsuT+nxureVYsQYHhOxSxArgjlvIkkqBFcTxB6EV+A30yV3EKAesXDQOa5JSiwB2rtJVxEQMWbkYlKiRGO5Om6bRmR2wBvQ2iBiWoJ00/3NgB6G5qlQwdQ/RhUBH/YNpS7fmcAY0hLT6dMpYQRAcwo5/IzvmXUNoDoiIYd+f5GnBUoK6wA9Ab/L/pozxIQK4aNq8kIgYmpvmuCLhrZU3R31jueIR2PwFX3BFRJoVSJ27oJiXPJkHoevj2RdHIeDUIRGiwJ5IjnrjBxURWVTwTGg7OcklR25Y09QeK2cCilBIVhuNY4kVnUTEApfdt8SnPv/lFOzxDecyi9kHGY1wjcgR2PwqOO48YMRNX2w8CIsv2IXz/tLI3rm4XwFoYhUQIGZfsYPmsNc7y7ahOTYCgjZNTzvPG1RFplUYka9I7Ino1EED0UENVdHsUcmNLXK7As1PU0E9J1Ct1TqXeo/gf93hW5Z7v+rPWSFugjs5cd3extIVN8ndriRXA65DA5zA36xXv1kv/N/tV+Viyf1oJqSklMqowePMlKktEauPHKQBvoaK1IjalehXe1fYnCgMRAFR0aIHdx1CAIHTAvX+/w+8cViNS1ICTjPdzPA+2naGJ2+zydvdtFMa/mnTlCfpYGecw0p4EixNdDiuRbYctZnVvToZxPR3wxcSH2EBSgvfn+V25k3DOe9UXgm4tC+srS/bUK3IpDKKqu6z05sTqH6cyV7Jv5HkF307Bw/t0EpJ+W1ZP7gdN+r8jrwSWKJUaA0N04H7ccFV/fA3ajNgIKWteo6x12Fx1x0fq5DCns9IQKCv6s+gzYD3UoohI5Z4IQamWVN9fKRlrTNqDbS0xyggaji598JPUZhEojrH20LKF1qkyJ4xFxAgJugR50hKkOT5o8py+zuI6glg5sYyISAY+sp9ZGWXalcynfci0l6QICWTAVHiYJWb6pkqs10mj0gEjgkc0dfLZJ0z5V6pRqdDrZoY7L1cxwTecdU8Tx7o5C/87/CZ1hP90NbopPUK7zNT6XlzlWhSiPPVelJIXBND0QDYIh+iHEbvRRXQHJ7JneaHXl9pm369XesyLNOlaDeKleTBEWRcTllrfGZ/Jx4BjSdlkpT4QEk7vR8Kloix9KYuxxe4wlaPKGnowp2Z2hIxGAwAV70wcSnG2eBXXL0fWvdtXBA7CCYXphwns0JW0hWUpPZDyy67GwrnJ0PBN/cW5N6/HCVpLo81shyUJLDC9lXxeTrlgrzR+wZwDybmwAcnu4INAnqjvfNFYG1sUVX3OiEpMdlVgo+CGU7iceWYxq9nDrVaSqfhdtXV+KGacUWjHEokpRytSdJr0Puh29j4OwAOcgAwnBy49jUAwn10EDeW7TWvwBCH/DmdpdLBJ8snHANcz/NCzeOb59CBbrCSRIBQuMELwX/e4l0VEc2H/krgUAPOD1WRnBiK6EryV37+DrIhvjLbGShJPtg71BB+VVDORILGUqJ3zyPaeyNchwWdhmhEO9HXxzDeprXsEUUOOeDztAwLpORJIa1zfeldQxtMH4A7w7GYHMAent7qTeWuUElKbAqHAsbEqGGGlC5Q1ySHGVLiRMNhM0NKFZzuqSECP2x6SP92iMGdMwHxSTOkN3NGWolmOH/GSCujuSy5c6aja5rL0n6OlBqaHA76YprcFkkLLiqy6Xd8P36J9OtSAlQkOSApaZFSPADdpWQzB5Tg9GgpbjX8eSNPHwTtsRUkOJs53HvFbOYAvWJWc+hPcI3NHELwlWzmsAczwGYO0ANnNQewWa3mAIaG1Ry2cznk9GoPfTycreYQ40qVHgU9WyPUDlmqJ2FIwRckrHWM3TWQ4BbbGvtZl2xUNDsE4gSQn+2tJ8aJYKF+F+SbTYAEIO30ffMHhyDCt0QgxzRwrzBRKclj7knRlvLk7m00l2izCcCNpGmxqmw6dkPXlNXn7SOqPT8PeH4yAjL/dVA7IW49hVtcbDQv442wkATcERrrmNSGdRTezl/LBALPHgY9wvf90fe3NxyiYLchmJsXLFiwYMGCBQsWLFgwH/8BQqjRKhB614AAAAAASUVORK5CYII='
+
 export const SOCIAL_LINKS = {
     FB: 'FB',
     TWITTER: 'TWITTER',