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_2
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

10 Commits
version_2 ... 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
eafb2e9931 Merge version_2 into main 
Merge version_2 into main
 2026-02-16 10:43:28 +00:00
bender
6b2c6dba84 Merge version_2 into main 
Merge version_2 into main
 2026-02-16 10:31:52 +00:00
6 changed files with 78 additions and 97 deletions
Expand all files Collapse all files

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

@@ -67,16 +67,16 @@ export default function BlogPage() {
columns={[ columns={[
{ {
title: "Navigation", items: [ title: "Navigation", items: [
{ label: "Home", href: "#hero" }, { label: "Home", href: "/" },
{ label: "Available Pets", href: "#products" }, { label: "Available Pets", href: "products" },
{ label: "Adoption Process", href: "#features" }, { label: "Adoption Process", href: "features" },
{ label: "About", href: "#about" } { label: "About", href: "about" }
] ]
}, },
{ {
title: "Support", items: [ title: "Support", items: [
{ label: "FAQ", href: "#faq" }, { label: "FAQ", href: "faq" },
{ label: "Contact Us", href: "#contact" }, { label: "Contact Us", href: "contact" },
{ label: "Volunteer", href: "#" }, { label: "Volunteer", href: "#" },
{ label: "Donate", href: "#" } { label: "Donate", href: "#" }
] ]

41
src/app/layout.tsx
View File

@@ -1,43 +1,25 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { DM_Sans } from "next/font/google"; import { Inter } from "next/font/google";
import "./globals.css"; import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper"; import "./styles/variables.css";
import Tag from "@/tag/Tag"; import "./styles/base.css";
const dmSans = DM_Sans({ const inter = Inter({
variable: "--font-dm-sans", subsets: ["latin"], variable: "--font-inter", subsets: ["latin"],
}); });
export const metadata: Metadata = { 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: { title: "Happy Paws Shelter", description: "Find your perfect pet companion at Happy Paws Shelter"};
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"]
}
};
export default function RootLayout({ export default function RootLayout({
children, children,
}: Readonly<{ }: {
children: React.ReactNode; children: React.ReactNode;
}>) { }) {
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en">
<ServiceWrapper> <body className={inter.variable}>
<body {children}
className={`${dmSans.variable} antialiased`}
>
<Tag />
{children}
<script <script
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
@@ -1257,7 +1239,6 @@ export default function RootLayout({
}} }}
/> />
</body> </body>
</ServiceWrapper>
</html> </html>
); );
} }

22
src/app/page.tsx
View File

@@ -30,7 +30,7 @@ export default function PetShelterPage() {
<NavbarStyleApple <NavbarStyleApple
brandName="Happy Paws Shelter" brandName="Happy Paws Shelter"
navItems={[ navItems={[
{ name: "Home", id: "hero" }, { name: "Home", id: "/" },
{ name: "Available Pets", id: "products" }, { name: "Available Pets", id: "products" },
{ name: "Adoption Process", id: "features" }, { name: "Adoption Process", id: "features" },
{ name: "About Us", id: "about" }, { name: "About Us", id: "about" },
@@ -41,7 +41,7 @@ export default function PetShelterPage() {
<div id="hero" data-section="hero"> <div id="hero" data-section="hero">
<HeroSignup <HeroSignup
title="Give a Lofewfeving 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." description="Find your perfect companion at Happy Paws Shelter. Browse our available pets and start your adoption journey today."
tag="Find Your Match" tag="Find Your Match"
tagIcon={Heart} tagIcon={Heart}
@@ -85,7 +85,7 @@ export default function PetShelterPage() {
useInvertedBackground={false} useInvertedBackground={false}
showBorder={false} showBorder={false}
buttons={[ buttons={[
{ text: "Learn More", href: "#process" } { text: "Learn More", href: "products" }
]} ]}
/> />
</div> </div>
@@ -202,8 +202,8 @@ export default function PetShelterPage() {
background={{ variant: "plain" }} background={{ variant: "plain" }}
useInvertedBackground={false} useInvertedBackground={false}
buttons={[ buttons={[
{ text: "Schedule a Visit", href: "#signup" }, { text: "Schedule a Visit", href: "products" },
{ text: "Contact Us", href: "#footer" } { text: "Contact Us", href: "faq" }
]} ]}
/> />
</div> </div>
@@ -213,16 +213,16 @@ export default function PetShelterPage() {
columns={[ columns={[
{ {
title: "Navigation", items: [ title: "Navigation", items: [
{ label: "Home", href: "#hero" }, { label: "Home", href: "/" },
{ label: "Available Pets", href: "#products" }, { label: "Available Pets", href: "products" },
{ label: "Adoption Process", href: "#features" }, { label: "Adoption Process", href: "features" },
{ label: "About", href: "#about" } { label: "About", href: "about" }
] ]
}, },
{ {
title: "Support", items: [ title: "Support", items: [
{ label: "FAQ", href: "#faq" }, { label: "FAQ", href: "faq" },
{ label: "Contact Us", href: "#contact" }, { label: "Contact Us", href: "contact" },
{ label: "Volunteer", href: "#" }, { label: "Volunteer", href: "#" },
{ label: "Donate", href: "#" } { label: "Donate", href: "#" }
] ]

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

@@ -102,16 +102,16 @@ export default function ProductPage({ params }: ProductPageProps) {
columns={[ columns={[
{ {
title: "Navigation", items: [ title: "Navigation", items: [
{ label: "Home", href: "#hero" }, { label: "Home", href: "/" },
{ label: "Available Pets", href: "#products" }, { label: "Available Pets", href: "products" },
{ label: "Adoption Process", href: "#features" }, { label: "Adoption Process", href: "features" },
{ label: "About", href: "#about" } { label: "About", href: "about" }
] ]
}, },
{ {
title: "Support", items: [ title: "Support", items: [
{ label: "FAQ", href: "#faq" }, { label: "FAQ", href: "faq" },
{ label: "Contact Us", href: "#contact" }, { label: "Contact Us", href: "contact" },
{ label: "Volunteer", href: "#" }, { label: "Volunteer", href: "#" },
{ label: "Donate", href: "#" } { label: "Donate", href: "#" }
] ]
@@ -177,16 +177,16 @@ export default function ProductPage({ params }: ProductPageProps) {
columns={[ columns={[
{ {
title: "Navigation", items: [ title: "Navigation", items: [
{ label: "Home", href: "#hero" }, { label: "Home", href: "/" },
{ label: "Available Pets", href: "#products" }, { label: "Available Pets", href: "products" },
{ label: "Adoption Process", href: "#features" }, { label: "Adoption Process", href: "features" },
{ label: "About", href: "#about" } { label: "About", href: "about" }
] ]
}, },
{ {
title: "Support", items: [ title: "Support", items: [
{ label: "FAQ", href: "#faq" }, { label: "FAQ", href: "faq" },
{ label: "Contact Us", href: "#contact" }, { label: "Contact Us", href: "contact" },
{ label: "Volunteer", href: "#" }, { label: "Volunteer", href: "#" },
{ label: "Donate", href: "#" } { label: "Donate", href: "#" }
] ]
@@ -276,16 +276,16 @@ export default function ProductPage({ params }: ProductPageProps) {
columns={[ columns={[
{ {
title: "Navigation", items: [ title: "Navigation", items: [
{ label: "Home", href: "#hero" }, { label: "Home", href: "/" },
{ label: "Available Pets", href: "#products" }, { label: "Available Pets", href: "products" },
{ label: "Adoption Process", href: "#features" }, { label: "Adoption Process", href: "features" },
{ label: "About", href: "#about" } { label: "About", href: "about" }
] ]
}, },
{ {
title: "Support", items: [ title: "Support", items: [
{ label: "FAQ", href: "#faq" }, { label: "FAQ", href: "faq" },
{ label: "Contact Us", href: "#contact" }, { label: "Contact Us", href: "contact" },
{ label: "Volunteer", href: "#" }, { label: "Volunteer", href: "#" },
{ label: "Donate", href: "#" } { label: "Donate", href: "#" }
] ]

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

@@ -55,16 +55,16 @@ export default function ShopPage() {
columns={[ columns={[
{ {
title: "Navigation", items: [ title: "Navigation", items: [
{ label: "Home", href: "#hero" }, { label: "Home", href: "/" },
{ label: "Available Pets", href: "#products" }, { label: "Available Pets", href: "products" },
{ label: "Adoption Process", href: "#features" }, { label: "Adoption Process", href: "features" },
{ label: "About", href: "#about" } { label: "About", href: "about" }
] ]
}, },
{ {
title: "Support", items: [ title: "Support", items: [
{ label: "FAQ", href: "#faq" }, { label: "FAQ", href: "faq" },
{ label: "Contact Us", href: "#contact" }, { label: "Contact Us", href: "contact" },
{ label: "Volunteer", href: "#" }, { label: "Volunteer", href: "#" },
{ label: "Donate", href: "#" } { label: "Donate", href: "#" }
] ]
@@ -129,16 +129,16 @@ export default function ShopPage() {
columns={[ columns={[
{ {
title: "Navigation", items: [ title: "Navigation", items: [
{ label: "Home", href: "#hero" }, { label: "Home", href: "/" },
{ label: "Available Pets", href: "#products" }, { label: "Available Pets", href: "products" },
{ label: "Adoption Process", href: "#features" }, { label: "Adoption Process", href: "features" },
{ label: "About", href: "#about" } { label: "About", href: "about" }
] ]
}, },
{ {
title: "Support", items: [ title: "Support", items: [
{ label: "FAQ", href: "#faq" }, { label: "FAQ", href: "faq" },
{ label: "Contact Us", href: "#contact" }, { label: "Contact Us", href: "contact" },
{ label: "Volunteer", href: "#" }, { label: "Volunteer", href: "#" },
{ label: "Donate", href: "#" } { label: "Donate", href: "#" }
] ]

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

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