Merge version_2 into main

Update src/app/shop/page.tsx
2026-02-20 12:27:50 +00:00 · 2026-02-20 12:27:46 +00:00 · 2026-02-20 12:27:45 +00:00 · 2026-02-20 12:27:44 +00:00 · 2026-02-20 12:27:43 +00:00 · 2026-02-20 12:27:42 +00:00
6 changed files with 183 additions and 47 deletions
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -0,0 +1,134 @@
+"use client"
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
+import HeroSplitDualMedia from '@/components/sections/hero/HeroSplitDualMedia';
+import TestimonialCardSix from '@/components/sections/testimonial/TestimonialCardSix';
+import FooterSimple from '@/components/sections/footer/FooterSimple';
+import { Heart, Sparkles } from 'lucide-react';
+
+export default function AboutPage() {
+  return (
+    <ThemeProvider
+      defaultButtonVariant="directional-hover"
+      defaultTextAnimation="entrance-slide"
+      borderRadius="soft"
+      contentWidth="medium"
+      sizing="largeSizeMediumTitles"
+      background="fluid"
+      cardStyle="subtle-shadow"
+      primaryButtonStyle="shadow"
+      secondaryButtonStyle="layered"
+      headingFontWeight="light"
+    >
+      <div id="nav" data-section="nav">
+        <NavbarStyleCentered
+          brandName="Happy Paws Shelter"
+          navItems={[
+            { name: "Home", id: "/" },
+            { name: "About", id: "/about" },
+            { name: "Adopt", id: "featured" },
+            { name: "Our Story", id: "/about" },
+            { name: "Process", id: "process" },
+            { name: "Contact", id: "contact" }
+          ]}
+          button={{ text: "Start Adoption", href: "contact" }}
+        />
+      </div>
+
+      <div id="hero" data-section="hero">
+        <HeroSplitDualMedia
+          title="Our Shelter's Story"
+          description="Happy Paws Shelter was founded with a mission to rescue, rehabilitate, and rehome animals in need. Our dedicated team works tirelessly to give every pet a second chance at a happy life."
+          tag="About Happy Paws"
+          tagIcon={Heart}
+          tagAnimation="slide-up"
+          background={{ variant: "plain" }}
+          mediaItems={[
+            {
+              imageSrc: "https://img.b2bpic.net/free-photo/group-happy-animal-shelter-staff-with-dogs_1163-2935.jpg",              imageAlt: "Our shelter team with rescue dogs"
+            },
+            {
+              imageSrc: "https://img.b2bpic.net/free-photo/animals-being-cared-for-at-shelter_23-2148700000.jpg",              imageAlt: "Animals receiving care at our shelter"
+            }
+          ]}
+          rating={5}
+          ratingText="Making a difference every day"
+          buttons={[
+            { text: "Get Involved", href: "#" },
+            { text: "Donate", href: "#" }
+          ]}
+          buttonAnimation="slide-up"
+          mediaAnimation="slide-up"
+        />
+      </div>
+
+      <div id="testimonials" data-section="testimonials">
+        <TestimonialCardSix
+          title="Fun Stories from Our Shelter"
+          description="Heartwarming tales of rescue, recovery, and the incredible animals who have passed through our doors."
+          tag="Our Stories"
+          tagIcon={Sparkles}
+          tagAnimation="slide-up"
+          textboxLayout="default"
+          animationType="slide-up"
+          useInvertedBackground={false}
+          speed={40}
+          testimonials={[
+            {
+              id: "1",              name: "Buddy's Great Escape",              handle: "A German Shepherd's Adventure",              testimonial: "Buddy arrived at our shelter after wandering the streets for weeks. He was shy and scared, but with lots of love and patience, he blossomed into the most joyful pup! His new family says he's brought endless laughter and loyalty to their home.",              imageSrc: "https://img.b2bpic.net/free-photo/dog-smiling-camera-happy_23-2148699500.jpg",              imageAlt: "Buddy the German Shepherd"
+            },
+            {
+              id: "2",              name: "Whiskers' Second Chance",              handle: "A Kitten's Transformation",              testimonial: "Found in a cardboard box behind the grocery store, Whiskers was tiny and frightened. Our veterinary team nursed her back to health, and now she's a vibrant, playful kitty who absolutely loves cuddles. Her family can't imagine life without her!",              imageSrc: "https://img.b2bpic.net/free-photo/adorable-orange-kitten-playing-leaves_23-2148701000.jpg",              imageAlt: "Whiskers the kitten"
+            },
+            {
+              id: "3",              name: "Max's Medical Marvel",              handle: "A Rescue's Recovery Story",              testimonial: "Max came to us with serious health issues that required months of dedicated care. Our amazing vets performed life-saving surgery, and now he runs and plays like any healthy dog! Watching his transformation has been the highlight of our year.",              imageSrc: "https://img.b2bpic.net/free-photo/golden-retriever-running-beach_23-2148700500.jpg",              imageAlt: "Max the happy dog"
+            },
+            {
+              id: "4",              name: "Luna's Special Bond",              handle: "An Unlikely Friendship",              testimonial: "Luna, a three-legged cat, arrived at our shelter after a terrible accident. What's amazing is how she became best friends with a three-legged rabbit named Hoppy! Their friendship inspires everyone who visits, proving that love knows no limits.",              imageSrc: "https://img.b2bpic.net/free-photo/cute-animals-together_23-2148701500.jpg",              imageAlt: "Luna and Hoppy together"
+            },
+            {
+              id: "5",              name: "The Senior Squad",              handle: "Age is Just a Number",              testimonial: "We have a special program for senior animals, and watching older dogs and cats find loving homes has been incredible. One 14-year-old corgi named Daisy now spends her golden years with a retired couple who spoil her rotten!",              imageSrc: "https://img.b2bpic.net/free-photo/happy-senior-dog_23-2148702000.jpg",              imageAlt: "Senior dogs at our shelter"
+            },
+            {
+              id: "6",              name: "Rescue Reunion",              handle: "A Family Reunited",              testimonial: "One of our favorite stories happened when a lost dog named Shadow was reunited with his original family after two years on the streets. The tears of joy were flowing, and it reminded us why we do this work every single day!",              imageSrc: "https://img.b2bpic.net/free-photo/happy-family-with-dog-reunion_23-2148702500.jpg",              imageAlt: "Dog reunited with family"
+            }
+          ]}
+        />
+      </div>
+
+      <div id="footer" data-section="footer">
+        <FooterSimple
+          columns={[
+            {
+              title: "Quick Links",              items: [
+                { label: "Browse Pets", href: "/#featured" },
+                { label: "Adoption Process", href: "/#process" },
+                { label: "About Us", href: "/about" },
+                { label: "Contact", href: "/#contact" }
+              ]
+            },
+            {
+              title: "Support",              items: [
+                { label: "Donate", href: "#" },
+                { label: "Volunteer", href: "#" },
+                { label: "Sponsor a Pet", href: "#" },
+                { label: "FAQ", href: "#" }
+              ]
+            },
+            {
+              title: "Connect",              items: [
+                { label: "Facebook", href: "https://facebook.com" },
+                { label: "Instagram", href: "https://instagram.com" },
+                { label: "Twitter", href: "https://twitter.com" },
+                { label: "Contact Us", href: "mailto:info@happypaws.org" }
+              ]
+            }
+          ]}
+          bottomLeftText="© 2025 Happy Paws Shelter. All rights reserved."
+          bottomRightText="Made with care for our furry friends"
+        />
+      </div>
+    </ThemeProvider>
+  );
+}
--- a/src/app/blog/page.tsx
+++ b/src/app/blog/page.tsx
@@ -29,13 +29,14 @@ export default function BlogPage() {
                        brandName="Happy Paws Shelter"
                        navItems={[
                            { name: "Home", id: "/" },
-                            { name: "About", id: "about" },
-                            { name: "Adopt", id: "featured" },
-                            { name: "Process", id: "process" },
-                            { name: "Contact", id: "contact" }
+                            { name: "About", id: "/about" },
+                            { name: "Adopt", id: "/#featured" },
+                            { name: "Our Story", id: "/about" },
+                            { name: "Process", id: "/#process" },
+                            { name: "Contact", id: "/#contact" }
                        ]}
                        button={{
-                            text: "Start Adoption",                            href: "contact"
+                            text: "Start Adoption",                            href: "/#contact"
                        }}
                    />
                </div>
@@ -65,10 +66,10 @@ export default function BlogPage() {
                        columns={[
                            {
                                title: "Quick Links",                                items: [
-                                    { label: "Browse Pets", href: "#featured" },
-                                    { label: "Adoption Process", href: "#process" },
-                                    { label: "About Us", href: "#about" },
-                                    { label: "Contact", href: "#contact" }
+                                    { label: "Browse Pets", href: "/#featured" },
+                                    { label: "Adoption Process", href: "/#process" },
+                                    { label: "About Us", href: "/about" },
+                                    { label: "Contact", href: "/#contact" }
                                ]
                            },
                            {
@@ -95,4 +96,4 @@ export default function BlogPage() {
            </ReactLenis>
        </ThemeProvider>
    );
-}
+}
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1413,4 +1413,4 @@ export default function RootLayout({
      </ServiceWrapper>
    </html>
  );
-}
+}
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -30,9 +30,10 @@ export default function LandingPage() {
        <NavbarStyleCentered
          brandName="Happy Paws Shelter"
          navItems={[
-            { name: "Home", id: "home" },
+            { name: "Home", id: "/" },
            { name: "About", id: "about" },
            { name: "Adopt", id: "featured" },
+            { name: "Our Story", id: "/about" },
            { name: "Process", id: "process" },
            { name: "Contact", id: "contact" }
          ]}
@@ -76,7 +77,7 @@ export default function LandingPage() {
          ]}
          useInvertedBackground={false}
          buttons={[
-            { text: "Our Story", href: "#" },
+            { text: "Our Story", href: "/about" },
            { text: "Get Involved", href: "#" }
          ]}
          buttonAnimation="slide-up"
@@ -249,7 +250,7 @@ export default function LandingPage() {
              title: "Quick Links",              items: [
                { label: "Browse Pets", href: "#featured" },
                { label: "Adoption Process", href: "#process" },
-                { label: "About Us", href: "#about" },
+                { label: "About Us", href: "/about" },
                { label: "Contact", href: "#contact" }
              ]
            },
@@ -276,4 +277,4 @@ export default function LandingPage() {
      </div>
    </ThemeProvider>
  );
-}
+}
--- a/src/app/shop/[id]/page.tsx
+++ b/src/app/shop/[id]/page.tsx
@@ -86,11 +86,11 @@ export default function ProductPage({ params }: ProductPageProps) {
                            brandName="Happy Paws Shelter"
                            navItems={[
                                {"name":"Home","id":"/"},
-                                {"name":"About","id":"about"},
-                                {"name":"Adopt","id":"featured"},
-                                {"name":"Process","id":"process"},
-                                {"name":"Contact","id":"contact"},
-                                {"name":"Shop","id":"/shop"}
+                                {"name":"About","id":"/about"},
+                                {"name":"Adopt","id":"/#featured"},
+                                {"name":"Our Story","id":"/about"},
+                                {"name":"Process","id":"/#process"},
+                                {"name":"Contact","id":"/#contact"}
                            ]}
                            button={{"text":"Cart","onClick":() => setCartOpen(true)}}
                        />
@@ -101,7 +101,7 @@ export default function ProductPage({ params }: ProductPageProps) {
                    <div id="footer" data-section="footer">
                        <FooterSimple
                            columns={[
-                                {"title":"Quick Links","items":[{"label":"Browse Pets","href":"#featured"},{"label":"Adoption Process","href":"#process"},{"label":"About Us","href":"#about"},{"label":"Contact","href":"#contact"}]},
+                                {"title":"Quick Links","items":[{"label":"Browse Pets","href":"/#featured"},{"label":"Adoption Process","href":"/#process"},{"label":"About Us","href":"/about"},{"label":"Contact","href":"/#contact"}]},
                                {"title":"Support","items":[{"label":"Donate","href":"#"},{"label":"Volunteer","href":"#"},{"label":"Sponsor a Pet","href":"#"},{"label":"FAQ","href":"#"}]},
                                {"title":"Connect","items":[{"label":"Facebook","href":"https://facebook.com"},{"label":"Instagram","href":"https://instagram.com"},{"label":"Twitter","href":"https://twitter.com"},{"label":"Contact Us","href":"mailto:info@happypaws.org"}]}
                            ]}
@@ -134,11 +134,11 @@ export default function ProductPage({ params }: ProductPageProps) {
                            brandName="Happy Paws Shelter"
                            navItems={[
                                {"name":"Home","id":"/"},
-                                {"name":"About","id":"about"},
-                                {"name":"Adopt","id":"featured"},
-                                {"name":"Process","id":"process"},
-                                {"name":"Contact","id":"contact"},
-                                {"name":"Shop","id":"/shop"}
+                                {"name":"About","id":"/about"},
+                                {"name":"Adopt","id":"/#featured"},
+                                {"name":"Our Story","id":"/about"},
+                                {"name":"Process","id":"/#process"},
+                                {"name":"Contact","id":"/#contact"}
                            ]}
                            button={{"text":"Cart","onClick":() => setCartOpen(true)}}
                        />
@@ -157,7 +157,7 @@ export default function ProductPage({ params }: ProductPageProps) {
                    <div id="footer" data-section="footer">
                        <FooterSimple
                            columns={[
-                                {"title":"Quick Links","items":[{"label":"Browse Pets","href":"#featured"},{"label":"Adoption Process","href":"#process"},{"label":"About Us","href":"#about"},{"label":"Contact","href":"#contact"}]},
+                                {"title":"Quick Links","items":[{"label":"Browse Pets","href":"/#featured"},{"label":"Adoption Process","href":"/#process"},{"label":"About Us","href":"/about"},{"label":"Contact","href":"/#contact"}]},
                                {"title":"Support","items":[{"label":"Donate","href":"#"},{"label":"Volunteer","href":"#"},{"label":"Sponsor a Pet","href":"#"},{"label":"FAQ","href":"#"}]},
                                {"title":"Connect","items":[{"label":"Facebook","href":"https://facebook.com"},{"label":"Instagram","href":"https://instagram.com"},{"label":"Twitter","href":"https://twitter.com"},{"label":"Contact Us","href":"mailto:info@happypaws.org"}]}
                            ]}
@@ -189,11 +189,11 @@ export default function ProductPage({ params }: ProductPageProps) {
                        brandName="Happy Paws Shelter"
                        navItems={[
                            {"name":"Home","id":"/"},
-                            {"name":"About","id":"about"},
-                            {"name":"Adopt","id":"featured"},
-                            {"name":"Process","id":"process"},
-                            {"name":"Contact","id":"contact"},
-                            {"name":"Shop","id":"/shop"}
+                            {"name":"About","id":"/about"},
+                            {"name":"Adopt","id":"/#featured"},
+                            {"name":"Our Story","id":"/about"},
+                            {"name":"Process","id":"/#process"},
+                            {"name":"Contact","id":"/#contact"}
                        ]}
                        button={{"text":"Cart","onClick":() => setCartOpen(true)}}
                    />
@@ -237,7 +237,7 @@ export default function ProductPage({ params }: ProductPageProps) {
                <div id="footer" data-section="footer">
                    <FooterSimple
                        columns={[
-                            {"title":"Quick Links","items":[{"label":"Browse Pets","href":"#featured"},{"label":"Adoption Process","href":"#process"},{"label":"About Us","href":"#about"},{"label":"Contact","href":"#contact"}]},
+                            {"title":"Quick Links","items":[{"label":"Browse Pets","href":"/#featured"},{"label":"Adoption Process","href":"/#process"},{"label":"About Us","href":"/about"},{"label":"Contact","href":"/#contact"}]},
                            {"title":"Support","items":[{"label":"Donate","href":"#"},{"label":"Volunteer","href":"#"},{"label":"Sponsor a Pet","href":"#"},{"label":"FAQ","href":"#"}]},
                            {"title":"Connect","items":[{"label":"Facebook","href":"https://facebook.com"},{"label":"Instagram","href":"https://instagram.com"},{"label":"Twitter","href":"https://twitter.com"},{"label":"Contact Us","href":"mailto:info@happypaws.org"}]}
                        ]}
@@ -248,4 +248,4 @@ export default function ProductPage({ params }: ProductPageProps) {
            </ReactLenis>
        </ThemeProvider>
    );
-}
+}
--- a/src/app/shop/page.tsx
+++ b/src/app/shop/page.tsx
@@ -39,11 +39,11 @@ export default function ShopPage() {
                            brandName="Happy Paws Shelter"
                            navItems={[
                                {"name":"Home","id":"/"},
-                                {"name":"About","id":"about"},
-                                {"name":"Adopt","id":"featured"},
-                                {"name":"Process","id":"process"},
-                                {"name":"Contact","id":"contact"},
-                                {"name":"Shop","id":"/shop"}
+                                {"name":"About","id":"/about"},
+                                {"name":"Adopt","id":"/#featured"},
+                                {"name":"Our Story","id":"/about"},
+                                {"name":"Process","id":"/#process"},
+                                {"name":"Contact","id":"/#contact"}
                            ]}
                            button={{"text":"Cart","onClick":() => setCartOpen(true)}}
                        />
@@ -54,7 +54,7 @@ export default function ShopPage() {
                    <div id="footer" data-section="footer">
                        <FooterSimple
                            columns={[
-                                {"title":"Quick Links","items":[{"label":"Browse Pets","href":"#featured"},{"label":"Adoption Process","href":"#process"},{"label":"About Us","href":"#about"},{"label":"Contact","href":"#contact"}]},
+                                {"title":"Quick Links","items":[{"label":"Browse Pets","href":"/#featured"},{"label":"Adoption Process","href":"/#process"},{"label":"About Us","href":"/about"},{"label":"Contact","href":"/#contact"}]},
                                {"title":"Support","items":[{"label":"Donate","href":"#"},{"label":"Volunteer","href":"#"},{"label":"Sponsor a Pet","href":"#"},{"label":"FAQ","href":"#"}]},
                                {"title":"Connect","items":[{"label":"Facebook","href":"https://facebook.com"},{"label":"Instagram","href":"https://instagram.com"},{"label":"Twitter","href":"https://twitter.com"},{"label":"Contact Us","href":"mailto:info@happypaws.org"}]}
                            ]}
@@ -86,11 +86,11 @@ export default function ShopPage() {
                        brandName="Happy Paws Shelter"
                        navItems={[
                            {"name":"Home","id":"/"},
-                            {"name":"About","id":"about"},
-                            {"name":"Adopt","id":"featured"},
-                            {"name":"Process","id":"process"},
-                            {"name":"Contact","id":"contact"},
-                            {"name":"Shop","id":"/shop"}
+                            {"name":"About","id":"/about"},
+                            {"name":"Adopt","id":"/#featured"},
+                            {"name":"Our Story","id":"/about"},
+                            {"name":"Process","id":"/#process"},
+                            {"name":"Contact","id":"/#contact"}
                        ]}
                        button={{"text":"Cart","onClick":() => setCartOpen(true)}}
                    />
@@ -109,7 +109,7 @@ export default function ShopPage() {
                <div id="footer" data-section="footer">
                    <FooterSimple
                        columns={[
-                            {"title":"Quick Links","items":[{"label":"Browse Pets","href":"#featured"},{"label":"Adoption Process","href":"#process"},{"label":"About Us","href":"#about"},{"label":"Contact","href":"#contact"}]},
+                            {"title":"Quick Links","items":[{"label":"Browse Pets","href":"/#featured"},{"label":"Adoption Process","href":"/#process"},{"label":"About Us","href":"/about"},{"label":"Contact","href":"/#contact"}]},
                            {"title":"Support","items":[{"label":"Donate","href":"#"},{"label":"Volunteer","href":"#"},{"label":"Sponsor a Pet","href":"#"},{"label":"FAQ","href":"#"}]},
                            {"title":"Connect","items":[{"label":"Facebook","href":"https://facebook.com"},{"label":"Instagram","href":"https://instagram.com"},{"label":"Twitter","href":"https://twitter.com"},{"label":"Contact Us","href":"mailto:info@happypaws.org"}]}
                        ]}
@@ -120,4 +120,4 @@ export default function ShopPage() {
            </ReactLenis>
        </ThemeProvider>
    );
-}
+}
Author	SHA1	Message	Date
bender	334934a696	Merge version_2 into main Merge version_2 into main	2026-02-20 12:27:50 +00:00
bender	57ce29f7bb	Update src/app/shop/page.tsx	2026-02-20 12:27:46 +00:00
bender	57abd3038e	Update src/app/shop/[id]/page.tsx	2026-02-20 12:27:45 +00:00
bender	0ef76f9530	Update src/app/page.tsx	2026-02-20 12:27:44 +00:00
bender	ab13a0d704	Update src/app/layout.tsx	2026-02-20 12:27:43 +00:00
bender	976c1e96c2	Update src/app/blog/page.tsx	2026-02-20 12:27:42 +00:00
bender	2b3409b98e	Add src/app/about/page.tsx	2026-02-20 12:27:41 +00:00
bender	7f37706b7b	Merge version_1 into main Merge version_1 into main	2026-02-20 12:24:28 +00:00