bender/59f18d3a-a52a-4283-8a4f-0f5174d625b0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #1

Merged
bender merged 4 commits from version_1 into main 2026-02-24 11:38:16 +00:00
Conversation 0 Commits 4 Files Changed 4 +26 -20
4 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,21 +23,23 @@ export default function BlogPage() {
headingFontWeight="medium"
>
<ReactLenis root>
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "about" },
{ name: "Services", id: "features" },
{ name: "Bouquets", id: "products" },
{ name: "Testimonials", id: "testimonials" },
{ name: "Contact", id: "contact" },
]}
brandName="Fialko"
button={{ text: "Order Now", href: "contact" }}
className="py-2 lg:py-4 px-4 lg:px-6"
navItemClassName="text-foreground hover:text-primary-cta transition-colors duration-300"
buttonClassName="bg-primary-cta text-primary-cta-text hover:bg-primary-cta/90 transition-colors duration-300 rounded-soft"
/>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Services", id: "/#features" },
{ name: "Bouquets", id: "/#products" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "Contact", id: "/#contact" },
]}
brandName="Fialko"
button={{ text: "Order Now", href: "/#contact" }}
className="py-2 lg:py-4 px-4 lg:px-6"
navItemClassName="text-foreground hover:text-primary-cta transition-colors duration-300"
buttonClassName="bg-primary-cta text-primary-cta-text hover:bg-primary-cta/90 transition-colors duration-300 rounded-soft"
/>
</div>
{
isLoading ? (

4
src/app/page.tsx
View File

@@ -100,6 +100,7 @@ export default function LandingPage() {
{
id: "3", title: "Flower Care Guides", description: "Receive expert tips and tricks to keep your Fialko blooms vibrant and fresh for longer.", tag: "Freshness", imageSrc: "https://img.b2bpic.net/free-photo/close-up-woman-holding-watering-gloves_23-2149128082.jpg", imageAlt: "Flower care guide"},
]}
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={true}
className="py-20"
@@ -124,6 +125,7 @@ export default function LandingPage() {
{
id: "3", name: "Vibrant Mixed Bouquet", price: "$80", imageSrc: "https://img.b2bpic.net/free-photo/woman-holding-bouquet-yellow-orange-dahliason-light-background_169016-39443.jpg", imageAlt: "Vibrant mixed bouquet"},
]}
animationType="slide-up"
gridVariant="four-items-2x2-equal-grid"
textboxLayout="default"
useInvertedBackground={false}
@@ -159,6 +161,7 @@ export default function LandingPage() {
{ value: "98%", label: "Customer Satisfaction" },
{ value: "10+", label: "Years of Experience" },
]}
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={true}
className="py-20"
@@ -186,6 +189,7 @@ export default function LandingPage() {
{
id: "4", title: "What is your delivery area?", content: "We deliver throughout the city and surrounding suburbs. Enter your postcode at checkout to confirm."},
]}
faqsAnimation="slide-up"
textPosition="left"
useInvertedBackground={false}
animationType="smooth"

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

@@ -98,7 +98,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="medium"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline {...navbarProps} />
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
@@ -124,7 +124,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="medium"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline {...navbarProps} />
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
@@ -157,7 +157,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="medium"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline {...navbarProps} />
</div>
<div id="product-detail-card" data-section="product-detail-card">

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

@@ -65,7 +65,7 @@ function ShopPageContent() {
headingFontWeight="medium"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline {...navbarProps} />
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
@@ -105,7 +105,7 @@ function ShopPageContent() {
headingFontWeight="medium"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline {...navbarProps} />
</div>
<div id="product-catalog" data-section="product-catalog">