Merge version_4 into main #6

Merged
bender merged 4 commits from version_4 into main 2026-04-20 12:09:07 +00:00
4 changed files with 65 additions and 70 deletions

View File

@@ -3,38 +3,41 @@
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react";
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
import TextAbout from '@/components/sections/about/TextAbout';
import TextSplitAbout from '@/components/sections/about/TextSplitAbout';
import FooterMedia from '@/components/sections/footer/FooterMedia';
export default function AboutPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<ReactLenis root>
<NavbarLayoutFloatingOverlay
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "/about" },
{ name: "Services", id: "/services" },
{ name: "Location", id: "/location" },
{ name: "Contact", id: "/#contact" },
{ name: "Contact", id: "/contact" },
]}
brandName="Local Business"
/>
<div className="pt-32 pb-20">
<TextAbout
title="About Our Neighborhood Shop"
tag="Our Journey"
className="py-20"
/>
/>
</div>
<FooterMedia
<div id="about" data-section="about" className="pt-32 pb-20">
<TextSplitAbout
title="About Our Neighborhood Shop"
description={["Our journey began with a simple passion for high-quality artisan goods and a desire to bring our community together."]}
useInvertedBackground={false}
/>
</div>
<div id="footer" data-section="footer">
<FooterMedia
logoText="Local Business"
imageSrc="http://img.b2bpic.net/free-photo/man-growing-cultivating-plants-indoors_23-2149854844.jpg"
columns={[
{ title: "Pages", items: [{ label: "Home", href: "/" }, { label: "About", href: "/about" }, { label: "Services", href: "/services" }, { label: "Location", href: "/location" }] },
{ title: "Contact", items: [{ label: "Call Us", href: "tel:5550123" }] },
]}
/>
/>
</div>
</ReactLenis>
</ThemeProvider>
);

View File

@@ -3,48 +3,34 @@
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react";
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
import ProductCardThree from '@/components/sections/product/ProductCardThree';
import FooterMedia from '@/components/sections/footer/FooterMedia';
export default function GalleryPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<ReactLenis root>
<NavbarLayoutFloatingOverlay
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "About", id: "/about" },
{ name: "Services", id: "/services" },
{ name: "Gallery", id: "/gallery" },
{ name: "Location", id: "/location" },
{ name: "Contact", id: "/#contact" },
{ name: "Contact", id: "/contact" },
]}
/>
</div>
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="http://img.b2bpic.net/free-photo/man-growing-cultivating-plants-indoors_23-2149854844.jpg"
logoText="Local Business"
columns={[
{ title: "Pages", items: [{ label: "Home", href: "/" }, { label: "Services", href: "/services" }, { label: "Gallery", href: "/gallery" }, { label: "Location", href: "/location" }] },
{ title: "Contact", items: [{ label: "Call Us", href: "tel:5550123" }] },
]}
brandName="Local Business"
/>
<div id="gallery" data-section="gallery" className="pt-32">
<ProductCardThree
title="Our Product Gallery"
description="Explore our carefully curated collection of unique home goods."
products={[
{ id: "p1", name: "Ceramic Vase", price: "$45", imageSrc: "http://img.b2bpic.net/free-photo/vases-shelves-room_23-2148753232.jpg" },
{ id: "p2", name: "Handmade Throw", price: "$85", imageSrc: "http://img.b2bpic.net/free-photo/cozy-interior-with-knitted-blanket-cushion-sofa_23-2148869151.jpg" },
{ id: "p3", name: "Artisan Candle", price: "$25", imageSrc: "http://img.b2bpic.net/free-photo/candles-home-decor_23-2148905742.jpg" }
]}
gridVariant="bento-grid"
animationType="slide-up"
textboxLayout="split"
useInvertedBackground={false}
/>
</div>
<FooterMedia
imageSrc="http://img.b2bpic.net/free-photo/man-growing-cultivating-plants-indoors_23-2149854844.jpg"
logoText="Local Business"
columns={[
{ title: "Pages", items: [{ label: "Home", href: "/" }, { label: "Services", href: "/services" }, { label: "Gallery", href: "/gallery" }, { label: "Location", href: "/location" }] },
{ title: "Contact", items: [{ label: "Call Us", href: "tel:5550123" }] },
]}
copyrightText="© 2025 Local Business | All Rights Reserved"
/>
</ReactLenis>
</ThemeProvider>
);

View File

@@ -7,31 +7,34 @@ import FooterMedia from '@/components/sections/footer/FooterMedia';
export default function LocationPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<ReactLenis root>
<NavbarLayoutFloatingOverlay
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "/about" },
{ name: "Services", id: "/services" },
{ name: "Location", id: "/location" },
{ name: "Contact", id: "/#contact" },
{ name: "Contact", id: "/contact" },
]}
brandName="Local Business"
/>
/>
</div>
<div className="pt-32 pb-20 px-8 min-h-[60vh]">
<h1 className="text-4xl font-bold mb-6">Visit Us</h1>
<p className="text-lg mb-4">We are located in the heart of the neighborhood at 123 Artisan Way.</p>
<p className="text-lg">Our doors are open Monday through Saturday for all your home good needs.</p>
</div>
<FooterMedia
<div id="footer" data-section="footer">
<FooterMedia
logoText="Local Business"
imageSrc="http://img.b2bpic.net/free-photo/man-growing-cultivating-plants-indoors_23-2149854844.jpg"
columns={[
{ title: "Pages", items: [{ label: "Home", href: "/" }, { label: "About", href: "/about" }, { label: "Services", href: "/services" }, { label: "Location", href: "/location" }] },
{ title: "Contact", items: [{ label: "Call Us", href: "tel:5550123" }] },
]}
/>
/>
</div>
</ReactLenis>
</ThemeProvider>
);

View File

@@ -3,46 +3,49 @@
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react";
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
import FeatureCardSeven from '@/components/sections/feature/FeatureCardSeven';
import FeatureCardMedia from '@/components/sections/feature/FeatureCardMedia';
import FooterMedia from '@/components/sections/footer/FooterMedia';
export default function ServicesPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<ReactLenis root>
<NavbarLayoutFloatingOverlay
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "About", id: "/about" },
{ name: "Services", id: "/services" },
{ name: "Gallery", id: "/gallery" },
{ name: "Location", id: "/location" },
{ name: "Contact", id: "/#contact" },
{ name: "Contact", id: "/contact" },
]}
brandName="Local Business"
/>
/>
</div>
<div id="services" data-section="services" className="pt-32">
<FeatureCardSeven
<FeatureCardMedia
title="Our Premium Services"
description="Discover the range of services we offer to help you and your home thrive."
animationType="slide-up"
features={[
{ title: "Artisan Consulting", description: "Personalized guidance for your home interior." },
{ title: "Custom Gifting", description: "Bespoke gift baskets for every occasion." },
{ title: "Local Repairs", description: "High-quality repairs for your household goods." }
{ id: "f1", title: "Artisan Consulting", description: "Personalized guidance for your home interior.", tag: "Expert" },
{ id: "f2", title: "Custom Gifting", description: "Bespoke gift baskets for every occasion.", tag: "Unique" },
{ id: "f3", title: "Local Repairs", description: "High-quality repairs for your household goods.", tag: "Quality" }
]}
textboxLayout="split"
useInvertedBackground={false}
/>
</div>
<FooterMedia
imageSrc="http://img.b2bpic.net/free-photo/man-growing-cultivating-plants-indoors_23-2149854844.jpg"
logoText="Local Business"
columns={[
{ title: "Pages", items: [{ label: "Home", href: "/" }, { label: "Services", href: "/services" }, { label: "Gallery", href: "/gallery" }, { label: "Location", href: "/location" }] },
{ title: "Contact", items: [{ label: "Call Us", href: "tel:5550123" }] },
]}
copyrightText="© 2025 Local Business | All Rights Reserved"
/>
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="http://img.b2bpic.net/free-photo/man-growing-cultivating-plants-indoors_23-2149854844.jpg"
logoText="Local Business"
columns={[
{ title: "Pages", items: [{ label: "Home", href: "/" }, { label: "Services", href: "/services" }, { label: "Gallery", href: "/gallery" }, { label: "Location", href: "/location" }] },
{ title: "Contact", items: [{ label: "Call Us", href: "tel:5550123" }] },
]}
/>
</div>
</ReactLenis>
</ThemeProvider>
);