Merge version_2 into main #2

Merged
bender merged 2 commits from version_2 into main 2026-04-05 12:20:46 +00:00
2 changed files with 38 additions and 12 deletions

View File

@@ -5,9 +5,21 @@ import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarS
export default function ProjectsPage() {
return (
<ThemeProvider>
<NavbarStyleCentered
navItems={[
<ThemeProvider
defaultButtonVariant="text-stagger"
defaultTextAnimation="entrance-slide"
borderRadius="rounded"
contentWidth="medium"
sizing="medium"
background="circleGradient"
cardStyle="glass-elevated"
primaryButtonStyle="gradient"
secondaryButtonStyle="glass"
headingFontWeight="normal"
>
<div id="nav" data-section="nav">
<NavbarStyleCentered
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Products", id: "/#products" },
@@ -15,9 +27,10 @@ export default function ProjectsPage() {
{ name: "Contact", id: "/#contact" },
{ name: "Services", id: "/services" },
{ name: "Projects", id: "/projects" }
]}
brandName="SM Dizel"
/>
]}
brandName="SM Dizel"
/>
</div>
<main className="pt-32 pb-20 px-6 max-w-7xl mx-auto">
<h1 className="text-5xl font-bold mb-8">Our Projects</h1>
<p className="text-xl">A portfolio of our completed industrial metalwork projects and case studies.</p>

View File

@@ -5,9 +5,21 @@ import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarS
export default function ServicesPage() {
return (
<ThemeProvider>
<NavbarStyleCentered
navItems={[
<ThemeProvider
defaultButtonVariant="text-stagger"
defaultTextAnimation="entrance-slide"
borderRadius="rounded"
contentWidth="medium"
sizing="medium"
background="circleGradient"
cardStyle="glass-elevated"
primaryButtonStyle="gradient"
secondaryButtonStyle="glass"
headingFontWeight="normal"
>
<div id="nav" data-section="nav">
<NavbarStyleCentered
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Products", id: "/#products" },
@@ -15,9 +27,10 @@ export default function ServicesPage() {
{ name: "Contact", id: "/#contact" },
{ name: "Services", id: "/services" },
{ name: "Projects", id: "/projects" }
]}
brandName="SM Dizel"
/>
]}
brandName="SM Dizel"
/>
</div>
<main className="pt-32 pb-20 px-6 max-w-7xl mx-auto">
<h1 className="text-5xl font-bold mb-8">Our Services</h1>
<p className="text-xl">Comprehensive industrial metal fabrication and machining services tailored to your needs.</p>