From 4c64d32859e9faa2ae70b4b6a158543d6615bb87 Mon Sep 17 00:00:00 2001 From: bender Date: Mon, 23 Feb 2026 13:55:37 +0000 Subject: [PATCH 1/6] Add src/app/about/page.tsx --- src/app/about/page.tsx | 84 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 src/app/about/page.tsx diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx new file mode 100644 index 0000000..f7c05ee --- /dev/null +++ b/src/app/about/page.tsx @@ -0,0 +1,84 @@ +"use client"; + +import ReactLenis from "lenis/react"; +import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider"; +import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline'; +import TextAbout from '@/components/sections/about/TextAbout'; +import FooterBaseCard from '@/components/sections/footer/FooterBaseCard'; +import Link from 'next/link'; + +export default function AboutPage() { + return ( + + + + +
+ + +
+ + + + + ); +} From ef33eee0331e5ff3a1ffe8bcf941054a14807b4a Mon Sep 17 00:00:00 2001 From: bender Date: Mon, 23 Feb 2026 13:55:37 +0000 Subject: [PATCH 2/6] Update src/app/blog/page.tsx --- src/app/blog/page.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/blog/page.tsx b/src/app/blog/page.tsx index 5e71296..cd85f2d 100644 --- a/src/app/blog/page.tsx +++ b/src/app/blog/page.tsx @@ -30,6 +30,7 @@ export default function BlogPage() { brandName="Balka Flowers" navItems={[ { name: "Home", id: "/" }, + { name: "About Us", id: "/about" }, { name: "Contact", id: "/contact" } ]} button={{ text: "Shop Now", href: "/shop" }} @@ -71,7 +72,7 @@ export default function BlogPage() { }, { title: "Company", items: [ - { label: "About Us", href: "/#about" }, + { label: "About Us", href: "/about" }, { label: "Testimonials", href: "/#testimonials" }, { label: "Blog", href: "/blog" }, ], }, From f1cb56fdac4fa83d65122e0f20653cdfbbefecdf Mon Sep 17 00:00:00 2001 From: bender Date: Mon, 23 Feb 2026 13:55:38 +0000 Subject: [PATCH 3/6] Update src/app/contact/page.tsx --- src/app/contact/page.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/contact/page.tsx b/src/app/contact/page.tsx index 7c5f2a0..d6e804b 100644 --- a/src/app/contact/page.tsx +++ b/src/app/contact/page.tsx @@ -27,6 +27,7 @@ export default function ContactPage() { brandName="Balka Flowers" navItems={[ { name: "Home", id: "/" }, + { name: "About Us", id: "/about" }, { name: "Contact", id: "/contact" } ]} button={{ text: "Shop Now", href: "/shop" }} @@ -68,7 +69,7 @@ export default function ContactPage() { logoText="Balka Flowers" columns={[ { 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: "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" }] }, ]} copyrightText="© 2024 Balka Flowers. All rights reserved." From 87d486eb8ff03466d3f52484d4b23237ca557afe Mon Sep 17 00:00:00 2001 From: bender Date: Mon, 23 Feb 2026 13:55:39 +0000 Subject: [PATCH 4/6] Update src/app/page.tsx --- src/app/page.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/page.tsx b/src/app/page.tsx index 86043db..7d113ad 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -30,6 +30,7 @@ export default function LandingPage() { brandName="Balka Flowers" navItems={[ { name: "Home", id: "/" }, + { name: "About Us", id: "/about" }, { name: "Contact", id: "/contact" } ]} button={{ text: "Shop Now", href: "/shop" }} @@ -79,7 +80,7 @@ export default function LandingPage() { "At Balka, we believe in the power of flowers to transform spaces and convey emotions. Our studio is dedicated to sourcing the freshest blooms and creating bespoke arrangements that tell your unique story. From elegant bouquets to grand event decor, every creation is a testament to our artistry and attention to detail.", "We are a team of passionate florists committed to sustainable practices and unparalleled customer service. With years of experience, we've cultivated a reputation for excellence, ensuring every order from Balka Flowers brings joy and beauty to your life." ]} useInvertedBackground={false} showBorder={true} - buttons={[{ text: "Learn More About Us", href: "/contact" }]} + buttons={[{ text: "Learn More About Us", href: "/about" }]} buttonAnimation="slide-up" className="py-16 md:py-24" containerClassName="max-w-screen-xl mx-auto px-6 md:px-8" @@ -185,7 +186,7 @@ export default function LandingPage() { logoText="Balka Flowers" columns={[ { 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: "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" }] }, ]} copyrightText="© 2024 Balka Flowers. All rights reserved." From e17bfda3a1e27d31729185d1cb364e6486913d0f Mon Sep 17 00:00:00 2001 From: bender Date: Mon, 23 Feb 2026 13:55:39 +0000 Subject: [PATCH 5/6] Update src/app/shop/[id]/page.tsx --- src/app/shop/[id]/page.tsx | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/app/shop/[id]/page.tsx b/src/app/shop/[id]/page.tsx index f4a4fa1..bc58202 100644 --- a/src/app/shop/[id]/page.tsx +++ b/src/app/shop/[id]/page.tsx @@ -93,7 +93,11 @@ function ProductPageContent({ params }: ProductPageProps) {