From 86a8b4b32914fc14a69f89f027f96b142c3570d7 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Fri, 19 Jan 2024 19:17:15 -0600 Subject: [PATCH 1/4] more --- src/Components/SignupPage/SignupPage.js | 2 -- src/Constants/Fields/PaymentFields.js | 1 - 2 files changed, 3 deletions(-) diff --git a/src/Components/SignupPage/SignupPage.js b/src/Components/SignupPage/SignupPage.js index 97e3824..49030e2 100644 --- a/src/Components/SignupPage/SignupPage.js +++ b/src/Components/SignupPage/SignupPage.js @@ -42,7 +42,6 @@ const SignupPage = () => { }; const handleChangePaymentInput = (e, name) => { - console.log("e, name", e, name); const newPaymentData = handleFormDataChange( e, name, @@ -62,7 +61,6 @@ const SignupPage = () => { }; const validatePaymentData = () => { - console.log("paymentData", paymentData); const newPaymentData = getValidatedFormData(paymentData, paymentfields); const hasErrors = isFormDataHasErrors(newPaymentData); setPaymentData(newPaymentData); diff --git a/src/Constants/Fields/PaymentFields.js b/src/Constants/Fields/PaymentFields.js index 62461f7..d59546c 100644 --- a/src/Constants/Fields/PaymentFields.js +++ b/src/Constants/Fields/PaymentFields.js @@ -8,7 +8,6 @@ export const paymentfields = { cardLastName: { required: true, label: "Card Last Name", - maxLength: 45, type: "cardLastName", }, cardNumber: { From 8a5341780513f838f9f49ce004efbd7c14f13cb6 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Fri, 19 Jan 2024 19:26:15 -0600 Subject: [PATCH 2/4] more --- src/Components/Modals/PaymentModal.js | 8 ++++++-- src/Components/SignupPage/SignupPage.js | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Components/Modals/PaymentModal.js b/src/Components/Modals/PaymentModal.js index b538d50..46d58ba 100644 --- a/src/Components/Modals/PaymentModal.js +++ b/src/Components/Modals/PaymentModal.js @@ -23,10 +23,14 @@ const PaymentModal = ({ const ModalForm = () => { return splitEvery(Object.keys(paymentfields), fieldsChunkSize).map( (names, j) => ( - + {names.map((name, i) => ( - + handleChangePaymentInput(e, name)} diff --git a/src/Components/SignupPage/SignupPage.js b/src/Components/SignupPage/SignupPage.js index 49030e2..1292f3e 100644 --- a/src/Components/SignupPage/SignupPage.js +++ b/src/Components/SignupPage/SignupPage.js @@ -238,6 +238,7 @@ const SignupPage = () => { {showPaymentModal ? ( Date: Fri, 19 Jan 2024 19:29:34 -0600 Subject: [PATCH 3/4] more --- src/Components/SignupPage/SignupPage.js | 27 ++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/src/Components/SignupPage/SignupPage.js b/src/Components/SignupPage/SignupPage.js index 1292f3e..f0ab01f 100644 --- a/src/Components/SignupPage/SignupPage.js +++ b/src/Components/SignupPage/SignupPage.js @@ -112,7 +112,7 @@ const SignupPage = () => { const handleProceedToPayment = (e) => { e.preventDefault(); - /* + if (isBusy) { return; } @@ -120,7 +120,6 @@ const SignupPage = () => { if (dataValues === null) { return; } - */ setShowPaymentModal(true); }; @@ -137,7 +136,29 @@ const SignupPage = () => { if (paymentDataValues === null) { return; } - console.log("paymentDataValues", paymentDataValues); + const dataValues = validateData(); + if (dataValues === null) { + return; + } + setIsBusy(true); + const paymentSuccess = handleStripeAuthorization(paymentDataValues); + if (paymentSuccess) { + try { + const userCredential = await createUserWithEmailAndPassword( + auth, + dataValues.email, + dataValues.password + ); + const user = userCredential.user; + await saveUserData(user.uid, dataValues); + navigate("/"); + } catch (error) { + setIsBusy(false); + setNotice( + error.message || "Sorry, something went wrong. Please try again." + ); + } + } }; return ( From 84d3d5f21c905950e2c21f05758b0ddc4c09c5e0 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Fri, 19 Jan 2024 19:37:40 -0600 Subject: [PATCH 4/4] more --- src/Components/SignupPage/SignupPage.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Components/SignupPage/SignupPage.js b/src/Components/SignupPage/SignupPage.js index f0ab01f..dd887b5 100644 --- a/src/Components/SignupPage/SignupPage.js +++ b/src/Components/SignupPage/SignupPage.js @@ -158,6 +158,8 @@ const SignupPage = () => { error.message || "Sorry, something went wrong. Please try again." ); } + } else { + //handle payment failure } };