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

Merge version_2 into main #2

Merged
bender merged 4 commits from version_2 into main 2026-02-16 10:31:52 +00:00
Conversation 0 Commits 4 Files Changed 4 +30 -32
4 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
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"

43
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';
@@ -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/medium-shot-woman-with-cute-dogs_23-2148928960.jpg", 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>

9
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) }}
/>
@@ -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) }}
/>
@@ -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) }}
/>

6
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) }}
/>
@@ -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) }}
/>