Update src/app/page.tsx

Merge version_2 into main

src/app/layout.tsx

@@ -6,36 +6,22 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
 import Tag from "@/tag/Tag";
 
 const manrope = Manrope({
-  variable: "--font-manrope",
+  variable: "--font-manrope",  subsets: ["latin"],
-  subsets: ["latin"],
 });
 
 const dmSans = DM_Sans({
-  variable: "--font-dm-sans",
+  variable: "--font-dm-sans",  subsets: ["latin"],
-  subsets: ["latin"],
 });
 
 export const metadata: Metadata = {
-  title: "Elevate Beauty - Premium Makeup & Jewelry Collections",
+  title: "Elevate Beauty - Premium Makeup & Jewelry Collections",  description: "Discover expertly curated makeup and jewelry collections for style-conscious consumers. Premium beauty products, flexible booking, and exceptional customer service.",  keywords: "makeup, jewelry, cosmetics, accessories, beauty products, online shopping, premium beauty",  openGraph: {
-  description: "Discover expertly curated makeup and jewelry collections for style-conscious consumers. Premium beauty products, flexible booking, and exceptional customer service.",
+    title: "Elevate Beauty - Premium Makeup & Jewelry",    description: "Shop curated makeup and jewelry collections designed for your unique style.",    siteName: "Elevate Beauty",    type: "website",    images: [
-  keywords: "makeup, jewelry, cosmetics, accessories, beauty products, online shopping, premium beauty",
-  openGraph: {
-    title: "Elevate Beauty - Premium Makeup & Jewelry",
-    description: "Shop curated makeup and jewelry collections designed for your unique style.",
-    siteName: "Elevate Beauty",
-    type: "website",
-    images: [
       {
-        url: "http://img.b2bpic.net/free-photo/top-view-cosmetic-beauty-makeup_1150-6662.jpg",
+        url: "http://img.b2bpic.net/free-photo/top-view-cosmetic-beauty-makeup_1150-6662.jpg",        alt: "Premium makeup collection"},
-        alt: "Premium makeup collection",
-      },
     ],
   },
   twitter: {
-    card: "summary_large_image",
+    card: "summary_large_image",    title: "Elevate Beauty - Premium Collections",    description: "Discover expertly curated makeup and jewelry that celebrate your individuality.",    images: ["http://img.b2bpic.net/free-photo/portrait-european-woman-wedding-dress-wearing-necklace-ring_343596-847.jpg"],
-    title: "Elevate Beauty - Premium Collections",
-    description: "Discover expertly curated makeup and jewelry that celebrate your individuality.",
-    images: ["http://img.b2bpic.net/free-photo/portrait-european-woman-wedding-dress-wearing-necklace-ring_343596-847.jpg"],
   },
   robots: {
     index: true,

src/app/page.tsx

@@ -24,8 +24,7 @@ export default function HomePage() {
 
   const footerColumns = [
     {
-      title: "Shop",
+      title: "Shop",      items: [
-      items: [
         { label: "Makeup Collection", href: "/products" },
         { label: "Jewelry Collection", href: "/products" },
         { label: "New Arrivals", href: "/products" },
@@ -33,8 +32,7 @@ export default function HomePage() {
       ],
     },
     {
-      title: "Company",
+      title: "Company",      items: [
-      items: [
         { label: "About Us", href: "/about" },
         { label: "Our Story", href: "/about" },
         { label: "Blog", href: "#" },
@@ -42,8 +40,7 @@ export default function HomePage() {
       ],
     },
     {
-      title: "Support",
+      title: "Support",      items: [
-      items: [
         { label: "Contact Us", href: "/contact" },
         { label: "FAQ", href: "#faq" },
         { label: "Shipping Info", href: "#" },
@@ -51,8 +48,7 @@ export default function HomePage() {
       ],
     },
     {
-      title: "Connect",
+      title: "Connect",      items: [
-      items: [
         { label: "Instagram", href: "https://instagram.com" },
         { label: "Facebook", href: "https://facebook.com" },
         { label: "Pinterest", href: "https://pinterest.com" },
@@ -79,8 +75,7 @@ export default function HomePage() {
           brandName="Elevate Beauty"
           navItems={navItems}
           button={{
-            text: "Shop Now",
+            text: "Shop Now",            href: "#products"
-            href: "#products",
           }}
         />
       </div>
@@ -95,29 +90,24 @@ export default function HomePage() {
           background={{ variant: "plain" }}
           mediaItems={[
             {
-              imageSrc: "http://img.b2bpic.net/free-photo/top-view-cosmetic-beauty-makeup_1150-6662.jpg",
+              imageSrc: "http://img.b2bpic.net/free-photo/top-view-cosmetic-beauty-makeup_1150-6662.jpg",              imageAlt: "Luxury makeup palette"
-              imageAlt: "Luxury makeup palette",
             },
             {
-              imageSrc: "http://img.b2bpic.net/free-photo/portrait-european-woman-wedding-dress-wearing-necklace-ring_343596-847.jpg",
+              imageSrc: "http://img.b2bpic.net/free-photo/portrait-european-woman-wedding-dress-wearing-necklace-ring_343596-847.jpg",              imageAlt: "Diamond jewelry collection"
-              imageAlt: "Diamond jewelry collection",
             },
             {
-              imageSrc: "http://img.b2bpic.net/free-photo/professional-make-up-brushes-wooden-background-beauty-industry_482257-9815.jpg",
+              imageSrc: "http://img.b2bpic.net/free-photo/professional-make-up-brushes-wooden-background-beauty-industry_482257-9815.jpg",              imageAlt: "Professional makeup brushes"
-              imageAlt: "Professional makeup brushes",
             },
             {
-              imageSrc: "http://img.b2bpic.net/free-photo/bright-engagement-gold-shiny-love-macro_1400-32.jpg",
+              imageSrc: "http://img.b2bpic.net/free-photo/bright-engagement-gold-shiny-love-macro_1400-32.jpg",              imageAlt: "Gold necklace"
-              imageAlt: "Gold necklace",
             },
             {
-              imageSrc: "http://img.b2bpic.net/free-photo/lipsticks-near-cosmetics-case_23-2147778928.jpg",
+              imageSrc: "http://img.b2bpic.net/free-photo/lipsticks-near-cosmetics-case_23-2147778928.jpg",              imageAlt: "Lipstick collection"
-              imageAlt: "Lipstick collection",
             },
           ]}
           mediaAnimation="slide-up"
           buttons={[
-            { text: "Shop Now", href: "#products" },
+            { text: "Discover Your Favorites", href: "#products" },
             { text: "Explore Collections", href: "#featured" },
           ]}
           buttonAnimation="slide-up"
@@ -127,58 +117,28 @@ export default function HomePage() {
       <div id="products" data-section="products">
         <ProductCardFour
           title="Curated Collections"
-          description="Browse our expertly selected makeup and jewelry pieces designed for style-conscious consumers who value quality and innovation."
+          description="Handpicked by beauty experts, our collections feature only authentic, premium products that deliver exceptional quality and style. Each item is selected for superior performance, durability, and design to ensure you receive the finest makeup and jewelry pieces that truly make a difference. Shop with confidence knowing every product meets our rigorous standards for excellence."
           tag="New Arrivals"
           tagIcon={Package}
           tagAnimation="slide-up"
           products={[
             {
-              id: "1",
+              id: "1",              name: "Luxe Velvet Foundation",              price: "$48",              variant: "Light Beige • 4 Shades",              imageSrc: "http://img.b2bpic.net/free-photo/top-view-foundation-containers-arrangement_23-2149705554.jpg?_wi=1",              imageAlt: "Foundation makeup product"
-              name: "Luxe Velvet Foundation",
-              price: "$48",
-              variant: "Light Beige • 4 Shades",
-              imageSrc: "http://img.b2bpic.net/free-photo/top-view-foundation-containers-arrangement_23-2149705554.jpg?_wi=1",
-              imageAlt: "Foundation makeup product",
             },
             {
-              id: "2",
+              id: "2",              name: "Prismatic Eyeshadow Palette",              price: "$56",              variant: "12 Colors • Long-wear",              imageSrc: "http://img.b2bpic.net/free-photo/cosmetics-make-up-elements-wooden-table_482257-26975.jpg?_wi=1",              imageAlt: "Eyeshadow palette"
-              name: "Prismatic Eyeshadow Palette",
-              price: "$56",
-              variant: "12 Colors • Long-wear",
-              imageSrc: "http://img.b2bpic.net/free-photo/cosmetics-make-up-elements-wooden-table_482257-26975.jpg?_wi=1",
-              imageAlt: "Eyeshadow palette",
             },
             {
-              id: "3",
+              id: "3",              name: "Volume Pro Mascara",              price: "$32",              variant: "Waterproof • 2 Formulas",              imageSrc: "http://img.b2bpic.net/free-photo/top-view-black-mascara-with-grey-background_23-2148299644.jpg?_wi=1",              imageAlt: "Mascara product"
-              name: "Volume Pro Mascara",
-              price: "$32",
-              variant: "Waterproof • 2 Formulas",
-              imageSrc: "http://img.b2bpic.net/free-photo/top-view-black-mascara-with-grey-background_23-2148299644.jpg?_wi=1",
-              imageAlt: "Mascara product",
             },
             {
-              id: "4",
+              id: "4",              name: "Gold Vermeil Bracelet",              price: "$89",              variant: "18K Gold • Adjustable",              imageSrc: "http://img.b2bpic.net/free-photo/vertical-shot-young-female-wearing-beautiful-silver-bracelet_181624-26319.jpg?_wi=1",              imageAlt: "Gold bracelet"
-              name: "Gold Vermeil Bracelet",
-              price: "$89",
-              variant: "18K Gold • Adjustable",
-              imageSrc: "http://img.b2bpic.net/free-photo/vertical-shot-young-female-wearing-beautiful-silver-bracelet_181624-26319.jpg?_wi=1",
-              imageAlt: "Gold bracelet",
             },
             {
-              id: "5",
+              id: "5",              name: "Sterling Silver Earrings",              price: "$64",              variant: "Hypoallergenic • Elegant",              imageSrc: "http://img.b2bpic.net/free-photo/still-life-aesthetic-earrings_23-2149649161.jpg?_wi=1",              imageAlt: "Silver earrings"
-              name: "Sterling Silver Earrings",
-              price: "$64",
-              variant: "Hypoallergenic • Elegant",
-              imageSrc: "http://img.b2bpic.net/free-photo/still-life-aesthetic-earrings_23-2149649161.jpg?_wi=1",
-              imageAlt: "Silver earrings",
             },
             {
-              id: "6",
+              id: "6",              name: "Pearl Statement Necklace",              price: "$124",              variant: "Cultured Pearl • 16\" Chain",              imageSrc: "http://img.b2bpic.net/free-photo/close-shot-woman-wearing-sea-shell-necklace-beach_343596-937.jpg?_wi=1",              imageAlt: "Pearl necklace"
-              name: "Pearl Statement Necklace",
-              price: "$124",
-              variant: "Cultured Pearl • 16\" Chain",
-              imageSrc: "http://img.b2bpic.net/free-photo/close-shot-woman-wearing-sea-shell-necklace-beach_343596-937.jpg?_wi=1",
-              imageAlt: "Pearl necklace",
             },
           ]}
           gridVariant="bento-grid"
@@ -199,27 +159,19 @@ export default function HomePage() {
           features={[
             {
               id: 1,
-              title: "Curated Selection",
+              title: "Curated Selection",              description: "Our team of beauty experts handpicks every product to ensure quality, authenticity, and style.",              imageSrc: "http://img.b2bpic.net/free-photo/online-workshop-demontration-beauty-products_259150-60056.jpg?_wi=1"
-              description: "Our team of beauty experts handpicks every product to ensure quality, authenticity, and style.",
-              imageSrc: "http://img.b2bpic.net/free-photo/online-workshop-demontration-beauty-products_259150-60056.jpg?_wi=1",
             },
             {
               id: 2,
-              title: "Flexible Booking",
+              title: "Flexible Booking",              description: "Book your orders at your convenience with our flexible scheduling system for personalized shopping.",              imageSrc: "http://img.b2bpic.net/free-photo/online-workshop-demontration-beauty-products_259150-60056.jpg?_wi=2"
-              description: "Book your orders at your convenience with our flexible scheduling system for personalized shopping.",
-              imageSrc: "http://img.b2bpic.net/free-photo/online-workshop-demontration-beauty-products_259150-60056.jpg?_wi=2",
             },
             {
               id: 3,
-              title: "Expert Support",
+              title: "Expert Support",              description: "Access personalized recommendations and customer support from our knowledgeable beauty consultants.",              imageSrc: "http://img.b2bpic.net/free-photo/online-workshop-demontration-beauty-products_259150-60056.jpg?_wi=3"
-              description: "Access personalized recommendations and customer support from our knowledgeable beauty consultants.",
-              imageSrc: "http://img.b2bpic.net/free-photo/online-workshop-demontration-beauty-products_259150-60056.jpg?_wi=3",
             },
             {
               id: 4,
-              title: "Secure Checkout",
+              title: "Secure Checkout",              description: "Shop with confidence with our encrypted payment systems and secure order management.",              imageSrc: "http://img.b2bpic.net/free-photo/online-workshop-demontration-beauty-products_259150-60056.jpg?_wi=4"
-              description: "Shop with confidence with our encrypted payment systems and secure order management.",
-              imageSrc: "http://img.b2bpic.net/free-photo/online-workshop-demontration-beauty-products_259150-60056.jpg?_wi=4",
             },
           ]}
           textboxLayout="default"
@@ -238,58 +190,28 @@ export default function HomePage() {
           tagAnimation="slide-up"
           testimonials={[
             {
-              id: "1",
+              id: "1",              name: "Sarah Mitchell",              handle: "@sarahmitchell",              testimonial: "The quality of products is exceptional! I've found my go-to makeup and jewelry pieces here. The booking system makes shopping so convenient.",              rating: 5,
-              name: "Sarah Mitchell",
+              imageSrc: "http://img.b2bpic.net/free-photo/positive-confident-businesswoman-wearing-formal-suit-standing-with-arms-folded_74855-10328.jpg?_wi=1",              imageAlt: "Sarah Mitchell"
-              handle: "@sarahmitchell",
-              testimonial: "The quality of products is exceptional! I've found my go-to makeup and jewelry pieces here. The booking system makes shopping so convenient.",
-              rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/positive-confident-businesswoman-wearing-formal-suit-standing-with-arms-folded_74855-10328.jpg?_wi=1",
-              imageAlt: "Sarah Mitchell",
             },
             {
-              id: "2",
+              id: "2",              name: "Jessica Chen",              handle: "@jchen_style",              testimonial: "Elevate Beauty curates collections perfectly for my taste. Love the premium feel and the customer service is outstanding!",              rating: 5,
-              name: "Jessica Chen",
+              imageSrc: "http://img.b2bpic.net/free-photo/positive-confident-businesswoman-wearing-formal-suit-standing-with-arms-folded_74855-10328.jpg?_wi=2",              imageAlt: "Jessica Chen"
-              handle: "@jchen_style",
-              testimonial: "Elevate Beauty curates collections perfectly for my taste. Love the premium feel and the customer service is outstanding!",
-              rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/positive-confident-businesswoman-wearing-formal-suit-standing-with-arms-folded_74855-10328.jpg?_wi=2",
-              imageAlt: "Jessica Chen",
             },
             {
-              id: "3",
+              id: "3",              name: "Emma Rodriguez",              handle: "@emmastyle92",              testimonial: "Finally found a place where makeup and jewelry collections are equally amazing. The expert recommendations helped me find my perfect shade!",              rating: 5,
-              name: "Emma Rodriguez",
+              imageSrc: "http://img.b2bpic.net/free-photo/positive-confident-businesswoman-wearing-formal-suit-standing-with-arms-folded_74855-10328.jpg?_wi=3",              imageAlt: "Emma Rodriguez"
-              handle: "@emmastyle92",
-              testimonial: "Finally found a place where makeup and jewelry collections are equally amazing. The expert recommendations helped me find my perfect shade!",
-              rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/positive-confident-businesswoman-wearing-formal-suit-standing-with-arms-folded_74855-10328.jpg?_wi=3",
-              imageAlt: "Emma Rodriguez",
             },
             {
-              id: "4",
+              id: "4",              name: "Olivia Thompson",              handle: "@olivia.beauty",              testimonial: "The checkout experience is seamless, and the products arrive beautifully packaged. Already recommended to all my friends!",              rating: 5,
-              name: "Olivia Thompson",
+              imageSrc: "http://img.b2bpic.net/free-photo/positive-confident-businesswoman-wearing-formal-suit-standing-with-arms-folded_74855-10328.jpg?_wi=4",              imageAlt: "Olivia Thompson"
-              handle: "@olivia.beauty",
-              testimonial: "The checkout experience is seamless, and the products arrive beautifully packaged. Already recommended to all my friends!",
-              rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/positive-confident-businesswoman-wearing-formal-suit-standing-with-arms-folded_74855-10328.jpg?_wi=4",
-              imageAlt: "Olivia Thompson",
             },
             {
-              id: "5",
+              id: "5",              name: "Maya Patel",              handle: "@mayap_style",              testimonial: "Incredible selection of jewelry pieces and makeup. The quality-to-price ratio is unbeatable. This is my new favorite beauty destination.",              rating: 5,
-              name: "Maya Patel",
+              imageSrc: "http://img.b2bpic.net/free-photo/positive-confident-businesswoman-wearing-formal-suit-standing-with-arms-folded_74855-10328.jpg?_wi=5",              imageAlt: "Maya Patel"
-              handle: "@mayap_style",
-              testimonial: "Incredible selection of jewelry pieces and makeup. The quality-to-price ratio is unbeatable. This is my new favorite beauty destination.",
-              rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/positive-confident-businesswoman-wearing-formal-suit-standing-with-arms-folded_74855-10328.jpg?_wi=5",
-              imageAlt: "Maya Patel",
             },
             {
-              id: "6",
+              id: "6",              name: "Rachel Green",              handle: "@rachelsbeauty",              testimonial: "I love how easy it is to find exactly what I'm looking for. The curated collections are fresh and on-trend. Highly recommend!",              rating: 5,
-              name: "Rachel Green",
+              imageSrc: "http://img.b2bpic.net/free-photo/positive-confident-businesswoman-wearing-formal-suit-standing-with-arms-folded_74855-10328.jpg?_wi=6",              imageAlt: "Rachel Green"
-              handle: "@rachelsbeauty",
-              testimonial: "I love how easy it is to find exactly what I'm looking for. The curated collections are fresh and on-trend. Highly recommend!",
-              rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/positive-confident-businesswoman-wearing-formal-suit-standing-with-arms-folded_74855-10328.jpg?_wi=6",
-              imageAlt: "Rachel Green",
             },
           ]}
           showRating={true}
@@ -308,13 +230,7 @@ export default function HomePage() {
           tagAnimation="slide-up"
           names={["Sephora", "Ulta Beauty", "Nordstrom", "Swarovski", "Cartier", "MAC", "NARS"]}
           logos={[
-            "http://img.b2bpic.net/free-vector/elegant-aesthetic-beauty-influencers-agency-logo_742173-10297.jpg",
+            "http://img.b2bpic.net/free-vector/elegant-aesthetic-beauty-influencers-agency-logo_742173-10297.jpg",            "http://img.b2bpic.net/free-vector/elegant-aesthetic-beauty-influencers-agency-logo_742173-10297.jpg",            "http://img.b2bpic.net/free-vector/real-estate-typography-logo_742173-4275.jpg",            "http://img.b2bpic.net/free-vector/flat-fashion-accessories-logo-set_23-2148922521.jpg",            "http://img.b2bpic.net/free-vector/flat-fashion-accessories-logo-set_23-2148922521.jpg",            "http://img.b2bpic.net/free-photo/view-circular-arrangement-with-make-up-flowers_23-2148301812.jpg",            "http://img.b2bpic.net/free-vector/natural-logo-design-template-branding-corporate-identity_25819-649.jpg"
-            "http://img.b2bpic.net/free-vector/elegant-aesthetic-beauty-influencers-agency-logo_742173-10297.jpg",
-            "http://img.b2bpic.net/free-vector/real-estate-typography-logo_742173-4275.jpg",
-            "http://img.b2bpic.net/free-vector/flat-fashion-accessories-logo-set_23-2148922521.jpg",
-            "http://img.b2bpic.net/free-vector/flat-fashion-accessories-logo-set_23-2148922521.jpg",
-            "http://img.b2bpic.net/free-photo/view-circular-arrangement-with-make-up-flowers_23-2148301812.jpg",
-            "http://img.b2bpic.net/free-vector/natural-logo-design-template-branding-corporate-identity_25819-649.jpg",
           ]}
           textboxLayout="default"
           useInvertedBackground={false}