bender/c602efd0-a5c4-460f-be0e-6cc4cc5dffce
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #1

Merged
bender merged 5 commits from version_2 into main 2026-02-17 14:34:45 +00:00
Conversation 0 Commits 5 Files Changed 5 +84 -28
5 changed files with 84 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,13 +36,15 @@ export default function BlogPage() {
brandName="Paw Haven"
navItems={[
{ name: "Home", id: "/" },
{ name: "Adopt", id: "adopt" },
{ name: "About", id: "about" },
{ name: "Success", id: "testimonials" },
{ name: "Support", id: "support" },
{ name: "Contact", id: "contact" },
{ name: "Adopt", id: "/#adopt" },
{ name: "About", id: "/#about" },
{ name: "Success", id: "/#testimonials" },
{ name: "Support", id: "/#support" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" },
{ name: "Contact", id: "/#contact" }
]}
button={{ text: "Donate", href: "#contact" }}
button={{ text: "Donate", href: "/#contact" }}
/>
</div>

15
src/app/page.tsx
View File

@@ -29,8 +29,17 @@ export default function SitePage() {
<div id="nav" data-section="nav">
<NavbarStyleCentered
brandName="Paw Haven"
navItems={[{name: 'Adopt', id: 'adopt'}, {name: 'About', id: 'about'}, {name: 'Success', id: 'testimonials'}, {name: 'Support', id: 'support'}, {name: 'Contact', id: 'contact'}]}
button={{text: 'Donate', href: '#contact'}}
navItems={[
{ name: "Home", id: "/" },
{ name: "Adopt", id: "/#adopt" },
{ name: "About", id: "/#about" },
{ name: "Success", id: "/#testimonials" },
{ name: "Support", id: "/#support" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" },
{ name: "Contact", id: "/#contact" }
]}
button={{text: 'Donate', href: '/#contact'}}
/>
</div>
@@ -154,4 +163,4 @@ export default function SitePage() {
</div>
</ThemeProvider>
);
}
}

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

@@ -85,7 +85,16 @@ export default function ProductPage({ params }: ProductPageProps) {
<div id="navbar" data-section="navbar">
<NavbarStyleCentered
brandName="Paw Haven"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
navItems={[
{ name: "Home", id: "/" },
{ name: "Adopt", id: "/#adopt" },
{ name: "About", id: "/#about" },
{ name: "Success", id: "/#testimonials" },
{ name: "Support", id: "/#support" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" },
{ name: "Contact", id: "/#contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
@@ -129,7 +138,16 @@ export default function ProductPage({ params }: ProductPageProps) {
<div id="navbar" data-section="navbar">
<NavbarStyleCentered
brandName="Paw Haven"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
navItems={[
{ name: "Home", id: "/" },
{ name: "Adopt", id: "/#adopt" },
{ name: "About", id: "/#about" },
{ name: "Success", id: "/#testimonials" },
{ name: "Support", id: "/#support" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" },
{ name: "Contact", id: "/#contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
@@ -180,7 +198,16 @@ export default function ProductPage({ params }: ProductPageProps) {
<div id="navbar" data-section="navbar">
<NavbarStyleCentered
brandName="Paw Haven"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
navItems={[
{ name: "Home", id: "/" },
{ name: "Adopt", id: "/#adopt" },
{ name: "About", id: "/#about" },
{ name: "Success", id: "/#testimonials" },
{ name: "Support", id: "/#support" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" },
{ name: "Contact", id: "/#contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>

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

@@ -60,7 +60,16 @@ export default function ShopPage() {
<div id="navbar" data-section="navbar">
<NavbarStyleCentered
brandName="Paw Haven"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
navItems={[
{ name: "Home", id: "/" },
{ name: "Adopt", id: "/#adopt" },
{ name: "About", id: "/#about" },
{ name: "Success", id: "/#testimonials" },
{ name: "Support", id: "/#support" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" },
{ name: "Contact", id: "/#contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
@@ -103,7 +112,16 @@ export default function ShopPage() {
<div id="navbar" data-section="navbar">
<NavbarStyleCentered
brandName="Paw Haven"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
navItems={[
{ name: "Home", id: "/" },
{ name: "Adopt", id: "/#adopt" },
{ name: "About", id: "/#about" },
{ name: "Success", id: "/#testimonials" },
{ name: "Support", id: "/#support" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" },
{ name: "Contact", id: "/#contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>

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

@@ -2,21 +2,21 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #f5f5f5;;
--card: #ffffff;;
--foreground: #1c1c1c;;
--primary-cta: #1c1c1c;;
--secondary-cta: #ffffff;;
--accent: #6139e6;;
--background-accent: #b3a8e8;; */
/* --background: #0a0a0a;;
--card: #1a1a1a;;
--foreground: #fffffae6;;
--primary-cta: #fde047;;
--secondary-cta: #1a1a1a;;
--accent: #737373;;
--background-accent: #737373;; */
--background: #f5f5f5;;
--card: #ffffff;;
--foreground: #1c1c1c;;
--primary-cta: #1c1c1c;;
--secondary-cta: #ffffff;;
--accent: #6139e6;;
--background-accent: #b3a8e8;;
--background: #0a0a0a;;
--card: #1a1a1a;;
--foreground: #fffffae6;;
--primary-cta: #fde047;;
--secondary-cta: #1a1a1a;;
--accent: #737373;;
--background-accent: #737373;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);