Merge version_2 into main

Merge version_2 into main

src/app/business-solar/page.tsx

@@ -26,31 +26,19 @@ export default function LandingPage() {
       <NavbarStyleApple
       navItems={[
         {
-          name: "Home",
+          name: "Home",          id: "/"},
-          id: "/",
-        },
         {
-          name: "Business Solar",
+          name: "Business Solar",          id: "/business-solar"},
-          id: "/business-solar",
-        },
         {
-          name: "Home Solar",
+          name: "Home Solar",          id: "/home-solar"},
-          id: "/home-solar",
-        },
         {
-          name: "Large Scale",
+          name: "Large Scale",          id: "/large-scale"},
-          id: "/large-scale",
-        },
         {
-          name: "Electricians",
+          name: "Electricians",          id: "/electricians"},
-          id: "/electricians",
-        },
         {
-          name: "Contact",
+          name: "Contact",          id: "/contact"},
-          id: "/contact",
-        },
       ]}
-      brandName="Nano Electrical"
+      brandName="Nanoone"
     />
   </div>
 
@@ -61,55 +49,22 @@ export default function LandingPage() {
       useInvertedBackground={false}
       plans={[
         {
-          id: "small",
+          id: "small",          tag: "Entry",          price: "R1,399",          period: "/mo",          description: "Essential energy for small biz.",          button: {
-          tag: "Entry",
+            text: "Get Started",            href: "/contact"},
-          price: "R1,399",
+          featuresTitle: "Includes:",          features: [
-          period: "/mo",
+            "Solar panels",            "Inverter",            "Professional Install"],
-          description: "Essential energy for small biz.",
-          button: {
-            text: "Get Started",
-            href: "/contact",
-          },
-          featuresTitle: "Includes:",
-          features: [
-            "Solar panels",
-            "Inverter",
-            "Professional Install",
-          ],
         },
         {
-          id: "med",
+          id: "med",          tag: "Value",          price: "R1,740",          period: "/mo",          description: "Balanced power solution.",          button: {
-          tag: "Value",
+            text: "Get Started",            href: "/contact"},
-          price: "R1,740",
+          featuresTitle: "Includes:",          features: [
-          period: "/mo",
+            "Solar panels",            "Battery",            "Inverter"],
-          description: "Balanced power solution.",
-          button: {
-            text: "Get Started",
-            href: "/contact",
-          },
-          featuresTitle: "Includes:",
-          features: [
-            "Solar panels",
-            "Battery",
-            "Inverter",
-          ],
         },
         {
-          id: "large",
+          id: "large",          tag: "Growth",          price: "R2,900",          period: "/mo",          description: "High energy capacity.",          button: {
-          tag: "Growth",
+            text: "Get Started",            href: "/contact"},
-          price: "R2,900",
+          featuresTitle: "Includes:",          features: [
-          period: "/mo",
+            "Advanced panels",            "Dual Battery",            "Smart Monitoring"],
-          description: "High energy capacity.",
-          button: {
-            text: "Get Started",
-            href: "/contact",
-          },
-          featuresTitle: "Includes:",
-          features: [
-            "Advanced panels",
-            "Dual Battery",
-            "Smart Monitoring",
-          ],
         },
       ]}
       title="Business Solar Packages"
@@ -126,45 +81,31 @@ export default function LandingPage() {
 
   <div id="footer" data-section="footer">
       <FooterBaseReveal
-      logoText="Nano Electrical"
+      logoText="Nanoone"
+      logoSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3C83gjjyM4uZB0Yud0ao1GtaWZj/uploaded-1775753866075-dc8oigd9.jpg"
       columns={[
         {
-          title: "Company",
+          title: "Company",          items: [
-          items: [
             {
-              label: "About",
+              label: "About",              href: "#"},
-              href: "#",
-            },
             {
-              label: "Services",
+              label: "Services",              href: "#services"},
-              href: "#services",
-            },
           ],
         },
         {
-          title: "Solar",
+          title: "Solar",          items: [
-          items: [
             {
-              label: "Home",
+              label: "Home",              href: "/home-solar"},
-              href: "/home-solar",
-            },
             {
-              label: "Business",
+              label: "Business",              href: "/business-solar"},
-              href: "/business-solar",
-            },
           ],
         },
         {
-          title: "Contact",
+          title: "Contact",          items: [
-          items: [
             {
-              label: "064 184 7070",
+              label: "064 184 7070",              href: "tel:0641847070"},
-              href: "tel:0641847070",
-            },
             {
-              label: "Contact Form",
+              label: "Contact Form",              href: "/contact"},
-              href: "/contact",
-            },
           ],
         },
       ]}
@@ -173,4 +114,4 @@ export default function LandingPage() {
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}

src/app/contact/page.tsx

@@ -26,31 +26,19 @@ export default function LandingPage() {
       <NavbarStyleApple
       navItems={[
         {
-          name: "Home",
+          name: "Home",          id: "/"},
-          id: "/",
-        },
         {
-          name: "Business Solar",
+          name: "Business Solar",          id: "/business-solar"},
-          id: "/business-solar",
-        },
         {
-          name: "Home Solar",
+          name: "Home Solar",          id: "/home-solar"},
-          id: "/home-solar",
-        },
         {
-          name: "Large Scale",
+          name: "Large Scale",          id: "/large-scale"},
-          id: "/large-scale",
-        },
         {
-          name: "Electricians",
+          name: "Electricians",          id: "/electricians"},
-          id: "/electricians",
-        },
         {
-          name: "Contact",
+          name: "Contact",          id: "/contact"},
-          id: "/contact",
-        },
       ]}
-      brandName="Nano Electrical"
+      brandName="Nanoone"
     />
   </div>
 
@@ -58,8 +46,7 @@ export default function LandingPage() {
       <ContactCenter
       useInvertedBackground={false}
       background={{
-        variant: "plain",
+        variant: "plain"}}
-      }}
       tag="Contact"
       title="Get In Touch"
       description="Call 064 184 7070 or fill out the form below."
@@ -72,68 +59,45 @@ export default function LandingPage() {
       useInvertedBackground={true}
       faqs={[
         {
-          id: "q1",
+          id: "q1",          title: "What areas do you serve?",          content: "We serve all major areas in South Africa."},
-          title: "What areas do you serve?",
-          content: "We serve all major areas in South Africa.",
-        },
         {
-          id: "q2",
+          id: "q2",          title: "How fast is installation?",          content: "Typically 2 weeks from approval."},
-          title: "How fast is installation?",
-          content: "Typically 2 weeks from approval.",
-        },
         {
-          id: "q3",
+          id: "q3",          title: "Do you offer financing?",          content: "Yes, we have subscription and rental options."},
-          title: "Do you offer financing?",
-          content: "Yes, we have subscription and rental options.",
-        },
       ]}
       title="Frequently Asked Questions"
-      description="Have questions about Nano Electrical?"
+      description="Have questions about Nanoone?"
       faqsAnimation="slide-up"
     />
   </div>
 
   <div id="footer" data-section="footer">
       <FooterBaseReveal
-      logoText="Nano Electrical"
+      logoText="Nanoone"
+      logoSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3C83gjjyM4uZB0Yud0ao1GtaWZj/uploaded-1775753866075-dc8oigd9.jpg"
       columns={[
         {
-          title: "Company",
+          title: "Company",          items: [
-          items: [
             {
-              label: "About",
+              label: "About",              href: "#"},
-              href: "#",
-            },
             {
-              label: "Services",
+              label: "Services",              href: "#services"},
-              href: "#services",
-            },
           ],
         },
         {
-          title: "Solar",
+          title: "Solar",          items: [
-          items: [
             {
-              label: "Home",
+              label: "Home",              href: "/home-solar"},
-              href: "/home-solar",
-            },
             {
-              label: "Business",
+              label: "Business",              href: "/business-solar"},
-              href: "/business-solar",
-            },
           ],
         },
         {
-          title: "Contact",
+          title: "Contact",          items: [
-          items: [
             {
-              label: "064 184 7070",
+              label: "064 184 7070",              href: "tel:0641847070"},
-              href: "tel:0641847070",
-            },
             {
-              label: "Contact Form",
+              label: "Contact Form",              href: "/contact"},
-              href: "/contact",
-            },
           ],
         },
       ]}
@@ -142,4 +106,4 @@ export default function LandingPage() {
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}

src/app/electricians/page.tsx

@@ -32,7 +32,7 @@ export default function ElectriciansPage() {
               { name: "Electricians", id: "/electricians" },
               { name: "Contact", id: "/contact" },
             ]}
-            brandName="Nano Electrical"
+            brandName="Nanoone"
           />
         </div>
         <div id="elec-about" data-section="elec-about">
@@ -55,7 +55,8 @@ export default function ElectriciansPage() {
         </div>
         <div id="footer" data-section="footer">
           <FooterBaseReveal
-            logoText="Nano Electrical"
+            logoText="Nanoone"
+            logoSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3C83gjjyM4uZB0Yud0ao1GtaWZj/uploaded-1775753866075-dc8oigd9.jpg"
             columns={[
               { title: "Company", items: [{ label: "About", href: "#" }, { label: "Services", href: "#services" }] },
               { title: "Solar", items: [{ label: "Home", href: "/home-solar" }, { label: "Business", href: "/business-solar" }] },

src/app/home-solar/page.tsx

@@ -32,7 +32,7 @@ export default function HomeSolarPage() {
               { name: "Electricians", id: "/electricians" },
               { name: "Contact", id: "/contact" },
             ]}
-            brandName="Nano Electrical"
+            brandName="Nanoone"
           />
         </div>
         <div id="home-about" data-section="home-about">
@@ -55,7 +55,8 @@ export default function HomeSolarPage() {
         </div>
         <div id="footer" data-section="footer">
           <FooterBaseReveal
-            logoText="Nano Electrical"
+            logoText="Nanoone"
+            logoSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3C83gjjyM4uZB0Yud0ao1GtaWZj/uploaded-1775753866075-dc8oigd9.jpg"
             columns={[
               { title: "Company", items: [{ label: "About", href: "#" }, { label: "Services", href: "#services" }] },
               { title: "Solar", items: [{ label: "Home", href: "/home-solar" }, { label: "Business", href: "/business-solar" }] },

src/app/large-scale/page.tsx

@@ -26,31 +26,19 @@ export default function LandingPage() {
       <NavbarStyleApple
       navItems={[
         {
-          name: "Home",
+          name: "Home",          id: "/"},
-          id: "/",
-        },
         {
-          name: "Business Solar",
+          name: "Business Solar",          id: "/business-solar"},
-          id: "/business-solar",
-        },
         {
-          name: "Home Solar",
+          name: "Home Solar",          id: "/home-solar"},
-          id: "/home-solar",
-        },
         {
-          name: "Large Scale",
+          name: "Large Scale",          id: "/large-scale"},
-          id: "/large-scale",
-        },
         {
-          name: "Electricians",
+          name: "Electricians",          id: "/electricians"},
-          id: "/electricians",
-        },
         {
-          name: "Contact",
+          name: "Contact",          id: "/contact"},
-          id: "/contact",
-        },
       ]}
-      brandName="Nano Electrical"
+      brandName="Nanoone"
     />
   </div>
 
@@ -65,8 +53,7 @@ export default function LandingPage() {
       <ContactCenter
       useInvertedBackground={true}
       background={{
-        variant: "plain",
+        variant: "plain"}}
-      }}
       tag="Request"
       title="Get a Quote"
       description="Contact us for industrial scale inquiries."
@@ -75,45 +62,31 @@ export default function LandingPage() {
 
   <div id="footer" data-section="footer">
       <FooterBaseReveal
-      logoText="Nano Electrical"
+      logoText="Nanoone"
+      logoSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3C83gjjyM4uZB0Yud0ao1GtaWZj/uploaded-1775753866075-dc8oigd9.jpg"
       columns={[
         {
-          title: "Company",
+          title: "Company",          items: [
-          items: [
             {
-              label: "About",
+              label: "About",              href: "#"},
-              href: "#",
-            },
             {
-              label: "Services",
+              label: "Services",              href: "#services"},
-              href: "#services",
-            },
           ],
         },
         {
-          title: "Solar",
+          title: "Solar",          items: [
-          items: [
             {
-              label: "Home",
+              label: "Home",              href: "/home-solar"},
-              href: "/home-solar",
-            },
             {
-              label: "Business",
+              label: "Business",              href: "/business-solar"},
-              href: "/business-solar",
-            },
           ],
         },
         {
-          title: "Contact",
+          title: "Contact",          items: [
-          items: [
             {
-              label: "064 184 7070",
+              label: "064 184 7070",              href: "tel:0641847070"},
-              href: "tel:0641847070",
-            },
             {
-              label: "Contact Form",
+              label: "Contact Form",              href: "/contact"},
-              href: "/contact",
-            },
           ],
         },
       ]}
@@ -122,4 +95,4 @@ export default function LandingPage() {
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}

src/app/page.tsx

@@ -33,7 +33,7 @@ export default function LandingPage() {
               { name: "Electricians", id: "/electricians" },
               { name: "Contact", id: "/contact" },
             ]}
-            brandName="Nano Electrical"
+            brandName="Nanoone"
           />
         </div>
 
@@ -47,11 +47,11 @@ export default function LandingPage() {
               { text: "Call 064 184 7070", href: "tel:0641847070" },
             ]}
             mediaItems={[
-              { imageSrc: "http://img.b2bpic.net/free-photo/shareholders-reviewing-solar-panel-components-analyzing-material-quality_482257-123381.jpg", imageAlt: "Modern solar panels on a residential roof" },
+              { imageSrc: "http://img.b2bpic.net/free-photo/shareholders-reviewing-solar-panel-components-analyzing-material-quality_482257-123381.jpg" },
-              { imageSrc: "http://img.b2bpic.net/free-photo/industrial-consultant-examines-high-tech-solar-energy-production-line_482257-125958.jpg?_wi=1", imageAlt: "Commercial solar warehouse installation" },
+              { imageSrc: "http://img.b2bpic.net/free-photo/industrial-consultant-examines-high-tech-solar-energy-production-line_482257-125958.jpg?_wi=1" },
-              { imageSrc: "http://img.b2bpic.net/free-photo/house-holding-blank-sign_1156-354.jpg?_wi=1", imageAlt: "Residential solar energy system" },
+              { imageSrc: "http://img.b2bpic.net/free-photo/house-holding-blank-sign_1156-354.jpg?_wi=1" },
-              { imageSrc: "http://img.b2bpic.net/free-photo/photovoltaic-power-station-middle-field-with-sheep39s_657883-383.jpg?_wi=1", imageAlt: "Large scale solar farm landscape" },
+              { imageSrc: "http://img.b2bpic.net/free-photo/photovoltaic-power-station-middle-field-with-sheep39s_657883-383.jpg?_wi=1" },
-              { imageSrc: "http://img.b2bpic.net/free-photo/man-electrical-technician-working-switchboard-with-fuses-uses-tablet_169016-24593.jpg?_wi=1", imageAlt: "Professional electrical maintenance" },
+              { imageSrc: "http://img.b2bpic.net/free-photo/man-electrical-technician-working-switchboard-with-fuses-uses-tablet_169016-24593.jpg?_wi=1" },
             ]}
           />
         </div>
@@ -91,7 +91,8 @@ export default function LandingPage() {
 
         <div id="footer" data-section="footer">
           <FooterBaseReveal
-            logoText="Nano Electrical"
+            logoText="Nanoone"
+            logoSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3C83gjjyM4uZB0Yud0ao1GtaWZj/uploaded-1775753866075-dc8oigd9.jpg"
             columns={[
               { title: "Company", items: [{ label: "About", href: "#" }, { label: "Services", href: "#services" }] },
               { title: "Solar", items: [{ label: "Home", href: "/home-solar" }, { label: "Business", href: "/business-solar" }] },