Merge version_1 into main

Merge version_1 into main

src/app/about/page.tsx

@@ -7,7 +7,7 @@ import LegalSection from '@/components/legal/LegalSection';
 import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
 import TextAbout from '@/components/sections/about/TextAbout';
 
-export default function LandingPage() {
+export default function AboutPage() {
   return (
     <ThemeProvider
         defaultButtonVariant="expand-hover"
@@ -25,30 +25,12 @@ export default function LandingPage() {
   <div id="nav" data-section="nav">
       <NavbarStyleApple
       navItems={[
-        {
+        { name: "Home", id: "/" },
-          name: "Home",
+        { name: "About", id: "/about" },
-          id: "/",
+        { name: "Coffee", id: "/menu" },
-        },
+        { name: "Roastery", id: "/academy" },
-        {
+        { name: "Reviews", id: "/reviews" },
-          name: "About",
+        { name: "Contact", id: "/contact" },
-          id: "/about",
-        },
-        {
-          name: "Coffee",
-          id: "/menu",
-        },
-        {
-          name: "Roastery",
-          id: "/academy",
-        },
-        {
-          name: "Reviews",
-          id: "/reviews",
-        },
-        {
-          name: "Contact",
-          id: "/contact",
-        },
       ]}
       brandName="Roastery Lab"
     />
@@ -66,13 +48,7 @@ export default function LandingPage() {
       layout="section"
       title="Our Roasting Standards"
       sections={[
-        {
+        { heading: "Sourcing", content: { type: "paragraph", text: "We source direct from farmers." } },
-          heading: "Sourcing",
-          content: {
-            type: "paragraph",
-            text: "We source direct from farmers.",
-          },
-        },
       ]}
     />
   </div>
@@ -80,17 +56,11 @@ export default function LandingPage() {
   <div id="footer" data-section="footer">
       <FooterLogoReveal
       logoText="Roastery Lab"
-      leftLink={{
+      leftLink={{ text: "Privacy Policy", href: "#" }}
-        text: "Privacy Policy",
+      rightLink={{ text: "Instagram", href: "#" }}
-        href: "#",
-      }}
-      rightLink={{
-        text: "Instagram",
-        href: "#",
-      }}
     />
   </div>
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}

src/app/academy/page.tsx

@@ -7,7 +7,7 @@ import FeatureCardTen from '@/components/sections/feature/FeatureCardTen';
 import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
 import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
 
-export default function LandingPage() {
+export default function AcademyPage() {
   return (
     <ThemeProvider
         defaultButtonVariant="expand-hover"
@@ -25,30 +25,12 @@ export default function LandingPage() {
   <div id="nav" data-section="nav">
       <NavbarStyleApple
       navItems={[
-        {
+        { name: "Home", id: "/" },
-          name: "Home",
+        { name: "About", id: "/about" },
-          id: "/",
+        { name: "Coffee", id: "/menu" },
-        },
+        { name: "Roastery", id: "/academy" },
-        {
+        { name: "Reviews", id: "/reviews" },
-          name: "About",
+        { name: "Contact", id: "/contact" },
-          id: "/about",
-        },
-        {
-          name: "Coffee",
-          id: "/menu",
-        },
-        {
-          name: "Roastery",
-          id: "/academy",
-        },
-        {
-          name: "Reviews",
-          id: "/reviews",
-        },
-        {
-          name: "Contact",
-          id: "/contact",
-        },
       ]}
       brandName="Roastery Lab"
     />
@@ -61,26 +43,14 @@ export default function LandingPage() {
       useInvertedBackground={true}
       features={[
         {
-          title: "Roasting",
+          title: "Roasting",          description: "Understand the science behind roasting profiles.",          media: { imageSrc: "http://img.b2bpic.net/free-photo/close-up-coffee-background_23-2147776809.jpg", imageAlt: "industrial coffee roasting machine" },
-          description: "Understand the science behind roasting profiles.",
-          media: {
-            imageSrc: "http://img.b2bpic.net/free-photo/top-view-buckwheats-food-shovels-alongside-them-horizontal_176474-2387.jpg",
-          },
           items: [],
           reverse: false,
-          imageSrc: "http://img.b2bpic.net/free-photo/close-up-coffee-background_23-2147776809.jpg?_wi=2",
-          imageAlt: "industrial coffee roasting machine",
         },
         {
-          title: "Brewing",
+          title: "Brewing",          description: "Hands-on experience with advanced drippers.",          media: { imageSrc: "http://img.b2bpic.net/free-photo/male-barista-pouring-water-coffee-filter_23-2148824415.jpg", imageAlt: "industrial coffee roasting machine" },
-          description: "Hands-on experience with advanced drippers.",
-          media: {
-            imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-plus-size-man-working-as-barista_23-2150754673.jpg",
-          },
           items: [],
           reverse: true,
-          imageSrc: "http://img.b2bpic.net/free-photo/male-barista-pouring-water-coffee-filter_23-2148824415.jpg?_wi=2",
-          imageAlt: "industrial coffee roasting machine",
         },
       ]}
       title="Learn Coffee With Us"
@@ -97,30 +67,18 @@ export default function LandingPage() {
       imageSrc="http://img.b2bpic.net/free-photo/medium-shot-man-cleaning-machine_23-2149149677.jpg"
       mediaAnimation="slide-up"
       faqsAnimation="slide-up"
-      faqs={[
+      faqs={[{ id: "1", title: "Do I need experience?", content: "No, beginners welcome." }]}
-        {
-          id: "1",
-          title: "Do I need experience?",
-          content: "No, beginners welcome.",
-        },
-      ]}
     />
   </div>
 
   <div id="footer" data-section="footer">
       <FooterLogoReveal
       logoText="Roastery Lab"
-      leftLink={{
+      leftLink={{ text: "Privacy Policy", href: "#" }}
-        text: "Privacy Policy",
+      rightLink={{ text: "Instagram", href: "#" }}
-        href: "#",
-      }}
-      rightLink={{
-        text: "Instagram",
-        href: "#",
-      }}
     />
   </div>
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}

src/app/page.tsx

@@ -28,30 +28,12 @@ export default function LandingPage() {
   <div id="nav" data-section="nav">
       <NavbarStyleApple
       navItems={[
-        {
+        { name: "Home", id: "/" },
-          name: "Home",
+        { name: "About", id: "/about" },
-          id: "/",
+        { name: "Coffee", id: "/menu" },
-        },
+        { name: "Roastery", id: "/academy" },
-        {
+        { name: "Reviews", id: "/reviews" },
-          name: "About",
+        { name: "Contact", id: "/contact" },
-          id: "/about",
-        },
-        {
-          name: "Coffee",
-          id: "/menu",
-        },
-        {
-          name: "Roastery",
-          id: "/academy",
-        },
-        {
-          name: "Reviews",
-          id: "/reviews",
-        },
-        {
-          name: "Contact",
-          id: "/contact",
-        },
       ]}
       brandName="Roastery Lab"
     />
@@ -59,68 +41,27 @@ export default function LandingPage() {
 
   <div id="hero" data-section="hero">
       <HeroBillboard
-      background={{
+      background={{ variant: "gradient-bars" }}
-        variant: "gradient-bars",
-      }}
       title="Crafted for True Coffee Lovers"
       description="Specialty coffee roasted with precision and passion."
-      buttons={[
+      buttons={[{ text: "Explore Coffee", href: "/menu" }, { text: "Visit Us", href: "/contact" }]}
-        {
+      imageSrc="http://img.b2bpic.net/free-photo/close-up-coffee-background_23-2147776809.jpg"
-          text: "Explore Coffee",
-          href: "/menu",
-        },
-        {
-          text: "Visit Us",
-          href: "/contact",
-        },
-      ]}
-      imageSrc="http://img.b2bpic.net/free-photo/close-up-coffee-background_23-2147776809.jpg?_wi=1"
       imageAlt="roasted coffee beans macro"
       mediaAnimation="slide-up"
       avatars={[
-        {
+        { src: "http://img.b2bpic.net/free-photo/fashion-girl-standing-summer-city_1157-20838.jpg", alt: "Customer 1" },
-          src: "http://img.b2bpic.net/free-photo/fashion-girl-standing-summer-city_1157-20838.jpg",
+        { src: "http://img.b2bpic.net/free-photo/business-woman-working-with-smartphone-while-drinking-coffee-outside-city-background-high-quality-photo_291650-846.jpg", alt: "Customer 2" },
-          alt: "Customer 1",
+        { src: "http://img.b2bpic.net/free-photo/medium-shot-smiley-woman-holding-coffee_23-2149429333.jpg", alt: "Customer 3" },
-        },
+        { src: "http://img.b2bpic.net/free-photo/portrait-young-female-photographer-holds-cup-morning_613910-16247.jpg", alt: "Customer 4" },
-        {
+        { src: "http://img.b2bpic.net/free-photo/happy-woman-business-clothes-posing-near-wall-with-coffee-gray_171337-13306.jpg", alt: "Customer 5" },
-          src: "http://img.b2bpic.net/free-photo/business-woman-working-with-smartphone-while-drinking-coffee-outside-city-background-high-quality-photo_291650-846.jpg",
-          alt: "Customer 2",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/medium-shot-smiley-woman-holding-coffee_23-2149429333.jpg",
-          alt: "Customer 3",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/portrait-young-female-photographer-holds-cup-morning_613910-16247.jpg",
-          alt: "Customer 4",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/happy-woman-business-clothes-posing-near-wall-with-coffee-gray_171337-13306.jpg",
-          alt: "Customer 5",
-        },
       ]}
       avatarText="Loved by 500+ coffee enthusiasts"
       marqueeItems={[
-        {
+        { type: "text", text: "Ethically Sourced" },
-          type: "text",
+        { type: "text", text: "Small Batch Roasted" },
-          text: "Ethically Sourced",
+        { type: "text", text: "Precision Brewing" },
-        },
+        { type: "text", text: "Direct Trade" },
-        {
+        { type: "text", text: "Expert Academy" },
-          type: "text",
-          text: "Small Batch Roasted",
-        },
-        {
-          type: "text",
-          text: "Precision Brewing",
-        },
-        {
-          type: "text",
-          text: "Direct Trade",
-        },
-        {
-          type: "text",
-          text: "Expert Academy",
-        },
       ]}
     />
   </div>
@@ -129,17 +70,15 @@ export default function LandingPage() {
       <TextAbout
       useInvertedBackground={false}
       title="Not Just a Café, A Roastery."
-      buttons={[
+      buttons={[{ text: "Learn More", href: "/about" }]}
-        {
-          text: "Learn More",
-          href: "/about",
-        },
-      ]}
     />
   </div>
 
   <div id="blog" data-section="blog">
       <BlogCardOne
+      title="Latest Insights"
+      description="Read our coffee journals."
+      blogs={[]}
       animationType="slide-up"
       textboxLayout="default"
       useInvertedBackground={false}
@@ -147,11 +86,14 @@ export default function LandingPage() {
   </div>
 
   <div id="ecommerce" data-section="ecommerce">
-      <ProductCart />
+      <ProductCart isOpen={false} onClose={() => {}} items={[]} total="0" buttons={[]} />
   </div>
 
   <div id="team" data-section="team">
       <TeamCardTwo
+      title="Our Roasting Team"
+      description="Meet the experts behind your daily cup."
+      members={[]}
       animationType="slide-up"
       textboxLayout="default"
       gridVariant="uniform-all-items-equal"
@@ -162,17 +104,11 @@ export default function LandingPage() {
   <div id="footer" data-section="footer">
       <FooterLogoReveal
       logoText="Roastery Lab"
-      leftLink={{
+      leftLink={{ text: "Privacy Policy", href: "#" }}
-        text: "Privacy Policy",
+      rightLink={{ text: "Instagram", href: "#" }}
-        href: "#",
-      }}
-      rightLink={{
-        text: "Instagram",
-        href: "#",
-      }}
     />
   </div>
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}