Merge version_1 into main #1

Merged
development merged 5 commits from version_1 into main 2026-01-15 10:15:53 +00:00
5 changed files with 69 additions and 96 deletions

View File

@@ -5,7 +5,7 @@ import NavbarStyleMinimal from '@/components/navbar/NavbarStyleMinimal';
import InlineImageSplitTextAbout from '@/components/sections/about/InlineImageSplitTextAbout';
import FeatureProcessSteps from '@/components/sections/feature/FeatureProcessSteps';
import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
import { ThemeProvider } from '@/components/ui/ThemeProvider';
import { ThemeProvider } from '@/providers/themeProvider/ThemeProvider';
export default function AboutPage() {
return (
@@ -13,22 +13,27 @@ export default function AboutPage() {
defaultButtonVariant="hover-magnetic"
defaultTextAnimation="entrance-slide"
borderRadius="pill"
contentWidth="compact"
sizing="largeSizeMediumTitles"
contentWidth="medium"
sizing="medium"
background="aurora"
cardStyle="gradient-mesh"
primaryButtonStyle="double-inset"
secondaryButtonStyle="layered"
cardStyle="glass-elevated"
primaryButtonStyle="gradient"
secondaryButtonStyle="glass"
showBlurBottom={false}
>
<div id="nav" data-section="nav">
<NavbarStyleMinimal
brandName="Bloom & Petals"
button={{
text: "Shop Now",
href: "/products"
text: "Shop Now", href: "/products"
}}
/>
<div style={{ position: 'absolute', top: '20px', right: '200px', zIndex: 1000 }}>
<Link href="/" style={{ marginRight: '15px', color: 'var(--foreground)' }}>Home</Link>
<Link href="/about" style={{ marginRight: '15px', color: 'var(--foreground)' }}>About</Link>
<Link href="/products" style={{ marginRight: '15px', color: 'var(--foreground)' }}>Products</Link>
<Link href="/contact" style={{ color: 'var(--foreground)' }}>Contact</Link>
</div>
</div>
<div id="about" data-section="about">
@@ -53,22 +58,13 @@ export default function AboutPage() {
useInvertedBackground="noInvert"
steps={[
{
number: "01",
title: "Choose Your Flowers",
description: "Browse our curated collection of fresh, premium arrangements or customize your own.",
tag: "Selection"
number: "01", title: "Choose Your Flowers", description: "Browse our curated collection of fresh, premium arrangements or customize your own.", tag: "Selection"
},
{
number: "02",
title: "Add Personal Touch",
description: "Include a heartfelt message, select delivery date, and add special add-ons like chocolates or candles.",
tag: "Customization"
number: "02", title: "Add Personal Touch", description: "Include a heartfelt message, select delivery date, and add special add-ons like chocolates or candles.", tag: "Customization"
},
{
number: "03",
title: "Fast Delivery",
description: "We'll arrange, package, and deliver your flowers with care straight to the recipient's door.",
tag: "Delivery"
number: "03", title: "Fast Delivery", description: "We'll arrange, package, and deliver your flowers with care straight to the recipient's door.", tag: "Delivery"
}
]}
/>

View File

@@ -4,7 +4,7 @@ import Link from "next/link";
import NavbarStyleMinimal from '@/components/navbar/NavbarStyleMinimal';
import ContactSplit from '@/components/sections/contact/ContactSplit';
import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
import { ThemeProvider } from '@/components/ui/ThemeProvider';
import { ThemeProvider } from '@/providers/themeProvider/ThemeProvider';
export default function ContactPage() {
return (
@@ -12,22 +12,27 @@ export default function ContactPage() {
defaultButtonVariant="hover-magnetic"
defaultTextAnimation="entrance-slide"
borderRadius="pill"
contentWidth="compact"
sizing="largeSizeMediumTitles"
contentWidth="medium"
sizing="medium"
background="aurora"
cardStyle="gradient-mesh"
primaryButtonStyle="double-inset"
secondaryButtonStyle="layered"
cardStyle="glass-elevated"
primaryButtonStyle="gradient"
secondaryButtonStyle="glass"
showBlurBottom={false}
>
<div id="nav" data-section="nav">
<NavbarStyleMinimal
brandName="Bloom & Petals"
button={{
text: "Shop Now",
href: "/products"
text: "Shop Now", href: "/products"
}}
/>
<div style={{ position: 'absolute', top: '20px', right: '200px', zIndex: 1000 }}>
<Link href="/" style={{ marginRight: '15px', color: 'var(--foreground)' }}>Home</Link>
<Link href="/about" style={{ marginRight: '15px', color: 'var(--foreground)' }}>About</Link>
<Link href="/products" style={{ marginRight: '15px', color: 'var(--foreground)' }}>Products</Link>
<Link href="/contact" style={{ color: 'var(--foreground)' }}>Contact</Link>
</div>
</div>
<div id="contact" data-section="contact">

View File

@@ -5,31 +5,19 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const rubik = Rubik({
variable: "--font-rubik",
subsets: ["latin"],
variable: "--font-rubik", subsets: ["latin"],
});
export const metadata: Metadata = {
title: "Bloom & Petals | Fresh Flower Delivery & Arrangements",
description: "Send fresh, handcrafted floral arrangements for any occasion. Premium flowers delivered same-day with guaranteed freshness and beautiful packaging.",
keywords: "flower delivery, fresh flowers, flower arrangements, bouquets, florist online",
openGraph: {
title: "Bloom & Petals | Fresh Flower Delivery",
description: "Beautiful handcrafted flower arrangements delivered fresh to your door.",
siteName: "Bloom & Petals",
type: "website",
images: [
title: "Bloom & Petals | Fresh Flower Delivery & Arrangements", description: "Send fresh, handcrafted floral arrangements for any occasion. Premium flowers delivered same-day with guaranteed freshness and beautiful packaging.", keywords: "flower delivery, fresh flowers, flower arrangements, bouquets, florist online", openGraph: {
title: "Bloom & Petals | Fresh Flower Delivery", description: "Beautiful handcrafted flower arrangements delivered fresh to your door.", siteName: "Bloom & Petals", type: "website", images: [
{
url: "https://img.b2bpic.net/free-photo/high-angle-beautiful-boho-flowers_23-2149526052.jpg",
alt: "Fresh flower arrangements"
url: "https://img.b2bpic.net/free-photo/high-angle-beautiful-boho-flowers_23-2149526052.jpg", alt: "Fresh flower arrangements"
}
]
},
twitter: {
card: "summary_large_image",
title: "Bloom & Petals | Fresh Flower Delivery",
description: "Send fresh flowers for any occasion with guaranteed quality.",
images: ["https://img.b2bpic.net/free-photo/high-angle-beautiful-boho-flowers_23-2149526052.jpg"]
card: "summary_large_image", title: "Bloom & Petals | Fresh Flower Delivery", description: "Send fresh flowers for any occasion with guaranteed quality.", images: ["https://img.b2bpic.net/free-photo/high-angle-beautiful-boho-flowers_23-2149526052.jpg"]
},
robots: {
index: true,

View File

@@ -5,7 +5,7 @@ import NavbarStyleMinimal from '@/components/navbar/NavbarStyleMinimal';
import HeroBillboardScroll from '@/components/sections/hero/HeroBillboardScroll';
import TestimonialCardThirteen from '@/components/sections/testimonial/TestimonialCardThirteen';
import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
import { ThemeProvider } from '@/components/ui/ThemeProvider';
import { ThemeProvider } from '@/providers/themeProvider/ThemeProvider';
export default function HomePage() {
return (
@@ -13,22 +13,27 @@ export default function HomePage() {
defaultButtonVariant="hover-magnetic"
defaultTextAnimation="entrance-slide"
borderRadius="pill"
contentWidth="compact"
sizing="largeSizeMediumTitles"
contentWidth="medium"
sizing="medium"
background="aurora"
cardStyle="gradient-mesh"
primaryButtonStyle="double-inset"
secondaryButtonStyle="layered"
cardStyle="glass-elevated"
primaryButtonStyle="gradient"
secondaryButtonStyle="glass"
showBlurBottom={false}
>
<div id="nav" data-section="nav">
<NavbarStyleMinimal
brandName="Bloom & Petals"
button={{
text: "Shop Now",
href: "/products"
text: "Shop Now", href: "/products"
}}
/>
<div style={{ position: 'absolute', top: '20px', right: '200px', zIndex: 1000 }}>
<Link href="/" style={{ marginRight: '15px', color: 'var(--foreground)' }}>Home</Link>
<Link href="/about" style={{ marginRight: '15px', color: 'var(--foreground)' }}>About</Link>
<Link href="/products" style={{ marginRight: '15px', color: 'var(--foreground)' }}>Products</Link>
<Link href="/contact" style={{ color: 'var(--foreground)' }}>Contact</Link>
</div>
</div>
<div id="hero" data-section="hero">
@@ -55,27 +60,17 @@ export default function HomePage() {
showRating={true}
testimonials={[
{
id: "1",
name: "Sarah Johnson",
handle: "@sarahjohns",
testimonial: "The flowers arrived beautifully packaged and incredibly fresh. My wife loved them! Definitely ordering again.",
rating: 5,
id: "1", name: "Sarah Johnson", handle: "@sarahjohns", testimonial: "The flowers arrived beautifully packaged and incredibly fresh. My wife loved them! Definitely ordering again.", rating: 5,
imageSrc: "https://img.b2bpic.net/free-photo/arm-close-up-woman-with-shopping-bags_1098-2428.jpg"
},
{
id: "2",
name: "Michael Chen",
handle: "@mchen_photos",
testimonial: "Best floral service I've used. Fast delivery, gorgeous arrangements, and excellent customer service.",
rating: 5,
id: "2", name: "Michael Chen",
handle: "@mchen_photos", testimonial: "Best floral service I've used. Fast delivery, gorgeous arrangements, and excellent customer service.", rating: 5,
imageSrc: "https://img.b2bpic.net/free-photo/portrait-woman-happy-after-shopping_23-2148660676.jpg"
},
{
id: "3",
name: "Emily Rodriguez",
handle: "@emilyrodz",
testimonial: "Custom arrangement was exactly what I envisioned. The florist understood my vision perfectly.",
rating: 5,
id: "3", name: "Emily Rodriguez", handle: "@emilyrodz",
testimonial: "Custom arrangement was exactly what I envisioned. The florist understood my vision perfectly.", rating: 5,
imageSrc: "https://img.b2bpic.net/free-photo/girl-looking-away-medium-shot_23-2148225705.jpg"
}
]}

View File

@@ -4,7 +4,7 @@ import Link from "next/link";
import NavbarStyleMinimal from '@/components/navbar/NavbarStyleMinimal';
import ProductCardOne from '@/components/sections/product/ProductCardOne';
import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
import { ThemeProvider } from '@/components/ui/ThemeProvider';
import { ThemeProvider } from '@/providers/themeProvider/ThemeProvider';
export default function ProductsPage() {
return (
@@ -12,22 +12,27 @@ export default function ProductsPage() {
defaultButtonVariant="hover-magnetic"
defaultTextAnimation="entrance-slide"
borderRadius="pill"
contentWidth="compact"
sizing="largeSizeMediumTitles"
contentWidth="medium"
sizing="medium"
background="aurora"
cardStyle="gradient-mesh"
primaryButtonStyle="double-inset"
secondaryButtonStyle="layered"
cardStyle="glass-elevated"
primaryButtonStyle="gradient"
secondaryButtonStyle="glass"
showBlurBottom={false}
>
<div id="nav" data-section="nav">
<NavbarStyleMinimal
brandName="Bloom & Petals"
button={{
text: "Shop Now",
href: "/products"
text: "Shop Now", href: "/products"
}}
/>
<div style={{ position: 'absolute', top: '20px', right: '200px', zIndex: 1000 }}>
<Link href="/" style={{ marginRight: '15px', color: 'var(--foreground)' }}>Home</Link>
<Link href="/about" style={{ marginRight: '15px', color: 'var(--foreground)' }}>About</Link>
<Link href="/products" style={{ marginRight: '15px', color: 'var(--foreground)' }}>Products</Link>
<Link href="/contact" style={{ color: 'var(--foreground)' }}>Contact</Link>
</div>
</div>
<div id="products" data-section="products">
@@ -41,32 +46,16 @@ export default function ProductsPage() {
useInvertedBackground="noInvert"
products={[
{
id: "1",
name: "Red Rose Romance",
price: "$79.99",
imageSrc: "https://img.b2bpic.net/free-photo/elevated-view-red-rose-flower-vase_23-2148181221.jpg",
imageAlt: "Red roses bouquet"
id: "1", name: "Red Rose Romance", price: "$79.99", imageSrc: "https://img.b2bpic.net/free-photo/elevated-view-red-rose-flower-vase_23-2148181221.jpg", imageAlt: "Red roses bouquet"
},
{
id: "2",
name: "Spring Tulip Mix",
price: "$69.99",
imageSrc: "https://img.b2bpic.net/free-photo/red-roses-inside-transparent-glass-vase-room_114579-2701.jpg",
imageAlt: "Colorful tulips arrangement"
id: "2", name: "Spring Tulip Mix", price: "$69.99", imageSrc: "https://img.b2bpic.net/free-photo/red-roses-inside-transparent-glass-vase-room_114579-2701.jpg", imageAlt: "Colorful tulips arrangement"
},
{
id: "3",
name: "Sunflower Sunshine",
price: "$74.99",
imageSrc: "https://img.b2bpic.net/free-photo/close-up-man-holding-elegant-flowers_23-2148488537.jpg",
imageAlt: "Bright sunflowers"
id: "3", name: "Sunflower Sunshine", price: "$74.99", imageSrc: "https://img.b2bpic.net/free-photo/close-up-man-holding-elegant-flowers_23-2148488537.jpg", imageAlt: "Bright sunflowers"
},
{
id: "4",
name: "Orchid Elegance",
price: "$89.99",
imageSrc: "https://img.b2bpic.net/free-photo/beautiful-wedding-bouquet-roses_24837-420.jpg",
imageAlt: "Premium orchid arrangement"
id: "4", name: "Orchid Elegance", price: "$89.99", imageSrc: "https://img.b2bpic.net/free-photo/beautiful-wedding-bouquet-roses_24837-420.jpg", imageAlt: "Premium orchid arrangement"
}
]}
/>