Merge version_19_1781008368669 into main

Merge version_19_1781008368669 into main

src/pages/HomePage/sections/About.tsx

@@ -18,79 +18,33 @@ type AboutFeaturesSplitProps = {
 
 const AboutInline = () => {
   return (
-    <section aria-label="About section" className="py-20">
-      <div className="flex flex-col gap-8 md:gap-10 mx-auto w-content-width">
-        <div className="flex flex-col items-center gap-2">
-          <div className="px-3 py-1 mb-1 text-sm card rounded w-fit">
-            <p>{"Our Story"}</p>
-          </div>
-
-          <TextAnimation
-            text={"Crafting Joy, One Bake at a Time"}
-            variant="slide-up"
-            gradientText={true}
-            tag="h2"
-            className="md:max-w-8/10 text-6xl 2xl:text-7xl leading-[1.15] font-semibold text-center text-balance"
-          />
-
-          <TextAnimation
-            text={"At Sweet Delights Bakery, we believe in the magic of fresh ingredients and traditional techniques. Every pastry, cake, and bread is baked with passion and precision, ensuring a delightful experience with every bite. From our family kitchen to your table, we bring you the taste of homemade perfection."}
-            variant="slide-up"
-            gradientText={false}
-            tag="p"
-            className="md:max-w-7/10 text-lg md:text-xl leading-snug text-center text-balance"
-          />
-
-          {(undefined || undefined) && (
-            <div className="flex flex-wrap justify-center gap-3 mt-2 md:mt-3">
-              {undefined && <Button text={undefined.text} href={undefined.href} variant="primary"/>}
-              {undefined && <Button text={undefined.text} href={undefined.href} variant="secondary"animationDelay={0.1} />}
-            </div>
-          )}
-        </div>
-
-        <div className="flex flex-col md:flex-row md:items-stretch gap-5">
-          <div className="flex flex-col justify-center gap-4 xl:gap-5 2xl:gap-6 p-6 xl:p-7 2xl:p-8 w-full md:w-4/10 2xl:w-35/100 card rounded">
-            {[{"icon":Wheat,"title":"Premium Ingredients","description":"Sourced locally and globally for the finest quality and flavor."},{"icon":Heart,"title":"Handcrafted with Love","description":"Each item is carefully prepared by our skilled bakers."},{"icon":Truck,"title":"Convenient Delivery","description":"Freshness brought directly to your home or office."}].map((item, index) => {
-              const ItemIcon = resolveIcon(item.icon);
-              return (
-              <div key={item.title}>
-                <div className="flex flex-col gap-2">
-                  <div className="flex items-center justify-center shrink-0 mb-1 size-10 primary-button rounded">
-                    <ItemIcon className="h-2/5 w-2/5 text-primary-cta-text" strokeWidth={1.5} />
-                  </div>
-                  <h3 className="text-2xl font-semibold">{item.title}</h3>
-                  <p className="text-base leading-snug">{item.description}</p>
-                </div>
-                {index < [{"icon":Wheat,"title":"Premium Ingredients","description":"Sourced locally and globally for the finest quality and flavor."},{"icon":Heart,"title":"Handcrafted with Love","description":"Each item is carefully prepared by our skilled bakers."},{"icon":Truck,"title":"Convenient Delivery","description":"Freshness brought directly to your home or office."}].length - 1 && (
-                  <div className="mt-4 xl:mt-5 2xl:mt-6 border-b border-accent/40" />
-                )}
-              </div>
-              );
-            })}
-          </div>
-
-          <div className="p-px w-full md:w-6/10 2xl:w-7/10 h-80 md:h-auto card rounded overflow-hidden">
-            <div className="relative size-full">
-              <div className="absolute top-4 right-4 z-10 bg-background/90 backdrop-blur-sm px-4 py-2 rounded shadow-lg flex flex-col items-center border border-border">
-              <span className="text-xs font-semibold uppercase tracking-wider text-muted-foreground mb-1">Discount Ends In</span>
-              <div className="text-xl font-bold text-primary-cta flex items-center gap-1">
-                <span>05</span>:<span>00</span>
-              </div>
-            </div>
-            <ImageOrVideo imageSrc={"http://img.b2bpic.net/free-photo/close-up-baker-hands-kneading-dough_23-2148302953.jpg"} className="absolute inset-0 object-cover rounded" />
-            </div>
-          </div>
-        </div>
-      </div>
-    </section>
-  );
-};
-
-export default function AboutSection() {
-  return (
-    <div data-webild-section="about" id="about">
-      <AboutInline />
+    <section data-webild-section="about" className="py-24 bg-background">
+  <div className="mx-auto w-content-width flex flex-col md:flex-row items-center gap-12">
+    <div className="w-full md:w-1/2">
+      <ImageOrVideo 
+        imageSrc="https://picsum.photos/seed/297971575/1200/800" 
+        className="w-full h-[400px] md:h-[500px] object-cover rounded-theme" 
+      />
     </div>
+    <div className="w-full md:w-1/2 flex flex-col gap-6">
+      <div className="px-3 py-1 text-sm card rounded w-fit">
+        <p>Our Story</p>
+      </div>
+      <TextAnimation
+        text="Crafting Joy, One Bake at a Time"
+        variant="slide-up"
+        gradientText={false}
+        tag="h2"
+        className="text-5xl md:text-6xl font-bold leading-tight"
+      />
+      <p className="text-lg text-muted-foreground">
+        At Sweet Delights Bakery, we believe in the magic of fresh ingredients and traditional techniques. Every pastry, cake, and bread is baked with passion and precision, ensuring a delightful experience with every bite. From our family kitchen to your table, we bring you the taste of homemade perfection.
+      </p>
+      <div className="mt-4">
+        <Button text="Learn More" variant="primary" />
+      </div>
+    </div>
+  </div>
+</section>
   );
 }

src/pages/HomePage/sections/Hero.tsx

@@ -1,24 +1,114 @@
-// AUTO-GENERATED by per-section-migrate. Edit freely — Bob will treat this
-// file as the canonical source for the "hero" section.
+/* eslint-disable */
+// @ts-nocheck — generated by catalog-eject; runtime-correct but TS strict-mode false-positives on inlined catalog body
+import Button from "@/components/ui/Button";
+import HeroBackgroundSlot from "@/components/ui/HeroBackgroundSlot";
+import TextAnimation from "@/components/ui/TextAnimation";
+import ImageOrVideo from "@/components/ui/ImageOrVideo";
 
-import React from 'react';
-import HeroBrand from '@/components/sections/hero/HeroBrand';
-import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
+import Carousel from "@/components/ui/Carousel";
+
+const primaryButton = {
+  text: "Start Your Order",
+  href: "#contact"
+};
+const secondaryButton = {
+  href: "#products",
+  text: "View Our Menu"
+};
+const leftItems = [
+  {
+    imageSrc: "http://img.b2bpic.net/free-photo/overhead-view-baked-chocolate-cakes-with-spoon-clothes-wooden-backdrop_23-2148087027.jpg?_wi=1"
+  },
+  {
+    imageSrc: "https://picsum.photos/seed/952460365/1200/800"
+  }
+];
+const rightItems = [
+  {
+    imageSrc: "https://picsum.photos/seed/1804074766/1200/800"
+  },
+  {
+    imageSrc: "http://img.b2bpic.net/free-photo/overhead-view-baked-chocolate-cakes-with-spoon-clothes-wooden-backdrop_23-2148087027.jpg?_wi=2"
+  }
+];
+
+type HeroSplitVerticalMarqueeProps = {
+  tag: string;
+  title: string;
+  description: string;
+  primaryButton: { text: string; href: string };
+  secondaryButton: { text: string; href: string };
+  leftItems: ({ imageSrc: string; videoSrc?: never } | { videoSrc: string; imageSrc?: never })[];
+  rightItems: ({ imageSrc: string; videoSrc?: never } | { videoSrc: string; imageSrc?: never })[];
+};
+
+const HeroInline = () => {
+  const duplicatedLeft = [...leftItems, ...leftItems, ...leftItems, ...leftItems];
+  const duplicatedRight = [...rightItems, ...rightItems, ...rightItems, ...rightItems];
 
-export default function HeroSection(): React.JSX.Element {
   return (
-    <div id="hero" data-section="hero">
-        <SectionErrorBoundary name="hero">
-              <HeroBrand
-          brand="Indulge in Artisan Pastries Delivered Fresh to Your Door"
-          description="Artisan pastries, custom cakes, and daily favorites made with premium ingredients. Order online for pickup or delivery today."
-          primaryButton={{
-            text: "Start Your Order",        href: "#contact"}}
-          secondaryButton={{
-            text: "View Our Menu",        href: "#products"}}
-          imageSrc="http://img.b2bpic.net/free-photo/overhead-view-baked-chocolate-cakes-with-spoon-clothes-wooden-backdrop_23-2148087027.jpg"
-        />
-        </SectionErrorBoundary>
+    <section aria-label="Hero section" className="relative flex items-center h-fit md:h-svh pt-25 pb-20 md:py-0">
+      <HeroBackgroundSlot />
+      <div className="flex flex-col md:flex-row items-center gap-12 md:gap-20 w-content-width mx-auto">
+        <div className="w-full md:w-1/2">
+          <div className="flex flex-col items-center md:items-start gap-3">
+            <div className="px-3 py-1 mb-1 text-sm card rounded w-fit">
+              <p>{"Artisan Bakery"}</p>
+            </div>
+
+            <TextAnimation
+              text={"Indulge in Artisan Pastries Delivered Fresh to Your Door"}
+              variant="slide-up"
+              gradientText={true}
+              tag="h1"
+              className="text-7xl 2xl:text-8xl leading-[1.15] font-semibold text-center md:text-left text-balance"
+            />
+
+            <TextAnimation
+              text={"Artisan pastries, custom cakes, and daily favorites made with premium ingredients. Order online for pickup or delivery today."}
+              variant="slide-up"
+              gradientText={false}
+              tag="p"
+              className="md:max-w-8/10 text-lg md:text-xl leading-snug text-center md:text-left text-balance"
+            />
+
+            <div className="flex flex-wrap max-md:justify-center gap-3 mt-2 md:mt-3">
+              <Button text={primaryButton.text} href={primaryButton.href} variant="primary"/>
+              <Button text={secondaryButton.text} href={secondaryButton.href} variant="secondary"animationDelay={0.1} />
+            </div>
+          </div>
+        </div>
+
+        <div className="w-full md:w-1/2 h-100 md:h-[75vh] flex gap-2 xl:gap-3 2xl:gap-4 overflow-hidden">
+          <div className="flex-1 overflow-hidden mask-fade-y-medium">
+            <div className="flex flex-col gap-2 xl:gap-3 2xl:gap-4 animate-marquee-vertical">
+              {duplicatedLeft.map((item, index) => (
+                <div key={index} className="shrink-0 aspect-square p-2 xl:p-3 2xl:p-4 card rounded overflow-hidden">
+                  <ImageOrVideo imageSrc={item.imageSrc} videoSrc={item.videoSrc} />
+                </div>
+              ))}
+            </div>
+          </div>
+
+          <div className="flex-1 overflow-hidden mask-fade-y-medium">
+            <div className="flex flex-col gap-2 xl:gap-3 2xl:gap-4 animate-marquee-vertical-reverse">
+              {duplicatedRight.map((item, index) => (
+                <div key={index} className="shrink-0 aspect-square p-2 xl:p-3 2xl:p-4 card rounded overflow-hidden">
+                  <ImageOrVideo imageSrc={item.imageSrc} videoSrc={item.videoSrc} />
+                </div>
+              ))}
+            </div>
+          </div>
+        </div>
       </div>
+    </section>
+  );
+};
+
+export default function HeroSection() {
+  return (
+    <div data-webild-section="hero" id="hero">
+      <HeroInline />
+    </div>
   );
 }