development/c086476f-967e-4a91-9377-2ad1f79f43c6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_4 into main #3

Merged
development merged 2 commits from version_4 into main 2026-02-10 04:40:37 +00:00
Conversation 0 Commits 2 Files Changed 2 +13 -42
2 changed files with 13 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/app/layout.tsx
View File

@@ -1,47 +1,18 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Plus_Jakarta_Sans } from "next/font/google";
import "./globals.css"; import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const plusJakartaSans = Plus_Jakarta_Sans({
variable: "--font-plus-jakarta-sans", subsets: ["latin"],
});
export const metadata: Metadata = { export const metadata: Metadata = {
title: "BuildWave | San Diego Construction Company", description: "Premium construction services in San Diego. Residential, commercial, and renovation projects with 15+ years of excellence and expertise.", keywords: "construction San Diego, home builders, commercial construction, renovation contractor, residential construction", metadataBase: new URL("https://buildwave-construction.com"), title: "BuildWave Construction", description: "Premium construction services for San Diego"};
alternates: {
canonical: "https://buildwave-construction.com"
},
openGraph: {
title: "BuildWave | Professional Construction Services", description: "San Diego's trusted construction company for residential and commercial projects.", siteName: "BuildWave", type: "website", images: [
{
url: "https://img.b2bpic.net/free-photo/standing-industrial-engineers-blue-vests-helmets_496169-947.jpg", alt: "BuildWave Construction Project"
}
]
},
twitter: {
card: "summary_large_image", title: "BuildWave Construction", description: "Premium construction services in San Diego", images: ["https://img.b2bpic.net/free-photo/standing-industrial-engineers-blue-vests-helmets_496169-947.jpg"]
},
robots: {
index: true,
follow: true
}
};
export default function RootLayout({ export default function RootLayout({
children, children,
}: Readonly<{ }: {
children: React.ReactNode; children: React.ReactNode;
}>) { }) {
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en">
<ServiceWrapper> <body>
<body {children}
className={plusJakartaSans.variable}
>
<Tag />
{children}
<script <script
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
@@ -1261,7 +1232,6 @@ export default function RootLayout({
}} }}
/> />
</body> </body>
</ServiceWrapper>
</html> </html>
); );
} }

7
src/app/page.tsx
View File

@@ -1,7 +1,7 @@
"use client" "use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider"; import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple'; import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
import HeroCarouselLogo from '@/components/sections/hero/heroCarouselLogo/HeroCarouselLogo'; import HeroCarouselLogo from '@/components/sections/hero/heroCarouselLogo/HeroCarouselLogo';
import TextSplitAbout from '@/components/sections/about/TextSplitAbout'; import TextSplitAbout from '@/components/sections/about/TextSplitAbout';
import FeatureCardNine from '@/components/sections/feature/FeatureCardNine'; import FeatureCardNine from '@/components/sections/feature/FeatureCardNine';
@@ -27,7 +27,7 @@ export default function LandingPage() {
headingFontWeight="bold" headingFontWeight="bold"
> >
<div id="nav" data-section="nav"> <div id="nav" data-section="nav">
<NavbarStyleApple <NavbarLayoutFloatingOverlay
brandName="BuildWave" brandName="BuildWave"
navItems={[ navItems={[
{ name: "Services", id: "services" }, { name: "Services", id: "services" },
@@ -35,6 +35,7 @@ export default function LandingPage() {
{ name: "About", id: "about" }, { name: "About", id: "about" },
{ name: "Contact", id: "contact" } { name: "Contact", id: "contact" }
]} ]}
button={{ text: "Get Started", href: "contact" }}
/> />
</div> </div>