bender/0119b01d-98cd-4a08-8c1e-ea43eea6320f
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: bender:version_1
Branches Tags
bender:main bender:version_3 bender:version_2 bender:version_1
...
pull from: bender:version_3
Branches Tags
bender:main bender:version_3 bender:version_2 bender:version_1

17 Commits
version_1 ... version_3

Author SHA1 Message Date
bender
cfa56df1c3 Update src/app/page.tsx 2026-02-16 11:22:54 +00:00
bender
fee2d9aa8c Update src/app/styles/variables.css 2026-02-16 11:20:52 +00:00
bender
bbc4ea9cf7 Update src/app/shop/page.tsx 2026-02-16 11:20:51 +00:00
bender
473831baec Update src/app/shop/[id]/page.tsx 2026-02-16 11:20:51 +00:00
bender
a2405e629b Update src/app/page.tsx 2026-02-16 11:20:50 +00:00
bender
fc3ca40b9a Update src/app/layout.tsx 2026-02-16 11:20:49 +00:00
bender
e78542a039 Update src/app/blog/page.tsx 2026-02-16 11:20:48 +00:00
bender
10ad5dfe6a Merge version_2 into main 
Merge version_2 into main
 2026-02-16 10:45:17 +00:00
bender
856062723f Update src/app/page.tsx 2026-02-16 10:45:13 +00:00
bender
eafb2e9931 Merge version_2 into main 
Merge version_2 into main
 2026-02-16 10:43:28 +00:00
bender
81f1e4d924 Update src/app/page.tsx 2026-02-16 10:43:24 +00:00
bender
6b2c6dba84 Merge version_2 into main 
Merge version_2 into main
 2026-02-16 10:31:52 +00:00
bender
2efee64eab Update src/app/shop/page.tsx 2026-02-16 10:31:47 +00:00
bender
18007799c6 Update src/app/shop/[id]/page.tsx 2026-02-16 10:31:47 +00:00
bender
dd6ed98bb2 Update src/app/page.tsx 2026-02-16 10:31:46 +00:00
bender
8c6e6a518f Update src/app/blog/page.tsx 2026-02-16 10:31:45 +00:00
bender
fe1c3f8311 Merge version_1 into main 
Merge version_1 into main
 2026-02-16 10:24:22 +00:00
6 changed files with 109 additions and 130 deletions
Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
"use client";
import ReactLenis from "lenis/react";
import BlogCardThree from '@/components/sections/blog/BlogCardThree';
import BlogCardOne from '@/components/sections/blog/BlogCardOne';
import FooterSimple from '@/components/sections/footer/FooterSimple';
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
@@ -43,7 +43,7 @@ export default function BlogPage() {
</div>
) : (
<div id="blog" data-section="blog">
<BlogCardThree
<BlogCardOne
blogs={posts}
title="Pet Care Stories"
description="Read heartwarming stories and helpful tips from our shelter community"
@@ -67,16 +67,16 @@ export default function BlogPage() {
columns={[
{
title: "Navigation", items: [
{ label: "Home", href: "#hero" },
{ label: "Available Pets", href: "#products" },
{ label: "Adoption Process", href: "#features" },
{ label: "About", href: "#about" }
{ label: "Home", href: "/" },
{ label: "Available Pets", href: "products" },
{ label: "Adoption Process", href: "features" },
{ label: "About", href: "about" }
]
},
{
title: "Support", items: [
{ label: "FAQ", href: "#faq" },
{ label: "Contact Us", href: "#contact" },
{ label: "FAQ", href: "faq" },
{ label: "Contact Us", href: "contact" },
{ label: "Volunteer", href: "#" },
{ label: "Donate", href: "#" }
]
@@ -96,4 +96,4 @@ export default function BlogPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

45
src/app/layout.tsx
View File

@@ -1,44 +1,26 @@
import type { Metadata } from "next";
import { DM_Sans } from "next/font/google";
import { Inter } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import "./styles/variables.css";
import "./styles/base.css";
const dmSans = DM_Sans({
variable: "--font-dm-sans", subsets: ["latin"],
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
});
export const metadata: Metadata = {
title: "Pet Adoption | Happy Paws Shelter", description: "Find your perfect companion at Happy Paws Shelter. Browse adoptable dogs, cats, and other pets. Safe, loving adoption process with ongoing support.", keywords: "pet adoption, dog adoption, cat adoption, animal shelter, rescue pets, adopt a pet", robots: {
index: true,
follow: true
},
openGraph: {
title: "Pet Adoption | Happy Paws Shelter", description: "Give a loving pet a new home. Browse our available animals and start your adoption journey today.", type: "website", siteName: "Happy Paws Shelter", images: [
{
url: "https://img.b2bpic.net/free-photo/pretty-girl-embarcing-cat-dog_8353-5281.jpg", alt: "Happy pets at Happy Paws Shelter"
}
]
},
twitter: {
card: "summary_large_image", title: "Pet Adoption | Happy Paws Shelter", description: "Find your perfect pet companion. Adopt from Happy Paws Shelter today.", images: ["https://img.b2bpic.net/free-photo/pretty-girl-embarcing-cat-dog_8353-5281.jpg"]
}
};
title: "Happy Paws Shelter", description: "Find your perfect pet companion at Happy Paws Shelter"};
export default function RootLayout({
children,
}: Readonly<{
}: {
children: React.ReactNode;
}>) {
}) {
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${dmSans.variable} antialiased`}
>
<Tag />
{children}
<html lang="en">
<body className={inter.variable}>
{children}
<script
dangerouslySetInnerHTML={{
__html: `
@@ -1257,7 +1239,6 @@ export default function RootLayout({
}}
/>
</body>
</ServiceWrapper>
</html>
);
}
}

69
src/app/page.tsx
View File

@@ -7,7 +7,7 @@ import HeroSignup from '@/components/sections/hero/HeroSignup';
import ProductCardOne from '@/components/sections/product/ProductCardOne';
import TextSplitAbout from '@/components/sections/about/TextSplitAbout';
import FeatureCardSix from '@/components/sections/feature/FeatureCardSix';
import TestimonialCardSixteen from '@/components/sections/testimonial/TestimonialCardSixteen';
import FeatureCardTwentyThree from '@/components/sections/feature/FeatureCardTwentyThree';
import FaqSplitMedia from '@/components/sections/faq/FaqSplitMedia';
import ContactText from '@/components/sections/contact/ContactText';
import FooterSimple from '@/components/sections/footer/FooterSimple';
@@ -30,7 +30,7 @@ export default function PetShelterPage() {
<NavbarStyleApple
brandName="Happy Paws Shelter"
navItems={[
{ name: "Home", id: "hero" },
{ name: "Home", id: "/" },
{ name: "Available Pets", id: "products" },
{ name: "Adoption Process", id: "features" },
{ name: "About Us", id: "about" },
@@ -41,7 +41,7 @@ export default function PetShelterPage() {
<div id="hero" data-section="hero">
<HeroSignup
title="Give a Loving Pet a New Home"
title="Give a Loving 11 Pet a New Home"
description="Find your perfect companion at Happy Paws Shelter. Browse our available pets and start your adoption journey today."
tag="Find Your Match"
tagIcon={Heart}
@@ -62,7 +62,7 @@ export default function PetShelterPage() {
useInvertedBackground={false}
products={[
{
id: "1", name: "Max - Golden Retriever", price: "Adoption Fee: $150", imageSrc: "https://img.b2bpic.net/free-photo/medium-shot-woman-with-cute-dogs_23-2148928960.jpg", imageAlt: "Golden retriever puppy named Max", isFavorited: false
id: "1", name: "Max - Golden Retriever", price: "Adoption Fee: $150", imageSrc: "https://img.b2bpic.net/free-photo/vertical-shot-white-brown-dog-with-red-leash-green-grass_181624-2772.jpg?id=7848650", imageAlt: "Golden retriever puppy named Max", isFavorited: false
},
{
id: "2", name: "Luna - Tabby Cat", price: "Adoption Fee: $75", imageSrc: "https://img.b2bpic.net/free-photo/elegant-fashion-girls-summer-park_1157-21448.jpg", imageAlt: "Tabby kitten named Luna", isFavorited: false
@@ -85,7 +85,7 @@ export default function PetShelterPage() {
useInvertedBackground={false}
showBorder={false}
buttons={[
{ text: "Learn More", href: "#process" }
{ text: "Learn More", href: "products" }
]}
/>
</div>
@@ -120,38 +120,41 @@ export default function PetShelterPage() {
</div>
<div id="testimonials" data-section="testimonials">
<TestimonialCardSixteen
title="Happy Adoption Stories"
description="Hear from families who found their perfect pets at Happy Paws Shelter and the joy adoption brought to their lives."
tag="Adoption Success"
tagIcon={Star}
<FeatureCardTwentyThree
title="Gallery of Available Pets"
description="Discover our wonderful selection of adoptable animals. Each pet has been carefully vetted and is ready to bring joy to their new family."
tag="Meet Our Animals"
tagIcon={Heart}
tagAnimation="slide-up"
textboxLayout="default"
useInvertedBackground={false}
animationType="slide-up"
testimonials={[
features={[
{
id: "1", name: "Sarah Johnson", role: "Pet Parent", company: "Happy Family", rating: 5,
imageSrc: "https://img.b2bpic.net/free-photo/alone-specialist-handsome-daydreaming-collar_1262-870.jpg", imageAlt: "Sarah Johnson smiling with pet"
id: "1", title: "Max - Golden Retriever", tags: ["Dog", "Friendly"],
imageSrc: "https://img.b2bpic.net/free-photo/vertical-shot-white-brown-dog-with-red-leash-green-grass_181624-2772.jpg?id=7848650", imageAlt: "Max the Golden Retriever"
},
{
id: "2", name: "Michael Chen", role: "Dog Owner", company: "Active Home", rating: 5,
imageSrc: "https://img.b2bpic.net/free-photo/smiling-businessman-standing-airport_107420-85035.jpg", imageAlt: "Michael Chen with adopted dog"
id: "2", title: "Luna - Tabby Cat", tags: ["Cat", "Playful"],
imageSrc: "https://img.b2bpic.net/free-photo/elegant-fashion-girls-summer-park_1157-21448.jpg", imageAlt: "Luna the Tabby Cat"
},
{
id: "3", name: "Emily Rodriguez", role: "Cat Lover", company: "Cozy Home", rating: 5,
imageSrc: "https://img.b2bpic.net/free-photo/young-businesswoman-portrait-office_1262-1506.jpg", imageAlt: "Emily Rodriguez with adopted cat"
id: "3", title: "Patches - Holland Lop Rabbit", tags: ["Rabbit", "Gentle"],
imageSrc: "https://img.b2bpic.net/free-photo/two-stylish-girls-sunny-field-with-dogs_1157-34702.jpg", imageAlt: "Patches the Holland Lop Rabbit"
},
{
id: "4", name: "David Kim", role: "Pet Parent", company: "Loving Family", rating: 5,
imageSrc: "https://img.b2bpic.net/free-photo/casual-smile-street-style-background-spring_1139-777.jpg", imageAlt: "David Kim with adopted pet"
id: "4", title: "Buddy - Beagle Mix", tags: ["Dog", "Energetic"],
imageSrc: "https://img.b2bpic.net/free-photo/two-stylish-girls-sunny-field-with-dogs_1157-34702.jpg", imageAlt: "Buddy the Beagle Mix"
},
{
id: "5", title: "Whiskers - Siamese", tags: ["Cat", "Affectionate"],
imageSrc: "https://img.b2bpic.net/free-photo/dog-sitting-near-girl_8353-5282.jpg", imageAlt: "Whiskers the Siamese Cat"
},
{
id: "6", title: "Bailey - Labrador", tags: ["Dog", "Loyal"],
imageSrc: "https://img.b2bpic.net/free-photo/pretty-girl-embarcing-cat-dog_8353-5281.jpg", imageAlt: "Bailey the Labrador"
}
]}
kpiItems={[
{ value: "2,500+", label: "Successful Adoptions" },
{ value: "98%", label: "Family Satisfaction" },
{ value: "15+", label: "Years of Service" }
]}
/>
</div>
@@ -199,8 +202,8 @@ export default function PetShelterPage() {
background={{ variant: "plain" }}
useInvertedBackground={false}
buttons={[
{ text: "Schedule a Visit", href: "#signup" },
{ text: "Contact Us", href: "#footer" }
{ text: "Schedule a Visit", href: "products" },
{ text: "Contact Us", href: "faq" }
]}
/>
</div>
@@ -210,16 +213,16 @@ export default function PetShelterPage() {
columns={[
{
title: "Navigation", items: [
{ label: "Home", href: "#hero" },
{ label: "Available Pets", href: "#products" },
{ label: "Adoption Process", href: "#features" },
{ label: "About", href: "#about" }
{ label: "Home", href: "/" },
{ label: "Available Pets", href: "products" },
{ label: "Adoption Process", href: "features" },
{ label: "About", href: "about" }
]
},
{
title: "Support", items: [
{ label: "FAQ", href: "#faq" },
{ label: "Contact Us", href: "#contact" },
{ label: "FAQ", href: "faq" },
{ label: "Contact Us", href: "contact" },
{ label: "Volunteer", href: "#" },
{ label: "Donate", href: "#" }
]
@@ -238,4 +241,4 @@ export default function PetShelterPage() {
</div>
</ThemeProvider>
);
}
}

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

@@ -89,8 +89,7 @@ export default function ProductPage({ params }: ProductPageProps) {
{ name: "Available Pets", id: "products" },
{ name: "Adoption Process", id: "features" },
{ name: "About Us", id: "about" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -103,16 +102,16 @@ export default function ProductPage({ params }: ProductPageProps) {
columns={[
{
title: "Navigation", items: [
{ label: "Home", href: "#hero" },
{ label: "Available Pets", href: "#products" },
{ label: "Adoption Process", href: "#features" },
{ label: "About", href: "#about" }
{ label: "Home", href: "/" },
{ label: "Available Pets", href: "products" },
{ label: "Adoption Process", href: "features" },
{ label: "About", href: "about" }
]
},
{
title: "Support", items: [
{ label: "FAQ", href: "#faq" },
{ label: "Contact Us", href: "#contact" },
{ label: "FAQ", href: "faq" },
{ label: "Contact Us", href: "contact" },
{ label: "Volunteer", href: "#" },
{ label: "Donate", href: "#" }
]
@@ -157,8 +156,7 @@ export default function ProductPage({ params }: ProductPageProps) {
{ name: "Available Pets", id: "products" },
{ name: "Adoption Process", id: "features" },
{ name: "About Us", id: "about" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -179,16 +177,16 @@ export default function ProductPage({ params }: ProductPageProps) {
columns={[
{
title: "Navigation", items: [
{ label: "Home", href: "#hero" },
{ label: "Available Pets", href: "#products" },
{ label: "Adoption Process", href: "#features" },
{ label: "About", href: "#about" }
{ label: "Home", href: "/" },
{ label: "Available Pets", href: "products" },
{ label: "Adoption Process", href: "features" },
{ label: "About", href: "about" }
]
},
{
title: "Support", items: [
{ label: "FAQ", href: "#faq" },
{ label: "Contact Us", href: "#contact" },
{ label: "FAQ", href: "faq" },
{ label: "Contact Us", href: "contact" },
{ label: "Volunteer", href: "#" },
{ label: "Donate", href: "#" }
]
@@ -232,8 +230,7 @@ export default function ProductPage({ params }: ProductPageProps) {
{ name: "Available Pets", id: "products" },
{ name: "Adoption Process", id: "features" },
{ name: "About Us", id: "about" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -279,16 +276,16 @@ export default function ProductPage({ params }: ProductPageProps) {
columns={[
{
title: "Navigation", items: [
{ label: "Home", href: "#hero" },
{ label: "Available Pets", href: "#products" },
{ label: "Adoption Process", href: "#features" },
{ label: "About", href: "#about" }
{ label: "Home", href: "/" },
{ label: "Available Pets", href: "products" },
{ label: "Adoption Process", href: "features" },
{ label: "About", href: "about" }
]
},
{
title: "Support", items: [
{ label: "FAQ", href: "#faq" },
{ label: "Contact Us", href: "#contact" },
{ label: "FAQ", href: "faq" },
{ label: "Contact Us", href: "contact" },
{ label: "Volunteer", href: "#" },
{ label: "Donate", href: "#" }
]
@@ -308,4 +305,4 @@ export default function ProductPage({ params }: ProductPageProps) {
</ReactLenis>
</ThemeProvider>
);
}
}

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

@@ -42,8 +42,7 @@ export default function ShopPage() {
{ name: "Available Pets", id: "products" },
{ name: "Adoption Process", id: "features" },
{ name: "About Us", id: "about" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -56,16 +55,16 @@ export default function ShopPage() {
columns={[
{
title: "Navigation", items: [
{ label: "Home", href: "#hero" },
{ label: "Available Pets", href: "#products" },
{ label: "Adoption Process", href: "#features" },
{ label: "About", href: "#about" }
{ label: "Home", href: "/" },
{ label: "Available Pets", href: "products" },
{ label: "Adoption Process", href: "features" },
{ label: "About", href: "about" }
]
},
{
title: "Support", items: [
{ label: "FAQ", href: "#faq" },
{ label: "Contact Us", href: "#contact" },
{ label: "FAQ", href: "faq" },
{ label: "Contact Us", href: "contact" },
{ label: "Volunteer", href: "#" },
{ label: "Donate", href: "#" }
]
@@ -109,8 +108,7 @@ export default function ShopPage() {
{ name: "Available Pets", id: "products" },
{ name: "Adoption Process", id: "features" },
{ name: "About Us", id: "about" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -131,16 +129,16 @@ export default function ShopPage() {
columns={[
{
title: "Navigation", items: [
{ label: "Home", href: "#hero" },
{ label: "Available Pets", href: "#products" },
{ label: "Adoption Process", href: "#features" },
{ label: "About", href: "#about" }
{ label: "Home", href: "/" },
{ label: "Available Pets", href: "products" },
{ label: "Adoption Process", href: "features" },
{ label: "About", href: "about" }
]
},
{
title: "Support", items: [
{ label: "FAQ", href: "#faq" },
{ label: "Contact Us", href: "#contact" },
{ label: "FAQ", href: "faq" },
{ label: "Contact Us", href: "contact" },
{ label: "Volunteer", href: "#" },
{ label: "Donate", href: "#" }
]
@@ -160,4 +158,4 @@ export default function ShopPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

28
src/app/styles/variables.css
View File

@@ -2,21 +2,21 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #f7f6f7;;
--card: #ffffff;;
--foreground: #0c1325;;
--primary-cta: #0798ff;;
--secondary-cta: #ffffff;;
--accent: #93c7ff;;
--background-accent: #a8cde8;; */
/* --background: #1a0f0a;;
--card: #2a1810;;
--foreground: #ffeae0;;
--primary-cta: #d4a15f;;
--secondary-cta: #2a1810;;
--accent: #e8c49f;;
--background-accent: #a67c52;; */
--background: #f7f6f7;;
--card: #ffffff;;
--foreground: #0c1325;;
--primary-cta: #0798ff;;
--secondary-cta: #ffffff;;
--accent: #93c7ff;;
--background-accent: #a8cde8;;
--background: #1a0f0a;;
--card: #2a1810;;
--foreground: #ffeae0;;
--primary-cta: #d4a15f;;
--secondary-cta: #2a1810;;
--accent: #e8c49f;;
--background-accent: #a67c52;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);