Merge version_3 into main #3

Merged
bender merged 4 commits from version_3 into main 2026-02-25 15:59:10 +00:00
4 changed files with 1 additions and 26 deletions

View File

@@ -75,7 +75,6 @@ export default function BlogPage() {
{
title: "Company", items: [
{ label: "About Us", href: "/#about" },
{ label: "FAQ", href: "/#faq" },
{ label: "Contact", href: "/#contact" },
],
},

View File

@@ -6,7 +6,6 @@ import HeroCarouselLogo from '@/components/sections/hero/heroCarouselLogo/HeroCa
import TextSplitAbout from '@/components/sections/about/TextSplitAbout';
import ProductCardFour from '@/components/sections/product/ProductCardFour';
import TestimonialCardFifteen from '@/components/sections/testimonial/TestimonialCardFifteen';
import FaqBase from '@/components/sections/faq/FaqBase';
import ContactSplitForm from '@/components/sections/contact/ContactSplitForm';
import FooterMedia from '@/components/sections/footer/FooterMedia';
@@ -111,26 +110,6 @@ export default function LandingPage() {
/>
</div>
<div id="faq" data-section="faq">
<FaqBase
title="Frequently Asked Questions"
description="Find answers to common questions about our services, flower care, and ordering process."
faqs={[
{
id: "1", title: "What is your delivery policy?", content: "We offer local delivery within a 20-mile radius of our studio. Same-day delivery is available for orders placed before 12 PM local time, Monday-Saturday."},
{
id: "2", title: "How do I care for my fresh flowers?", content: "For optimal freshness, trim stems at an angle, change water daily, and keep flowers away from direct sunlight and heat sources. A packet of flower food is included with every order."},
{
id: "3", title: "Can I request a custom bouquet?", content: "Absolutely! We specialize in custom designs. Please contact us directly to discuss your vision, preferred flowers, colors, and budget. We'd love to bring your unique floral ideas to life."},
{
id: "4", title: "What payment methods do you accept?", content: "We accept all major credit cards (Visa, Mastercard, Amex), PayPal, and Apple Pay for online orders. In-studio purchases can also be made with cash."},
]}
textboxLayout="default"
useInvertedBackground={false}
faqsAnimation="slide-up"
/>
</div>
<div id="contact" data-section="contact">
<ContactSplitForm
title="Get in Touch with Our Floral Experts"
@@ -167,7 +146,6 @@ export default function LandingPage() {
{
title: "Company", items: [
{ label: "About Us", href: "/#about" },
{ label: "FAQ", href: "/#faq" },
{ label: "Contact", href: "/#contact" },
],
},

View File

@@ -235,7 +235,6 @@ function ProductPageContent({ params }: ProductPageProps) {
{ title: "Shop", items: [{ label: "Bouquets", href: "/shop" }, { label: "Arrangements", href: "/shop" }, { label: "Custom Orders", href: "/#contact" }] },
{ title: "Company", items: [
{ label: "About Us", href: "/#about" },
{ label: "FAQ", href: "/#faq" },
{ label: "Contact", href: "/#contact" }
] },
{ title: "Connect", items: [{ label: "Instagram", href: "https://instagram.com/angola_flowers" }, { label: "Facebook", href: "https://facebook.com/angola_flowers" }] }

View File

@@ -50,7 +50,7 @@ function ShopPageContent() {
<div id="loading-section" data-section="loading-section">
<main className="min-h-screen flex items-center justify-center pt-20">
<p className="text-foreground">Loading products...</p>
</main>
</div>
</div>
</ReactLenis>
</ThemeProvider>
@@ -105,7 +105,6 @@ function ShopPageContent() {
{ title: "Shop", items: [{ label: "Bouquets", href: "/shop" }, { label: "Arrangements", href: "/shop" }, { label: "Custom Orders", href: "/#contact" }] },
{ title: "Company", items: [
{ label: "About Us", href: "/#about" },
{ label: "FAQ", href: "/#faq" },
{ label: "Contact", href: "/#contact" }
] },
{ title: "Connect", items: [{ label: "Instagram", href: "https://instagram.com/angola_flowers" }, { label: "Facebook", href: "https://facebook.com/angola_flowers" }] }