Update src/app/shop/page.tsx

Merge version_2 into main

src/app/blog/page.tsx

@@ -30,6 +30,7 @@ export default function BlogPage() {
             headingFontWeight="light"
         >
             <ReactLenis root>
+                <div id="nav" data-section="nav">
                     <NavbarStyleFullscreen
                         navItems={[
                             { name: "Home", id: "/" },
@@ -42,6 +43,7 @@ export default function BlogPage() {
                         bottomLeftText="Experience the Beauty"
                         bottomRightText="hello@angola.com"
                     />
+                </div>
 
                 <main>
                     {isLoading ? (
@@ -61,6 +63,7 @@ export default function BlogPage() {
                     )}
                 </main>
 
+                <div id="footer" data-section="footer">
                     <FooterMedia
                         imageSrc="http://img.b2bpic.net/free-photo/beautiful-decoration-cute-little-dried-colorful-flowers-wallpaper_343596-3238.jpg?_wi=2"
                         imageAlt="Soft, blurred pastel flowers in a tranquil setting"
@@ -75,7 +78,6 @@ export default function BlogPage() {
                             {
                                 title: "Company",                                items: [
                                     { label: "About Us", href: "/#about" },
-                                { label: "FAQ", href: "/#faq" },
                                     { label: "Contact", href: "/#contact" },
                                 ],
                             },
@@ -89,6 +91,7 @@ export default function BlogPage() {
                         logoText="Angola"
                         copyrightText="© 2024 Angola Flowers Studio. All rights reserved."
                     />
+                </div>
             </ReactLenis>
         </ThemeProvider>
     );

src/app/page.tsx

@@ -6,7 +6,6 @@ import HeroCarouselLogo from '@/components/sections/hero/heroCarouselLogo/HeroCa
 import TextSplitAbout from '@/components/sections/about/TextSplitAbout';
 import ProductCardFour from '@/components/sections/product/ProductCardFour';
 import TestimonialCardFifteen from '@/components/sections/testimonial/TestimonialCardFifteen';
-import FaqBase from '@/components/sections/faq/FaqBase';
 import ContactSplitForm from '@/components/sections/contact/ContactSplitForm';
 import FooterMedia from '@/components/sections/footer/FooterMedia';
 
@@ -111,26 +110,6 @@ export default function LandingPage() {
         />
       </div>
 
-      <div id="faq" data-section="faq">
-        <FaqBase
-          title="Frequently Asked Questions"
-          description="Find answers to common questions about our services, flower care, and ordering process."
-          faqs={[
-            {
-              id: "1",              title: "What is your delivery policy?",              content: "We offer local delivery within a 20-mile radius of our studio. Same-day delivery is available for orders placed before 12 PM local time, Monday-Saturday."},
-            {
-              id: "2",              title: "How do I care for my fresh flowers?",              content: "For optimal freshness, trim stems at an angle, change water daily, and keep flowers away from direct sunlight and heat sources. A packet of flower food is included with every order."},
-            {
-              id: "3",              title: "Can I request a custom bouquet?",              content: "Absolutely! We specialize in custom designs. Please contact us directly to discuss your vision, preferred flowers, colors, and budget. We'd love to bring your unique floral ideas to life."},
-            {
-              id: "4",              title: "What payment methods do you accept?",              content: "We accept all major credit cards (Visa, Mastercard, Amex), PayPal, and Apple Pay for online orders. In-studio purchases can also be made with cash."},
-          ]}
-          textboxLayout="default"
-          useInvertedBackground={false}
-          faqsAnimation="slide-up"
-        />
-      </div>
-
       <div id="contact" data-section="contact">
         <ContactSplitForm
           title="Get in Touch with Our Floral Experts"
@@ -167,7 +146,6 @@ export default function LandingPage() {
             {
               title: "Company",              items: [
                 { label: "About Us", href: "/#about" },
-                { label: "FAQ", href: "/#faq" },
                 { label: "Contact", href: "/#contact" },
               ],
             },

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

@@ -89,7 +89,7 @@ function ProductPageContent({ params }: ProductPageProps) {
                 headingFontWeight="light"
             >
                 <ReactLenis root>
-                    <div id="navbar" data-section="navbar">
+                    <div id="nav" data-section="nav">
                     <NavbarStyleFullscreen
                         navItems={[
                             { name: "Home", id: "/" },
@@ -129,7 +129,7 @@ function ProductPageContent({ params }: ProductPageProps) {
                 headingFontWeight="light"
             >
                 <ReactLenis root>
-                    <div id="navbar" data-section="navbar">
+                    <div id="nav" data-section="nav">
                         <NavbarStyleFullscreen
                             navItems={[
                                 { name: "Home", id: "/" },
@@ -176,7 +176,7 @@ function ProductPageContent({ params }: ProductPageProps) {
             headingFontWeight="light"
         >
             <ReactLenis root>
-                <div id="navbar" data-section="navbar">
+                <div id="nav" data-section="nav">
                     <NavbarStyleFullscreen
                         navItems={[
                             { name: "Home", id: "/" },
@@ -191,6 +191,7 @@ function ProductPageContent({ params }: ProductPageProps) {
                         button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                     />
                 </div>
+                <main>
                   <div id="product-detail-card" data-section="product-detail-card">
                       <ProductDetailCard
                           layout="page"
@@ -235,7 +236,6 @@ function ProductPageContent({ params }: ProductPageProps) {
                              { title: "Shop", items: [{ label: "Bouquets", href: "/shop" }, { label: "Arrangements", href: "/shop" }, { label: "Custom Orders", href: "/#contact" }] },
                              { title: "Company", items: [
                               { label: "About Us", href: "/#about" },
-                            { label: "FAQ", href: "/#faq" },
                               { label: "Contact", href: "/#contact" }
                              ] },
                              { title: "Connect", items: [{ label: "Instagram", href: "https://instagram.com/angola_flowers" }, { label: "Facebook", href: "https://facebook.com/angola_flowers" }] }
@@ -244,6 +244,7 @@ function ProductPageContent({ params }: ProductPageProps) {
                           copyrightText="© 2024 Angola Flowers Studio. All rights reserved."
                       />
                   </div>
+                </main>
             </ReactLenis>
         </ThemeProvider>
     );

src/app/shop/page.tsx

@@ -32,7 +32,7 @@ function ShopPageContent() {
                 headingFontWeight="light"
             >
                 <ReactLenis root>
-                    <div id="navbar" data-section="navbar">
+                    <div id="nav" data-section="nav">
                     <NavbarStyleFullscreen
                         navItems={[
                             { name: "Home", id: "/" },
@@ -71,7 +71,7 @@ function ShopPageContent() {
             headingFontWeight="light"
         >
             <ReactLenis root>
-                <div id="navbar" data-section="navbar">
+                <div id="nav" data-section="nav">
                     <NavbarStyleFullscreen
                         navItems={[
                             { name: "Home", id: "/" },
@@ -86,6 +86,7 @@ function ShopPageContent() {
                         button={{ text: "Cart", onClick: () => {} }}
                     />
                 </div>
+                <main>
                   <div id="product-catalog" data-section="product-catalog">
                     <ProductCatalog
                         layout="page"
@@ -105,7 +106,6 @@ function ShopPageContent() {
                              { title: "Shop", items: [{ label: "Bouquets", href: "/shop" }, { label: "Arrangements", href: "/shop" }, { label: "Custom Orders", href: "/#contact" }] },
                              { title: "Company", items: [
                               { label: "About Us", href: "/#about" },
-                            { label: "FAQ", href: "/#faq" },
                               { label: "Contact", href: "/#contact" }
                              ] },
                              { title: "Connect", items: [{ label: "Instagram", href: "https://instagram.com/angola_flowers" }, { label: "Facebook", href: "https://facebook.com/angola_flowers" }] }
@@ -114,6 +114,7 @@ function ShopPageContent() {
                           copyrightText="© 2024 Angola Flowers Studio. All rights reserved."
                       />
                   </div>
+                </main>
             </ReactLenis>
         </ThemeProvider>
     );