development/370b934a-c520-4ed0-baed-d8f312a36042
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #1

Merged
development merged 1 commits from version_1 into main 2026-01-20 13:06:20 +00:00
Conversation 0 Commits 1 Files Changed 1 +17 -17
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/app/page.tsx
View File

@@ -1,4 +1,4 @@
"use client" "use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider"; import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen'; import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
@@ -28,11 +28,11 @@ export default function MagnoliaPage() {
<NavbarStyleFullscreen <NavbarStyleFullscreen
brandName="Magnolia" brandName="Magnolia"
navItems={[ navItems={[
{ name: "Home", id: "home" }, { name: "Home", id: "hero" },
{ name: "Shop", id: "products" }, { name: "Shop", id: "products" },
{ name: "About", id: "about" }, { name: "About", id: "about" },
{ name: "FAQ", id: "faq" }, { name: "FAQ", id: "faq" },
{ name: "Contact", id: "contact" } { name: "Contact", id: "footer" }
]} ]}
bottomLeftText="Premium Flowers" bottomLeftText="Premium Flowers"
bottomRightText="hello@magnolia-flowers.com" bottomRightText="hello@magnolia-flowers.com"
@@ -50,8 +50,8 @@ export default function MagnoliaPage() {
showBlur={true} showBlur={true}
showDimOverlay={false} showDimOverlay={false}
buttons={[ buttons={[
{ text: "Shop Now", href: "#products" }, { text: "Shop Now", href: "products" },
{ text: "Learn More", href: "#about" } { text: "Learn More", href: "about" }
]} ]}
/> />
</div> </div>
@@ -67,7 +67,7 @@ export default function MagnoliaPage() {
]} ]}
imageSrc="https://img.b2bpic.net/free-photo/bouquet-pink-roses-with-green-leaves-inside-vase_114579-1439.jpg" imageSrc="https://img.b2bpic.net/free-photo/bouquet-pink-roses-with-green-leaves-inside-vase_114579-1439.jpg"
imageAlt="Magnolia florist at work" imageAlt="Magnolia florist at work"
useInvertedBackground="invertDefault" useInvertedBackground="noInvert"
/> />
</div> </div>
@@ -106,7 +106,7 @@ export default function MagnoliaPage() {
gridVariant="four-items-2x2-equal-grid" gridVariant="four-items-2x2-equal-grid"
animationType="scale-rotate" animationType="scale-rotate"
textboxLayout="default" textboxLayout="default"
useInvertedBackground="invertDefault" useInvertedBackground="noInvert"
/> />
</div> </div>
@@ -144,7 +144,7 @@ export default function MagnoliaPage() {
sideTitle="Frequently Asked Questions" sideTitle="Frequently Asked Questions"
sideDescription="Everything you need to know about our services" sideDescription="Everything you need to know about our services"
textPosition="left" textPosition="left"
useInvertedBackground="invertDefault" useInvertedBackground="noInvert"
animationType="smooth" animationType="smooth"
faqs={[ faqs={[
{ {
@@ -175,23 +175,23 @@ export default function MagnoliaPage() {
columns={[ columns={[
{ {
title: "Shop", items: [ title: "Shop", items: [
{ label: "Featured Collections", href: "#products" }, { label: "Featured Collections", href: "products" },
{ label: "Custom Arrangements", href: "#contact" }, { label: "Custom Arrangements", href: "footer" },
{ label: "Seasonal Specials", href: "#products" } { label: "Seasonal Specials", href: "products" }
] ]
}, },
{ {
title: "Company", items: [ title: "Company", items: [
{ label: "About Us", href: "#about" }, { label: "About Us", href: "about" },
{ label: "Our Story", href: "#about" }, { label: "Our Story", href: "about" },
{ label: "Careers", href: "#contact" } { label: "Careers", href: "footer" }
] ]
}, },
{ {
title: "Support", items: [ title: "Support", items: [
{ label: "FAQ", href: "#faq" }, { label: "FAQ", href: "faq" },
{ label: "Contact Us", href: "#contact" }, { label: "Contact Us", href: "footer" },
{ label: "Delivery Info", href: "#contact" } { label: "Delivery Info", href: "footer" }
] ]
} }
]} ]}