bender/3a7956ca-ea62-4543-90cf-b093716af084
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_4 into main #5

Merged
bender merged 3 commits from version_4 into main 2026-02-23 13:20:50 +00:00
Conversation 0 Commits 3 Files Changed 3 +7 -7
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@ import ReactLenis from "lenis/react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import { useBlogPosts } from "@/hooks/useBlogPosts";
import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
import BlogCardTwo from '@/components/sections/blog/BlogCardTwo';
import BlogCardOne from '@/components/sections/blog/BlogCardOne';
import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
export default function BlogPage() {
@@ -47,7 +47,7 @@ export default function BlogPage() {
</div>
) : (
<div id="blog" data-section="blog">
<BlogCardTwo
<BlogCardOne
blogs={posts}
title="Latest Articles"
description="Insights and updates from our team"

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

@@ -92,7 +92,7 @@ function ProductPageContent({ params }: ProductPageProps) {
<div id="navbar" data-section="navbar">
<NavbarLayoutFloatingInline
brandName="Balka Flowers"
navItems={[{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }, { name: "Contact", id: "/contact" }]}}
navItems={[{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }, { name: "Contact", id: "/contact" }]}
className="py-4 px-6 md:px-8"
navItemClassName="text-foreground hover:text-primary-cta transition-colors"
buttonClassName="px-5 py-2"
@@ -126,7 +126,7 @@ function ProductPageContent({ params }: ProductPageProps) {
<div id="navbar" data-section="navbar">
<NavbarLayoutFloatingInline
brandName="Balka Flowers"
navItems={[{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }, { name: "Contact", id: "/contact" }]}}
navItems={[{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }, { name: "Contact", id: "/contact" }]}
className="py-4 px-6 md:px-8"
navItemClassName="text-foreground hover:text-primary-cta transition-colors"
buttonClassName="px-5 py-2"
@@ -167,7 +167,7 @@ function ProductPageContent({ params }: ProductPageProps) {
<div id="navbar" data-section="navbar">
<NavbarLayoutFloatingInline
brandName="Balka Flowers"
navItems={[{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }, { name: "Contact", id: "/contact" }]}}
navItems={[{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }, { name: "Contact", id: "/contact" }]}
className="py-4 px-6 md:px-8"
navItemClassName="text-foreground hover:text-primary-cta transition-colors"
buttonClassName="px-5 py-2"

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

@@ -59,7 +59,7 @@ function ShopPageContent() {
<div id="navbar" data-section="navbar">
<NavbarLayoutFloatingInline
brandName="Balka Flowers"
navItems={[{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }, { name: "Contact", id: "/contact" }]}}
navItems={[{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }, { name: "Contact", id: "/contact" }]}
className="py-4 px-6 md:px-8"
navItemClassName="text-foreground hover:text-primary-cta transition-colors"
buttonClassName="px-5 py-2"
@@ -92,7 +92,7 @@ function ShopPageContent() {
<div id="navbar" data-section="navbar">
<NavbarLayoutFloatingInline
brandName="Balka Flowers"
navItems={[{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }, { name: "Contact", id: "/contact" }]}}
navItems={[{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }, { name: "Contact", id: "/contact" }]}
className="py-4 px-6 md:px-8"
navItemClassName="text-foreground hover:text-primary-cta transition-colors"
buttonClassName="px-5 py-2"