bender/2cfe6d53-e0b4-4e73-93f7-34835111f5c3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main

Browse Source 
Merge version_1 into main
This commit was merged in pull request #2.
This commit is contained in:
bender
2026-02-21 16:49:39 +00:00
parent ab0e6ebef5 4e4ca12734
commit fa8aa8e336
4 changed files with 109 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,6 +5,7 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import { useBlogPosts } from "@/hooks/useBlogPosts";
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import BlogCardTwo from '@/components/sections/blog/BlogCardTwo';
import FooterLogoEmphasis from "@/components/sections/footer/FooterLogoEmphasis";
export default function BlogPage() {
const { posts, isLoading } = useBlogPosts();
@@ -26,30 +27,41 @@ export default function BlogPage() {
<NavbarStyleApple
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "about" },
{ name: "Services", id: "services" },
{ name: "Projects", id: "projects" },
{ name: "Process", id: "process" },
{ name: "Contact", id: "contact" },
{ name: "About", id: "/#about" },
{ name: "Services", id: "/#services" },
{ name: "Projects", id: "/#projects" },
{ name: "Process", id: "/#process" },
{ name: "Contact", id: "/#contact" },
]}
brandName="Lakeside Construction"
/>
{isLoading ? (
<div className="w-content-width mx-auto py-20 text-center">
<p className="text-foreground">Loading posts...</p>
</div>
) : (
<BlogCardTwo
blogs={posts}
title="Latest Articles"
description="Insights and updates from our team"
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={false}
carouselMode="buttons"
<main>
{isLoading ? (
<div className="w-content-width mx-auto py-20 text-center">
<p className="text-foreground">Loading posts...</p>
</div>
) : (
<BlogCardTwo
blogs={posts}
title="Latest Articles"
description="Insights and updates from our team"
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={false}
carouselMode="buttons"
/>
)}
</main>
<div id="footer" data-section="footer">
<FooterLogoEmphasis
columns={[
{ items: [{ label: "Home", href: "/" }, { label: "About", href: "/#about" }, { label: "Services", href: "/#services" }, { label: "Projects", href: "/#projects" }] },
{ items: [{ label: "Process", href: "/#process" }, { label: "Testimonials", href: "/#testimonials" }, { label: "Contact", href: "/#contact" }, { label: "Privacy Policy", href: "/privacy" }] },
{ items: [{ label: "Careers", href: "/careers" }, { label: "Sitemap", href: "/sitemap" }] },
]}
logoText="Lakeside Construction Inc."
/>
)}
</div>
</ReactLenis>
</ThemeProvider>
);

46
src/app/page.tsx
View File

@@ -59,12 +59,12 @@ export default function LandingPage() {
title="Built to Endure. Designed to Impress."
description="Luxury residential construction and renovations crafted with precision and integrity."
carouselItems={[
{ id: "1", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=h7mpxz&_wi=1", imageAlt: "Stunning lakefront luxury home at sunset" },
{ id: "2", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=h7mpxz&_wi=2", imageAlt: "Stunning lakefront luxury home at sunset" },
{ id: "3", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=h7mpxz&_wi=3", imageAlt: "Stunning lakefront luxury home at sunset" },
{ id: "4", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=h7mpxz&_wi=4", imageAlt: "Stunning lakefront luxury home at sunset" },
{ id: "5", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=h7mpxz&_wi=5", imageAlt: "Stunning lakefront luxury home at sunset" },
{ id: "6", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=h7mpxz&_wi=6", imageAlt: "Stunning lakefront luxury home at sunset" },
{ id: "1", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=h7mpxz", imageAlt: "Stunning lakefront luxury home at sunset" },
{ id: "2", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=h7mpxz", imageAlt: "Stunning lakefront luxury home at sunset" },
{ id: "3", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=h7mpxz", imageAlt: "Stunning lakefront luxury home at sunset" },
{ id: "4", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=h7mpxz", imageAlt: "Stunning lakefront luxury home at sunset" },
{ id: "5", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=h7mpxz", imageAlt: "Stunning lakefront luxury home at sunset" },
{ id: "6", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=h7mpxz", imageAlt: "Stunning lakefront luxury home at sunset" },
]}
buttons={[
{ text: "Request a Consultation", href: "#contact" },
@@ -76,7 +76,6 @@ export default function LandingPage() {
autoPlay={true}
autoPlayInterval={5000}
ariaLabel="Hero section for Lakeside Construction Inc."
useInvertedBackground={false}
/>
</div>
@@ -85,12 +84,7 @@ export default function LandingPage() {
title="Trusted with Your Vision"
description="Our unwavering commitment to excellence is backed by decades of experience and client satisfaction."
logos={[
{ src: "https://img.b2bpic.net/free-vector/set-labour-day-labels-with-yellow-frames_23-2147617898.jpg", alt: "Licensed" },
{ src: "https://img.b2bpic.net/free-vector/flat-design-patented-stamp-collection_23-2149752886.jpg", alt: "Insured" },
{ src: "https://img.b2bpic.net/free-vector/set-labour-day-labels-with-yellow-frames_23-2147617898.jpg", alt: "20+ Years Experience" },
{ src: "https://img.b2bpic.net/free-vector/iron-sheet-first-place-with-red-ribbon_23-2147486017.jpg", alt: "5-Star Rated" },
{ src: "https://img.b2bpic.net/free-vector/luxury-sales-stickers_23-2147567188.jpg", alt: "Premium Materials" },
]}
"https://img.b2bpic.net/free-vector/set-labour-day-labels-with-yellow-frames_23-2147617898.jpg", "https://img.b2bpic.net/free-vector/flat-design-patented-stamp-collection_23-2149752886.jpg", "https://img.b2bpic.net/free-vector/set-labour-day-labels-with-yellow-frames_23-2147617898.jpg", "https://img.b2bpic.net/free-vector/iron-sheet-first-place-with-red-ribbon_23-2147486017.jpg", "https://img.b2bpic.net/free-vector/luxury-sales-stickers_23-2147567188.jpg"]}
tag="Our Commitment"
tagIcon={BadgeCheck}
/>
@@ -104,7 +98,6 @@ export default function LandingPage() {
{ type: "text", content: "Building Futures." },
]}
buttons={[{ text: "Learn More About Us", href: "#about" }]}
description="At Lakeside Construction Inc., we are more than builders; we are craftsmen dedicated to transforming visions into enduring realities. With a meticulous eye for detail and a passion for architectural excellence, we approach every custom home build and luxury renovation with unparalleled precision and integrity. Our client-focused philosophy ensures clear communication, reliable execution, and a seamless process from conception to final walkthrough. Trust us to build not just structures, but legacies that stand the test of time."
/>
</div>
@@ -121,6 +114,9 @@ export default function LandingPage() {
description="Discover our comprehensive range of premium construction and renovation services."
tag="Services"
tagIcon={Hammer}
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={false}
/>
</div>
@@ -128,14 +124,18 @@ export default function LandingPage() {
<ProductCardFour
products={[
{ id: "1", name: "The Lakeview Estate", price: "Custom Build", variant: "Lakefront Modern", imageSrc: "https://img.b2bpic.net/free-photo/luxurious-villa-with-modern-architectural-design_23-2151694118.jpg", imageAlt: "The Lakeview Estate - Lakefront Modern home" },
{ id: "2", name: "Hillside Renovation", price: "Luxury Renovation", variant: "Contemporary Interior", imageSrc: "https://img.b2bpic.net/free-photo/family-is-resting-windowsill-bed_651396-2780.jpg?_wi=1", imageAlt: "Hillside Renovation - Contemporary Interior design" },
{ id: "2", name: "Hillside Renovation", price: "Luxury Renovation", variant: "Contemporary Interior", imageSrc: "https://img.b2bpic.net/free-photo/family-is-resting-windowsill-bed_651396-2780.jpg", imageAlt: "Hillside Renovation - Contemporary Interior design" },
{ id: "3", name: "Water's Edge Oasis", price: "Outdoor Living", variant: "Bespoke Lakeside Patio", imageSrc: "https://img.b2bpic.net/free-photo/outdoor-deck_1203-3200.jpg", imageAlt: "Water's Edge Oasis - Bespoke Lakeside Patio" },
{ id: "4", name: "The Summit Residence", price: "Custom Build", variant: "Mountain Modern", imageSrc: "https://img.b2bpic.net/free-photo/luxury-architecture-exterior-design_23-2151920917.jpg?_wi=1", imageAlt: "The Summit Residence - Mountain Modern architecture" },
{ id: "4", name: "The Summit Residence", price: "Custom Build", variant: "Mountain Modern", imageSrc: "https://img.b2bpic.net/free-photo/luxury-architecture-exterior-design_23-2151920917.jpg", imageAlt: "The Summit Residence - Mountain Modern architecture" },
]}
title="Featured Projects"
description="A curated showcase of our most distinguished custom builds and luxury renovations."
tag="Our Work"
tagIcon={Image}
gridVariant="default"
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={false}
/>
</div>
@@ -151,21 +151,26 @@ export default function LandingPage() {
description="Experience a transparent and collaborative journey from conception to completion."
tag="How We Build"
tagIcon={ClipboardCheck}
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={false}
/>
</div>
<div id="testimonials" data-section="testimonials">
<TestimonialCardFive
testimonials={[
{ id: "1", name: "Mr. & Mrs. Anderson, Lakefront Homeowners", date: "Date: October 2023", title: "Unparalleled Quality & Professionalism", quote: "Lakeside Construction Inc. transformed our lakefront property into an absolute masterpiece. Their attention to detail, transparent communication, and commitment to quality were truly unparalleled. We couldn't be happier with our custom home.", tag: "Custom Home Build", avatarSrc: "https://img.b2bpic.net/free-photo/smiling-businessman-standing-airport-terminal_107420-85070.jpg", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=h7mpxz&_wi=7", imageAlt: "Luxury lakefront home" },
{ id: "2", name: "Dr. Eleanor Vance, Executive", date: "Date: August 2024", title: "A Renovation Beyond Expectation", quote: "We entrusted Lakeside Construction Inc. with a significant renovation of our historic property, and they exceeded every expectation. The team's craftsmanship and dedication to preserving the home's character while adding modern luxury was remarkable. Highly recommend.", tag: "Luxury Renovation", avatarSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=pwxwul", imageSrc: "https://img.b2bpic.net/free-photo/family-is-resting-windowsill-bed_651396-2780.jpg?_wi=2", imageAlt: "Renovated luxury interior" },
{ id: "3", name: "Mr. Robert Sterling, Entrepreneur", date: "Date: July 2023", title: "Integrity and Craftsmanship Personified", quote: "Working with Lakeside Construction Inc. was a pleasure. They delivered our addition on time and within budget, with an incredible level of integrity and superior craftsmanship. It seamlessly blends with our existing home, enhancing both beauty and value.", tag: "Home Addition", avatarSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=9t4ty1", imageSrc: "https://img.b2bpic.net/free-photo/luxury-architecture-exterior-design_23-2151920917.jpg?_wi=2", imageAlt: "Modern home addition" },
{ id: "1", name: "Mr. & Mrs. Anderson, Lakefront Homeowners", date: "Date: October 2023", title: "Unparalleled Quality & Professionalism", quote: "Lakeside Construction Inc. transformed our lakefront property into an absolute masterpiece. Their attention to detail, transparent communication, and commitment to quality were truly unparalleled. We couldn't be happier with our custom home.", tag: "Custom Home Build", avatarSrc: "https://img.b2bpic.net/free-photo/smiling-businessman-standing-airport-terminal_107420-85070.jpg", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=h7mpxz", imageAlt: "Luxury lakefront home" },
{ id: "2", name: "Dr. Eleanor Vance, Executive", date: "Date: August 2024", title: "A Renovation Beyond Expectation", quote: "We entrusted Lakeside Construction Inc. with a significant renovation of our historic property, and they exceeded every expectation. The team's craftsmanship and dedication to preserving the home's character while adding modern luxury was remarkable. Highly recommend.", tag: "Luxury Renovation", avatarSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=pwxwul", imageSrc: "https://img.b2bpic.net/free-photo/family-is-resting-windowsill-bed_651396-2780.jpg", imageAlt: "Renovated luxury interior" },
{ id: "3", name: "Mr. Robert Sterling, Entrepreneur", date: "Date: July 2023", title: "Integrity and Craftsmanship Personified", quote: "Working with Lakeside Construction Inc. was a pleasure. They delivered our addition on time and within budget, with an incredible level of integrity and superior craftsmanship. It seamlessly blends with our existing home, enhancing both beauty and value.", tag: "Home Addition", avatarSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/no-image.jpg?id=9t4ty1", imageSrc: "https://img.b2bpic.net/free-photo/luxury-architecture-exterior-design_23-2151920917.jpg", imageAlt: "Modern home addition" },
{ id: "4", name: "Ms. Olivia Chen, Investor", date: "Date: May 2024", title: "Truly a Partner in Building Dreams", quote: "Lakeside Construction Inc. didn't just build a house; they built our dream home. Their team was professional, responsive, and incredibly skilled. From the initial design to the final touches, they were true partners, ensuring our vision came to life flawlessly.", tag: "Custom Home Build", avatarSrc: "https://img.b2bpic.net/free-photo/smiling-businessman-standing-airport-terminal_107420-85070.jpg", imageAlt: "Custom built luxury home" },
]}
title="Hear From Our Valued Clients"
description="Read what affluent homeowners say about their experience with Lakeside Construction Inc."
tag="Testimonials"
tagIcon={Star}
textboxLayout="default"
useInvertedBackground={false}
/>
</div>
@@ -177,6 +182,7 @@ export default function LandingPage() {
buttons={[{ text: "Request a Consultation", href: "#contact" }]}
background={{ variant: "downward-rays-animated-grid" }}
tagIcon={Diamond}
useInvertedBackground={false}
/>
</div>
@@ -195,6 +201,7 @@ export default function LandingPage() {
tagIcon={Mail}
textBoxClassName="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6"
buttonClassName="col-span-full md:col-span-1 lg:col-span-1"
useInvertedBackground={false}
/>
</div>
@@ -206,7 +213,6 @@ export default function LandingPage() {
{ items: [{ label: "Careers", href: "/careers" }, { label: "Sitemap", href: "/sitemap" }] },
]}
logoText="Lakeside Construction Inc."
useInvertedBackground={true}
/>
</div>
</main>

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

@@ -5,7 +5,7 @@ import { useRouter } from "next/navigation";
import ReactLenis from "lenis/react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleApple from "@/components/navbar/NavbarStyleApple/NavbarStyleApple";
import Footer from '@/components/footer/Footer';
import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
import ProductDetailCard from "@/components/ecommerce/productDetail/ProductDetailCard";
import ProductCart from "@/components/ecommerce/cart/ProductCart";
import { useProductDetail } from "@/hooks/useProductDetail";
@@ -89,14 +89,16 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="light"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="navbar" data-section="navbar" className="relative">
<NavbarStyleApple
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
brandName="Lakeside Construction"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
>
<button onClick={() => setCartOpen(true)} className="text-lg">Cart</button>
</NavbarStyleApple>
/>
<div className="absolute top-0 right-0 h-full flex items-center pr-4">
<button onClick={() => setCartOpen(true)} className="text-lg">
Cart ({cartItems.length})
</button>
</div>
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
<p className="text-foreground">Loading product...</p>
@@ -121,14 +123,16 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="light"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="navbar" data-section="navbar" className="relative">
<NavbarStyleApple
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
brandName="Lakeside Construction"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
>
<button onClick={() => setCartOpen(true)} className="text-lg">Cart</button>
</NavbarStyleApple>
/>
<div className="absolute top-0 right-0 h-full flex items-center pr-4">
<button onClick={() => setCartOpen(true)} className="text-lg">
Cart ({cartItems.length})
</button>
</div>
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
<div className="text-center">
@@ -160,14 +164,16 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="light"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="navbar" data-section="navbar" className="relative">
<NavbarStyleApple
brandName="Lakeside Construction"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
>
<button onClick={() => setCartOpen(true)} className="text-lg">Cart</button>
</NavbarStyleApple>
/>
<div className="absolute top-0 right-0 h-full flex items-center pr-4">
<button onClick={() => setCartOpen(true)} className="text-lg">
Cart ({cartItems.length})
</button>
</div>
</div>
<div id="productDetailCard" data-section="productDetailCard">
<ProductDetailCard
@@ -206,7 +212,13 @@ function ProductPageContent({ params }: ProductPageProps) {
/>
</div>
<div id="footer" data-section="footer">
<Footer />
<FooterLogoEmphasis
columns={[
{ items: [{ label: "Home", href: "/" }, { label: "Shop", href: "/shop" }] },
{ items: [{ label: "Privacy Policy", href: "/privacy" }] },
]}
logoText="Lakeside Construction Inc."
/>
</div>
</ReactLenis>
</ThemeProvider>

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

@@ -4,7 +4,7 @@ import { Suspense, useCallback } from "react";
import ReactLenis from "lenis/react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import Footer from '@/components/footer/Footer';
import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
import ProductCatalog from "@/components/ecommerce/productCatalog/ProductCatalog";
import ProductCart from "@/components/ecommerce/cart/ProductCart";
import { useProductCatalog } from "@/hooks/useProductCatalog";
@@ -56,14 +56,16 @@ function ShopPageContent() {
headingFontWeight="light"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="navbar" data-section="navbar" className="relative">
<NavbarStyleApple
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
brandName="Lakeside Construction"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
>
<button onClick={() => setCartOpen(true)} className="text-lg">Cart</button>
</NavbarStyleApple>
/>
<div className="absolute top-0 right-0 h-full flex items-center pr-4">
<button onClick={() => setCartOpen(true)} className="text-lg">
Cart ({cartItems.length})
</button>
</div>
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
<p className="text-foreground">Loading products...</p>
@@ -102,14 +104,16 @@ function ShopPageContent() {
headingFontWeight="light"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="navbar" data-section="navbar" className="relative">
<NavbarStyleApple
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
brandName="Lakeside Construction"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
>
<button onClick={() => setCartOpen(true)} className="text-lg">Cart</button>
</NavbarStyleApple>
/>
<div className="absolute top-0 right-0 h-full flex items-center pr-4">
<button onClick={() => setCartOpen(true)} className="text-lg">
Cart ({cartItems.length})
</button>
</div>
</div>
<div id="product-catalog" data-section="product-catalog">
<ProductCatalog
@@ -138,7 +142,13 @@ function ShopPageContent() {
/>
</div>
<div id="footer" data-section="footer">
<Footer />
<FooterLogoEmphasis
columns={[
{ items: [{ label: "Home", href: "/" }, { label: "Shop", href: "/shop" }] },
{ items: [{ label: "Privacy Policy", href: "/privacy" }] },
]}
logoText="Lakeside Construction Inc."
/>
</div>
</ReactLenis>
</ThemeProvider>