Update src/app/page.tsx

Merge version_4 into main

src/app/blog/page.tsx

@@ -36,13 +36,15 @@ export default function BlogPage() {
                         brandName="Paw Haven"
                         navItems={[
                             { name: "Home", id: "/" },
-                            { name: "Adopt", id: "adopt" },
+                            { name: "Adopt", id: "/#adopt" },
-                            { name: "About", id: "about" },
+                            { name: "About", id: "/#about" },
-                            { name: "Success", id: "testimonials" },
+                            { name: "Success", id: "/#testimonials" },
-                            { name: "Support", id: "support" },
+                            { name: "Support", id: "/#support" },
-                            { name: "Contact", id: "contact" },
+                            { name: "Blog", id: "/blog" },
+                            { name: "Shop", id: "/shop" },
+                            { name: "Contact", id: "/#contact" }
                         ]}
-                        button={{ text: "Donate", href: "#contact" }}
+                        button={{ text: "Donate", href: "/#contact" }}
                     />
                 </div>
 

src/app/page.tsx

@@ -3,7 +3,7 @@
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
 import ContactCenter from '@/components/sections/contact/ContactCenter';
-import FaqSplitMedia from '@/components/sections/faq/FaqSplitMedia';
+import FaqSplitText from '@/components/sections/faq/FaqSplitText';
 import FeatureCardEight from '@/components/sections/feature/FeatureCardEight';
 import FooterCard from '@/components/sections/footer/FooterCard';
 import HeroPersonalLinks from '@/components/sections/hero/HeroPersonalLinks';
@@ -29,8 +29,17 @@ export default function SitePage() {
       <div id="nav" data-section="nav">
         <NavbarStyleCentered 
           brandName="Paw Haven"
-          navItems={[{name: 'Adopt', id: 'adopt'}, {name: 'About', id: 'about'}, {name: 'Success', id: 'testimonials'}, {name: 'Support', id: 'support'}, {name: 'Contact', id: 'contact'}]}
+          navItems={[
-          button={{text: 'Donate', href: '#contact'}}
+            { name: "Home", id: "/" },
+            { name: "Adopt", id: "/#adopt" },
+            { name: "About", id: "/#about" },
+            { name: "Success", id: "/#testimonials" },
+            { name: "Support", id: "/#support" },
+            { name: "Blog", id: "/blog" },
+            { name: "Shop", id: "/shop" },
+            { name: "Contact", id: "/#contact" }
+          ]}
+          button={{text: 'Donate', href: '/#contact'}}
         />
       </div>
 
@@ -49,7 +58,7 @@ export default function SitePage() {
           title="About Paw Haven: Connecting Hearts and Paws"
           description="At Paw Haven, we believe every animal deserves a second chance at a loving home. We're dedicated to rescuing, rehabilitating, and rehoming abandoned and neglected pets, ensuring they find their forever families."
           tag="Our Mission"
-          imageSrc="https://img.b2bpic.net/free-photo/smiley-woman-spending-time-with-cute-rescue-dogs-shelter_23-2148682966.jpg"
+          imageSrc="https://img.b2bpic.net/free-photo/dogs-locked-up-victims-animal-abuse-abuse_181624-57149.jpg?id=25928428"
           imageAlt="Volunteers caring for pets at Paw Haven shelter"
           buttons={[{text: 'Learn More', href: '#about'}]}
           useInvertedBackground={true}
@@ -82,10 +91,10 @@ export default function SitePage() {
           description="Read inspiring stories from families who found their furry companions at Paw Haven."
           tag="Our Community"
           testimonials={[
-            {id: '1', name: 'Sarah & Tom Davis', role: 'New Pet Parents', testimonial: 'Adopting our dog, Bella, from Paw Haven was the best decision we ever made. She\'s brought so much joy into our lives! The team was incredibly supportive throughout the process.', imageSrc: 'https://img.b2bpic.net/free-photo/woman-playing-with-rescue-dogs-shelter_23-2148682984.jpg', imageAlt: 'Happy couple with adopted dog Bella'},
+            {id: '1', name: 'Sarah & Tom Davis', role: 'New Pet Parents', testimonial: "Adopting our dog, Bella, from Paw Haven was the best decision we ever made. She's brought so much joy into our lives! The team was incredibly supportive throughout the process.", imageSrc: 'https://img.b2bpic.net/free-photo/woman-playing-with-rescue-dogs-shelter_23-2148682984.jpg', imageAlt: 'Happy couple with adopted dog Bella'},
-            {id: '2', name: 'Emily Rodriguez', role: 'Cat Lover', testimonial: 'Our cat, Whiskers, found her forever home with us thanks to Paw Haven. She\'s the most affectionate cat, and we couldn\'t imagine life without her. Thank you for your amazing work!', imageSrc: 'https://img.b2bpic.net/free-photo/medium-shot-smiley-women-with-cute-rabbit_23-2149514560.jpg', imageAlt: 'Child playing with adopted cat Whiskers'},
+            {id: '2', name: 'Emily Rodriguez', role: 'Cat Lover', testimonial: "Our cat, Whiskers, found her forever home with us thanks to Paw Haven. She's the most affectionate cat, and we couldn't imagine life without her. Thank you for your amazing work!", imageSrc: 'https://img.b2bpic.net/free-photo/medium-shot-smiley-women-with-cute-rabbit_23-2149514560.jpg', imageAlt: 'Child playing with adopted cat Whiskers'},
             {id: '3', name: 'Mark & Lisa Chen', role: 'Rescue Advocates', testimonial: 'We adopted our senior dog, Charlie, from Paw Haven. Despite his age, he\'s full of life and love. The shelter\'s dedication to older pets is truly remarkable. Highly recommend!', imageSrc: 'https://img.b2bpic.net/free-photo/happy-family-feeding-horse-stable_23-2147562174.jpg', imageAlt: 'Elderly person with adopted dog Charlie'},
-            {id: '4', name: 'Jessica & David Lee', role: 'Multi-Pet Family', testimonial: 'Paw Haven helped us grow our family by two. Their staff ensured a smooth adoption process for both our dog and cat. We\'re so grateful for their commitment to animal welfare.', imageSrc: 'https://img.b2bpic.net/free-photo/women-shelter-playing-with-cute-rescue-dogs_23-2148682939.jpg', imageAlt: 'Family with multiple adopted pets'}
+            {id: '4', name: 'Jessica & David Lee', role: 'Multi-Pet Family', testimonial: "Paw Haven helped us grow our family by two. Their staff ensured a smooth adoption process for both our dog and cat. We're so grateful for their commitment to animal welfare.", imageSrc: 'https://img.b2bpic.net/free-photo/women-shelter-playing-with-cute-rescue-dogs_23-2148682939.jpg', imageAlt: 'Family with multiple adopted pets'}
           ]}
           textboxLayout="default"
           animationType="slide-up"
@@ -101,7 +110,7 @@ export default function SitePage() {
           features={[
             {id: 1, title: 'Adopt a Pet', description: 'Give a loving animal a forever home and experience unconditional love.', imageSrc: 'https://img.b2bpic.net/free-photo/pretty-girl-embarcing-cat-dog_8353-5281.jpg', imageAlt: 'Happy dog'},
             {id: 2, title: 'Make a Donation', description: 'Your financial support helps cover medical care, food, and shelter for our residents.', imageSrc: 'https://img.b2bpic.net/free-photo/happy-asian-woman-posing-with-small-pet-dog-home_1098-20160.jpg', imageAlt: 'Friendly cat'},
-            {id: 3, title: 'Volunteer Your Time', description: 'Dedicate your time to walk dogs, play with cats, or assist with daily shelter operations.', imageSrc: 'https://img.b2bpic.net/free-photo/smiley-woman-spending-time-with-cute-rescue-dogs-shelter_23-2148682966.jpg', imageAlt: 'Volunteer with pets'},
+            {id: 3, title: 'Volunteer Your Time', description: 'Dedicate your time to walk dogs, play with cats, or assist with daily shelter operations.', imageSrc: 'https://img.b2bpic.net/free-photo/dogs-locked-up-victims-animal-abuse-abuse_181624-57149.jpg?id=25928428', imageAlt: 'Volunteer with pets'},
             {id: 4, title: 'Foster an Animal', description: 'Provide a temporary home for a pet, giving them a comfortable environment before adoption.', imageSrc: 'https://img.b2bpic.net/free-photo/two-stylish-girls-sunny-field-with-dogs_1157-34702.jpg', imageAlt: 'Dog in home'}
           ]}
           textboxLayout="default"
@@ -110,24 +119,20 @@ export default function SitePage() {
       </div>
 
       <div id="faq" data-section="faq">
-        <FaqSplitMedia 
+        <FaqSplitText 
-          title="Frequently Asked Questions"
+          sideTitle="Frequently Asked Questions"
-          description="Find answers to common questions about adoption, volunteering, and supporting Paw Haven."
+          sideDescription="Find answers to common questions about adoption, volunteering, and supporting Paw Haven."
-          tag="Help Center"
           faqs={[
             {id: '1', title: 'What is the adoption process?', content: 'Our adoption process typically involves an application, a meet-and-greet with the pet, and a home visit to ensure a good match. Our team will guide you through every step.'},
-            {id: '2', title: 'How can I volunteer?', content: 'We welcome volunteers! You can fill out a volunteer application on our website, and we\'ll connect you with opportunities like dog walking, cat socialization, or event support.'},
+            {id: '2', title: 'How can I volunteer?', content: "We welcome volunteers! You can fill out a volunteer application on our website, and we'll connect you with opportunities like dog walking, cat socialization, or event support."},
-            {id: '3', title: 'What types of donations do you accept?', content: 'We gratefully accept monetary donations, pet food, blankets, toys, and other supplies. Visit our \'Donate\' section for a full list of needed items.'},
+            {id: '3', title: 'What types of donations do you accept?', content: "We gratefully accept monetary donations, pet food, blankets, toys, and other supplies. Visit our 'Donate' section for a full list of needed items."},
             {id: '4', title: 'Can I foster an animal?', content: 'Yes, fostering is a wonderful way to help! We provide all necessary supplies and medical care for foster animals. Contact us to learn more about becoming a foster parent.'},
             {id: '5', title: 'Do you offer pet surrender services?', content: 'We understand that circumstances can change. Please contact us directly to discuss our surrender policy and available resources.'}
           ]}
-          imageSrc="https://img.b2bpic.net/free-photo/two-stylish-girls-sunny-field-with-dogs_1157-34698.jpg"
-          imageAlt="Curious puppy looking up"
-          mediaPosition="left"
-          mediaAnimation="slide-up"
           faqsAnimation="slide-up"
-          textboxLayout="default"
+          textPosition="left"
           useInvertedBackground={false}
+          animationType="smooth"
         />
       </div>
 
@@ -154,4 +159,4 @@ export default function SitePage() {
       </div>
     </ThemeProvider>
   );
-}
+}

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

@@ -85,7 +85,16 @@ export default function ProductPage({ params }: ProductPageProps) {
                     <div id="navbar" data-section="navbar">
                         <NavbarStyleCentered
                             brandName="Paw Haven"
-                            navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
+                            navItems={[
+                                { name: "Home", id: "/" },
+                                { name: "Adopt", id: "/#adopt" },
+                                { name: "About", id: "/#about" },
+                                { name: "Success", id: "/#testimonials" },
+                                { name: "Support", id: "/#support" },
+                                { name: "Blog", id: "/blog" },
+                                { name: "Shop", id: "/shop" },
+                                { name: "Contact", id: "/#contact" }
+                            ]}
                             button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                         />
                     </div>
@@ -129,7 +138,16 @@ export default function ProductPage({ params }: ProductPageProps) {
                     <div id="navbar" data-section="navbar">
                         <NavbarStyleCentered
                             brandName="Paw Haven"
-                            navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
+                            navItems={[
+                                { name: "Home", id: "/" },
+                                { name: "Adopt", id: "/#adopt" },
+                                { name: "About", id: "/#about" },
+                                { name: "Success", id: "/#testimonials" },
+                                { name: "Support", id: "/#support" },
+                                { name: "Blog", id: "/blog" },
+                                { name: "Shop", id: "/shop" },
+                                { name: "Contact", id: "/#contact" }
+                            ]}
                             button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                         />
                     </div>
@@ -180,7 +198,16 @@ export default function ProductPage({ params }: ProductPageProps) {
                 <div id="navbar" data-section="navbar">
                     <NavbarStyleCentered
                         brandName="Paw Haven"
-                        navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
+                        navItems={[
+                            { name: "Home", id: "/" },
+                            { name: "Adopt", id: "/#adopt" },
+                            { name: "About", id: "/#about" },
+                            { name: "Success", id: "/#testimonials" },
+                            { name: "Support", id: "/#support" },
+                            { name: "Blog", id: "/blog" },
+                            { name: "Shop", id: "/shop" },
+                            { name: "Contact", id: "/#contact" }
+                        ]}
                         button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                     />
                 </div>

src/app/shop/page.tsx

@@ -60,7 +60,16 @@ export default function ShopPage() {
                     <div id="navbar" data-section="navbar">
                         <NavbarStyleCentered
                             brandName="Paw Haven"
-                            navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
+                            navItems={[
+                                { name: "Home", id: "/" },
+                                { name: "Adopt", id: "/#adopt" },
+                                { name: "About", id: "/#about" },
+                                { name: "Success", id: "/#testimonials" },
+                                { name: "Support", id: "/#support" },
+                                { name: "Blog", id: "/blog" },
+                                { name: "Shop", id: "/shop" },
+                                { name: "Contact", id: "/#contact" }
+                            ]}
                             button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                         />
                     </div>
@@ -103,7 +112,16 @@ export default function ShopPage() {
                 <div id="navbar" data-section="navbar">
                     <NavbarStyleCentered
                         brandName="Paw Haven"
-                        navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
+                        navItems={[
+                            { name: "Home", id: "/" },
+                            { name: "Adopt", id: "/#adopt" },
+                            { name: "About", id: "/#about" },
+                            { name: "Success", id: "/#testimonials" },
+                            { name: "Support", id: "/#support" },
+                            { name: "Blog", id: "/blog" },
+                            { name: "Shop", id: "/shop" },
+                            { name: "Contact", id: "/#contact" }
+                        ]}
                         button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                     />
                 </div>

src/app/styles/variables.css

@@ -2,21 +2,21 @@
   /* Base units */
   /* --vw is set by ThemeProvider */
 
-  /* --background: #f5f5f5;;
+  /* --background: #f6f0e9;;
-  --card: #ffffff;;
+  --card: #efe7dd;;
-  --foreground: #1c1c1c;;
+  --foreground: #2b180a;;
-  --primary-cta: #1c1c1c;;
+  --primary-cta: #2b180a;;
-  --secondary-cta: #ffffff;;
+  --secondary-cta: #efe7dd;;
-  --accent: #6139e6;;
+  --accent: #94877c;;
-  --background-accent: #b3a8e8;; */
+  --background-accent: #afa094;; */
 
-  --background: #f5f5f5;;
+  --background: #f6f0e9;;
-  --card: #ffffff;;
+  --card: #efe7dd;;
-  --foreground: #1c1c1c;;
+  --foreground: #2b180a;;
-  --primary-cta: #1c1c1c;;
+  --primary-cta: #2b180a;;
-  --secondary-cta: #ffffff;;
+  --secondary-cta: #efe7dd;;
-  --accent: #6139e6;;
+  --accent: #94877c;;
-  --background-accent: #b3a8e8;;
+  --background-accent: #afa094;;
 
   /* text sizing - set by ThemeProvider */
   /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);