bender/606f20ed-442f-4da4-85ee-6e384b639b7d
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #2

Merged
bender merged 4 commits from version_1 into main 2026-02-22 17:29:56 +00:00
Conversation 0 Commits 4 Files Changed 4 +35 -50
4 changed files with 35 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,13 +28,13 @@ export default function BlogPage() {
brandName="Baba's Bakery"
navItems={[
{ name: "Home", id: "/" },
{ name: "Menu", id: "products" },
{ name: "Our Story", id: "about" },
{ name: "Reviews", id: "testimonials" },
{ name: "FAQ", id: "faq" },
{ name: "Contact", id: "contact" },
{ name: "Menu", id: "/#products" },
{ name: "Our Story", id: "/#about" },
{ name: "Reviews", id: "/#testimonials" },
{ name: "FAQ", id: "/#faq" },
{ name: "Contact", id: "/#contact" },
]}
button={{ text: "Order Now", href: "#products" }}
button={{ text: "Order Now", href: "/#products" }}
className="py-4 px-6"
buttonClassName="px-5 py-2"
buttonTextClassName="font-semibold"
@@ -63,27 +63,26 @@ export default function BlogPage() {
columns={[
{
title: "Shop", items: [
{ label: "Our Menu", href: "#products" },
{ label: "Custom Orders", href: "#contact" },
{ label: "Our Menu", href: "/#products" },
{ label: "Custom Orders", href: "/#contact" },
],
},
{
title: "About", items: [
{ label: "Our Story", href: "#about" },
{ label: "Reviews", href: "#testimonials" },
{ label: "Our Story", href: "/#about" },
{ label: "Reviews", href: "/#testimonials" },
],
},
{
title: "Support", items: [
{ label: "FAQ", href: "#faq" },
{ label: "Contact Us", href: "#contact" },
{ label: "FAQ", href: "/#faq" },
{ label: "Contact Us", href: "/#contact" },
],
},
]}
copyrightText="© 2024 Baba's Bakery. All rights reserved."
imageSrc="https://img.b2bpic.net/free-photo/front-view-yummy-pastries-with-eggs-flour-milk-dark-wall-bread-food-meal-breakfast-morning-milk-bird-color_179666-17655.jpg?_wi=3"
imageSrc="https://img.b2bpic.net/free-photo/front-view-yummy-pastries-with-eggs-flour-milk-dark-wall-bread-food-meal-breakfast-morning-milk-bird-color_179666-17655.jpg"
imageAlt="Various Ukrainian baked goods on a rustic table"
useInvertedBackground={true}
ariaLabel="Site footer with links and copyright"
/>
</ReactLenis>

13
src/app/page.tsx
View File

@@ -50,7 +50,7 @@ export default function LandingPage() {
{ text: "View Our Menu", href: "#products" },
{ text: "Our Story", href: "#about" },
]}
imageSrc="https://img.b2bpic.net/free-photo/front-view-yummy-pastries-with-eggs-flour-milk-dark-wall-bread-food-meal-breakfast-morning-milk-bird-color_179666-17655.jpg?_wi=1"
imageSrc="https://img.b2bpic.net/free-photo/front-view-yummy-pastries-with-eggs-flour-milk-dark-wall-bread-food-meal-breakfast-morning-milk-bird-color_179666-17655.jpg"
imageAlt="Assortment of traditional Ukrainian pastries on a wooden table"
textPosition="bottom-left"
showBlur={true}
@@ -95,9 +95,6 @@ export default function LandingPage() {
textboxLayout="default"
useInvertedBackground={false}
ariaLabel="Product section featuring Ukrainian baked goods"
titleClassName="text-4xl md:text-5xl lg:text-6xl font-bold"
descriptionClassName="text-lg md:text-xl"
tagClassName="text-foreground text-sm font-medium uppercase tracking-wider"
/>
</div>
@@ -117,9 +114,6 @@ export default function LandingPage() {
textboxLayout="default"
useInvertedBackground={true}
ariaLabel="Customer Testimonials section"
titleClassName="text-4xl md:text-5xl lg:text-6xl font-bold"
descriptionClassName="text-lg md:text-xl"
tagClassName="text-foreground text-sm font-medium uppercase tracking-wider"
/>
</div>
@@ -138,9 +132,6 @@ export default function LandingPage() {
textboxLayout="default"
useInvertedBackground={false}
ariaLabel="FAQ section for bakery"
titleClassName="text-4xl md:text-5xl lg:text-6xl font-bold"
descriptionClassName="text-lg md:text-xl"
tagClassName="text-foreground text-sm font-medium uppercase tracking-wider"
/>
</div>
@@ -174,7 +165,7 @@ export default function LandingPage() {
{ title: "Support", items: [{ label: "FAQ", href: "#faq" }, { label: "Contact Us", href: "#contact" }] },
]}
copyrightText="© 2024 Baba's Bakery. All rights reserved."
imageSrc="https://img.b2bpic.net/free-photo/front-view-yummy-pastries-with-eggs-flour-milk-dark-wall-bread-food-meal-breakfast-morning-milk-bird-color_179666-17655.jpg?_wi=2"
imageSrc="https://img.b2bpic.net/free-photo/front-view-yummy-pastries-with-eggs-flour-milk-dark-wall-bread-food-meal-breakfast-morning-milk-bird-color_179666-17655.jpg"
imageAlt="Various Ukrainian baked goods on a rustic table"
ariaLabel="Site footer with links and copyright"
/>

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

@@ -111,14 +111,13 @@ function ProductPageContent({ params }: ProductPageProps) {
<FooterMedia
logoText="Baba's Bakery"
columns={[
{title: "Shop", items: [{label: "Our Menu", href: "#products"},{label: "Custom Orders", href: "#contact"}]},
{title: "About", items: [{label: "Our Story", href: "#about"},{label: "Reviews", href: "#testimonials"}]},
{title: "Support", items: [{label: "FAQ", href: "#faq"},{label: "Contact Us", href: "#contact"}]}
{title: "Shop", items: [{label: "Our Menu", href: "/#products"},{label: "Custom Orders", href: "/#contact"}]},
{title: "About", items: [{label: "Our Story", href: "/#about"},{label: "Reviews", href: "/#testimonials"}]},
{title: "Support", items: [{label: "FAQ", href: "/#faq"},{label: "Contact Us", href: "/#contact"}]}
]}
copyrightText="© 2024 Baba's Bakery. All rights reserved."
imageSrc="https://img.b2bpic.net/free-photo/front-view-yummy-pastries-with-eggs-flour-milk-dark-wall-bread-food-meal-breakfast-morning-milk-bird-color_179666-17655.jpg?_wi=6"
imageSrc="https://img.b2bpic.net/free-photo/front-view-yummy-pastries-with-eggs-flour-milk-dark-wall-bread-food-meal-breakfast-morning-milk-bird-color_179666-17655.jpg"
imageAlt="Various Ukrainian baked goods on a rustic table"
useInvertedBackground={true}
ariaLabel="Site footer with links and copyright"
/>
</div>
@@ -167,14 +166,13 @@ function ProductPageContent({ params }: ProductPageProps) {
<FooterMedia
logoText="Baba's Bakery"
columns={[
{title: "Shop", items: [{label: "Our Menu", href: "#products"},{label: "Custom Orders", href: "#contact"}]},
{title: "About", items: [{label: "Our Story", href: "#about"},{label: "Reviews", href: "#testimonials"}]},
{title: "Support", items: [{label: "FAQ", href: "#faq"},{label: "Contact Us", href: "#contact"}]}
{title: "Shop", items: [{label: "Our Menu", href: "/#products"},{label: "Custom Orders", href: "/#contact"}]},
{title: "About", items: [{label: "Our Story", href: "/#about"},{label: "Reviews", href: "/#testimonials"}]},
{title: "Support", items: [{label: "FAQ", href: "/#faq"},{label: "Contact Us", href: "/#contact"}]}
]}
copyrightText="© 2024 Baba's Bakery. All rights reserved."
imageSrc="https://img.b2bpic.net/free-photo/front-view-yummy-pastries-with-eggs-flour-milk-dark-wall-bread-food-meal-breakfast-morning-milk-bird-color_179666-17655.jpg?_wi=7"
imageSrc="https://img.b2bpic.net/free-photo/front-view-yummy-pastries-with-eggs-flour-milk-dark-wall-bread-food-meal-breakfast-morning-milk-bird-color_179666-17655.jpg"
imageAlt="Various Ukrainian baked goods on a rustic table"
useInvertedBackground={true}
ariaLabel="Site footer with links and copyright"
/>
</div>
@@ -247,14 +245,13 @@ function ProductPageContent({ params }: ProductPageProps) {
<FooterMedia
logoText="Baba's Bakery"
columns={[
{title: "Shop", items: [{label: "Our Menu", href: "#products"},{label: "Custom Orders", href: "#contact"}]},
{title: "About", items: [{label: "Our Story", href: "#about"},{label: "Reviews", href: "#testimonials"}]},
{title: "Support", items: [{label: "FAQ", href: "#faq"},{label: "Contact Us", href: "#contact"}]}
{title: "Shop", items: [{label: "Our Menu", href: "/#products"},{label: "Custom Orders", href: "/#contact"}]},
{title: "About", items: [{label: "Our Story", href: "/#about"},{label: "Reviews", href: "/#testimonials"}]},
{title: "Support", items: [{label: "FAQ", href: "/#faq"},{label: "Contact Us", href: "/#contact"}]}
]}
copyrightText="© 2024 Baba's Bakery. All rights reserved."
imageSrc="https://img.b2bpic.net/free-photo/front-view-yummy-pastries-with-eggs-flour-milk-dark-wall-bread-food-meal-breakfast-morning-milk-bird-color_179666-17655.jpg?_wi=8"
imageSrc="https://img.b2bpic.net/free-photo/front-view-yummy-pastries-with-eggs-flour-milk-dark-wall-bread-food-meal-breakfast-morning-milk-bird-color_179666-17655.jpg"
imageAlt="Various Ukrainian baked goods on a rustic table"
useInvertedBackground={true}
ariaLabel="Site footer with links and copyright"
/>
</div>

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

@@ -54,14 +54,13 @@ function ShopPageContent() {
<FooterMedia
logoText="Baba's Bakery"
columns={[
{title: "Shop", items: [{label: "Our Menu", href: "#products"},{label: "Custom Orders", href: "#contact"}]},
{title: "About", items: [{label: "Our Story", href: "#about"},{label: "Reviews", href: "#testimonials"}]},
{title: "Support", items: [{label: "FAQ", href: "#faq"},{label: "Contact Us", href: "#contact"}]}
{title: "Shop", items: [{label: "Our Menu", href: "/#products"},{label: "Custom Orders", href: "/#contact"}]},
{title: "About", items: [{label: "Our Story", href: "/#about"},{label: "Reviews", href: "/#testimonials"}]},
{title: "Support", items: [{label: "FAQ", href: "/#faq"},{label: "Contact Us", href: "/#contact"}]}
]}
copyrightText="© 2024 Baba's Bakery. All rights reserved."
imageSrc="https://img.b2bpic.net/free-photo/front-view-yummy-pastries-with-eggs-flour-milk-dark-wall-bread-food-meal-breakfast-morning-milk-bird-color_179666-17655.jpg?_wi=4"
imageSrc="https://img.b2bpic.net/free-photo/front-view-yummy-pastries-with-eggs-flour-milk-dark-wall-bread-food-meal-breakfast-morning-milk-bird-color_179666-17655.jpg"
imageAlt="Various Ukrainian baked goods on a rustic table"
useInvertedBackground={true}
ariaLabel="Site footer with links and copyright"
/>
</div>
@@ -109,14 +108,13 @@ function ShopPageContent() {
<FooterMedia
logoText="Baba's Bakery"
columns={[
{title: "Shop", items: [{label: "Our Menu", href: "#products"},{label: "Custom Orders", href: "#contact"}]},
{title: "About", items: [{label: "Our Story", href: "#about"},{label: "Reviews", href: "#testimonials"}]},
{title: "Support", items: [{label: "FAQ", href: "#faq"},{label: "Contact Us", href: "#contact"}]}
{title: "Shop", items: [{label: "Our Menu", href: "/#products"},{label: "Custom Orders", href: "/#contact"}]},
{title: "About", items: [{label: "Our Story", href: "/#about"},{label: "Reviews", href: "/#testimonials"}]},
{title: "Support", items: [{label: "FAQ", href: "/#faq"},{label: "Contact Us", href: "/#contact"}]}
]}
copyrightText="© 2024 Baba's Bakery. All rights reserved."
imageSrc="https://img.b2bpic.net/free-photo/front-view-yummy-pastries-with-eggs-flour-milk-dark-wall-bread-food-meal-breakfast-morning-milk-bird-color_179666-17655.jpg?_wi=5"
imageSrc="https://img.b2bpic.net/free-photo/front-view-yummy-pastries-with-eggs-flour-milk-dark-wall-bread-food-meal-breakfast-morning-milk-bird-color_179666-17655.jpg"
imageAlt="Various Ukrainian baked goods on a rustic table"
useInvertedBackground={true}
ariaLabel="Site footer with links and copyright"
/>
</div>