bender/c5ad0342-0e52-4e26-acd2-4fc19dbd7fae
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #2

Merged
bender merged 3 commits from version_2 into main 2026-02-19 12:54:46 +00:00
Conversation 0 Commits 3 Files Changed 3 +27 -38
3 changed files with 27 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
"use client";
import ReactLenis from "lenis/react";
import BlogCardTwo from '@/components/sections/blog/BlogCardTwo';
import BlogCardThree from '@/components/sections/blog/BlogCardThree';
import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
@@ -28,7 +28,6 @@ export default function BlogPage() {
<NavbarLayoutFloatingOverlay
brandName="Koliba Ukrainska"
navItems={[
{ name: "Home", id: "/" },
{ name: "Philosophy", id: "about" },
{ name: "Menu", id: "menu" },
{ name: "Banquets", id: "banquets" },
@@ -47,7 +46,7 @@ export default function BlogPage() {
</div>
) : (
<div id="blog" data-section="blog">
<BlogCardTwo
<BlogCardThree
blogs={posts}
title="Ukrainian Culinary Stories"
description="Discover the rich traditions and authentic flavors that define our Ukrainian heritage through stories from our kitchen"

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

@@ -85,13 +85,11 @@ export default function ProductPage({ params }: ProductPageProps) {
<NavbarLayoutFloatingOverlay
brandName="Koliba Ukrainska"
navItems={[
{"name":"Home","id":"/"},
{"name":"Philosophy","id":"about"},
{"name":"Menu","id":"menu"},
{"name":"Banquets","id":"banquets"},
{"name":"Delivery","id":"delivery"},
{"name":"Contacts","id":"contact"},
{"name":"Shop","id":"/shop"}
{ name: "Philosophy", id: "about" },
{ name: "Menu", id: "menu" },
{ name: "Banquets", id: "banquets" },
{ name: "Delivery", id: "delivery" },
{ name: "Contacts", id: "contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
buttonClassName="rounded-full px-6 py-2"
@@ -135,13 +133,11 @@ export default function ProductPage({ params }: ProductPageProps) {
<NavbarLayoutFloatingOverlay
brandName="Koliba Ukrainska"
navItems={[
{"name":"Home","id":"/"},
{"name":"Philosophy","id":"about"},
{"name":"Menu","id":"menu"},
{"name":"Banquets","id":"banquets"},
{"name":"Delivery","id":"delivery"},
{"name":"Contacts","id":"contact"},
{"name":"Shop","id":"/shop"}
{ name: "Philosophy", id: "about" },
{ name: "Menu", id: "menu" },
{ name: "Banquets", id: "banquets" },
{ name: "Delivery", id: "delivery" },
{ name: "Contacts", id: "contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
buttonClassName="rounded-full px-6 py-2"
@@ -192,13 +188,11 @@ export default function ProductPage({ params }: ProductPageProps) {
<NavbarLayoutFloatingOverlay
brandName="Koliba Ukrainska"
navItems={[
{"name":"Home","id":"/"},
{"name":"Philosophy","id":"about"},
{"name":"Menu","id":"menu"},
{"name":"Banquets","id":"banquets"},
{"name":"Delivery","id":"delivery"},
{"name":"Contacts","id":"contact"},
{"name":"Shop","id":"/shop"}
{ name: "Philosophy", id: "about" },
{ name: "Menu", id: "menu" },
{ name: "Banquets", id: "banquets" },
{ name: "Delivery", id: "delivery" },
{ name: "Contacts", id: "contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
buttonClassName="rounded-full px-6 py-2"

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

@@ -38,13 +38,11 @@ export default function ShopPage() {
<NavbarLayoutFloatingOverlay
brandName="Koliba Ukrainska"
navItems={[
{"name":"Home","id":"/"},
{"name":"Philosophy","id":"about"},
{"name":"Menu","id":"menu"},
{"name":"Banquets","id":"banquets"},
{"name":"Delivery","id":"delivery"},
{"name":"Contacts","id":"contact"},
{"name":"Shop","id":"/shop"}
{ name: "Philosophy", id: "about" },
{ name: "Menu", id: "menu" },
{ name: "Banquets", id: "banquets" },
{ name: "Delivery", id: "delivery" },
{ name: "Contacts", id: "contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
buttonClassName="rounded-full px-6 py-2"
@@ -87,13 +85,11 @@ export default function ShopPage() {
<NavbarLayoutFloatingOverlay
brandName="Koliba Ukrainska"
navItems={[
{"name":"Home","id":"/"},
{"name":"Philosophy","id":"about"},
{"name":"Menu","id":"menu"},
{"name":"Banquets","id":"banquets"},
{"name":"Delivery","id":"delivery"},
{"name":"Contacts","id":"contact"},
{"name":"Shop","id":"/shop"}
{ name: "Philosophy", id: "about" },
{ name: "Menu", id: "menu" },
{ name: "Banquets", id: "banquets" },
{ name: "Delivery", id: "delivery" },
{ name: "Contacts", id: "contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
buttonClassName="rounded-full px-6 py-2"