Merge version_3 into main

Merge version_3 into main
This commit was merged in pull request #5.
This commit is contained in:
2026-02-13 12:23:27 +00:00
6 changed files with 55 additions and 32 deletions

View File

@@ -1,6 +1,7 @@
"use client";
import React from "react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import { PawPrint, Star, MapPin } from "lucide-react";
@@ -38,7 +39,7 @@ export default function AdoptPage() {
headingFontWeight="bold"
>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay brandName="Golden Paws" navItems={navItems} logoHref="/" />
<NavbarLayoutFloatingOverlay brandName="Golden Paws" navItems={navItems} button={{ text: "Adopt Now", href: "/adopt" }} />
</div>
<div id="pets-list" data-section="pets-list">
@@ -54,7 +55,7 @@ export default function AdoptPage() {
tag="Available Pets"
tagIcon={PawPrint}
gridVariant="four-items-2x2-equal-grid"
animationType="blur-reveal"
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={false}
/>

View File

@@ -1,8 +1,9 @@
"use client";
import React from "react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import { MapPin, Heart } from "lucide-react";
import { MapPin, HelpCircle, Heart } from "lucide-react";
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
import ContactFaq from '@/components/sections/contact/ContactFaq';
@@ -37,7 +38,7 @@ export default function ContactPage() {
headingFontWeight="bold"
>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay brandName="Golden Paws" navItems={navItems} logoHref="/" />
<NavbarLayoutFloatingOverlay brandName="Golden Paws" navItems={navItems} button={{ text: "Adopt Now", href: "/adopt" }} />
</div>
<div id="visit-us" data-section="visit-us">
@@ -56,6 +57,21 @@ export default function ContactPage() {
/>
</div>
<div id="general-faq" data-section="general-faq">
<ContactFaq
ctaTitle="Help Center"
ctaDescription="Find answers to common logistical and support questions about our rescue operations."
ctaButton={{ text: "Message Support", href: "mailto:support@goldenpaws.org" }}
ctaIcon={HelpCircle}
faqs={[
{ id: 'f4', title: 'What if the adoption doesn\'t work out?', content: 'We have a lifetime return policy. They are always welcome back.' },
{ id: 'f5', title: 'Do you take in stray animals?', content: 'Please contact local animal control for strays. We focus on shelter transfers and owner surrenders.' }
]}
useInvertedBackground={true}
animationType="slide-up"
/>
</div>
<div id="support-mission" data-section="support-mission">
<MediaAbout
title="Support Our Cause"
@@ -65,7 +81,7 @@ export default function ContactPage() {
imageSrc="https://img.b2bpic.net/free-photo/hipster-woman-smile-enjoy-playing-with-her-puppy-summer-field-vintage-tone-filter_1150-1188.jpg"
imageAlt="Person donating to shelter"
buttons={[{ text: 'Donate Now', href: '#' }]}
useInvertedBackground={true}
useInvertedBackground={false}
/>
</div>

View File

@@ -10,8 +10,12 @@ const roboto = Roboto({
});
export const metadata: Metadata = {
title: "Golden Paws Shelter | Rescue & Adoption", description: "Find your new best friend at Golden Paws Shelter. We rescue, rehabilitate, and rehome pets in need. Browse available dogs and cats for adoption today.", openGraph: {
title: "Golden Paws Animal Shelter", description: "Giving animals a second chance at a forever home.", siteName: "Golden Paws", type: "website"
title: "Golden Paws Shelter | Rescue & Adoption", description: "Find your new best friend at Golden Paws Shelter. We rescue, rehabilitate, and rehome pets in need. Browse available dogs and cats for adoption today.",
openGraph: {
title: "Golden Paws Animal Shelter",
description: "Giving animals a second chance at a forever home.",
siteName: "Golden Paws",
type: "website"
},
};

View File

@@ -1,6 +1,7 @@
"use client";
import React from "react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import { Heart, Users } from "lucide-react";
@@ -38,7 +39,7 @@ export default function MissionPage() {
headingFontWeight="bold"
>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay brandName="Golden Paws" navItems={navItems} logoHref="/" />
<NavbarLayoutFloatingOverlay brandName="Golden Paws" navItems={navItems} button={{ text: "Adopt Now", href: "/adopt" }} />
</div>
<div id="mission-hero" data-section="mission-hero">

View File

@@ -1,6 +1,7 @@
"use client";
import React from "react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import { Sparkles, Heart, PawPrint, MapPin, Star } from "lucide-react";
@@ -44,7 +45,7 @@ export default function HomePage() {
<NavbarLayoutFloatingOverlay
brandName="Golden Paws"
navItems={navItems}
logoHref="/"
button={{ text: "Adopt Now", href: "/adopt" }}
/>
</div>
@@ -101,7 +102,7 @@ export default function HomePage() {
tag="Available Pets"
tagIcon={PawPrint}
gridVariant="four-items-2x2-equal-grid"
animationType="blur-reveal"
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={true}
/>
@@ -110,8 +111,8 @@ export default function HomePage() {
<div id="stories" data-section="stories">
<TestimonialCardFive
testimonials={[
{ id: 't1', name: 'Sarah & Mike Thompson', date: 'Date: 12 Nov 2024', title: 'Life is better with Cooper', quote: "Adopting Cooper was the best decision we ever made. The shelter team helped us every step of the way.", tag: 'Dog Adoption', avatarSrc: 'https://img.b2bpic.net/free-photo/cheerful-romantic-couple_1098-2321.jpg', imageSrc: 'https://img.b2bpic.net/free-photo/portrait-smiling-family-dog_329181-20491.jpg' },
{ id: 't2', name: 'Emily Chen', date: 'Date: 05 Jan 2025', title: 'Luna is my constant companion', quote: "I was looking for a quiet companion and Luna has exceeded all expectations.", tag: 'Cat Adoption', avatarSrc: 'https://img.b2bpic.net/free-photo/woman-with-hat-hugging-her-beloved_1098-2310.jpg', imageSrc: 'https://img.b2bpic.net/free-photo/couple-with-their-kitten-celebrating-christmas_1303-30192.jpg' }
{ id: 't1', name: 'Sarah & Mike Thompson', date: 'Date: 12 Nov 2024', title: 'Life is better with Cooper', quote: 'Adopting Cooper was the best decision we ever made. The shelter team helped us every step of the way.', tag: 'Dog Adoption', avatarSrc: 'https://img.b2bpic.net/free-photo/cheerful-romantic-couple_1098-2321.jpg', imageSrc: 'https://img.b2bpic.net/free-photo/portrait-smiling-family-dog_329181-20491.jpg' },
{ id: 't2', name: 'Emily Chen', date: 'Date: 05 Jan 2025', title: 'Luna is my constant companion', quote: 'I was looking for a quiet companion and Luna has exceeded all expectations.', tag: 'Cat Adoption', avatarSrc: 'https://img.b2bpic.net/free-photo/woman-with-hat-hugging-her-beloved_1098-2310.jpg', imageSrc: 'https://img.b2bpic.net/free-photo/couple-with-their-kitten-celebrating-christmas_1303-30192.jpg' }
]}
title="Heartwarming Adoption Stories"
description="See the joy that a rescued pet can bring to a household."

View File

@@ -2,21 +2,21 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #fafffb;;
--card: #f7fffa;;
--foreground: #001a0a;;
--primary-cta: #0a7039;;
--secondary-cta: #ffffff;;
--accent: #a8d9be;;
--background-accent: #6bbf8e;; */
/* --background: #020d06;;
--card: #0a1f12;;
--foreground: #f1f8f3;;
--primary-cta: #2e7d32;;
--secondary-cta: #0c2416;;
--accent: #4caf50;;
--background-accent: #143a22;; */
--background: #fafffb;;
--card: #f7fffa;;
--foreground: #001a0a;;
--primary-cta: #0a7039;;
--secondary-cta: #ffffff;;
--accent: #a8d9be;;
--background-accent: #6bbf8e;;
--background: #020d06;;
--card: #0a1f12;;
--foreground: #f1f8f3;;
--primary-cta: #2e7d32;;
--secondary-cta: #0c2416;;
--accent: #4caf50;;
--background-accent: #143a22;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);