bender/d71254dc-754d-425b-be50-6253d44d2106
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #4

Merged
bender merged 5 commits from version_2 into main 2026-02-21 10:46:09 +00:00
Conversation 0 Commits 5 Files Changed 5 +22 -39
5 changed files with 22 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,12 +26,7 @@ export default function BlogPage() {
>
<ReactLenis root>
<NavbarStyleFullscreen
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Services", id: "/#services" },
{ name: "Contact", id: "/#contact" }
]}
navItems={[{ name: "Home", id: "/" }, { name: "About", id: "/#about" }, { name: "Shop", id: "/shop" }, { name: "Services", id: "/#services" }, { name: "Contact", id: "/#contact" }, { name: "Blog", id: "/blog" }]}
brandName="Life"
bottomLeftText="Embrace Nature's Beauty"
bottomRightText="hello@lifestudio.com"

10
src/app/page.tsx
View File

@@ -29,7 +29,7 @@ export default function LandingPage() {
>
<div id="nav" data-section="nav">
<NavbarStyleFullscreen
navItems={[{name:"Home",id:"hero"},{name:"About",id:"about"},{name:"Shop",id:"shop"},{name:"Services",id:"services"},{name:"Contact",id:"contact"}]}
navItems={[{name:"Home",id:"/"},{name:"About",id:"/#about"},{name:"Shop",id:"/shop"},{name:"Services",id:"/#services"},{name:"Contact",id:"/#contact"},{name:"Blog",id:"/blog"}]}
brandName="Life"
bottomLeftText="Embrace Nature's Beauty"
bottomRightText="hello@lifestudio.com"
@@ -43,7 +43,7 @@ export default function LandingPage() {
mediaItems={[{imageSrc:"https://img.b2bpic.net/free-photo/elegant-rose-bouquet_23-2147697781.jpg",imageAlt:"Luxurious bouquet of fresh, vibrant flowers."},{imageSrc:"https://img.b2bpic.net/free-photo/spring-composition-with-bouquet-flowers-vase-closeup_169016-29760.jpg",imageAlt:"Elegant floral display for an event."}]}
rating={5}
ratingText="Loved by thousands of happy customers"
buttons={[{text:"Shop Now",href:"#shop"},{text:"Our Story",href:"#about"}]}
buttons={[{text:"Shop Now",href:"/shop"},{text:"Our Story",href:"/#about"}]}
background={{variant:"plain"}}
mediaAnimation="slide-up"
/>
@@ -53,7 +53,7 @@ export default function LandingPage() {
tag="Our Passion, Your Joy"
title="At Life Flowers Studio, we believe every bloom tells a story. We handcraft arrangements that speak volumes."
useInvertedBackground={false}
buttons={[{text:"Meet Our Team",href:"#team"},{text:"Visit Our Studio",href:"#contact"}]}
buttons={[{text:"Meet Our Team",href:"/#team"},{text:"Visit Our Studio",href:"/#contact"}]}
/>
</div>
<div id="shop" data-section="shop">
@@ -72,7 +72,7 @@ export default function LandingPage() {
<PricingCardThree
title="Our Floral Services"
description="Find the perfect floral solution for your special events and everyday needs."
plans={[{id:"1",name:"Daily Deliveries",price:"From $50",features:["Fresh seasonal blooms","Customizable options","Same-day delivery available","Personalized note included"],buttons:[{text:"Order Now",href:"#contact"}]},{id:"2",badge:"Most Popular",badgeIcon:Sparkles,name:"Event Florals",price:"Quote Basis",features:["Wedding & corporate events","Venue decoration","Bridal bouquets & boutonnieres","Consultation with expert florists"],buttons:[{text:"Book Consultation",href:"#contact"}]},{id:"3",name:"Subscription Boxes",price:"From $40/month",features:["Weekly or bi-weekly fresh flowers","Exclusive seasonal selections","Flexible delivery schedule","Cancel anytime"],buttons:[{text:"Subscribe",href:"#contact"}]}]}
plans={[{id:"1",name:"Daily Deliveries",price:"From $50",features:["Fresh seasonal blooms","Customizable options","Same-day delivery available","Personalized note included"],buttons:[{text:"Order Now",href:"/#contact"}]},{id:"2",badge:"Most Popular",badgeIcon:Sparkles,name:"Event Florals",price:"Quote Basis",features:["Wedding & corporate events","Venue decoration","Bridal bouquets & boutonnieres","Consultation with expert florists"],buttons:[{text:"Book Consultation",href:"/#contact"}]},{id:"3",name:"Subscription Boxes",price:"From $40/month",features:["Weekly or bi-weekly fresh flowers","Exclusive seasonal selections","Flexible delivery schedule","Cancel anytime"],buttons:[{text:"Subscribe",href:"/#contact"}]}]}
carouselMode="buttons"
animationType="slide-up"
textboxLayout="default"
@@ -126,7 +126,7 @@ export default function LandingPage() {
</div>
<div id="footer" data-section="footer">
<FooterSimple
columns={[{title:"Studio",items:[{label:"About Us",href:"#about"},{label:"Our Story",href:"#about"},{label:"Team",href:"#team"}]},{title:"Shop",items:[{label:"Bouquets",href:"#shop"},{label:"Seasonal",href:"#shop"},{label:"Gifts",href:"#shop"}]},{title:"Services",items:[{label:"Weddings",href:"#services"},{label:"Events",href:"#services"},{label:"Subscriptions",href:"#services"}]},{title:"Help",items:[{label:"FAQ",href:"#faq"},{label:"Contact Us",href:"#contact"},{label:"Blog",href:"#blog"}]}]}
columns={[{title:"Studio",items:[{label:"About Us",href:"/#about"},{label:"Our Story",href:"/#about"},{label:"Team",href:"/#team"}]},{title:"Shop",items:[{label:"Bouquets",href:"/shop"},{label:"Seasonal",href:"/shop"},{label:"Gifts",href:"/shop"}]},{title:"Services",items:[{label:"Weddings",href:"/#services"},{label:"Events",href:"/#services"},{label:"Subscriptions",href:"/#services"}]},{title:"Help",items:[{label:"FAQ",href:"/#faq"},{label:"Contact Us",href:"/#contact"},{label:"Blog",href:"/blog"}]}]}
bottomLeftText="© 2024 Life Flowers Studio. All rights reserved."
bottomRightText="Crafted with Love & Nature"
/>

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

@@ -90,13 +90,7 @@ function ProductPageContent({ params }: ProductPageProps) {
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarStyleFullscreen
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Services", id: "/#services" },
{ name: "Contact", id: "/#contact" },
]}
brandName="Life"
navItems={[{ name: "Home", id: "/" }, { name: "About", id: "/#about" }, { name: "Shop", id: "/shop" }, { name: "Services", id: "/#services" }, { name: "Contact", id: "/#contact" }, { name: "Blog", id: "/blog" }]} brandName="Life"
bottomLeftText="Embrace Nature's Beauty"
bottomRightText="hello@lifestudio.com"
/>

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

@@ -57,13 +57,7 @@ function ShopPageContent() {
<ReactLenis root>
<div id="navbar" data-section="navbar">
<NavbarStyleFullscreen
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Services", id: "/#services" },
{ name: "Contact", id: "/#contact" },
]}
brandName="Life"
navItems={[{ name: "Home", id: "/" }, { name: "About", id: "/#about" }, { name: "Shop", id: "/shop" }, { name: "Services", id: "/#services" }, { name: "Contact", id: "/#contact" }, { name: "Blog", id: "/blog" }]} brandName="Life"
bottomLeftText="Embrace Nature's Beauty"
bottomRightText="hello@lifestudio.com"
/>

28
src/app/styles/variables.css
View File

@@ -2,21 +2,21 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #f7f6f7;;
--card: #ffffff;;
--foreground: #1b0c25;;
--primary-cta: #1b0c25;;
--secondary-cta: #ffffff;;
--accent: #ff93e4;;
--background-accent: #e8a8c3;; */
/* --background: #060000;;
--card: #1d0d0d;;
--foreground: #ffe6e6;;
--primary-cta: #ff3d4a;;
--secondary-cta: #1f0a0a;;
--accent: #7b2d2d;;
--background-accent: #b8111f;; */
--background: #f7f6f7;;
--card: #ffffff;;
--foreground: #1b0c25;;
--primary-cta: #1b0c25;;
--secondary-cta: #ffffff;;
--accent: #ff93e4;;
--background-accent: #e8a8c3;;
--background: #060000;;
--card: #1d0d0d;;
--foreground: #ffe6e6;;
--primary-cta: #ff3d4a;;
--secondary-cta: #1f0a0a;;
--accent: #7b2d2d;;
--background-accent: #b8111f;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);