bender/c0f5df0e-bf53-4671-9bfd-aa44b3e47528
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main

Browse Source 
Merge version_1 into main
This commit was merged in pull request #3.
This commit is contained in:
bender
2026-02-12 13:45:05 +00:00
parent c3c7abd3f7 4330b6a621
commit 560725eae5
2 changed files with 63 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,7 +66,7 @@ export default function ProductPage({ params }: ProductPageProps) {
await checkout(getCheckoutItems(), { successUrl: currentUrl.toString() });
}, [cartItems, checkout, getCheckoutItems]);
const themeProviderProps = {"defaultButtonVariant":"icon-arrow","defaultTextAnimation":"background-highlight","borderRadius":"sharp","contentWidth":"smallMedium","sizing":"mediumLarge","background":"floatingGradient","cardStyle":"glass-depth","primaryButtonStyle":"gradient","secondaryButtonStyle":"solid","headingFontWeight":"semibold"};
// themeProviderProps object removed, props are now directly on ThemeProvider
const navbarProps = {"navItems":[{"name":"Home","id":"/"},{"name":"Adopt","id":"/adopt"},{"name":"About Us","id":"/about"},{"name":"Contact","id":"/contact"},{"name":"Blog","id":"/blog"},{"name":"Shop","id":"/shop"}],"brandName":"Paws & Hearts","bottomLeftText":"Connecting Pets & People","bottomRightText":"hello@pawsandhearts.org","logoHref":"/"};
@@ -74,7 +74,18 @@ export default function ProductPage({ params }: ProductPageProps) {
if (isLoading) {
return (
<ThemeProvider {...themeProviderProps}>
<ThemeProvider
defaultButtonVariant="icon-arrow"
defaultTextAnimation="background-highlight"
borderRadius="sharp"
contentWidth="smallMedium"
sizing="mediumLarge"
background="floatingGradient"
cardStyle="glass-depth"
primaryButtonStyle="gradient"
secondaryButtonStyle="solid"
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarStyleFullscreen
@@ -96,7 +107,18 @@ export default function ProductPage({ params }: ProductPageProps) {
if (!product) {
return (
<ThemeProvider {...themeProviderProps}>
<ThemeProvider
defaultButtonVariant="icon-arrow"
defaultTextAnimation="background-highlight"
borderRadius="sharp"
contentWidth="smallMedium"
sizing="mediumLarge"
background="floatingGradient"
cardStyle="glass-depth"
primaryButtonStyle="gradient"
secondaryButtonStyle="solid"
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarStyleFullscreen
@@ -125,7 +147,18 @@ export default function ProductPage({ params }: ProductPageProps) {
}
return (
<ThemeProvider {...themeProviderProps}>
<ThemeProvider
defaultButtonVariant="icon-arrow"
defaultTextAnimation="background-highlight"
borderRadius="sharp"
contentWidth="smallMedium"
sizing="mediumLarge"
background="floatingGradient"
cardStyle="glass-depth"
primaryButtonStyle="gradient"
secondaryButtonStyle="solid"
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarStyleFullscreen

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

@@ -16,15 +16,26 @@ export default function ShopPage() {
filters,
} = useProductCatalog({ basePath: "/shop" });
const themeProviderProps = {"defaultButtonVariant":"icon-arrow","defaultTextAnimation":"background-highlight","borderRadius":"sharp","contentWidth":"smallMedium","sizing":"mediumLarge","background":"floatingGradient","cardStyle":"glass-depth","primaryButtonStyle":"gradient","secondaryButtonStyle":"solid","headingFontWeight":"semibold"};
// themeProviderProps object removed, props are now directly on ThemeProvider
const navbarProps = {"navItems":[{"name":"Home","id":"/"},{"name":"Adopt","id":"/adopt"},{"name":"About Us","id":"/about"},{"name":"Contact","id":"/contact"},{"name":"Blog","id":"/blog"},{"name":"Shop","id":"/shop"}],"brandName":"Paws & Hearts","bottomLeftText":"Connecting Pets & People","bottomRightText":"hello@pawsandhearts.org","logoHref":"/"};
const footerProps = {"columns":[{"title":"Navigate","items":[{"label":"Home","href":"/"},{"label":"Adopt","href":"/adopt"},{"label":"About Us","href":"/about"}]},{"title":"Support","items":[{"label":"Volunteer","href":"/contact"},{"label":"Donate","href":"/contact"},{"label":"Foster","href":"/contact"}]},{"title":"Connect","items":[{"label":"Contact Us","href":"/contact"},{"label":"FAQ","href":"/contact"},{"label":"Privacy Policy","href":"/privacy"}]}],"bottomLeftText":"© 2024 Paws & Hearts Shelter. All rights reserved.","bottomRightText":"Made with Love & Paws"};
const footerProps = {"columns":[{"title":"Navigate","items":[{"label":"Home","href":"/"},{"label":"Adopt","href":"/adopt"},{"label":"":"About Us","href":"/about"}]},{"title":"Support","items":[{"label":"Volunteer","href":"/contact"},{"label":"Donate","href":"/contact"},{"label":"Foster","href":"/contact"}]},{"title":"Connect","items":[{"label":"Contact Us","href":"/contact"},{"label":"FAQ","href":"/contact"},{"label":"Privacy Policy","href":"/privacy"}]}],"bottomLeftText":"© 2024 Paws & Hearts Shelter. All rights reserved.","bottomRightText":"Made with Love & Paws"};
if (isLoading) {
return (
<ThemeProvider {...themeProviderProps}>
<ThemeProvider
defaultButtonVariant="icon-arrow"
defaultTextAnimation="background-highlight"
borderRadius="sharp"
contentWidth="smallMedium"
sizing="mediumLarge"
background="floatingGradient"
cardStyle="glass-depth"
primaryButtonStyle="gradient"
secondaryButtonStyle="solid"
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarStyleFullscreen
@@ -45,7 +56,18 @@ export default function ShopPage() {
}
return (
<ThemeProvider {...themeProviderProps}>
<ThemeProvider
defaultButtonVariant="icon-arrow"
defaultTextAnimation="background-highlight"
borderRadius="sharp"
contentWidth="smallMedium"
sizing="mediumLarge"
background="floatingGradient"
cardStyle="glass-depth"
primaryButtonStyle="gradient"
secondaryButtonStyle="solid"
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarStyleFullscreen