Merge version_4 into main

Merge version_4 into main

src/app/about/page.tsx

@@ -0,0 +1,181 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import ReactLenis from "lenis/react";
+
+import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
+import FooterMedia from '@/components/sections/footer/FooterMedia';
+import TextAbout from '@/components/sections/about/TextAbout';
+import AboutMetric from '@/components/sections/about/AboutMetric';
+import MetricCardThree from '@/components/sections/metrics/MetricCardThree';
+import ContactCTA from '@/components/sections/contact/ContactCTA';
+
+import { Award, Clock, Gauge, Sparkles, Star, Users, Phone, ShoppingCart, CalendarDays } from "lucide-react";
+
+export default function AboutPage() {
+  return (
+    <ThemeProvider
+      defaultButtonVariant="expand-hover"
+      defaultTextAnimation="entrance-slide"
+      borderRadius="rounded"
+      contentWidth="medium"
+      sizing="largeSmallSizeMediumTitles"
+      background="none"
+      cardStyle="solid"
+      primaryButtonStyle="primary-glow"
+      secondaryButtonStyle="radial-glow"
+      headingFontWeight="light"
+    >
+      <ReactLenis root>
+        <div id="nav" data-section="nav">
+          <NavbarLayoutFloatingOverlay
+            navItems={[
+              {
+                name: "Home",                id: "/"},
+              {
+                name: "About Us",                id: "/about"},
+              {
+                name: "Services",                id: "/#services"},
+              {
+                name: "Reviews",                id: "/#reviews"},
+              {
+                name: "Order Online",                id: "/order-online"},
+              {
+                name: "Reservations",                id: "/reservations"},
+              {
+                name: "Contact",                id: "/#contact"},
+            ]}
+            logoSrc="http://img.b2bpic.net/free-vector/hand-drawn-evil-eye-icon_23-2150148629.jpg"
+            logoAlt="Omega Plumbing & Drain logo"
+            brandName="Omega Plumbing & Drain"
+            button={{
+              text: "Call Now",              href: "tel:210-618-2887"}}
+          />
+        </div>
+
+        <div id="about-us" data-section="about-us">
+          <TextAbout
+            useInvertedBackground={false}
+            title="About Omega Plumbing & Drain: Your Community's Trusted Plumbers"
+            buttons={[
+              {
+                text: "Call Now: 210-618-2887",                href: "tel:210-618-2887"},
+              {
+                text: "Request Service",                href: "/#contact"},
+              {
+                text: "Order Online",                href: "/order-online"},
+              {
+                text: "Make a Reservation",                href: "/reservations"},
+            ]}
+          />
+        </div>
+
+        <div id="about-metrics" data-section="about-metrics">
+          <AboutMetric
+            useInvertedBackground={true}
+            title="Our Commitment to Excellence"
+            metrics={[
+              {
+                icon: Gauge,
+                label: "Years in Service",                value: "15+"},
+              {
+                icon: Users,
+                label: "Licensed Plumbers",                value: "20+"},
+              {
+                icon: Star,
+                label: "Customer Rating",                value: "4.9/5"},
+            ]}
+            metricsAnimation="slide-up"
+          />
+        </div>
+
+        <div id="trust-elements" data-section="trust-elements">
+          <MetricCardThree
+            animationType="slide-up"
+            textboxLayout="default"
+            useInvertedBackground={false}
+            metrics={[
+              {
+                id: "licensed",                icon: Award,
+                title: "Licensed & Insured",                value: "Fully Compliant"},
+              {
+                id: "emergency",                icon: Clock,
+                title: "24/7 Emergency Service",                value: "Rapid Response"},
+              {
+                id: "experienced",                icon: Sparkles,
+                title: "Experienced Professionals",                value: "Skilled & Certified"},
+            ]}
+            title="Why Omega is Your Best Choice"
+            description="Our commitment to excellence ensures peace of mind for every customer in San Antonio."
+          />
+        </div>
+
+        <div id="contact-cta" data-section="contact-cta">
+          <ContactCTA
+            useInvertedBackground={true}
+            background={{
+              variant: "radial-gradient"}}
+            tag="Ready for Service?"
+            title="Get in Touch with Omega Plumbing & Drain"
+            description="Whether it's an emergency or a routine check-up, our team is ready to provide top-notch service."
+            buttons={[
+              {
+                text: "Call Now: 210-618-2887",                href: "tel:210-618-2887"},
+              {
+                text: "Request Service",                href: "mailto:info@omegaplumbingdrain.com"},
+              {
+                text: "Order Online",                href: "/order-online"},
+              {
+                text: "Make a Reservation",                href: "/reservations"},
+            ]}
+          />
+        </div>
+
+        <div id="footer" data-section="footer">
+          <FooterMedia
+            imageSrc="http://img.b2bpic.net/free-photo/close-up-surface-with-white-circles_1203-511.jpg?_wi=2"
+            imageAlt="Omega Plumbing & Drain service van at night"
+            logoSrc="http://img.b2bpic.net/free-vector/hand-drawn-evil-eye-icon_23-2150148629.jpg"
+            logoAlt="Omega Plumbing & Drain logo"
+            logoText="Omega Plumbing & Drain"
+            columns={[
+              {
+                title: "Services",                items: [
+                  {
+                    label: "Emergency Plumbing",                    href: "/#services"},
+                  {
+                    label: "Leak Detection",                    href: "/#services"},
+                  {
+                    label: "Drain Cleaning",                    href: "/#services"},
+                  {
+                    label: "Water Main Repair",                    href: "/#services"},
+                  {
+                    label: "Hydro Jetting",                    href: "/#services"},
+                ],
+              },
+              {
+                title: "Company",                items: [
+                  {
+                    label: "About Us",                    href: "/about"},
+                  {
+                    label: "Testimonials",                    href: "/#reviews"},
+                  {
+                    label: "Contact",                    href: "/#contact"},
+                ],
+              },
+              {
+                title: "Legal",                items: [
+                  {
+                    label: "Privacy Policy",                    href: "#"},
+                  {
+                    label: "Terms of Service",                    href: "#"},
+                ],
+              },
+            ]}
+            copyrightText="© 2024 Omega Plumbing & Drain. All rights reserved."
+          />
+        </div>
+      </ReactLenis>
+    </ThemeProvider>
+  );
+}

src/app/page.tsx

@@ -2,7 +2,7 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import AboutMetric from '@/components/sections/about/AboutMetric';
+
 import ContactCTA from '@/components/sections/contact/ContactCTA';
 import FeatureCardTwentySix from '@/components/sections/feature/FeatureCardTwentySix';
 import FooterMedia from '@/components/sections/footer/FooterMedia';
@@ -11,7 +11,9 @@ import MetricCardThree from '@/components/sections/metrics/MetricCardThree';
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
 import PricingCardOne from '@/components/sections/pricing/PricingCardOne';
 import TestimonialCardTwo from '@/components/sections/testimonial/TestimonialCardTwo';
-import { Award, Clock, Droplet, Gauge, Phone, Search, Sparkles, Star, Users, Waves, Wrench } from "lucide-react";
+import FeatureBento from '@/components/sections/feature/FeatureBento';
+
+import { Award, Clock, Droplet, Gauge, Phone, Search, Sparkles, Star, Users, Waves, Wrench, MapPin, CalendarDays, ShoppingCart } from "lucide-react";
 
 export default function LandingPage() {
   return (
@@ -32,13 +34,19 @@ export default function LandingPage() {
       <NavbarLayoutFloatingOverlay
       navItems={[
         {
-          name: "Home",          id: "#home"},
+          name: "Home",          id: "/"},
         {
-          name: "Services",          id: "#services"},
+          name: "About Us",          id: "/about"},
         {
-          name: "Reviews",          id: "#reviews"},
+          name: "Services",          id: "/#services"},
         {
-          name: "Contact",          id: "#contact"},
+          name: "Reviews",          id: "/#reviews"},
+        {
+          name: "Order Online",          id: "/order-online"},
+        {
+          name: "Reservations",          id: "/reservations"},
+        {
+          name: "Contact",          id: "/#contact"},
       ]}
       logoSrc="http://img.b2bpic.net/free-vector/hand-drawn-evil-eye-icon_23-2150148629.jpg"
       logoAlt="Omega Plumbing & Drain logo"
@@ -73,7 +81,11 @@ export default function LandingPage() {
         {
           text: "Call Now: 210-618-2887",          href: "tel:210-618-2887"},
         {
-          text: "Request Service",          href: "#contact"},
+          text: "Request Service",          href: "/#contact"},
+        {
+          text: "Order Online",          href: "/order-online"},
+        {
+          text: "Make a Reservation",          href: "/reservations"},
       ]}
       avatars={[
         {
@@ -96,25 +108,6 @@ export default function LandingPage() {
     />
   </div>
 
-  <div id="about" data-section="about">
-      <AboutMetric
-      useInvertedBackground={false}
-      title="About Omega Plumbing & Drain"
-      metrics={[
-        {
-          icon: Gauge,
-          label: "Years in Service",          value: "15+"},
-        {
-          icon: Users,
-          label: "Licensed Plumbers",          value: "20+"},
-        {
-          icon: Star,
-          label: "Customer Rating",          value: "4.9/5"},
-      ]}
-      metricsAnimation="slide-up"
-    />
-  </div>
-
   <div id="trust-elements" data-section="trust-elements">
       <MetricCardThree
       animationType="slide-up"
@@ -142,23 +135,25 @@ export default function LandingPage() {
       useInvertedBackground={false}
       features={[
         {
-          title: "24/7 Emergency Plumbing",          description: "Burst pipes, major leaks, or overflowing toilets – our rapid response team is available around the clock to handle your urgent plumbing crises efficiently.",          imageSrc: "http://img.b2bpic.net/free-photo/plumber-using-wrench-while-working-bathroom_23-2149021430.jpg",          imageAlt: "Plumber responding to emergency call at night",          buttonIcon: Phone,
+          title: "24/7 Emergency Plumbing",          description: "Burst pipes, major leaks, or overflowing toilets – our rapid response team is available around the clock to handle your urgent plumbing crises efficiently.",          imageSrc: "https://img.b2bpic.net/free-photo/man-installs-heating-system-house-checks-pipes-with-wrench_169016-55822.jpg?id=219636595",          imageAlt: "Plumber responding to emergency call at night",          buttonIcon: Phone,
         },
         {
-          title: "Advanced Leak Detection",          description: "Utilizing state-of-the-art technology, we accurately locate hidden leaks in walls, floors, and underground pipes to prevent costly water damage and conserve water.",          imageSrc: "http://img.b2bpic.net/free-photo/close-up-person-checking-bathroom-sink_23-2149010476.jpg",          imageAlt: "Leak detection equipment scanning a wall",          buttonIcon: Search,
+          title: "Advanced Leak Detection",          description: "Utilizing state-of-the-art technology, we accurately locate hidden leaks in walls, floors, and underground pipes to prevent costly water damage and conserve water.",          imageSrc: "https://img.b2bpic.net/free-photo/male-plumber-working-fix-problems-client-s-house_23-2150990705.jpg?id=94957533",          imageAlt: "Leak detection equipment scanning a wall",          buttonIcon: Search,
         },
         {
-          title: "Thorough Drain Cleaning",          description: "From stubborn clogs to slow drains, we provide effective cleaning solutions for sinks, showers, toilets, and main sewer lines, ensuring free-flowing plumbing.",          imageSrc: "http://img.b2bpic.net/free-photo/plumber-removing-clog-sink_23-2149176729.jpg",          imageAlt: "Plumber clearing a clogged drain with an auger",          buttonIcon: Droplet,
+          title: "Thorough Drain Cleaning",          description: "From stubborn clogs to slow drains, we provide effective cleaning solutions for sinks, showers, toilets, and main sewer lines, ensuring free-flowing plumbing.",          imageSrc: "https://img.b2bpic.net/premium-photo/plumbing-repair-sewer-cleaning-toned-processing-food-chopper-repair_494741-49829.jpg?id=23544247",          imageAlt: "Plumber clearing a clogged drain with an auger",          buttonIcon: Droplet,
         },
         {
-          title: "Water Main Repair & Installation",          description: "Expert services for diagnosing, repairing, or replacing damaged water mains, restoring essential water supply with minimal disruption to your property.",          imageSrc: "http://img.b2bpic.net/free-photo/pipeline-connection-industry_23-2149156477.jpg",          imageAlt: "Water main repair in progress",          buttonIcon: Wrench,
+          title: "Water Main Repair & Installation",          description: "Expert services for diagnosing, repairing, or replacing damaged water mains, restoring essential water supply with minimal disruption to your property.",          imageSrc: "https://img.b2bpic.net/premium-photo/different-plumbing-fixtures-use-bathroom_128406-984.jpg?id=9664673",          imageAlt: "Water main repair in progress",          buttonIcon: Wrench,
         },
         {
-          title: "High-Pressure Hydro Jetting",          description: "For tough blockages and accumulated debris, our hydro jetting service uses high-pressure water streams to thoroughly clean pipes, leaving them pristine.",          imageSrc: "http://img.b2bpic.net/free-photo/plumber-cleaning-pipe-with-water-jet_23-2149010467.jpg",          imageAlt: "Hydro jetting equipment cleaning a pipe",          buttonIcon: Waves,
+          title: "High-Pressure Hydro Jetting",          description: "For tough blockages and accumulated debris, our hydro jetting service uses high-pressure water streams to thoroughly clean pipes, leaving them pristine.",          imageSrc: "https://img.b2bpic.net/free-photo/plumbing-repair-service_181624-27146.jpg?id=12152405",          imageAlt: "Hydro jetting equipment cleaning a pipe",          buttonIcon: Waves,
         },
       ]}
       title="Our Comprehensive Plumbing Services"
       description="We offer a full range of plumbing solutions to keep your home or business running smoothly. No job is too big or too small for our expert team."
+      cardTitleClassName="text-white"
+      cardDescriptionClassName="text-white"
     />
   </div>
 
@@ -213,9 +208,26 @@ export default function LandingPage() {
     />
   </div>
 
+  <div id="location-hours" data-section="location-hours">
+      <FeatureBento
+      animationType="blur-reveal"
+      title="Visit Us or Check Our Hours"
+      description="Find us easily and know when we're available. We're dedicated to serving the San Antonio community with reliable plumbing solutions."
+      textboxLayout="default"
+      useInvertedBackground={true}
+      features={[
+        {
+          title: "Our Location",          description: "123 Plumbing Way, San Antonio, TX 78205",          bentoComponent: "map"},
+        {
+          title: "Business Hours",          description: "Monday - Friday: 8:00 AM - 5:00 PM\nSaturday: 9:00 AM - 1:00 PM\nSunday: Closed\n24/7 Emergency Service Available!",          bentoComponent: "reveal-icon",          icon: Clock,
+        },
+      ]}
+    />
+  </div>
+
   <div id="contact" data-section="contact">
       <ContactCTA
-      useInvertedBackground={true}
+      useInvertedBackground={false}
       background={{
         variant: "radial-gradient"}}
       tag="Contact Us"
@@ -225,14 +237,18 @@ export default function LandingPage() {
         {
           text: "Call Now: 210-618-2887",          href: "tel:210-618-2887"},
         {
-          text: "Request a Service",          href: "mailto:info@omegaplumbingdrain.com"},
+          text: "Request Service",          href: "mailto:info@omegaplumbingdrain.com"},
+        {
+          text: "Order Online",          href: "/order-online"},
+        {
+          text: "Make a Reservation",          href: "/reservations"},
       ]}
     />
   </div>
 
   <div id="footer" data-section="footer">
       <FooterMedia
-      imageSrc="http://img.b2bpic.net/free-photo/close-up-surface-with-white-circles_1203-511.jpg"
+      imageSrc="http://img.b2bpic.net/free-photo/close-up-surface-with-white-circles_1203-511.jpg?_wi=1"
       imageAlt="Omega Plumbing & Drain service van at night"
       logoSrc="http://img.b2bpic.net/free-vector/hand-drawn-evil-eye-icon_23-2150148629.jpg"
       logoAlt="Omega Plumbing & Drain logo"
@@ -241,25 +257,25 @@ export default function LandingPage() {
         {
           title: "Services",          items: [
             {
-              label: "Emergency Plumbing",              href: "#services"},
+              label: "Emergency Plumbing",              href: "/#services"},
             {
-              label: "Leak Detection",              href: "#services"},
+              label: "Leak Detection",              href: "/#services"},
             {
-              label: "Drain Cleaning",              href: "#services"},
+              label: "Drain Cleaning",              href: "/#services"},
             {
-              label: "Water Main Repair",              href: "#services"},
+              label: "Water Main Repair",              href: "/#services"},
             {
-              label: "Hydro Jetting",              href: "#services"},
+              label: "Hydro Jetting",              href: "/#services"},
           ],
         },
         {
           title: "Company",          items: [
             {
-              label: "About Us",              href: "#about"},
+              label: "About Us",              href: "/about"},
             {
-              label: "Testimonials",              href: "#reviews"},
+              label: "Testimonials",              href: "/#reviews"},
             {
-              label: "Contact",              href: "#contact"},
+              label: "Contact",              href: "/#contact"},
           ],
         },
         {