fix: fix conflic

2025-07-22 20:26:49 +00:00 · 2021-09-07 11:40:47 +07:00
parent 5261cb04bc a9f9f06eb9
commit b569c6397d
148 changed files with 6995 additions and 4308 deletions
--- a/src/utils/constanst.utils.ts
+++ b/src/utils/constanst.utils.ts
@@ -10,6 +10,7 @@ export const ROUTE = {
    PRODUCTS: '/products',
    ABOUT: '/about',
    ACCOUNT: '/account',
+    RECIPES: '/recipes',

    BUSSINESS: '/bussiness',
    CONTACT: '/contact',
@@ -18,6 +19,7 @@ export const ROUTE = {
    TERM_CONDITION: '/term-condition',
    PRIVACY_POLICY: '/privacy-policy',
    BLOGS: '/blogs',
+    FORGOT_PASSWORD: '/forgot-password'
 }

 export const ACCOUNT_TAB = {
--- a/src/utils/demo-data.ts
+++ b/src/utils/demo-data.ts
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 export const RECIPE_DATA_TEST= [
    {   
        id: '1',
@@ -40,5 +41,159 @@ export const RECIPE_DATA_TEST= [
        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,...",
        image: 'https://user-images.githubusercontent.com/76729908/132159262-f28a9fb9-4852-47e6-80b5-d600521b548a.png',
        link:'#'
+=======
+import { RecipeCardProps } from "src/components/common/RecipeCard/RecipeCard"
+
+export const PRODUCT_DATA_TEST = [
+    {
+        name: 'Tomato',
+        weight: '250g',
+        category: 'VEGGIE',
+        price: 'Rp 27.500',
+        imageSrc: "https://user-images.githubusercontent.com/76729908/131646211-d56b77ac-83f1-4dd2-b55c-e3f1e0ba4e49.png",
+    },
+    {
+        name: 'Cucumber',
+        weight: '250g',
+        category: 'VEGGIE',
+        price: 'Rp 27.500',
+        imageSrc: "https://user-images.githubusercontent.com/76729908/131646211-d56b77ac-83f1-4dd2-b55c-e3f1e0ba4e49.png",
+    },
+    {
+        name: 'Carrot',
+        weight: '250g',
+        category: 'VEGGIE',
+        price: 'Rp 27.500',
+        imageSrc: "https://user-images.githubusercontent.com/76729908/131646217-23b86160-45c9-4845-8dcc-b3e1a4483edd.png",
+    },
+    {
+        name: 'Salad',
+        weight: '250g',
+        category: 'VEGGIE',
+        price: 'Rp 27.500',
+        imageSrc: "https://user-images.githubusercontent.com/76729908/131646221-aaa1d48d-bb80-470f-9400-ae2aa47285b6.png",
+    },
+    {
+        name: 'Tomato',
+        weight: '250g',
+        category: 'VEGGIE',
+        price: 'Rp 27.500',
+        imageSrc: "https://user-images.githubusercontent.com/76729908/131646224-d22dc2e4-6ae8-4bbe-adcf-491ce191f09b.png",
+    },
+    {
+        name: 'Cucumber',
+        weight: '250g',
+        category: 'VEGGIE',
+        price: 'Rp 27.500',
+        imageSrc: "https://user-images.githubusercontent.com/76729908/131646225-2728f192-481b-4142-99b0-dde92f53c6c6.png",
+    },
+    {
+        name: 'Tomato',
+        weight: '250g',
+        category: 'VEGGIE',
+        price: 'Rp 27.500',
+        imageSrc: "https://user-images.githubusercontent.com/76729908/131646227-b5705e64-3b45-47a3-9433-9f4b5ee8d40c.png",
+    },
+    {
+        name: 'Cucumber',
+        weight: '250g',
+        category: 'VEGGIE',
+        price: 'Rp 27.500',
+        imageSrc: "https://user-images.githubusercontent.com/76729908/131646231-2d1c3ad1-4f5b-4a8e-9874-ca731f4ce128.png",
+    },
+]
+
+export const INGREDIENT_DATA_TEST = [
+    {
+        name: 'Tomato',
+        weight: '250g',
+        category: 'VEGGIE',
+        price: 'Rp 27.500',
+        imageSrc: "https://user-images.githubusercontent.com/76729908/131646211-d56b77ac-83f1-4dd2-b55c-e3f1e0ba4e49.png",
+    },
+    {
+        name: 'Cucumber',
+        weight: '250g',
+        category: 'VEGGIE',
+        price: 'Rp 27.500',
+        imageSrc: "https://user-images.githubusercontent.com/76729908/131646211-d56b77ac-83f1-4dd2-b55c-e3f1e0ba4e49.png",
+        isNotSell: true,
+    },
+    {
+        name: 'Carrot',
+        weight: '250g',
+        category: 'VEGGIE',
+        price: 'Rp 27.500',
+        imageSrc: "https://user-images.githubusercontent.com/76729908/131646217-23b86160-45c9-4845-8dcc-b3e1a4483edd.png",
+    },
+    {
+        name: 'Salad',
+        weight: '250g',
+        category: 'VEGGIE',
+        price: 'Rp 27.500',
+        imageSrc: "https://user-images.githubusercontent.com/76729908/131646221-aaa1d48d-bb80-470f-9400-ae2aa47285b6.png",
+        isNotSell: true,
+    },
+    {
+        name: 'Tomato',
+        weight: '250g',
+        category: 'VEGGIE',
+        price: 'Rp 27.500',
+        imageSrc: "https://user-images.githubusercontent.com/76729908/131646224-d22dc2e4-6ae8-4bbe-adcf-491ce191f09b.png",
+    },
+    {
+        name: 'Cucumber',
+        weight: '250g',
+        category: 'VEGGIE',
+        price: 'Rp 27.500',
+        imageSrc: "https://user-images.githubusercontent.com/76729908/131646225-2728f192-481b-4142-99b0-dde92f53c6c6.png",
+    },
+    {
+        name: 'Tomato',
+        weight: '250g',
+        category: 'VEGGIE',
+        price: 'Rp 27.500',
+        imageSrc: "https://user-images.githubusercontent.com/76729908/131646227-b5705e64-3b45-47a3-9433-9f4b5ee8d40c.png",
+    },
+    {
+        name: 'Cucumber',
+        weight: '250g',
+        category: 'VEGGIE',
+        price: 'Rp 27.500',
+        imageSrc: "https://user-images.githubusercontent.com/76729908/131646231-2d1c3ad1-4f5b-4a8e-9874-ca731f4ce128.png",
+    },
+]
+
+export const RECIPE_DATA_TEST: RecipeCardProps[] = [
+    {
+        title: "Special Recipe of Vietnamese Phở",
+        description: "Alright, before we get to the actual recipe, let’s chat for a sec about the ingredients.  To make this pho soup recipe, you will need:",
+        imageSrc: 'https://user-images.githubusercontent.com/76729908/132159257-f92574c7-d00d-4142-8ea7-0ca9515fb737.png'
+    },
+    {
+        title: "Original Recipe of Curry",
+        description: "Chicken curry is common to several countries including India, countries in Asia and the Caribbean. My favorite of them though is this aromatic Indian...",
+        imageSrc: 'https://user-images.githubusercontent.com/76729908/132159259-ae4c986d-ab53-4758-9137-d06bafdd15d0.png'
+    },
+    {
+        title: "The Best Recipe of Beef Noodle Soup",
+        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: 'https://user-images.githubusercontent.com/76729908/132159262-f28a9fb9-4852-47e6-80b5-d600521b548a.png'
+    },
+    {
+        title: "Special Recipe of Vietnamese Phở",
+        description: "Alright, before we get to the actual recipe, let’s chat for a sec about the ingredients.  To make this pho soup recipe, you will need:",
+        imageSrc: 'https://user-images.githubusercontent.com/76729908/132159257-f92574c7-d00d-4142-8ea7-0ca9515fb737.png'
+    },
+    {
+        title: "Original Recipe of Curry",
+        description: "Chicken curry is common to several countries including India, countries in Asia and the Caribbean. My favorite of them though is this aromatic Indian...",
+        imageSrc: 'https://user-images.githubusercontent.com/76729908/132159259-ae4c986d-ab53-4758-9137-d06bafdd15d0.png'
+    },
+    {
+        title: "The Best Recipe of Beef Noodle Soup",
+        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: 'https://user-images.githubusercontent.com/76729908/132159262-f28a9fb9-4852-47e6-80b5-d600521b548a.png'
+>>>>>>> a9f9f06eb9dee2a1ddefe907ff804237a78c5210
    },
 ]
--- a/src/utils/language.utils.ts
+++ b/src/utils/language.utils.ts
@@ -2,7 +2,12 @@ export const LANGUAGE = {
    BUTTON_LABEL: {
        BUY_NOW: 'Buy now',
        SHOP_NOW: 'Shop now',
+<<<<<<< HEAD
        CONFIRM:'Confirm'
+=======
+        ADD_TO_CARD: 'Add to Cart',
+        PREORDER: 'Pre-Order Now',
+>>>>>>> a9f9f06eb9dee2a1ddefe907ff804237a78c5210
    },
    PLACE_HOLDER: {
        SEARCH: 'Search',
--- a/src/utils/types.utils.ts
+++ b/src/utils/types.utils.ts
@@ -0,0 +1,24 @@
+export interface ProductProps {
+    category: string
+    name: string
+    weight: string
+    price: string
+    imageSrc: string
+    isNotSell?: boolean
+}
+
+export interface FeaturedProductProps {
+    title: string
+    subTitle: string
+    originPrice: string
+    price: string
+    imageSrc: string
+}
+
+export interface RecipeProps {
+    title: string
+    description:string
+    imageSrc: string
+}
+
+export type MouseAndTouchEvent = MouseEvent | TouchEvent
--- a/src/utils/useClickOutSide.ts
+++ b/src/utils/useClickOutSide.ts
@@ -0,0 +1,30 @@
+import { RefObject, useEffect } from 'react'
+import { MouseAndTouchEvent } from './types.utils'
+
+export function useOnClickOutside<T extends HTMLElement = HTMLElement>(
+	ref: RefObject<T>,
+	callback: (event: MouseAndTouchEvent) => void
+) {
+	useEffect(() => {
+		const listener = (event: MouseAndTouchEvent) => {
+			const el = ref?.current
+
+			// Do nothing if clicking ref's element or descendent elements
+			if (!el || el.contains(event.target as Node)) {
+				return
+			}
+
+			callback(event)
+		}
+
+		document.addEventListener(`mousedown`, listener)
+		document.addEventListener(`touchstart`, listener)
+
+		return () => {
+			document.removeEventListener(`mousedown`, listener)
+			document.removeEventListener(`touchstart`, listener)
+		}
+
+		// Reload only if ref or handler changes
+	}, [ref, callback])
+}