From bb6c507977941f6b1a83d5934dd26d2d2bb96164 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Sat, 27 Jan 2024 15:16:19 -0600 Subject: [PATCH 1/6] more --- src/Components/SignupPage/SignupPage.js | 2 +- src/Constants/Fields/RadioFields.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Components/SignupPage/SignupPage.js b/src/Components/SignupPage/SignupPage.js index 757c2aa..b294cfc 100644 --- a/src/Components/SignupPage/SignupPage.js +++ b/src/Components/SignupPage/SignupPage.js @@ -39,7 +39,7 @@ const SignupPage = () => { ); const [showPaymentModal, setShowPaymentModal] = useState(false); const [showSelectPlan, setShowSelectPlan] = useState(false); - const [activeRadioOption, setActiveRadioOption] = useState("Partner"); + const [activeRadioOption, setActiveRadioOption] = useState("partner"); const [selectedPlan, setSelectedPlan] = useState({}); const [isAnnual, setIsAnnual] = useState(false); // Could also go in App.js if needed in the future diff --git a/src/Constants/Fields/RadioFields.js b/src/Constants/Fields/RadioFields.js index 7934e01..8ab2bec 100644 --- a/src/Constants/Fields/RadioFields.js +++ b/src/Constants/Fields/RadioFields.js @@ -38,7 +38,7 @@ export const signupRadioFields = [ description: [ "Unlimited documents.", "Triage-level support", - "Up to 10 additional accounts at $39/each", + "Up to 8 additional accounts at $39/each", ], details: "", pricing: [ From 4c032b73826ca5777a77c5c150d33f619073438e Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Sat, 27 Jan 2024 15:21:09 -0600 Subject: [PATCH 2/6] more --- src/styles/signup.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/styles/signup.scss b/src/styles/signup.scss index d5d63c5..a43234f 100644 --- a/src/styles/signup.scss +++ b/src/styles/signup.scss @@ -50,6 +50,7 @@ display: flex; flex-direction: column; align-items: flex-end; + padding-right: 14px; } .signup-proceed { @@ -136,7 +137,7 @@ flex-direction: row; padding: 6px; width: 100%; - height: 400px; + height: 340px; } .select-plan-summary-box { From e132003b738d9dc67fdda28cf78b536f488c7840 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Sat, 27 Jan 2024 15:44:55 -0600 Subject: [PATCH 3/6] more --- src/Components/SignupPage/SignupPage.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Components/SignupPage/SignupPage.js b/src/Components/SignupPage/SignupPage.js index b294cfc..6572670 100644 --- a/src/Components/SignupPage/SignupPage.js +++ b/src/Components/SignupPage/SignupPage.js @@ -49,7 +49,7 @@ const SignupPage = () => { process.env.NODE_ENV === "development" ? process.env.REACT_APP_API_DEV : process.env.REACT_APP_API_PROD; - + const [selectedPlanToProcess, setSelectedPlanToProcess] = useState(); const modalText = "MAYBE PUT TOTAL HERE"; const handleChangeInput = (e, name) => { @@ -79,6 +79,10 @@ const SignupPage = () => { setSelectedPlan(tempPlan); const temp = value; setActiveRadioOption(temp); + const planTemp = determinePlan(isAnnual, activeRadioOption); + setSelectedPlanToProcess(planTemp); + console.log("selectedPlan", selectedPlan); + console.log("selectedPlanToProcess", selectedPlanToProcess); }; const validateData = () => { From 462a7e897482b98e5e3968c6b3a396f4f1d655ce Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Sat, 27 Jan 2024 16:19:19 -0600 Subject: [PATCH 4/6] more --- src/Components/SignupPage/SignupPage.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Components/SignupPage/SignupPage.js b/src/Components/SignupPage/SignupPage.js index 6572670..f56434c 100644 --- a/src/Components/SignupPage/SignupPage.js +++ b/src/Components/SignupPage/SignupPage.js @@ -72,17 +72,17 @@ const SignupPage = () => { }; const handleChangeRadioInput = (value) => { - const tempPlan = signupRadioFields.filter((field) => { - return field.value === value; + const tempPlan = signupRadioFields.filter((plan) => { + if (plan.value === value) { + return plan; + } }); setSelectedPlan(tempPlan); - const temp = value; - setActiveRadioOption(temp); - const planTemp = determinePlan(isAnnual, activeRadioOption); - setSelectedPlanToProcess(planTemp); + + setActiveRadioOption(tempPlan[0].value); + console.log("selectedPlan", selectedPlan); - console.log("selectedPlanToProcess", selectedPlanToProcess); }; const validateData = () => { From b8c3610c0dc4a087ed9253d620282b703798ea03 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Sat, 27 Jan 2024 16:19:44 -0600 Subject: [PATCH 5/6] more --- src/Components/SignupPage/SignupPage.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/Components/SignupPage/SignupPage.js b/src/Components/SignupPage/SignupPage.js index f56434c..d733143 100644 --- a/src/Components/SignupPage/SignupPage.js +++ b/src/Components/SignupPage/SignupPage.js @@ -79,10 +79,7 @@ const SignupPage = () => { }); setSelectedPlan(tempPlan); - setActiveRadioOption(tempPlan[0].value); - - console.log("selectedPlan", selectedPlan); }; const validateData = () => { From 27af139ea353b58cef9189af296ac8536c61ebbd Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Sat, 27 Jan 2024 16:22:53 -0600 Subject: [PATCH 6/6] more --- src/Components/Modals/PaymentModal.js | 4 +++- src/Components/SignupPage/SignupPage.js | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Components/Modals/PaymentModal.js b/src/Components/Modals/PaymentModal.js index 7ef7cf9..a50c9f2 100644 --- a/src/Components/Modals/PaymentModal.js +++ b/src/Components/Modals/PaymentModal.js @@ -17,9 +17,11 @@ const PaymentModal = ({ handleSignUp, setShowPaymentModal, handleSignup, + selectedPlan, + isAnnual, }) => { const fieldsChunkSize = 2; - + console.log("***", selectedPlan, isAnnual); return ( diff --git a/src/Components/SignupPage/SignupPage.js b/src/Components/SignupPage/SignupPage.js index d733143..f292e01 100644 --- a/src/Components/SignupPage/SignupPage.js +++ b/src/Components/SignupPage/SignupPage.js @@ -451,6 +451,8 @@ const SignupPage = () => { modalText={modalText} notice={notice} setNotice={setNotice} + selectedPlan={selectedPlan} + isAnnual={isAnnual} /> ) : ( <>