Merge version_1_1782151815074 into main #1

Merged
bender merged 3 commits from version_1_1782151815074 into main 2026-06-22 18:11:34 +00:00
2 changed files with 48 additions and 156 deletions

View File

@@ -8,32 +8,25 @@ import { StyleProvider } from "@/components/ui/StyleProvider";
export default function Layout() {
const navItems = [
{
"name": "Home",
"href": "#hero"
"name": "Home", "href": "#hero"
},
{
"name": "About",
"href": "#about"
"name": "About", "href": "#about"
},
{
"name": "Products",
"href": "#products"
"name": "Products", "href": "#products"
},
{
"name": "FAQ",
"href": "#faq"
"name": "FAQ", "href": "#faq"
},
{
"name": "Features",
"href": "#features"
"name": "Features", "href": "#features"
},
{
"name": "Metrics",
"href": "#metrics"
"name": "Metrics", "href": "#metrics"
},
{
"name": "Testimonial",
"href": "#testimonial"
"name": "Testimonial", "href": "#testimonial"
}
];
@@ -43,10 +36,9 @@ export default function Layout() {
<SectionErrorBoundary name="navbar">
<NavbarFloatingLogo
logo="Gloss & Beads"
logoImageSrc="http://img.b2bpic.net/free-vector/set-cute-messages-badges-vector_53876-61473.jpg"
ctaButton={{
text: "Shop Now",
href: "#products",
}}
text: "Shop Now", href: "#products"}}
navItems={navItems} />
</SectionErrorBoundary>
<main className="flex-grow">
@@ -56,29 +48,19 @@ export default function Layout() {
<FooterBasic
columns={[
{
title: "Shop",
items: [
title: "Shop", items: [
{
label: "Gloss",
href: "#products",
},
label: "Gloss", href: "#products"},
{
label: "Bracelets",
href: "#products",
},
label: "Bracelets", href: "#products"},
],
},
{
title: "Support",
items: [
title: "Support", items: [
{
label: "Shipping",
href: "#",
},
label: "Shipping", href: "#"},
{
label: "FAQ",
href: "#faq",
},
label: "FAQ", href: "#faq"},
],
},
]}

View File

@@ -18,32 +18,22 @@ export default function HomePage() {
title="Glow with Love, Wear Your Style"
description="Infused with vitamins and beneficial oils, our glosses keep you shining naturally. Plus, browse our unique, handmade clay bead bracelets."
primaryButton={{
text: "Shop Glosses",
href: "#products",
}}
text: "Shop Glosses", href: "#products"}}
secondaryButton={{
text: "Shop Bracelets",
href: "#products",
}}
text: "Shop Bracelets", href: "#products"}}
items={[
{
imageSrc: "http://img.b2bpic.net/free-photo/person-holding-spoon-round-frame-from-cereals_23-2147961731.jpg",
},
imageSrc: "http://img.b2bpic.net/free-photo/person-holding-spoon-round-frame-from-cereals_23-2147961731.jpg"},
{
imageSrc: "http://img.b2bpic.net/free-photo/person-eating-sweet-candy-desert_23-2149675167.jpg",
},
imageSrc: "http://img.b2bpic.net/free-photo/person-eating-sweet-candy-desert_23-2149675167.jpg"},
{
imageSrc: "http://img.b2bpic.net/free-photo/diversity-concept-with-hands_23-2149176164.jpg",
},
imageSrc: "http://img.b2bpic.net/free-photo/diversity-concept-with-hands_23-2149176164.jpg"},
{
imageSrc: "http://img.b2bpic.net/free-photo/front-close-view-young-female-flower-designed-shirt-doing-make-up-pink-background_140725-26707.jpg",
},
imageSrc: "http://img.b2bpic.net/free-photo/front-close-view-young-female-flower-designed-shirt-doing-make-up-pink-background_140725-26707.jpg"},
{
imageSrc: "http://img.b2bpic.net/free-photo/close-up-shot-woman-biting-her-finger_23-2148341355.jpg",
},
imageSrc: "http://img.b2bpic.net/free-photo/close-up-shot-woman-biting-her-finger_23-2148341355.jpg"},
{
imageSrc: "http://img.b2bpic.net/free-photo/crop-girl-applying-lipstick-friend_23-2147764678.jpg",
},
imageSrc: "http://img.b2bpic.net/free-photo/crop-girl-applying-lipstick-friend_23-2147764678.jpg"},
]}
/>
</SectionErrorBoundary>
@@ -54,9 +44,7 @@ export default function HomePage() {
<AboutText
title="Crafted with Care, Packed with Joy"
primaryButton={{
text: "Our Ingredients",
href: "#faq",
}}
text: "Our Ingredients", href: "#faq"}}
/>
</SectionErrorBoundary>
</div>
@@ -69,26 +57,11 @@ export default function HomePage() {
description="We believe beauty and style should feel as good as they look."
steps={[
{
tag: "1",
title: "Vitamin Infused",
subtitle: "Healthy Glow",
description: "Our glosses are packed with nourishing oils and vitamins.",
imageSrc: "http://img.b2bpic.net/free-photo/flat-lay-assortment-argan-oil-care-product_23-2148955842.jpg",
},
tag: "1", title: "Vitamin Infused", subtitle: "Healthy Glow", description: "Our glosses are packed with nourishing oils and vitamins.", imageSrc: "http://img.b2bpic.net/free-photo/flat-lay-assortment-argan-oil-care-product_23-2148955842.jpg"},
{
tag: "2",
title: "Unique Designs",
subtitle: "Handmade Clay",
description: "Every bead and charm is chosen with love and precision.",
imageSrc: "http://img.b2bpic.net/free-photo/top-view-christmas-presents-arrangement_23-2149180940.jpg",
},
tag: "2", title: "Unique Designs", subtitle: "Handmade Clay", description: "Every bead and charm is chosen with love and precision.", imageSrc: "http://img.b2bpic.net/free-photo/top-view-christmas-presents-arrangement_23-2149180940.jpg"},
{
tag: "3",
title: "Cute Freebies",
subtitle: "Unboxing Joy",
description: "Every order includes hand-picked stickers and treats.",
imageSrc: "http://img.b2bpic.net/free-photo/round-frame-from-cereals-with-bright-bowls-table_23-2147961738.jpg",
},
tag: "3", title: "Cute Freebies", subtitle: "Unboxing Joy", description: "Every order includes hand-picked stickers and treats.", imageSrc: "http://img.b2bpic.net/free-photo/round-frame-from-cereals-with-bright-bowls-table_23-2147961738.jpg"},
]}
/>
</SectionErrorBoundary>
@@ -102,47 +75,19 @@ export default function HomePage() {
description="Find your perfect match in our collection."
items={[
{
title: "Vitamin Gloss",
description: "Nourishing formula.",
href: "#",
imageSrc: "http://img.b2bpic.net/free-photo/top-view-horizontal-line-christmas-balls-pink-background_23-2148346487.jpg",
},
title: "Vitamin Gloss", description: "Nourishing formula.", href: "#", imageSrc: "http://img.b2bpic.net/free-photo/top-view-horizontal-line-christmas-balls-pink-background_23-2148346487.jpg"},
{
title: "Pearl Bracelet",
description: "Elegant clay beads.",
href: "#",
imageSrc: "http://img.b2bpic.net/free-photo/flat-lay-different-lip-balm-shades-texture_23-2149518362.jpg",
},
title: "Pearl Bracelet", description: "Elegant clay beads.", href: "#", imageSrc: "http://img.b2bpic.net/free-photo/flat-lay-different-lip-balm-shades-texture_23-2149518362.jpg"},
{
title: "Sticker Pack",
description: "Included as freebie.",
href: "#",
imageSrc: "http://img.b2bpic.net/free-photo/top-view-bowls-with-powder-brushes_23-2148774927.jpg",
},
title: "Sticker Pack", description: "Included as freebie.", href: "#", imageSrc: "http://img.b2bpic.net/free-photo/top-view-bowls-with-powder-brushes_23-2148774927.jpg"},
{
title: "Mini Gloss",
description: "Perfect for travel.",
href: "#",
imageSrc: "http://img.b2bpic.net/free-photo/christmas-tree-celebration-tinsel-concept_53876-133639.jpg",
},
title: "Mini Gloss", description: "Perfect for travel.", href: "#", imageSrc: "http://img.b2bpic.net/free-photo/christmas-tree-celebration-tinsel-concept_53876-133639.jpg"},
{
title: "Clay Choker",
description: "Custom handmade style.",
href: "#",
imageSrc: "http://img.b2bpic.net/free-photo/cosmetic-products-treatment-desk_23-2148574966.jpg",
},
title: "Clay Choker", description: "Custom handmade style.", href: "#", imageSrc: "http://img.b2bpic.net/free-photo/cosmetic-products-treatment-desk_23-2148574966.jpg"},
{
title: "Gloss Duo Set",
description: "The perfect bundle.",
href: "#",
imageSrc: "http://img.b2bpic.net/free-photo/top-view-father-s-day-gift-coffee-cup_23-2147683484.jpg",
},
title: "Gloss Duo Set", description: "The perfect bundle.", href: "#", imageSrc: "http://img.b2bpic.net/free-photo/top-view-father-s-day-gift-coffee-cup_23-2147683484.jpg"},
{
title: "Surprise Gift",
description: "Handmade with love.",
href: "#",
imageSrc: "http://img.b2bpic.net/free-photo/person-holding-gift-box-with-hearts-hands_23-2148017469.jpg",
},
title: "Surprise Gift", description: "Handmade with love.", href: "#", imageSrc: "http://img.b2bpic.net/free-photo/person-holding-gift-box-with-hearts-hands_23-2148017469.jpg"},
]}
/>
</SectionErrorBoundary>
@@ -156,17 +101,11 @@ export default function HomePage() {
description="Handmade isn't just a label, it's our promise."
metrics={[
{
value: "100+",
description: "Handmade Bracelets",
},
value: "100+", description: "Handmade Bracelets"},
{
value: "500+",
description: "Gloss Tubes Sold",
},
value: "500+", description: "Gloss Tubes Sold"},
{
value: "99%",
description: "Happy Customers",
},
value: "99%", description: "Happy Customers"},
]}
/>
</SectionErrorBoundary>
@@ -177,37 +116,18 @@ export default function HomePage() {
<TestimonialColumnMarqueeCards
tag="Feedback"
title="What Our Glow Girls Say"
description="Read what our happy customers think about our products."
testimonials={[
{
name: "Chloe M.",
role: "Student",
quote: "The gloss smells amazing and the stickers are so cute!",
imageSrc: "http://img.b2bpic.net/free-photo/front-view-smiley-woman-posing-with-copy-space_23-2148673200.jpg",
},
name: "Chloe M.", role: "Student", quote: "The gloss smells amazing and the stickers are so cute!", imageSrc: "http://img.b2bpic.net/free-photo/front-view-smiley-woman-posing-with-copy-space_23-2148673200.jpg"},
{
name: "Maya S.",
role: "Collector",
quote: "Best clay bracelets ever, they feel very durable.",
imageSrc: "http://img.b2bpic.net/free-photo/successful-young-man-stylish-hat-relaxing-alone-cozy-cafeteria-lunch-break-looking-with-happy-expression_273609-1935.jpg",
},
name: "Maya S.", role: "Collector", quote: "Best clay bracelets ever, they feel very durable.", imageSrc: "http://img.b2bpic.net/free-photo/successful-young-man-stylish-hat-relaxing-alone-cozy-cafeteria-lunch-break-looking-with-happy-expression_273609-1935.jpg"},
{
name: "Riley P.",
role: "Blogger",
quote: "Love the vitamins in the gloss! My lips feel healthier.",
imageSrc: "http://img.b2bpic.net/free-photo/side-view-woman-with-festival-look-makeup_23-2151374032.jpg",
},
name: "Riley P.", role: "Blogger", quote: "Love the vitamins in the gloss! My lips feel healthier.", imageSrc: "http://img.b2bpic.net/free-photo/side-view-woman-with-festival-look-makeup_23-2151374032.jpg"},
{
name: "Jordan L.",
role: "Fan",
quote: "Packaging is just top tier. Felt like a real gift.",
imageSrc: "http://img.b2bpic.net/free-photo/beautiful-young-tattooed-person_23-2149563229.jpg",
},
name: "Jordan L.", role: "Fan", quote: "Packaging is just top tier. Felt like a real gift.", imageSrc: "http://img.b2bpic.net/free-photo/beautiful-young-tattooed-person_23-2149563229.jpg"},
{
name: "Alex R.",
role: "Shopper",
quote: "The mini glosses are perfect for carrying around.",
imageSrc: "http://img.b2bpic.net/free-photo/positive-dark-skinned-curly-female-with-broad-smile-enjoys-good-recreation-cafeteria-drinks-cocktail-while-sits-comfortable-couch_273609-3224.jpg",
},
name: "Alex R.", role: "Shopper", quote: "The mini glosses are perfect for carrying around.", imageSrc: "http://img.b2bpic.net/free-photo/positive-dark-skinned-curly-female-with-broad-smile-enjoys-good-recreation-cafeteria-drinks-cocktail-while-sits-comfortable-couch_273609-3224.jpg"},
]}
/>
</SectionErrorBoundary>
@@ -221,17 +141,11 @@ export default function HomePage() {
description="Learn more about our ingredients and process."
items={[
{
question: "What oils do you use?",
answer: "We use jojoba, sweet almond, and coconut oils.",
},
question: "What oils do you use?", answer: "We use jojoba, sweet almond, and coconut oils."},
{
question: "Are your products cruelty-free?",
answer: "Absolutely, always.",
},
question: "Are your products cruelty-free?", answer: "Absolutely, always."},
{
question: "How long for shipping?",
answer: "Usually 3-5 business days.",
},
question: "How long for shipping?", answer: "Usually 3-5 business days."},
]}
imageSrc="http://img.b2bpic.net/free-photo/close-up-hyaluronic-acid-tratment_23-2149286714.jpg"
/>
@@ -244,13 +158,9 @@ export default function HomePage() {
tag="Get in touch"
text="Have a custom bracelet request? Let's talk!"
primaryButton={{
text: "Email Us",
href: "mailto:hello@glossandbeads.com",
}}
text: "Email Us", href: "mailto:hello@glossandbeads.com"}}
secondaryButton={{
text: "Follow on IG",
href: "#",
}}
text: "Follow on IG", href: "#"}}
/>
</SectionErrorBoundary>
</div>