Update src/app/projects/page.tsx

Merge version_1 into main

src/app/contact/page.tsx

@@ -8,7 +8,7 @@ import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis'
 import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
 import { Mail, Phone } from "lucide-react";
 
-export default function LandingPage() {
+export default function ContactPage() {
   return (
     <ThemeProvider
         defaultButtonVariant="shift-hover"
@@ -26,18 +26,9 @@ export default function LandingPage() {
   <div id="nav" data-section="nav">
       <NavbarStyleApple
       navItems={[
-        {
+        { name: "Home", id: "/" },
-          name: "Home",
+        { name: "Projects", id: "/projects" },
-          id: "/",
+        { name: "Contact", id: "/contact" },
-        },
-        {
-          name: "Projects",
-          id: "/projects",
-        },
-        {
-          name: "Contact",
-          id: "/contact",
-        },
       ]}
       brandName="A1 Roofmasters"
     />
@@ -46,9 +37,7 @@ export default function LandingPage() {
   <div id="contact-page-form" data-section="contact-page-form">
       <ContactText
       useInvertedBackground={false}
-      background={{
+      background={{ variant: "plain" }}
-        variant: "plain",
-      }}
       text="Contact Us for a Free Estimate"
     />
   </div>
@@ -58,21 +47,9 @@ export default function LandingPage() {
       useInvertedBackground={false}
       title="Contact Details"
       metrics={[
-        {
+        { icon: Phone, label: "Call Sal", value: "631-620-2330" },
-          icon: Phone,
+        { icon: Phone, label: "Call Rock", value: "631-539-1664" },
-          label: "Call Sal",
+        { icon: Mail, label: "Email", value: "contact@a1roofmasters.com" },
-          value: "631-620-2330",
-        },
-        {
-          icon: Phone,
-          label: "Call Rock",
-          value: "631-539-1664",
-        },
-        {
-          icon: Mail,
-          label: "Email",
-          value: "contact@a1roofmasters.com",
-        },
       ]}
       metricsAnimation="slide-up"
     />
@@ -81,38 +58,8 @@ export default function LandingPage() {
   <div id="footer" data-section="footer">
       <FooterLogoEmphasis
       columns={[
-        {
+        { items: [{ label: "Home", href: "/" }, { label: "Projects", href: "/projects" }, { label: "Contact", href: "/contact" }] },
-          items: [
+        { items: [{ label: "Sal: 631-620-2330", href: "tel:631-620-2330" }, { label: "Rock: 631-539-1664", href: "tel:631-539-1664" }, { label: "contact@a1roofmasters.com", href: "mailto:contact@a1roofmasters.com" }] },
-            {
-              label: "Home",
-              href: "/",
-            },
-            {
-              label: "Projects",
-              href: "/projects",
-            },
-            {
-              label: "Contact",
-              href: "/contact",
-            },
-          ],
-        },
-        {
-          items: [
-            {
-              label: "Sal: 631-620-2330",
-              href: "tel:631-620-2330",
-            },
-            {
-              label: "Rock: 631-539-1664",
-              href: "tel:631-539-1664",
-            },
-            {
-              label: "contact@a1roofmasters.com",
-              href: "mailto:contact@a1roofmasters.com",
-            },
-          ],
-        },
       ]}
       logoText="A1 Roofmasters"
     />

src/app/page.tsx

@@ -6,7 +6,7 @@ import AboutMetric from '@/components/sections/about/AboutMetric';
 import ContactText from '@/components/sections/contact/ContactText';
 import FeatureBorderGlow from '@/components/sections/feature/featureBorderGlow/FeatureBorderGlow';
 import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
-import HeroBillboard from '@/components/sections/hero/HeroBillboard';
+import HeroOverlay from '@/components/sections/hero/HeroOverlay';
 import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
 import ProductCardOne from '@/components/sections/product/ProductCardOne';
 import TestimonialCardSixteen from '@/components/sections/testimonial/TestimonialCardSixteen';
@@ -30,88 +30,22 @@ export default function LandingPage() {
   <div id="nav" data-section="nav">
       <NavbarStyleApple
       navItems={[
-        {
+        { name: "Home", id: "/" },
-          name: "Home",
+        { name: "Projects", id: "/projects" },
-          id: "/",
+        { name: "Contact", id: "/contact" },
-        },
-        {
-          name: "Projects",
-          id: "/projects",
-        },
-        {
-          name: "Contact",
-          id: "/contact",
-        },
       ]}
       brandName="A1 Roofmasters"
     />
   </div>
 
   <div id="hero" data-section="hero">
-      <HeroBillboard
+      <HeroOverlay
-      background={{
+        title="Professional Roofing Services You Can Trust"
-        variant: "gradient-bars",
+        description="Expert roof installation, leak repair, and replacement services by factory-certified professionals. Built strong, built to last."
-      }}
+        imageSrc="http://img.b2bpic.net/free-photo/closeup-roof-house-made-wooden-tiles_169016-25417.jpg"
-      title="Professional Roofing Services You Can Trust"
+        buttons={[{ text: "Get a Free Estimate", href: "/contact" }, { text: "Call Now", href: "tel:631-620-2330" }]}
-      description="Expert roof installation, leak repair, and replacement services by factory-certified professionals. Built strong, built to last."
+        showBlur={true}
-      buttons={[
+      />
-        {
-          text: "Get a Free Estimate",
-          href: "/contact",
-        },
-        {
-          text: "Call Now",
-          href: "tel:631-620-2330",
-        },
-      ]}
-      imageSrc="http://img.b2bpic.net/free-photo/closeup-roof-house-made-wooden-tiles_169016-25417.jpg"
-      imageAlt="Professional roof installation services by A1 Roofmasters"
-      mediaAnimation="slide-up"
-      avatars={[
-        {
-          src: "http://img.b2bpic.net/free-photo/charming-student-girl-good-mood-relaxing-home_343059-139.jpg",
-          alt: "Happy customer",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/young-businessman-happy-expression_1194-1674.jpg",
-          alt: "Satisfied client",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/casual-smile-street-style-background-spring_1139-777.jpg",
-          alt: "Happy customer",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/smiling-handsome-businessman-leaning-knees_1262-5774.jpg",
-          alt: "Satisfied client",
-        },
-        {
-          src: "http://img.b2bpic.net/free-photo/medium-shot-man-working-as-real-estate-agent_23-2151065019.jpg",
-          alt: "Happy customer",
-        },
-      ]}
-      marqueeItems={[
-        {
-          type: "text",
-          text: "Licensed & Insured",
-        },
-        {
-          type: "text",
-          text: "24/7 Emergency Service",
-        },
-        {
-          type: "text",
-          text: "Factory Certified Installers",
-        },
-        {
-          type: "text",
-          text: "Free Consultations",
-        },
-        {
-          type: "text",
-          text: "Lifetime Warranty Available",
-        },
-      ]}
-    />
   </div>
 
   <div id="services" data-section="services">
@@ -120,26 +54,10 @@ export default function LandingPage() {
       textboxLayout="default"
       useInvertedBackground={false}
       features={[
-        {
+        { icon: CheckCircle, title: "Expert Roof Installation", description: "Professional installation designed for long-term protection." },
-          icon: CheckCircle,
+        { icon: Wrench, title: "Roof Leak Repair", description: "Fast and reliable repair services when you need them most." },
-          title: "Expert Roof Installation",
+        { icon: Square, title: "Flat Roof Replacement", description: "Specialists in advanced flat roofing systems." },
-          description: "Professional installation designed for long-term protection.",
+        { icon: Home, title: "Shingle Roof Replacement", description: "Durable and aesthetic shingle roofing solutions." },
-        },
-        {
-          icon: Wrench,
-          title: "Roof Leak Repair",
-          description: "Fast and reliable repair services when you need them most.",
-        },
-        {
-          icon: Square,
-          title: "Flat Roof Replacement",
-          description: "Specialists in advanced flat roofing systems.",
-        },
-        {
-          icon: Home,
-          title: "Shingle Roof Replacement",
-          description: "Durable and aesthetic shingle roofing solutions.",
-        },
       ]}
       title="Our Expert Services"
       description="We specialize in high-quality roofing systems, providing expert installation and repair services to keep your property protected."
@@ -151,21 +69,9 @@ export default function LandingPage() {
       useInvertedBackground={false}
       title="Why Choose Us"
       metrics={[
-        {
+        { icon: Award, label: "Factory Certified", value: "100%" },
-          icon: Award,
+        { icon: Users, label: "Experienced Staff", value: "20+ Years" },
-          label: "Factory Certified",
+        { icon: CheckSquare, label: "Projects Completed", value: "500+" },
-          value: "100%",
-        },
-        {
-          icon: Users,
-          label: "Experienced Staff",
-          value: "20+ Years",
-        },
-        {
-          icon: CheckSquare,
-          label: "Projects Completed",
-          value: "500+",
-        },
       ]}
       metricsAnimation="slide-up"
     />
@@ -178,51 +84,14 @@ export default function LandingPage() {
       gridVariant="four-items-2x2-equal-grid"
       useInvertedBackground={false}
       products={[
-        {
+        { id: "p1", name: "Luxury Shingle Project", price: "Residential", imageSrc: "http://img.b2bpic.net/free-photo/roof-pattern_1203-3266.jpg?_wi=1" },
-          id: "p1",
+        { id: "p2", name: "Modern Roof Repair", price: "Renovation", imageSrc: "http://img.b2bpic.net/free-photo/chinise-building_1417-1695.jpg?_wi=1" },
-          name: "Luxury Shingle Project",
+        { id: "p3", name: "Commercial Flat Roof", price: "Commercial", imageSrc: "http://img.b2bpic.net/free-photo/city-building-corner_23-2148107091.jpg?_wi=1" },
-          price: "Residential",
+        { id: "p4", name: "Classic Home Roof", price: "Residential", imageSrc: "http://img.b2bpic.net/free-photo/architects-looking-plan-front-house_23-2147813107.jpg?_wi=1" },
-          imageSrc: "http://img.b2bpic.net/free-photo/roof-pattern_1203-3266.jpg?_wi=1",
-        },
-        {
-          id: "p2",
-          name: "Modern Roof Repair",
-          price: "Renovation",
-          imageSrc: "http://img.b2bpic.net/free-photo/chinise-building_1417-1695.jpg?_wi=1",
-        },
-        {
-          id: "p3",
-          name: "Commercial Flat Roof",
-          price: "Commercial",
-          imageSrc: "http://img.b2bpic.net/free-photo/city-building-corner_23-2148107091.jpg?_wi=1",
-        },
-        {
-          id: "p4",
-          name: "Classic Home Roof",
-          price: "Residential",
-          imageSrc: "http://img.b2bpic.net/free-photo/architects-looking-plan-front-house_23-2147813107.jpg?_wi=1",
-        },
-        {
-          id: "p5",
-          name: "Full Shingle Replace",
-          price: "Replacement",
-          imageSrc: "http://img.b2bpic.net/free-photo/vertical-low-angle-closeup-shot-black-roof-building_181624-10654.jpg?_wi=1",
-        },
-        {
-          id: "p6",
-          name: "Custom Roof Design",
-          price: "Residential",
-          imageSrc: "http://img.b2bpic.net/free-photo/full-shot-man-wearing-protection-helmet-outdoors_23-2149343635.jpg?_wi=1",
-        },
       ]}
       title="Recent Projects"
       description="Take a look at our recent work and the high standards of quality we bring to every job."
-      buttons={[
+      buttons={[{ text: "View All Projects", href: "/projects" }]}
-        {
-          text: "View All Projects",
-          href: "/projects",
-        },
-      ]}
     />
   </div>
 
@@ -232,61 +101,10 @@ export default function LandingPage() {
       textboxLayout="default"
       useInvertedBackground={false}
       testimonials={[
-        {
+        { id: "1", name: "Sarah J.", role: "Homeowner", company: "Local Customer", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/charming-student-girl-good-mood-relaxing-home_343059-139.jpg" },
-          id: "1",
+        { id: "2", name: "Mark D.", role: "Property Manager", company: "Commercial Client", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/young-businessman-happy-expression_1194-1674.jpg" },
-          name: "Sarah J.",
-          role: "Homeowner",
-          company: "Local Customer",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/charming-student-girl-good-mood-relaxing-home_343059-139.jpg",
-        },
-        {
-          id: "2",
-          name: "Mark D.",
-          role: "Property Manager",
-          company: "Commercial Client",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/young-businessman-happy-expression_1194-1674.jpg",
-        },
-        {
-          id: "3",
-          name: "Emily R.",
-          role: "Homeowner",
-          company: "Local Customer",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/casual-smile-street-style-background-spring_1139-777.jpg",
-        },
-        {
-          id: "4",
-          name: "David K.",
-          role: "Homeowner",
-          company: "Local Customer",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/smiling-handsome-businessman-leaning-knees_1262-5774.jpg",
-        },
-        {
-          id: "5",
-          name: "Jennifer M.",
-          role: "Business Owner",
-          company: "Local Client",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-man-working-as-real-estate-agent_23-2151065019.jpg",
-        },
-      ]}
-      kpiItems={[
-        {
-          value: "500+",
-          label: "Projects Finished",
-        },
-        {
-          value: "100%",
-          label: "Customer Satisfaction",
-        },
-        {
-          value: "24/7",
-          label: "Emergency Support",
-        },
       ]}
+      kpiItems={[{ value: "500+", label: "Projects Finished" }, { value: "100%", label: "Customer Satisfaction" }, { value: "24/7", label: "Emergency Support" }]}
       title="What Our Customers Say"
       description="Trusted by hundreds of property owners in the region for our expert roofing and honest service."
     />
@@ -295,58 +113,17 @@ export default function LandingPage() {
   <div id="contact-section" data-section="contact-section">
       <ContactText
       useInvertedBackground={false}
-      background={{
+      background={{ variant: "gradient-bars" }}
-        variant: "gradient-bars",
-      }}
       text="Need Roofing Help? Get a Free Estimate Today"
-      buttons={[
+      buttons={[{ text: "Call Sal", href: "tel:631-620-2330" }, { text: "Call Rock", href: "tel:631-539-1664" }]}
-        {
-          text: "Call Sal",
-          href: "tel:631-620-2330",
-        },
-        {
-          text: "Call Rock",
-          href: "tel:631-539-1664",
-        },
-      ]}
     />
   </div>
 
   <div id="footer" data-section="footer">
       <FooterLogoEmphasis
       columns={[
-        {
+        { items: [{ label: "Home", href: "/" }, { label: "Projects", href: "/projects" }, { label: "Contact", href: "/contact" }] },
-          items: [
+        { items: [{ label: "Sal: 631-620-2330", href: "tel:631-620-2330" }, { label: "Rock: 631-539-1664", href: "tel:631-539-1664" }, { label: "contact@a1roofmasters.com", href: "mailto:contact@a1roofmasters.com" }] },
-            {
-              label: "Home",
-              href: "/",
-            },
-            {
-              label: "Projects",
-              href: "/projects",
-            },
-            {
-              label: "Contact",
-              href: "/contact",
-            },
-          ],
-        },
-        {
-          items: [
-            {
-              label: "Sal: 631-620-2330",
-              href: "tel:631-620-2330",
-            },
-            {
-              label: "Rock: 631-539-1664",
-              href: "tel:631-539-1664",
-            },
-            {
-              label: "contact@a1roofmasters.com",
-              href: "mailto:contact@a1roofmasters.com",
-            },
-          ],
-        },
       ]}
       logoText="A1 Roofmasters"
     />

src/app/projects/page.tsx

@@ -8,7 +8,7 @@ import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleAp
 import ProductCatalog from '@/components/ecommerce/productCatalog/ProductCatalog';
 import { Clock, ShieldCheck } from "lucide-react";
 
-export default function LandingPage() {
+export default function ProjectsPage() {
   return (
     <ThemeProvider
         defaultButtonVariant="shift-hover"
@@ -26,18 +26,9 @@ export default function LandingPage() {
   <div id="nav" data-section="nav">
       <NavbarStyleApple
       navItems={[
-        {
+        { name: "Home", id: "/" },
-          name: "Home",
+        { name: "Projects", id: "/projects" },
-          id: "/",
+        { name: "Contact", id: "/contact" },
-        },
-        {
-          name: "Projects",
-          id: "/projects",
-        },
-        {
-          name: "Contact",
-          id: "/contact",
-        },
       ]}
       brandName="A1 Roofmasters"
     />
@@ -47,48 +38,9 @@ export default function LandingPage() {
       <ProductCatalog
       layout="page"
       products={[
-        {
+        { id: "pc1", name: "Roof Installation", price: "Residential", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/roof-pattern_1203-3266.jpg?_wi=2" },
-          id: "pc1",
+        { id: "pc2", name: "Roof Repair", price: "Renovation", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/chinise-building_1417-1695.jpg?_wi=2" },
-          name: "Roof Installation",
+        { id: "pc3", name: "Flat Roof Replacement", price: "Commercial", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/city-building-corner_23-2148107091.jpg?_wi=2" },
-          price: "Residential",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/roof-pattern_1203-3266.jpg?_wi=2",
-        },
-        {
-          id: "pc2",
-          name: "Roof Repair",
-          price: "Renovation",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/chinise-building_1417-1695.jpg?_wi=2",
-        },
-        {
-          id: "pc3",
-          name: "Flat Roof Replacement",
-          price: "Commercial",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/city-building-corner_23-2148107091.jpg?_wi=2",
-        },
-        {
-          id: "pc4",
-          name: "Shingle Replacement",
-          price: "Residential",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/architects-looking-plan-front-house_23-2147813107.jpg?_wi=2",
-        },
-        {
-          id: "pc5",
-          name: "Luxury Roof Work",
-          price: "Replacement",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/vertical-low-angle-closeup-shot-black-roof-building_181624-10654.jpg?_wi=2",
-        },
-        {
-          id: "pc6",
-          name: "Residential Repair",
-          price: "Residential",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/full-shot-man-wearing-protection-helmet-outdoors_23-2149343635.jpg?_wi=2",
-        },
       ]}
     />
   </div>
@@ -101,16 +53,8 @@ export default function LandingPage() {
       title="Quality Assurance"
       description="Every project we undertake is backed by our promise of quality and durability."
       features={[
-        {
+        { icon: ShieldCheck, title: "Licensed Professionals", description: "All our team members are fully licensed." },
-          icon: ShieldCheck,
+        { icon: Clock, title: "On Time Delivery", description: "We stick to our schedule." },
-          title: "Licensed Professionals",
-          description: "All our team members are fully licensed.",
-        },
-        {
-          icon: Clock,
-          title: "On Time Delivery",
-          description: "We stick to our schedule.",
-        },
       ]}
     />
   </div>
@@ -118,38 +62,8 @@ export default function LandingPage() {
   <div id="footer" data-section="footer">
       <FooterLogoEmphasis
       columns={[
-        {
+        { items: [{ label: "Home", href: "/" }, { label: "Projects", href: "/projects" }, { label: "Contact", href: "/contact" }] },
-          items: [
+        { items: [{ label: "Sal: 631-620-2330", href: "tel:631-620-2330" }, { label: "Rock: 631-539-1664", href: "tel:631-539-1664" }, { label: "contact@a1roofmasters.com", href: "mailto:contact@a1roofmasters.com" }] },
-            {
-              label: "Home",
-              href: "/",
-            },
-            {
-              label: "Projects",
-              href: "/projects",
-            },
-            {
-              label: "Contact",
-              href: "/contact",
-            },
-          ],
-        },
-        {
-          items: [
-            {
-              label: "Sal: 631-620-2330",
-              href: "tel:631-620-2330",
-            },
-            {
-              label: "Rock: 631-539-1664",
-              href: "tel:631-539-1664",
-            },
-            {
-              label: "contact@a1roofmasters.com",
-              href: "mailto:contact@a1roofmasters.com",
-            },
-          ],
-        },
       ]}
       logoText="A1 Roofmasters"
     />