bender/482c72fe-ecc5-46fd-9856-13c286ea62c2
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge version_3 into main #5

Open
bender wants to merge 2 commits from version_3 into main
pull from: version_3
merge into: bender:main
Conversation 0 Commits 2 Files Changed 2 +52 -64
2 changed files with 52 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/app/layout.tsx
View File

@@ -1,54 +1,20 @@
import type { Metadata } from "next";
import { Halant } from "next/font/google";
import { Inter } from "next/font/google";
import { Nunito } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const halant = Halant({
variable: "--font-halant", subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
});
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
});
const nunito = Nunito({
variable: "--font-nunito", subsets: ["latin"],
});
const inter = Inter({ subsets: ["latin"] });
export const metadata: Metadata = {
title: "BeautyGlow - Premium Natural Skincare Products", description: "Discover premium beauty care products made with natural ingredients. Dermatologist-tested, cruelty-free skincare for every skin type. Shop now and get 20% off your first order.", keywords: "skincare, beauty care products, natural cosmetics, moisturizer, face serum, beauty care, dermatologist tested", openGraph: {
title: "BeautyGlow - Premium Natural Skincare", description: "Transform your skin with our carefully curated collection of premium beauty care products. Natural ingredients, dermatologist-tested, cruelty-free.", siteName: "BeautyGlow", type: "website", images: [
{
url: "http://img.b2bpic.net/free-photo/close-up-fair-skinned-young-women-s-hands-holding-jars-organic-body-creams-care-moisturizing-concept_197531-31493.jpg", alt: "BeautyGlow Premium Beauty Care Products"},
],
},
twitter: {
card: "summary_large_image", title: "BeautyGlow - Premium Natural Skincare", description: "Discover premium beauty care products with natural ingredients", images: ["http://img.b2bpic.net/free-photo/close-up-fair-skinned-young-women-s-hands-holding-jars-organic-body-creams-care-moisturizing-concept_197531-31493.jpg"],
},
robots: {
index: true,
follow: true,
},
};
title: "BeautyGlow - Premium Beauty Care Products", description: "Discover our carefully curated collection of skincare essentials designed to transform your beauty routine."};
export default function RootLayout({
children,
}: Readonly<{
}: {
children: React.ReactNode;
}>) {
}) {
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${halant.variable} ${inter.variable} ${nunito.variable} antialiased`}
>
<Tag />
{children}
<html lang="en">
<body className={inter.className}>{children}
<script
dangerouslySetInnerHTML={{
__html: `
@@ -1416,7 +1382,6 @@ export default function RootLayout({
}}
/>
</body>
</ServiceWrapper>
</html>
);
}

69
src/app/page.tsx
View File

@@ -36,7 +36,8 @@ export default function LandingPage() {
{ name: "Contact", id: "contact" },
]}
button={{
text: "Shop Now", href: "https://your-shopify-store.myshopify.com"}}
text: "Shop Now", href: "https://your-shopify-store.myshopify.com"
}}
/>
</div>
@@ -56,7 +57,8 @@ export default function LandingPage() {
tagAnimation="slide-up"
buttons={[
{
text: "Shop Collection", href: "https://your-shopify-store.myshopify.com"},
text: "Shop Now & Save 15%", href: "https://your-shopify-store.myshopify.com"
},
{ text: "Learn More", href: "#about" },
]}
buttonAnimation="slide-up"
@@ -76,7 +78,8 @@ export default function LandingPage() {
tagAnimation="slide-up"
buttons={[
{
text: "View All Products", href: "https://your-shopify-store.myshopify.com/collections"},
text: "View All Products", href: "https://your-shopify-store.myshopify.com/collections"
},
]}
buttonAnimation="slide-up"
textboxLayout="default"
@@ -124,21 +127,24 @@ export default function LandingPage() {
id: 1,
tag: "Step 1", title: "Cleanse & Prep", subtitle: "Start with purity", description: "Begin your routine with our gentle cleansing formula that removes impurities without stripping natural oils. Perfect for all skin types, this step prepares your skin for maximum absorption of active ingredients.", imageSrc: "http://img.b2bpic.net/free-photo/close-up-man-hand-holding-face-cream-container_23-2148213310.jpg?_wi=2", imageAlt: "Cleansing step", buttons: [
{
text: "Shop Cleansers", href: "https://your-shopify-store.myshopify.com"},
text: "Shop Cleansers", href: "https://your-shopify-store.myshopify.com"
},
],
},
{
id: 2,
tag: "Step 2", title: "Treat & Nourish", subtitle: "Transform your skin", description: "Apply targeted serums and treatments to address specific concerns. Our concentrated formulas work synergistically to boost hydration, brighten, and revitalize your complexion with visible results.", imageSrc: "http://img.b2bpic.net/free-photo/natural-product-plant-arrangement_23-2148899414.jpg?_wi=2", imageAlt: "Treatment step", buttons: [
{
text: "Explore Serums", href: "https://your-shopify-store.myshopify.com"},
text: "Explore Serums", href: "https://your-shopify-store.myshopify.com"
},
],
},
{
id: 3,
tag: "Step 3", title: "Moisturize & Protect", subtitle: "Lock in the magic", description: "Seal in all the goodness with our luxurious moisturizers and protective treatments. This final step ensures your skin stays hydrated, radiant, and protected throughout the day or night.", imageSrc: "http://img.b2bpic.net/free-photo/cosmetologist-applying-mask-face-client-beauty-salon_1303-16765.jpg?_wi=2", imageAlt: "Moisturizing step", buttons: [
{
text: "Shop Moisturizers", href: "https://your-shopify-store.myshopify.com"},
text: "Shop Moisturizers", href: "https://your-shopify-store.myshopify.com"
},
],
},
]}
@@ -156,16 +162,20 @@ export default function LandingPage() {
testimonials={[
{
id: "1", name: "Sarah Mitchell", role: "Beauty Enthusiast", company: "Skincare Lover", rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/casual-smile-street-style-background-spring_1139-777.jpg", imageAlt: "Sarah Mitchell"},
imageSrc: "http://img.b2bpic.net/free-photo/casual-smile-street-style-background-spring_1139-777.jpg", imageAlt: "Sarah Mitchell"
},
{
id: "2", name: "Emily Rodriguez", role: "Marketing Director", company: "Wellness Co", rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/young-woman-smiling-while-posing_176474-95622.jpg", imageAlt: "Emily Rodriguez"},
imageSrc: "http://img.b2bpic.net/free-photo/young-woman-smiling-while-posing_176474-95622.jpg", imageAlt: "Emily Rodriguez"
},
{
id: "3", name: "Jessica Wang", role: "Entrepreneur", company: "Tech Startup", rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/close-up-good-looking-smiling-friendly-female-trainee-ready-tackle-assignments-smiling-broadly-feeling-lucky-day-work-self-assured-encouraged-achieve-success-goal-white-wall_176420-35567.jpg?_wi=1", imageAlt: "Jessica Wang"},
imageSrc: "http://img.b2bpic.net/free-photo/close-up-good-looking-smiling-friendly-female-trainee-ready-tackle-assignments-smiling-broadly-feeling-lucky-day-work-self-assured-encouraged-achieve-success-goal-white-wall_176420-35567.jpg?_wi=1", imageAlt: "Jessica Wang"
},
{
id: "4", name: "Amanda Brooks", role: "Yoga Instructor", company: "Wellness Studio", rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/close-up-good-looking-smiling-friendly-female-trainee-ready-tackle-assignments-smiling-broadly-feeling-lucky-day-work-self-assured-encouraged-achieve-success-goal-white-wall_176420-35567.jpg?_wi=2", imageAlt: "Amanda Brooks"},
imageSrc: "http://img.b2bpic.net/free-photo/close-up-good-looking-smiling-friendly-female-trainee-ready-tackle-assignments-smiling-broadly-feeling-lucky-day-work-self-assured-encouraged-achieve-success-goal-white-wall_176420-35567.jpg?_wi=2", imageAlt: "Amanda Brooks"
},
]}
kpiItems={[
{ value: "4.9/5", label: "Average Rating" },
@@ -186,17 +196,23 @@ export default function LandingPage() {
useInvertedBackground={false}
faqs={[
{
id: "1", title: "Are your products suitable for sensitive skin?", content: "Yes! All our products are formulated to be gentle on sensitive skin. We use hypoallergenic ingredients and conduct dermatological testing on every formula. However, we recommend doing a patch test first if you have extremely reactive skin."},
id: "1", title: "Are your products suitable for sensitive skin?", content: "Yes! All our products are formulated to be gentle on sensitive skin. We use hypoallergenic ingredients and conduct dermatological testing on every formula. However, we recommend doing a patch test first if you have extremely reactive skin."
},
{
id: "2", title: "What is your return policy?", content: "We offer a 60-day money-back guarantee on all products. If you're not completely satisfied, simply contact our customer service team for a full refund—no questions asked."},
id: "2", title: "What is your return policy?", content: "We offer a 60-day money-back guarantee on all products. If you're not completely satisfied, simply contact our customer service team for a full refund—no questions asked."
},
{
id: "3", title: "How long does shipping take?", content: "Orders typically ship within 1-2 business days. Standard shipping takes 5-7 business days, while express shipping takes 2-3 business days. All orders include tracking information."},
id: "3", title: "How long does shipping take?", content: "Orders typically ship within 1-2 business days. Standard shipping takes 5-7 business days, while express shipping takes 2-3 business days. All orders include tracking information."
},
{
id: "4", title: "Can I use multiple serums together?", content: "Absolutely! Our serums are designed to work synergistically. Apply them in order of consistency (thinnest to thickest) and allow 1-2 minutes between applications for best absorption."},
id: "4", title: "Can I use multiple serums together?", content: "Absolutely! Our serums are designed to work synergistically. Apply them in order of consistency (thinnest to thickest) and allow 1-2 minutes between applications for best absorption."
},
{
id: "5", title: "Are your products vegan?", content: "Most of our products are vegan, but not all. Each product page clearly indicates whether it's vegan-friendly. We're committed to expanding our vegan line and regularly introducing new plant-based formulations."},
id: "5", title: "Are your products vegan?", content: "Most of our products are vegan, but not all. Each product page clearly indicates whether it's vegan-friendly. We're committed to expanding our vegan line and regularly introducing new plant-based formulations."
},
{
id: "6", title: "How do I know which products are right for me?", content: "We offer a free skincare consultation with our beauty experts. Simply fill out our skin assessment form on the website, and we'll provide personalized product recommendations based on your skin type and concerns."},
id: "6", title: "How do I know which products are right for me?", content: "We offer a free skincare consultation with our beauty experts. Simply fill out our skin assessment form on the website, and we'll provide personalized product recommendations based on your skin type and concerns."
},
]}
faqsAnimation="slide-up"
animationType="smooth"
@@ -209,13 +225,17 @@ export default function LandingPage() {
{
title: "Shop", items: [
{
label: "All Products", href: "https://your-shopify-store.myshopify.com/collections"},
label: "All Products", href: "https://your-shopify-store.myshopify.com/collections"
},
{
label: "Best Sellers", href: "https://your-shopify-store.myshopify.com/collections/bestsellers"},
label: "Best Sellers", href: "https://your-shopify-store.myshopify.com/collections/bestsellers"
},
{
label: "New Arrivals", href: "https://your-shopify-store.myshopify.com/collections/new"},
label: "New Arrivals", href: "https://your-shopify-store.myshopify.com/collections/new"
},
{
label: "Bundle Deals", href: "https://your-shopify-store.myshopify.com/collections/bundles"},
label: "Bundle Deals", href: "https://your-shopify-store.myshopify.com/collections/bundles"
},
],
},
{
@@ -229,11 +249,14 @@ export default function LandingPage() {
{
title: "Support", items: [
{
label: "Help Center", href: "https://your-shopify-store.myshopify.com/pages/help"},
label: "Help Center", href: "https://your-shopify-store.myshopify.com/pages/help"
},
{
label: "Shipping Info", href: "https://your-shopify-store.myshopify.com/pages/shipping"},
label: "Shipping Info", href: "https://your-shopify-store.myshopify.com/pages/shipping"
},
{
label: "Returns", href: "https://your-shopify-store.myshopify.com/pages/returns"},
label: "Returns", href: "https://your-shopify-store.myshopify.com/pages/returns"
},
{ label: "Privacy Policy", href: "#" },
],
},