Merge version_1 into main #1

Merged
bender merged 4 commits from version_1 into main 2026-02-25 11:13:55 +00:00
Showing only changes of commit 8d010b855e - Show all commits

View File

@@ -11,6 +11,15 @@ import ContactCTA from '@/components/sections/contact/ContactCTA';
import FooterBase from '@/components/sections/footer/FooterBase';
export default function SitePage() {
const navItems = [
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Shop", id: "/shop" },
{ name: "Blog", id: "/blog" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "Contact", id: "/#contact" },
];
return (
<ThemeProvider
defaultButtonVariant="expand-hover"
@@ -28,13 +37,7 @@ export default function SitePage() {
<div id="nav" data-section="nav">
<NavbarStyleApple
brandName="Olla"
navItems={[
{ name: "Home", id: "hero" },
{ name: "About", id: "about" },
{ name: "Shop", id: "shop" },
{ name: "Testimonials", id: "testimonials" },
{ name: "Contact", id: "contact" },
]}
navItems={navItems}
/>
</div>
<div id="hero" data-section="hero">
@@ -43,8 +46,8 @@ export default function SitePage() {
description="Crafting exquisite floral arrangements for every occasion. Discover the beauty of nature, artfully designed."
tag="Welcome to Olla"
buttons={[
{ text: "Shop Now", href: "shop" },
{ text: "Learn More", href: "about" },
{ text: "Shop Now", href: "/shop" },
{ text: "Learn More", href: "/#about" },
]}
imageSrc="http://img.b2bpic.net/free-photo/woman-holds-festive-flower-arrangement-with-bright-chrysanthemum-flowers_169016-51483.jpg"
imageAlt="Elegant floral arrangement for Olla Flowers Studio"