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

Merge version_5 into main #9

Merged
bender merged 5 commits from version_5 into main 2026-02-23 13:33:33 +00:00
Conversation 0 Commits 5 Files Changed 5 +16 -12
5 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,6 +6,7 @@ import { useBlogPosts } from "@/hooks/useBlogPosts";
import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
import BlogCardOne from '@/components/sections/blog/BlogCardOne';
import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
import Link from 'next/link';
export default function BlogPage() {
const { posts, isLoading } = useBlogPosts();
@@ -29,8 +30,6 @@ export default function BlogPage() {
brandName="Balka Flowers"
navItems={[
{ name: "Home", id: "/" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" },
{ name: "Contact", id: "/contact" }
]}
button={{ text: "Shop Now", href: "/shop" }}

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

@@ -5,6 +5,7 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
import ContactSplitForm from '@/components/sections/contact/ContactSplitForm';
import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
import Link from 'next/link';
export default function ContactPage() {
return (
@@ -26,8 +27,6 @@ export default function ContactPage() {
brandName="Balka Flowers"
navItems={[
{ name: "Home", id: "/" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" },
{ name: "Contact", id: "/contact" }
]}
button={{ text: "Shop Now", href: "/shop" }}
@@ -48,7 +47,7 @@ export default function ContactPage() {
]}
textarea={{ name: 'message', placeholder: 'Type your message...', rows: 5, required: true }}
useInvertedBackground={false}
videoSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_34my1kGeblbsCcwUUCcjBY9WFkg/uploaded-1771684785214-9g6egt6v.mp4"
imageSrc="https://img.b2bpic.net/free-photo/beautiful-flowers-bouquet-with-copy-space_23-2148911578.jpg"
mediaAnimation="slide-up"
mediaPosition="right"
buttonText="Send Message"

3
src/app/page.tsx
View File

@@ -9,6 +9,7 @@ import TestimonialCardThirteen from '@/components/sections/testimonial/Testimoni
import ContactFaq from '@/components/sections/contact/ContactFaq';
import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
import { Mail } from 'lucide-react';
import Link from 'next/link';
export default function LandingPage() {
return (
@@ -29,8 +30,6 @@ export default function LandingPage() {
brandName="Balka Flowers"
navItems={[
{ name: "Home", id: "/" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" },
{ name: "Contact", id: "/contact" }
]}
button={{ text: "Shop Now", href: "/shop" }}

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

@@ -11,6 +11,7 @@ import { useProductDetail } from "@/hooks/useProductDetail";
import { useCart } from "@/hooks/useCart";
import { useCheckout } from "@/hooks/useCheckout";
import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
import Link from 'next/link';
interface ProductPageProps {
params: Promise<{ id: string }>;
@@ -92,7 +93,8 @@ 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" }]} className="py-4 px-6 md:px-8"
navItems={[{ name: "Home", id: "/" }, { 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"
buttonTextClassName="font-semibold"
@@ -125,7 +127,8 @@ 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" }]} className="py-4 px-6 md:px-8"
navItems={[{ name: "Home", id: "/" }, { 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"
buttonTextClassName="font-semibold"
@@ -165,7 +168,8 @@ 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" }]} className="py-4 px-6 md:px-8"
navItems={[{ name: "Home", id: "/" }, { 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"
buttonTextClassName="font-semibold"

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

@@ -10,6 +10,7 @@ import ProductCart from "@/components/ecommerce/cart/ProductCart";
import { useCart } from "@/hooks/useCart";
import { useCheckout } from "@/hooks/useCheckout";
import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
import Link from 'next/link';
function ShopPageContent() {
const {
@@ -59,7 +60,8 @@ 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" }]} className="py-4 px-6 md:px-8"
navItems={[{ name: "Home", id: "/" }, { 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"
buttonTextClassName="font-semibold"
@@ -91,7 +93,8 @@ 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" }]} className="py-4 px-6 md:px-8"
navItems={[{ name: "Home", id: "/" }, { 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"
buttonTextClassName="font-semibold"