Merge version_2 into main

Merge version_2 into main

src/app/blog/page.tsx

@@ -70,4 +70,4 @@ export default function BlogPage() {
             </ReactLenis>
         </ThemeProvider>
     );
-}
+}

src/app/layout.tsx

@@ -431,6 +431,20 @@ export default function RootLayout({
     
     originalContent = element.textContent;
     element.contentEditable = 'true';
+    
+    if (!element.dataset.webildOriginalWhiteSpace) {
+      const computedStyle = window.getComputedStyle(element);
+      element.dataset.webildOriginalWhiteSpace = computedStyle.whiteSpace;
+      element.dataset.webildOriginalWordWrap = computedStyle.wordWrap;
+      element.dataset.webildOriginalOverflowWrap = computedStyle.overflowWrap;
+      element.dataset.webildOriginalOverflow = computedStyle.overflow;
+    }
+    
+    element.style.whiteSpace = 'pre-wrap';
+    element.style.wordWrap = 'break-word';
+    element.style.overflowWrap = 'break-word';
+    element.style.overflow = 'visible';
+    
     element.focus();
     isEditing = true;
     
@@ -540,6 +554,23 @@ export default function RootLayout({
     element.contentEditable = 'false';
     isEditing = false;
     
+    if (element.dataset.webildOriginalWhiteSpace) {
+      element.style.whiteSpace = element.dataset.webildOriginalWhiteSpace === 'normal' ? '' : element.dataset.webildOriginalWhiteSpace;
+      delete element.dataset.webildOriginalWhiteSpace;
+    }
+    if (element.dataset.webildOriginalWordWrap) {
+      element.style.wordWrap = element.dataset.webildOriginalWordWrap === 'normal' ? '' : element.dataset.webildOriginalWordWrap;
+      delete element.dataset.webildOriginalWordWrap;
+    }
+    if (element.dataset.webildOriginalOverflowWrap) {
+      element.style.overflowWrap = element.dataset.webildOriginalOverflowWrap === 'normal' ? '' : element.dataset.webildOriginalOverflowWrap;
+      delete element.dataset.webildOriginalOverflowWrap;
+    }
+    if (element.dataset.webildOriginalOverflow) {
+      element.style.overflow = element.dataset.webildOriginalOverflow === 'visible' ? '' : element.dataset.webildOriginalOverflow;
+      delete element.dataset.webildOriginalOverflow;
+    }
+    
     if (element.dataset.beforeInputHandler === 'true') {
       element.removeEventListener('beforeinput', () => {});
       delete element.dataset.beforeInputHandler;
@@ -845,6 +876,9 @@ export default function RootLayout({
 
   const handleScroll = () => {
     if (!isActive) return;
+    
+    if (isEditing) return;
+    
     if (selectedElement) {
       makeUneditable(selectedElement, false);
       selectedElement.classList.remove(selectedClass);
@@ -1259,4 +1293,4 @@ export default function RootLayout({
       </ServiceWrapper>
     </html>
   );
-}
+}

src/app/page.tsx

@@ -1,8 +1,8 @@
-"use client"
+"use client";
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
-import HeroBillboardRotatedCarousel from '@/components/sections/hero/HeroBillboardRotatedCarousel';
+import HeroCarouselLogo from '@/components/sections/hero/heroCarouselLogo/HeroCarouselLogo';
 import ProductCardOne from '@/components/sections/product/ProductCardOne';
 import AboutMetric from '@/components/sections/about/AboutMetric';
 import FeatureCardSix from '@/components/sections/feature/FeatureCardSix';
@@ -42,40 +42,25 @@ export default function BeachPerfumePage() {
       </div>
 
       <div id="hero" data-section="hero">
-        <HeroBillboardRotatedCarousel
-          title="Discover the Essence of the Coast"
+        <HeroCarouselLogo
+          logoText="Beach"
           description="Luxury fragrances inspired by sun, sand, and sea. Each scent tells a story of coastal elegance and timeless beauty."
-          tag="Premium Collection"
-          tagIcon={Sparkles}
-          tagAnimation="slide-up"
           buttons={[
             { text: "Explore Collection", href: "#products" },
             { text: "Learn More", href: "#about" }
           ]}
-          buttonAnimation="slide-up"
-          background={{ variant: "plain" }}
-          carouselItems={[
+          slides={[
             {
-              id: "carousel-1",              imageSrc: "https://img.b2bpic.net/free-photo/top-view-skincare-product-beach_23-2150167921.jpg",              imageAlt: "Ocean Breeze Perfume"
+              imageSrc: "https://img.b2bpic.net/free-photo/top-view-skincare-product-beach_23-2150167921.jpg",              imageAlt: "Ocean Breeze Perfume"
             },
             {
-              id: "carousel-2",              imageSrc: "https://img.b2bpic.net/free-photo/perfume-bottle-nature_23-2151890497.jpg",              imageAlt: "Coastal Fragrance"
+              imageSrc: "https://img.b2bpic.net/free-photo/perfume-bottle-nature_23-2151890526.jpg",              imageAlt: "Premium Fragrance Collection"
             },
             {
-              id: "carousel-3",              imageSrc: "https://img.b2bpic.net/free-photo/perfume-bottle-nature_23-2151890530.jpg",              imageAlt: "Luxury Perfume Bottle"
-            },
-            {
-              id: "carousel-4",              imageSrc: "https://img.b2bpic.net/free-photo/accessories-sunglasses-perfume-hat-craft-surface_176420-11866.jpg",              imageAlt: "Beach Collection"
-            },
-            {
-              id: "carousel-5",              imageSrc: "https://img.b2bpic.net/free-photo/perfume-bottle-nature_23-2151890498.jpg",              imageAlt: "Premium Fragrance"
-            },
-            {
-              id: "carousel-6",              imageSrc: "https://img.b2bpic.net/free-photo/skin-care-product-sand-ocean_23-2148761469.jpg",              imageAlt: "Coastal Perfume Selection"
+              imageSrc: "https://img.b2bpic.net/free-photo/beach-skincare-product-still-life_23-2150167936.jpg",              imageAlt: "Coastal Mist Perfume"
             }
           ]}
-          autoPlay={true}
-          autoPlayInterval={4000}
+          autoplayDelay={5000}
         />
       </div>
 
@@ -236,4 +221,4 @@ export default function BeachPerfumePage() {
       </div>
     </ThemeProvider>
   );
-}
+}

src/app/shop/[id]/page.tsx

@@ -236,4 +236,4 @@ export default function ProductPage({ params }: ProductPageProps) {
             </ReactLenis>
         </ThemeProvider>
     );
-}
+}

src/app/shop/page.tsx

@@ -113,4 +113,4 @@ export default function ShopPage() {
             </ReactLenis>
         </ThemeProvider>
     );
-}
+}