From f422468d97a98db9415eb83129002bda07a7bd85 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Fri, 23 Feb 2024 04:32:43 -0600 Subject: [PATCH 01/14] more --- src/Components/SignupPage/SignupPage.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Components/SignupPage/SignupPage.js b/src/Components/SignupPage/SignupPage.js index bdcf3ab..1021674 100644 --- a/src/Components/SignupPage/SignupPage.js +++ b/src/Components/SignupPage/SignupPage.js @@ -44,12 +44,12 @@ const SignupPage = () => { getFormDataDefaults(paymentfields) ); const [showPaymentModal, setShowPaymentModal] = useState(false); - + /* const [showSelectPlan, setShowSelectPlan] = useState( isUpgrade ? true : false ); - - //const [showSelectPlan, setShowSelectPlan] = useState(true); +*/ + const [showSelectPlan, setShowSelectPlan] = useState(true); const [activeRadioOption, setActiveRadioOption] = useState("partner"); const [selectedPlan, setSelectedPlan] = useState([signupRadioFields[1]]); const stripe = new Stripe(stripeApiKey); @@ -610,7 +610,7 @@ const SignupPage = () => {
- {signupRadioFields?.map((option, index) => ( + {signupRadioFields?.slice(0, 3).map((option, index) => (
Date: Fri, 23 Feb 2024 05:00:49 -0600 Subject: [PATCH 02/14] more --- src/Components/SignupPage/SignupPage.js | 2 ++ src/Constants/Fields/RadioFields.js | 19 +++++++++++++++++++ src/pageElements/Radio.js | 2 +- src/styles/radio.scss | 2 +- src/styles/signup.scss | 9 +++------ 5 files changed, 26 insertions(+), 8 deletions(-) diff --git a/src/Components/SignupPage/SignupPage.js b/src/Components/SignupPage/SignupPage.js index 1021674..481da78 100644 --- a/src/Components/SignupPage/SignupPage.js +++ b/src/Components/SignupPage/SignupPage.js @@ -62,6 +62,8 @@ const SignupPage = () => { const [showPromoModal, setShowPromoModal] = useState(false); const [issueText, setIssueText] = useState(""); const [isAnnual, setIsAnnual] = useState(1); + const [valX, setValX] = useState(0); + const [valY, setValY] = useState(2); const handleChangeInput = (e, name) => { const newData = handleFormDataChange(e, name, data, signupFields); diff --git a/src/Constants/Fields/RadioFields.js b/src/Constants/Fields/RadioFields.js index 860bd30..d0e3e82 100644 --- a/src/Constants/Fields/RadioFields.js +++ b/src/Constants/Fields/RadioFields.js @@ -1,4 +1,21 @@ export const signupRadioFields = [ + { + name: "Of Counsel", + label: "Of Counsel", + value: "ofCounsel", + description: [ + "One document/one-time fee", + "Documents conforming with state rules", + "Intellidraft AI - have a downloadable doc in minutes", + "24/7 support", + ], + details: "", + docsAllowedPerMonth: 1, + pricing: [ + { type: "monthly", amount: 59 }, + { type: "annDiscount", amount: 59 }, + ], + }, { name: "Associate", label: "Associate", @@ -7,6 +24,7 @@ export const signupRadioFields = [ "1 document per month", "Carryover 1 unused document each subscription period", "Documents conforming with state rules", + "Intellidraft AI - have a downloadable doc in minutes", "24/7 support", "First month free!", ], @@ -26,6 +44,7 @@ export const signupRadioFields = [ "3 documents per month", "Carryover 1 unused document per month", "Documents conforming with state rules", + "Intellidraft AI - have a downloadable doc in minutes", "Up to 2 additional accounts: $49/each", "24/7 support", ], diff --git a/src/pageElements/Radio.js b/src/pageElements/Radio.js index efe6a63..84b7f39 100644 --- a/src/pageElements/Radio.js +++ b/src/pageElements/Radio.js @@ -43,7 +43,7 @@ const Radio = (props) => { )}
{`${name}`}
- {parentIndex > 2 ? ( + {value === "ofCounsel" ? (
{`$${price[index]["amount"]}/doc`}
diff --git a/src/styles/radio.scss b/src/styles/radio.scss index ae5039b..da4e440 100644 --- a/src/styles/radio.scss +++ b/src/styles/radio.scss @@ -7,7 +7,7 @@ &.not-upgrade { background-color: #fff; } - height: 290px; + height: 345px; margin: 10px 8px 0px 8px; border-radius: 5px; border: 1px solid #d4d4d4; diff --git a/src/styles/signup.scss b/src/styles/signup.scss index 2482d66..26176d0 100644 --- a/src/styles/signup.scss +++ b/src/styles/signup.scss @@ -117,7 +117,7 @@ flex-direction: column; margin-top: 24px; width: 920px; - min-height: 510px; + min-height: 540px; border-radius: 10px; background-color: rgb(240, 247, 250); border: 1px solid #e9e9e9; @@ -167,10 +167,8 @@ .radio-group-box { display: flex; flex-direction: row; - flex-wrap: wrap; - justify-content: flex-end; + justify-content: center; padding: 6px; - width: 100%; } .select-plan-summary-box { @@ -197,8 +195,7 @@ } .signup-radio-container { - width: 300px; - height: 100%; + width: 280px; } .signup-feat-item { From 2ce31ebe93f91bad947700152643690474b4e208 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Fri, 23 Feb 2024 05:02:41 -0600 Subject: [PATCH 03/14] more --- src/pageElements/Radio.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pageElements/Radio.js b/src/pageElements/Radio.js index 84b7f39..ae6a993 100644 --- a/src/pageElements/Radio.js +++ b/src/pageElements/Radio.js @@ -38,7 +38,7 @@ const Radio = (props) => {
) : (
- +
)}
{`${name}`}
From 715c15221c536bf9369706f62db65d12afc8c45a Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Fri, 23 Feb 2024 05:10:02 -0600 Subject: [PATCH 04/14] more --- src/Constants/Fields/RadioFields.js | 15 ++++++++------- src/styles/radio.scss | 5 +++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/Constants/Fields/RadioFields.js b/src/Constants/Fields/RadioFields.js index d0e3e82..9f3632a 100644 --- a/src/Constants/Fields/RadioFields.js +++ b/src/Constants/Fields/RadioFields.js @@ -5,8 +5,8 @@ export const signupRadioFields = [ value: "ofCounsel", description: [ "One document/one-time fee", - "Documents conforming with state rules", - "Intellidraft AI - have a downloadable doc in minutes", + "Documents conform with state rules", + "Intellidraft AI - downloadable document in minutes", "24/7 support", ], details: "", @@ -23,8 +23,8 @@ export const signupRadioFields = [ description: [ "1 document per month", "Carryover 1 unused document each subscription period", - "Documents conforming with state rules", - "Intellidraft AI - have a downloadable doc in minutes", + "Documents conform with state rules", + "Intellidraft AI - downloadable document in minutes", "24/7 support", "First month free!", ], @@ -43,8 +43,8 @@ export const signupRadioFields = [ description: [ "3 documents per month", "Carryover 1 unused document per month", - "Documents conforming with state rules", - "Intellidraft AI - have a downloadable doc in minutes", + "Documents conform with state rules", + "Intellidraft AI - downloadable document in minutes", "Up to 2 additional accounts: $49/each", "24/7 support", ], @@ -62,7 +62,8 @@ export const signupRadioFields = [ value: "seniorPartner", description: [ "Unlimited documents.", - "Documents conforming with state rules", + "Documents conform with state rules", + "Intellidraft AI - downloadable document in minutes", "24/7 Triage-level support response", "Up to 8 additional accounts at $39/each", ], diff --git a/src/styles/radio.scss b/src/styles/radio.scss index da4e440..c6c50bf 100644 --- a/src/styles/radio.scss +++ b/src/styles/radio.scss @@ -24,8 +24,9 @@ .radio-circle-lower { display: flex; flex-direction: column; - margin-left: 12px; - padding-left: 12px; + justify-content: center; + margin-left: auto; + margin-right: auto; } .radio-circle-box { From 0cc5985f697fed3842fcaee9a4bf4f7d0a66a97e Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Fri, 23 Feb 2024 05:24:03 -0600 Subject: [PATCH 05/14] more --- src/Components/SignupPage/SignupPage.js | 4 ++-- src/Constants/Fields/RadioFields.js | 2 +- src/pageElements/Radio.js | 6 +++--- src/styles/radio.scss | 9 +++++++-- src/styles/signup.scss | 4 +++- 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/Components/SignupPage/SignupPage.js b/src/Components/SignupPage/SignupPage.js index 481da78..a3cdbb5 100644 --- a/src/Components/SignupPage/SignupPage.js +++ b/src/Components/SignupPage/SignupPage.js @@ -63,7 +63,7 @@ const SignupPage = () => { const [issueText, setIssueText] = useState(""); const [isAnnual, setIsAnnual] = useState(1); const [valX, setValX] = useState(0); - const [valY, setValY] = useState(2); + const [valY, setValY] = useState(3); const handleChangeInput = (e, name) => { const newData = handleFormDataChange(e, name, data, signupFields); @@ -612,7 +612,7 @@ const SignupPage = () => {
- {signupRadioFields?.slice(0, 3).map((option, index) => ( + {signupRadioFields?.slice(valX, valY).map((option, index) => (
{ > {value == activeRadioOption && !isUpgrade ? (
- +
) : (
- +
)}
{`${name}`}
@@ -58,7 +58,7 @@ const Radio = (props) => {
{description.map((item, i) => { const el = - item == "First month free!" && !isUpgrade ? ( + item == "First month is free!" && !isUpgrade ? (

{item}

diff --git a/src/styles/radio.scss b/src/styles/radio.scss index c6c50bf..c150f0c 100644 --- a/src/styles/radio.scss +++ b/src/styles/radio.scss @@ -1,6 +1,9 @@ .radio-circle-container { display: flex; flex-direction: column; + align-items: center; + margin-right: auto; + margin-left: auto; &.upgrade { background-color: rgb(149, 149, 149); } @@ -8,17 +11,19 @@ background-color: #fff; } height: 345px; - margin: 10px 8px 0px 8px; border-radius: 5px; border: 1px solid #d4d4d4; } .radio-circle-top { + width: 248px; height: 40px; display: flex; flex-direction: row; - margin-top: 12px; + margin-top: 18px; margin-left: 2px; + border: 1px solid var(--accent-orange-light); + border-radius: 10px; } .radio-circle-lower { diff --git a/src/styles/signup.scss b/src/styles/signup.scss index 26176d0..2c846e1 100644 --- a/src/styles/signup.scss +++ b/src/styles/signup.scss @@ -214,11 +214,13 @@ .offer-div { display: flex; justify-content: center; - align-items: center; height: 30px; border: 1px solid #fdbe72; border-radius: 10px; margin-top: 25px; + margin-left: auto; + margin-right: auto; + width: 220px; } .show-addaccount-wrapper { From 250d80ea1141a1513d37d9740286bf8e8708c992 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Fri, 23 Feb 2024 05:48:44 -0600 Subject: [PATCH 06/14] more --- src/Components/SignupPage/SignupPage.js | 63 ++++++++++++++++--------- src/styles/signup.scss | 23 ++++++++- 2 files changed, 63 insertions(+), 23 deletions(-) diff --git a/src/Components/SignupPage/SignupPage.js b/src/Components/SignupPage/SignupPage.js index a3cdbb5..caca153 100644 --- a/src/Components/SignupPage/SignupPage.js +++ b/src/Components/SignupPage/SignupPage.js @@ -62,8 +62,8 @@ const SignupPage = () => { const [showPromoModal, setShowPromoModal] = useState(false); const [issueText, setIssueText] = useState(""); const [isAnnual, setIsAnnual] = useState(1); - const [valX, setValX] = useState(0); - const [valY, setValY] = useState(3); + const [valX, setValX] = useState(1); + const [valY, setValY] = useState(4); const handleChangeInput = (e, name) => { const newData = handleFormDataChange(e, name, data, signupFields); @@ -107,6 +107,22 @@ const SignupPage = () => { setActiveRadioOption(tempPlan[0].value); }; + const handleLeftArrowClick = () => { + console.log("left"); + if (valX == 0) { + return; + } else { + const tempx = valX - 1; + const tempy = valY - 1; + setValX(tempx); + setValY(tempy); + } + }; + + const handleRightArrowClick = () => { + console.log("left"); + }; + const vals = [ [1, 2, 3, 4, 5, 6, 7, 8], [1, 2], @@ -611,25 +627,30 @@ const SignupPage = () => {
-
- {signupRadioFields?.slice(valX, valY).map((option, index) => ( -
- -
- ))} + +
+
+
+ {signupRadioFields?.slice(valX, valY).map((option, index) => ( +
+ +
+ ))} +
+
{showAddAccount && !isBusy ? (
diff --git a/src/styles/signup.scss b/src/styles/signup.scss index 2c846e1..6303259 100644 --- a/src/styles/signup.scss +++ b/src/styles/signup.scss @@ -115,6 +115,10 @@ .select-plan-container { display: flex; flex-direction: column; + justify-content: center; + align-items: center; + margin-right: auto; + margin-left: auto; margin-top: 24px; width: 920px; min-height: 540px; @@ -164,11 +168,26 @@ flex-direction: column; } +.radio-group-super { + width: 912px; + display: flex; + flex-direction: row; + justify-content: center; + background-color: red; +} + .radio-group-box { display: flex; flex-direction: row; justify-content: center; - padding: 6px; + padding: 2px; + background-color: yellow; + width: 815px; +} + +.toggle-arrow-box { + width: 10px; + background-color: red; } .select-plan-summary-box { @@ -195,7 +214,7 @@ } .signup-radio-container { - width: 280px; + width: 270px; } .signup-feat-item { From 6767d59ea48020221341ef82989aa7aa7a29f308 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Fri, 23 Feb 2024 05:55:28 -0600 Subject: [PATCH 07/14] More --- src/Components/SignupPage/SignupPage.js | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/Components/SignupPage/SignupPage.js b/src/Components/SignupPage/SignupPage.js index caca153..6f8bc0a 100644 --- a/src/Components/SignupPage/SignupPage.js +++ b/src/Components/SignupPage/SignupPage.js @@ -13,6 +13,7 @@ import { v4 as uuidv4 } from "uuid"; import { collection, setDoc, doc } from "firebase/firestore"; import LoadingSpinner from "../../pageElements/LoadingSpinner"; import { splitEvery } from "../../Utils/Array"; +import { ArrowLeftSquare, ArrowRightSquare } from "react-bootstrap-icons"; import { getFormDataDefaults, getValidatedFormData, @@ -629,7 +630,14 @@ const SignupPage = () => {
-
+
+ +
{signupRadioFields?.slice(valX, valY).map((option, index) => (
@@ -650,7 +658,14 @@ const SignupPage = () => {
))}
-
+
+ +
{showAddAccount && !isBusy ? (
From 263bf52ad5f4ed8f09ce5f68f7205527dbdfcc45 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Fri, 23 Feb 2024 05:58:59 -0600 Subject: [PATCH 08/14] more --- src/Components/SignupPage/SignupPage.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/Components/SignupPage/SignupPage.js b/src/Components/SignupPage/SignupPage.js index 6f8bc0a..f3cf2b5 100644 --- a/src/Components/SignupPage/SignupPage.js +++ b/src/Components/SignupPage/SignupPage.js @@ -121,7 +121,16 @@ const SignupPage = () => { }; const handleRightArrowClick = () => { + console.log("right"); console.log("left"); + if (valX == 1) { + return; + } else { + const tempx = valX + 1; + const tempy = valY + 1; + setValX(tempx); + setValY(tempy); + } }; const vals = [ @@ -458,7 +467,7 @@ const SignupPage = () => { const today = new Date(); const subscriptionCreated = today; const subscriptionPeriodStart = today; - const subscriptionPeriodEnd = "it edns whatever"; //today.setDate(today.getDate() + 30); + const subscriptionPeriodEnd = "it ends whatever"; //today.setDate(today.getDate() + 30); const subscriptionId = uuidv4(); const userCredential = await createUserWithEmailAndPassword( From 8b88a2070539ce4a51252650f2df4ec63ea73abb Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Fri, 23 Feb 2024 06:04:34 -0600 Subject: [PATCH 09/14] more --- src/Components/SignupPage/SignupPage.js | 2 +- src/styles/signup.scss | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/Components/SignupPage/SignupPage.js b/src/Components/SignupPage/SignupPage.js index f3cf2b5..9a62c4a 100644 --- a/src/Components/SignupPage/SignupPage.js +++ b/src/Components/SignupPage/SignupPage.js @@ -640,7 +640,7 @@ const SignupPage = () => {
- Date: Fri, 23 Feb 2024 06:06:50 -0600 Subject: [PATCH 10/14] more --- src/styles/signup.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/styles/signup.scss b/src/styles/signup.scss index 05deb50..92702e3 100644 --- a/src/styles/signup.scss +++ b/src/styles/signup.scss @@ -58,12 +58,12 @@ } .signup-button-box { - width: 100%; + width: 830px; display: flex; flex-direction: row; justify-content: flex-end; - padding-right: 14px; - margin-top: 28px; + padding-right: 24px; + margin-top: 16px; } .signup-freebie-box { From 3d600450c9dc2b18c9a914126b27413eed5456ab Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Fri, 23 Feb 2024 06:13:18 -0600 Subject: [PATCH 11/14] more --- src/Components/SignupPage/SignupPage.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Components/SignupPage/SignupPage.js b/src/Components/SignupPage/SignupPage.js index 9a62c4a..cda9a27 100644 --- a/src/Components/SignupPage/SignupPage.js +++ b/src/Components/SignupPage/SignupPage.js @@ -642,9 +642,10 @@ const SignupPage = () => {
@@ -670,9 +671,10 @@ const SignupPage = () => {
From 4d7f977745f0b5ff9514e753c2ddb6fd02482975 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Fri, 23 Feb 2024 06:14:21 -0600 Subject: [PATCH 12/14] more --- src/Components/SignupPage/SignupPage.js | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/src/Components/SignupPage/SignupPage.js b/src/Components/SignupPage/SignupPage.js index cda9a27..a1fdd38 100644 --- a/src/Components/SignupPage/SignupPage.js +++ b/src/Components/SignupPage/SignupPage.js @@ -807,24 +807,3 @@ const SignupPage = () => { }; export default SignupPage; - -/* - - - const userDataValues = { - barNumber: "232323", - city: "broolyn", - email: "j@s.com", - firm: "asdf", - firstName: "ghghg", - lastName: "hhhhh", - password: "123344556", - practiceArea: "dfdfdf", - state: "New York", - streetAddress: "123 Main", - telephone: "(313) 555-5555", - zipCode: "12345", - }; - - -*/ From 5ff6c71f23e8e49de94c6efff8eedc4b1b7684cf Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Fri, 23 Feb 2024 06:31:13 -0600 Subject: [PATCH 13/14] more --- src/styles/signup.scss | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/styles/signup.scss b/src/styles/signup.scss index 92702e3..3ea08a6 100644 --- a/src/styles/signup.scss +++ b/src/styles/signup.scss @@ -67,13 +67,14 @@ } .signup-freebie-box { - width: 100%; + width: 830px; display: flex; flex-direction: row; justify-content: flex-end; - padding-right: 22px; + padding-right: 20px; margin-top: 12px; margin-bottom: 24px; + margin-right: 16px; font-size: 1.15rem; color: #2759ff; } From 114f4c6a63fc7824e71bda62e1ffe2bd762a9880 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Fri, 23 Feb 2024 06:35:20 -0600 Subject: [PATCH 14/14] more --- src/Components/SignupPage/SignupPage.js | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/Components/SignupPage/SignupPage.js b/src/Components/SignupPage/SignupPage.js index a1fdd38..cc80e1a 100644 --- a/src/Components/SignupPage/SignupPage.js +++ b/src/Components/SignupPage/SignupPage.js @@ -45,12 +45,12 @@ const SignupPage = () => { getFormDataDefaults(paymentfields) ); const [showPaymentModal, setShowPaymentModal] = useState(false); - /* + const [showSelectPlan, setShowSelectPlan] = useState( isUpgrade ? true : false ); -*/ - const [showSelectPlan, setShowSelectPlan] = useState(true); + + //const [showSelectPlan, setShowSelectPlan] = useState(true); const [activeRadioOption, setActiveRadioOption] = useState("partner"); const [selectedPlan, setSelectedPlan] = useState([signupRadioFields[1]]); const stripe = new Stripe(stripeApiKey); @@ -109,7 +109,6 @@ const SignupPage = () => { }; const handleLeftArrowClick = () => { - console.log("left"); if (valX == 0) { return; } else { @@ -121,8 +120,6 @@ const SignupPage = () => { }; const handleRightArrowClick = () => { - console.log("right"); - console.log("left"); if (valX == 1) { return; } else { @@ -315,7 +312,7 @@ const SignupPage = () => { }; const handleToggle = (val) => setIsAnnual(val); - console.log("isAnnual", isAnnual); + const handleAddAccounts = () => { setShowAddAccount(!showAddAccount); };