From c29913b128aba11d2dfa63c3b31a41e5a48aa50a Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Thu, 1 Feb 2024 16:38:47 -0600 Subject: [PATCH 1/5] more --- src/Constants/Fields/SignupFields.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Constants/Fields/SignupFields.js b/src/Constants/Fields/SignupFields.js index 0c9d58d..909b5a4 100644 --- a/src/Constants/Fields/SignupFields.js +++ b/src/Constants/Fields/SignupFields.js @@ -21,7 +21,7 @@ export const signupFields = { minLength: 3, maxLength: 45, type: "select", - values: ["Florida", "Massachusetts", "New Jersey", "New York"], + values: ["Florida", "New Jersey", "New York"], }, zipCode: { required: true, From 01fa0316d01008b733391ae31c9f03553c8068f5 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Thu, 1 Feb 2024 16:51:13 -0600 Subject: [PATCH 2/5] more --- src/Components/SignupPage/SignupPage.js | 21 +++++++++++++++++---- src/Constants/Fields/SignupFields.js | 6 ++++++ 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/src/Components/SignupPage/SignupPage.js b/src/Components/SignupPage/SignupPage.js index 8725408..264c14b 100644 --- a/src/Components/SignupPage/SignupPage.js +++ b/src/Components/SignupPage/SignupPage.js @@ -18,8 +18,10 @@ import { isFormDataHasErrors, } from "../../Utils/Form"; import { objectMap } from "../../Utils/Object"; -import { determinePlan } from "../../Utils/Miscutils"; -import { signupFields } from "../../Constants/Fields/SignupFields"; +import { + signupFields, + stateDataValues, +} from "../../Constants/Fields/SignupFields"; import { paymentfields } from "../../Constants/Fields/PaymentFields"; import { signupRadioFields } from "../../Constants/Fields/RadioFields"; import PaymentModal from "../Modals/PaymentModal"; @@ -152,8 +154,15 @@ const SignupPage = () => { const fbAuthUid = authId; const plan = selectedPlan; const docsAllowed = - plan === "associate" ? 1 : plan === "partner" ? 3 : "unlimited"; + plan === "associate" + ? 1 + : plan === "partner" + ? 3 + : plan === "unlimited" + ? 4000 + : 0; const docsGenerated = 0; + const { firstName, lastName, @@ -168,6 +177,10 @@ const SignupPage = () => { email, } = dataValues; + const userState = stateDataValues.filter((value) => { + if (value.name === state) return value; + }); + const userData = { docsAllowed, docsGenerated, @@ -180,7 +193,7 @@ const SignupPage = () => { telephone, streetAddress, city, - state, + state: userState, zipCode, barNumber, practiceArea, diff --git a/src/Constants/Fields/SignupFields.js b/src/Constants/Fields/SignupFields.js index 909b5a4..84629ce 100644 --- a/src/Constants/Fields/SignupFields.js +++ b/src/Constants/Fields/SignupFields.js @@ -52,3 +52,9 @@ export const signupFields = { type: "confirmPassword", }, }; + +export const stateDataValues = [ + { name: "Florida", value: "florida", code: "fl" }, + { name: "New York", value: "newYork", code: "ny" }, + { name: "New Jersey", value: "newJersey", code: "nj" }, +]; From e2b8457407ed92d70e807fc9f72dbc57dd8b6540 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Thu, 1 Feb 2024 17:11:51 -0600 Subject: [PATCH 3/5] more --- src/Components/Document/DocEditPage.js | 12 ++++++------ src/Components/Modals/CreateModal.js | 9 ++++----- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/Components/Document/DocEditPage.js b/src/Components/Document/DocEditPage.js index 0e5fa20..936f001 100644 --- a/src/Components/Document/DocEditPage.js +++ b/src/Components/Document/DocEditPage.js @@ -68,8 +68,8 @@ const DocEditPage = () => { : docEditCopy.NewYork; const headerPicker = () => { - switch (state) { - case "New York": + switch (state.code) { + case "ny": return ( { onScrollClick={onScrollClick} /> ); - case "New Jersey": + case "nj": return ( { onScrollClick={onScrollClick} /> ); - case "Florida": + case "fl": return ( { defendant: defendants, firm: lawFirm, firmCity: city, - firmState: usState, + firmState: usState.code, firmStreetAddress: streetAdd, firmZip: zipCode, judge: judge, jurisdiction: juris, leadAttorneys: leadAttorneys, plaintiff: plaintiffs, - state: usState, + state: usState.code, tel: telephone, venue: venued, }), diff --git a/src/Components/Modals/CreateModal.js b/src/Components/Modals/CreateModal.js index b503a43..ef68e26 100644 --- a/src/Components/Modals/CreateModal.js +++ b/src/Components/Modals/CreateModal.js @@ -33,8 +33,9 @@ const CreateModal = ({ setShowModal, caseData }) => { const isEditing = typeof editCaseId !== "undefined"; const [isBusy, setIsBusy] = useState(false); const [newCaseId, setNewCaseId] = useState(); - const caseNumCopy = - group.state == "New York" ? "Index Number" : "Case Number"; + const state = group?.state[0].code ? group?.state[0].code : null; + console.log("state", state); + const caseNumCopy = state === "ny" ? "Index Number" : "Case Number"; const [data, setData] = useState( getFormDataDefaults(fields, isEditing ? caseData : undefined) ); @@ -185,9 +186,7 @@ const CreateModal = ({ setShowModal, caseData }) => { data.caseNumber.value.length === 0 ? isEditing ? caseData.caseNumber - : stateOfCase === "NY" - ? "Index Number" - : "Case Number" + : caseNumCopy : "" } /> From c7f25d9adc8d79e13d0234725291e9e3bf3a6333 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Thu, 1 Feb 2024 17:31:31 -0600 Subject: [PATCH 4/5] more --- src/Components/Document/DocEditPage.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Components/Document/DocEditPage.js b/src/Components/Document/DocEditPage.js index 936f001..fc53b1e 100644 --- a/src/Components/Document/DocEditPage.js +++ b/src/Components/Document/DocEditPage.js @@ -47,7 +47,8 @@ const DocEditPage = () => { const [index, setIndex] = useState(0); // For document generation: - const state = group ? group?.state : null; + + const state = group.state[0] ? group.state[0].code : "ny"; const lawFirm = group ? group?.firm : null; const streetAdd = group ? group?.streetAddress : null; const city = group ? group.city : null; @@ -61,14 +62,14 @@ const DocEditPage = () => { : process.env.REACT_APP_API_PROD; const displayCopy = - state === "New York" + state === "ny" ? docEditCopy.NewYork - : state === "New Jersey" + : state === "nj" ? docEditCopy.NewJersey : docEditCopy.NewYork; const headerPicker = () => { - switch (state.code) { + switch (state) { case "ny": return ( Date: Thu, 1 Feb 2024 17:32:39 -0600 Subject: [PATCH 5/5] more --- src/Components/Document/DocEditPage.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Components/Document/DocEditPage.js b/src/Components/Document/DocEditPage.js index fc53b1e..43b11a1 100644 --- a/src/Components/Document/DocEditPage.js +++ b/src/Components/Document/DocEditPage.js @@ -147,7 +147,8 @@ const DocEditPage = () => { /* * GET parsed requests. * GET completions if already generated - * */ + */ + useEffect(() => { if (!documentId || !documentType) { return;