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 #4

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

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

@@ -30,6 +30,7 @@ export default function BlogPage() {
navItems={[
{ name: "Home", id: "/" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" },
{ name: "Contact", id: "/contact" }
]}
button={{ text: "Shop Now", href: "/shop" }}

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

@@ -3,9 +3,8 @@
import ReactLenis from "lenis/react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
import ContactCenter from '@/components/sections/contact/ContactCenter';
import ContactSplitForm from '@/components/sections/contact/ContactSplitForm';
import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
import { Mail } from 'lucide-react';
export default function ContactPage() {
return (
@@ -28,6 +27,7 @@ export default function ContactPage() {
navItems={[
{ name: "Home", id: "/" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" },
{ name: "Contact", id: "/contact" }
]}
button={{ text: "Shop Now", href: "/shop" }}
@@ -39,29 +39,28 @@ export default function ContactPage() {
</div>
<div id="contact-main" data-section="contact-main">
<ContactCenter
tag="Get in Touch"
<ContactSplitForm
title="We'd love to hear from you."
description="Whether you have a custom order request, an event inquiry, or just want to say hello, our team is ready to assist you."
tagIcon={Mail}
inputPlaceholder="Your email address"
buttonText="Send Message"
termsText="By sending a message you're confirming that you agree with our Privacy Policy."
onSubmit={(email) => console.log("Contact form submitted with email:", email)}
background={{ variant: "plain" }}
inputs={[
{ name: 'name', type: 'text', placeholder: 'Name', required: true },
{ name: 'email', type: 'email', placeholder: 'Email', required: true },
]}
textarea={{ name: 'message', placeholder: 'Type your message...', rows: 5, required: true }}
useInvertedBackground={false}
imageSrc="https://img.b2bpic.net/free-photo/caucasian-florist-woman-inside-flower-shop_53876-26300.jpg"
mediaAnimation="slide-up"
mediaPosition="right"
buttonText="Send Message"
onSubmit={(data) => console.log("Contact form submitted with data:", data)}
ariaLabel="Contact section"
className="py-16 md:py-24"
containerClassName="max-w-screen-md mx-auto px-6 md:px-8"
contentClassName="bg-card rounded-soft shadow-lg p-8"
tagClassName="text-primary-cta text-sm font-semibold uppercase tracking-wider"
containerClassName="max-w-screen-xl mx-auto px-6 md:px-8"
formCardClassName="bg-card rounded-soft shadow-lg p-8"
titleClassName="text-foreground text-4xl md:text-5xl font-bold mb-4"
descriptionClassName="text-foreground/80 text-lg md:text-xl mb-8"
formWrapperClassName="mt-8"
formClassName="flex flex-col gap-4"
inputClassName="bg-background-accent/30 border border-border-color focus:border-primary-cta focus:ring-1 focus:ring-primary-cta transition-colors duration-200 rounded-md p-3"
buttonClassName="primary-button px-6 py-3"
buttonTextClassName="font-semibold"
termsClassName="text-foreground/60 text-sm mt-4"
/>
</div>

3
src/app/page.tsx
View File

@@ -30,6 +30,7 @@ export default function LandingPage() {
navItems={[
{ name: "Home", id: "/" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" },
{ name: "Contact", id: "/contact" }
]}
button={{ text: "Shop Now", href: "/shop" }}
@@ -184,7 +185,7 @@ export default function LandingPage() {
<FooterBaseCard
logoText="Balka Flowers"
columns={[
{ title: "Shop", items: [{ label: "Bouquets", href: "#products" }, { label: "Events", href: "/contact" }, { label: "Custom Orders", href: "/contact" }] },
{ title: "Shop", items: [{ label: "Bouquets", href: "/shop" }, { label: "Events", href: "/contact" }, { label: "Custom Orders", href: "/contact" }] },
{ title: "Company", items: [{ label: "About Us", href: "/#about" }, { label: "Testimonials", href: "/#testimonials" }, { label: "Blog", href: "/blog" }] },
{ title: "Support", items: [{ label: "FAQ", href: "/contact" }, { label: "Contact", href: "/contact" }] },
]}

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"