bender/9bf07589-647d-4c50-8a9a-fedb90eb0895
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #1

Merged
bender merged 4 commits from version_2 into main 2026-04-26 18:26:18 +00:00
Conversation 0 Commits 4 Files Changed 4 +69 -53
4 changed files with 69 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/app/login/page.tsx Normal file
View File

@@ -0,0 +1,26 @@
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleCentered from "@/components/navbar/NavbarStyleCentered/NavbarStyleCentered";
import { useState } from "react";
export default function LoginPage() {
return (
<ThemeProvider>
<NavbarStyleCentered
brandName="Luminé Skincare"
navItems={[{ name: "Home", id: "/" }]}
/>
<div className="min-h-screen flex items-center justify-center p-8">
<div className="max-w-md w-full p-8 border rounded-xl">
<h1 className="text-3xl font-bold mb-6">Login</h1>
<form className="space-y-4">
<input type="email" placeholder="Email" className="w-full p-2 border rounded" />
<input type="password" placeholder="Password" className="w-full p-2 border rounded" />
<button type="submit" className="w-full p-2 bg-primary text-white rounded">Login</button>
</form>
</div>
</div>
</ThemeProvider>
);
}

61
src/app/page.tsx
View File

@@ -77,25 +77,13 @@ export default function SkincareTemplatePage() {
description="Discover our carefully curated skincare essentials designed to nourish and revitalize your skin. Worldwide shipping available."
products={[
{
id: "1",
name: "Hydrating Moisturizer",
price: "$68",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/templates/skincare/image2.webp",
imageAlt: "Hydrating Moisturizer bottle"
id: "1", name: "Hydrating Moisturizer", price: "$68", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/templates/skincare/image2.webp", imageAlt: "Hydrating Moisturizer bottle"
},
{
id: "2",
name: "Radiance Serum",
price: "$85",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/templates/skincare/image3.webp",
imageAlt: "Radiance Serum bottle"
id: "2", name: "Radiance Serum", price: "$85", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/templates/skincare/image3.webp", imageAlt: "Radiance Serum bottle"
},
{
id: "3",
name: "Purifying Face Mask",
price: "$52",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/templates/skincare/image1.webp",
imageAlt: "Purifying Face Mask jar"
id: "3", name: "Purifying Face Mask", price: "$52", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/templates/skincare/image1.webp", imageAlt: "Purifying Face Mask jar"
}
]}
gridVariant="three-columns-all-equal-width"
@@ -111,20 +99,13 @@ export default function SkincareTemplatePage() {
description="Scientifically-formulated skincare products that deliver visible results with natural, sustainable ingredients. Available for worldwide shipping."
features={[
{
title: "Worldwide Shipping",
description: "Fast and reliable delivery to over 150 countries worldwide",
bentoComponent: "globe"
title: "Worldwide Shipping", description: "Fast and reliable delivery to over 150 countries worldwide", bentoComponent: "globe"
},
{
title: "Clinically Proven",
description: "Dermatologist-tested and proven effective in clinical trials",
bentoComponent: "line-chart"
title: "Clinically Proven", description: "Dermatologist-tested and proven effective in clinical trials", bentoComponent: "line-chart"
},
{
title: "Sustainable",
description: "Eco-conscious packaging and ethical sourcing practices",
bentoComponent: "orbiting-icons",
centerIcon: Leaf,
title: "Sustainable", description: "Eco-conscious packaging and ethical sourcing practices", bentoComponent: "orbiting-icons", centerIcon: Leaf,
items: [
{ icon: Droplet, ring: 1 },
{ icon: Sprout, ring: 2 },
@@ -161,24 +142,16 @@ export default function SkincareTemplatePage() {
description="Everything you need to know about our skincare products, worldwide shipping, and delivery."
faqs={[
{
id: "1",
title: "How long does it take to see results?",
content: "Most customers notice visible improvements in skin texture and radiance within 2-4 weeks of consistent use. For more significant results like reduced fine lines or hyperpigmentation, allow 6-8 weeks."
id: "1", title: "How long does it take to see results?", content: "Most customers notice visible improvements in skin texture and radiance within 2-4 weeks of consistent use. For more significant results like reduced fine lines or hyperpigmentation, allow 6-8 weeks."
},
{
id: "2",
title: "Are your products suitable for sensitive skin?",
content: "Yes! All Luminé products are formulated to be gentle and non-irritating. We use natural ingredients and avoid common irritants. We recommend patch testing first if you have very reactive skin."
id: "2", title: "Are your products suitable for sensitive skin?", content: "Yes! All Luminé products are formulated to be gentle and non-irritating. We use natural ingredients and avoid common irritants. We recommend patch testing first if you have very reactive skin."
},
{
id: "3",
title: "Do you offer worldwide shipping?",
content: "Absolutely! We ship to over 150 countries worldwide. Standard shipping typically takes 7-14 business days depending on your location. Express shipping options are also available for faster delivery."
id: "3", title: "Do you offer worldwide shipping?", content: "Absolutely! We ship to over 150 countries worldwide. Standard shipping typically takes 7-14 business days depending on your location. Express shipping options are also available for faster delivery."
},
{
id: "4",
title: "What is your return policy?",
content: "We offer a 60-day satisfaction guarantee on all purchases. If you're not completely happy with your skincare, return it for a full refund or exchange. Worldwide returns are processed efficiently through our international shipping partners."
id: "4", title: "What is your return policy?", content: "We offer a 60-day satisfaction guarantee on all purchases. If you're not completely happy with your skincare, return it for a full refund or exchange. Worldwide returns are processed efficiently through our international shipping partners."
}
]}
imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/default/templates/skincare/image4.webp"
@@ -211,8 +184,7 @@ export default function SkincareTemplatePage() {
logoText="Luminé"
columns={[
{
title: "Product",
items: [
title: "Product", items: [
{ label: "Moisturizers", href: "#products" },
{ label: "Serums", href: "#products" },
{ label: "Masks", href: "#products" },
@@ -220,8 +192,7 @@ export default function SkincareTemplatePage() {
]
},
{
title: "Company",
items: [
title: "Company", items: [
{ label: "About Us", href: "#about" },
{ label: "Sustainability", href: "#about" },
{ label: "Blog", href: "#" },
@@ -229,8 +200,7 @@ export default function SkincareTemplatePage() {
]
},
{
title: "Support",
items: [
title: "Support", items: [
{ label: "Contact Us", href: "#contact" },
{ label: "FAQ", href: "#faq" },
{ label: "Worldwide Shipping", href: "#" },
@@ -238,8 +208,7 @@ export default function SkincareTemplatePage() {
]
},
{
title: "Connect",
items: [
title: "Connect", items: [
{ label: "Instagram", href: "#" },
{ label: "Facebook", href: "#" },
{ label: "Pinterest", href: "#" },
@@ -252,4 +221,4 @@ export default function SkincareTemplatePage() {
</div>
</ThemeProvider>
);
}
}

21
src/app/profile/page.tsx Normal file
View File

@@ -0,0 +1,21 @@
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleCentered from "@/components/navbar/NavbarStyleCentered/NavbarStyleCentered";
export default function ProfilePage() {
return (
<ThemeProvider>
<NavbarStyleCentered
brandName="Luminé Skincare"
navItems={[{ name: "Home", id: "/" }]}
/>
<div className="min-h-screen p-8">
<div className="max-w-2xl mx-auto p-8 border rounded-xl">
<h1 className="text-3xl font-bold mb-4">My Profile</h1>
<p>Welcome to your account dashboard.</p>
</div>
</div>
</ThemeProvider>
);
}

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

@@ -10,15 +10,15 @@
--accent: #ffffff;
--background-accent: #ffffff; */
--background: #fcf6ec;
--card: #f3ede2;
--foreground: #2e2521;
--primary-cta: #2e2521;
--background: #fdf7f4;
--card: #ffffff;
--foreground: #4a3b3a;
--primary-cta: #f3a5b5;
--primary-cta-text: #fcf6ec;
--secondary-cta: #ffffff;
--secondary-cta: #fdf7f4;
--secondary-cta-text: #2e2521;
--accent: #b2a28b;
--background-accent: #b2a28b;
--accent: #f9d4d8;
--background-accent: #f7e4e0;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);