development/8b341297-ab9c-484b-9d13-9a8c83d3c1db
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #1

Merged
development merged 6 commits from version_1 into main 2026-01-23 12:39:10 +00:00
Conversation 0 Commits 6 Files Changed 6 +54 -168
6 changed files with 54 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/app/about/page.tsx
View File

@@ -8,6 +8,7 @@ import TeamCardSix from '@/components/sections/team/TeamCardSix';
import FeatureHoverPattern from '@/components/sections/feature/featureHoverPattern/FeatureHoverPattern';
import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
import { Sparkles, Handshake, Leaf, Users } from 'lucide-react';
import Link from 'next/link';
export default function AboutPage() {
return (
@@ -33,8 +34,7 @@ export default function AboutPage() {
{ name: "Contact", id: "/contact" }
]}
button={{
text: "Order Now",
href: "/shop"
text: "Order Now", href: "/shop"
}}
/>
</div>
@@ -68,28 +68,16 @@ export default function AboutPage() {
description="Talented florists and designers dedicated to bringing beauty to every arrangement"
members={[
{
id: "1",
name: "Isabella Rossi",
role: "Founder & Head Florist",
imageSrc: "https://img.b2bpic.net/free-photo/caucasion-woman-casual-confident-concept_53876-137678.jpg"
id: "1", name: "Isabella Rossi", role: "Founder & Head Florist", imageSrc: "https://img.b2bpic.net/free-photo/caucasion-woman-casual-confident-concept_53876-137678.jpg"
},
{
id: "2",
name: "Marcus Johnson",
role: "Senior Floral Designer",
imageSrc: "https://img.b2bpic.net/free-photo/positive-blond-girl-shows-tongue-winks-camera-makes-happy-funny-face-stands-against-white-background_176420-46979.jpg"
id: "2", name: "Marcus Johnson", role: "Senior Floral Designer", imageSrc: "https://img.b2bpic.net/free-photo/positive-blond-girl-shows-tongue-winks-camera-makes-happy-funny-face-stands-against-white-background_176420-46979.jpg"
},
{
id: "3",
name: "Sofia Mendez",
role: "Creative Director",
imageSrc: "https://img.b2bpic.net/free-photo/portrait-young-woman_23-2148574874.jpg"
id: "3", name: "Sofia Mendez", role: "Creative Director", imageSrc: "https://img.b2bpic.net/free-photo/portrait-young-woman_23-2148574874.jpg"
},
{
id: "4",
name: "James Wilson",
role: "Logistics Manager",
imageSrc: "https://img.b2bpic.net/free-photo/young-woman-smiling_176474-95672.jpg"
id: "4", name: "James Wilson", role: "Logistics Manager", imageSrc: "https://img.b2bpic.net/free-photo/young-woman-smiling_176474-95672.jpg"
}
]}
gridVariant="uniform-all-items-equal"
@@ -106,23 +94,19 @@ export default function AboutPage() {
features={[
{
icon: Sparkles,
title: "Quality First",
description: "We never compromise on the freshness and beauty of our flowers."
title: "Quality First", description: "We never compromise on the freshness and beauty of our flowers."
},
{
icon: Handshake,
title: "Customer Care",
description: "Your satisfaction is our ultimate goal and we stand behind every arrangement."
title: "Customer Care", description: "Your satisfaction is our ultimate goal and we stand behind every arrangement."
},
{
icon: Leaf,
title: "Sustainability",
description: "Committed to eco-friendly practices and ethical sourcing worldwide."
title: "Sustainability", description: "Committed to eco-friendly practices and ethical sourcing worldwide."
},
{
icon: Users,
title: "Community",
description: "Supporting local growers and giving back to our community year-round."
title: "Community", description: "Supporting local growers and giving back to our community year-round."
}
]}
animationType="slide-up"

5
src/app/blog/page.tsx
View File

@@ -5,6 +5,7 @@ import ReactLenis from "lenis/react";
import BlogCardThree from '@/components/sections/blog/BlogCardThree';
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
import Link from 'next/link';
type BlogPost = {
id: string;
@@ -53,7 +54,8 @@ export default function BlogPage() {
const url = `${apiUrl}/posts/${projectId}?status=published`;
const response = await fetch(url, {
method: "GET", headers: {
"Content-Type": "application/json"},
"Content-Type": "application/json"
},
});
if (response.ok) {
@@ -98,7 +100,6 @@ export default function BlogPage() {
<NavbarLayoutFloatingOverlay
brandName="Fiona"
navItems={[
{ name: "Home", id: "/home" },
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" },
{ name: "About", id: "/about" },

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

@@ -6,6 +6,7 @@ import HeroBillboardScroll from '@/components/sections/hero/HeroBillboardScroll'
import ContactSplit from '@/components/sections/contact/ContactSplit';
import FaqBase from '@/components/sections/faq/FaqBase';
import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
import Link from 'next/link';
export default function ContactPage() {
return (
@@ -31,8 +32,7 @@ export default function ContactPage() {
{ name: "Contact", id: "/contact" }
]}
button={{
text: "Order Now",
href: "/shop"
text: "Order Now", href: "/shop"
}}
/>
</div>
@@ -65,34 +65,22 @@ export default function ContactPage() {
description="Find answers to common questions about our flowers, delivery, and services"
faqs={[
{
id: "1",
title: "How long will my flowers last?",
content: "With proper care, most of our arrangements will last 7-10 days. We include care instructions with every delivery. Change water every 2-3 days, trim stems at an angle, and keep flowers in a cool location away from direct sunlight."
id: "1", title: "How long will my flowers last?", content: "With proper care, most of our arrangements will last 7-10 days. We include care instructions with every delivery. Change water every 2-3 days, trim stems at an angle, and keep flowers in a cool location away from direct sunlight."
},
{
id: "2",
title: "What areas do you deliver to?",
content: "We offer same-day delivery within a 15-mile radius of our downtown location. For deliveries outside this area, we can arrange next-day delivery. Contact us for specific address availability."
id: "2", title: "What areas do you deliver to?", content: "We offer same-day delivery within a 15-mile radius of our downtown location. For deliveries outside this area, we can arrange next-day delivery. Contact us for specific address availability."
},
{
id: "3",
title: "Can I customize an arrangement?",
content: "Absolutely! We love creating custom arrangements. Call us or use our custom order form to discuss your vision, color preferences, and budget. Our florists will create a one-of-a-kind masterpiece for you."
id: "3", title: "Can I customize an arrangement?", content: "Absolutely! We love creating custom arrangements. Call us or use our custom order form to discuss your vision, color preferences, and budget. Our florists will create a one-of-a-kind masterpiece for you."
},
{
id: "4",
title: "What's your refund policy?",
content: "We offer a 100% satisfaction guarantee. If you're not completely happy with your flowers, we'll either replace them or provide a full refund within 7 days of delivery."
id: "4", title: "What's your refund policy?", content: "We offer a 100% satisfaction guarantee. If you're not completely happy with your flowers, we'll either replace them or provide a full refund within 7 days of delivery."
},
{
id: "5",
title: "Do you offer subscription services?",
content: "Yes! Our Fiona Weekly service delivers fresh arrangements every week. Choose from our curated selections or work with our florists to design custom weekly bouquets."
id: "5", title: "Do you offer subscription services?", content: "Yes! Our Fiona Weekly service delivers fresh arrangements every week. Choose from our curated selections or work with our florists to design custom weekly bouquets."
},
{
id: "6",
title: "Are your flowers ethically sourced?",
content: "Yes, we partner exclusively with certified growers who practice sustainable farming and fair labor practices. We're proud to support ethical flower production worldwide."
id: "6", title: "Are your flowers ethically sourced?", content: "Yes, we partner exclusively with certified growers who practice sustainable farming and fair labor practices. We're proud to support ethical flower production worldwide."
}
]}
animationType="smooth"

26
src/app/layout.tsx
View File

@@ -5,37 +5,23 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const spectral = Spectral({
variable: "--font-spectral",
subsets: ["latin"],
variable: "--font-spectral", subsets: ["latin"],
weight: ["200", "300", "400", "500", "600", "700", "800"],
});
export const metadata: Metadata = {
title: "Fiona - Premium Flower Delivery & Custom Arrangements",
description: "Discover Fiona's premium flower delivery service. Fresh, handpicked flowers and custom arrangements for every occasion. Same-day delivery available. 100% satisfaction guaranteed.",
keywords: ["flower delivery", "premium flowers", "flower arrangements", "fresh flowers", "same-day delivery", "custom bouquets"],
title: "Fiona - Premium Flower Delivery & Custom Arrangements", description: "Discover Fiona's premium flower delivery service. Fresh, handpicked flowers and custom arrangements for every occasion. Same-day delivery available. 100% satisfaction guaranteed.", keywords: ["flower delivery", "premium flowers", "flower arrangements", "fresh flowers", "same-day delivery", "custom bouquets"],
metadataBase: new URL("https://fiona-flowers.com"),
alternates: {
canonical: "https://fiona-flowers.com",
},
canonical: "https://fiona-flowers.com"},
openGraph: {
title: "Fiona - Premium Flower Delivery",
description: "Fresh, stunning flowers delivered with care. Premium arrangements for every occasion.",
url: "https://fiona-flowers.com",
siteName: "Fiona",
type: "website",
images: [
title: "Fiona - Premium Flower Delivery", description: "Fresh, stunning flowers delivered with care. Premium arrangements for every occasion.", url: "https://fiona-flowers.com", siteName: "Fiona", type: "website", images: [
{
url: "https://img.b2bpic.net/free-photo/bouquet-fresh-roses-glass-vase-close-up_169016-8804.jpg",
alt: "Fiona premium flower arrangements",
},
url: "https://img.b2bpic.net/free-photo/bouquet-fresh-roses-glass-vase-close-up_169016-8804.jpg", alt: "Fiona premium flower arrangements"},
],
},
twitter: {
card: "summary_large_image",
title: "Fiona - Premium Flower Delivery",
description: "Fresh, stunning flowers delivered with care.",
images: ["https://img.b2bpic.net/free-photo/bouquet-fresh-roses-glass-vase-close-up_169016-8804.jpg"],
card: "summary_large_image", title: "Fiona - Premium Flower Delivery", description: "Fresh, stunning flowers delivered with care.", images: ["https://img.b2bpic.net/free-photo/bouquet-fresh-roses-glass-vase-close-up_169016-8804.jpg"],
},
robots: {
index: true,

80
src/app/page.tsx
View File

@@ -10,6 +10,7 @@ import TestimonialCardTwelve from '@/components/sections/testimonial/Testimonial
import ContactSplit from '@/components/sections/contact/ContactSplit';
import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
import { Leaf, Truck, Palette, Shield, Heart, Star } from 'lucide-react';
import Link from 'next/link';
export default function HomePage() {
return (
@@ -35,8 +36,7 @@ export default function HomePage() {
{ name: "Contact", id: "/contact" }
]}
button={{
text: "Order Now",
href: "/shop"
text: "Order Now", href: "/shop"
}}
/>
</div>
@@ -63,36 +63,16 @@ export default function HomePage() {
tag="Best Sellers"
products={[
{
id: "1",
name: "Royal Rose Elegance",
price: "$85",
variant: "Red Roses • 24 Stems",
imageSrc: "https://img.b2bpic.net/free-photo/flat-lay-beautifully-bloomed-colorful-rose-flowers_23-2149005546.jpg",
imageAlt: "Red rose bouquet"
id: "1", name: "Royal Rose Elegance", price: "$85", variant: "Red Roses • 24 Stems", imageSrc: "https://img.b2bpic.net/free-photo/flat-lay-beautifully-bloomed-colorful-rose-flowers_23-2149005546.jpg", imageAlt: "Red rose bouquet"
},
{
id: "2",
name: "Spring Tulip Medley",
price: "$65",
variant: "Mixed Tulips • 20 Stems",
imageSrc: "https://img.b2bpic.net/free-photo/bouquet-pink-roses-with-blue-ribbon-vintage-wooden-background_1220-284.jpg",
imageAlt: "Spring tulip arrangement"
id: "2", name: "Spring Tulip Medley", price: "$65", variant: "Mixed Tulips • 20 Stems", imageSrc: "https://img.b2bpic.net/free-photo/bouquet-pink-roses-with-blue-ribbon-vintage-wooden-background_1220-284.jpg", imageAlt: "Spring tulip arrangement"
},
{
id: "3",
name: "Sunshine Sunflower Delight",
price: "$75",
variant: "Sunflowers • 15 Stems",
imageSrc: "https://img.b2bpic.net/free-photo/bouquet-roses-with-red-bow_23-2147591160.jpg",
imageAlt: "Bright sunflower bouquet"
id: "3", name: "Sunshine Sunflower Delight", price: "$75", variant: "Sunflowers • 15 Stems", imageSrc: "https://img.b2bpic.net/free-photo/bouquet-roses-with-red-bow_23-2147591160.jpg", imageAlt: "Bright sunflower bouquet"
},
{
id: "4",
name: "Exotic Orchid Paradise",
price: "$95",
variant: "Premium Orchids • 12 Stems",
imageSrc: "https://img.b2bpic.net/free-photo/gentle-flowers-bouquet_23-2147694593.jpg",
imageAlt: "Exotic orchid arrangement"
id: "4", name: "Exotic Orchid Paradise", price: "$95", variant: "Premium Orchids • 12 Stems", imageSrc: "https://img.b2bpic.net/free-photo/gentle-flowers-bouquet_23-2147694593.jpg", imageAlt: "Exotic orchid arrangement"
}
]}
gridVariant="uniform-all-items-equal"
@@ -124,33 +104,27 @@ export default function HomePage() {
features={[
{
icon: Leaf,
title: "Farm Fresh Blooms",
description: "Sourced daily from premium growers, our flowers arrive at peak freshness and vibrancy."
title: "Farm Fresh Blooms", description: "Sourced daily from premium growers, our flowers arrive at peak freshness and vibrancy."
},
{
icon: Truck,
title: "Same-Day Delivery",
description: "Order before noon and enjoy same-day delivery to your loved ones."
title: "Same-Day Delivery", description: "Order before noon and enjoy same-day delivery to your loved ones."
},
{
icon: Palette,
title: "Custom Arrangements",
description: "Work with our florists to create personalized arrangements for any occasion."
title: "Custom Arrangements", description: "Work with our florists to create personalized arrangements for any occasion."
},
{
icon: Shield,
title: "Quality Guarantee",
description: "100% satisfaction guaranteed or your money back within 7 days."
title: "Quality Guarantee", description: "100% satisfaction guaranteed or your money back within 7 days."
},
{
icon: Heart,
title: "Sustainable Practices",
description: "Eco-friendly packaging and partnerships with ethical growers worldwide."
title: "Sustainable Practices", description: "Eco-friendly packaging and partnerships with ethical growers worldwide."
},
{
icon: Star,
title: "Expert Florists",
description: "Decades of combined experience ensuring every arrangement is perfection."
title: "Expert Florists", description: "Decades of combined experience ensuring every arrangement is perfection."
}
]}
animationType="slide-up"
@@ -163,40 +137,22 @@ export default function HomePage() {
<TestimonialCardTwelve
testimonials={[
{
id: "1",
name: "Sarah Mitchell",
imageSrc: "https://img.b2bpic.net/free-photo/portrait-young-woman_23-2148574874.jpg",
imageAlt: "Sarah Mitchell"
id: "1", name: "Sarah Mitchell", imageSrc: "https://img.b2bpic.net/free-photo/portrait-young-woman_23-2148574874.jpg", imageAlt: "Sarah Mitchell"
},
{
id: "2",
name: "Emma Richardson",
imageSrc: "https://img.b2bpic.net/free-photo/caucasion-woman-casual-confident-concept_53876-137678.jpg",
imageAlt: "Emma Richardson"
id: "2", name: "Emma Richardson", imageSrc: "https://img.b2bpic.net/free-photo/caucasion-woman-casual-confident-concept_53876-137678.jpg", imageAlt: "Emma Richardson"
},
{
id: "3",
name: "James Thompson",
imageSrc: "https://img.b2bpic.net/free-photo/positive-blond-girl-shows-tongue-winks-camera-makes-happy-funny-face-stands-against-white-background_176420-46979.jpg",
imageAlt: "James Thompson"
id: "3", name: "James Thompson", imageSrc: "https://img.b2bpic.net/free-photo/positive-blond-girl-shows-tongue-winks-camera-makes-happy-funny-face-stands-against-white-background_176420-46979.jpg", imageAlt: "James Thompson"
},
{
id: "4",
name: "Victoria Chen",
imageSrc: "https://img.b2bpic.net/free-photo/close-up-attractive-african-american-woman-smiling-looking-happy-standing-yellow-background_1258-54850.jpg",
imageAlt: "Victoria Chen"
id: "4", name: "Victoria Chen", imageSrc: "https://img.b2bpic.net/free-photo/close-up-attractive-african-american-woman-smiling-looking-happy-standing-yellow-background_1258-54850.jpg", imageAlt: "Victoria Chen"
},
{
id: "5",
name: "Olivia Martinez",
imageSrc: "https://img.b2bpic.net/free-photo/beautiful-woman-cafe_273609-12690.jpg",
imageAlt: "Olivia Martinez"
id: "5", name: "Olivia Martinez", imageSrc: "https://img.b2bpic.net/free-photo/beautiful-woman-cafe_273609-12690.jpg", imageAlt: "Olivia Martinez"
},
{
id: "6",
name: "David Anderson",
imageSrc: "https://img.b2bpic.net/free-photo/young-woman-smiling_176474-95672.jpg",
imageAlt: "David Anderson"
id: "6", name: "David Anderson", imageSrc: "https://img.b2bpic.net/free-photo/young-woman-smiling_176474-95672.jpg", imageAlt: "David Anderson"
}
]}
cardTitle="Over 10,000 customers trust Fiona for their special moments"

47
src/app/shop/page.tsx
View File

@@ -5,6 +5,7 @@ import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatin
import HeroBillboardScroll from '@/components/sections/hero/HeroBillboardScroll';
import ProductCardFour from '@/components/sections/product/ProductCardFour';
import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
import Link from 'next/link';
export default function ShopPage() {
return (
@@ -30,8 +31,7 @@ export default function ShopPage() {
{ name: "Contact", id: "/contact" }
]}
button={{
text: "Order Now",
href: "/shop"
text: "Order Now", href: "/shop"
}}
/>
</div>
@@ -50,54 +50,25 @@ export default function ShopPage() {
<div id="shop-products" data-section="shop-products">
<ProductCardFour
title="All Products"
description="Discover our complete selection of premium flowers and custom arrangements for every special occasion"
products={[
{
id: "1",
name: "Royal Rose Elegance",
price: "$85",
variant: "Red Roses • 24 Stems",
imageSrc: "https://img.b2bpic.net/free-photo/flat-lay-beautifully-bloomed-colorful-rose-flowers_23-2149005546.jpg",
imageAlt: "Red rose bouquet"
id: "1", name: "Royal Rose Elegance", price: "$85", variant: "Red Roses • 24 Stems", imageSrc: "https://img.b2bpic.net/free-photo/flat-lay-beautifully-bloomed-colorful-rose-flowers_23-2149005546.jpg", imageAlt: "Red rose bouquet"
},
{
id: "2",
name: "Spring Tulip Medley",
price: "$65",
variant: "Mixed Tulips • 20 Stems",
imageSrc: "https://img.b2bpic.net/free-photo/bouquet-pink-roses-with-blue-ribbon-vintage-wooden-background_1220-284.jpg",
imageAlt: "Spring tulip arrangement"
id: "2", name: "Spring Tulip Medley", price: "$65", variant: "Mixed Tulips • 20 Stems", imageSrc: "https://img.b2bpic.net/free-photo/bouquet-pink-roses-with-blue-ribbon-vintage-wooden-background_1220-284.jpg", imageAlt: "Spring tulip arrangement"
},
{
id: "3",
name: "Sunshine Sunflower Delight",
price: "$75",
variant: "Sunflowers • 15 Stems",
imageSrc: "https://img.b2bpic.net/free-photo/bouquet-roses-with-red-bow_23-2147591160.jpg",
imageAlt: "Bright sunflower bouquet"
id: "3", name: "Sunshine Sunflower Delight", price: "$75", variant: "Sunflowers • 15 Stems", imageSrc: "https://img.b2bpic.net/free-photo/bouquet-roses-with-red-bow_23-2147591160.jpg", imageAlt: "Bright sunflower bouquet"
},
{
id: "4",
name: "Exotic Orchid Paradise",
price: "$95",
variant: "Premium Orchids • 12 Stems",
imageSrc: "https://img.b2bpic.net/free-photo/gentle-flowers-bouquet_23-2147694593.jpg",
imageAlt: "Exotic orchid arrangement"
id: "4", name: "Exotic Orchid Paradise", price: "$95", variant: "Premium Orchids • 12 Stems", imageSrc: "https://img.b2bpic.net/free-photo/gentle-flowers-bouquet_23-2147694593.jpg", imageAlt: "Exotic orchid arrangement"
},
{
id: "5",
name: "Romantic Red & White",
price: "$90",
variant: "Red & White Mix • 30 Stems",
imageSrc: "https://img.b2bpic.net/free-photo/flat-lay-beautifully-bloomed-colorful-rose-flowers_23-2149005546.jpg",
imageAlt: "Red and white flower arrangement"
id: "5", name: "Romantic Red & White", price: "$90", variant: "Red & White Mix • 30 Stems", imageSrc: "https://img.b2bpic.net/free-photo/flat-lay-beautifully-bloomed-colorful-rose-flowers_23-2149005546.jpg", imageAlt: "Red and white flower arrangement"
},
{
id: "6",
name: "Garden Fresh Mix",
price: "$70",
variant: "Seasonal Mix • 25 Stems",
imageSrc: "https://img.b2bpic.net/free-photo/bouquet-pink-roses-with-blue-ribbon-vintage-wooden-background_1220-284.jpg",
imageAlt: "Garden fresh flower mix"
id: "6", name: "Garden Fresh Mix", price: "$70", variant: "Seasonal Mix • 25 Stems", imageSrc: "https://img.b2bpic.net/free-photo/bouquet-pink-roses-with-blue-ribbon-vintage-wooden-background_1220-284.jpg", imageAlt: "Garden fresh flower mix"
}
]}
gridVariant="uniform-all-items-equal"