Merge version_56_1782421748441 into main #62

Merged
bender merged 1 commits from version_56_1782421748441 into main 2026-06-25 21:11:47 +00:00
2 changed files with 15 additions and 132 deletions

View File

@@ -1,5 +1,5 @@
import FooterMinimal from '@/components/sections/footer/FooterMinimal';
import NavbarFloatingLogo from '@/components/ui/NavbarFloatingLogo';
import NavbarCentered from '@/components/ui/NavbarCentered';
import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
import SiteBackgroundSlot from "@/components/ui/SiteBackgroundSlot";
import { Facebook, Instagram } from "lucide-react";
@@ -42,9 +42,8 @@ export default function Layout() {
<StyleProvider buttonVariant="expand" siteBackground="gridDots" heroBackground="cornerGlow">
<SiteBackgroundSlot />
<SectionErrorBoundary name="navbar">
<NavbarFloatingLogo
<NavbarCentered
logo="OA General"
logoImageSrc="https://images.pexels.com/photos/36151946/pexels-photo-36151946.jpeg?auto=compress&cs=tinysrgb&h=650&w=940&id=36151946"
ctaButton={{
text: "Get Quote",
href: "#contact",

View File

@@ -1,136 +1,20 @@
/* eslint-disable */
// @ts-nocheck — generated by catalog-eject; runtime-correct but TS strict-mode false-positives on inlined catalog body
import Button from "@/components/ui/Button";
import HeroBackgroundSlot from "@/components/ui/HeroBackgroundSlot";
import TextAnimation from "@/components/ui/TextAnimation";
import ImageOrVideo from "@/components/ui/ImageOrVideo";
// Created by add_section_from_catalog (HeroSplitVerticalMarquee).
const primaryButton = {
text: "Free Estimate",
href: "#contact"
};
const secondaryButton = {
text: "Our Services",
href: "#services"
};
const leftItems = [
{
imageSrc: "https://storage.googleapis.com/webild/users/user_3FVvm8wEysRPV9bC25IuulDoP5E/uploaded-1782177170754-o5qz9oxw.png"
},
{
imageSrc: "https://storage.googleapis.com/webild/users/user_3FVvm8wEysRPV9bC25IuulDoP5E/uploaded-1782177550448-9rd27mxw.png"
},
{
imageSrc: "https://storage.googleapis.com/webild/users/user_3FVvm8wEysRPV9bC25IuulDoP5E/uploaded-1782177078066-uz2cqdi7.png"
},
{
imageSrc: "https://storage.googleapis.com/webild/users/user_3FVvm8wEysRPV9bC25IuulDoP5E/uploaded-1782173916313-7eb8k1s3.png?_wi=1"
},
{
imageSrc: "https://storage.googleapis.com/webild/users/user_3FVvm8wEysRPV9bC25IuulDoP5E/uploaded-1782176828795-vivdh5w5.png"
},
{
imageSrc: "https://storage.googleapis.com/webild/users/user_3FVvm8wEysRPV9bC25IuulDoP5E/uploaded-1782177432350-fb8ierf5.png"
}
];
const rightItems = [
{
imageSrc: "https://storage.googleapis.com/webild/users/user_3FVvm8wEysRPV9bC25IuulDoP5E/uploaded-1782249307935-v4dnj3j5.png"
},
{
imageSrc: "https://storage.googleapis.com/webild/users/user_3FVvm8wEysRPV9bC25IuulDoP5E/uploaded-1782173916313-7eb8k1s3.png?_wi=2"
},
{
imageSrc: "https://storage.googleapis.com/webild/users/user_3FVvm8wEysRPV9bC25IuulDoP5E/uploaded-1782177486564-o153n4lc.png"
},
{
imageSrc: "https://storage.googleapis.com/webild/users/user_3FVvm8wEysRPV9bC25IuulDoP5E/uploaded-1782177227684-ddjfsi1d.png"
},
{
imageSrc: "https://storage.googleapis.com/webild/users/user_3FVvm8wEysRPV9bC25IuulDoP5E/uploaded-1782176963792-kfpp4mpw.png"
},
{
imageSrc: "https://storage.googleapis.com/webild/users/user_3FVvm8wEysRPV9bC25IuulDoP5E/uploaded-1782177302811-2gggcz6v.png"
}
];
import React from 'react';
import HeroSplitVerticalMarquee from '@/components/sections/hero/HeroSplitVerticalMarquee';
type HeroSplitVerticalMarqueeProps = {
tag: string;
title: string;
description: string;
primaryButton: { text: string; href: string };
secondaryButton: { text: string; href: string };
leftItems: ({ imageSrc: string; videoSrc?: never } | { videoSrc: string; imageSrc?: never })[];
rightItems: ({ imageSrc: string; videoSrc?: never } | { videoSrc: string; imageSrc?: never })[];
};
const HeroInline = () => {
const duplicatedLeft = [...leftItems, ...leftItems, ...leftItems, ...leftItems];
const duplicatedRight = [...rightItems, ...rightItems, ...rightItems, ...rightItems];
return (
<section aria-label="Hero section" className="relative flex items-center h-fit md:h-svh pt-25 pb-20 md:py-0">
<HeroBackgroundSlot />
<div className="flex flex-col md:flex-row items-center gap-12 md:gap-20 w-content-width mx-auto">
<div className="w-full md:w-1/2">
<div className="flex flex-col items-center md:items-start gap-3">
<div className="px-3 py-1 mb-1 text-sm card rounded w-fit">
<p>{"Transforming Spaces, Elevating Lives"}</p>
</div>
<TextAnimation
text={"Professional General Contracting in Florida"}
variant="fade"
gradientText={true}
tag="h1"
className="text-7xl 2xl:text-8xl leading-[1.15] font-semibold text-center md:text-left text-balance"
/>
<TextAnimation
text={"OA General Contracting specializes in high-quality remodeling, painting, flooring, and home improvements. We bring craftsmanship to every detail."}
variant="fade"
gradientText={false}
tag="p"
className="md:max-w-8/10 text-lg md:text-xl leading-snug text-center md:text-left text-balance"
/>
<div className="flex flex-wrap max-md:justify-center gap-3 mt-2 md:mt-3">
<Button text={primaryButton.text} href={primaryButton.href} variant="primary"/>
<Button text={secondaryButton.text} href={secondaryButton.href} variant="secondary"animationDelay={0.1} />
</div>
</div>
</div>
<div className="w-full md:w-1/2 h-100 md:h-[75vh] flex gap-2 xl:gap-3 2xl:gap-4 overflow-hidden">
<div className="flex-1 overflow-hidden mask-fade-y-medium">
<div className="flex flex-col gap-2 xl:gap-3 2xl:gap-4 animate-marquee-vertical">
{duplicatedLeft.map((item, index) => (
<div key={index} className="shrink-0 aspect-square p-2 xl:p-3 2xl:p-4 card rounded overflow-hidden">
<ImageOrVideo imageSrc={item.imageSrc} videoSrc={item.videoSrc} />
</div>
))}
</div>
</div>
<div className="flex-1 overflow-hidden mask-fade-y-medium">
<div className="flex flex-col gap-2 xl:gap-3 2xl:gap-4 animate-marquee-vertical-reverse">
{duplicatedRight.map((item, index) => (
<div key={index} className="shrink-0 aspect-square p-2 xl:p-3 2xl:p-4 card rounded overflow-hidden">
<ImageOrVideo imageSrc={item.imageSrc} videoSrc={item.videoSrc} />
</div>
))}
</div>
</div>
</div>
</div>
</section>
);
};
export default function HeroSection() {
export default function HeroSection(): React.JSX.Element {
return (
<div data-webild-section="hero" id="hero">
<HeroInline />
<HeroSplitVerticalMarquee
primaryButton={{"href":"#contact","text":"Free Estimate"}}
leftItems={[{"imageSrc":"https://storage.googleapis.com/webild/users/user_3FVvm8wEysRPV9bC25IuulDoP5E/uploaded-1782177170754-o5qz9oxw.png"},{"imageSrc":"https://storage.googleapis.com/webild/users/user_3FVvm8wEysRPV9bC25IuulDoP5E/uploaded-1782177550448-9rd27mxw.png"},{"imageSrc":"https://storage.googleapis.com/webild/users/user_3FVvm8wEysRPV9bC25IuulDoP5E/uploaded-1782177078066-uz2cqdi7.png"},{"imageSrc":"https://storage.googleapis.com/webild/users/user_3FVvm8wEysRPV9bC25IuulDoP5E/uploaded-1782173916313-7eb8k1s3.png?_wi=1"},{"imageSrc":"https://storage.googleapis.com/webild/users/user_3FVvm8wEysRPV9bC25IuulDoP5E/uploaded-1782176828795-vivdh5w5.png"},{"imageSrc":"https://storage.googleapis.com/webild/users/user_3FVvm8wEysRPV9bC25IuulDoP5E/uploaded-1782177432350-fb8ierf5.png"}]}
description="OA General Contracting specializes in transforming spaces and elevating lives."
rightItems={[{"imageSrc":"https://storage.googleapis.com/webild/users/user_3FVvm8wEysRPV9bC25IuulDoP5E/uploaded-1782249307935-v4dnj3j5.png"},{"imageSrc":"https://storage.googleapis.com/webild/users/user_3FVvm8wEysRPV9bC25IuulDoP5E/uploaded-1782173916313-7eb8k1s3.png?_wi=2"},{"imageSrc":"https://storage.googleapis.com/webild/users/user_3FVvm8wEysRPV9bC25IuulDoP5E/uploaded-1782177486564-o153n4lc.png"},{"imageSrc":"https://storage.googleapis.com/webild/users/user_3FVvm8wEysRPV9bC25IuulDoP5E/uploaded-1782177227684-ddjfsi1d.png"},{"imageSrc":"https://storage.googleapis.com/webild/users/user_3FVvm8wEysRPV9bC25IuulDoP5E/uploaded-1782176963792-kfpp4mpw.png"},{"imageSrc":"https://storage.googleapis.com/webild/users/user_3FVvm8wEysRPV9bC25IuulDoP5E/uploaded-1782177302811-2gggcz6v.png"}]}
title="Professional General Contracting in Florida"
tag="Transforming Spaces, Elevating Lives"
secondaryButton={{"href":"#services","text":"Our Services"}}
/>
</div>
);
}