Merge pull request #56 from kjannette/veer

Veer

src/Components/Modals/PaymentModal.js

@@ -32,13 +32,14 @@ const PaymentModal = ({
   const additionalAccountsAnnualPriceToday =
     additionalAccountsMonthlyPriceToday * 12;
 
-  const tempExtraAccountsPrice = isAnnual
+  console.log(
+    "additionalAccountsAnnualPriceToday",
+    additionalAccountsAnnualPriceToday
+  );
+
+  const extraAccountsPrice = isAnnual
     ? additionalAccountsAnnualPriceToday
     : additionalAccountsMonthlyPriceToday;
-  const extraAccountsPrice =
-    tempExtraAccountsPrice === NaN || tempExtraAccountsPrice === undefined
-      ? 0
-      : 0;
   const showAdditionaLAccountsView =
     (selectedPlan[0]?.value === "partner" && numberOfAccountsToAdd > 0) ||
     (selectedPlan[0]?.value === "seniorPartner" && numberOfAccountsToAdd > 0);
@@ -49,12 +50,11 @@ const PaymentModal = ({
     ? annualSubscriptionPriceToday
     : monthlySubscriptionPriceToday;
   const totalToday = amountToday + extraAccountsPrice;
-  console.log("amoutnToday", amountToday);
-  console.log("extraAccountsPrice", extraAccountsPrice);
 
   function handleValidateAndPay() {
     handleSignup(totalToday);
   }
+
   return (
     <Modal show="true" size="lg">
       <Modal.Header className="payment-modal-header" closeButton>
@@ -160,21 +160,13 @@ const PaymentModal = ({
 export default PaymentModal;
 
 /*
+  const tempExtraAccountsPrice = isAnnual
+    ? additionalAccountsAnnualPriceToday
+    : additionalAccountsMonthlyPriceToday;
 
-            {showAdditionaLAccountsView ? (
+  const extraAccountsPrice =
-              <div className="payment-modal-text-wrapper">
+    tempExtraAccountsPrice === NaN || tempExtraAccountsPrice === undefined
-                <div className="paymodal-summary-right">
+      ? 0
-                  Additional Accounts:
+      : 0;
-                </div>
+      
-                <div className="paymodal-summary-left">
+  */
-                  {isAnnual
-                    ? additionalAccountsAnnualPriceToday
-                    : additionalAccountsMonthlyPriceToday}
-                </div>
-              </div>
-            ) : (
-              <></>
-            )}
-
-
-        */

src/Components/SignupPage/SignupPage.js

@@ -58,12 +58,11 @@ const SignupPage = () => {
   };
 
   const handleChangeAccountSelect = (e, name) => {
-    console.log("~~~~~~~~~~~~~~e.target.value, name", e.target.value, name);
     const num = e.target.value;
     const temp = Number(num);
     setNumberOfAccountsToAdd(temp);
   };
-  console.log("numberOfAccountsToAdd", numberOfAccountsToAdd);
+
   const handleChangePaymentInput = (e, name) => {
     const newPaymentData = handleFormDataChange(
       e,
@@ -84,7 +83,6 @@ const SignupPage = () => {
     });
 
     setSelectedPlan(tempPlan);
-    console.log("selectedPlan", selectedPlan);
     setActiveRadioOption(tempPlan[0].value);
   };
 
@@ -248,7 +246,6 @@ const SignupPage = () => {
   };
 
   const handleAddAccounts = () => {
-    console.log("selectedPlan", selectedPlan);
     setShowAddAccount(!showAddAccount);
   };
 
@@ -341,6 +338,9 @@ const SignupPage = () => {
     setIsBusy(true);
 
     if (paymentDataValues && dataValues) {
+      console.log(
+        "tryblock ~~~  tryblock ~~~  tryblock ~~~  tryblock ~~~  tryblock ~~~  "
+      );
       try {
         const userCredential = await createUserWithEmailAndPassword(
           auth,
@@ -383,7 +383,6 @@ const SignupPage = () => {
     selectedPlan[0].value === "seniorPartner" ||
     selectedPlan[0].value === "partner";
 
-  console.log("isAnnial on signup page", isAnnual);
   return (
     <div className="signup-super-container">
       <div className="signup-sub-container">
@@ -555,7 +554,7 @@ const SignupPage = () => {
                     />
                     <div className="upload-button-box">
                       <Button
-                        className="p-2 mr-2 primary-button"
+                        className="p-2 mr-2 primary-button signup-proceed-btn"
                         onClick={handleAdd}
                         labelText="Add And Proceed To Payment"
                       />

src/styles/signup.scss

@@ -268,3 +268,7 @@
   font-size: 0.82rem;
   font-weight: 300;
 }
+
+.signup-proceed-btn {
+  width: 240px;
+}