bender/38ca5dc4-96b9-4f6e-91c8-dd0478aafc33
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 20:41:48 +00:00
Conversation 0 Commits 4 Files Changed 4 +76 -71
4 changed files with 76 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,5 @@
"use client";
import React from 'react';
import ReactLenis from "lenis/react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
@@ -27,67 +26,73 @@ export default function BlogPage() {
headingFontWeight="bold"
>
<ReactLenis root>
<NavbarLayoutFloatingOverlay
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "about" },
{ name: "Products", id: "products" },
{ name: "Testimonials", id: "testimonials" },
{ name: "FAQ", id: "faq" },
{ name: "Contact", id: "contact" },
]}
brandName="Смачна Випічка"
button={{ text: "Order Online", href: "#contact" }}
className="py-4 px-6"
buttonClassName="shadow-md"
buttonTextClassName="font-semibold"
/>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Products", id: "/#products" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "FAQ", id: "/#faq" },
{ name: "Contact", id: "/#contact" },
]}
brandName="Смачна Випічка"
button={{ text: "Order Online", href: "/#contact" }}
className="py-4 px-6"
buttonClassName="shadow-md"
buttonTextClassName="font-semibold"
/>
</div>
{isLoading ? (
<div className="w-content-width mx-auto py-20 text-center">
<p className="text-foreground">Loading posts...</p>
</div>
) : (
<BlogCardThree
blogs={posts}
title="From Our Bakery's Blog"
description="Discover the latest news, recipes, and stories from Смачна Випічка."
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={false}
carouselMode="buttons"
/>
<div id="blog" data-section="blog">
<BlogCardThree
blogs={posts}
title="From Our Bakery's Blog"
description="Discover the latest news, recipes, and stories from Смачна Випічка."
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={false}
carouselMode="buttons"
/>
</div>
)}
<FooterMedia
imageSrc="https://img.b2bpic.net/free-photo/white-cheese-bread-with-eggs_140725-3991.jpg?_wi=3"
imageAlt="Warm and inviting Ukrainian bakery interior"
logoText="Смачна Випічка"
copyrightText="© 2024 Смачна Випічка. All rights reserved."
columns={[
{
title: "Menu", items: [
{ label: "Varenyky", href: "#products" },
{ label: "Pampushky", href: "#products" },
{ label: "Medovyk", href: "#products" },
{ label: "Strudel", href: "#products" },
],
},
{
title: "Bakery", items: [
{ label: "Our Story", href: "#about" },
{ label: "FAQ", href: "#faq" },
{ label: "Contact", href: "#contact" },
],
},
{
title: "Follow Us", items: [
{ label: "Facebook", href: "https://facebook.com/smachnavypichka" },
{ label: "Instagram", href: "https://instagram.com/smachnavypichka" },
],
},
]}
/>
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="https://img.b2bpic.net/free-photo/white-cheese-bread-with-eggs_140725-3991.jpg"
imageAlt="Warm and inviting Ukrainian bakery interior"
logoText="Смачна Випічка"
copyrightText="© 2024 Смачна Випічка. All rights reserved."
columns={[
{
title: "Menu", items: [
{ label: "Varenyky", href: "/#products" },
{ label: "Pampushky", href: "/#products" },
{ label: "Medovyk", href: "/#products" },
{ label: "Strudel", href: "/#products" },
],
},
{
title: "Bakery", items: [
{ label: "Our Story", href: "/#about" },
{ label: "FAQ", href: "/#faq" },
{ label: "Contact", href: "/#contact" },
],
},
{
title: "Follow Us", items: [
{ label: "Facebook", href: "https://facebook.com/smachnavypichka" },
{ label: "Instagram", href: "https://instagram.com/smachnavypichka" },
],
},
]}
/>
</div>
</ReactLenis>
</ThemeProvider>
);

20
src/app/page.tsx
View File

@@ -44,7 +44,7 @@ export default function LandingPage() {
<HeroOverlay
title="Смачна Випічка"
description="Authentic Ukrainian flavors, baked fresh daily with love and tradition."
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="Warm and inviting Ukrainian bakery interior with fresh pastries"
textPosition="bottom-left"
showDimOverlay={true}
@@ -91,8 +91,8 @@ export default function LandingPage() {
id: "4", name: "Яблучний Штрудель", price: "$18.00", imageSrc: "https://img.b2bpic.net/free-photo/homemade-apple-strudel_123827-36348.jpg", imageAlt: "Delicious Ukrainian apple strudel with powdered sugar"},
]}
textBoxClassName="p-8"
titleClassName="text-3xl md:text-4xl"
descriptionClassName="text-md md:text-lg"
textBoxTitleClassName="text-3xl md:text-4xl"
textBoxDescriptionClassName="text-md md:text-lg"
cardClassName="hover:scale-105 transition-transform duration-300"
/>
</div>
@@ -110,17 +110,17 @@ export default function LandingPage() {
imageSrc: "https://img.b2bpic.net/free-photo/woman-films-vlog-praising-bio-local-shop_482257-81629.jpg"},
{
id: "2", name: "Dmytro H.", role: "Food Blogger", company: "Lviv Tastings", rating: 5,
imageSrc: "https://img.b2bpic.net/free-photo/man-baker-kitchen-by-pastry-cart_1303-32295.jpg?_wi=1"},
imageSrc: "https://img.b2bpic.net/free-photo/man-baker-kitchen-by-pastry-cart_1303-32295.jpg"},
{
id: "3", name: "Anastasia M.", role: "Community Organizer", company: "Ukrainian Culture Hub", rating: 5,
imageSrc: "https://img.b2bpic.net/free-photo/mother-with-little-charming-daughter-is-sitting-cafeteria-sunlight_291650-1195.jpg"},
{
id: "4", name: "Serhii V.", role: "Chef", company: "Golden Spoon Restaurant", rating: 5,
imageSrc: "https://img.b2bpic.net/free-photo/man-baker-kitchen-by-pastry-cart_1303-32295.jpg?_wi=2"},
imageSrc: "https://img.b2bpic.net/free-photo/man-baker-kitchen-by-pastry-cart_1303-32295.jpg"},
]}
textBoxClassName="p-8"
titleClassName="text-3xl md:text-4xl"
descriptionClassName="text-md md:text-lg"
textBoxTitleClassName="text-3xl md:text-4xl"
textBoxDescriptionClassName="text-md md:text-lg"
cardClassName="h-96"
/>
</div>
@@ -142,8 +142,8 @@ export default function LandingPage() {
id: "4", title: "Do you have gluten-free options?", content: "We offer a selection of gluten-free pastries. Please ask our staff for today's offerings."},
]}
textBoxClassName="p-8"
titleClassName="text-3xl md:text-4xl"
descriptionClassName="text-md md:text-lg"
textBoxTitleClassName="text-3xl md:text-4xl"
textBoxDescriptionClassName="text-md md:text-lg"
/>
</div>
<div id="contact" data-section="contact">
@@ -169,7 +169,7 @@ export default function LandingPage() {
</div>
<div id="footer" data-section="footer">
<FooterMedia
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="Warm and inviting Ukrainian bakery interior"
logoText="Смачна Випічка"
copyrightText="© 2024 Смачна Випічка. All rights reserved."

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

@@ -89,7 +89,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="bold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
navItems={[{ "name": "Home", "id": "/" }, { "name": "Shop", "id": "/shop" }]}
brandName="Смачна Випічка"
@@ -120,7 +120,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="bold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
navItems={[{ "name": "Home", "id": "/" }, { "name": "Shop", "id": "/shop" }]}
brandName="Смачна Випічка"
@@ -158,7 +158,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="bold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
navItems={[{ "name": "Home", "id": "/" }, { "name": "Shop", "id": "/shop" }]}
brandName="Смачна Випічка"
@@ -204,7 +204,7 @@ function ProductPageContent({ params }: ProductPageProps) {
</div>
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="https://img.b2bpic.net/free-photo/white-cheese-bread-with-eggs_140725-3991.jpg?_wi=5"
imageSrc="https://img.b2bpic.net/free-photo/white-cheese-bread-with-eggs_140725-3991.jpg"
imageAlt="Warm and inviting Ukrainian bakery interior"
logoText="Смачна Випічка"
copyrightText="© 2024 Смачна Випічка. All rights reserved."

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

@@ -56,7 +56,7 @@ function ShopPageContent() {
headingFontWeight="bold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
navItems={[{ "name": "Home", "id": "/" }, { "name": "Shop", "id": "/shop" }]}
brandName="Смачна Випічка"
@@ -86,7 +86,7 @@ function ShopPageContent() {
headingFontWeight="bold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
navItems={[{ "name": "Home", "id": "/" }, { "name": "Shop", "id": "/shop" }]}
brandName="Смачна Випічка"
@@ -122,7 +122,7 @@ function ShopPageContent() {
</div>
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="https://img.b2bpic.net/free-photo/white-cheese-bread-with-eggs_140725-3991.jpg?_wi=4"
imageSrc="https://img.b2bpic.net/free-photo/white-cheese-bread-with-eggs_140725-3991.jpg"
imageAlt="Warm and inviting Ukrainian bakery interior"
logoText="Смачна Випічка"
copyrightText="© 2024 Смачна Випічка. All rights reserved."