bender/c2e4fdcd-2a12-468e-b67a-eabf1be08663
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #2

Merged
bender merged 2 commits from version_2 into main 2026-03-04 04:22:10 +00:00
Conversation 0 Commits 2 Files Changed 2 +42 -163
2 changed files with 42 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/app/layout.tsx
View File

@@ -6,36 +6,22 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const manrope = Manrope({
variable: "--font-manrope",
subsets: ["latin"],
variable: "--font-manrope", subsets: ["latin"],
});
const dmSans = DM_Sans({
variable: "--font-dm-sans",
subsets: ["latin"],
variable: "--font-dm-sans", subsets: ["latin"],
});
export const metadata: Metadata = {
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: {
title: "Elevate Beauty - Premium Makeup & Jewelry",
description: "Shop curated makeup and jewelry collections designed for your unique style.",
siteName: "Elevate Beauty",
type: "website",
images: [
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: {
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",
alt: "Premium makeup collection",
},
url: "http://img.b2bpic.net/free-photo/top-view-cosmetic-beauty-makeup_1150-6662.jpg", alt: "Premium makeup collection"},
],
},
twitter: {
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"],
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"],
},
robots: {
index: true,
@@ -1427,4 +1413,4 @@ export default function RootLayout({
</ServiceWrapper>
</html>
);
}
}

177
src/app/page.tsx
View File

@@ -24,8 +24,7 @@ export default function HomePage() {
const footerColumns = [
{
title: "Shop",
items: [
title: "Shop", 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",
items: [
title: "Company", items: [
{ label: "About Us", href: "/about" },
{ label: "Our Story", href: "/about" },
{ label: "Blog", href: "#" },
@@ -42,8 +40,7 @@ export default function HomePage() {
],
},
{
title: "Support",
items: [
title: "Support", items: [
{ label: "Contact Us", href: "/contact" },
{ label: "FAQ", href: "#faq" },
{ label: "Shipping Info", href: "#" },
@@ -51,8 +48,7 @@ export default function HomePage() {
],
},
{
title: "Connect",
items: [
title: "Connect", items: [
{ label: "Instagram", href: "https://instagram.com" },
{ label: "Facebook", href: "https://facebook.com" },
{ label: "Pinterest", href: "https://pinterest.com" },
@@ -79,9 +75,7 @@ export default function HomePage() {
brandName="Elevate Beauty"
navItems={navItems}
button={{
text: "Shop Now",
href: "#products",
}}
text: "Shop Now", href: "#products"}}
/>
</div>
@@ -95,29 +89,19 @@ export default function HomePage() {
background={{ variant: "plain" }}
mediaItems={[
{
imageSrc: "http://img.b2bpic.net/free-photo/top-view-cosmetic-beauty-makeup_1150-6662.jpg",
imageAlt: "Luxury makeup palette",
},
imageSrc: "http://img.b2bpic.net/free-photo/top-view-cosmetic-beauty-makeup_1150-6662.jpg", imageAlt: "Luxury makeup palette"},
{
imageSrc: "http://img.b2bpic.net/free-photo/portrait-european-woman-wedding-dress-wearing-necklace-ring_343596-847.jpg",
imageAlt: "Diamond jewelry collection",
},
imageSrc: "http://img.b2bpic.net/free-photo/portrait-european-woman-wedding-dress-wearing-necklace-ring_343596-847.jpg", imageAlt: "Diamond jewelry collection"},
{
imageSrc: "http://img.b2bpic.net/free-photo/professional-make-up-brushes-wooden-background-beauty-industry_482257-9815.jpg",
imageAlt: "Professional makeup brushes",
},
imageSrc: "http://img.b2bpic.net/free-photo/professional-make-up-brushes-wooden-background-beauty-industry_482257-9815.jpg", imageAlt: "Professional makeup brushes"},
{
imageSrc: "http://img.b2bpic.net/free-photo/bright-engagement-gold-shiny-love-macro_1400-32.jpg",
imageAlt: "Gold necklace",
},
imageSrc: "http://img.b2bpic.net/free-photo/bright-engagement-gold-shiny-love-macro_1400-32.jpg", imageAlt: "Gold necklace"},
{
imageSrc: "http://img.b2bpic.net/free-photo/lipsticks-near-cosmetics-case_23-2147778928.jpg",
imageAlt: "Lipstick collection",
},
imageSrc: "http://img.b2bpic.net/free-photo/lipsticks-near-cosmetics-case_23-2147778928.jpg", 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"
@@ -133,53 +117,17 @@ export default function HomePage() {
tagAnimation="slide-up"
products={[
{
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",
},
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"},
{
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",
},
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"},
{
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",
},
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"},
{
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",
},
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"},
{
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",
},
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"},
{
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",
},
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"},
]}
gridVariant="bento-grid"
animationType="slide-up"
@@ -199,28 +147,16 @@ export default function HomePage() {
features={[
{
id: 1,
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",
},
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"},
{
id: 2,
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",
},
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"},
{
id: 3,
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",
},
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"},
{
id: 4,
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",
},
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"},
]}
textboxLayout="default"
useInvertedBackground={false}
@@ -238,59 +174,23 @@ export default function HomePage() {
tagAnimation="slide-up"
testimonials={[
{
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,
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: "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,
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",
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,
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: "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,
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",
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,
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: "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,
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",
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,
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: "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,
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",
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,
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: "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,
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",
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,
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",
},
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,
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}
textboxLayout="default"
@@ -308,14 +208,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/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/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}
speed={40}
@@ -348,4 +241,4 @@ export default function HomePage() {
</div>
</ThemeProvider>
);
}
}