bender/2c3f248a-cd34-4d43-86f4-6a737c81a558
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #5

Merged
bender merged 4 commits from version_1 into main 2026-02-23 12:23:48 +00:00
Conversation 0 Commits 4 Files Changed 4 +18 -15
4 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,7 +19,7 @@ export default function BlogPage() {
const navItems = [
{ name: "Home", id: "/" },
{ name: "Shop", id: "/#shop" },
{ name: "Shop", id: "/shop" },
{ name: "About", id: "/#about" },
{ name: "Features", id: "/#features" },
{ name: "Testimonials", id: "/#testimonials" },
@@ -44,7 +44,7 @@ export default function BlogPage() {
<NavbarLayoutFloatingOverlay
brandName="Find Me"
navItems={navItems}
button={{ text: "Explore Now", href: "/#shop" }}
button={{ text: "Explore Now", href: "/shop" }}
className="bg-card/80 backdrop-blur-md"
buttonClassName="bg-primary-cta text-primary-cta-text"
buttonTextClassName="font-semibold"
@@ -59,7 +59,7 @@ export default function BlogPage() {
<main className="pt-24">
<div id="blog" data-section="blog">
<BlogCardTwo
posts={posts}
blogPosts={posts}
title="From Our Blog"
description="Explore the latest stories, tips, and insights from our team."
animationType="slide-up"
@@ -78,9 +78,9 @@ export default function BlogPage() {
columns={[
{
title: "Shop", items: [
{ label: "New Arrivals", href: "/#shop" },
{ label: "Best Sellers", href: "/#shop" },
{ label: "Discovery Sets", href: "/#shop" },
{ label: "New Arrivals", href: "/shop" },
{ label: "Best Sellers", href: "/shop" },
{ label: "Discovery Sets", href: "/shop" },
],
},
{

17
src/app/page.tsx
View File

@@ -17,12 +17,13 @@ import FooterMedia from '@/components/sections/footer/FooterMedia';
export default function LandingPage() {
const navItems = [
{ name: 'Shop', id: '#shop' },
{ name: 'Shop', id: '/shop' },
{ name: 'About', id: '#about' },
{ name: 'Features', id: '#features' },
{ name: 'Testimonials', id: '#testimonials' },
{ name: 'FAQ', id: '#faq' },
{ name: 'Contact', id: '#contact' },
{ name: 'Blog', id: '/blog' },
];
return (
@@ -55,7 +56,7 @@ export default function LandingPage() {
description="Discover an exquisite collection of perfumes that capture the essence of luxury and individuality. Find the fragrance that truly speaks to you."
tag="Find Me Exclusives"
tagIcon={Sparkles}
tagAnimation="background-highlight"
tagAnimation="slide-up"
buttons={[
{ text: 'Shop Now', href: '#shop' },
{ text: 'Our Story', href: '#about' },
@@ -85,7 +86,7 @@ export default function LandingPage() {
description="At Find Me, we believe perfume is more than just a scent—it's an expression of identity, a memory, a feeling. Our curated selection brings you masterpieces from renowned perfumers and hidden gems, crafted with passion and precision."
tag="Our Philosophy"
tagIcon={Award}
tagAnimation="background-highlight"
tagAnimation="slide-up"
buttons={[{ text: 'Learn More', href: '#' }]}
buttonAnimation="slide-up"
imageSrc="https://img.b2bpic.net/free-photo/high-angle-ecological-zero-waster-concept_23-2148591681.jpg"
@@ -105,7 +106,7 @@ export default function LandingPage() {
description="Explore our range of captivating perfumes, each a unique blend of artistry and aroma."
tag="Signature Scents"
tagIcon={Heart}
tagAnimation="background-highlight"
tagAnimation="slide-up"
products={[
{ id: '1', brand: 'Essence de Nuit', name: 'Midnight Bloom', price: '$120.00', rating: 5, reviewCount: '1.5k', imageSrc: 'https://img.b2bpic.net/free-photo/ecofriendly-beauty-product_23-2150669104.jpg', imageAlt: 'Elegant amber perfume bottle' },
{ id: '2', brand: 'Aura', name: 'Morning Dew', price: '$95.00', rating: 4, reviewCount: '870', imageSrc: 'https://img.b2bpic.net/free-photo/elegant-vegan-alcohol-arrangement_23-2149337694.jpg', imageAlt: 'Modern clear perfume bottle with floral notes' },
@@ -136,7 +137,7 @@ export default function LandingPage() {
description="Experience unparalleled quality, personalized service, and a passion for fine fragrances."
tag="Our Promise"
tagIcon={CheckCircle}
tagAnimation="background-highlight"
tagAnimation="slide-up"
accordionItems={[
{ id: '1', title: 'Curated Selection', content: 'We handpick each perfume, ensuring a collection of exceptional quality and unique character from across the globe.' },
{ id: '2', title: 'Expert Guidance', content: 'Our fragrance specialists offer personalized consultations to help you discover the perfect scent that reflects your style.' },
@@ -165,7 +166,7 @@ export default function LandingPage() {
description="Read what our cherished customers have to say about their 'Find Me' experience."
tag="Customer Love"
tagIcon={MessageSquare}
tagAnimation="background-highlight"
tagAnimation="slide-up"
testimonials={[
{ id: '1', title: 'Truly a game-changer for my fragrance journey!', quote: "Find Me transformed how I discover perfumes. Their selection is exquisite, and the personalized recommendations are spot on. I've found my new signature scent!", name: 'Elara Vance', role: 'Fragrance Blogger', imageSrc: 'https://img.b2bpic.net/free-photo/european-woman-with-bright-make-up-elegant-outfit-preparing-birthday-party_291650-580.jpg', imageAlt: 'Portrait of Elara Vance' },
{ id: '2', title: 'Exceptional service and an unparalleled collection.', quote: "The team at Find Me is incredibly knowledgeable. They helped me choose a unique fragrance for a special occasion, and I couldn't be happier with the quality and experience.", name: 'Marcus Thorne', role: 'Creative Director', imageSrc: 'https://img.b2bpic.net/free-photo/handsome-welldressed-arabian-man-smoke-cigar-with-glass-whiskey-balcony-pub_627829-5920.jpg', imageAlt: 'Portrait of Marcus Thorne' },
@@ -194,7 +195,7 @@ export default function LandingPage() {
description="Find answers to common inquiries about our products, shipping, and services."
tag="Need Help?"
tagIcon={HelpCircle}
tagAnimation="background-highlight"
tagAnimation="slide-up"
faqs={[
{ id: '1', title: 'What is your return policy?', content: 'We offer returns on unopened and unused perfumes within 14 days of purchase. Please refer to our full policy for details.' },
{ id: '2', title: 'How long does shipping take?', content: 'Standard shipping usually takes 3-7 business days within the country. International shipping times vary.' },
@@ -225,7 +226,7 @@ export default function LandingPage() {
title="Inquire About Your Next Scent"
description="Have questions or need assistance? Our expert team is here to help you find your perfect fragrance."
tagIcon={Mail}
tagAnimation="background-highlight"
tagAnimation="slide-up"
background={{ variant: 'sparkles-gradient' }}
useInvertedBackground={false}
inputPlaceholder="Your email address"

1
src/app/shop/[id]/page.tsx
View File

@@ -24,6 +24,7 @@ const navItems = [
{ name: "Testimonials", id: "/#testimonials" },
{ name: "FAQ", id: "/#faq" },
{ name: "Contact", id: "/#contact" },
{ name: "Blog", id: "/blog" },
];

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

@@ -15,6 +15,7 @@ const navItems = [
{ name: "Testimonials", id: "/#testimonials" },
{ name: "FAQ", id: "/#faq" },
{ name: "Contact", id: "/#contact" },
{ name: "Blog", id: "/blog" },
];
function ShopPageContent() {
@@ -70,7 +71,7 @@ function ShopPageContent() {
<FooterMedia
imageSrc="https://img.b2bpic.net/free-vector/pink-silk-background_1048-401.jpg"
imageAlt="Abstract luxury texture background with soft gradients"
columns={[{ title: "Shop", items: [{ label: "New Arrivals", href: "/#shop" }, { label: "Best Sellers", href: "/#shop" }, { label: "Discovery Sets", href: "/#shop" }] }, { title: "Company", items: [{ label: "About Us", href: "/#about" }, { label: "Our Promise", href: "/#features" }, { label: "Contact", href: "/#contact" }] }, { title: "Support", items: [{ label: "FAQ", href: "/#faq" }, { label: "Shipping", href: "#" }, { label: "Returns", href: "#" }] }]}
columns={[{ title: "Shop", items: [{ label: "New Arrivals", href: "/shop" }, { label: "Best Sellers", href: "/shop" }, { label: "Discovery Sets", href: "/shop" }] }, { title: "Company", items: [{ label: "About Us", href: "/#about" }, { label: "Our Promise", href: "/#features" }, { label: "Contact", href: "/#contact" }] }, { title: "Support", items: [{ label: "FAQ", href: "/#faq" }, { label: "Shipping", href: "#" }, { label: "Returns", href: "#" }] }]}
logoText="Find Me"
copyrightText="© 2024 Find Me. All rights reserved."
className="bg-card"