Merge version_4 into main

Merge version_4 into main

src/app/layout.tsx

@@ -1384,4 +1384,4 @@ export default function RootLayout({
       </body>
     </html>
   );
-}
+}

src/app/page.tsx

@@ -15,9 +15,9 @@ import { useState } from 'react';
 
 export default function LandingPage() {
   const [formData, setFormData] = useState({
-    phoneNumber: '',
-    email: '',
     workType: '',
+    email: '',
+    phoneNumber: '',
   });
 
   const handleInputChange = (e: React.ChangeEvent<HTMLInputElement | HTMLSelectElement>) => {
@@ -33,9 +33,9 @@ export default function LandingPage() {
     console.log('Quote form submitted:', formData);
     // Handle form submission here
     setFormData({
-      phoneNumber: '',
-      email: '',
       workType: '',
+      email: '',
+      phoneNumber: '',
     });
   };
 
@@ -211,38 +211,6 @@ export default function LandingPage() {
 
             <form onSubmit={handleSubmit} className="bg-card rounded-lg p-8 shadow-lg border border-accent">
               <div className="mb-6">
-                <label htmlFor="phoneNumber" className="block text-sm font-medium mb-2">
-                  Phone Number <span className="text-red-500">*</span>
-                </label>
-                <input
-                  type="tel"
-                  id="phoneNumber"
-                  name="phoneNumber"
-                  value={formData.phoneNumber}
-                  onChange={handleInputChange}
-                  placeholder="(555) 123-4567"
-                  required
-                  className="w-full px-4 py-3 border border-accent rounded-lg focus:outline-none focus:ring-2 focus:ring-primary-cta"
-                />
-              </div>
-
-              <div className="mb-6">
-                <label htmlFor="email" className="block text-sm font-medium mb-2">
-                  Email Address <span className="text-red-500">*</span>
-                </label>
-                <input
-                  type="email"
-                  id="email"
-                  name="email"
-                  value={formData.email}
-                  onChange={handleInputChange}
-                  placeholder="your@email.com"
-                  required
-                  className="w-full px-4 py-3 border border-accent rounded-lg focus:outline-none focus:ring-2 focus:ring-primary-cta"
-                />
-              </div>
-
-              <div className="mb-8">
                 <label htmlFor="workType" className="block text-sm font-medium mb-2">
                   Type of Work Needed <span className="text-red-500">*</span>
                 </label>
@@ -265,6 +233,38 @@ export default function LandingPage() {
                 </select>
               </div>
 
+              <div className="mb-6">
+                <label htmlFor="email" className="block text-sm font-medium mb-2">
+                  Email Address <span className="text-red-500">*</span>
+                </label>
+                <input
+                  type="email"
+                  id="email"
+                  name="email"
+                  value={formData.email}
+                  onChange={handleInputChange}
+                  placeholder="your@email.com"
+                  required
+                  className="w-full px-4 py-3 border border-accent rounded-lg focus:outline-none focus:ring-2 focus:ring-primary-cta"
+                />
+              </div>
+
+              <div className="mb-8">
+                <label htmlFor="phoneNumber" className="block text-sm font-medium mb-2">
+                  Phone Number <span className="text-red-500">*</span>
+                </label>
+                <input
+                  type="tel"
+                  id="phoneNumber"
+                  name="phoneNumber"
+                  value={formData.phoneNumber}
+                  onChange={handleInputChange}
+                  placeholder="(555) 123-4567"
+                  required
+                  className="w-full px-4 py-3 border border-accent rounded-lg focus:outline-none focus:ring-2 focus:ring-primary-cta"
+                />
+              </div>
+
               <button
                 type="submit"
                 className="w-full bg-primary-cta text-white font-semibold py-3 rounded-lg hover:opacity-90 transition-opacity"
@@ -309,4 +309,4 @@ export default function LandingPage() {
       </div>
     </ThemeProvider>
   );
-}
+}