bender/042bd653-9df5-4a9b-8e5a-21c86c4ba277
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 13:40:06 +00:00
Conversation 0 Commits 4 Files Changed 4 +20 -23
4 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,15 +32,15 @@ export default function BlogPage() {
<NavbarLayoutFloatingOverlay
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "about" },
{ name: "Products", id: "products" },
{ name: "Process", id: "process" },
{ name: "Testimonials", id: "testimonials" },
{ name: "FAQ", id: "faq" },
{ name: "Contact", id: "contact" },
{ name: "About", id: "/#about" },
{ name: "Products", id: "/#products" },
{ name: "Process", id: "/#process" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "FAQ", id: "/#faq" },
{ name: "Contact", id: "/#contact" },
]}
brandName="Смачна Випічка"
button={{ text: "Order Now", href: "#contact" }}
button={{ text: "Order Now", href: "/#contact" }}
buttonClassName="min-w-32"
className="bg-white/80 backdrop-blur-sm shadow-md"
/>
@@ -70,15 +70,15 @@ export default function BlogPage() {
columns={[
{
title: "Bakery", items: [
{ label: "Our Story", href: "#about" },
{ label: "Products", href: "#products" },
{ label: "Process", href: "#process" },
{ label: "Our Story", href: "/#about" },
{ label: "Products", href: "/#products" },
{ label: "Process", href: "/#process" },
],
},
{
title: "Support", items: [
{ label: "FAQ", href: "#faq" },
{ label: "Contact Us", href: "#contact" },
{ label: "FAQ", href: "/#faq" },
{ label: "Contact Us", href: "/#contact" },
],
},
{
@@ -89,7 +89,6 @@ export default function BlogPage() {
},
]}
copyrightText="© 2024 Смачна Випічка. All rights reserved."
useInvertedBackground={false}
className="py-10 bg-background-accent text-primary-cta-text"
logoTextClassName="font-extrabold text-3xl"
columnTitleClassName="font-bold text-lg"

4
src/app/page.tsx
View File

@@ -54,7 +54,7 @@ export default function LandingPage() {
{ text: "Learn More", href: "#about" },
]}
background={{ variant: "plain" }}
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="Assortment of fresh Ukrainian breads and pastries"
className="min-h-[75svh] md:min-h-[85svh] lg:min-h-[90svh]"
cardWrapperClassName="shadow-xl rounded-soft border border-gray-200/50"
@@ -104,7 +104,7 @@ export default function LandingPage() {
{
id: "honey-cake", name: "Classic Medovyk", price: "$35.00", variant: "Layers of Honey Goodness", imageSrc: "https://img.b2bpic.net/free-photo/piece-homemade-honey-cake-with-dried-flowers-honey-spoon-wool-tablecloth_114579-17241.jpg", imageAlt: "A slice of layered Ukrainian honey cake (Medovyk)"},
{
id: "kolach", name: "Braided Kolach", price: "$12.00", variant: "Festive & Flavorful", imageSrc: "https://img.b2bpic.net/free-photo/vertical-view-whole-black-bread-brown-towel-potteries-dark-colors-surface_179666-24652.jpg?_wi=2", imageAlt: "A beautifully braided Ukrainian Kolach bread"},
id: "kolach", name: "Braided Kolach", price: "$12.00", variant: "Festive & Flavorful", imageSrc: "https://img.b2bpic.net/free-photo/vertical-view-whole-black-bread-brown-towel-potteries-dark-colors-surface_179666-24652.jpg", imageAlt: "A beautifully braided Ukrainian Kolach bread"},
]}
animationType="slide-up"
textboxLayout="default"

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

@@ -1,4 +1,4 @@
use client";
"use client";
import { Suspense, use, useCallback } from "react";
import { useRouter } from "next/navigation";
@@ -173,12 +173,11 @@ function ProductPageContent({ params }: ProductPageProps) {
<FooterBase
logoText="Смачна Випічка"
columns={[
{ title: "Bakery", items: [{ label: "Our Story", href: "#about" }, { label: "Products", href: "#products" }, { label: "Process", href: "#process" }] },
{ title: "Support", items: [{ label: "FAQ", href: "#faq" }, { label: "Contact Us", href: "#contact" }] },
{ title: "Bakery", items: [{ label: "Our Story", href: "/#about" }, { label: "Products", href: "/#products" }, { label: "Process", href: "/#process" }] },
{ title: "Support", items: [{ label: "FAQ", href: "/#faq" }, { label: "Contact Us", href: "/#contact" }] },
{ title: "Legal", items: [{ label: "Privacy Policy", href: "/privacy" }, { label: "Terms of Service", href: "/terms" }] }
]}
copyrightText="© 2024 Смачна Випічка. All rights reserved."
useInvertedBackground={false}
className="py-10 bg-background-accent text-primary-cta-text"
logoTextClassName="font-extrabold text-3xl"
columnTitleClassName="font-bold text-lg"

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

@@ -1,4 +1,4 @@
use client";
"use client";
import { Suspense, useCallback } from "react";
import ReactLenis from "lenis/react";
@@ -106,12 +106,11 @@ function ShopPageContent() {
<FooterBase
logoText="Смачна Випічка"
columns={[
{ title: "Bakery", items: [{ label: "Our Story", href: "#about" }, { label: "Products", href: "#products" }, { label: "Process", href: "#process" }] },
{ title: "Support", items: [{ label: "FAQ", href: "#faq" }, { label: "Contact Us", href: "#contact" }] },
{ title: "Bakery", items: [{ label: "Our Story", href: "/#about" }, { label: "Products", href: "/#products" }, { label: "Process", href: "/#process" }] },
{ title: "Support", items: [{ label: "FAQ", href: "/#faq" }, { label: "Contact Us", href: "/#contact" }] },
{ title: "Legal", items: [{ label: "Privacy Policy", href: "/privacy" }, { label: "Terms of Service", href: "/terms" }] }
]}
copyrightText="© 2024 Смачна Випічка. All rights reserved."
useInvertedBackground={false}
className="py-10 bg-background-accent text-primary-cta-text"
logoTextClassName="font-extrabold text-3xl"
columnTitleClassName="font-bold text-lg"