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

Merge version_2 into main #2

Merged
bender merged 4 commits from version_2 into main 2026-02-23 12:44:11 +00:00
Conversation 0 Commits 4 Files Changed 4 +23 -51
4 changed files with 23 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,9 +22,6 @@ export default function BlogPage() {
primaryButtonStyle="diagonal-gradient"
secondaryButtonStyle="layered"
headingFontWeight="normal"
theme={{
"--background": "#fdfdff", "--card": "#ffffff", "--foreground": "#2a0f3d", "--primary-cta": "#e63946", "--secondary-cta": "#d1c4e9", "--accent": "#8b5cf6", "--background-accent": "#f8f0ff"
}}
>
<ReactLenis root>
<div id="nav" data-section="nav">
@@ -32,12 +29,9 @@ export default function BlogPage() {
brandName="Balka Flowers"
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "about" },
{ name: "Products", id: "products" },
{ name: "Testimonials", id: "testimonials" },
{ name: "Contact", id: "contact" },
{ name: "Blog", id: "/blog" },
]}
button={{ text: "Shop Now", href: "#products" }}
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"
@@ -69,27 +63,26 @@ export default function BlogPage() {
columns={[
{
title: "Shop", items: [
{ label: "Bouquets", href: "#products" },
{ label: "Events", href: "#contact" },
{ label: "Custom Orders", href: "#contact" },
{ 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: "About Us", href: "/#about" },
{ label: "Testimonials", href: "/#testimonials" },
{ label: "Blog", href: "/blog" },
],
},
{
title: "Support", items: [
{ label: "FAQ", href: "#contact" },
{ label: "Contact", href: "#contact" },
{ label: "FAQ", href: "/#contact" },
{ label: "Contact", href: "/#contact" },
],
},
]}
copyrightText="© 2024 Balka Flowers. All rights reserved."
onPrivacyClick={null}
className="py-16 md:py-24"
cardClassName="bg-card rounded-soft shadow-lg"
logoTextClassName="text-foreground text-4xl font-bold"

12
src/app/page.tsx
View File

@@ -23,21 +23,15 @@ export default function LandingPage() {
primaryButtonStyle="diagonal-gradient"
secondaryButtonStyle="layered"
headingFontWeight="normal"
theme={{
"--background": "#fdfdff", "--card": "#ffffff", "--foreground": "#2a0f3d", "--primary-cta": "#e63946", "--secondary-cta": "#d1c4e9", "--accent": "#8b5cf6", "--background-accent": "#f8f0ff"
}}
>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
brandName="Balka Flowers"
navItems={[
{ name: "Home", id: "hero" },
{ name: "About", id: "about" },
{ name: "Products", id: "products" },
{ name: "Testimonials", id: "testimonials" },
{ name: "Contact", id: "contact" },
{ name: "Home", id: "/" },
{ name: "Blog", id: "/blog" },
]}
button={{ text: "Shop Now", href: "#products" }}
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"

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

@@ -87,15 +87,12 @@ function ProductPageContent({ params }: ProductPageProps) {
primaryButtonStyle="diagonal-gradient"
secondaryButtonStyle="layered"
headingFontWeight="normal"
theme={{
"--background": "#fdfdff", "--card": "#ffffff", "--foreground": "#2a0f3d", "--primary-cta": "#e63946", "--secondary-cta": "#d1c4e9", "--accent": "#8b5cf6", "--background-accent": "#f8f0ff"
}}
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarLayoutFloatingInline
brandName="Balka Flowers"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
navItems={[{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }]}
className="py-4 px-6 md:px-8"
navItemClassName="text-foreground hover:text-primary-cta transition-colors"
buttonClassName="px-5 py-2"
@@ -124,15 +121,12 @@ function ProductPageContent({ params }: ProductPageProps) {
primaryButtonStyle="diagonal-gradient"
secondaryButtonStyle="layered"
headingFontWeight="normal"
theme={{
"--background": "#fdfdff", "--card": "#ffffff", "--foreground": "#2a0f3d", "--primary-cta": "#e63946", "--secondary-cta": "#d1c4e9", "--accent": "#8b5cf6", "--background-accent": "#f8f0ff"
}}
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarLayoutFloatingInline
brandName="Balka Flowers"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
navItems={[{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }]}
className="py-4 px-6 md:px-8"
navItemClassName="text-foreground hover:text-primary-cta transition-colors"
buttonClassName="px-5 py-2"
@@ -168,15 +162,12 @@ function ProductPageContent({ params }: ProductPageProps) {
primaryButtonStyle="diagonal-gradient"
secondaryButtonStyle="layered"
headingFontWeight="normal"
theme={{
"--background": "#fdfdff", "--card": "#ffffff", "--foreground": "#2a0f3d", "--primary-cta": "#e63946", "--secondary-cta": "#d1c4e9", "--accent": "#8b5cf6", "--background-accent": "#f8f0ff"
}}
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarLayoutFloatingInline
brandName="Balka Flowers"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
navItems={[{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }]}
className="py-4 px-6 md:px-8"
navItemClassName="text-foreground hover:text-primary-cta transition-colors"
buttonClassName="px-5 py-2"
@@ -224,9 +215,9 @@ function ProductPageContent({ params }: ProductPageProps) {
<FooterBaseCard
logoText="Balka Flowers"
columns={[
{ title: "Shop", items: [{ label: "Bouquets", href: "#products" }, { 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" }] }
{ 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"

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

@@ -54,15 +54,12 @@ function ShopPageContent() {
primaryButtonStyle="diagonal-gradient"
secondaryButtonStyle="layered"
headingFontWeight="normal"
theme={{
"--background": "#fdfdff", "--card": "#ffffff", "--foreground": "#2a0f3d", "--primary-cta": "#e63946", "--secondary-cta": "#d1c4e9", "--accent": "#8b5cf6", "--background-accent": "#f8f0ff"
}}
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarLayoutFloatingInline
brandName="Balka Flowers"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
navItems={[{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }]}
className="py-4 px-6 md:px-8"
navItemClassName="text-foreground hover:text-primary-cta transition-colors"
buttonClassName="px-5 py-2"
@@ -90,15 +87,12 @@ function ShopPageContent() {
primaryButtonStyle="diagonal-gradient"
secondaryButtonStyle="layered"
headingFontWeight="normal"
theme={{
"--background": "#fdfdff", "--card": "#ffffff", "--foreground": "#2a0f3d", "--primary-cta": "#e63946", "--secondary-cta": "#d1c4e9", "--accent": "#8b5cf6", "--background-accent": "#f8f0ff"
}}
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarLayoutFloatingInline
brandName="Balka Flowers"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
navItems={[{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }]}
className="py-4 px-6 md:px-8"
navItemClassName="text-foreground hover:text-primary-cta transition-colors"
buttonClassName="px-5 py-2"
@@ -136,9 +130,9 @@ function ShopPageContent() {
<FooterBaseCard
logoText="Balka Flowers"
columns={[
{ title: "Shop", items: [{ label: "Bouquets", href: "#products" }, { 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" }] }
{ 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"