development/c1c7ed8b-9351-4293-9d73-33e58dfb3bfb
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #3

Open
development wants to merge 5 commits from version_1 into main
pull from: version_1
merge into: development:main
Conversation 0 Commits 5 Files Changed 5 +26 -94
5 changed files with 26 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,8 +5,7 @@ import ContactCenter from '@/components/sections/contact/ContactCenter';
import FaqDouble from '@/components/sections/faq/FaqDouble';
import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import Link from 'next/link';
import { Envelope, HelpCircle } from 'lucide-react';
import { Mail, HelpCircle } from 'lucide-react';
export default function ContactPage() {
return (
@@ -32,8 +31,7 @@ export default function ContactPage() {
{ name: "Contact", id: "/contact" }
]}
button={{
text: "Book Consultation",
href: "/contact"
text: "Book Consultation", href: "/contact"
}}
/>
</div>
@@ -41,7 +39,7 @@ export default function ContactPage() {
<div id="contact" data-section="contact">
<ContactCenter
tag="Get In Touch"
tagIcon={Envelope}
tagIcon={Mail}
title="Ready to bring your vision to life?"
description="Contact us today to discuss your floral needs. Whether it's a wedding, special event, or just because - we're here to create something beautiful for you."
inputPlaceholder="Enter your email address"
@@ -62,34 +60,22 @@ export default function ContactPage() {
animationType="smooth"
faqs={[
{
id: "1",
title: "How far in advance should I order?",
content: "We recommend ordering at least 3-5 days in advance for custom arrangements. For rush orders, please contact us directly as we can often accommodate same-day or next-day delivery depending on availability."
id: "1", title: "How far in advance should I order?", content: "We recommend ordering at least 3-5 days in advance for custom arrangements. For rush orders, please contact us directly as we can often accommodate same-day or next-day delivery depending on availability."
},
{
id: "2",
title: "Do you offer wedding and event services?",
content: "Absolutely! We specialize in wedding florals, corporate events, and special occasions. We provide comprehensive design consultations to ensure your vision comes to life. Contact us for a custom proposal."
id: "2", title: "Do you offer wedding and event services?", content: "Absolutely! We specialize in wedding florals, corporate events, and special occasions. We provide comprehensive design consultations to ensure your vision comes to life. Contact us for a custom proposal."
},
{
id: "3",
title: "What is your delivery area?",
content: "We deliver throughout the metropolitan area and surrounding regions. For out-of-area orders, we can arrange coordination with trusted partner florists to ensure quality delivery."
id: "3", title: "What is your delivery area?", content: "We deliver throughout the metropolitan area and surrounding regions. For out-of-area orders, we can arrange coordination with trusted partner florists to ensure quality delivery."
},
{
id: "4",
title: "How should I care for my arrangement?",
content: "Keep flowers in cool water away from direct sunlight and heat. Change the water every 2-3 days and trim stems at a 45-degree angle. We provide detailed care instructions with every arrangement."
id: "4", title: "How should I care for my arrangement?", content: "Keep flowers in cool water away from direct sunlight and heat. Change the water every 2-3 days and trim stems at a 45-degree angle. We provide detailed care instructions with every arrangement."
},
{
id: "5",
title: "Can you accommodate allergies or preferences?",
content: "Yes! We can work around allergies, color preferences, and specific flower requests. Please mention any preferences during consultation so we can create the perfect arrangement for you."
id: "5", title: "Can you accommodate allergies or preferences?", content: "Yes! We can work around allergies, color preferences, and specific flower requests. Please mention any preferences during consultation so we can create the perfect arrangement for you."
},
{
id: "6",
title: "What payment methods do you accept?",
content: "We accept all major credit cards, digital payments, and bank transfers. A 50% deposit is required to confirm bookings, with the balance due before delivery."
id: "6", title: "What payment methods do you accept?", content: "We accept all major credit cards, digital payments, and bank transfers. A 50% deposit is required to confirm bookings, with the balance due before delivery."
}
]}
/>

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

@@ -5,7 +5,6 @@ import ProductCardThree from '@/components/sections/product/ProductCardThree';
import TestimonialCardFifteen from '@/components/sections/testimonial/TestimonialCardFifteen';
import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import Link from 'next/link';
import { Sparkles } from 'lucide-react';
export default function GalleryPage() {
@@ -32,8 +31,7 @@ export default function GalleryPage() {
{ name: "Contact", id: "/contact" }
]}
button={{
text: "Book Consultation",
href: "/contact"
text: "Book Consultation", href: "/contact"
}}
/>
</div>
@@ -46,36 +44,16 @@ export default function GalleryPage() {
tagIcon={Sparkles}
products={[
{
id: "1",
name: "Garden Paradise Bouquet",
price: "$120",
imageSrc: "https://img.b2bpic.net/free-photo/beautiful-boho-flowers-assortment_23-2149526015.jpg",
imageAlt: "Garden paradise arrangement",
initialQuantity: 1
id: "1", name: "Garden Paradise Bouquet", price: "$120", imageSrc: "https://img.b2bpic.net/free-photo/beautiful-boho-flowers-assortment_23-2149526015.jpg", imageAlt: "Garden paradise arrangement", initialQuantity: 1
},
{
id: "2",
name: "Elegant Rose Collection",
price: "$95",
imageSrc: "https://img.b2bpic.net/free-photo/rose-wooden-background_1232-2088.jpg",
imageAlt: "Elegant rose collection",
initialQuantity: 1
id: "2", name: "Elegant Rose Collection", price: "$95", imageSrc: "https://img.b2bpic.net/free-photo/rose-wooden-background_1232-2088.jpg", imageAlt: "Elegant rose collection", initialQuantity: 1
},
{
id: "3",
name: "Seasonal Wildflower Mix",
price: "$75",
imageSrc: "https://img.b2bpic.net/free-photo/elevated-view-red-rose-flower-vase_23-2148181221.jpg",
imageAlt: "Wildflower arrangement",
initialQuantity: 1
id: "3", name: "Seasonal Wildflower Mix", price: "$75", imageSrc: "https://img.b2bpic.net/free-photo/elevated-view-red-rose-flower-vase_23-2148181221.jpg", imageAlt: "Wildflower arrangement", initialQuantity: 1
},
{
id: "4",
name: "Luxury Bridal Bouquet",
price: "$180",
imageSrc: "https://img.b2bpic.net/free-photo/bouquet-roses-with-red-bow_23-2147591160.jpg",
imageAlt: "Luxury bridal bouquet",
initialQuantity: 1
id: "4", name: "Luxury Bridal Bouquet", price: "$180", imageSrc: "https://img.b2bpic.net/free-photo/bouquet-roses-with-red-bow_23-2147591160.jpg", imageAlt: "Luxury bridal bouquet", initialQuantity: 1
}
]}
textboxLayout="default"

23
src/app/layout.tsx
View File

@@ -3,16 +3,12 @@ import { Lato } from "next/font/google";
import "./globals.css";
const lato = Lato({
variable: "--font-lato",
subsets: ["latin"],
variable: "--font-lato", subsets: ["latin"],
weight: ["100", "300", "400", "700", "900"],
});
export const metadata: Metadata = {
title: "Flowers Life - Premium Floral Design Studio",
description: "Exquisite floral arrangements for weddings, events, and special occasions. Premium flowers crafted with artistry and care.",
keywords: "florist, flowers, floral arrangements, wedding flowers, event flowers, bouquets, flower delivery",
metadataBase: new URL("https://flowerslife.com"),
title: "Flowers Life - Premium Floral Design Studio", description: "Exquisite floral arrangements for weddings, events, and special occasions. Premium flowers crafted with artistry and care.", keywords: "florist, flowers, floral arrangements, wedding flowers, event flowers, bouquets, flower delivery", metadataBase: new URL("https://flowerslife.com"),
alternates: {
canonical: "https://flowerslife.com"
},
@@ -21,23 +17,14 @@ export const metadata: Metadata = {
follow: true
},
openGraph: {
title: "Flowers Life - Premium Floral Design Studio",
description: "Celebrating nature's beauty through exquisite floral artistry and design",
url: "https://flowerslife.com",
siteName: "Flowers Life",
type: "website",
images: [
title: "Flowers Life - Premium Floral Design Studio", description: "Celebrating nature's beauty through exquisite floral artistry and design", url: "https://flowerslife.com", siteName: "Flowers Life", type: "website", images: [
{
url: "https://img.b2bpic.net/free-photo/beautiful-boho-flowers-assortment_23-2149526015.jpg",
alt: "Flowers Life - Premium Floral Arrangements"
url: "https://img.b2bpic.net/free-photo/beautiful-boho-flowers-assortment_23-2149526015.jpg", alt: "Flowers Life - Premium Floral Arrangements"
}
]
},
twitter: {
card: "summary_large_image",
title: "Flowers Life - Premium Floral Design Studio",
description: "Exquisite floral arrangements for every occasion",
images: ["https://img.b2bpic.net/free-photo/beautiful-boho-flowers-assortment_23-2149526015.jpg"]
card: "summary_large_image", title: "Flowers Life - Premium Floral Design Studio", description: "Exquisite floral arrangements for every occasion", images: ["https://img.b2bpic.net/free-photo/beautiful-boho-flowers-assortment_23-2149526015.jpg"]
}
};

4
src/app/page.tsx
View File

@@ -6,7 +6,6 @@ import AboutMetric from '@/components/sections/about/AboutMetric';
import TestimonialCardFifteen from '@/components/sections/testimonial/TestimonialCardFifteen';
import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import Link from 'next/link';
import { Flower2, Heart, Award, Globe } from 'lucide-react';
export default function HomePage() {
@@ -33,8 +32,7 @@ export default function HomePage() {
{ name: "Contact", id: "/contact" }
]}
button={{
text: "Book Consultation",
href: "/contact"
text: "Book Consultation", href: "/contact"
}}
/>
</div>

29
src/app/services/page.tsx
View File

@@ -6,8 +6,7 @@ import ProductCardThree from '@/components/sections/product/ProductCardThree';
import ContactCenter from '@/components/sections/contact/ContactCenter';
import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import Link from 'next/link';
import { Sparkles, Envelope } from 'lucide-react';
import { Sparkles, Mail } from 'lucide-react';
export default function ServicesPage() {
return (
@@ -33,8 +32,7 @@ export default function ServicesPage() {
{ name: "Contact", id: "/contact" }
]}
button={{
text: "Book Consultation",
href: "/contact"
text: "Book Consultation", href: "/contact"
}}
/>
</div>
@@ -66,28 +64,13 @@ export default function ServicesPage() {
tagIcon={Sparkles}
products={[
{
id: "1",
name: "Romantic Rose Bouquet",
price: "$85",
imageSrc: "https://img.b2bpic.net/free-photo/rose-wooden-background_1232-2088.jpg",
imageAlt: "Premium rose bouquet",
initialQuantity: 1
id: "1", name: "Romantic Rose Bouquet", price: "$85", imageSrc: "https://img.b2bpic.net/free-photo/rose-wooden-background_1232-2088.jpg", imageAlt: "Premium rose bouquet", initialQuantity: 1
},
{
id: "2",
name: "Wedding Day Elegance",
price: "$250",
imageSrc: "https://img.b2bpic.net/free-photo/bouquet-roses-with-red-bow_23-2147591160.jpg",
imageAlt: "Wedding flower arrangement",
initialQuantity: 1
id: "2", name: "Wedding Day Elegance", price: "$250", imageSrc: "https://img.b2bpic.net/free-photo/bouquet-roses-with-red-bow_23-2147591160.jpg", imageAlt: "Wedding flower arrangement", initialQuantity: 1
},
{
id: "3",
name: "Seasonal Celebration",
price: "$95",
imageSrc: "https://img.b2bpic.net/free-photo/elevated-view-red-rose-flower-vase_23-2148181221.jpg",
imageAlt: "Seasonal flower mix",
initialQuantity: 1
id: "3", name: "Seasonal Celebration", price: "$95", imageSrc: "https://img.b2bpic.net/free-photo/elevated-view-red-rose-flower-vase_23-2148181221.jpg", imageAlt: "Seasonal flower mix", initialQuantity: 1
}
]}
textboxLayout="default"
@@ -100,7 +83,7 @@ export default function ServicesPage() {
<div id="contact" data-section="contact">
<ContactCenter
tag="Get In Touch"
tagIcon={Envelope}
tagIcon={Mail}
title="Ready to bring your vision to life?"
description="Join our mailing list to stay updated on seasonal collections, special promotions, and floral inspiration."
inputPlaceholder="Enter your email address"