bender/ef82b29f-cd8f-419f-aa4b-b25521b19cde
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #2

Merged
bender merged 2 commits from version_1 into main 2026-03-10 08:56:12 +00:00
Conversation 0 Commits 2 Files Changed 2 +47 -113
2 changed files with 47 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/app/collections/page.tsx
View File

@@ -20,8 +20,7 @@ export default function CollectionsPage() {
const footerColumns = [
{
title: "Shop",
items: [
title: "Shop", items: [
{ label: "All Fragrances", href: "/shop" },
{ label: "Collections", href: "/collections" },
{ label: "New Arrivals", href: "/shop?filter=new" },
@@ -29,8 +28,7 @@ export default function CollectionsPage() {
],
},
{
title: "Company",
items: [
title: "Company", items: [
{ label: "About Us", href: "/about" },
{ label: "Our Story", href: "/about#story" },
{ label: "Craftsmanship", href: "/about#craftsmanship" },
@@ -38,8 +36,7 @@ export default function CollectionsPage() {
],
},
{
title: "Support",
items: [
title: "Support", items: [
{ label: "Contact Us", href: "/contact" },
{ label: "Shipping Info", href: "/shipping" },
{ label: "Returns", href: "/returns" },
@@ -47,8 +44,7 @@ export default function CollectionsPage() {
],
},
{
title: "Discover",
items: [
title: "Discover", items: [
{ label: "Fragrance Finder", href: "/finder" },
{ label: "Blog & Guides", href: "/blog" },
{ label: "Fragrance Notes", href: "/fragrance-notes" },
@@ -56,8 +52,7 @@ export default function CollectionsPage() {
],
},
{
title: "Legal",
items: [
title: "Legal", items: [
{ label: "Privacy Policy", href: "/privacy" },
{ label: "Terms of Service", href: "/terms" },
{ label: "Shipping Policy", href: "/shipping-policy" },
@@ -84,9 +79,7 @@ export default function CollectionsPage() {
brandName="Essence Luxe"
navItems={navItems}
button={{
text: "Explore",
href: "shop",
}}
text: "Explore", href: "shop"}}
/>
</div>
@@ -101,10 +94,9 @@ export default function CollectionsPage() {
{ text: "Browse All", href: "#" },
{ text: "Find Your Scent", href: "#" },
]}
imageSrc="http://img.b2bpic.net/free-photo/front-view-cologne-bottle-rotten-tree-branch-dark-blue-background_140725-144917.jpg?_wi=2"
imageSrc="http://img.b2bpic.net/free-photo/front-view-cologne-bottle-rotten-tree-branch-dark-blue-background_140725-144917.jpg"
imageAlt="Premium perfume collection showcase"
mediaAnimation="slide-up"
useInvertedBackground={false}
/>
</div>
@@ -112,28 +104,13 @@ export default function CollectionsPage() {
<ProductCardThree
products={[
{
id: "1",
name: "Midnight Noir",
price: "$185.00",
imageSrc: "http://img.b2bpic.net/free-photo/elegant-vegan-alcohol-arrangement_23-2149337761.jpg?_wi=5",
imageAlt: "Midnight Noir luxury perfume bottle",
initialQuantity: 1,
id: "1", name: "Midnight Noir", price: "$185.00", imageSrc: "http://img.b2bpic.net/free-photo/elegant-vegan-alcohol-arrangement_23-2149337761.jpg", imageAlt: "Midnight Noir luxury perfume bottle", initialQuantity: 1,
},
{
id: "2",
name: "Emerald Essence",
price: "$165.00",
imageSrc: "http://img.b2bpic.net/free-photo/girly-composition-table_23-2148229230.jpg?_wi=4",
imageAlt: "Emerald Essence fragrance bottle",
initialQuantity: 1,
id: "2", name: "Emerald Essence", price: "$165.00", imageSrc: "http://img.b2bpic.net/free-photo/girly-composition-table_23-2148229230.jpg", imageAlt: "Emerald Essence fragrance bottle", initialQuantity: 1,
},
{
id: "3",
name: "White Rose Vintage",
price: "$195.00",
imageSrc: "http://img.b2bpic.net/free-photo/beautiful-still-life-arrangement-with-water_23-2149176156.jpg?_wi=4",
imageAlt: "White Rose Vintage premium perfume",
initialQuantity: 1,
id: "3", name: "White Rose Vintage", price: "$195.00", imageSrc: "http://img.b2bpic.net/free-photo/beautiful-still-life-arrangement-with-water_23-2149176156.jpg", imageAlt: "White Rose Vintage premium perfume", initialQuantity: 1,
},
]}
title="Featured Perfumes"
@@ -141,7 +118,6 @@ export default function CollectionsPage() {
tag="Best Sellers"
tagIcon={Sparkles}
textboxLayout="default"
useInvertedBackground={false}
gridVariant="three-columns-all-equal-width"
animationType="blur-reveal"
/>
@@ -151,40 +127,19 @@ export default function CollectionsPage() {
<ProductCardThree
products={[
{
id: "men-1",
name: "Men's Collection",
price: "$160-$200",
imageSrc: "http://img.b2bpic.net/free-photo/oriental-spices-small-bottles_23-2147684854.jpg?_wi=3",
imageAlt: "Men's fragrance collection",
},
id: "men-1", name: "Men's Collection", price: "$160-$200", imageSrc: "http://img.b2bpic.net/free-photo/oriental-spices-small-bottles_23-2147684854.jpg", imageAlt: "Men's fragrance collection"},
{
id: "women-1",
name: "Women's Collection",
price: "$165-$215",
imageSrc: "http://img.b2bpic.net/free-photo/collection-small-perfume-bottles_53876-32341.jpg?_wi=3",
imageAlt: "Women's fragrance collection",
},
id: "women-1", name: "Women's Collection", price: "$165-$215", imageSrc: "http://img.b2bpic.net/free-photo/collection-small-perfume-bottles_53876-32341.jpg", imageAlt: "Women's fragrance collection"},
{
id: "unisex-1",
name: "Unisex Collection",
price: "$155-$195",
imageSrc: "http://img.b2bpic.net/free-photo/colorful-spray-bottles-isolated-white-background_53876-32355.jpg?_wi=3",
imageAlt: "Unisex fragrance collection",
},
id: "unisex-1", name: "Unisex Collection", price: "$155-$195", imageSrc: "http://img.b2bpic.net/free-photo/colorful-spray-bottles-isolated-white-background_53876-32355.jpg", imageAlt: "Unisex fragrance collection"},
{
id: "limited-1",
name: "Limited Edition",
price: "$250-$400",
imageSrc: "http://img.b2bpic.net/free-photo/luxury-perfume-fragrance-bottle_116380-80.jpg?_wi=3",
imageAlt: "Limited edition fragrances",
},
id: "limited-1", name: "Limited Edition", price: "$250-$400", imageSrc: "http://img.b2bpic.net/free-photo/luxury-perfume-fragrance-bottle_116380-80.jpg", imageAlt: "Limited edition fragrances"},
]}
title="Fragrance Collections"
description="Browse our curated collections organized by preference and occasion"
tag="Collections"
tagIcon={Palette}
textboxLayout="default"
useInvertedBackground={false}
gridVariant="bento-grid"
animationType="scale-rotate"
/>
@@ -197,7 +152,6 @@ export default function CollectionsPage() {
title="Discover Your Signature Scent"
description="Our fragrance experts are ready to help you find the perfect scent. Whether you're looking for a personal signature or a gift for someone special, we're here to guide you."
background={{ variant: "plain" }}
useInvertedBackground={false}
buttons={[
{ text: "Contact Us", href: "/contact" },
{ text: "Try Fragrance Finder", href: "/finder" },

86
src/app/product/[id]/page.tsx
View File

@@ -4,12 +4,12 @@ import Link from "next/link";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingOverlay from "@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay";
import HeroBillboard from "@/components/sections/hero/HeroBillboard";
import FeatureCardTwentyOne from "@/components/sections/feature/FeatureCardTwentyOne";
import ProductCardThree from "@/components/sections/product/ProductCardThree";
import ContactCTA from "@/components/sections/contact/ContactCTA";
import FooterBaseCard from "@/components/sections/footer/FooterBaseCard";
import { Heart, Mail, Crown, Sparkles } from "lucide-react";
import { Mail, Sparkles, Palette } from "lucide-react";
export default function ProductPage() {
export default function ProductDetailPage() {
const navItems = [
{ name: "Shop", id: "shop" },
{ name: "Collections", id: "collections" },
@@ -20,8 +20,7 @@ export default function ProductPage() {
const footerColumns = [
{
title: "Shop",
items: [
title: "Shop", items: [
{ label: "All Fragrances", href: "/shop" },
{ label: "Collections", href: "/collections" },
{ label: "New Arrivals", href: "/shop?filter=new" },
@@ -29,8 +28,7 @@ export default function ProductPage() {
],
},
{
title: "Company",
items: [
title: "Company", items: [
{ label: "About Us", href: "/about" },
{ label: "Our Story", href: "/about#story" },
{ label: "Craftsmanship", href: "/about#craftsmanship" },
@@ -38,8 +36,7 @@ export default function ProductPage() {
],
},
{
title: "Support",
items: [
title: "Support", items: [
{ label: "Contact Us", href: "/contact" },
{ label: "Shipping Info", href: "/shipping" },
{ label: "Returns", href: "/returns" },
@@ -47,8 +44,7 @@ export default function ProductPage() {
],
},
{
title: "Discover",
items: [
title: "Discover", items: [
{ label: "Fragrance Finder", href: "/finder" },
{ label: "Blog & Guides", href: "/blog" },
{ label: "Fragrance Notes", href: "/fragrance-notes" },
@@ -56,8 +52,7 @@ export default function ProductPage() {
],
},
{
title: "Legal",
items: [
title: "Legal", items: [
{ label: "Privacy Policy", href: "/privacy" },
{ label: "Terms of Service", href: "/terms" },
{ label: "Shipping Policy", href: "/shipping-policy" },
@@ -84,75 +79,60 @@ export default function ProductPage() {
brandName="Essence Luxe"
navItems={navItems}
button={{
text: "Explore",
href: "shop",
}}
text: "Explore", href: "shop"}}
/>
</div>
<div id="product-hero" data-section="product-hero">
<HeroBillboard
title="Midnight Noir"
description="An intoxicating blend of dark woods and mysterious spices. A fragrance for those who embrace the night with confidence and sophistication."
title="Premium Fragrance"
description="Experience luxury in every spray. Our expertly crafted fragrances combine the finest ingredients with timeless elegance."
background={{ variant: "sparkles-gradient" }}
tag="Best Seller"
tag="Luxury Collection"
tagIcon={Sparkles}
buttons={[
{ text: "Add to Cart", href: "#" },
{ text: "View Collection", href: "/collections" },
{ text: "Learn More", href: "#" },
]}
imageSrc="http://img.b2bpic.net/free-photo/elegant-vegan-alcohol-arrangement_23-2149337761.jpg?_wi=4"
imageAlt="Midnight Noir luxury perfume bottle"
imageSrc="http://img.b2bpic.net/free-photo/front-view-cologne-bottle-rotten-tree-branch-dark-blue-background_140725-144917.jpg"
imageAlt="Premium perfume bottle showcase"
mediaAnimation="slide-up"
useInvertedBackground={false}
/>
</div>
<div id="product-details" data-section="product-details">
<FeatureCardTwentyOne
title="Why Midnight Noir Stands Apart"
description="Crafted with precision and passion, this fragrance embodies luxury in every drop"
tag="Premium Quality"
tagIcon={Crown}
imageSrc="http://img.b2bpic.net/free-photo/close-up-dispenser-liquid-soap-female-hands-store_169016-24141.jpg?_wi=2"
imageAlt="Perfume crafting process and ingredients"
mediaAnimation="slide-up"
useInvertedBackground={false}
mediaPosition="left"
accordionItems={[
<div id="related-products" data-section="related-products">
<ProductCardThree
products={[
{
id: "1",
title: "Top Notes: First Impression",
content: "The initial burst of bergamot and black pepper creates an electrifying opening that captures attention. These volatile notes evolve within the first 15 minutes.",
id: "1", name: "Midnight Noir", price: "$185.00", imageSrc: "http://img.b2bpic.net/free-photo/elegant-vegan-alcohol-arrangement_23-2149337761.jpg", imageAlt: "Midnight Noir luxury perfume bottle", initialQuantity: 1,
},
{
id: "2",
title: "Heart Notes: The Soul",
content: "As top notes fade, a mysterious blend of oud, cedarwood, and leather emerges. This is where Midnight Noir reveals its true character, lasting 4-6 hours.",
id: "2", name: "Emerald Essence", price: "$165.00", imageSrc: "http://img.b2bpic.net/free-photo/girly-composition-table_23-2148229230.jpg", imageAlt: "Emerald Essence fragrance bottle", initialQuantity: 1,
},
{
id: "3",
title: "Base Notes: Lasting Legacy",
content: "Vanilla, amber, and musk create a warm, sensual foundation that lingers for 8+ hours. This final layer ensures your signature scent remains throughout the day.",
id: "3", name: "White Rose Vintage", price: "$195.00", imageSrc: "http://img.b2bpic.net/free-photo/beautiful-still-life-arrangement-with-water_23-2149176156.jpg", imageAlt: "White Rose Vintage premium perfume", initialQuantity: 1,
},
]}
buttons={[
{ text: "Shop Collection", href: "/collections" },
]}
title="Related Fragrances"
description="Explore other fragrances you might love"
tag="Similar Scents"
tagIcon={Sparkles}
textboxLayout="default"
gridVariant="three-columns-all-equal-width"
animationType="blur-reveal"
/>
</div>
<div id="product-cta" data-section="product-cta">
<ContactCTA
tag="Get In Touch"
tag="Need Help?"
tagIcon={Mail}
title="Ready to Make Midnight Noir Your Signature?"
description="Experience luxury that transcends time. Our fragrance experts are available to help you discover the perfect scent or answer any questions about our premium fragrances."
title="Find Your Perfect Match"
description="Our fragrance experts are here to help you discover the scent that's perfect for you. Contact us for personalized recommendations."
background={{ variant: "plain" }}
useInvertedBackground={false}
buttons={[
{ text: "Contact Us", href: "/contact" },
{ text: "Return to Collections", href: "/collections" },
{ text: "Contact Support", href: "/contact" },
{ text: "Take Quiz", href: "/finder" },
]}
/>
</div>