bender/1096aebb-069b-41f2-8fbc-6b849bebf919
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #2

Merged
bender merged 5 commits from version_2 into main 2026-02-20 11:53:59 +00:00
Conversation 0 Commits 5 Files Changed 5 +22 -31
5 changed files with 22 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/blog/page.tsx
View File

@@ -100,4 +100,4 @@ export default function BlogPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

2
src/app/layout.tsx
View File

@@ -1406,4 +1406,4 @@ export default function RootLayout({
</ServiceWrapper>
</html>
);
}
}

30
src/app/page.tsx
View File

@@ -1,9 +1,9 @@
"use client"
"use client";
import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
import HeroSplitKpi from '@/components/sections/hero/HeroSplitKpi';
import ProductCardTwo from '@/components/sections/product/ProductCardTwo';
import MetricSplitMediaAbout from '@/components/sections/about/MetricSplitMediaAbout';
import InlineImageSplitTextAbout from '@/components/sections/about/InlineImageSplitTextAbout';
import TestimonialCardSix from '@/components/sections/testimonial/TestimonialCardSix';
import SocialProofOne from '@/components/sections/socialProof/SocialProofOne';
import FaqSplitMedia from '@/components/sections/faq/FaqSplitMedia';
@@ -29,7 +29,7 @@ export default function LandingPage() {
<div id="nav" data-section="nav">
<NavbarStyleCentered
navItems={[
{name: "Home", id: "home"},
{name: "Home", id: "/"},
{name: "Products", id: "products"},
{name: "About", id: "about"},
{name: "Reviews", id: "testimonials"},
@@ -98,21 +98,17 @@ export default function LandingPage() {
</div>
<div id="about" data-section="about">
<MetricSplitMediaAbout
title="Crafted with Passion, Worn with Pride"
description="At LikeYou, we believe every fragrance should tell a story. Our master perfumers blend the finest natural ingredients from around the world to create scents that resonate with your soul. With over a decade of expertise, we've perfected the art of fragrance creation."
tag="Our Story"
tagIcon={Award}
tagAnimation="slide-up"
metrics={[
{value: "12+", title: "Years of Expertise"},
{value: "98%", title: "Customer Satisfaction"}
<InlineImageSplitTextAbout
heading={[
{type: "text", content: "Crafted with Passion, "},
{type: "image", src: "https://img.b2bpic.net/free-photo/glass-vase-female-hand-home-goods-store_169016-52128.jpg?_wi=1", alt: "Perfumery"},
{type: "text", content: "Worn with Pride"}
]}
imageSrc="https://img.b2bpic.net/free-photo/glass-vase-female-hand-home-goods-store_169016-52128.jpg?_wi=1"
imageAlt="Perfumery craftsmanship and ingredients"
mediaAnimation="slide-up"
metricsAnimation="slide-up"
useInvertedBackground={false}
buttons={[
{text: "Learn Our Story", href: "#"}
]}
buttonAnimation="slide-up"
/>
</div>
@@ -269,4 +265,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}

11
src/app/shop/[id]/page.tsx
View File

@@ -88,8 +88,7 @@ export default function ProductPage({ params }: ProductPageProps) {
{ name: "Products", id: "products" },
{ name: "About", id: "about" },
{ name: "Reviews", id: "testimonials" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
brandName="LikeYou"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
@@ -165,8 +164,7 @@ export default function ProductPage({ params }: ProductPageProps) {
{ name: "Products", id: "products" },
{ name: "About", id: "about" },
{ name: "Reviews", id: "testimonials" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
brandName="LikeYou"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
@@ -249,8 +247,7 @@ export default function ProductPage({ params }: ProductPageProps) {
{ name: "Products", id: "products" },
{ name: "About", id: "about" },
{ name: "Reviews", id: "testimonials" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
brandName="LikeYou"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
@@ -335,4 +332,4 @@ export default function ProductPage({ params }: ProductPageProps) {
</ReactLenis>
</ThemeProvider>
);
}
}

8
src/app/shop/page.tsx
View File

@@ -41,8 +41,7 @@ export default function ShopPage() {
{ name: "Products", id: "products" },
{ name: "About", id: "about" },
{ name: "Reviews", id: "testimonials" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
brandName="LikeYou"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
@@ -117,8 +116,7 @@ export default function ShopPage() {
{ name: "Products", id: "products" },
{ name: "About", id: "about" },
{ name: "Reviews", id: "testimonials" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
brandName="LikeYou"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
@@ -178,4 +176,4 @@ export default function ShopPage() {
</ReactLenis>
</ThemeProvider>
);
}
}