bender/abd57db7-1b16-400d-84a1-4db672c1cd45
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge version_3 into main #1

Merged
bender merged 4 commits from version_3 into main 2026-04-25 17:15:59 +00:00
Conversation 0 Commits 4 Files Changed 4 +126 -173
4 changed files with 126 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/app/launch-plan/page.tsx Normal file
View File

@@ -0,0 +1,38 @@
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react";
import LegalSection from '@/components/legal/LegalSection';
import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
export default function LaunchPlanPage() {
return (
<ThemeProvider>
<ReactLenis root>
<NavbarStyleCentered
navItems={[
{ name: "Home", id: "/" },
{ name: "Launch Plan", id: "#content" }
]}
brandName="CreamyDream x Cherry"
/>
<div id="content" className="pt-32 pb-20">
<LegalSection
layout="page"
title="Launch Plan"
sections={[
{ heading: "Phase 1: Pre-Launch", content: { type: "numbered-list", items: ["Social media teaser campaign", "Influencer seeding", "Email waitlist signup setup"] } },
{ heading: "Phase 2: Launch Day", content: { type: "numbered-list", items: ["Website goes live", "Influencer content drops", "Email blast to waitlist"] } },
{ heading: "Phase 3: Post-Launch", content: { type: "numbered-list", items: ["Customer review collection", "Community highlight series", "Launch product refinement based on feedback"] } }
]}
/>
</div>
<FooterLogoEmphasis
logoText="CreamyDream x Cherry"
columns={[]}
/>
</ReactLenis>
</ThemeProvider>
);
}

210
src/app/page.tsx
View File

@@ -21,32 +21,24 @@ export default function LandingPage() {
borderRadius="pill"
contentWidth="mediumLarge"
sizing="mediumLarge"
background="circleGradient"
cardStyle="soft-shadow"
primaryButtonStyle="primary-glow"
background="noise"
cardStyle="glass-elevated"
primaryButtonStyle="gradient"
secondaryButtonStyle="glass"
headingFontWeight="normal"
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="nav" data-section="nav">
<NavbarStyleCentered
navItems={[
{
name: "Home",
id: "#hero",
},
name: "Home", id: "#hero"},
{
name: "Products",
id: "#products",
},
name: "Products", id: "#products"},
{
name: "Bundles",
id: "#bundles",
},
name: "Bundles", id: "#bundles"},
{
name: "Reviews",
id: "#reviews",
},
name: "Reviews", id: "#reviews"},
]}
brandName="CreamyDream x Cherry"
/>
@@ -55,17 +47,14 @@ export default function LandingPage() {
<div id="hero" data-section="hero">
<HeroBillboardScroll
background={{
variant: "gradient-bars",
}}
variant: "sparkles-gradient"}}
title="Moisture-Locked Perfection for Your Crown"
description="Discover the CreamyDream x Cherry collaboration: premium, moisture-focused care designed to empower your natural curls."
imageSrc="http://img.b2bpic.net/free-photo/beautiful-strong-confident-black-model-khaki-thin-coat-isolated-white_633478-1220.jpg"
imageAlt="curly hair beauty close up"
buttons={[
{
text: "Shop Now",
href: "#products",
},
text: "Shop Now", href: "#products"},
]}
/>
</div>
@@ -75,9 +64,7 @@ export default function LandingPage() {
useInvertedBackground={true}
title="Empowered by Nature"
description={[
"CreamyDream and Cherry unite to bring you the best in moisture-focused hair care.",
"We believe every curl tells a story, and yours deserves to grow healthy, bouncy, and bold.",
]}
"CreamyDream and Cherry unite to bring you the best in moisture-focused hair care.", "We believe every curl tells a story, and yours deserves to grow healthy, bouncy, and bold."]}
/>
</div>
@@ -89,47 +76,17 @@ export default function LandingPage() {
useInvertedBackground={false}
products={[
{
id: "1",
name: "Sticky Leave-In",
price: "$24.75",
imageSrc: "http://img.b2bpic.net/free-photo/conditioner-bottle_187299-45898.jpg",
imageAlt: "hair cream bottle mockup",
},
id: "1", name: "Sticky Leave-In", price: "$24.75", imageSrc: "http://img.b2bpic.net/free-photo/conditioner-bottle_187299-45898.jpg", imageAlt: "hair cream bottle mockup"},
{
id: "2",
name: "Chebe Wash-Set",
price: "$63.80",
imageSrc: "http://img.b2bpic.net/free-photo/coconut-other-products-top-view_23-2148337502.jpg",
imageAlt: "shampoo wash set bottle",
},
id: "2", name: "Chebe Wash-Set", price: "$63.80", imageSrc: "http://img.b2bpic.net/free-photo/coconut-other-products-top-view_23-2148337502.jpg", imageAlt: "shampoo wash set bottle"},
{
id: "3",
name: "Fluffy Butter",
price: "$20.85",
imageSrc: "http://img.b2bpic.net/free-photo/skin-regeneration-product-still-life_23-2151232279.jpg",
imageAlt: "hair butter jar mockup",
},
id: "3", name: "Fluffy Butter", price: "$20.85", imageSrc: "http://img.b2bpic.net/free-photo/skin-regeneration-product-still-life_23-2151232279.jpg", imageAlt: "hair butter jar mockup"},
{
id: "4",
name: "Wet Curly Gel",
price: "$21.95",
imageSrc: "http://img.b2bpic.net/free-photo/skin-regeneration-product-still-life_23-2151232278.jpg",
imageAlt: "hair cream bottle mockup",
},
id: "4", name: "Wet Curly Gel", price: "$21.95", imageSrc: "http://img.b2bpic.net/free-photo/skin-regeneration-product-still-life_23-2151232278.jpg", imageAlt: "hair cream bottle mockup"},
{
id: "5",
name: "Olie/Oil",
price: "$25.25",
imageSrc: "http://img.b2bpic.net/free-photo/close-up-skin-regeneration-products_23-2151242133.jpg",
imageAlt: "hair butter jar mockup",
},
id: "5", name: "Olie/Oil", price: "$25.25", imageSrc: "http://img.b2bpic.net/free-photo/close-up-skin-regeneration-products_23-2151242133.jpg", imageAlt: "hair butter jar mockup"},
{
id: "6",
name: "Curly Leave-In",
price: "$20.35",
imageSrc: "http://img.b2bpic.net/free-photo/beautiful-eucalyptus-with-beauty-products_23-2149440648.jpg",
imageAlt: "shampoo wash set bottle",
},
id: "6", name: "Curly Leave-In", price: "$20.35", imageSrc: "http://img.b2bpic.net/free-photo/beautiful-eucalyptus-with-beauty-products_23-2149440648.jpg", imageAlt: "shampoo wash set bottle"},
]}
title="Our Signature Collection"
description="Hand-picked, high-moisture essentials for every step of your hair care journey."
@@ -143,36 +100,16 @@ export default function LandingPage() {
useInvertedBackground={true}
plans={[
{
id: "bundle-1",
tag: "Top Pick",
price: "$75.35",
period: "once",
description: "The Ultimate 3-Pack Moisture Routine",
button: {
text: "Shop Bundle",
},
featuresTitle: "What's inside:",
features: [
"Sticky Leave-In",
"Olie/Oil",
"Fluffy Butter",
],
id: "bundle-1", tag: "Top Pick", price: "$75.35", period: "once", description: "The Ultimate 3-Pack Moisture Routine", button: {
text: "Shop Bundle"},
featuresTitle: "What's inside:", features: [
"Sticky Leave-In", "Olie/Oil", "Fluffy Butter"],
},
{
id: "bundle-2",
tag: "Best Value",
price: "$72.05",
period: "once",
description: "Full Wash-Set Treatment",
button: {
text: "Shop Bundle",
},
featuresTitle: "What's inside:",
features: [
"Shampoo",
"Conditioner",
"Deep Treatment",
],
id: "bundle-2", tag: "Best Value", price: "$72.05", period: "once", description: "Full Wash-Set Treatment", button: {
text: "Shop Bundle"},
featuresTitle: "What's inside:", features: [
"Shampoo", "Conditioner", "Deep Treatment"],
},
]}
title="Better Together: Bundles"
@@ -187,23 +124,11 @@ export default function LandingPage() {
useInvertedBackground={false}
features={[
{
title: "Deep Moisture",
description: "Hydrate and define curls with ingredients that last all day.",
imageSrc: "http://img.b2bpic.net/free-photo/foundation-dropper-bottle-with-reflection_23-2151968650.jpg",
imageAlt: "hair cream bottle mockup",
},
title: "Deep Moisture", description: "Hydrate and define curls with ingredients that last all day.", imageSrc: "http://img.b2bpic.net/free-photo/foundation-dropper-bottle-with-reflection_23-2151968650.jpg", imageAlt: "hair cream bottle mockup"},
{
title: "Healthy Growth",
description: "Supports follicle health for stronger, longer, and softer hair.",
imageSrc: "http://img.b2bpic.net/free-photo/flat-lay-natural-ingredients-arrangement_23-2148899382.jpg",
imageAlt: "shampoo wash set bottle",
},
title: "Healthy Growth", description: "Supports follicle health for stronger, longer, and softer hair.", imageSrc: "http://img.b2bpic.net/free-photo/flat-lay-natural-ingredients-arrangement_23-2148899382.jpg", imageAlt: "shampoo wash set bottle"},
{
title: "Confidence Boost",
description: "Empowering you to wear your natural texture with sass.",
imageSrc: "http://img.b2bpic.net/free-photo/skin-regeneration-product-still-life_23-2151232241.jpg",
imageAlt: "hair butter jar mockup",
},
title: "Confidence Boost", description: "Empowering you to wear your natural texture with sass.", imageSrc: "http://img.b2bpic.net/free-photo/skin-regeneration-product-still-life_23-2151232241.jpg", imageAlt: "hair butter jar mockup"},
]}
title="Why You'll Love Us"
description="We don't just sell hair products; we create a movement of confident, empowered natural beauty."
@@ -217,40 +142,15 @@ export default function LandingPage() {
useInvertedBackground={true}
testimonials={[
{
id: "1",
name: "Jamila B.",
handle: "@curljam",
testimonial: "My curls have never felt this soft. Truly the best leave-in ever!",
imageSrc: "http://img.b2bpic.net/free-photo/mixed-race-black-blonde-model-with-curly-hair-wondered-model-turned-face-right_633478-789.jpg",
},
id: "1", name: "Jamila B.", handle: "@curljam", testimonial: "My curls have never felt this soft. Truly the best leave-in ever!", imageSrc: "http://img.b2bpic.net/free-photo/mixed-race-black-blonde-model-with-curly-hair-wondered-model-turned-face-right_633478-789.jpg"},
{
id: "2",
name: "Kelsey S.",
handle: "@kelseysways",
testimonial: "The Chebe Wash-Set is a total game changer for my coily hair growth.",
imageSrc: "http://img.b2bpic.net/free-photo/lovely-girl-denim-jacket-ruffles-hair-white-background-portrait-african-curly-woman-green-tee-smiling-isolated-backdrop_197531-29011.jpg",
},
id: "2", name: "Kelsey S.", handle: "@kelseysways", testimonial: "The Chebe Wash-Set is a total game changer for my coily hair growth.", imageSrc: "http://img.b2bpic.net/free-photo/lovely-girl-denim-jacket-ruffles-hair-white-background-portrait-african-curly-woman-green-tee-smiling-isolated-backdrop_197531-29011.jpg"},
{
id: "3",
name: "Maya L.",
handle: "@maya_styles",
testimonial: "The Fluffy Butter is the only thing that keeps my ends hydrated.",
imageSrc: "http://img.b2bpic.net/free-photo/close-up-wool-texture-details_23-2149503200.jpg",
},
id: "3", name: "Maya L.", handle: "@maya_styles", testimonial: "The Fluffy Butter is the only thing that keeps my ends hydrated.", imageSrc: "http://img.b2bpic.net/free-photo/close-up-wool-texture-details_23-2149503200.jpg"},
{
id: "4",
name: "Tasha R.",
handle: "@tashareviews",
testimonial: "Finally a brand that gets curly girl needs. Obsessed!",
imageSrc: "http://img.b2bpic.net/free-photo/beautiful-portrait-detail-woman-s-brown-hair_23-2151913372.jpg",
},
id: "4", name: "Tasha R.", handle: "@tashareviews", testimonial: "Finally a brand that gets curly girl needs. Obsessed!", imageSrc: "http://img.b2bpic.net/free-photo/beautiful-portrait-detail-woman-s-brown-hair_23-2151913372.jpg"},
{
id: "5",
name: "Nia D.",
handle: "@nia_curly",
testimonial: "Obsessed with the smell and how defined my coils look now.",
imageSrc: "http://img.b2bpic.net/free-photo/woman-touching-her-curls-sitting-bench_1139-587.jpg",
},
id: "5", name: "Nia D.", handle: "@nia_curly", testimonial: "Obsessed with the smell and how defined my coils look now.", imageSrc: "http://img.b2bpic.net/free-photo/woman-touching-her-curls-sitting-bench_1139-587.jpg"},
]}
title="Loved by the Curly Community"
description="See why our customers are making the switch to moisture-rich, natural hair care."
@@ -263,20 +163,11 @@ export default function LandingPage() {
useInvertedBackground={false}
faqs={[
{
id: "1",
title: "What is your shipping policy?",
content: "We offer flat rate shipping and free shipping on orders over $80.",
},
id: "1", title: "What is your shipping policy?", content: "We offer flat rate shipping and free shipping on orders over $80."},
{
id: "2",
title: "Can I return products?",
content: "We accept returns on unopened items within 14 days.",
},
id: "2", title: "Can I return products?", content: "We accept returns on unopened items within 14 days."},
{
id: "3",
title: "Are these for all hair types?",
content: "Specifically formulated for curly, coily, and natural hair.",
},
id: "3", title: "Are these for all hair types?", content: "Specifically formulated for curly, coily, and natural hair."},
]}
imageSrc="http://img.b2bpic.net/free-photo/mixed-race-black-woman-with-neutral-makeup-portrait-curly-hair-ideal-skin-studio-grey-background_633478-1061.jpg"
mediaAnimation="slide-up"
@@ -291,8 +182,7 @@ export default function LandingPage() {
<ContactCenter
useInvertedBackground={true}
background={{
variant: "plain",
}}
variant: "plain"}}
title="Join the Movement"
description="Sign up for 10% off your first order and exclusive curly care tips."
tag="Stay Updated"
@@ -305,37 +195,25 @@ export default function LandingPage() {
{
items: [
{
label: "Shop All",
href: "#products",
},
label: "Shop All", href: "#products"},
{
label: "Bundles",
href: "#bundles",
},
label: "Bundles", href: "#bundles"},
],
},
{
items: [
{
label: "Shipping Policy",
href: "#",
},
label: "Shipping Policy", href: "#"},
{
label: "Returns",
href: "#",
},
label: "Returns", href: "#"},
],
},
{
items: [
{
label: "Contact",
href: "#",
},
label: "Contact", href: "#"},
{
label: "Instagram",
href: "#",
},
label: "Instagram", href: "#"},
],
},
]}
@@ -345,4 +223,4 @@ export default function LandingPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

37
src/app/shipping-policy/page.tsx Normal file
View File

@@ -0,0 +1,37 @@
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react";
import LegalSection from '@/components/legal/LegalSection';
import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
export default function ShippingPolicyPage() {
return (
<ThemeProvider>
<ReactLenis root>
<NavbarStyleCentered
navItems={[
{ name: "Home", id: "/" },
{ name: "Policy", id: "#content" }
]}
brandName="CreamyDream x Cherry"
/>
<div id="content" className="pt-32 pb-20">
<LegalSection
layout="page"
title="Shipping & Returns Policy"
sections={[
{ heading: "Shipping", content: { type: "paragraph", text: "We process and ship orders within 2 business days. Standard shipping is flat rate. Enjoy free shipping on all domestic orders over $80." } },
{ heading: "Returns", content: { type: "paragraph", text: "We want you to love your products. We accept returns of unopened items in their original packaging within 14 days of delivery. Please contact our support team to initiate a return request." } }
]}
/>
</div>
<FooterLogoEmphasis
logoText="CreamyDream x Cherry"
columns={[]}
/>
</ReactLenis>
</ThemeProvider>
);
}

14
src/app/styles/variables.css
View File

@@ -10,15 +10,15 @@
--accent: #ffffff;
--background-accent: #ffffff; */
--background: #f7f6f7;
--card: #ffffff;
--foreground: #1b0c25;
--primary-cta: #1b0c25;
--background: #fbfaf8;
--card: #f0ede9;
--foreground: #2d2621;
--primary-cta: #c15c4d;
--primary-cta-text: #f7f6f7;
--secondary-cta: #ffffff;
--secondary-cta: #f0ede9;
--secondary-cta-text: #1b0c25;
--accent: #ff93e4;
--background-accent: #e8a8c3;
--accent: #d6a89c;
--background-accent: #e8d2ca;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);