bender/deb8fabe-ab92-4ade-910c-10e5cc0e18ad
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #2

Merged
bender merged 7 commits from version_1 into main 2026-02-22 20:16:24 +00:00
Conversation 0 Commits 7 Files Changed 4 +39 -37
4 changed files with 39 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,15 @@ import FooterMedia from '@/components/sections/footer/FooterMedia';
export default function BlogPage() {
const { posts, isLoading } = useBlogPosts();
const navItems = [
{ name: "Home", id: "/" },
{ name: "About Us", id: "/#about" },
{ name: "Menu", id: "/#products" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "FAQ", id: "/#faq" },
{ name: "Contact", id: "/#contact" },
];
return (
<ThemeProvider
defaultButtonVariant="text-stagger"
@@ -26,16 +35,9 @@ export default function BlogPage() {
<ReactLenis root>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
navItems={[
{ name: "Home", id: "/" },
{ name: "About Us", id: "about" },
{ name: "Menu", id: "products" },
{ name: "Testimonials", id: "testimonials" },
{ name: "FAQ", id: "faq" },
{ name: "Contact", id: "contact" },
]}
navItems={navItems}
brandName="Смачна Випічка"
button={{ text: "Order Now", href: "#contact" }}
button={{ text: "Order Now", href: "/#contact" }}
buttonClassName="min-w-fit px-4 py-2"
buttonTextClassName="font-semibold"
/>
@@ -62,21 +64,21 @@ export default function BlogPage() {
<FooterMedia
logoText="Смачна Випічка"
copyrightText="© 2024 Смачна Випічка. All rights reserved."
imageSrc="https://img.b2bpic.net/free-photo/top-view-fresh-bread-with-milk-eggs-dark-blue-surface_179666-44600.jpg?_wi=2"
imageSrc="https://img.b2bpic.net/free-photo/top-view-fresh-bread-with-milk-eggs-dark-blue-surface_179666-44600.jpg"
imageAlt="Traditional Ukrainian baking tools"
columns={[
{
title: "Menu", items: [
{ label: "Babka", href: "#products" },
{ label: "Pampushky", href: "#products" },
{ label: "Varenyky", href: "#products" },
{ label: "Babka", href: "/#products" },
{ label: "Pampushky", href: "/#products" },
{ label: "Varenyky", href: "/#products" },
],
},
{
title: "Bakery", items: [
{ label: "Our Story", href: "#about" },
{ label: "FAQ", href: "#faq" },
{ label: "Contact", href: "#contact" },
{ label: "Our Story", href: "/#about" },
{ label: "FAQ", href: "/#faq" },
{ label: "Contact", href: "/#contact" },
],
},
]}

18
src/app/page.tsx
View File

@@ -55,7 +55,7 @@ export default function LandingPage() {
title="Our Story: Where Tradition Meets Taste"
description="At Смачна Випічка, we are passionate about preserving the culinary art of Ukraine. Every loaf, pastry, and cake is a testament to generations of baking wisdom, crafted with the finest ingredients and heartfelt dedication. We invite you to taste the tradition."
tag="About Us"
imageSrc="https://img.b2bpic.net/free-photo/white-cheese-bread-with-eggs_140725-3991.jpg?_wi=1"
imageSrc="https://img.b2bpic.net/free-photo/white-cheese-bread-with-eggs_140725-3991.jpg"
imageAlt="Traditional Ukrainian bakery interior with a baker"
useInvertedBackground={false}
buttons={[{'text':'See Our Process','href':'#contact'}]}
@@ -77,8 +77,8 @@ export default function LandingPage() {
gridVariant="three-columns-all-equal-width"
tagAnimation="slide-up"
buttonAnimation="slide-up"
titleClassName="text-balance"
descriptionClassName="max-w-xl"
textBoxTitleClassName="text-balance"
textBoxDescriptionClassName="max-w-xl"
/>
</div>
<div id="testimonials" data-section="testimonials">
@@ -93,8 +93,8 @@ export default function LandingPage() {
useInvertedBackground={false}
tagAnimation="slide-up"
buttonAnimation="slide-up"
titleClassName="text-balance"
descriptionClassName="max-w-xl"
textBoxTitleClassName="text-balance"
textBoxDescriptionClassName="max-w-xl"
/>
</div>
<div id="faq" data-section="faq">
@@ -109,8 +109,8 @@ export default function LandingPage() {
animationType="smooth"
tagAnimation="slide-up"
buttonAnimation="slide-up"
titleClassName="text-balance"
descriptionClassName="max-w-xl"
textBoxTitleClassName="text-balance"
textBoxDescriptionClassName="max-w-xl"
/>
</div>
<div id="contact" data-section="contact">
@@ -121,7 +121,7 @@ export default function LandingPage() {
textarea={{'name':'message','placeholder':'Your Message or Order Details...','rows':5,'required':true}}
buttonText="Send Message"
useInvertedBackground={false}
imageSrc="https://img.b2bpic.net/free-photo/white-cheese-bread-with-eggs_140725-3991.jpg?_wi=2"
imageSrc="https://img.b2bpic.net/free-photo/white-cheese-bread-with-eggs_140725-3991.jpg"
imageAlt="Exterior of a traditional Ukrainian bakery"
mediaAnimation="slide-up"
mediaPosition="right"
@@ -133,7 +133,7 @@ export default function LandingPage() {
<FooterMedia
logoText="Смачна Випічка"
copyrightText="© 2024 Смачна Випічка. All rights reserved."
imageSrc="https://img.b2bpic.net/free-photo/top-view-fresh-bread-with-milk-eggs-dark-blue-surface_179666-44600.jpg?_wi=1"
imageSrc="https://img.b2bpic.net/free-photo/top-view-fresh-bread-with-milk-eggs-dark-blue-surface_179666-44600.jpg"
imageAlt="Traditional Ukrainian baking tools"
columns={[{'title':'Menu','items':[{'label':'Babka','href':'#products'},{'label':'Pampushky','href':'#products'},{'label':'Varenyky','href':'#products'}]},{'title':'Bakery','items':[{'label':'Our Story','href':'#about'},{'label':'FAQ','href':'#faq'},{'label':'Contact','href':'#contact'}]}]}
mediaClassName="h-80"

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

@@ -74,7 +74,7 @@ function ProductPageContent({ params }: ProductPageProps) {
await checkout(getCheckoutItems(), { successUrl: currentUrl.toString() });
}, [cartItems, checkout, getCheckoutItems]);
const navItems = [{"name":"Home","id":"/"},{"name":"About Us","id":"about"},{"name":"Menu","id":"products"},{"name":"Testimonials","id":"testimonials"},{"name":"FAQ","id":"faq"},{"name":"Contact","id":"contact"},{"name":"Shop","id":"/shop"}].filter(item => item.id.startsWith('/'));
const navItems = [{"name":"Home","id":"/"},{"name":"About Us","id":"/#about"},{"name":"Menu","id":"/#products"},{"name":"Testimonials","id":"/#testimonials"},{"name":"FAQ","id":"/#faq"},{"name":"Contact","id":"/#contact"},{"name":"Shop","id":"/shop"}].filter(item => item.id.startsWith('/'));
if (isLoading) {
return (
@@ -107,9 +107,9 @@ function ProductPageContent({ params }: ProductPageProps) {
<FooterMedia
logoText="Смачна Випічка"
copyrightText="© 2024 Смачна Випічка. All rights reserved."
imageSrc="https://img.b2bpic.net/free-photo/top-view-fresh-bread-with-milk-eggs-dark-blue-surface_179666-44600.jpg?_wi=5"
imageSrc="https://img.b2bpic.net/free-photo/top-view-fresh-bread-with-milk-eggs-dark-blue-surface_179666-44600.jpg"
imageAlt="Traditional Ukrainian baking tools"
columns={[{"title":"Menu","items":[{"label":"Babka","href":"#products"},{"label":"Pampushky","href":"#products"},{"label":"Varenyky","href":"#products"}]},{"title":"Bakery","items":[{"label":"Our Story","href":"#about"},{"label":"FAQ","href":"#faq"},{"label":"Contact","href":"#contact"}]}]}
columns={[{'title':'Menu','items':[{'label':'Babka','href':'/#products'},{'label':'Pampushky','href':'/#products'},{'label':'Varenyky','href':'/#products'}]},{'title':'Bakery','items':[{'label':'Our Story','href':'/#about'},{'label':'FAQ','href':'/#faq'},{'label':'Contact','href':'/#contact'}]}]}
mediaClassName="h-80"
mediaWrapperClassName="h-80"
logoTextClassName="text-2xl font-bold"
@@ -164,9 +164,9 @@ function ProductPageContent({ params }: ProductPageProps) {
<FooterMedia
logoText="Смачна Випічка"
copyrightText="© 2024 Смачна Випічка. All rights reserved."
imageSrc="https://img.b2bpic.net/free-photo/top-view-fresh-bread-with-milk-eggs-dark-blue-surface_179666-44600.jpg?_wi=6"
imageSrc="https://img.b2bpic.net/free-photo/top-view-fresh-bread-with-milk-eggs-dark-blue-surface_179666-44600.jpg"
imageAlt="Traditional Ukrainian baking tools"
columns={[{"title":"Menu","items":[{"label":"Babka","href":"#products"},{"label":"Pampushky","href":"#products"},{"label":"Varenyky","href":"#products"}]},{"title":"Bakery","items":[{"label":"Our Story","href":"#about"},{"label":"FAQ","href":"#faq"},{"label":"Contact","href":"#contact"}]}]}
columns={[{'title':'Menu','items':[{'label':'Babka','href':'/#products'},{'label':'Pampushky','href':'/#products'},{'label':'Varenyky','href':'/#products'}]},{'title':'Bakery','items':[{'label':'Our Story','href':'/#about'},{'label':'FAQ','href':'/#faq'},{'label':'Contact','href':'/#contact'}]}]}
mediaClassName="h-80"
mediaWrapperClassName="h-80"
logoTextClassName="text-2xl font-bold"
@@ -245,9 +245,9 @@ function ProductPageContent({ params }: ProductPageProps) {
<FooterMedia
logoText="Смачна Випічка"
copyrightText="© 2024 Смачна Випічка. All rights reserved."
imageSrc="https://img.b2bpic.net/free-photo/top-view-fresh-bread-with-milk-eggs-dark-blue-surface_179666-44600.jpg?_wi=7"
imageSrc="https://img.b2bpic.net/free-photo/top-view-fresh-bread-with-milk-eggs-dark-blue-surface_179666-44600.jpg"
imageAlt="Traditional Ukrainian baking tools"
columns={[{"title":"Menu","items":[{"label":"Babka","href":"#products"},{"label":"Pampushky","href":"#products"},{"label":"Varenyky","href":"#products"}]},{"title":"Bakery","items":[{"label":"Our Story","href":"#about"},{"label":"FAQ","href":"#faq"},{"label":"Contact","href":"#contact"}]}]}
columns={[{'title':'Menu','items':[{'label':'Babka','href':'/#products'},{'label':'Pampushky','href':'/#products'},{'label':'Varenyky','href':'/#products'}]},{'title':'Bakery','items':[{'label':'Our Story','href':'/#about'},{'label':'FAQ','href':'/#faq'},{'label':'Contact','href':'/#contact'}]}]}
mediaClassName="h-80"
mediaWrapperClassName="h-80"
logoTextClassName="text-2xl font-bold"

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

@@ -39,7 +39,7 @@ function ShopPageContent() {
await checkout(getCheckoutItems(), { successUrl: currentUrl.toString() });
}, [cartItems, checkout, getCheckoutItems]);
const navItems = [{"name":"Home","id":"/"},{"name":"About Us","id":"about"},{"name":"Menu","id":"products"},{"name":"Testimonials","id":"testimonials"},{"name":"FAQ","id":"faq"},{"name":"Contact","id":"contact"},{"name":"Shop","id":"/shop"}].filter(item => item.id.startsWith('/'));
const navItems = [{"name":"Home","id":"/"},{"name":"About Us","id":"/#about"},{"name":"Menu","id":"/#products"},{"name":"Testimonials","id":"/#testimonials"},{"name":"FAQ","id":"/#faq"},{"name":"Contact","id":"/#contact"},{"name":"Shop","id":"/shop"}].filter(item => item.id.startsWith('/'));
if (isLoading) {
return (
@@ -72,9 +72,9 @@ function ShopPageContent() {
<FooterMedia
logoText="Смачна Випічка"
copyrightText="© 2024 Смачна Випічка. All rights reserved."
imageSrc="https://img.b2bpic.net/free-photo/top-view-fresh-bread-with-milk-eggs-dark-blue-surface_179666-44600.jpg?_wi=3"
imageSrc="https://img.b2bpic.net/free-photo/top-view-fresh-bread-with-milk-eggs-dark-blue-surface_179666-44600.jpg"
imageAlt="Traditional Ukrainian baking tools"
columns={[{"title":"Menu","items":[{"label":"Babka","href":"#products"},{"label":"Pampushky","href":"#products"},{"label":"Varenyky","href":"#products"}]},{"title":"Bakery","items":[{"label":"Our Story","href":"#about"},{"label":"FAQ","href":"#faq"},{"label":"Contact","href":"#contact"}]}]}
columns={[{'title':'Menu','items':[{'label':'Babka','href':'/#products'},{'label':'Pampushky','href':'/#products'},{'label':'Varenyky','href':'/#products'}]},{'title':'Bakery','items':[{'label':'Our Story','href':'/#about'},{'label':'FAQ','href':'/#faq'},{'label':'Contact','href':'/#contact'}]}]}
mediaClassName="h-80"
mediaWrapperClassName="h-80"
logoTextClassName="text-2xl font-bold"
@@ -143,9 +143,9 @@ function ShopPageContent() {
<FooterMedia
logoText="Смачна Випічка"
copyrightText="© 2024 Смачна Випічка. All rights reserved."
imageSrc="https://img.b2bpic.net/free-photo/top-view-fresh-bread-with-milk-eggs-dark-blue-surface_179666-44600.jpg?_wi=4"
imageSrc="https://img.b2bpic.net/free-photo/top-view-fresh-bread-with-milk-eggs-dark-blue-surface_179666-44600.jpg"
imageAlt="Traditional Ukrainian baking tools"
columns={[{"title":"Menu","items":[{"label":"Babka","href":"#products"},{"label":"Pampushky","href":"#products"},{"label":"Varenyky","href":"#products"}]},{"title":"Bakery","items":[{"label":"Our Story","href":"#about"},{"label":"FAQ","href":"#faq"},{"label":"Contact","href":"#contact"}]}]}
columns={[{'title':'Menu','items':[{'label':'Babka','href':'/#products'},{'label':'Pampushky','href':'/#products'},{'label':'Varenyky','href':'/#products'}]},{'title':'Bakery','items':[{'label':'Our Story','href':'/#about'},{'label':'FAQ','href':'/#faq'},{'label':'Contact','href':'/#contact'}]}]}
mediaClassName="h-80"
mediaWrapperClassName="h-80"
logoTextClassName="text-2xl font-bold"