Merge version_1 into main #2

Merged
bender merged 2 commits from version_1 into main 2026-04-07 13:19:54 +00:00
2 changed files with 104 additions and 170 deletions

View File

@@ -8,7 +8,7 @@ import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatin
import TeamCardOne from '@/components/sections/team/TeamCardOne';
import { Facebook, Instagram } from "lucide-react";
export default function LandingPage() {
export default function AboutPage() {
return (
<ThemeProvider
defaultButtonVariant="text-stagger"
@@ -23,96 +23,60 @@ export default function LandingPage() {
headingFontWeight="medium"
>
<ReactLenis root>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
navItems={[
{
name: "Home",
id: "/",
},
{
name: "Shop",
id: "/shop",
},
{
name: "About",
id: "/about",
},
{
name: "Find Us",
id: "/contact",
},
]}
brandName="HMJ's Organics"
/>
</div>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" },
{ name: "About", id: "/about" },
{ name: "Find Us", id: "/contact" },
]}
brandName="HMJ's Organics"
/>
</div>
<div id="about" data-section="about">
<MetricSplitMediaAbout
useInvertedBackground={false}
title="Our Impact"
description="Since we opened, we've focused on quality and sustainability."
imageSrc="http://img.b2bpic.net/free-photo/arrangement-vegetable-basket-row-local-street-market_23-2148209771.jpg?_wi=3"
imageAlt="HMJ's store interior"
mediaAnimation="fade-in"
metricsAnimation="slide-up"
metrics={[
{
value: "500+",
title: "Happy Customers",
},
{
value: "100%",
title: "Organic Certified",
},
]}
/>
</div>
<div id="about" data-section="about">
<MetricSplitMediaAbout
useInvertedBackground={false}
title="Our Impact"
description="Since we opened, we've focused on quality and sustainability."
imageSrc="http://img.b2bpic.net/free-photo/arrangement-vegetable-basket-row-local-street-market_23-2148209771.jpg"
imageAlt="HMJ's store interior"
mediaAnimation="slide-up"
metricsAnimation="slide-up"
metrics={[
{ value: "500+", title: "Happy Customers" },
{ value: "100%", title: "Organic Certified" },
]}
/>
</div>
<div id="team" data-section="team">
<TeamCardOne
animationType="slide-up"
textboxLayout="default"
gridVariant="uniform-all-items-equal"
useInvertedBackground={false}
title="Meet the Team"
description="The passionate individuals behind HMJ's Organics."
members={[
{
id: "m1",
name: "Jane Doe",
role: "Founder",
imageSrc: "http://img.b2bpic.net/free-photo/smiling-woman-running-holding-bottle-with-water_23-2148138021.jpg?_wi=2",
},
{
id: "m2",
name: "John Smith",
role: "Supply Manager",
imageSrc: "http://img.b2bpic.net/free-photo/stylish-handsome-caucasian-man-posing-looking-camera-isolated-dark-background_613910-15062.jpg?_wi=2",
},
]}
/>
</div>
<div id="team" data-section="team">
<TeamCardOne
animationType="slide-up"
textboxLayout="default"
gridVariant="uniform-all-items-equal"
useInvertedBackground={false}
title="Meet the Team"
description="The passionate individuals behind HMJ's Organics."
members={[
{ id: "m1", name: "Jane Doe", role: "Founder", imageSrc: "http://img.b2bpic.net/free-photo/smiling-woman-running-holding-bottle-with-water_23-2148138021.jpg" },
{ id: "m2", name: "John Smith", role: "Supply Manager", imageSrc: "http://img.b2bpic.net/free-photo/stylish-handsome-caucasian-man-posing-looking-camera-isolated-dark-background_613910-15062.jpg" },
]}
/>
</div>
<div id="footer" data-section="footer">
<FooterCard
logoText="HMJ's Organics"
copyrightText="© 2025 HMJ's Organics | 141 Street Lane, Leeds"
socialLinks={[
{
icon: Instagram,
href: "#",
ariaLabel: "Instagram",
},
{
icon: Facebook,
href: "#",
ariaLabel: "Facebook",
},
]}
/>
</div>
<div id="footer" data-section="footer">
<FooterCard
logoText="HMJ's Organics"
copyrightText="© 2025 HMJ's Organics | 141 Street Lane, Leeds"
socialLinks={[
{ icon: Instagram, href: "#", ariaLabel: "Instagram" },
{ icon: Facebook, href: "#", ariaLabel: "Facebook" },
]}
/>
</div>
</ReactLenis>
</ThemeProvider>
);
}
}

View File

@@ -8,7 +8,7 @@ import ProductCardFour from '@/components/sections/product/ProductCardFour';
import ProductCart from '@/components/ecommerce/cart/ProductCart';
import { Facebook, Instagram } from "lucide-react";
export default function LandingPage() {
export default function ShopPage() {
return (
<ThemeProvider
defaultButtonVariant="text-stagger"
@@ -23,90 +23,60 @@ export default function LandingPage() {
headingFontWeight="medium"
>
<ReactLenis root>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
navItems={[
{
name: "Home",
id: "/",
},
{
name: "Shop",
id: "/shop",
},
{
name: "About",
id: "/about",
},
{
name: "Find Us",
id: "/contact",
},
]}
brandName="HMJ's Organics"
/>
</div>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" },
{ name: "About", id: "/about" },
{ name: "Find Us", id: "/contact" },
]}
brandName="HMJ's Organics"
/>
</div>
<div id="product" data-section="product">
<ProductCardFour
animationType="slide-up"
textboxLayout="default"
gridVariant="uniform-all-items-equal"
useInvertedBackground={false}
title="All Our Products"
description="Browse our complete range of organic wholefoods and wellness essentials."
products={[
{
id: "p1",
name: "Supergreens",
price: 24.00",
variant: "Powder",
imageSrc: "http://img.b2bpic.net/free-photo/black-glossy-cosmetic-jar-with-cap_187299-46287.jpg?_wi=4",
},
{
id: "p2",
name: "Manuka Honey",
price: "£45.00",
variant: "Honey",
imageSrc: "http://img.b2bpic.net/free-photo/still-life-kombucha-bottle_23-2150621455.jpg?_wi=4",
},
]}
/>
</div>
<div id="product" data-section="product">
<ProductCardFour
animationType="slide-up"
textboxLayout="default"
gridVariant="uniform-all-items-equal"
useInvertedBackground={false}
title="All Our Products"
description="Browse our complete range of organic wholefoods and wellness essentials."
products={[
{
id: "p1", name: "Supergreens", price: "£24.00", variant: "Powder", imageSrc: "http://img.b2bpic.net/free-photo/black-glossy-cosmetic-jar-with-cap_187299-46287.jpg"},
{
id: "p2", name: "Manuka Honey", price: "£45.00", variant: "Honey", imageSrc: "http://img.b2bpic.net/free-photo/still-life-kombucha-bottle_23-2150621455.jpg"},
{
id: "p3", name: "Matcha Tea", price: "£28.00", variant: "Tea", imageSrc: "http://img.b2bpic.net/free-photo/front-view-tea-brewer-with-dried-flowers_23-2148567599.jpg"}
]}
/>
</div>
<div id="ecommerce" data-section="ecommerce">
<ProductCart
isOpen={false}
onClose={() => {}}
total="£0.00"
buttons={[
{
text: "Continue Shopping",
href: "/shop",
},
]}
/>
</div>
<div id="ecommerce" data-section="ecommerce">
<ProductCart
isOpen={false}
onClose={() => {}}
items={[]}
total="£0.00"
buttons={[
{ text: "Continue Shopping", href: "/shop" },
]}
/>
</div>
<div id="footer" data-section="footer">
<FooterCard
logoText="HMJ's Organics"
copyrightText="© 2025 HMJ's Organics | 141 Street Lane, Leeds"
socialLinks={[
{
icon: Instagram,
href: "#",
ariaLabel: "Instagram",
},
{
icon: Facebook,
href: "#",
ariaLabel: "Facebook",
},
]}
/>
</div>
<div id="footer" data-section="footer">
<FooterCard
logoText="HMJ's Organics"
copyrightText="© 2025 HMJ's Organics | 141 Street Lane, Leeds"
socialLinks={[
{ icon: Instagram, href: "#", ariaLabel: "Instagram" },
{ icon: Facebook, href: "#", ariaLabel: "Facebook" },
]}
/>
</div>
</ReactLenis>
</ThemeProvider>
);
}
}