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 #4

Merged
bender merged 4 commits from version_1 into main 2026-02-21 16:55:07 +00:00
Conversation 0 Commits 4 Files Changed 4 +19 -18
4 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,17 +24,19 @@ export default function BlogPage() {
headingFontWeight="light"
>
<ReactLenis root>
<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" },
]}
brandName="Lakeside Construction"
/>
<div id="nav" data-section="nav">
<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" },
]}
brandName="Lakeside Construction"
/>
</div>
<main>
{isLoading ? (
<div className="w-content-width mx-auto py-20 text-center">

1
src/app/page.tsx
View File

@@ -136,7 +136,6 @@ export default function LandingPage() {
description="A curated showcase of our most distinguished custom builds and luxury renovations."
tag="Our Work"
tagIcon={Image}
gridVariant="standard"
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={false}

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

@@ -4,7 +4,7 @@ import { Suspense, use, useCallback } from "react";
import { useRouter } from "next/navigation";
import ReactLenis from "lenis/react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleApple from "@/components/navbar/NavbarStyleApple/NavbarStyleApple";
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
import ProductDetailCard from "@/components/ecommerce/productDetail/ProductDetailCard";
import ProductCart from "@/components/ecommerce/cart/ProductCart";
@@ -89,7 +89,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="light"
>
<ReactLenis root>
<div id="navbar" data-section="navbar" className="relative">
<div id="nav" data-section="nav" className="relative">
<NavbarStyleApple
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
brandName="Lakeside Construction"
@@ -123,7 +123,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="light"
>
<ReactLenis root>
<div id="navbar" data-section="navbar" className="relative">
<div id="nav" data-section="nav" className="relative">
<NavbarStyleApple
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
brandName="Lakeside Construction"
@@ -164,7 +164,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="light"
>
<ReactLenis root>
<div id="navbar" data-section="navbar" className="relative">
<div id="nav" data-section="nav" className="relative">
<NavbarStyleApple
brandName="Lakeside Construction"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}

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

@@ -56,7 +56,7 @@ function ShopPageContent() {
headingFontWeight="light"
>
<ReactLenis root>
<div id="navbar" data-section="navbar" className="relative">
<div id="nav" data-section="nav" className="relative">
<NavbarStyleApple
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
brandName="Lakeside Construction"
@@ -104,7 +104,7 @@ function ShopPageContent() {
headingFontWeight="light"
>
<ReactLenis root>
<div id="navbar" data-section="navbar" className="relative">
<div id="nav" data-section="nav" className="relative">
<NavbarStyleApple
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
brandName="Lakeside Construction"