From 6d1f3ed3e0503b445b95a38a29e14567621c383a Mon Sep 17 00:00:00 2001
From: Vivek Vishal <vishalvivek488@gmail.com>
Date: Tue, 14 Jan 2025 14:45:30 +0000
Subject: [PATCH 01/14] add contact-us form specific fields

Signed-off-by: GitHub <noreply@github.com>
---
 src/components/CommonForm/index.js | 85 ++++++++++++++++++------------
 1 file changed, 50 insertions(+), 35 deletions(-)

diff --git a/src/components/CommonForm/index.js b/src/components/CommonForm/index.js
index 5cf5926c3326..f79d2bdabba0 100644
--- a/src/components/CommonForm/index.js
+++ b/src/components/CommonForm/index.js
@@ -134,12 +134,13 @@ const CommonForm = ({ form, title, submit_title, submit_body }) => {
         <label htmlFor="email" className="form-name">Email Address <span className="required-sign">*</span></label>
         {validateEmail && <p style={{ margin: "0px", color: "red", fontSize: "16px" }}>{errorEmail}</p>}
         <Field type="email" className="text-field" id="email" name="email" pattern="([a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}$)" required />
-        <label htmlFor="occupation" className="form-name">Occupation / Title <span className="required-sign">*</span></label>
-        <Field type="text" className="text-field" id="occupation" name="occupation" required />
-        <label htmlFor="org" className="form-name">Organization / Company / School <span className="required-sign">*</span></label>
-        <Field type="text" className="text-field" id="org" name="org" />
-
-        {/* <div className="accounts">
+        { form != "contact" && (
+          <>
+            <label htmlFor="occupation" className="form-name">Occupation / Title <span className="required-sign">*</span></label>
+            <Field type="text" className="text-field" id="occupation" name="occupation" required />
+            <label htmlFor="org" className="form-name">Organization / Company / School <span className="required-sign">*</span></label>
+            <Field type="text" className="text-field" id="org" name="org" />
+            {/* <div className="accounts">
            <label className="form-name">Account(s) to Connect</label>
            <p>
              {account_desc}
@@ -157,35 +158,49 @@ const CommonForm = ({ form, title, submit_title, submit_body }) => {
             </div>
          </div> */}
 
-        <label htmlFor="role" className="form-name">What role best identifies you? <span className="required-sign">*</span></label>
-        {validateRole && <p style={{ margin: "0px", color: "red", fontSize: "16px" }}>{errorRole}</p>}
-        <div role="group" className="formRight" aria-labelledby="select">
-          <Field as="select" name="role">
-            <option defaultValue hidden className="custom-arrow">Select your role</option>
-            <option className="options" value="Architect">Architect</option>
-            <option className="options" value="Backend Engineer">Backend Engineer</option>
-            <option className="options" value="Business Operations">Business Operations</option>
-            <option className="options" value="Data Analyst">Data Analyst</option>
-            <option className="options" value="Designer">Designer</option>
-            <option className="options" value="Developer">Developer</option>
-            <option className="options" value="DevOps Engineer">DevOps Engineer / SysAdmin</option>
-            <option className="options" value="Executive">Executive</option>
-            <option className="options" value="Frontend Engineer">Frontend Engineer</option>
-            <option className="options" value="Fullstack Engineer">Fullstack Engineer</option>
-            <option className="options" value="IT Operations">IT Operations</option>
-            <option className="options" value="Manager">Manager</option>
-            <option className="options" value="Marketing">Marketing</option>
-            <option className="options" value="Media/Analyst">Media/Analyst</option>
-            <option className="options" value="Platform Engineer">Platform Engineer</option>
-            <option className="options" value="Professor/Academic">Professor/Academic</option>
-            <option className="options" value="Product Manager">Product Manager</option>
-            <option className="options" value="Sales">Sales</option>
-            <option className="options" value="Sales Engineer">Sales Engineer</option>
-            <option className="options" value="Site Reliability Engineer">Site Reliability Engineer</option>
-            <option className="options" value="Student">Student</option>
-            <option className="options" value="Other">Other</option>
-          </Field>
-        </div>
+            <label htmlFor="role" className="form-name">What role best identifies you? <span className="required-sign">*</span></label>
+            {validateRole && <p style={{ margin: "0px", color: "red", fontSize: "16px" }}>{errorRole}</p>}
+            <div role="group" className="formRight" aria-labelledby="select">
+              <Field as="select" name="role">
+                <option defaultValue hidden className="custom-arrow">Select your role</option>
+                <option className="options" value="Architect">Architect</option>
+                <option className="options" value="Backend Engineer">Backend Engineer</option>
+                <option className="options" value="Business Operations">Business Operations</option>
+                <option className="options" value="Data Analyst">Data Analyst</option>
+                <option className="options" value="Designer">Designer</option>
+                <option className="options" value="Developer">Developer</option>
+                <option className="options" value="DevOps Engineer">DevOps Engineer / SysAdmin</option>
+                <option className="options" value="Executive">Executive</option>
+                <option className="options" value="Frontend Engineer">Frontend Engineer</option>
+                <option className="options" value="Fullstack Engineer">Fullstack Engineer</option>
+                <option className="options" value="IT Operations">IT Operations</option>
+                <option className="options" value="Manager">Manager</option>
+                <option className="options" value="Marketing">Marketing</option>
+                <option className="options" value="Media/Analyst">Media/Analyst</option>
+                <option className="options" value="Platform Engineer">Platform Engineer</option>
+                <option className="options" value="Professor/Academic">Professor/Academic</option>
+                <option className="options" value="Product Manager">Product Manager</option>
+                <option className="options" value="Sales">Sales</option>
+                <option className="options" value="Sales Engineer">Sales Engineer</option>
+                <option className="options" value="Site Reliability Engineer">Site Reliability Engineer</option>
+                <option className="options" value="Student">Student</option>
+                <option className="options" value="Other">Other</option>
+              </Field>
+            </div>
+          </>
+        )}
+        {form == "contact" && (
+          <>
+            <label htmlFor="subject" className="form-name">
+              Subject <span className="required-sign">*</span>
+            </label>
+            <Field type="text" required className="text-field" id="subject" name="subject" />
+            <label htmlFor="message" className="form-name">
+            Message <span className="required-sign">*</span>
+            </label>
+            <Field as="textarea" required  rows="8" type="text" className="text-field" id="message" name="message" />
+          </>
+        )}
         {form == "open-source-pricing" && (
           <>
             <label htmlFor="projectname" className="form-name">

From 9f4008947eb161ca01bc465b3d13956d408b4fbb Mon Sep 17 00:00:00 2001
From: Vivek Vishal <vishalvivek488@gmail.com>
Date: Tue, 14 Jan 2025 14:46:47 +0000
Subject: [PATCH 02/14] replace with CommonForm

Signed-off-by: GitHub <noreply@github.com>
---
 src/sections/Company/Contact/index.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/sections/Company/Contact/index.js b/src/sections/Company/Contact/index.js
index b81277fa05ca..09ef25c9b2b5 100644
--- a/src/sections/Company/Contact/index.js
+++ b/src/sections/Company/Contact/index.js
@@ -1,5 +1,5 @@
 import React, { useRef } from "react";
-import { Container, Row } from "../../../reusecore/Layout";
+import { Container, Row, Col } from "../../../reusecore/Layout";
 import PageHeader from "../../../reusecore/PageHeader";
 import Jobs_Icon from "../../../assets/images/contact/job.svg";
 import Support_Icon from "../../../assets/images/contact/support.svg";
@@ -8,6 +8,7 @@ import Contact_Icon from "../../../assets/images/contact/contact.svg";
 import CardOutline from "../../../components/Card-Outline";
 import ContactPageWrapper from "./contactpage.style";
 import ContactForm from "../../../components/ContactForm";
+import CommonForm from "../../../components/CommonForm";
 
 const ContactPage = () => {
   const expandForm = useRef();
@@ -64,7 +65,16 @@ const ContactPage = () => {
           </Row>
           <div className="contact-form" ref={expandForm}>
             <Container>
-              <ContactForm />
+              {/* <ContactForm /> */}
+              <Col $lg={5} $md={6} $sm={12} style={{ padding: "0", marginLeft: "auto", marginRight: "auto" }}>
+                <CommonForm
+                  title="Contact us"
+                  form="contact"
+                  account_desc=""
+                  submit_title="Thanks for contacting us!"
+                  submit_body="We'll get back to you as soon as we can."
+                />
+              </Col>
             </Container>
           </div>
         </Row>
@@ -73,4 +83,4 @@ const ContactPage = () => {
   );
 };
 
-export default ContactPage;
+export default ContactPage;
\ No newline at end of file

From 49dce72e9fad3cf99e0342b87cf558bc04eec79c Mon Sep 17 00:00:00 2001
From: Vivek Vishal <vishalvivek488@gmail.com>
Date: Tue, 14 Jan 2025 15:49:26 +0000
Subject: [PATCH 03/14] update

Signed-off-by: GitHub <noreply@github.com>
---
 src/components/CommonForm/index.js | 79 ++++++++++++++----------------
 1 file changed, 38 insertions(+), 41 deletions(-)

diff --git a/src/components/CommonForm/index.js b/src/components/CommonForm/index.js
index f79d2bdabba0..f05b0690516e 100644
--- a/src/components/CommonForm/index.js
+++ b/src/components/CommonForm/index.js
@@ -134,13 +134,12 @@ const CommonForm = ({ form, title, submit_title, submit_body }) => {
         <label htmlFor="email" className="form-name">Email Address <span className="required-sign">*</span></label>
         {validateEmail && <p style={{ margin: "0px", color: "red", fontSize: "16px" }}>{errorEmail}</p>}
         <Field type="email" className="text-field" id="email" name="email" pattern="([a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}$)" required />
-        { form != "contact" && (
-          <>
-            <label htmlFor="occupation" className="form-name">Occupation / Title <span className="required-sign">*</span></label>
-            <Field type="text" className="text-field" id="occupation" name="occupation" required />
-            <label htmlFor="org" className="form-name">Organization / Company / School <span className="required-sign">*</span></label>
-            <Field type="text" className="text-field" id="org" name="org" />
-            {/* <div className="accounts">
+        <label htmlFor="occupation" className="form-name">Occupation / Title <span className="required-sign">*</span></label>
+        <Field type="text" className="text-field" id="occupation" name="occupation" required />
+        <label htmlFor="org" className="form-name">Organization / Company / School <span className="required-sign">*</span></label>
+        <Field type="text" className="text-field" id="org" name="org" />
+
+        {/* <div className="accounts">
            <label className="form-name">Account(s) to Connect</label>
            <p>
              {account_desc}
@@ -158,38 +157,36 @@ const CommonForm = ({ form, title, submit_title, submit_body }) => {
             </div>
          </div> */}
 
-            <label htmlFor="role" className="form-name">What role best identifies you? <span className="required-sign">*</span></label>
-            {validateRole && <p style={{ margin: "0px", color: "red", fontSize: "16px" }}>{errorRole}</p>}
-            <div role="group" className="formRight" aria-labelledby="select">
-              <Field as="select" name="role">
-                <option defaultValue hidden className="custom-arrow">Select your role</option>
-                <option className="options" value="Architect">Architect</option>
-                <option className="options" value="Backend Engineer">Backend Engineer</option>
-                <option className="options" value="Business Operations">Business Operations</option>
-                <option className="options" value="Data Analyst">Data Analyst</option>
-                <option className="options" value="Designer">Designer</option>
-                <option className="options" value="Developer">Developer</option>
-                <option className="options" value="DevOps Engineer">DevOps Engineer / SysAdmin</option>
-                <option className="options" value="Executive">Executive</option>
-                <option className="options" value="Frontend Engineer">Frontend Engineer</option>
-                <option className="options" value="Fullstack Engineer">Fullstack Engineer</option>
-                <option className="options" value="IT Operations">IT Operations</option>
-                <option className="options" value="Manager">Manager</option>
-                <option className="options" value="Marketing">Marketing</option>
-                <option className="options" value="Media/Analyst">Media/Analyst</option>
-                <option className="options" value="Platform Engineer">Platform Engineer</option>
-                <option className="options" value="Professor/Academic">Professor/Academic</option>
-                <option className="options" value="Product Manager">Product Manager</option>
-                <option className="options" value="Sales">Sales</option>
-                <option className="options" value="Sales Engineer">Sales Engineer</option>
-                <option className="options" value="Site Reliability Engineer">Site Reliability Engineer</option>
-                <option className="options" value="Student">Student</option>
-                <option className="options" value="Other">Other</option>
-              </Field>
-            </div>
-          </>
-        )}
-        {form == "contact" && (
+        <label htmlFor="role" className="form-name">What role best identifies you? <span className="required-sign">*</span></label>
+        {validateRole && <p style={{ margin: "0px", color: "red", fontSize: "16px" }}>{errorRole}</p>}
+        <div role="group" className="formRight" aria-labelledby="select">
+          <Field as="select" name="role">
+            <option defaultValue hidden className="custom-arrow">Select your role</option>
+            <option className="options" value="Architect">Architect</option>
+            <option className="options" value="Backend Engineer">Backend Engineer</option>
+            <option className="options" value="Business Operations">Business Operations</option>
+            <option className="options" value="Data Analyst">Data Analyst</option>
+            <option className="options" value="Designer">Designer</option>
+            <option className="options" value="Developer">Developer</option>
+            <option className="options" value="DevOps Engineer">DevOps Engineer / SysAdmin</option>
+            <option className="options" value="Executive">Executive</option>
+            <option className="options" value="Frontend Engineer">Frontend Engineer</option>
+            <option className="options" value="Fullstack Engineer">Fullstack Engineer</option>
+            <option className="options" value="IT Operations">IT Operations</option>
+            <option className="options" value="Manager">Manager</option>
+            <option className="options" value="Marketing">Marketing</option>
+            <option className="options" value="Media/Analyst">Media/Analyst</option>
+            <option className="options" value="Platform Engineer">Platform Engineer</option>
+            <option className="options" value="Professor/Academic">Professor/Academic</option>
+            <option className="options" value="Product Manager">Product Manager</option>
+            <option className="options" value="Sales">Sales</option>
+            <option className="options" value="Sales Engineer">Sales Engineer</option>
+            <option className="options" value="Site Reliability Engineer">Site Reliability Engineer</option>
+            <option className="options" value="Student">Student</option>
+            <option className="options" value="Other">Other</option>
+          </Field>
+        </div>
+        {form === "contact" && (
           <>
             <label htmlFor="subject" className="form-name">
               Subject <span className="required-sign">*</span>
@@ -198,7 +195,7 @@ const CommonForm = ({ form, title, submit_title, submit_body }) => {
             <label htmlFor="message" className="form-name">
             Message <span className="required-sign">*</span>
             </label>
-            <Field as="textarea" required  rows="8" type="text" className="text-field" id="message" name="message" />
+            <Field as="textarea" required rows="8" type="text" className="text-field" id="message" name="message" />
           </>
         )}
         {form == "open-source-pricing" && (
@@ -306,4 +303,4 @@ const ThankYou = forwardRef(({ title, description }, ref) => {
 });
 
 
-export default CommonForm;
+export default CommonForm;
\ No newline at end of file

From d4049b6ef9e26d2dfe3093c3d51aff4beaab0434 Mon Sep 17 00:00:00 2001
From: Vivek Vishal <vishalvivek488@gmail.com>
Date: Tue, 14 Jan 2025 16:23:25 +0000
Subject: [PATCH 04/14] set height to auto

Signed-off-by: GitHub <noreply@github.com>
---
 src/sections/Company/Contact/contactpage.style.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sections/Company/Contact/contactpage.style.js b/src/sections/Company/Contact/contactpage.style.js
index 925e9b7f1a6b..99c0399ed69d 100644
--- a/src/sections/Company/Contact/contactpage.style.js
+++ b/src/sections/Company/Contact/contactpage.style.js
@@ -44,7 +44,7 @@ const ContactPageWrapper = styled.section`
   .showForm {
     display: flex;
     flex-wrap: wrap;
-    height: 70rem;
+    height: auto;
     margin: auto -15px;
   }
 

From bcc89b7d3cadd3bf1de8ef1fe50a04d8850caa8e Mon Sep 17 00:00:00 2001
From: Vivek Vishal <vishalvivek488@gmail.com>
Date: Tue, 14 Jan 2025 16:24:16 +0000
Subject: [PATCH 05/14] custom submit button title

Signed-off-by: GitHub <noreply@github.com>
---
 src/components/CommonForm/index.js    | 5 +++--
 src/sections/Company/Contact/index.js | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/CommonForm/index.js b/src/components/CommonForm/index.js
index f05b0690516e..32ee3e3d44b5 100644
--- a/src/components/CommonForm/index.js
+++ b/src/components/CommonForm/index.js
@@ -7,7 +7,7 @@ import { Container } from "../../reusecore/Layout";
 import layer5_img from "../../assets/images/layer5/layer5-only/svg/layer5-white-no-trim.svg";
 
 
-const CommonForm = ({ form, title, submit_title, submit_body }) => {
+const CommonForm = ({ form, title, submit_title, submit_body, submit_button_title }) => {
 
   const [stepNumber, setStepNumber] = useState(0);
   const [memberFormOne, setMemberFormOne] = useState({});
@@ -196,6 +196,7 @@ const CommonForm = ({ form, title, submit_title, submit_body }) => {
             Message <span className="required-sign">*</span>
             </label>
             <Field as="textarea" required rows="8" type="text" className="text-field" id="message" name="message" />
+            <div>By providing my contact information, I authorize Layer5 to contact me with communications about 's products and services.</div>
           </>
         )}
         {form == "open-source-pricing" && (
@@ -276,7 +277,7 @@ const CommonForm = ({ form, title, submit_title, submit_body }) => {
         )}
 
 
-        <Button $secondary className="btn" title="Submit" />
+        <Button $secondary className="btn" title={submit_button_title || "Submit"} />
       </Form>
     </Formik>
   </div>
diff --git a/src/sections/Company/Contact/index.js b/src/sections/Company/Contact/index.js
index 09ef25c9b2b5..0812e3b761de 100644
--- a/src/sections/Company/Contact/index.js
+++ b/src/sections/Company/Contact/index.js
@@ -73,6 +73,7 @@ const ContactPage = () => {
                   account_desc=""
                   submit_title="Thanks for contacting us!"
                   submit_body="We'll get back to you as soon as we can."
+                  submit_button_title="Contact us"
                 />
               </Col>
             </Container>

From fb76bee047b93b1fb697bb87c46cc9975849a400 Mon Sep 17 00:00:00 2001
From: Vivek Vishal <vishalvivek488@gmail.com>
Date: Tue, 14 Jan 2025 16:26:39 +0000
Subject: [PATCH 06/14] missing text fix

Signed-off-by: GitHub <noreply@github.com>
---
 src/components/CommonForm/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/CommonForm/index.js b/src/components/CommonForm/index.js
index 32ee3e3d44b5..09c3830e47be 100644
--- a/src/components/CommonForm/index.js
+++ b/src/components/CommonForm/index.js
@@ -196,7 +196,7 @@ const CommonForm = ({ form, title, submit_title, submit_body, submit_button_titl
             Message <span className="required-sign">*</span>
             </label>
             <Field as="textarea" required rows="8" type="text" className="text-field" id="message" name="message" />
-            <div>By providing my contact information, I authorize Layer5 to contact me with communications about 's products and services.</div>
+            <div>By providing my contact information, I authorize Layer5 to contact me with communications about Layer5's products and services.</div>
           </>
         )}
         {form == "open-source-pricing" && (

From 8c74d255a8186593976719b5631ea3c4e8289a29 Mon Sep 17 00:00:00 2001
From: Vivek Vishal <vishalvivek488@gmail.com>
Date: Tue, 14 Jan 2025 17:01:56 +0000
Subject: [PATCH 07/14] checkbox for sub

Signed-off-by: GitHub <noreply@github.com>
---
 src/components/CommonForm/index.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/components/CommonForm/index.js b/src/components/CommonForm/index.js
index 09c3830e47be..398de603ea3f 100644
--- a/src/components/CommonForm/index.js
+++ b/src/components/CommonForm/index.js
@@ -196,6 +196,14 @@ const CommonForm = ({ form, title, submit_title, submit_body, submit_button_titl
             Message <span className="required-sign">*</span>
             </label>
             <Field as="textarea" required rows="8" type="text" className="text-field" id="message" name="message" />
+            <label>
+              <Field
+                type="checkbox"
+                name="subscribed"
+                className="form-check"
+              />
+              <span>Subscribe to our newsletter</span>
+            </label>
             <div>By providing my contact information, I authorize Layer5 to contact me with communications about Layer5's products and services.</div>
           </>
         )}

From 17eb950a0ea916606993b232d709f958f6ef54c0 Mon Sep 17 00:00:00 2001
From: Vivek Vishal <vishalvivek488@gmail.com>
Date: Tue, 14 Jan 2025 17:14:43 +0000
Subject: [PATCH 08/14] update mailchimp form with formic contact sales form

Signed-off-by: GitHub <noreply@github.com>
---
 src/components/PlanCard/index.js | 66 ++++++++++++++++++++++++++++++--
 1 file changed, 63 insertions(+), 3 deletions(-)

diff --git a/src/components/PlanCard/index.js b/src/components/PlanCard/index.js
index b3b8cca35533..5a66cfca5ad6 100644
--- a/src/components/PlanCard/index.js
+++ b/src/components/PlanCard/index.js
@@ -1,10 +1,18 @@
-import React from "react";
+import React, { useState } from "react";
 import Button from "../../reusecore/Button";
 import { Col, Row, Container } from "../../reusecore/Layout";
 import PlanCardWrapper from "./planCard.style";
 import FeatureDetails from "./collapsible-details";
+import Modal from "react-modal";
+import CommonForm from "../CommonForm";
 
 const PlanCard = ({ planData , isYearly }) => {
+
+  const [modalIsOpen, setModalIsOpen] = useState(false);
+
+  const openModal = () => setModalIsOpen(true);
+  const closeModal = () => setModalIsOpen(false);
+
   if (!planData || !Array.isArray(planData) || planData.length === 0) {
     return <div>No plan data available</div>;
   }
@@ -76,9 +84,9 @@ const PlanCard = ({ planData , isYearly }) => {
                       ? "price-button-disabled"
                       : "price-button-link"
                   }
-                  $url={x.button[1]}
+                  onClick={x.tier === "Enterprise" ? openModal : undefined}
                 >
-                  {x.button[0]}
+                  {x.tier === "Enterprise" ? "Contact Sales" : x.button[0]}
                 </Button>
 
                 <h6>{x.byline2}</h6>
@@ -101,6 +109,58 @@ const PlanCard = ({ planData , isYearly }) => {
           ))}
         </Row>
       </Container>
+      <Modal
+        isOpen={modalIsOpen}
+        onRequestClose={closeModal}
+        className="Modal"
+        overlayClassName="Overlay"
+        ariaHideApp={false}
+        contentLabel="Enterprise Inquiry Form"
+        style={{
+          content: {
+            maxHeight: "90vh",
+            overflow: "hidden",
+            display: "flex",
+            flexDirection: "column",
+            "&::-webkit-scrollbar": {
+              display: "none"
+            },
+            scrollbarWidth: "none",
+            msOverflowStyle: "none"
+          },
+          overlay: {
+            overflow: "auto",
+            "&::-webkit-scrollbar": {
+              display: "none"
+            },
+            scrollbarWidth: "none",
+            msOverflowStyle: "none"
+          }
+        }}
+      >
+        <Button $secondary className="close-modal-btn" onClick={closeModal}>
+    X
+        </Button>
+        <h2 className="modal-heading">Contact sales</h2>
+        <div style={{
+          flex: 1,
+          overflow: "auto",
+          scrollbarWidth: "none",
+          msOverflowStyle: "none",
+          "&::-webkit-scrollbar": {
+            display: "none"
+          }
+        }}>
+          <CommonForm
+            title="Contact sales"
+            form="contact"
+            account_desc=""
+            submit_title="Thanks for contacting us!"
+            submit_body="We'll get back to you as soon as we can."
+            submit_button_title="Contact sales"
+          />
+        </div>
+      </Modal>
     </PlanCardWrapper>
   );
 };

From f3bf8b8e7c201ce24d4f3891e85d3d2a1a1daded Mon Sep 17 00:00:00 2001
From: Vivek Vishal <vishalvivek488@gmail.com>
Date: Fri, 17 Jan 2025 14:00:09 +0000
Subject: [PATCH 09/14] update

Signed-off-by: GitHub <noreply@github.com>
---
 src/components/CommonForm/commonForm.style.js |  2 +-
 src/components/CommonForm/index.js            | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/components/CommonForm/commonForm.style.js b/src/components/CommonForm/commonForm.style.js
index aafc464aa0b8..5b1ba3711947 100644
--- a/src/components/CommonForm/commonForm.style.js
+++ b/src/components/CommonForm/commonForm.style.js
@@ -33,7 +33,7 @@ const CommonFormWrapper = styled.section`
 }
 
 .form-body{
-box-shadow: 0px 5px 5px 2px ${props => props.theme.primaryLightColor};
+box-shadow: 0px -2px 5px 2px ${props => props.theme.primaryLightColor};
 margin: 1rem;
 
 .form-title {
diff --git a/src/components/CommonForm/index.js b/src/components/CommonForm/index.js
index 398de603ea3f..a75190deb599 100644
--- a/src/components/CommonForm/index.js
+++ b/src/components/CommonForm/index.js
@@ -84,7 +84,11 @@ const CommonForm = ({ form, title, submit_title, submit_body, submit_button_titl
       {
         stepNumber === 0 &&
   <div className="form-body">
-    <h2 className="form-title">{title}</h2>
+    { form !== "contact" && (
+      <>
+        <h2 className="form-title">{title}</h2>
+      </>
+    )}
     <Formik
       initialValues={{
         firstname: firstname,
@@ -196,14 +200,14 @@ const CommonForm = ({ form, title, submit_title, submit_body, submit_button_titl
             Message <span className="required-sign">*</span>
             </label>
             <Field as="textarea" required rows="8" type="text" className="text-field" id="message" name="message" />
-            <label>
+            {/* <label>
               <Field
                 type="checkbox"
                 name="subscribed"
                 className="form-check"
               />
               <span>Subscribe to our newsletter</span>
-            </label>
+            </label> */}
             <div>By providing my contact information, I authorize Layer5 to contact me with communications about Layer5's products and services.</div>
           </>
         )}

From f36567ac65d9858c962e748341dce14b2c86c6eb Mon Sep 17 00:00:00 2001
From: Vivek Vishal <vishalvivek488@gmail.com>
Date: Mon, 20 Jan 2025 17:51:19 +0530
Subject: [PATCH 10/14] Update index.js

Signed-off-by: Vivek Vishal <vishalvivek488@gmail.com>
---
 src/sections/General/Faq/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/sections/General/Faq/index.js b/src/sections/General/Faq/index.js
index 937b601f076b..8d5902eed278 100644
--- a/src/sections/General/Faq/index.js
+++ b/src/sections/General/Faq/index.js
@@ -106,7 +106,8 @@ const Faq = (props) => {
         </Accordion>
         <div className="askus_section">
           <h2>Didn't find an answer to your question?</h2>
-          <ContactFormModal callout_text="Just Ask" form_header="Send Us An Email" />
+          // <ContactFormModal callout_text="Just Ask" form_header="Send Us An Email" />
+             <Button $secondary title="Just Ask" $url="https://layer5.io/company/contact" $external={ true } />
         </div>
       </Container>
     </FaqSectionWrapper>

From 18cf56ef191f28309e5c699e8bf04524bcdae139 Mon Sep 17 00:00:00 2001
From: Vivek Vishal <vishalvivek488@gmail.com>
Date: Mon, 20 Jan 2025 17:56:04 +0530
Subject: [PATCH 11/14] width: fit-content

Signed-off-by: Vivek Vishal <vishalvivek488@gmail.com>
---
 src/components/CommonForm/commonForm.style.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/CommonForm/commonForm.style.js b/src/components/CommonForm/commonForm.style.js
index 5b1ba3711947..2e3b7358dbba 100644
--- a/src/components/CommonForm/commonForm.style.js
+++ b/src/components/CommonForm/commonForm.style.js
@@ -36,6 +36,7 @@ const CommonFormWrapper = styled.section`
 box-shadow: 0px -2px 5px 2px ${props => props.theme.primaryLightColor};
 margin: 1rem;
 
+
 .form-title {
     padding: 1rem;
     text-align: center;
@@ -45,6 +46,7 @@ margin: 1rem;
 
 .form{
     font-size: .9rem;
+    width: fit-content;
     margin: 0 1rem 1rem;
     padding: 1rem;
     

From c8d73c81a2cd39222b6b7c263d4d828ae1e091d6 Mon Sep 17 00:00:00 2001
From: Vivek Vishal <vishalvivek488@gmail.com>
Date: Mon, 20 Jan 2025 18:12:38 +0530
Subject: [PATCH 12/14] Update src/sections/General/Faq/index.js

Signed-off-by: Vivek Vishal <vishalvivek488@gmail.com>
---
 src/sections/General/Faq/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sections/General/Faq/index.js b/src/sections/General/Faq/index.js
index 8d5902eed278..dfa2a8fe26ed 100644
--- a/src/sections/General/Faq/index.js
+++ b/src/sections/General/Faq/index.js
@@ -106,7 +106,7 @@ const Faq = (props) => {
         </Accordion>
         <div className="askus_section">
           <h2>Didn't find an answer to your question?</h2>
-          // <ContactFormModal callout_text="Just Ask" form_header="Send Us An Email" />
+       
              <Button $secondary title="Just Ask" $url="https://layer5.io/company/contact" $external={ true } />
         </div>
       </Container>

From aa0a8d0b92f98ad0ad553ba6edabdc6711a29a49 Mon Sep 17 00:00:00 2001
From: Vivek Vishal <vishalvivek488@gmail.com>
Date: Mon, 20 Jan 2025 18:12:55 +0530
Subject: [PATCH 13/14] fit-content is important

Signed-off-by: Vivek Vishal <vishalvivek488@gmail.com>
---
 src/components/CommonForm/commonForm.style.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/CommonForm/commonForm.style.js b/src/components/CommonForm/commonForm.style.js
index 2e3b7358dbba..60525d09dc18 100644
--- a/src/components/CommonForm/commonForm.style.js
+++ b/src/components/CommonForm/commonForm.style.js
@@ -46,7 +46,7 @@ margin: 1rem;
 
 .form{
     font-size: .9rem;
-    width: fit-content;
+    width: fit-content !important;
     margin: 0 1rem 1rem;
     padding: 1rem;
     

From 12f2c0fef1680036de670160372b2f2aadffd4d1 Mon Sep 17 00:00:00 2001
From: Vivek Vishal <vishalvivek488@gmail.com>
Date: Mon, 20 Jan 2025 20:01:40 +0530
Subject: [PATCH 14/14] fix eslint errors

Signed-off-by: Vivek Vishal <vishalvivek488@gmail.com>
---
 src/sections/General/Faq/index.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/sections/General/Faq/index.js b/src/sections/General/Faq/index.js
index dfa2a8fe26ed..260a1e4d81b9 100644
--- a/src/sections/General/Faq/index.js
+++ b/src/sections/General/Faq/index.js
@@ -106,8 +106,7 @@ const Faq = (props) => {
         </Accordion>
         <div className="askus_section">
           <h2>Didn't find an answer to your question?</h2>
-       
-             <Button $secondary title="Just Ask" $url="https://layer5.io/company/contact" $external={ true } />
+          <Button $secondary title="Just Ask" $url="https://layer5.io/company/contact" $external={ true } />
         </div>
       </Container>
     </FaqSectionWrapper>