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

Merge version_3 into main #5

Merged
bender merged 6 commits from version_3 into main 2026-02-16 11:20:56 +00:00
Conversation 0 Commits 6 Files Changed 6 +78 -97
6 changed files with 78 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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>
);
}
}

24
src/app/page.tsx
View File

@@ -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 Lofewfeving Pet a New Home"
title="Give a Loving 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}
@@ -85,7 +85,7 @@ export default function PetShelterPage() {
useInvertedBackground={false}
showBorder={false}
buttons={[
{ text: "Learn More", href: "#process" }
{ text: "Learn More", href: "products" }
]}
/>
</div>
@@ -202,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>
@@ -213,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: "#" }
]
@@ -241,4 +241,4 @@ export default function PetShelterPage() {
</div>
</ThemeProvider>
);
}
}

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

@@ -102,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: "#" }
]
@@ -177,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: "#" }
]
@@ -276,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: "#" }
]
@@ -305,4 +305,4 @@ export default function ProductPage({ params }: ProductPageProps) {
</ReactLenis>
</ThemeProvider>
);
}
}

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

@@ -55,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: "#" }
]
@@ -129,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: "#" }
]
@@ -158,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);