bender/7f75b6a9-e8a6-474f-afc5-f7b43014fc3c
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #1

Merged
bender merged 3 commits from version_1 into main 2026-02-21 13:06:03 +00:00
Conversation 0 Commits 3 Files Changed 3 +40 -79
3 changed files with 40 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,31 +9,28 @@ import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
const navItems = [
{ name: "Home", id: "/" },
{ name: "About Us", id: "about-us" },
{ name: "Process", id: "adoption-process" },
{ name: "Pets", id: "available-pets" },
{ name: "Success", id: "success-stories" },
{ name: "FAQs", id: "faq" },
{ name: "Contact", id: "contact-us" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" },
{ name: "Contact", id: "/#contact-us" },
];
const footerColumns = [
{
title: "Adoption", items: [
{ label: "Available Pets", href: "#available-pets" },
{ label: "Adoption Process", href: "#adoption-process" },
{ label: "Available Pets", href: "/#available-pets" },
{ label: "Adoption Process", href: "/#adoption-process" },
],
},
{
title: "Get Involved", items: [
{ label: "Volunteer", href: "#contact-us" },
{ label: "Volunteer", href: "/#contact-us" },
{ label: "Donate", href: "https://example.com/donate" },
],
},
{
title: "About Us", items: [
{ label: "Our Mission", href: "#about-us" },
{ label: "Contact Us", href: "#contact-us" },
{ label: "Our Mission", href: "/#about-us" },
{ label: "Contact Us", href: "/#contact-us" },
],
},
];

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

@@ -1,4 +1,4 @@
use client";
"use client";
import { Suspense, use, useCallback } from "react";
import { useRouter } from "next/navigation";
@@ -16,6 +16,13 @@ interface ProductPageProps {
params: Promise<{ id: string }>;
}
const navItems = [
{ name: "Home", id: "/" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" },
{ name: "Contact", id: "/#contact-us" },
];
export default function ProductPage({ params }: ProductPageProps) {
return (
<Suspense fallback={null}>
@@ -89,20 +96,10 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="bold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple
navItems={[
{ name: "Home", id: "/" },
{ name: "About Us", id: "about-us" },
{ name: "Process", id: "adoption-process" },
{ name: "Pets", id: "available-pets" },
{ name: "Success", id: "success-stories" },
{ name: "FAQs", id: "faq" },
{ name: "Contact", id: "contact-us" },
{ name: "Shop", id: "/shop" },
]}
navItems={navItems}
brandName="Pet Haven"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
@@ -128,20 +125,10 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="bold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple
navItems={[
{ name: "Home", id: "/" },
{ name: "About Us", id: "about-us" },
{ name: "Process", id: "adoption-process" },
{ name: "Pets", id: "available-pets" },
{ name: "Success", id: "success-stories" },
{ name: "FAQs", id: "faq" },
{ name: "Contact", id: "contact-us" },
{ name: "Shop", id: "/shop" },
]}
navItems={navItems}
brandName="Pet Haven"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
@@ -174,20 +161,10 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="bold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple
navItems={[
{ name: "Home", id: "/" },
{ name: "About Us", id: "about-us" },
{ name: "Process", id: "adoption-process" },
{ name: "Pets", id: "available-pets" },
{ name: "Success", id: "success-stories" },
{ name: "FAQs", id: "faq" },
{ name: "Contact", id: "contact-us" },
{ name: "Shop", id: "/shop" },
]}
navItems={navItems}
brandName="Pet Haven"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<div id="product-detail-card" data-section="product-detail-card">
@@ -229,9 +206,9 @@ function ProductPageContent({ params }: ProductPageProps) {
<div id="footer" data-section="footer">
<FooterBaseReveal
columns={[
{ title: "Adoption", items: [{ label: "Available Pets", href: "#available-pets" }, { label: "Adoption Process", href: "#adoption-process" }] },
{ title: "Get Involved", items: [{ label: "Volunteer", href: "#contact-us" }, { label: "Donate", href: "https://example.com/donate" }] },
{ title: "About Us", items: [{ label: "Our Mission", href: "#about-us" }, { label: "Contact Us", href: "#contact-us" }] },
{ title: "Adoption", items: [{ label: "Available Pets", href: "/#available-pets" }, { label: "Adoption Process", href: "/#adoption-process" }] },
{ title: "Get Involved", items: [{ label: "Volunteer", href: "/#contact-us" }, { label: "Donate", href: "https://example.com/donate" }] },
{ title: "About Us", items: [{ label: "Our Mission", href: "/#about-us" }, { label: "Contact Us", href: "/#contact-us" }] },
]}
copyrightText="© 2024 | Pet Haven. All rights reserved."
/>

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

@@ -1,4 +1,4 @@
use client";
"use client";
import { Suspense, useCallback } from "react";
import ReactLenis from "lenis/react";
@@ -11,6 +11,13 @@ import { useProductCatalog } from "@/hooks/useProductCatalog";
import { useCart } from "@/hooks/useCart";
import { useCheckout } from "@/hooks/useCheckout";
const navItems = [
{ name: "Home", id: "/" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" },
{ name: "Contact", id: "/#contact-us" },
];
function ShopPageContent() {
const {
products,
@@ -56,20 +63,10 @@ function ShopPageContent() {
headingFontWeight="bold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple
navItems={[
{ name: "Home", id: "/" },
{ name: "About Us", id: "about-us" },
{ name: "Process", id: "adoption-process" },
{ name: "Pets", id: "available-pets" },
{ name: "Success", id: "success-stories" },
{ name: "FAQs", id: "faq" },
{ name: "Contact", id: "contact-us" },
{ name: "Shop", id: "/shop" },
]}
navItems={navItems}
brandName="Pet Haven"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
@@ -94,20 +91,10 @@ function ShopPageContent() {
headingFontWeight="bold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple
navItems={[
{ name: "Home", id: "/" },
{ name: "About Us", id: "about-us" },
{ name: "Process", id: "adoption-process" },
{ name: "Pets", id: "available-pets" },
{ name: "Success", id: "success-stories" },
{ name: "FAQs", id: "faq" },
{ name: "Contact", id: "contact-us" },
{ name: "Shop", id: "/shop" },
]}
navItems={navItems}
brandName="Pet Haven"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<div id="product-catalog" data-section="product-catalog">
@@ -139,9 +126,9 @@ function ShopPageContent() {
<div id="footer" data-section="footer">
<FooterBaseReveal
columns={[
{ title: "Adoption", items: [{ label: "Available Pets", href: "#available-pets" }, { label: "Adoption Process", href: "#adoption-process" }] },
{ title: "Get Involved", items: [{ label: "Volunteer", href: "#contact-us" }, { label: "Donate", href: "https://example.com/donate" }] },
{ title: "About Us", items: [{ label: "Our Mission", href: "#about-us" }, { label: "Contact Us", href: "#contact-us" }] },
{ title: "Adoption", items: [{ label: "Available Pets", href: "/#available-pets" }, { label: "Adoption Process", href: "/#adoption-process" }] },
{ title: "Get Involved", items: [{ label: "Volunteer", href: "/#contact-us" }, { label: "Donate", href: "https://example.com/donate" }] },
{ title: "About Us", items: [{ label: "Our Mission", href: "/#about-us" }, { label: "Contact Us", href: "/#contact-us" }] },
]}
copyrightText="© 2024 | Pet Haven. All rights reserved."
/>