development/c110f79f-043d-4ba9-82e1-9e0e1f940332
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main

Browse Source 
Merge version_1 into main
This commit was merged in pull request #1.
This commit is contained in:
development
2026-01-23 13:45:56 +00:00
parent 64896c8a57 bf96035cab
commit 48a264e41e
6 changed files with 58 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/app/arrangements/page.tsx
View File

@@ -49,7 +49,6 @@ export default function ArrangementsPage() {
buttons={[
{ text: "Browse by Occasion", href: "#products" }
]}
useInvertedBackground="noInvert"
/>
</div>
@@ -59,44 +58,20 @@ export default function ArrangementsPage() {
description="Handpicked collections for weddings, events, gifts, and everyday joy."
products={[
{
id: "1",
brand: "Rose Studio",
name: "Romantic Red Rose Bouquet",
price: "$89.00",
rating: 5,
reviewCount: "342",
imageSrc: "https://img.b2bpic.net/free-photo/vase-with-decorative-flowers_1203-1640.jpg",
imageAlt: "Red roses"
id: "1", brand: "Rose Studio", name: "Romantic Red Rose Bouquet", price: "$89.00", rating: 5,
reviewCount: "342", imageSrc: "https://img.b2bpic.net/free-photo/vase-with-decorative-flowers_1203-1640.jpg", imageAlt: "Red roses"
},
{
id: "2",
brand: "Rose Studio",
name: "Spring Celebration Arrangement",
price: "$75.00",
rating: 5,
reviewCount: "218",
imageSrc: "https://img.b2bpic.net/free-photo/beautiful-flowers-blue-surface_23-2147609383.jpg",
imageAlt: "Spring tulips"
id: "2", brand: "Rose Studio", name: "Spring Celebration Arrangement", price: "$75.00", rating: 5,
reviewCount: "218", imageSrc: "https://img.b2bpic.net/free-photo/beautiful-flowers-blue-surface_23-2147609383.jpg", imageAlt: "Spring tulips"
},
{
id: "3",
brand: "Rose Studio",
name: "Sunshine Sunflower Bundle",
price: "$72.00",
rating: 5,
reviewCount: "195",
imageSrc: "https://img.b2bpic.net/free-photo/wedding-bouquet-wooden-piece-with-white-candles_114579-2065.jpg",
imageAlt: "Sunflower arrangement"
id: "3", brand: "Rose Studio", name: "Sunshine Sunflower Bundle", price: "$72.00", rating: 5,
reviewCount: "195", imageSrc: "https://img.b2bpic.net/free-photo/wedding-bouquet-wooden-piece-with-white-candles_114579-2065.jpg", imageAlt: "Sunflower arrangement"
},
{
id: "4",
brand: "Rose Studio",
name: "Peony Paradise Collection",
price: "$95.00",
rating: 5,
reviewCount: "267",
imageSrc: "https://img.b2bpic.net/free-vector/elegant-wedding-invitation-card-with-beautiful-floral_21799-2713.jpg",
imageAlt: "Pink peonies"
id: "4", brand: "Rose Studio", name: "Peony Paradise Collection", price: "$95.00", rating: 5,
reviewCount: "267", imageSrc: "https://img.b2bpic.net/free-vector/elegant-wedding-invitation-card-with-beautiful-floral_21799-2713.jpg", imageAlt: "Pink peonies"
}
]}
gridVariant="four-items-2x2-equal-grid"
@@ -121,8 +96,7 @@ export default function ArrangementsPage() {
logoText="Rose"
columns={[
{
title: "Collections",
items: [
title: "Collections", items: [
{ label: "Wedding Flowers", href: "/arrangements" },
{ label: "Event Design", href: "/arrangements" },
{ label: "Everyday Arrangements", href: "/arrangements" },
@@ -130,8 +104,7 @@ export default function ArrangementsPage() {
]
},
{
title: "Services",
items: [
title: "Services", items: [
{ label: "Custom Design", href: "/services" },
{ label: "Delivery", href: "/services" },
{ label: "Subscriptions", href: "/services" },
@@ -139,8 +112,7 @@ export default function ArrangementsPage() {
]
},
{
title: "Company",
items: [
title: "Company", items: [
{ label: "About Us", href: "/" },
{ label: "Gallery", href: "/gallery" },
{ label: "Blog", href: "/" },
@@ -148,8 +120,7 @@ export default function ArrangementsPage() {
]
},
{
title: "Connect",
items: [
title: "Connect", items: [
{ label: "Instagram", href: "https://instagram.com" },
{ label: "Facebook", href: "https://facebook.com" },
{ label: "Pinterest", href: "https://pinterest.com" },

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

@@ -45,7 +45,6 @@ export default function ContactPage() {
imageAlt="Contact Rose Studio"
textPosition="center"
showBlur={true}
useInvertedBackground="noInvert"
/>
</div>
@@ -65,8 +64,7 @@ export default function ContactPage() {
logoText="Rose"
columns={[
{
title: "Collections",
items: [
title: "Collections", items: [
{ label: "Wedding Flowers", href: "/arrangements" },
{ label: "Event Design", href: "/arrangements" },
{ label: "Everyday Arrangements", href: "/arrangements" },
@@ -74,8 +72,7 @@ export default function ContactPage() {
]
},
{
title: "Services",
items: [
title: "Services", items: [
{ label: "Custom Design", href: "/services" },
{ label: "Delivery", href: "/services" },
{ label: "Subscriptions", href: "/services" },
@@ -83,8 +80,7 @@ export default function ContactPage() {
]
},
{
title: "Company",
items: [
title: "Company", items: [
{ label: "About Us", href: "/" },
{ label: "Gallery", href: "/gallery" },
{ label: "Blog", href: "/" },
@@ -92,8 +88,7 @@ export default function ContactPage() {
]
},
{
title: "Connect",
items: [
title: "Connect", items: [
{ label: "Instagram", href: "https://instagram.com" },
{ label: "Facebook", href: "https://facebook.com" },
{ label: "Pinterest", href: "https://pinterest.com" },

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

@@ -45,7 +45,6 @@ export default function GalleryPage() {
imageAlt="Rose gallery showcase"
textPosition="center"
showBlur={true}
useInvertedBackground="noInvert"
/>
</div>
@@ -55,36 +54,16 @@ export default function GalleryPage() {
description="A selection of our most celebrated floral arrangements and event installations."
blogs={[
{
id: "1",
category: "Romantic",
title: "Scarlet Romance - Red Rose Centerpiece",
excerpt: "A timeless arrangement of premium red roses perfect for anniversaries and romantic celebrations.",
imageSrc: "https://img.b2bpic.net/free-photo/vase-with-decorative-flowers_1203-1640.jpg",
imageAlt: "Red rose arrangement"
id: "1", category: "Romantic", title: "Scarlet Romance - Red Rose Centerpiece", excerpt: "A timeless arrangement of premium red roses perfect for anniversaries and romantic celebrations.", imageSrc: "https://img.b2bpic.net/free-photo/vase-with-decorative-flowers_1203-1640.jpg", imageAlt: "Red rose arrangement"
},
{
id: "2",
category: "Spring",
title: "Spring Awakening - Vibrant Tulip Mix",
excerpt: "Celebrate the season with our colorful tulip arrangements featuring soft pastels and bold hues.",
imageSrc: "https://img.b2bpic.net/free-photo/beautiful-flowers-blue-surface_23-2147609383.jpg",
imageAlt: "Spring tulip arrangement"
id: "2", category: "Spring", title: "Spring Awakening - Vibrant Tulip Mix", excerpt: "Celebrate the season with our colorful tulip arrangements featuring soft pastels and bold hues.", imageSrc: "https://img.b2bpic.net/free-photo/beautiful-flowers-blue-surface_23-2147609383.jpg", imageAlt: "Spring tulip arrangement"
},
{
id: "3",
category: "Joyful",
title: "Sunshine Bliss - Sunflower Installation",
excerpt: "Brighten any space with our cheerful sunflower designs that radiate happiness and warmth.",
imageSrc: "https://img.b2bpic.net/free-photo/wedding-bouquet-wooden-piece-with-white-candles_114579-2065.jpg",
imageAlt: "Sunflower arrangement"
id: "3", category: "Joyful", title: "Sunshine Bliss - Sunflower Installation", excerpt: "Brighten any space with our cheerful sunflower designs that radiate happiness and warmth.", imageSrc: "https://img.b2bpic.net/free-photo/wedding-bouquet-wooden-piece-with-white-candles_114579-2065.jpg", imageAlt: "Sunflower arrangement"
},
{
id: "4",
category: "Luxury",
title: "Peony Paradise - Premium Pink Collection",
excerpt: "Elegant peonies arranged in our signature style for the most discerning floral enthusiasts.",
imageSrc: "https://img.b2bpic.net/free-vector/elegant-wedding-invitation-card-with-beautiful-floral_21799-2713.jpg",
imageAlt: "Pink peony arrangement"
id: "4", category: "Luxury", title: "Peony Paradise - Premium Pink Collection", excerpt: "Elegant peonies arranged in our signature style for the most discerning floral enthusiasts.", imageSrc: "https://img.b2bpic.net/free-vector/elegant-wedding-invitation-card-with-beautiful-floral_21799-2713.jpg", imageAlt: "Pink peony arrangement"
}
]}
textboxLayout="default"
@@ -98,8 +77,7 @@ export default function GalleryPage() {
logoText="Rose"
columns={[
{
title: "Collections",
items: [
title: "Collections", items: [
{ label: "Wedding Flowers", href: "/arrangements" },
{ label: "Event Design", href: "/arrangements" },
{ label: "Everyday Arrangements", href: "/arrangements" },
@@ -107,8 +85,7 @@ export default function GalleryPage() {
]
},
{
title: "Services",
items: [
title: "Services", items: [
{ label: "Custom Design", href: "/services" },
{ label: "Delivery", href: "/services" },
{ label: "Subscriptions", href: "/services" },
@@ -116,8 +93,7 @@ export default function GalleryPage() {
]
},
{
title: "Company",
items: [
title: "Company", items: [
{ label: "About Us", href: "/" },
{ label: "Gallery", href: "/gallery" },
{ label: "Blog", href: "/" },
@@ -125,8 +101,7 @@ export default function GalleryPage() {
]
},
{
title: "Connect",
items: [
title: "Connect", items: [
{ label: "Instagram", href: "https://instagram.com" },
{ label: "Facebook", href: "https://facebook.com" },
{ label: "Pinterest", href: "https://pinterest.com" },

26
src/app/layout.tsx
View File

@@ -6,42 +6,28 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const interTight = Inter_Tight({
variable: "--font-inter-tight",
subsets: ["latin"],
variable: "--font-inter-tight", subsets: ["latin"],
weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
});
const fraunces = Fraunces({
variable: "--font-fraunces",
subsets: ["latin"],
variable: "--font-fraunces", subsets: ["latin"],
});
export const metadata: Metadata = {
title: "Rose - Premium Floral Design Studio",
description: "Handcrafted floral arrangements and expert design services for weddings, events, and everyday joy. Premium roses and exotic blooms.",
keywords: "florist, floral design, flower arrangements, wedding flowers, event flowers, roses, bouquets, flower delivery",
metadataBase: new URL("https://rosestudio.com"),
title: "Rose - Premium Floral Design Studio", description: "Handcrafted floral arrangements and expert design services for weddings, events, and everyday joy. Premium roses and exotic blooms.", keywords: "florist, floral design, flower arrangements, wedding flowers, event flowers, roses, bouquets, flower delivery", metadataBase: new URL("https://rosestudio.com"),
alternates: {
canonical: "https://rosestudio.com"
},
openGraph: {
title: "Rose - Premium Floral Design",
description: "Handcrafted floral arrangements for every occasion",
url: "https://rosestudio.com",
siteName: "Rose Flowers Studio",
type: "website",
images: [
title: "Rose - Premium Floral Design", description: "Handcrafted floral arrangements for every occasion", url: "https://rosestudio.com", siteName: "Rose Flowers Studio", type: "website", images: [
{
url: "https://img.b2bpic.net/free-photo/bouquet-fresh-roses-glass-vase-close-up_169016-8804.jpg",
alt: "Rose Studio Floral Arrangements"
url: "https://img.b2bpic.net/free-photo/bouquet-fresh-roses-glass-vase-close-up_169016-8804.jpg", alt: "Rose Studio Floral Arrangements"
}
]
},
twitter: {
card: "summary_large_image",
title: "Rose - Premium Floral Design Studio",
description: "Handcrafted arrangements celebrating beauty in every bloom",
images: ["https://img.b2bpic.net/free-photo/bouquet-fresh-roses-glass-vase-close-up_169016-8804.jpg"]
card: "summary_large_image", title: "Rose - Premium Floral Design Studio", description: "Handcrafted arrangements celebrating beauty in every bloom", images: ["https://img.b2bpic.net/free-photo/bouquet-fresh-roses-glass-vase-close-up_169016-8804.jpg"]
},
robots: {
index: true,

89
src/app/page.tsx
View File

@@ -56,7 +56,6 @@ export default function HomePage() {
{ text: "Explore Arrangements", href: "/arrangements" },
{ text: "Book a Design Consultation", href: "/contact" }
]}
useInvertedBackground="invertDefault"
/>
</div>
@@ -83,34 +82,16 @@ export default function HomePage() {
tagIcon={Star}
products={[
{
id: "1",
brand: "Rose Studio",
name: "Romantic Red Rose Bouquet",
price: "$89.00",
rating: 5,
reviewCount: "342",
imageSrc: "https://img.b2bpic.net/free-photo/side-view-pink-color-roses-flower-bouquet_140725-12180.jpg",
imageAlt: "Red rose wedding bouquet"
id: "1", brand: "Rose Studio", name: "Romantic Red Rose Bouquet", price: "$89.00", rating: 5,
reviewCount: "342", imageSrc: "https://img.b2bpic.net/free-photo/side-view-pink-color-roses-flower-bouquet_140725-12180.jpg", imageAlt: "Red rose wedding bouquet"
},
{
id: "2",
brand: "Rose Studio",
name: "Spring Celebration Arrangement",
price: "$75.00",
rating: 5,
reviewCount: "218",
imageSrc: "https://img.b2bpic.net/free-photo/bouquet-florish-vase-standing_114579-2320.jpg",
imageAlt: "Colorful spring flower arrangement"
id: "2", brand: "Rose Studio", name: "Spring Celebration Arrangement", price: "$75.00", rating: 5,
reviewCount: "218", imageSrc: "https://img.b2bpic.net/free-photo/bouquet-florish-vase-standing_114579-2320.jpg", imageAlt: "Colorful spring flower arrangement"
},
{
id: "3",
brand: "Rose Studio",
name: "Everyday Elegance Vase",
price: "$65.00",
rating: 5,
reviewCount: "156",
imageSrc: "https://img.b2bpic.net/free-photo/flat-lay-beautifully-bloomed-colorful-rose-flowers_23-2149005540.jpg",
imageAlt: "Beautiful everyday flower arrangement"
id: "3", brand: "Rose Studio", name: "Everyday Elegance Vase", price: "$65.00", rating: 5,
reviewCount: "156", imageSrc: "https://img.b2bpic.net/free-photo/flat-lay-beautifully-bloomed-colorful-rose-flowers_23-2149005540.jpg", imageAlt: "Beautiful everyday flower arrangement"
}
]}
gridVariant="three-columns-all-equal-width"
@@ -134,24 +115,16 @@ export default function HomePage() {
useInvertedBackground="noInvert"
accordionItems={[
{
id: "1",
title: "Custom Design Services",
content: "Work directly with our master florists to create bespoke arrangements tailored to your vision, color preferences, and occasion."
id: "1", title: "Custom Design Services", content: "Work directly with our master florists to create bespoke arrangements tailored to your vision, color preferences, and occasion."
},
{
id: "2",
title: "Premium Fresh Flowers",
content: "We source only the finest fresh blooms from sustainable growers, ensuring your arrangements remain vibrant and beautiful."
id: "2", title: "Premium Fresh Flowers", content: "We source only the finest fresh blooms from sustainable growers, ensuring your arrangements remain vibrant and beautiful."
},
{
id: "3",
title: "Same-Day Delivery",
content: "Need flowers today? Our efficient delivery service ensures your arrangements arrive fresh and on time, anywhere in the city."
id: "3", title: "Same-Day Delivery", content: "Need flowers today? Our efficient delivery service ensures your arrangements arrive fresh and on time, anywhere in the city."
},
{
id: "4",
title: "Expert Care Guidance",
content: "Each arrangement comes with professional care instructions to maximize the lifespan and beauty of your flowers."
id: "4", title: "Expert Care Guidance", content: "Each arrangement comes with professional care instructions to maximize the lifespan and beauty of your flowers."
}
]}
buttons={[
@@ -164,40 +137,22 @@ export default function HomePage() {
<TestimonialCardTwelve
testimonials={[
{
id: "1",
name: "Sarah Mitchell",
imageSrc: "https://img.b2bpic.net/free-photo/casual-smile-street-style-background-spring_1139-777.jpg",
imageAlt: "Sarah Mitchell"
id: "1", name: "Sarah Mitchell", imageSrc: "https://img.b2bpic.net/free-photo/casual-smile-street-style-background-spring_1139-777.jpg", imageAlt: "Sarah Mitchell"
},
{
id: "2",
name: "Emily Chen",
imageSrc: "https://img.b2bpic.net/free-photo/studio-portrait-successful-young-businesswoman_1262-5844.jpg",
imageAlt: "Emily Chen"
id: "2", name: "Emily Chen", imageSrc: "https://img.b2bpic.net/free-photo/studio-portrait-successful-young-businesswoman_1262-5844.jpg", imageAlt: "Emily Chen"
},
{
id: "3",
name: "James Patel",
imageSrc: "https://img.b2bpic.net/free-photo/portrait-young-business-woman-standing-outside-office-buildings-business-success-concept_58466-12274.jpg",
imageAlt: "James Patel"
id: "3", name: "James Patel", imageSrc: "https://img.b2bpic.net/free-photo/portrait-young-business-woman-standing-outside-office-buildings-business-success-concept_58466-12274.jpg", imageAlt: "James Patel"
},
{
id: "4",
name: "Lisa Rodriguez",
imageSrc: "https://img.b2bpic.net/free-photo/businesswoman-glasses-portrait_1262-1461.jpg",
imageAlt: "Lisa Rodriguez"
id: "4", name: "Lisa Rodriguez", imageSrc: "https://img.b2bpic.net/free-photo/businesswoman-glasses-portrait_1262-1461.jpg", imageAlt: "Lisa Rodriguez"
},
{
id: "5",
name: "David Kim",
imageSrc: "https://img.b2bpic.net/free-photo/portrait-cheerful-teenage-girl-sitting-cafe_1262-3048.jpg",
imageAlt: "David Kim"
id: "5", name: "David Kim", imageSrc: "https://img.b2bpic.net/free-photo/portrait-cheerful-teenage-girl-sitting-cafe_1262-3048.jpg", imageAlt: "David Kim"
},
{
id: "6",
name: "Jessica Thompson",
imageSrc: "https://img.b2bpic.net/free-photo/smiling-young-woman-typing-her-laptop_231208-13559.jpg",
imageAlt: "Jessica Thompson"
id: "6", name: "Jessica Thompson", imageSrc: "https://img.b2bpic.net/free-photo/smiling-young-woman-typing-her-laptop_231208-13559.jpg", imageAlt: "Jessica Thompson"
}
]}
cardTitle="Trusted by over 2,500 satisfied customers who celebrate life's moments with Rose Studio"
@@ -223,8 +178,7 @@ export default function HomePage() {
logoText="Rose"
columns={[
{
title: "Collections",
items: [
title: "Collections", items: [
{ label: "Wedding Flowers", href: "/arrangements" },
{ label: "Event Design", href: "/arrangements" },
{ label: "Everyday Arrangements", href: "/arrangements" },
@@ -232,8 +186,7 @@ export default function HomePage() {
]
},
{
title: "Services",
items: [
title: "Services", items: [
{ label: "Custom Design", href: "/services" },
{ label: "Delivery", href: "/services" },
{ label: "Subscriptions", href: "/services" },
@@ -241,8 +194,7 @@ export default function HomePage() {
]
},
{
title: "Company",
items: [
title: "Company", items: [
{ label: "About Us", href: "/" },
{ label: "Gallery", href: "/gallery" },
{ label: "Blog", href: "/" },
@@ -250,8 +202,7 @@ export default function HomePage() {
]
},
{
title: "Connect",
items: [
title: "Connect", items: [
{ label: "Instagram", href: "https://instagram.com" },
{ label: "Facebook", href: "https://facebook.com" },
{ label: "Pinterest", href: "https://pinterest.com" },

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

@@ -49,7 +49,6 @@ export default function ServicesPage() {
buttons={[
{ text: "Book a Service", href: "/contact" }
]}
useInvertedBackground="noInvert"
/>
</div>
@@ -63,24 +62,16 @@ export default function ServicesPage() {
useInvertedBackground="invertDefault"
accordionItems={[
{
id: "1",
title: "Custom Design Consultation",
content: "Meet with our master florists to design unique arrangements. We listen to your vision and create something extraordinary."
id: "1", title: "Custom Design Consultation", content: "Meet with our master florists to design unique arrangements. We listen to your vision and create something extraordinary."
},
{
id: "2",
title: "Wedding & Event Flowers",
content: "Complete floral services for your special day. Bridal bouquets, centerpieces, ceremony decor, and more."
id: "2", title: "Wedding & Event Flowers", content: "Complete floral services for your special day. Bridal bouquets, centerpieces, ceremony decor, and more."
},
{
id: "3",
title: "Corporate Accounts",
content: "Recurring flower delivery for offices, hotels, and businesses. Fresh blooms weekly or monthly."
id: "3", title: "Corporate Accounts", content: "Recurring flower delivery for offices, hotels, and businesses. Fresh blooms weekly or monthly."
},
{
id: "4",
title: "Flower Subscriptions",
content: "Subscribe to regular deliveries of fresh seasonal flowers. Surprise someone special or brighten your own home."
id: "4", title: "Flower Subscriptions", content: "Subscribe to regular deliveries of fresh seasonal flowers. Surprise someone special or brighten your own home."
}
]}
/>
@@ -101,8 +92,7 @@ export default function ServicesPage() {
logoText="Rose"
columns={[
{
title: "Collections",
items: [
title: "Collections", items: [
{ label: "Wedding Flowers", href: "/arrangements" },
{ label: "Event Design", href: "/arrangements" },
{ label: "Everyday Arrangements", href: "/arrangements" },
@@ -110,8 +100,7 @@ export default function ServicesPage() {
]
},
{
title: "Services",
items: [
title: "Services", items: [
{ label: "Custom Design", href: "/services" },
{ label: "Delivery", href: "/services" },
{ label: "Subscriptions", href: "/services" },
@@ -119,8 +108,7 @@ export default function ServicesPage() {
]
},
{
title: "Company",
items: [
title: "Company", items: [
{ label: "About Us", href: "/" },
{ label: "Gallery", href: "/gallery" },
{ label: "Blog", href: "/" },
@@ -128,8 +116,7 @@ export default function ServicesPage() {
]
},
{
title: "Connect",
items: [
title: "Connect", items: [
{ label: "Instagram", href: "https://instagram.com" },
{ label: "Facebook", href: "https://facebook.com" },
{ label: "Pinterest", href: "https://pinterest.com" },