chore(contact): add contact page, update footer, fix issues

Author: debloper

src/App.tsx

@@ -9,7 +9,7 @@ import NotFound from "./pages/NotFound";
 import SolarPanels from "./pages/SolarPanels";
 import HybridInverters from "./pages/HybridInverters";
 import BatteryStorage from "./pages/BatteryStorage";
-import AboutUs from "./pages/AboutUs";
+import ContactUs from "./pages/ContactUs";
 import PrivacyPolicy from "./pages/PrivacyPolicy";
 import TermsOfService from "./pages/TermsOfService";
 import { ThemeProvider } from "./contexts/ThemeContext";
@@ -28,7 +28,7 @@ const App = () => (
             <Route path="/solar-panels" element={<SolarPanels />} />
             <Route path="/hybrid-inverters" element={<HybridInverters />} />
             <Route path="/battery-storage" element={<BatteryStorage />} />
-            <Route path="/about-us" element={<AboutUs />} />
+            <Route path="/contact" element={<ContactUs />} />
             <Route path="/privacy-policy" element={<PrivacyPolicy />} />
             <Route path="/terms-of-service" element={<TermsOfService />} />
             {/* ADD ALL CUSTOM ROUTES ABOVE THE CATCH-ALL "*" ROUTE */}

src/components/Footer.tsx

@@ -7,8 +7,8 @@ const Footer = () => {
     <footer className="bg-solar-blue text-white py-12">
       <div className="container mx-auto px-4">
         <div className="grid md:grid-cols-3 gap-8">
-          <div className="col-span-1">
-            <div className="flex items-center mb-4">
+          <div className="space-y-4">
+            <div className="flex items-center">
               <Link to="/">
                 <svg width="192" height="108" viewBox="0 0 1920 1080" version="1.1" id="logo" xmlns="http://www.w3.org/2000/svg">
                   <g id="g2" transform="translate(-6.0890488)">
@@ -26,33 +26,34 @@ const Footer = () => {
                 </svg>
               </Link>
             </div>
-            <p className="text-gray-300">
-              Your trusted local retailer for premium solar energy solutions.
-            </p>
           </div>
-          
-          <div className="mx-auto">
-            {/* <h3 className="text-lg font-semibold mb-4">Products</h3> */}
-            <ul className="space-y-2 text-gray-300">
-              <li><a href="/solar-panels" className="hover:text-solar-gold">Solar Panels</a></li>
-              <li><a href="/hybrid-inverters" className="hover:text-solar-gold">Hybrid Inverters</a></li>
-              <li><a href="/battery-storage" className="hover:text-solar-gold">Battery Storage</a></li>
+
+          {/* Navigation Links */}
+          <div className="space-y-4">
+            <ul className="space-y-2">
+              <li><Link to="/solar-panels" className="text-gray-300 hover:text-solar-gold transition-colors">Solar Panels</Link></li>
+              <li><Link to="/hybrid-inverters" className="text-gray-300 hover:text-solar-gold transition-colors">Hybrid Inverters</Link></li>
+              <li><Link to="/battery-storage" className="text-gray-300 hover:text-solar-gold transition-colors">Battery Storage</Link></li>
             </ul>
           </div>
-          
-          <div className="mx-auto">
-            {/* <h3 className="text-lg font-semibold mb-4">Contact</h3> */}
-            <ul className="space-y-2 text-gray-300">
-              <li><Link to="/about-us" className="hover:text-solar-gold">About Us</Link></li>
-              <li><a className="hover:text-solar-gold" href="mailto:contact@solvenergy.in">contact@solvenergy.in</a></li>
-              <li>
-                <div className="flex gap-4 mt-4">
-                  <a href="https://www.facebook.com/thesolvenergy/" target="_blank" rel="noopener noreferrer"><svg role="img" className="w-6 h-6" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Facebook</title><path fill="#ffffff" d="M9.101 23.691v-7.98H6.627v-3.667h2.474v-1.58c0-4.085 1.848-5.978 5.858-5.978.401 0 .955.042 1.468.103a8.68 8.68 0 0 1 1.141.195v3.325a8.623 8.623 0 0 0-.653-.036 26.805 26.805 0 0 0-.733-.009c-.707 0-1.259.096-1.675.309a1.686 1.686 0 0 0-.679.622c-.258.42-.374.995-.374 1.752v1.297h3.919l-.386 2.103-.287 1.564h-3.246v8.245C19.396 23.238 24 18.179 24 12.044c0-6.627-5.373-12-12-12s-12 5.373-12 12c0 5.628 3.874 10.35 9.101 11.647Z"/></svg></a>
-                  <a href="https://x.com/TheSOLVENERGY" target="_blank" rel="noopener noreferrer"><svg role="img" className="w-6 h-6" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>X</title><path fill="#ffffff" d="M14.234 10.162 22.977 0h-2.072l-7.591 8.824L7.251 0H.258l9.168 13.343L.258 24H2.33l8.016-9.318L16.749 24h6.993zm-2.837 3.299-.929-1.329L3.076 1.56h3.182l5.965 8.532.929 1.329 7.754 11.09h-3.182z"/></svg></a>
-                  <a href="https://www.instagram.com/thesolvenergy/" target="_blank" rel="noopener noreferrer"><svg role="img" className="w-6 h-6" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Instagram</title><path fill="#ffffff" d="M7.0301.084c-1.2768.0602-2.1487.264-2.911.5634-.7888.3075-1.4575.72-2.1228 1.3877-.6652.6677-1.075 1.3368-1.3802 2.127-.2954.7638-.4956 1.6365-.552 2.914-.0564 1.2775-.0689 1.6882-.0626 4.947.0062 3.2586.0206 3.6671.0825 4.9473.061 1.2765.264 2.1482.5635 2.9107.308.7889.72 1.4573 1.388 2.1228.6679.6655 1.3365 1.0743 2.1285 1.38.7632.295 1.6361.4961 2.9134.552 1.2773.056 1.6884.069 4.9462.0627 3.2578-.0062 3.668-.0207 4.9478-.0814 1.28-.0607 2.147-.2652 2.9098-.5633.7889-.3086 1.4578-.72 2.1228-1.3881.665-.6682 1.0745-1.3378 1.3795-2.1284.2957-.7632.4966-1.636.552-2.9124.056-1.2809.0692-1.6898.063-4.948-.0063-3.2583-.021-3.6668-.0817-4.9465-.0607-1.2797-.264-2.1487-.5633-2.9117-.3084-.7889-.72-1.4568-1.3876-2.1228C21.2982 1.33 20.628.9208 19.8378.6165 19.074.321 18.2017.1197 16.9244.0645 15.6471.0093 15.236-.005 11.977.0014 8.718.0076 8.31.0215 7.0301.0839m.1402 21.6932c-1.17-.0509-1.8053-.2453-2.2287-.408-.5606-.216-.96-.4771-1.3819-.895-.422-.4178-.6811-.8186-.9-1.378-.1644-.4234-.3624-1.058-.4171-2.228-.0595-1.2645-.072-1.6442-.079-4.848-.007-3.2037.0053-3.583.0607-4.848.05-1.169.2456-1.805.408-2.2282.216-.5613.4762-.96.895-1.3816.4188-.4217.8184-.6814 1.3783-.9003.423-.1651 1.0575-.3614 2.227-.4171 1.2655-.06 1.6447-.072 4.848-.079 3.2033-.007 3.5835.005 4.8495.0608 1.169.0508 1.8053.2445 2.228.408.5608.216.96.4754 1.3816.895.4217.4194.6816.8176.9005 1.3787.1653.4217.3617 1.056.4169 2.2263.0602 1.2655.0739 1.645.0796 4.848.0058 3.203-.0055 3.5834-.061 4.848-.051 1.17-.245 1.8055-.408 2.2294-.216.5604-.4763.96-.8954 1.3814-.419.4215-.8181.6811-1.3783.9-.4224.1649-1.0577.3617-2.2262.4174-1.2656.0595-1.6448.072-4.8493.079-3.2045.007-3.5825-.006-4.848-.0608M16.953 5.5864A1.44 1.44 0 1 0 18.39 4.144a1.44 1.44 0 0 0-1.437 1.4424M5.8385 12.012c.0067 3.4032 2.7706 6.1557 6.173 6.1493 3.4026-.0065 6.157-2.7701 6.1506-6.1733-.0065-3.4032-2.771-6.1565-6.174-6.1498-3.403.0067-6.156 2.771-6.1496 6.1738M8 12.0077a4 4 0 1 1 4.008 3.9921A3.9996 3.9996 0 0 1 8 12.0077"/></svg></a>
+
+          {/* Contact Info & Social */}
+          <div className="space-y-4">
+            <Link to="/contact-us" className="text-gray-300 hover:text-solar-gold transition-colors">Contact Us</Link>
+            <div className="space-y-3">
+              <a className="text-gray-300 hover:text-solar-gold transition-colors" href="mailto:contact@solvenergy.in">contact@solvenergy.in</a>
+                <div className="flex gap-4">
+                  <a href="https://www.facebook.com/thesolvenergy/" target="_blank" rel="noopener noreferrer" className="text-gray-300 hover:text-solar-gold transition-colors">
+                    <svg role="img" className="w-6 h-6" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Facebook</title><path fill="currentColor" d="M9.101 23.691v-7.98H6.627v-3.667h2.474v-1.58c0-4.085 1.848-5.978 5.858-5.978.401 0 .955.042 1.468.103a8.68 8.68 0 0 1 1.141.195v3.325a8.623 8.623 0 0 0-.653-.036 26.805 26.805 0 0 0-.733-.009c-.707 0-1.259.096-1.675.309a1.686 1.686 0 0 0-.679.622c-.258.42-.374.995-.374 1.752v1.297h3.919l-.386 2.103-.287 1.564h-3.246v8.245C19.396 23.238 24 18.179 24 12.044c0-6.627-5.373-12-12-12s-12 5.373-12 12c0 5.628 3.874 10.35 9.101 11.647Z"/></svg>
+                  </a>
+                  <a href="https://x.com/TheSOLVENERGY" target="_blank" rel="noopener noreferrer" className="text-gray-300 hover:text-solar-gold transition-colors">
+                    <svg role="img" className="w-6 h-6" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>X</title><path fill="currentColor" d="M14.234 10.162 22.977 0h-2.072l-7.591 8.824L7.251 0H.258l9.168 13.343L.258 24H2.33l8.016-9.318L16.749 24h6.993zm-2.837 3.299-.929-1.329L3.076 1.56h3.182l5.965 8.532.929 1.329 7.754 11.09h-3.182z"/></svg>
+                  </a>
+                  <a href="https://www.instagram.com/thesolvenergy/" target="_blank" rel="noopener noreferrer" className="text-gray-300 hover:text-solar-gold transition-colors">
+                    <svg role="img" className="w-6 h-6" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Instagram</title><path fill="currentColor" d="M7.0301.084c-1.2768.0602-2.1487.264-2.911.5634-.7888.3075-1.4575.72-2.1228 1.3877-.6652.6677-1.075 1.3368-1.3802 2.127-.2954.7638-.4956 1.6365-.552 2.914-.0564 1.2775-.0689 1.6882-.0626 4.947.0062 3.2586.0206 3.6671.0825 4.9473.061 1.2765.264 2.1482.5635 2.9107.308.7889.72 1.4573 1.388 2.1228.6679.6655 1.3365 1.0743 2.1285 1.38.7632.295 1.6361.4961 2.9134.552 1.2773.056 1.6884.069 4.9462.0627 3.2578-.0062 3.668-.0207 4.9478-.0814 1.28-.0607 2.147-.2652 2.9098-.5633.7889-.3086 1.4578-.72 2.1228-1.3881.665-.6682 1.0745-1.3378 1.3795-2.1284.2957-.7632.4966-1.636.552-2.9124.056-1.2809.0692-1.6898.063-4.948-.0063-3.2583-.021-3.6668-.0817-4.9465-.0607-1.2797-.264-2.1487-.5633-2.9117-.3084-.7889-.72-1.4568-1.3876-2.1228C21.2982 1.33 20.628.9208 19.8378.6165 19.074.321 18.2017.1197 16.9244.0645 15.6471.0093 15.236-.005 11.977.0014 8.718.0076 8.31.0215 7.0301.0839m.1402 21.6932c-1.17-.0509-1.8053-.2453-2.2287-.408-.5606-.216-.96-.4771-1.3819-.895-.422-.4178-.6811-.8186-.9-1.378-.1644-.4234-.3624-1.058-.4171-2.228-.0595-1.2645-.072-1.6442-.079-4.848-.007-3.2037.0053-3.583.0607-4.848.05-1.169.2456-1.805.408-2.2282.216-.5613.4762-.96.895-1.3816.4188-.4217.8184-.6814 1.3783-.9003.423-.1651 1.0575-.3614 2.227-.4171 1.2655-.06 1.6447-.072 4.848-.079 3.2033-.007 3.5835.005 4.8495.0608 1.169.0508 1.8053.2445 2.228.408.5608.216.96.4754 1.3816.895.4217.4194.6816.8176.9005 1.3787.1653.4217.3617 1.056.4169 2.2263.0602 1.2655.0739 1.645.0796 4.848.0058 3.203-.0055 3.5834-.061 4.848-.051 1.17-.245 1.8055-.408 2.2294-.216.5604-.4763.96-.8954 1.3814-.419.4215-.8181.6811-1.3783.9-.4224.1649-1.0577.3617-2.2262.4174-1.2656.0595-1.6448.072-4.8493.079-3.2045.007-3.5825-.006-4.848-.0608M16.953 5.5864A1.44 1.44 0 1 0 18.39 4.144a1.44 1.44 0 0 0-1.437 1.4424M5.8385 12.012c.0067 3.4032 2.7706 6.1557 6.173 6.1493 3.4026-.0065 6.157-2.7701 6.1506-6.1733-.0065-3.4032-2.771-6.1565-6.174-6.1498-3.403.0067-6.156 2.771-6.1496 6.1738M8 12.0077a4 4 0 1 1 4.008 3.9921A3.9996 3.9996 0 0 1 8 12.0077"/></svg>
+                  </a>
                 </div>
-              </li>
-            </ul>
+            </div>
           </div>
         </div>
 

src/components/HeroSection.tsx

@@ -62,7 +62,7 @@ const HeroSection = () => {
                 onClick={scrollToNextSection}
                 className={`${theme === 'dark' ? 'bg-blue-500 hover:bg-blue-600 text-white' : 'bg-solar-gold hover:bg-opacity-90 text-solar-blue hover:bg-white'} font-medium text-lg px-6 py-6 transition-transform hover:scale-105 duration-300`}
               >
-                Get Started
+                Estimate
               </Button>
               <Button 
                 onClick={navigateToSolarPanels}

src/components/LoadCalculatorSection.tsx

@@ -5,6 +5,7 @@ import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 import { Calculator, Plus, Trash2 } from "lucide-react";
+import { Link } from "react-router-dom";
 
 interface Appliance {
   id: string;
@@ -88,12 +89,12 @@ const LoadCalculatorSection = () => {
     <section id="calculator" className="solar-section bg-solar-light dark:bg-gray-900 py-24 transition-colors duration-300">
       <div className="solar-container">
         <div className="text-center max-w-3xl mx-auto mb-16">
-          <div className="flex items-center justify-center mb-10">
+          <div className="flex items-center justify-center my-12">
             <Calculator className="h-8 w-8 text-solar-blue dark:text-blue-300 mr-3" />
-            <h2 className="section-title mb-0">Solar Load Calculator</h2>
+            <h2 className="section-title mb-0">Estimate: Solar Solution Requirements</h2>
           </div>
           <p className="text-lg text-gray-600 dark:text-gray-300 mb-6 transition-colors duration-300">
-            Calculate your power requirements to determine the right solar system size for your home.
+            Calculate your power demands to determine the right solar system size.
             Add your appliances and get instant recommendations.
           </p>
         </div>
@@ -305,6 +306,12 @@ const LoadCalculatorSection = () => {
                 </Button> */}
               </CardContent>
             </Card>
+
+            <Link to="/contact" className="block">
+              <Button className="w-full bg-solar-gold hover:bg-opacity-90 text-solar-blue font-semibold text-xl py-8 transition-transform hover:scale-105 duration-300">
+                Contact us for quotations!
+              </Button>
+            </Link>
           </div>
         </div>
       </div>

src/components/Navbar.tsx

@@ -40,16 +40,6 @@ const Navbar = () => {
     }
   };
 
-  const handlePowerCalculatorClick = () => {
-    navigate('/');
-    setTimeout(() => {
-      const calculatorSection = document.getElementById('calculator');
-      if (calculatorSection) {
-        calculatorSection.scrollIntoView({ behavior: 'smooth' });
-      }
-    }, 100);
-  };
-
   return (
     <header
       className={`fixed w-full z-50 transition-all duration-300 ${
@@ -80,6 +70,13 @@ const Navbar = () => {
 
         {/* Desktop Navigation */}
         <nav className="hidden md:flex items-center space-x-8">
+          <Link
+            to="/#calculator"
+            onClick={() => scrollToSection("calculator")}
+            className={`${isScrolled ? "bg-solar-blue" : "bg-gray-800"} ${theme === 'dark' ? "" : "hover:text-solar-blue"} rounded-md px-3 py-2 font-semibold hover:bg-accent text-md text-white dark:bg-blue-700 dark:hover:bg-blue-800 transition-colors`}
+          >
+            Estimate
+          </Link>
           <NavigationMenu>
             <NavigationMenuList>
               <NavigationMenuItem>
@@ -126,22 +123,6 @@ const Navbar = () => {
               </NavigationMenuItem>
             </NavigationMenuList>
           </NavigationMenu>
-          {/* <button 
-            onClick={handlePowerCalculatorClick}
-            className={`${isScrolled ? "text-gray-800" : theme === 'dark' ? "text-white" : "text-gray-800"} dark:text-gray-200 transition-colors font-medium`}
-          >
-            Power Calculator
-          </button> */}
-          <Link to="/about-us" className={`${isScrolled ? "text-gray-800" : theme === 'dark' ? "text-white" : "text-gray-800"} dark:text-gray-200 transition-colors font-medium rounded-md px-3 py-2 hover:bg-accent/50`}>
-            About Us
-          </Link>
-          <Link 
-            to="/#calculator"
-            onClick={() => scrollToSection("calculator")}
-            className={`${isScrolled ? "bg-solar-blue" : "bg-gray-800"} ${theme === 'dark' ? "" : "hover:text-solar-blue"} rounded-md px-3 py-2 font-semibold hover:bg-accent text-md text-white dark:bg-blue-700 dark:hover:bg-blue-800 transition-colors`}
-          >
-            Power Calculator
-          </Link>
           <Button variant="ghost" size="icon" onClick={toggleTheme} className="ml-2 transition-transform hover:rotate-12 duration-300">
             {theme === 'dark' ? <Sun className="h-5 w-5" /> : <Moon className="h-5 w-5" />}
           </Button>
@@ -171,6 +152,15 @@ const Navbar = () => {
       {mobileMenuOpen && (
         <div className="md:hidden bg-white dark:bg-gray-800 shadow-lg py-4 transition-all duration-300 transform animate-accordion-down">
           <div className="container mx-auto px-4 flex flex-col space-y-4">
+            <Link
+              to="/#calculator"
+              onClick={() => {
+                setMobileMenuOpen(false);
+              }}
+              className="text-solar-blue dark:text-white font-medium py-2 transition-colors text-left"
+            >
+              Estimate
+            </Link>
             <div className="text-solar-blue dark:text-white font-medium py-2 transition-colors">
               Products
             </div>
@@ -197,30 +187,12 @@ const Navbar = () => {
                 Battery Storage
               </Link>
             </div>
-            <button
-              onClick={() => {
-                handlePowerCalculatorClick();
-                setMobileMenuOpen(false);
-              }}
-              className="text-solar-blue dark:text-white font-medium py-2 transition-colors text-left"
-            >
-              Power Calculator
-            </button>
             <Link
-              to="/about-us"
+              to="/contact"
               className="text-solar-blue dark:text-white font-medium py-2 transition-colors"
               onClick={() => setMobileMenuOpen(false)}
             >
-              About Us
-            </Link>
-            <Link
-              to="/#calculator" 
-              onClick={() => {
-                setMobileMenuOpen(false);
-              }}
-              className="bg-solar-blue hover:bg-opacity-90 text-white dark:bg-blue-700 dark:hover:bg-blue-800 transition-colors w-full"
-            >
-              Power Calculator
+              Contact Us
             </Link>
           </div>
         </div>