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

Merge version_6 into main

Browse Source 
Merge version_6 into main
This commit was merged in pull request #10.
This commit is contained in:
bender
2026-02-23 13:55:44 +00:00
parent 6909350c81 b0b633347c
commit dd6444cd70
6 changed files with 118 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/app/about/page.tsx Normal file
View File

@@ -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 (
<ThemeProvider
defaultButtonVariant="text-stagger"
defaultTextAnimation="entrance-slide"
borderRadius="soft"
contentWidth="compact"
sizing="largeSmallSizeLargeTitles"
background="blurBottom"
cardStyle="glass-depth"
primaryButtonStyle="diagonal-gradient"
secondaryButtonStyle="layered"
headingFontWeight="normal"
>
<ReactLenis root>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
brandName="Balka Flowers"
navItems={[
{ name: "Home", id: "/" },
{ name: "About Us", id: "/about" },
{ name: "Contact", id: "/contact" }
]}
button={{ text: "Shop Now", href: "/shop" }}
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"
/>
</div>
<div id="about-us-content" data-section="about-us-content">
<TextAbout
tag="Our Story"
title="Crafting Floral Experiences with Passion"
buttons={[{ text: "Contact Us", href: "/contact" }]}
useInvertedBackground={false}
className="py-16 md:py-24"
containerClassName="max-w-screen-xl mx-auto px-6 md:px-8"
titleClassName="text-foreground text-5xl md:text-6xl lg:text-7xl font-bold leading-tight"
buttonContainerClassName="mt-8"
buttonClassName="px-6 py-3"
buttonTextClassName="font-semibold"
/>
<TextAbout
title="Our Mission: Bringing Nature's Artistry to Your Life"
buttons={[]}
useInvertedBackground={true}
className="py-16 md:py-24"
containerClassName="max-w-screen-xl mx-auto px-6 md:px-8"
titleClassName="text-foreground text-4xl md:text-5xl lg:text-6xl font-bold leading-tight"
/>
</div>
<div id="footer" data-section="footer">
<FooterBaseCard
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: "Support", items: [{ label: "FAQ", href: "/contact" }, { label: "Contact", href: "/contact" }] },
]}
copyrightText="© 2024 Balka Flowers. All rights reserved."
className="py-16 md:py-24"
cardClassName="bg-card rounded-soft shadow-lg"
logoTextClassName="text-foreground text-4xl font-bold"
columnTitleClassName="text-foreground text-xl font-semibold"
columnItemClassName="text-foreground/70 hover:text-primary-cta transition-colors"
copyrightTextClassName="text-foreground/50 text-sm"
/>
</div>
</ReactLenis>
</ThemeProvider>
);
}

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

@@ -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" },
],
},

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

@@ -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."

5
src/app/page.tsx
View File

@@ -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."

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

@@ -93,7 +93,11 @@ function ProductPageContent({ params }: ProductPageProps) {
<div id="navbar" data-section="navbar">
<NavbarLayoutFloatingInline
brandName="Balka Flowers"
navItems={[{ name: "Home", id: "/" }, { name: "Contact", id: "/contact" }]}
navItems={[
{ name: "Home", id: "/" },
{ name: "About Us", id: "/about" },
{ 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"
@@ -127,7 +131,11 @@ function ProductPageContent({ params }: ProductPageProps) {
<div id="navbar" data-section="navbar">
<NavbarLayoutFloatingInline
brandName="Balka Flowers"
navItems={[{ name: "Home", id: "/" }, { name: "Contact", id: "/contact" }]}
navItems={[
{ name: "Home", id: "/" },
{ name: "About Us", id: "/about" },
{ 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"
@@ -168,7 +176,11 @@ function ProductPageContent({ params }: ProductPageProps) {
<div id="navbar" data-section="navbar">
<NavbarLayoutFloatingInline
brandName="Balka Flowers"
navItems={[{ name: "Home", id: "/" }, { name: "Contact", id: "/contact" }]}
navItems={[
{ name: "Home", id: "/" },
{ name: "About Us", id: "/about" },
{ 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"
@@ -217,7 +229,7 @@ function ProductPageContent({ params }: ProductPageProps) {
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."

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

@@ -60,7 +60,11 @@ function ShopPageContent() {
<div id="navbar" data-section="navbar">
<NavbarLayoutFloatingInline
brandName="Balka Flowers"
navItems={[{ name: "Home", id: "/" }, { name: "Contact", id: "/contact" }]}
navItems={[
{ name: "Home", id: "/" },
{ name: "About Us", id: "/about" },
{ 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"
@@ -93,7 +97,11 @@ function ShopPageContent() {
<div id="navbar" data-section="navbar">
<NavbarLayoutFloatingInline
brandName="Balka Flowers"
navItems={[{ name: "Home", id: "/" }, { name: "Contact", id: "/contact" }]}
navItems={[
{ name: "Home", id: "/" },
{ name: "About Us", id: "/about" },
{ 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"
@@ -132,7 +140,7 @@ function ShopPageContent() {
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."