From ef61d38753a16d3d2e887c7f624e79f86702d25e Mon Sep 17 00:00:00 2001 From: Aritra Ghorai Date: Thu, 13 Mar 2025 18:07:29 +0530 Subject: [PATCH] added --- components/header/Navbar.jsx | 87 ++++++++++++--------- components/hero-page/HeroSix.jsx | 4 +- components/products/RelatedProductCards.jsx | 6 +- components/search/searchComponent.jsx | 12 +-- components/sliders/SliderTwo.jsx | 10 +-- 5 files changed, 68 insertions(+), 51 deletions(-) diff --git a/components/header/Navbar.jsx b/components/header/Navbar.jsx index 143b031..d8e8b6f 100644 --- a/components/header/Navbar.jsx +++ b/components/header/Navbar.jsx @@ -1,38 +1,42 @@ -"use client" +"use client"; -import React, { useContext, useEffect, useState } from "react" -import { Menu, ShoppingBag, UserRound } from "lucide-react" -import { IoMdClose } from "react-icons/io" -import Link from "next/link" -import { NavigationMenu, NavigationMenuList } from "@/components/ui/navigation-menu" -import FullWidthMenu from "./FullWidthMenu" -import MainContext from "@/app/contexts/mainContext" -import DynamicNavbar from "../dynamic-navbar/dynamicNavbar" -import SearchComponent from "../search/searchComponent" -import { useCurrency } from "@/app/contexts/currencyContext" -import CurrencySelect from "../dynamic-navbar/currencySelect" -import Image from "next/image" +import React, { useContext, useEffect, useState } from "react"; +import { Menu, ShoppingBag, UserRound } from "lucide-react"; +import { IoMdClose } from "react-icons/io"; +import Link from "next/link"; +import { + NavigationMenu, + NavigationMenuList, +} from "@/components/ui/navigation-menu"; +import FullWidthMenu from "./FullWidthMenu"; +import MainContext from "@/app/contexts/mainContext"; +import DynamicNavbar from "../dynamic-navbar/dynamicNavbar"; +import SearchComponent from "../search/searchComponent"; +import { useCurrency } from "@/app/contexts/currencyContext"; +import CurrencySelect from "../dynamic-navbar/currencySelect"; +import Image from "next/image"; const Navbar = () => { - const [isOpen, setIsOpen] = useState(false) - const [isScrolled, setIsScrolled] = useState(false) - const [isMounted, setIsMounted] = useState(false) - const { token } = useContext(MainContext) - const toggleMenu = () => setIsOpen(!isOpen) - const { selectedCurrency, setSelectedCurrency, SUPPORTED_CURRENCIES } = useCurrency() + const [isOpen, setIsOpen] = useState(false); + const [isScrolled, setIsScrolled] = useState(false); + const [isMounted, setIsMounted] = useState(false); + const { token } = useContext(MainContext); + const toggleMenu = () => setIsOpen(!isOpen); + const { selectedCurrency, setSelectedCurrency, SUPPORTED_CURRENCIES } = + useCurrency(); useEffect(() => { - setIsMounted(true) + setIsMounted(true); const handleScroll = () => { - setIsScrolled(window.scrollY > 60) - } + setIsScrolled(window.scrollY > 60); + }; - window.addEventListener("scroll", handleScroll) - return () => window.removeEventListener("scroll", handleScroll) - }, []) + window.addEventListener("scroll", handleScroll); + return () => window.removeEventListener("scroll", handleScroll); + }, []); if (!isMounted) { - return null // or a loading placeholder + return null; // or a loading placeholder } return ( @@ -42,10 +46,20 @@ const Navbar = () => {
- Logo + Logo
@@ -66,9 +80,9 @@ const Navbar = () => {
- + -
+
{token ? ( @@ -103,12 +117,15 @@ const Navbar = () => { )} - +
- ) -} - -export default Navbar + ); +}; +export default Navbar; diff --git a/components/hero-page/HeroSix.jsx b/components/hero-page/HeroSix.jsx index 0458e10..d6ecc97 100644 --- a/components/hero-page/HeroSix.jsx +++ b/components/hero-page/HeroSix.jsx @@ -8,7 +8,7 @@ import { backendUrl } from "@/utils/axios"; const HeroSix = ({ guranteeData, data }) => { console.log(data); - const { heading2, description2, heading9, description6 } = data | {}; + const { heading2, description2, header9, description6 } = data || {}; return (
@@ -29,7 +29,7 @@ const HeroSix = ({ guranteeData, data }) => { diff --git a/components/products/RelatedProductCards.jsx b/components/products/RelatedProductCards.jsx index 04812dc..c68b7ae 100644 --- a/components/products/RelatedProductCards.jsx +++ b/components/products/RelatedProductCards.jsx @@ -30,7 +30,7 @@ const RelatedProductCards = ({ productId }) => { You may also like
-
+
{relatedProducts.map((product) => (
{
{`Logo {

- {product.title} + {product.product_name}

diff --git a/components/search/searchComponent.jsx b/components/search/searchComponent.jsx index 388b737..22c39d7 100644 --- a/components/search/searchComponent.jsx +++ b/components/search/searchComponent.jsx @@ -102,11 +102,11 @@ const SearchComponent = ({ isScrolled }) => {
{product.images?.[0] && ( {product.product_name} )} {product.product_name} @@ -130,7 +130,7 @@ const SearchComponent = ({ isScrolled }) => { {isExpanded && ( -
+
diff --git a/components/sliders/SliderTwo.jsx b/components/sliders/SliderTwo.jsx index 4c9356d..89fedf5 100644 --- a/components/sliders/SliderTwo.jsx +++ b/components/sliders/SliderTwo.jsx @@ -43,7 +43,7 @@ const EnhancedSlider = () => { Best-Selling {catData.category?.category_name} @@ -58,20 +58,20 @@ const EnhancedSlider = () => { opts={{ align: "start", }} - className="w-full" + className="w-full " > - + {catData.products?.map((product, idx) => ( -
+