Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update form #6185

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/CommonForm/commonForm.style.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
33 changes: 29 additions & 4 deletions src/components/CommonForm/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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({});
Expand Down Expand Up @@ -84,7 +84,11 @@ const CommonForm = ({ form, title, submit_title, submit_body }) => {
{
stepNumber === 0 &&
<div className="form-body">
<h2 className="form-title">{title}</h2>
{ form !== "contact" && (
<>
<h2 className="form-title">{title}</h2>
</>
)}
<Formik
initialValues={{
firstname: firstname,
Expand Down Expand Up @@ -186,6 +190,27 @@ const CommonForm = ({ form, title, submit_title, submit_body }) => {
<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" />
{/* <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>
</>
)}
{form == "open-source-pricing" && (
<>
<label htmlFor="projectname" className="form-name">
Expand Down Expand Up @@ -264,7 +289,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>
Expand All @@ -291,4 +316,4 @@ const ThankYou = forwardRef(({ title, description }, ref) => {
});


export default CommonForm;
export default CommonForm;
66 changes: 63 additions & 3 deletions src/components/PlanCard/index.js
Original file line number Diff line number Diff line change
@@ -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>;
}
Expand Down Expand Up @@ -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>
Expand All @@ -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>
);
};
Expand Down
2 changes: 1 addition & 1 deletion src/sections/Company/Contact/contactpage.style.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const ContactPageWrapper = styled.section`
.showForm {
display: flex;
flex-wrap: wrap;
height: 70rem;
height: auto;
margin: auto -15px;
}

Expand Down
17 changes: 14 additions & 3 deletions src/sections/Company/Contact/index.js
Original file line number Diff line number Diff line change
@@ -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";
Expand All @@ -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();
Expand Down Expand Up @@ -64,7 +65,17 @@ 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."
submit_button_title="Contact us"
/>
</Col>
</Container>
</div>
</Row>
Expand All @@ -73,4 +84,4 @@ const ContactPage = () => {
);
};

export default ContactPage;
export default ContactPage;
Loading