bender/58231c48-e4ac-4ea5-be3d-e5f286e1f726
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #1

Merged
bender merged 9 commits from version_1 into main 2026-02-13 11:42:12 +00:00
Conversation 0 Commits 9 Files Changed 9 +52 -61
9 changed files with 52 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,31 +11,31 @@ export default function AboutPage() {
{ name: "Home", id: "/" },
{ name: "Adopt", id: "/adopt" },
{ name: "About", id: "/about" },
{ name: "Contact", id: "/contact" }
{ name: "Contact", id: "/contact" },
{ name: "Donate", id: "/donate" },
{ name: "Shop", id: "/shop" },
{ name: "Blog", id: "/blog" }
];
const navButton = { text: "Donate", href: "/donate" };
const footerColumns = [
{
title: "About Us",
items: [
title: "About Us", items: [
{ label: "Our Mission", href: "/about" },
{ label: "Meet the Team", href: "/about" },
{ label: "Impact Report", href: "/about" }
]
},
{
title: "Get Involved",
items: [
title: "Get Involved", items: [
{ label: "Adopt a Pet", href: "/adopt" },
{ label: "Volunteer", href: "/contact" },
{ label: "Foster a Pet", href: "/contact" }
]
},
{
title: "Resources",
items: [
title: "Resources", items: [
{ label: "FAQs", href: "/contact" },
{ label: "Pet Care Tips", href: "/" },
{ label: "Contact Us", href: "/contact" }
@@ -63,7 +63,7 @@ export default function AboutPage() {
<div id="about-us" data-section="about-us">
<MediaSplitTabsAbout
title="Our Story & Mission"
description="At Hope Haven, we believe every animal deserves a loving, forever home. We're dedicated to rescuing, rehabilitating, and rehoming pets in need."
description="At Hope Haven, we believe every animal deserves a loving, forever home. We're dedicated to rescuing, rehabiliting, and rehoming pets in need."
tabs={[
{ id: "who-we-are", label: "Who We Are", description: "Hope Haven Animal Shelter is a non-profit organization founded on the principle of compassion and second chances. Our dedicated team works tirelessly to provide a safe haven for abandoned, neglected, and surrendered animals. We believe in transparency, integrity, and putting the well-being of our animals first." },
{ id: "our-values", label: "Our Values", description: "Our core values include compassion, respect, responsibility, and community. We treat every animal with the dignity they deserve, advocate for responsible pet ownership, and foster a supportive community of volunteers and adopters. These values guide every decision we make and every life we touch." },
@@ -102,13 +102,7 @@ export default function AboutPage() {
title="Our Valued Community Partners"
description="We're grateful for the support of these organizations who help us make a difference."
logos={[
"https://img.b2bpic.net/free-vector/collection-colorful-pet-shop-stickers_23-2147569707.jpg",
"https://img.b2bpic.net/free-vector/veterinary-clinic-labels-collection_23-2149714004.jpg",
"https://img.b2bpic.net/free-psd/pets-template-design_23-2151517542.jpg",
"https://img.b2bpic.net/free-vector/veterinary-logo-collection_1346-55.jpg",
"https://img.b2bpic.net/free-vector/veterinary-clinic-logo-templates_23-2147536016.jpg",
"https://img.b2bpic.net/free-vector/vintage-cruelty-free-logo_23-2149452211.jpg",
"https://img.b2bpic.net/free-vector/logo-with-pet-design_1363-32.jpg"
"https://img.b2bpic.net/free-vector/collection-colorful-pet-shop-stickers_23-2147569707.jpg", "https://img.b2bpic.net/free-vector/veterinary-clinic-labels-collection_23-2149714004.jpg", "https://img.b2bpic.net/free-psd/pets-template-design_23-2151517542.jpg", "https://img.b2bpic.net/free-vector/veterinary-logo-collection_1346-55.jpg", "https://img.b2bpic.net/free-vector/veterinary-clinic-logo-templates_23-2147536016.jpg", "https://img.b2bpic.net/free-vector/vintage-cruelty-free-logo_23-2149452211.jpg", "https://img.b2bpic.net/free-vector/logo-with-pet-design_1363-32.jpg"
]}
speed={40}
showCard={true}

14
src/app/adopt/page.tsx
View File

@@ -12,31 +12,31 @@ export default function AdoptPage() {
{ name: "Home", id: "/" },
{ name: "Adopt", id: "/adopt" },
{ name: "About", id: "/about" },
{ name: "Contact", id: "/contact" }
{ name: "Contact", id: "/contact" },
{ name: "Donate", id: "/donate" },
{ name: "Shop", id: "/shop" },
{ name: "Blog", id: "/blog" }
];
const navButton = { text: "Donate", href: "/donate" };
const footerColumns = [
{
title: "About Us",
items: [
title: "About Us", items: [
{ label: "Our Mission", href: "/about" },
{ label: "Meet the Team", href: "/about" },
{ label: "Impact Report", href: "/about" }
]
},
{
title: "Get Involved",
items: [
title: "Get Involved", items: [
{ label: "Adopt a Pet", href: "/adopt" },
{ label: "Volunteer", href: "/contact" },
{ label: "Foster a Pet", href: "/contact" }
]
},
{
title: "Resources",
items: [
title: "Resources", items: [
{ label: "FAQs", href: "/contact" },
{ label: "Pet Care Tips", href: "/" },
{ label: "Contact Us", href: "/contact" }

7
src/app/blog/page.tsx
View File

@@ -30,7 +30,10 @@ export default function BlogPage() {
{ name: "Home", id: "/" },
{ name: "Adopt", id: "/adopt" },
{ name: "About", id: "/about" },
{ name: "Contact", id: "/contact" }
{ name: "Contact", id: "/contact" },
{ name: "Donate", id: "/donate" },
{ name: "Shop", id: "/shop" },
{ name: "Blog", id: "/blog" }
]}
button={{ text: "Donate", href: "/donate" }}
brandName="Hope Haven"
@@ -90,4 +93,4 @@ export default function BlogPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

14
src/app/contact/page.tsx
View File

@@ -11,31 +11,31 @@ export default function ContactPage() {
{ name: "Home", id: "/" },
{ name: "Adopt", id: "/adopt" },
{ name: "About", id: "/about" },
{ name: "Contact", id: "/contact" }
{ name: "Contact", id: "/contact" },
{ name: "Donate", id: "/donate" },
{ name: "Shop", id: "/shop" },
{ name: "Blog", id: "/blog" }
];
const navButton = { text: "Donate", href: "/donate" };
const footerColumns = [
{
title: "About Us",
items: [
title: "About Us", items: [
{ label: "Our Mission", href: "/about" },
{ label: "Meet the Team", href: "/about" },
{ label: "Impact Report", href: "/about" }
]
},
{
title: "Get Involved",
items: [
title: "Get Involved", items: [
{ label: "Adopt a Pet", href: "/adopt" },
{ label: "Volunteer", href: "/contact" },
{ label: "Foster a Pet", href: "/contact" }
]
},
{
title: "Resources",
items: [
title: "Resources", items: [
{ label: "FAQs", href: "/contact" },
{ label: "Pet Care Tips", href: "/" },
{ label: "Contact Us", href: "/contact" }

14
src/app/donate/page.tsx
View File

@@ -11,31 +11,31 @@ export default function DonatePage() {
{ name: "Home", id: "/" },
{ name: "Adopt", id: "/adopt" },
{ name: "About", id: "/about" },
{ name: "Contact", id: "/contact" }
{ name: "Contact", id: "/contact" },
{ name: "Donate", id: "/donate" },
{ name: "Shop", id: "/shop" },
{ name: "Blog", id: "/blog" }
];
const navButton = { text: "Donate", href: "/donate" };
const footerColumns = [
{
title: "About Us",
items: [
title: "About Us", items: [
{ label: "Our Mission", href: "/about" },
{ label: "Meet the Team", href: "/about" },
{ label: "Impact Report", href: "/about" }
]
},
{
title: "Get Involved",
items: [
title: "Get Involved", items: [
{ label: "Adopt a Pet", href: "/adopt" },
{ label: "Volunteer", href: "/contact" },
{ label: "Foster a Pet", href: "/contact" }
]
},
{
title: "Resources",
items: [
title: "Resources", items: [
{ label: "FAQs", href: "/contact" },
{ label: "Pet Care Tips", href: "/" },
{ label: "Contact Us", href: "/contact" }

10
src/app/layout.tsx
View File

@@ -4,19 +4,15 @@ import { Inter } from "next/font/google";
import "./globals.css";
const publicSans = Public_Sans({
variable: "--font-public-sans",
subsets: ["latin"],
variable: "--font-public-sans", subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
variable: "--font-inter", subsets: ["latin"],
});
export const metadata: Metadata = {
title: "Hope Haven Animal Shelter",
description: "Every animal deserves a second chance. Discover your new best friend and join our mission to rescue, rehabilitate, and rehome pets in need.",
};
title: "Hope Haven Animal Shelter", description: "Every animal deserves a second chance. Discover your new best friend and join our mission to rescue, rehabilitate, and rehome pets in need."};
export default function RootLayout({
children,

22
src/app/page.tsx
View File

@@ -16,31 +16,31 @@ export default function HomePage() {
{ name: "Home", id: "/" },
{ name: "Adopt", id: "/adopt" },
{ name: "About", id: "/about" },
{ name: "Contact", id: "/contact" }
{ name: "Contact", id: "/contact" },
{ name: "Donate", id: "/donate" },
{ name: "Shop", id: "/shop" },
{ name: "Blog", id: "/blog" }
];
const navButton = { text: "Donate", href: "/donate" };
const footerColumns = [
{
title: "About Us",
items: [
title: "About Us", items: [
{ label: "Our Mission", href: "/about" },
{ label: "Meet the Team", href: "/about" },
{ label: "Impact Report", href: "/about" }
]
},
{
title: "Get Involved",
items: [
title: "Get Involved", items: [
{ label: "Adopt a Pet", href: "/adopt" },
{ label: "Volunteer", href: "/contact" },
{ label: "Foster a Pet", href: "/contact" }
]
},
{
title: "Resources",
items: [
title: "Resources", items: [
{ label: "FAQs", href: "/contact" },
{ label: "Pet Care Tips", href: "/" },
{ label: "Contact Us", href: "/contact" }
@@ -172,13 +172,7 @@ export default function HomePage() {
title="Our Valued Community Partners"
description="We're grateful for the support of these organizations who help us make a difference."
logos={[
"https://img.b2bpic.net/free-vector/collection-colorful-pet-shop-stickers_23-2147569707.jpg",
"https://img.b2bpic.net/free-vector/veterinary-clinic-labels-collection_23-2149714004.jpg",
"https://img.b2bpic.net/free-psd/pets-template-design_23-2151517542.jpg",
"https://img.b2bpic.net/free-vector/veterinary-logo-collection_1346-55.jpg",
"https://img.b2bpic.net/free-vector/veterinary-clinic-logo-templates_23-2147536016.jpg",
"https://img.b2bpic.net/free-vector/vintage-cruelty-free-logo_23-2149452211.jpg",
"https://img.b2bpic.net/free-vector/logo-with-pet-design_1363-32.jpg"
"https://img.b2bpic.net/free-vector/collection-colorful-pet-shop-stickers_23-2147569707.jpg", "https://img.b2bpic.net/free-vector/veterinary-clinic-labels-collection_23-2149714004.jpg", "https://img.b2bpic.net/free-psd/pets-template-design_23-2151517542.jpg", "https://img.b2bpic.net/free-vector/veterinary-logo-collection_1346-55.jpg", "https://img.b2bpic.net/free-vector/veterinary-clinic-logo-templates_23-2147536016.jpg", "https://img.b2bpic.net/free-vector/vintage-cruelty-free-logo_23-2149452211.jpg", "https://img.b2bpic.net/free-vector/logo-with-pet-design_1363-32.jpg"
]}
speed={40}
showCard={true}

4
src/app/shop/[id]/page.tsx
View File

@@ -88,7 +88,9 @@ export default function ProductPage({ params }: ProductPageProps) {
{ name: "Adopt", id: "/adopt" },
{ name: "About", id: "/about" },
{ name: "Contact", id: "/contact" },
{ name: "Shop", id: "/shop" }
{ name: "Shop", id: "/shop" },
{ name: "Donate", id: "/donate" },
{ name: "Blog", id: "/blog" }
],
brandName: "Hope Haven", className: "py-4", button: { text: "Cart", onClick: () => setCartOpen(true) }
};

4
src/app/shop/page.tsx
View File

@@ -38,7 +38,9 @@ export default function ShopPage() {
{ name: "Adopt", id: "/adopt" },
{ name: "About", id: "/about" },
{ name: "Contact", id: "/contact" },
{ name: "Shop", id: "/shop" }
{ name: "Shop", id: "/shop" },
{ name: "Donate", id: "/donate" },
{ name: "Blog", id: "/blog" }
],
brandName: "Hope Haven", className: "py-4", button: { text: "Cart", onClick: () => console.log("cart") }
};