Merge version_13 into main #15

Merged
bender merged 5 commits from version_13 into main 2026-03-27 22:33:54 +00:00
5 changed files with 36 additions and 38 deletions

View File

@@ -3,7 +3,7 @@
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react";
import FeatureCardTwentyFive from '@/components/sections/feature/FeatureCardTwentyFive';
import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
import TeamCardSix from '@/components/sections/team/TeamCardSix';
import { MapPin, Users } from "lucide-react";
@@ -87,23 +87,16 @@ export default function LandingPage() {
</div>
<div id="footer" data-section="footer">
<FooterLogoEmphasis
<FooterBaseCard
logoText="Nicks 2 Interlock"
copyrightText="© 2025 Nicks 2 Interlock. All rights reserved."
columns={[
{
items: [
{
label: "Home", href: "/"},
{
label: "Services", href: "/services"},
{
label: "Contact", href: "/contact"},
],
},
{ title: "Navigation", items: [{ label: "Home", href: "/" }, { label: "Services", href: "/services" }, { label: "Contact", href: "/contact" }] },
{ title: "Areas Served", items: [{ label: "Longmont", href: "#" }, { label: "Boulder", href: "#" }, { label: "Denver Metro", href: "#" }] }
]}
logoText="Nicks 2 Interlock Services"
/>
</div>
</ReactLenis>
</ThemeProvider>
);
}
}

View File

@@ -3,7 +3,7 @@
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react";
import ContactCTA from '@/components/sections/contact/ContactCTA';
import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
import PricingCardEight from '@/components/sections/pricing/PricingCardEight';
@@ -84,23 +84,16 @@ export default function LandingPage() {
</div>
<div id="footer" data-section="footer">
<FooterLogoEmphasis
<FooterBaseCard
logoText="Nicks 2 Interlock"
copyrightText="© 2025 Nicks 2 Interlock. All rights reserved."
columns={[
{
items: [
{
label: "Home", href: "/"},
{
label: "Services", href: "/services"},
{
label: "Contact", href: "/contact"},
],
},
{ title: "Navigation", items: [{ label: "Home", href: "/" }, { label: "Services", href: "/services" }, { label: "Contact", href: "/contact" }] },
{ title: "Areas Served", items: [{ label: "Longmont", href: "#" }, { label: "Boulder", href: "#" }, { label: "Denver Metro", href: "#" }] }
]}
logoText="Nicks 2 Interlock Services"
/>
</div>
</ReactLenis>
</ThemeProvider>
);
}
}

View File

@@ -4,7 +4,7 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react";
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
import TimelineProcessFlow from '@/components/cardStack/layouts/timelines/TimelineProcessFlow';
import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
import { Zap, FileCheck, CheckCircle2, Wrench } from "lucide-react";
export default function HowItWorksPage() {
@@ -51,12 +51,16 @@ export default function HowItWorksPage() {
</div>
<div id="footer" data-section="footer">
<FooterLogoEmphasis
columns={[{ items: [{ label: "Home", href: "/" }, { label: "Services", href: "/services" }, { label: "How It Works", href: "/how-it-works" }, { label: "Contact", href: "/contact" }] }]}
<FooterBaseCard
logoText="Nicks 2 Interlock"
copyrightText="© 2025 Nicks 2 Interlock. All rights reserved."
columns={[
{ title: "Navigation", items: [{ label: "Home", href: "/" }, { label: "Services", href: "/services" }, { label: "How It Works", href: "/how-it-works" }, { label: "Contact", href: "/contact" }] },
{ title: "Areas Served", items: [{ label: "Longmont", href: "#" }, { label: "Boulder", href: "#" }, { label: "Denver Metro", href: "#" }] }
]}
/>
</div>
</ReactLenis>
</ThemeProvider>
);
}
}

View File

@@ -5,7 +5,7 @@ import ReactLenis from "lenis/react";
import AboutMetric from '@/components/sections/about/AboutMetric';
import FaqSplitText from '@/components/sections/faq/FaqSplitText';
import FeatureCardTwentyFive from '@/components/sections/feature/FeatureCardTwentyFive';
import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
import HeroSplitDoubleCarousel from '@/components/sections/hero/HeroSplitDoubleCarousel';
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
import SocialProofOne from '@/components/sections/socialProof/SocialProofOne';
@@ -116,9 +116,13 @@ export default function LandingPage() {
</div>
<div id="footer" data-section="footer">
<FooterLogoEmphasis
columns={[{ items: [{ label: "Home", href: "/" }, { label: "Services", href: "/services" }, { label: "How It Works", href: "/how-it-works" }, { label: "Contact", href: "/contact" }] }]}
<FooterBaseCard
logoText="Nicks 2 Interlock"
copyrightText="© 2025 Nicks 2 Interlock. All rights reserved."
columns={[
{ title: "Navigation", items: [{ label: "Home", href: "/" }, { label: "Services", href: "/services" }, { label: "How It Works", href: "/how-it-works" }, { label: "Contact", href: "/contact" }] },
{ title: "Areas Served", items: [{ label: "Longmont", href: "#" }, { label: "Boulder", href: "#" }, { label: "Denver Metro", href: "#" }] }
]}
/>
</div>
</ReactLenis>

View File

@@ -3,7 +3,7 @@
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react";
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
import FeatureCardSix from '@/components/sections/feature/FeatureCardSix';
export default function ServicesPage() {
@@ -49,9 +49,13 @@ export default function ServicesPage() {
</div>
<div id="footer" data-section="footer">
<FooterLogoEmphasis
columns={[{ items: [{ label: "Home", href: "/" }, { label: "Services", href: "/services" }, { label: "How It Works", href: "/how-it-works" }, { label: "Contact", href: "/contact" }] }]}
<FooterBaseCard
logoText="Nicks 2 Interlock"
copyrightText="© 2025 Nicks 2 Interlock. All rights reserved."
columns={[
{ title: "Navigation", items: [{ label: "Home", href: "/" }, { label: "Services", href: "/services" }, { label: "How It Works", href: "/how-it-works" }, { label: "Contact", href: "/contact" }] },
{ title: "Areas Served", items: [{ label: "Longmont", href: "#" }, { label: "Boulder", href: "#" }, { label: "Denver Metro", href: "#" }] }
]}
/>
</div>
</ReactLenis>