bender/9fdf5b87-ae3b-4ece-af95-3cf3b33d9f89
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main

Browse Source 
Merge version_2 into main
This commit was merged in pull request #5.
This commit is contained in:
bender
2026-03-03 14:09:02 +00:00
parent 11e2910a1a e1c98b0033
commit b5a9a9f42e
4 changed files with 91 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/app/about/page.tsx
View File

@@ -1,14 +1,14 @@
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import HeroOverlay from '@/components/sections/hero/HeroOverlay';
import SplitAbout from '@/components/sections/about/SplitAbout';
import TeamCardTen from '@/components/sections/team/TeamCardTen';
import FaqBase from '@/components/sections/faq/FaqBase';
import ContactSplit from '@/components/sections/contact/ContactSplit';
import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
import { Heart, Users, Globe, Home, Mail, Sparkles } from 'lucide-react';
import NavbarStyleApple from "@/components/navbar/NavbarStyleApple/NavbarStyleApple";
import HeroSplitTestimonial from "@/components/sections/hero/HeroSplitTestimonial";
import SplitAbout from "@/components/sections/about/SplitAbout";
import TeamCardTen from "@/components/sections/team/TeamCardTen";
import FaqBase from "@/components/sections/faq/FaqBase";
import ContactSplit from "@/components/sections/contact/ContactSplit";
import FooterBaseReveal from "@/components/sections/footer/FooterBaseReveal";
import { Heart, Users, Globe, Home, Mail, Sparkles } from "lucide-react";
export default function AboutPage() {
return (
@@ -28,32 +28,42 @@ export default function AboutPage() {
<NavbarStyleApple
brandName="Paws Haven"
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "/about" },
{ name: "Pets", id: "pets" },
{ name: "Adopt", id: "adopt" },
{ name: "Get Involved", id: "involved" },
{ name: "Contact", id: "contact" }
{ name: "Pets", id: "/pets" },
{ name: "Adopt", id: "#adopt" },
{ name: "Get Involved", id: "#involved" },
{ name: "Contact", id: "#contact" }
]}
/>
</div>
<div id="hero" data-section="hero">
<HeroOverlay
<HeroSplitTestimonial
title="Our Story"
description="Paws Haven: 15+ Years of Rescue, Rehabilitation, and Rehoming"
tag="About Us"
tagIcon={Heart}
tagAnimation="slide-up"
buttons={[
{ text: "Get Involved", href: "involved" },
{ text: "Contact Us", href: "contact" }
{ text: "Get Involved", href: "#involved" },
{ text: "Contact Us", href: "#contact" }
]}
buttonAnimation="slide-up"
imageSrc="http://img.b2bpic.net/free-photo/cage-full-dog-puppies_329181-14496.jpg"
imageAlt="Paws Haven shelter animals"
textPosition="bottom-left"
showBlur={true}
showDimOverlay={true}
mediaAnimation="slide-up"
imagePosition="right"
background={{ variant: "sparkles-gradient" }}
testimonials={[
{
name: "Team Member", handle: "Paws Haven", testimonial: "We are dedicated to our mission of rescue and rehabilitation.", rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/portrait-smiling-family-dog_329181-20491.jpg"
}
]}
testimonialRotationInterval={5000}
useInvertedBackground={false}
showMarqueeCard={false}
/>
</div>
@@ -79,7 +89,7 @@ export default function AboutPage() {
}
]}
buttons={[
{ text: "Our Impact", href: "#impact" },
{ text: "Our Impact", href: "#" },
{ text: "Donate", href: "#" }
]}
buttonAnimation="slide-up"
@@ -173,21 +183,21 @@ export default function AboutPage() {
title: "About", items: [
{ label: "Our Mission", href: "/about" },
{ label: "Our Team", href: "/about" },
{ label: "Meet Our Pets", href: "/" }
{ label: "Meet Our Pets", href: "/pets" }
]
},
{
title: "Get Involved", items: [
{ label: "Adopt a Pet", href: "/" },
{ label: "Volunteer", href: "/" },
{ label: "Adopt a Pet", href: "#adopt" },
{ label: "Volunteer", href: "#involved" },
{ label: "Donate", href: "#" }
]
},
{
title: "Resources", items: [
{ label: "Pet Care Tips", href: "#" },
{ label: "FAQ", href: "/about" },
{ label: "Contact Us", href: "/" }
{ label: "FAQ", href: "#faq" },
{ label: "Contact Us", href: "#contact" }
]
}
]}
@@ -196,4 +206,4 @@ export default function AboutPage() {
</div>
</ThemeProvider>
);
}
}

68
src/app/admin/page.tsx
View File

@@ -1,11 +1,10 @@
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import MetricCardTen from '@/components/sections/metrics/MetricCardTen';
import MetricCardEleven from '@/components/sections/metrics/MetricCardEleven';
import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
import { LayoutDashboard, Users, FileText, Settings } from 'lucide-react';
import NavbarStyleApple from "@/components/navbar/NavbarStyleApple/NavbarStyleApple";
import MetricCardEleven from "@/components/sections/metrics/MetricCardEleven";
import FooterBaseReveal from "@/components/sections/footer/FooterBaseReveal";
import { LayoutDashboard, Settings } from "lucide-react";
export default function AdminPage() {
return (
@@ -25,12 +24,10 @@ export default function AdminPage() {
<NavbarStyleApple
brandName="Paws Haven"
navItems={[
{ name: "About", id: "about" },
{ name: "Pets", id: "pets" },
{ name: "Adopt", id: "adopt" },
{ name: "Get Involved", id: "involved" },
{ name: "Admin", id: "/admin" },
{ name: "Contact", id: "contact" }
{ name: "Home", id: "/" },
{ name: "About", id: "/about" },
{ name: "Pets", id: "/pets" },
{ name: "Contact", id: "#contact" }
]}
/>
</div>
@@ -59,65 +56,28 @@ export default function AdminPage() {
/>
</div>
<div id="management" data-section="management">
<MetricCardTen
metrics={[
{
id: "1", title: "Manage Pet Listings", subtitle: "Add, edit, and remove pet profiles", category: "Listings", value: "24 Active", buttons: [
{ text: "View All", href: "#" },
{ text: "Add New", href: "#" }
]
},
{
id: "2", title: "Adoption Applications", subtitle: "Review and process adoption requests", category: "Applications", value: "8 Pending", buttons: [
{ text: "Review", href: "#" }
]
},
{
id: "3", title: "Volunteer Management", subtitle: "Coordinate volunteers and schedule shifts", category: "Volunteers", value: "42 Active", buttons: [
{ text: "Manage", href: "#" }
]
},
{
id: "4", title: "Finance & Reports", subtitle: "View donations and financial reports", category: "Finance", value: "View Reports", buttons: [
{ text: "Access", href: "#" }
]
}
]}
title="Management Tools"
description="Essential administration and management features for your organization."
tag="Management"
tagIcon={Settings}
tagAnimation="slide-up"
textboxLayout="default"
useInvertedBackground={true}
animationType="slide-up"
carouselMode="buttons"
/>
</div>
<div id="footer" data-section="footer">
<FooterBaseReveal
columns={[
{
title: "About", items: [
{ label: "Our Mission", href: "about" },
{ label: "Our Mission", href: "/about" },
{ label: "Our Team", href: "#" },
{ label: "Meet Our Pets", href: "pets" }
{ label: "Meet Our Pets", href: "/pets" }
]
},
{
title: "Get Involved", items: [
{ label: "Adopt a Pet", href: "adopt" },
{ label: "Volunteer", href: "involved" },
{ label: "Adopt a Pet", href: "#adopt" },
{ label: "Volunteer", href: "#involved" },
{ label: "Donate", href: "#" }
]
},
{
title: "Resources", items: [
{ label: "Pet Care Tips", href: "#" },
{ label: "FAQ", href: "faq" },
{ label: "Contact Us", href: "contact" }
{ label: "FAQ", href: "#faq" },
{ label: "Contact Us", href: "#contact" }
]
}
]}

48
src/app/page.tsx
View File

@@ -1,17 +1,17 @@
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import HeroSplitTestimonial from '@/components/sections/hero/HeroSplitTestimonial';
import SplitAbout from '@/components/sections/about/SplitAbout';
import ProductCardOne from '@/components/sections/product/ProductCardOne';
import FeatureCardMedia from '@/components/sections/feature/FeatureCardMedia';
import TestimonialCardSix from '@/components/sections/testimonial/TestimonialCardSix';
import MetricCardEleven from '@/components/sections/metrics/MetricCardEleven';
import FaqSplitText from '@/components/sections/faq/FaqSplitText';
import ContactSplit from '@/components/sections/contact/ContactSplit';
import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
import { Heart, Users, Globe, Home, Mail, Sparkles } from 'lucide-react';
import NavbarStyleApple from "@/components/navbar/NavbarStyleApple/NavbarStyleApple";
import HeroSplitTestimonial from "@/components/sections/hero/HeroSplitTestimonial";
import SplitAbout from "@/components/sections/about/SplitAbout";
import ProductCardOne from "@/components/sections/product/ProductCardOne";
import FeatureCardMedia from "@/components/sections/feature/FeatureCardMedia";
import TestimonialCardSix from "@/components/sections/testimonial/TestimonialCardSix";
import MetricCardEleven from "@/components/sections/metrics/MetricCardEleven";
import FaqSplitText from "@/components/sections/faq/FaqSplitText";
import ContactSplit from "@/components/sections/contact/ContactSplit";
import FooterBaseReveal from "@/components/sections/footer/FooterBaseReveal";
import { Heart, Users, Globe, Home, Mail, Sparkles } from "lucide-react";
export default function LandingPage() {
return (
@@ -32,11 +32,11 @@ export default function LandingPage() {
brandName="Paws Haven"
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "about" },
{ name: "Pets", id: "pets" },
{ name: "Adopt", id: "adopt" },
{ name: "Get Involved", id: "involved" },
{ name: "Contact", id: "contact" }
{ name: "About", id: "/about" },
{ name: "Pets", id: "/pets" },
{ name: "Adopt", id: "#adopt" },
{ name: "Get Involved", id: "#involved" },
{ name: "Contact", id: "#contact" }
]}
/>
</div>
@@ -49,8 +49,8 @@ export default function LandingPage() {
tagIcon={Heart}
tagAnimation="slide-up"
buttons={[
{ text: "Browse Pets", href: "pets" },
{ text: "Learn More", href: "about" }
{ text: "Browse Pets", href: "/pets" },
{ text: "Learn More", href: "/about" }
]}
buttonAnimation="slide-up"
imageSrc="http://img.b2bpic.net/free-photo/dog-sitting-near-girl_8353-5282.jpg"
@@ -288,23 +288,23 @@ export default function LandingPage() {
columns={[
{
title: "About", items: [
{ label: "Our Mission", href: "about" },
{ label: "Our Mission", href: "/about" },
{ label: "Our Team", href: "#" },
{ label: "Meet Our Pets", href: "pets" }
{ label: "Meet Our Pets", href: "/pets" }
]
},
{
title: "Get Involved", items: [
{ label: "Adopt a Pet", href: "adopt" },
{ label: "Volunteer", href: "involved" },
{ label: "Adopt a Pet", href: "#adopt" },
{ label: "Volunteer", href: "#involved" },
{ label: "Donate", href: "#" }
]
},
{
title: "Resources", items: [
{ label: "Pet Care Tips", href: "#" },
{ label: "FAQ", href: "faq" },
{ label: "Contact Us", href: "contact" }
{ label: "FAQ", href: "#faq" },
{ label: "Contact Us", href: "#contact" }
]
}
]}

35
src/app/pets/page.tsx
View File

@@ -1,12 +1,12 @@
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import ProductCardOne from '@/components/sections/product/ProductCardOne';
import FeatureCardMedia from '@/components/sections/feature/FeatureCardMedia';
import ContactSplit from '@/components/sections/contact/ContactSplit';
import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
import { Heart, Mail, Sparkles, MapPin, Calendar, Users } from 'lucide-react';
import NavbarStyleApple from "@/components/navbar/NavbarStyleApple/NavbarStyleApple";
import ProductCardOne from "@/components/sections/product/ProductCardOne";
import FeatureCardMedia from "@/components/sections/feature/FeatureCardMedia";
import ContactSplit from "@/components/sections/contact/ContactSplit";
import FooterBaseReveal from "@/components/sections/footer/FooterBaseReveal";
import { Heart, Mail, Sparkles } from "lucide-react";
export default function PetsPage() {
return (
@@ -26,11 +26,12 @@ export default function PetsPage() {
<NavbarStyleApple
brandName="Paws Haven"
navItems={[
{ name: "About", id: "about" },
{ name: "Pets", id: "pets" },
{ name: "Adopt", id: "adopt" },
{ name: "Get Involved", id: "involved" },
{ name: "Contact", id: "contact" }
{ name: "Home", id: "/" },
{ name: "About", id: "/about" },
{ name: "Pets", id: "/pets" },
{ name: "Adopt", id: "#adopt" },
{ name: "Get Involved", id: "#involved" },
{ name: "Contact", id: "#contact" }
]}
/>
</div>
@@ -122,23 +123,23 @@ export default function PetsPage() {
columns={[
{
title: "About", items: [
{ label: "Our Mission", href: "about" },
{ label: "Our Mission", href: "/about" },
{ label: "Our Team", href: "#" },
{ label: "Meet Our Pets", href: "pets" }
{ label: "Meet Our Pets", href: "/pets" }
]
},
{
title: "Get Involved", items: [
{ label: "Adopt a Pet", href: "adopt" },
{ label: "Volunteer", href: "involved" },
{ label: "Adopt a Pet", href: "#adopt" },
{ label: "Volunteer", href: "#involved" },
{ label: "Donate", href: "#" }
]
},
{
title: "Resources", items: [
{ label: "Pet Care Tips", href: "#" },
{ label: "FAQ", href: "faq" },
{ label: "Contact Us", href: "contact" }
{ label: "FAQ", href: "#faq" },
{ label: "Contact Us", href: "#contact" }
]
}
]}