bender/adfafd9d-7ee1-4f0e-b94e-afa554eea7a1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #2

Merged
bender merged 5 commits from version_1 into main 2026-02-22 21:52:13 +00:00
Conversation 0 Commits 5 Files Changed 4 +64 -21
4 changed files with 64 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,13 +28,9 @@ export default function BlogPage() {
brandName="Baba's Bakery"
navItems={[
{ name: "Home", id: "/" },
{ name: "About Us", id: "about" },
{ name: "Products", id: "products" },
{ name: "Testimonials", id: "testimonials" },
{ name: "FAQ", id: "faq" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
]}
button={{ text: "Order Now", href: "#contact" }}
button={{ text: "Shop Now", href: "/shop" }}
className="py-4 px-6 md:px-8 lg:px-12 xl:px-16"
/>
</div>

4
src/app/page.tsx
View File

@@ -41,7 +41,7 @@ export default function LandingPage() {
<HeroOverlay
title="Authentic Ukrainian Baking, Made with Love"
description="Step into Baba's Bakery and discover a taste of tradition. We craft exquisite breads, pastries, and savory delights using time-honored recipes passed down through generations."
imageSrc="https://img.b2bpic.net/free-photo/vertical-view-whole-black-bread-brown-towel-potteries-dark-colors-surface_179666-24652.jpg?_wi=1"
imageSrc="https://img.b2bpic.net/free-photo/vertical-view-whole-black-bread-brown-towel-potteries-dark-colors-surface_179666-24652.jpg"
imageAlt="Warm Ukrainian bakery interior with fresh baked goods"
textPosition="bottom-left"
showBlur={true}
@@ -134,7 +134,7 @@ export default function LandingPage() {
textarea={{ name: "message", placeholder: "Your Message or Order Request...", rows: 5, required: true }}
buttonText="Send Message"
mediaAnimation="opacity"
imageSrc="https://img.b2bpic.net/free-photo/vertical-view-whole-black-bread-brown-towel-potteries-dark-colors-surface_179666-24652.jpg?_wi=2"
imageSrc="https://img.b2bpic.net/free-photo/vertical-view-whole-black-bread-brown-towel-potteries-dark-colors-surface_179666-24652.jpg"
imageAlt="Cozy bakery interior with counter"
mediaPosition="right"
useInvertedBackground={false}

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

@@ -73,10 +73,6 @@ function ProductPageContent({ params }: ProductPageProps) {
await checkout(getCheckoutItems(), { successUrl: currentUrl.toString() });
}, [cartItems, checkout, getCheckoutItems]);
const themeProviderProps = {
defaultButtonVariant: "shift-hover", defaultTextAnimation: "entrance-slide", borderRadius: "rounded", contentWidth: "small", sizing: "largeSmallSizeLargeTitles", background: "floatingGradient", cardStyle: "glass-elevated", primaryButtonStyle: "shadow", secondaryButtonStyle: "glass", headingFontWeight: "bold"
};
const navbarProps = {
brandName: "Baba's Bakery", navItems: [
{ name: "Home", id: "/" },
@@ -88,7 +84,18 @@ function ProductPageContent({ params }: ProductPageProps) {
if (isLoading) {
return (
<ThemeProvider {...themeProviderProps}>
<ThemeProvider
defaultButtonVariant="shift-hover"
defaultTextAnimation="entrance-slide"
borderRadius="rounded"
contentWidth="small"
sizing="largeSmallSizeLargeTitles"
background="floatingGradient"
cardStyle="glass-elevated"
primaryButtonStyle="shadow"
secondaryButtonStyle="glass"
headingFontWeight="bold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarLayoutFloatingOverlay {...navbarProps} />
@@ -103,7 +110,18 @@ function ProductPageContent({ params }: ProductPageProps) {
if (!product) {
return (
<ThemeProvider {...themeProviderProps}>
<ThemeProvider
defaultButtonVariant="shift-hover"
defaultTextAnimation="entrance-slide"
borderRadius="rounded"
contentWidth="small"
sizing="largeSmallSizeLargeTitles"
background="floatingGradient"
cardStyle="glass-elevated"
primaryButtonStyle="shadow"
secondaryButtonStyle="glass"
headingFontWeight="bold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarLayoutFloatingOverlay {...navbarProps} />
@@ -125,7 +143,18 @@ function ProductPageContent({ params }: ProductPageProps) {
}
return (
<ThemeProvider {...themeProviderProps}>
<ThemeProvider
defaultButtonVariant="shift-hover"
defaultTextAnimation="entrance-slide"
borderRadius="rounded"
contentWidth="small"
sizing="largeSmallSizeLargeTitles"
background="floatingGradient"
cardStyle="glass-elevated"
primaryButtonStyle="shadow"
secondaryButtonStyle="glass"
headingFontWeight="bold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarLayoutFloatingOverlay {...navbarProps} />

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

@@ -40,10 +40,6 @@ function ShopPageContent() {
await checkout(getCheckoutItems(), { successUrl: currentUrl.toString() });
}, [cartItems, checkout, getCheckoutItems]);
const themeProviderProps = {
defaultButtonVariant: "shift-hover", defaultTextAnimation: "entrance-slide", borderRadius: "rounded", contentWidth: "small", sizing: "largeSmallSizeLargeTitles", background: "floatingGradient", cardStyle: "glass-elevated", primaryButtonStyle: "shadow", secondaryButtonStyle: "glass", headingFontWeight: "bold"
};
const navbarProps = {
brandName: "Baba's Bakery", navItems: [
{ name: "Home", id: "/" },
@@ -55,7 +51,18 @@ function ShopPageContent() {
if (isLoading) {
return (
<ThemeProvider {...themeProviderProps}>
<ThemeProvider
defaultButtonVariant="shift-hover"
defaultTextAnimation="entrance-slide"
borderRadius="rounded"
contentWidth="small"
sizing="largeSmallSizeLargeTitles"
background="floatingGradient"
cardStyle="glass-elevated"
primaryButtonStyle="shadow"
secondaryButtonStyle="glass"
headingFontWeight="bold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarLayoutFloatingOverlay {...navbarProps} />
@@ -69,7 +76,18 @@ function ShopPageContent() {
}
return (
<ThemeProvider {...themeProviderProps}>
<ThemeProvider
defaultButtonVariant="shift-hover"
defaultTextAnimation="entrance-slide"
borderRadius="rounded"
contentWidth="small"
sizing="largeSmallSizeLargeTitles"
background="floatingGradient"
cardStyle="glass-elevated"
primaryButtonStyle="shadow"
secondaryButtonStyle="glass"
headingFontWeight="bold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarLayoutFloatingOverlay {...navbarProps} />