bender/825047e4-f50e-41bc-aa3a-962a30d22130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #3

Merged
bender merged 2 commits from version_2 into main 2026-03-03 13:20:56 +00:00
Conversation 0 Commits 2 Files Changed 2 +11 -11
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/page.tsx
View File

@@ -49,7 +49,7 @@ export default function LandingPage() {
{ text: "Learn More", href: "about" } { text: "Learn More", href: "about" }
]} ]}
background={{ variant: "sparkles-gradient" }} background={{ variant: "sparkles-gradient" }}
imageSrc="http://img.b2bpic.net/free-photo/indoor-shot-pleased-curly-haired-woman-puts-green-hydrogel-patches-eyes-rejuvenate-skin-smiles-tenderly-poses-bare-shoulders-isolated-beige-studio-background-beauty-concept_273609-59328.jpg" imageSrc="http://img.b2bpic.net/free-photo/indoor-shot-pleased-curly-haired-woman-puts-green-hydrogel-patches-eyes-rejuvenate-skin-smiles-tenderly-poses-bare-shoulders-isolated-beige-studio-background-beauty-concept_273609-59328.jpg?_wi=1"
imageAlt="Premium skincare products and natural ingredients" imageAlt="Premium skincare products and natural ingredients"
frameStyle="card" frameStyle="card"
mediaAnimation="slide-up" mediaAnimation="slide-up"
@@ -79,13 +79,13 @@ export default function LandingPage() {
description="Carefully crafted skincare essentials designed to transform your daily routine into a moment of luxury and self-care." description="Carefully crafted skincare essentials designed to transform your daily routine into a moment of luxury and self-care."
products={[ products={[
{ {
id: "1", name: "Luminous Serum", price: "$58", imageSrc: "http://img.b2bpic.net/free-photo/cosmetic-serum-bottle-hand-orange-background_185193-162127.jpg", imageAlt: "Luminous Serum bottle" id: "1", name: "Luminous Serum", price: "$58", imageSrc: "http://img.b2bpic.net/free-photo/cosmetic-serum-bottle-hand-orange-background_185193-162127.jpg?_wi=1", imageAlt: "Luminous Serum bottle"
}, },
{ {
id: "2", name: "Deep Moisture Cream", price: "$72", imageSrc: "http://img.b2bpic.net/free-photo/woman-caring-her-skin-standing-near-mirror-bathroom_1301-3694.jpg", imageAlt: "Deep Moisture Cream jar" id: "2", name: "Deep Moisture Cream", price: "$72", imageSrc: "http://img.b2bpic.net/free-photo/woman-caring-her-skin-standing-near-mirror-bathroom_1301-3694.jpg?_wi=1", imageAlt: "Deep Moisture Cream jar"
}, },
{ {
id: "3", name: "Pure Radiance Cleanser", price: "$42", imageSrc: "http://img.b2bpic.net/free-photo/aesthetic-spa-essentials-background-home-decor_53876-128208.jpg", imageAlt: "Pure Radiance Cleanser" id: "3", name: "Pure Radiance Cleanser", price: "$42", imageSrc: "http://img.b2bpic.net/free-photo/aesthetic-spa-essentials-background-home-decor_53876-128208.jpg?_wi=1", imageAlt: "Pure Radiance Cleanser"
} }
]} ]}
textboxLayout="default" textboxLayout="default"
@@ -157,7 +157,7 @@ export default function LandingPage() {
id: "4", title: "Can I use multiple products together?", content: "Absolutely! We recommend a simple routine: cleanse, apply serum, and moisturize. Our products are designed to work synergistically. For best results, apply products in order from lightest to thickest consistency, allowing each to absorb before applying the next." id: "4", title: "Can I use multiple products together?", content: "Absolutely! We recommend a simple routine: cleanse, apply serum, and moisturize. Our products are designed to work synergistically. For best results, apply products in order from lightest to thickest consistency, allowing each to absorb before applying the next."
} }
]} ]}
imageSrc="http://img.b2bpic.net/free-photo/beautiful-woman-doing-self-care-treatment-home_23-2148974362.jpg" imageSrc="http://img.b2bpic.net/free-photo/beautiful-woman-doing-self-care-treatment-home_23-2148974362.jpg?_wi=1"
imageAlt="Natural skincare routine" imageAlt="Natural skincare routine"
mediaAnimation="slide-up" mediaAnimation="slide-up"
mediaPosition="left" mediaPosition="left"

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

@@ -11,16 +11,16 @@ import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
export default function ProductsPage() { export default function ProductsPage() {
const allProducts = [ const allProducts = [
{ {
id: "1", name: "Luminous Serum", price: "$58", imageSrc: "http://img.b2bpic.net/free-photo/cosmetic-serum-bottle-hand-orange-background_185193-162127.jpg", imageAlt: "Luminous Serum bottle" id: "1", name: "Luminous Serum", price: "$58", imageSrc: "http://img.b2bpic.net/free-photo/cosmetic-serum-bottle-hand-orange-background_185193-162127.jpg?_wi=2", imageAlt: "Luminous Serum bottle"
}, },
{ {
id: "2", name: "Deep Moisture Cream", price: "$72", imageSrc: "http://img.b2bpic.net/free-photo/woman-caring-her-skin-standing-near-mirror-bathroom_1301-3694.jpg", imageAlt: "Deep Moisture Cream jar" id: "2", name: "Deep Moisture Cream", price: "$72", imageSrc: "http://img.b2bpic.net/free-photo/woman-caring-her-skin-standing-near-mirror-bathroom_1301-3694.jpg?_wi=2", imageAlt: "Deep Moisture Cream jar"
}, },
{ {
id: "3", name: "Pure Radiance Cleanser", price: "$42", imageSrc: "http://img.b2bpic.net/free-photo/aesthetic-spa-essentials-background-home-decor_53876-128208.jpg", imageAlt: "Pure Radiance Cleanser" id: "3", name: "Pure Radiance Cleanser", price: "$42", imageSrc: "http://img.b2bpic.net/free-photo/aesthetic-spa-essentials-background-home-decor_53876-128208.jpg?_wi=2", imageAlt: "Pure Radiance Cleanser"
}, },
{ {
id: "4", name: "Overnight Recovery Mask", price: "$65", imageSrc: "http://img.b2bpic.net/free-photo/cosmetic-serum-bottle-hand-orange-background_185193-162127.jpg", imageAlt: "Overnight Recovery Mask jar" id: "4", name: "Overnight Recovery Mask", price: "$65", imageSrc: "http://img.b2bpic.net/free-photo/cosmetic-serum-bottle-hand-orange-background_185193-162127.jpg?_wi=3", imageAlt: "Overnight Recovery Mask jar"
} }
]; ];
@@ -60,7 +60,7 @@ export default function ProductsPage() {
{ text: "Back to Home", href: "/" } { text: "Back to Home", href: "/" }
]} ]}
background={{ variant: "sparkles-gradient" }} background={{ variant: "sparkles-gradient" }}
imageSrc="http://img.b2bpic.net/free-photo/indoor-shot-pleased-curly-haired-woman-puts-green-hydrogel-patches-eyes-rejuvenate-skin-smiles-tenderly-poses-bare-shoulders-isolated-beige-studio-background-beauty-concept_273609-59328.jpg" imageSrc="http://img.b2bpic.net/free-photo/indoor-shot-pleased-curly-haired-woman-puts-green-hydrogel-patches-eyes-rejuvenate-skin-smiles-tenderly-poses-bare-shoulders-isolated-beige-studio-background-beauty-concept_273609-59328.jpg?_wi=2"
imageAlt="Radiant Skin Product Collection" imageAlt="Radiant Skin Product Collection"
frameStyle="card" frameStyle="card"
mediaAnimation="slide-up" mediaAnimation="slide-up"
@@ -191,7 +191,7 @@ export default function ProductsPage() {
id: "5", title: "Can I purchase products in different variants together?", content: "Absolutely! Mix and match different variants to create your perfect bundle. Our bundle pricing applies to any combination of our products, so you might purchase a standard 50ml Deep Moisture Cream with a 15ml Travel Size Serum, and both receive the bundle discount. This flexibility makes it easy to build the perfect routine for your needs." id: "5", title: "Can I purchase products in different variants together?", content: "Absolutely! Mix and match different variants to create your perfect bundle. Our bundle pricing applies to any combination of our products, so you might purchase a standard 50ml Deep Moisture Cream with a 15ml Travel Size Serum, and both receive the bundle discount. This flexibility makes it easy to build the perfect routine for your needs."
} }
]} ]}
imageSrc="http://img.b2bpic.net/free-photo/beautiful-woman-doing-self-care-treatment-home_23-2148974362.jpg" imageSrc="http://img.b2bpic.net/free-photo/beautiful-woman-doing-self-care-treatment-home_23-2148974362.jpg?_wi=2"
imageAlt="Product skincare routine" imageAlt="Product skincare routine"
mediaAnimation="slide-up" mediaAnimation="slide-up"
mediaPosition="right" mediaPosition="right"