From cc8700ef967b32bc82a6eaa4ff6001818dff9332 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Sun, 26 May 2024 16:23:36 -0500 Subject: [PATCH 1/9] more --- src/Constants/Fields/SignupFields.js | 2 +- src/pageElements/Toggle.js | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Constants/Fields/SignupFields.js b/src/Constants/Fields/SignupFields.js index b350006..5869e81 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", "New Jersey", "New York"], + values: ["Florida", "Michigan", "New Jersey", "New York"], }, zipCode: { required: true, diff --git a/src/pageElements/Toggle.js b/src/pageElements/Toggle.js index c64a060..ddd3cd3 100644 --- a/src/pageElements/Toggle.js +++ b/src/pageElements/Toggle.js @@ -10,18 +10,18 @@ const Toggle = (props) => { name="options" value={value} onChange={handleToggle} - defaultValue={1} + defaultValue={2} > onClick(1)} + onClick={(e) => onClick(2)} id="tbg-radio-1" - value={1} + value={2} > onClick(2)} + onClick={(e) => onClick(1)} id="tbg-radio-2" - value={2} + value={1} > From d1175f118979f6c8062dfc385fe88f8468f32103 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Sun, 26 May 2024 16:36:37 -0500 Subject: [PATCH 2/9] more --- src/Components/SignupPage/SignupPage.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Components/SignupPage/SignupPage.js b/src/Components/SignupPage/SignupPage.js index b0db95e..08872ca 100644 --- a/src/Components/SignupPage/SignupPage.js +++ b/src/Components/SignupPage/SignupPage.js @@ -50,7 +50,7 @@ const SignupPage = () => { isUpgrade ? true : false ); - // const [showSelectPlan, setShowSelectPlan] = useState(true); + //const [showSelectPlan, setShowSelectPlan] = useState(true); const [activeRadioOption, setActiveRadioOption] = useState("partner"); const [selectedPlan, setSelectedPlan] = useState([signupRadioFields[1]]); @@ -292,8 +292,8 @@ const SignupPage = () => { const handleCancelModal = () => { setShowPromoModal(!showPromoModal); + setShowSelectPlan(true); setTimeout(scrollToLowerPanel, 93); - setShowSelectPlan(!showSelectPlan); }; const handleOpenSelectPlan = (e) => { @@ -635,7 +635,7 @@ const SignupPage = () => {
{isBusy ? : null} {!isUpgrade && !isBusy ? signupForm : <>} - {true && !isBusy ? ( + {showSelectPlan && !isBusy ? (
From e81af6df93df16c52a3f26e1fb5a2592b6fe1b32 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Sun, 26 May 2024 17:30:46 -0500 Subject: [PATCH 3/9] more --- src/Components/SignupPage/SignupPage.js | 1 + src/Constants/Fields/SignupFields.js | 1 + 2 files changed, 2 insertions(+) diff --git a/src/Components/SignupPage/SignupPage.js b/src/Components/SignupPage/SignupPage.js index 08872ca..9f36c60 100644 --- a/src/Components/SignupPage/SignupPage.js +++ b/src/Components/SignupPage/SignupPage.js @@ -309,6 +309,7 @@ const SignupPage = () => { saveLeadData(dataValues); setShowPromoModal(!showPromoModal); + setShowSelectPlan(true); }; const handleToggle = (val) => setIsAnnual(val); diff --git a/src/Constants/Fields/SignupFields.js b/src/Constants/Fields/SignupFields.js index 5869e81..0a94848 100644 --- a/src/Constants/Fields/SignupFields.js +++ b/src/Constants/Fields/SignupFields.js @@ -57,6 +57,7 @@ export const signupFields = { export const stateDataValues = [ { name: "Florida", value: "florida", code: "fl" }, + { name: "Michigan", value: "michigan", code: "mi" }, { name: "New York", value: "newYork", code: "ny" }, { name: "New Jersey", value: "newJersey", code: "nj" }, ]; From f554a1325c5565445e2db5931a135e1b83b31fb0 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Sun, 26 May 2024 19:11:14 -0500 Subject: [PATCH 4/9] more --- src/Components/Modals/CreateModal.js | 1 - src/Components/Modals/PaymentModal.js | 2 +- src/Components/SignupPage/SignupPage.js | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Components/Modals/CreateModal.js b/src/Components/Modals/CreateModal.js index 2daf665..7957591 100644 --- a/src/Components/Modals/CreateModal.js +++ b/src/Components/Modals/CreateModal.js @@ -36,7 +36,6 @@ const CreateModal = ({ setShowModal, caseData }) => { const [venueArray, setVenueArray] = useState(); const [newCaseId, setNewCaseId] = useState(); const state = group?.state[0].code ? group?.state[0].code : null; - const caseNumCopy = state === "ny" ? "Index Number" : "Case Number"; const [data, setData] = useState( getFormDataDefaults(fields, isEditing ? caseData : undefined) diff --git a/src/Components/Modals/PaymentModal.js b/src/Components/Modals/PaymentModal.js index 236208c..4d540e0 100644 --- a/src/Components/Modals/PaymentModal.js +++ b/src/Components/Modals/PaymentModal.js @@ -60,7 +60,7 @@ const PaymentModal = ({ const totalToday = planValue === "ofCounsel" ? 59 : amountToday + extraAccountsPrice; - + console.log("selectedPlan in modal", selectedPlan); const isCounsel = planValue === "ofCounsel" ? true : false; const handleSignupClick = () => { //clear fields diff --git a/src/Components/SignupPage/SignupPage.js b/src/Components/SignupPage/SignupPage.js index 9f36c60..4c79453 100644 --- a/src/Components/SignupPage/SignupPage.js +++ b/src/Components/SignupPage/SignupPage.js @@ -53,7 +53,7 @@ const SignupPage = () => { //const [showSelectPlan, setShowSelectPlan] = useState(true); const [activeRadioOption, setActiveRadioOption] = useState("partner"); - const [selectedPlan, setSelectedPlan] = useState([signupRadioFields[1]]); + const [selectedPlan, setSelectedPlan] = useState([signupRadioFields[2]]); const stripe = new Stripe(stripeApiKey); const apiUrl = process.env.NODE_ENV === "development" @@ -109,7 +109,7 @@ const SignupPage = () => { setSelectedPlan(tempPlan); setActiveRadioOption(tempPlan[0].value); }; - + console.log("selectedPlan in signup page", selectedPlan); const handleLeftArrowClick = () => { if (valX == 0) { return; From 4da6640e711f7ec19612f4de67a2a5fac6737f31 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Sun, 26 May 2024 20:28:34 -0500 Subject: [PATCH 5/9] more --- src/Components/Modals/CreateModal.js | 3 +- src/Constants/Fields/CreateCaseFields.js | 264 +++++++++++++++++++++++ 2 files changed, 266 insertions(+), 1 deletion(-) diff --git a/src/Components/Modals/CreateModal.js b/src/Components/Modals/CreateModal.js index 7957591..988a427 100644 --- a/src/Components/Modals/CreateModal.js +++ b/src/Components/Modals/CreateModal.js @@ -40,6 +40,7 @@ const CreateModal = ({ setShowModal, caseData }) => { const [data, setData] = useState( getFormDataDefaults(fields, isEditing ? caseData : undefined) ); + console.log("state in create modal", state); function selectVenueValues(data) { const result = floridaCourts.filter((court) => { @@ -265,7 +266,7 @@ const CreateModal = ({ setShowModal, caseData }) => { name={"venue"} value={data.venue.value} error={data.venue.error} - type={state === "fl" ? "select" : "text"} + type={state === "fl" || state === "mi" ? "select" : "text"} values={venueArray} message={data.venue.message} disabled={isBusy} diff --git a/src/Constants/Fields/CreateCaseFields.js b/src/Constants/Fields/CreateCaseFields.js index a7850ba..9ecfe97 100644 --- a/src/Constants/Fields/CreateCaseFields.js +++ b/src/Constants/Fields/CreateCaseFields.js @@ -119,6 +119,270 @@ export const floridaCourts = [ }, ]; +const michiganCourts = [ + { + circuit: "1st", + counties: ["Hillsdale"], + }, + { + circuit: "2nd", + counties: ["Berrien"], + }, + { + circuit: "4th", + counties: ["Jackson"], + }, + { + circuit: "5th", + counties: ["Barry"], + }, + { + circuit: "7th", + counties: ["Genesee"], + }, + { + circuit: "8th", + counties: ["Ionia"], + }, + { + circuit: "9th", + counties: ["Kalamazoo"], + }, + { + circuit: "11th", + counties: ["Alger"], + }, + { + circuit: "12th", + counties: ["Baraga", "Houghton", "Keweenaw"], + }, + { + circuit: "13th", + counties: ["Antrim", "Grand Traverse"], + }, + { + circuit: "15th", + counties: ["Branch"], + }, + { + circuit: "17th", + counties: ["Kent"], + }, + { + circuit: "18th", + counties: ["Bay"], + }, + { + circuit: "19th", + counties: ["Benzie"], + }, + { + circuit: "21st", + counties: ["Isabella"], + }, + { + circuit: "23rd", + counties: ["Alcona", "Arenac", "Iosco"], + }, + { + circuit: "26th", + counties: ["Alpena"], + }, + { + circuit: "27th", + counties: ["Lake"], + }, + { + circuit: "29th", + counties: ["Clinton", "Gratiot"], + }, + { + circuit: "30th", + counties: ["Ingham"], + }, + { + circuit: "32nd", + counties: ["Gogebic"], + }, + { + circuit: "33rd", + counties: ["Charlevoix"], + }, + { + circuit: "37th", + counties: ["Calhoum"], + }, + { + circuit: "40th", + counties: ["Lapeer"], + }, + { + circuit: "41st", + counties: ["Dickinson", "Iron"], + }, + { + circuit: "43rd", + counties: ["Cass"], + }, + { + circuit: "46th", + counties: ["Crawford", "Kalkaska"], + }, + { + circuit: "47th", + counties: ["Delta"], + }, + { + circuit: "52nd", + counties: ["Huron"], + }, + { + circuit: "53rd", + counties: ["Cheboygan"], + }, + { + circuit: "55th", + counties: ["Clare", "Gladwin"], + }, + { + circuit: "56th", + counties: ["Eaton"], + }, + { + circuit: "57th", + counties: ["Emmet"], + }, + { + circuit: "50th", + counties: ["Chippewa"], + }, + + { + circuit: "", + counties: [""], + }, + { + circuit: "", + counties: [""], + }, + { + circuit: "", + counties: [""], + }, + { + circuit: "", + counties: [""], + }, + { + circuit: "", + counties: [""], + }, + { + circuit: "", + counties: [""], + }, + { + circuit: "", + counties: [""], + }, + { + circuit: "", + counties: [""], + }, + { + circuit: "", + counties: [""], + }, + { + circuit: "", + counties: [""], + }, + { + circuit: "", + counties: [""], + }, + { + circuit: "", + counties: [""], + }, + { + circuit: "", + counties: [""], + }, + { + circuit: "", + counties: [""], + }, + { + circuit: "", + counties: [""], + }, + { + circuit: "", + counties: [""], + }, + { + circuit: "", + counties: [""], + }, + { + circuit: "", + counties: [""], + }, + { + circuit: "", + counties: [""], + }, + { + circuit: "", + counties: [""], + }, + { + circuit: "", + counties: [""], + }, + { + circuit: "", + counties: [""], + }, + { + circuit: "", + counties: [""], + }, + { + circuit: "", + counties: [""], + }, + { + circuit: "", + counties: [""], + }, + { + circuit: "", + counties: [""], + }, + { + circuit: "", + counties: [""], + }, + { + circuit: "", + counties: [""], + }, + { + circuit: "", + counties: [""], + }, + { + circuit: "", + counties: [""], + }, + { + circuit: "", + counties: [""], + }, +]; + export const newYorkCounties = [ { name: "Albany County" }, { name: "Allegany County" }, From 6e1b502f7772a92de2151ad2ee9cf515ae2e95dd Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Sun, 26 May 2024 21:00:49 -0500 Subject: [PATCH 6/9] more --- src/Constants/Fields/CreateCaseFields.js | 114 ++++++++++++++++++++--- 1 file changed, 103 insertions(+), 11 deletions(-) diff --git a/src/Constants/Fields/CreateCaseFields.js b/src/Constants/Fields/CreateCaseFields.js index 9ecfe97..5750610 100644 --- a/src/Constants/Fields/CreateCaseFields.js +++ b/src/Constants/Fields/CreateCaseFields.js @@ -128,6 +128,10 @@ const michiganCourts = [ circuit: "2nd", counties: ["Berrien"], }, + { + circuit: "3rd", + counties: ["Wayne"], + }, { circuit: "4th", counties: ["Jackson"], @@ -136,21 +140,29 @@ const michiganCourts = [ circuit: "5th", counties: ["Barry"], }, + { + circuit: "6th", + counties: ["Oakland"], + }, { circuit: "7th", counties: ["Genesee"], }, { circuit: "8th", - counties: ["Ionia"], + counties: ["Ionia", "Montcalm"], }, { circuit: "9th", counties: ["Kalamazoo"], }, + { + circuit: "10th", + counties: ["Saginaw"], + }, { circuit: "11th", - counties: ["Alger"], + counties: ["Alger", "Luce", "Mackinac", "Schoolcraft"], }, { circuit: "12th", @@ -158,12 +170,20 @@ const michiganCourts = [ }, { circuit: "13th", - counties: ["Antrim", "Grand Traverse"], + counties: ["Antrim", "Leelanau", "Grand Traverse"], + }, + { + circuit: "14th", + counties: ["Muskegon"], }, { circuit: "15th", counties: ["Branch"], }, + { + circuit: "16th", + counties: ["Macomb"], + }, { circuit: "17th", counties: ["Kent"], @@ -174,23 +194,43 @@ const michiganCourts = [ }, { circuit: "19th", - counties: ["Benzie"], + counties: ["Benzie", "Manistee"], + }, + { + circuit: "20th", + counties: ["Ottawa"], }, { circuit: "21st", counties: ["Isabella"], }, + { + circuit: "22nd", + counties: ["Washtenaw"], + }, { circuit: "23rd", - counties: ["Alcona", "Arenac", "Iosco"], + counties: ["Alcona", "Arenac", "Iosco", "Oscoda"], + }, + { + circuit: "24th", + counties: ["Sanilac"], + }, + { + circuit: "25th", + counties: ["Marquette"], }, { circuit: "26th", - counties: ["Alpena"], + counties: ["Alpena", "Montmorency"], }, { circuit: "27th", - counties: ["Lake"], + counties: ["Lake", "Newaygo"], + }, + { + circuit: "28th", + counties: ["Missaukee", "Wexford"], }, { circuit: "29th", @@ -200,45 +240,97 @@ const michiganCourts = [ circuit: "30th", counties: ["Ingham"], }, + { + circuit: "31st", + counties: ["St. Clair"], + }, { circuit: "32nd", - counties: ["Gogebic"], + counties: ["Gogebic", "Ontonagon"], }, { circuit: "33rd", counties: ["Charlevoix"], }, + { + circuit: "34th", + counties: ["Ogemaw", "Roscommon"], + }, + { + circuit: "35th", + counties: ["Shiawasee"], + }, + { + circuit: "36th", + counties: ["Van Buren"], + }, { circuit: "37th", counties: ["Calhoum"], }, + { + circuit: "38th", + counties: ["Monroe"], + }, + { + circuit: "39th", + counties: ["Lenawee"], + }, { circuit: "40th", counties: ["Lapeer"], }, { circuit: "41st", - counties: ["Dickinson", "Iron"], + counties: ["Dickinson", "Iron", "Menominee"], + }, + { + circuit: "42nd", + counties: ["Midland"], }, { circuit: "43rd", counties: ["Cass"], }, + { + circuit: "44th", + counties: ["Livingston"], + }, + { + circuit: "45th", + counties: ["St. Joseph"], + }, + { + circuit: "45th", + counties: ["St. Joseph"], + }, { circuit: "46th", - counties: ["Crawford", "Kalkaska"], + counties: ["Crawford", "Kalkaska", "Otsego"], }, { circuit: "47th", counties: ["Delta"], }, + { + circuit: "49th", + counties: ["Mecosta", "Osceoloa"], + }, + { + circuit: "51st", + counties: ["Mason", "Oceana"], + }, { circuit: "52nd", counties: ["Huron"], }, { circuit: "53rd", - counties: ["Cheboygan"], + counties: ["Cheboygan", "Presque Isle"], + }, + { + circuit: "55th", + counties: ["Tuscola"], }, { circuit: "55th", From 6374aafcd121ff6cbbaa061a20f6ef48dea7f7c5 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Sun, 26 May 2024 21:05:09 -0500 Subject: [PATCH 7/9] more --- src/Components/Modals/CreateModal.js | 9 +++++---- src/Constants/Fields/CreateCaseFields.js | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Components/Modals/CreateModal.js b/src/Components/Modals/CreateModal.js index 988a427..5137e9e 100644 --- a/src/Components/Modals/CreateModal.js +++ b/src/Components/Modals/CreateModal.js @@ -13,6 +13,7 @@ import { objectMap } from "../../Utils/Object"; import { createCaseFields as fields } from "../../Constants/Fields/CreateCaseFields.js"; import { floridaCourts, + michiganCourts, newYorkCounties, } from "../../Constants/Fields/CreateCaseFields.js"; import "../../styles/modals.scss"; @@ -41,9 +42,9 @@ const CreateModal = ({ setShowModal, caseData }) => { getFormDataDefaults(fields, isEditing ? caseData : undefined) ); console.log("state in create modal", state); - + const courtsList = state === "mi" ? michiganCourts : floridaCourts; function selectVenueValues(data) { - const result = floridaCourts.filter((court) => { + const result = courtsList.filter((court) => { let val; const target = data?.jurisdiction?.value?.split(" ")[0]; if (court?.circuit === target) { @@ -222,10 +223,10 @@ const CreateModal = ({ setShowModal, caseData }) => { name={"jurisdiction"} state={state} value={data.jurisdiction.value} - values={floridaCourts} + values={courtsList} error={data.jurisdiction.error} message={data.jurisdiction.message} - type={state === "fl" ? "select" : "text"} + type={state === "fl" || state === "mi" ? "select" : "text"} disabled={isBusy} onChange={(e) => handleChangeInput(e, "jurisdiction")} label={ diff --git a/src/Constants/Fields/CreateCaseFields.js b/src/Constants/Fields/CreateCaseFields.js index 5750610..183af3c 100644 --- a/src/Constants/Fields/CreateCaseFields.js +++ b/src/Constants/Fields/CreateCaseFields.js @@ -119,7 +119,7 @@ export const floridaCourts = [ }, ]; -const michiganCourts = [ +export const michiganCourts = [ { circuit: "1st", counties: ["Hillsdale"], From e8147d7a49fccf632beeaaab1f24087b6891c431 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Sun, 26 May 2024 22:05:10 -0500 Subject: [PATCH 8/9] more --- src/Components/Document/DocEditPage.js | 8 +- .../Document/captionHeaders/floridaCaption.js | 1 - .../captionHeaders/michiganCaption.js | 71 +++++ .../Document/captionHeaders/newYorkCaption.js | 1 - src/Components/Modals/CreateModal.js | 4 +- src/Components/Modals/UploadModal.js | 4 +- src/Constants/Fields/CreateCaseFields.js | 249 +++++------------- src/pageElements/TextInput.js | 6 +- 8 files changed, 146 insertions(+), 198 deletions(-) create mode 100644 src/Components/Document/captionHeaders/michiganCaption.js diff --git a/src/Components/Document/DocEditPage.js b/src/Components/Document/DocEditPage.js index 12680cb..9a818ce 100644 --- a/src/Components/Document/DocEditPage.js +++ b/src/Components/Document/DocEditPage.js @@ -11,14 +11,8 @@ import Button from "../../pageElements/Button"; import ConfirmModal from "../Modals/ConfirmModal"; import LoadingSpinner from "../../pageElements/LoadingSpinner"; import { docEditCopy } from "../../Constants/Copy/docEditCopy.js"; +import { doc, getDoc, updateDoc, increment } from "firebase/firestore"; import "../../styles/docedit-page.scss"; -import { - doc, - getDoc, - updateDoc, - onSnapshot, - increment, -} from "firebase/firestore"; const DocEditPage = (props) => { const navigate = useNavigate(); diff --git a/src/Components/Document/captionHeaders/floridaCaption.js b/src/Components/Document/captionHeaders/floridaCaption.js index 851bc08..8b48f26 100644 --- a/src/Components/Document/captionHeaders/floridaCaption.js +++ b/src/Components/Document/captionHeaders/floridaCaption.js @@ -1,4 +1,3 @@ -import { useState } from "react"; import Scrollbutton from "react-bootstrap/Button"; import { ArrowUp, ArrowDown } from "react-bootstrap-icons"; import "../../../styles/captions.scss"; diff --git a/src/Components/Document/captionHeaders/michiganCaption.js b/src/Components/Document/captionHeaders/michiganCaption.js new file mode 100644 index 0000000..21fc913 --- /dev/null +++ b/src/Components/Document/captionHeaders/michiganCaption.js @@ -0,0 +1,71 @@ +import Scrollbutton from "react-bootstrap/Button"; +import { ArrowUp, ArrowDown } from "react-bootstrap-icons"; + +const MichiganCaption = (props) => { + const { fetchedCase, displayCopy, onScrollClick } = props; + + return ( + <> +
+
+
+ STATE OF MICHIGAN + + IN THE CIRCUIT COURT FOR THE COUNTY OF{" "} + {fetchedCase?.venu.split(" ")[0]} + +
+
+ -----------------------------------------------------------------------X +
+
+
+
+
+
+
+
Edit Document
+
+
+
+ {fetchedCase?.caption ? fetchedCase?.caption : <>}, +
+
+
+
+
Plaintiff(s),
+
+ Index no. {fetchedCase?.caseNumber} +
+
+
+
+
{displayCopy.versusText}
+
Judge: {fetchedCase?.judge}
+
+
+ {fetchedCase?.captionTwo ? fetchedCase?.captionTwo : <>}, +
+
+
+
Defendant(s)
+
+
+
+ ----------------------------------------------------------------------------X +
+
+
+
+
+ + Scroll + +
+
+
+ + ); +}; + +export default MichiganCaption; diff --git a/src/Components/Document/captionHeaders/newYorkCaption.js b/src/Components/Document/captionHeaders/newYorkCaption.js index c8ecae0..44ec8c9 100644 --- a/src/Components/Document/captionHeaders/newYorkCaption.js +++ b/src/Components/Document/captionHeaders/newYorkCaption.js @@ -1,4 +1,3 @@ -import { useState } from "react"; import Scrollbutton from "react-bootstrap/Button"; import { ArrowUp, ArrowDown } from "react-bootstrap-icons"; diff --git a/src/Components/Modals/CreateModal.js b/src/Components/Modals/CreateModal.js index 5137e9e..330e09c 100644 --- a/src/Components/Modals/CreateModal.js +++ b/src/Components/Modals/CreateModal.js @@ -41,7 +41,7 @@ const CreateModal = ({ setShowModal, caseData }) => { const [data, setData] = useState( getFormDataDefaults(fields, isEditing ? caseData : undefined) ); - console.log("state in create modal", state); + const courtsList = state === "mi" ? michiganCourts : floridaCourts; function selectVenueValues(data) { const result = courtsList.filter((court) => { @@ -58,7 +58,7 @@ const CreateModal = ({ setShowModal, caseData }) => { const handleChangeInput = (e, name) => { let venArr; const newData = handleFormDataChange(e, name, data, fields); - if (state === "fl") { + if (state === "fl" || state === "mi") { venArr = selectVenueValues(newData); } diff --git a/src/Components/Modals/UploadModal.js b/src/Components/Modals/UploadModal.js index c2791c5..8deb4d6 100644 --- a/src/Components/Modals/UploadModal.js +++ b/src/Components/Modals/UploadModal.js @@ -236,8 +236,8 @@ const UploadModal = (props) => {

- Select a .pdf file for upload, then 1. enter title, and 2. choose - document type (other fields optional). + 1, Enter document title, (i.e. Plaintiff's Interrogatories). 2. + Click or drag and drop the .psf file.

The document created will be associated with{" "} diff --git a/src/Constants/Fields/CreateCaseFields.js b/src/Constants/Fields/CreateCaseFields.js index 183af3c..c559944 100644 --- a/src/Constants/Fields/CreateCaseFields.js +++ b/src/Constants/Fields/CreateCaseFields.js @@ -122,356 +122,241 @@ export const floridaCourts = [ export const michiganCourts = [ { circuit: "1st", - counties: ["Hillsdale"], + counties: ["Hillsdale County"], }, { circuit: "2nd", - counties: ["Berrien"], + counties: ["Berrien County"], }, { circuit: "3rd", - counties: ["Wayne"], + counties: ["Wayne County"], }, { circuit: "4th", - counties: ["Jackson"], + counties: ["Jackson County"], }, { circuit: "5th", - counties: ["Barry"], + counties: ["Barry County"], }, { circuit: "6th", - counties: ["Oakland"], + counties: ["Oakland County"], }, { circuit: "7th", - counties: ["Genesee"], + counties: ["Genesee County"], }, { circuit: "8th", - counties: ["Ionia", "Montcalm"], + counties: ["Ionia County", "Montcalm County"], }, { circuit: "9th", - counties: ["Kalamazoo"], + counties: ["Kalamazoo County"], }, { circuit: "10th", - counties: ["Saginaw"], + counties: ["Saginaw County"], }, { circuit: "11th", - counties: ["Alger", "Luce", "Mackinac", "Schoolcraft"], + counties: [ + "Alger County", + "Luce County", + "Mackinac County", + "Schoolcraft County", + ], }, { circuit: "12th", - counties: ["Baraga", "Houghton", "Keweenaw"], + counties: ["Baraga County", "Houghton County", "Keweenaw County"], }, { circuit: "13th", - counties: ["Antrim", "Leelanau", "Grand Traverse"], + counties: ["Antrim County", "Leelanau County", "Grand Traverse County"], }, { circuit: "14th", - counties: ["Muskegon"], + counties: ["Muskegon County"], }, { circuit: "15th", - counties: ["Branch"], + counties: ["Branch County"], }, { circuit: "16th", - counties: ["Macomb"], + counties: ["Macomb County"], }, { circuit: "17th", - counties: ["Kent"], + counties: ["Kent County"], }, { circuit: "18th", - counties: ["Bay"], + counties: ["Bay County"], }, { circuit: "19th", - counties: ["Benzie", "Manistee"], + counties: ["Benzie County", "Manistee County"], }, { circuit: "20th", - counties: ["Ottawa"], + counties: ["Ottawa County"], }, { circuit: "21st", - counties: ["Isabella"], + counties: ["Isabella County"], }, { circuit: "22nd", - counties: ["Washtenaw"], + counties: ["Washtenaw County"], }, { circuit: "23rd", - counties: ["Alcona", "Arenac", "Iosco", "Oscoda"], + counties: [ + "Alcona County", + "Arenac County", + "Iosco County", + "Oscoda County", + ], }, { circuit: "24th", - counties: ["Sanilac"], + counties: ["Sanilac County"], }, { circuit: "25th", - counties: ["Marquette"], + counties: ["Marquette County"], }, { circuit: "26th", - counties: ["Alpena", "Montmorency"], + counties: ["Alpena County", "Montmorency County"], }, { circuit: "27th", - counties: ["Lake", "Newaygo"], + counties: ["Lake County", "Newaygo County"], }, { circuit: "28th", - counties: ["Missaukee", "Wexford"], + counties: ["Missaukee County", "Wexford County"], }, { circuit: "29th", - counties: ["Clinton", "Gratiot"], + counties: ["Clinton County", "Gratiot County"], }, { circuit: "30th", - counties: ["Ingham"], + counties: ["Ingham County"], }, { circuit: "31st", - counties: ["St. Clair"], + counties: ["St. Clair County"], }, { circuit: "32nd", - counties: ["Gogebic", "Ontonagon"], + counties: ["Gogebic County", "Ontonagon County"], }, { circuit: "33rd", - counties: ["Charlevoix"], + counties: ["Charlevoix County"], }, { circuit: "34th", - counties: ["Ogemaw", "Roscommon"], + counties: ["Ogemaw County", "Roscommon County"], }, { circuit: "35th", - counties: ["Shiawasee"], + counties: ["Shiawasee County"], }, { circuit: "36th", - counties: ["Van Buren"], + counties: ["Van Buren County"], }, { circuit: "37th", - counties: ["Calhoum"], + counties: ["Calhoum County"], }, { circuit: "38th", - counties: ["Monroe"], + counties: ["Monroe County"], }, { circuit: "39th", - counties: ["Lenawee"], + counties: ["Lenawee County"], }, { circuit: "40th", - counties: ["Lapeer"], + counties: ["Lapeer County"], }, { circuit: "41st", - counties: ["Dickinson", "Iron", "Menominee"], + counties: ["Dickinson County", "Iron County", "Menominee County"], }, { circuit: "42nd", - counties: ["Midland"], + counties: ["Midland County"], }, { circuit: "43rd", - counties: ["Cass"], + counties: ["Cass County"], }, { circuit: "44th", - counties: ["Livingston"], + counties: ["Livingston County"], }, { circuit: "45th", - counties: ["St. Joseph"], + counties: ["St. Joseph County"], }, { circuit: "45th", - counties: ["St. Joseph"], + counties: ["St. Joseph County"], }, { circuit: "46th", - counties: ["Crawford", "Kalkaska", "Otsego"], + counties: ["Crawford County", "Kalkaska County", "Otsego County"], }, { circuit: "47th", - counties: ["Delta"], + counties: ["Delta County"], }, { circuit: "49th", - counties: ["Mecosta", "Osceoloa"], + counties: ["Mecosta County", "Osceoloa County"], }, { circuit: "51st", - counties: ["Mason", "Oceana"], + counties: ["Mason County", "Oceana County"], }, { circuit: "52nd", - counties: ["Huron"], + counties: ["Huron County"], }, { circuit: "53rd", - counties: ["Cheboygan", "Presque Isle"], + counties: ["Cheboygan County", "Presque Isle County"], }, { circuit: "55th", - counties: ["Tuscola"], + counties: ["Tuscola County"], }, { circuit: "55th", - counties: ["Clare", "Gladwin"], + counties: ["Clare County", "Gladwin County"], }, { circuit: "56th", - counties: ["Eaton"], + counties: ["Eaton County"], }, { circuit: "57th", - counties: ["Emmet"], + counties: ["Emmet County"], }, { circuit: "50th", - counties: ["Chippewa"], - }, - - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], - }, - { - circuit: "", - counties: [""], + counties: ["Chippewa County"], }, ]; diff --git a/src/pageElements/TextInput.js b/src/pageElements/TextInput.js index e165339..e70501e 100644 --- a/src/pageElements/TextInput.js +++ b/src/pageElements/TextInput.js @@ -16,7 +16,7 @@ const TextInput = (props) => { type, disabled, } = props; - const isFlorida = state === "fl"; + const isObject = state === "fl" || state === "mi"; return (

{ onChange={onChange} > @@ -54,7 +54,7 @@ const TextInput = (props) => { className={`select-option`} key={`item${i}`} > - {isFlorida ? `${item.circuit} Judicial Circuit` : item} + {isObject ? `${item.circuit} Judicial Circuit` : item} )) ) : ( From 208596afdf1bd6dc8b92a01babdd6c21f4847c84 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Sun, 26 May 2024 22:24:56 -0500 Subject: [PATCH 9/9] More --- src/Components/Document/DocEditPage.js | 13 +++++++++- .../captionHeaders/michiganCaption.js | 19 +++++--------- src/Constants/Copy/docEditCopy.js | 25 +++++++++++++++++++ src/styles/docedit-page.scss | 9 +++++++ 4 files changed, 52 insertions(+), 14 deletions(-) diff --git a/src/Components/Document/DocEditPage.js b/src/Components/Document/DocEditPage.js index 9a818ce..a6e692e 100644 --- a/src/Components/Document/DocEditPage.js +++ b/src/Components/Document/DocEditPage.js @@ -2,6 +2,7 @@ import { useState, useContext, useEffect } from "react"; import NewYorkCaption from "./captionHeaders/newYorkCaption.js"; import NewJerseyCaption from "./captionHeaders/newJerseyCaption.js"; import FloridaCaption from "./captionHeaders/floridaCaption.js"; +import MichiganCaption from "./captionHeaders/michiganCaption.js"; import { useParams } from "react-router-dom"; import { Link, useNavigate } from "react-router-dom"; import EditElement from "../../pageElements/EditElement"; @@ -58,9 +59,11 @@ const DocEditPage = (props) => { const displayCopy = state === "ny" ? docEditCopy.NewYork + : state === "mi" + ? docEditCopy.Michigan : state === "nj" ? docEditCopy.NewJersey - : docEditCopy.NewYork; + : docEditCopy.NewJersey; const headerPicker = () => { switch (state) { @@ -88,6 +91,14 @@ const DocEditPage = (props) => { onScrollClick={onScrollClick} /> ); + case "mi": + return ( + + ); default: return ( { <>
-
+
STATE OF MICHIGAN IN THE CIRCUIT COURT FOR THE COUNTY OF{" "} - {fetchedCase?.venu.split(" ")[0]} + {fetchedCase?.venue.split(" ")[0].toUpperCase()} -
-
- -----------------------------------------------------------------------X -
-
@@ -26,7 +21,7 @@ const MichiganCaption = (props) => {
Edit Document
-
+
{fetchedCase?.caption ? fetchedCase?.caption : <>},
@@ -35,13 +30,13 @@ const MichiganCaption = (props) => {
Plaintiff(s),
- Index no. {fetchedCase?.caseNumber} + Case No. {fetchedCase?.caseNumber}
{displayCopy.versusText}
-
Judge: {fetchedCase?.judge}
+
Hon. {fetchedCase?.judge}
{fetchedCase?.captionTwo ? fetchedCase?.captionTwo : <>}, @@ -51,9 +46,7 @@ const MichiganCaption = (props) => {
Defendant(s)
-
- ----------------------------------------------------------------------------X -
+
__________________________________________________/
diff --git a/src/Constants/Copy/docEditCopy.js b/src/Constants/Copy/docEditCopy.js index 8861ccf..28d7d31 100644 --- a/src/Constants/Copy/docEditCopy.js +++ b/src/Constants/Copy/docEditCopy.js @@ -55,6 +55,31 @@ export const docEditCopy = { caseNumber: "Docket No.", versusText: "vs.", }, + Michigan: { + prelimaryStatement: function (documentType, respondent, servingParty) { + const docCopy = + documentType && documentType === "interrogatories" + ? "Interrogatories" + : documentType && documentType === "admissions" + ? "Request for Admissions" + : documentType && documentType === "production" + ? "Request for Production" + : documentType && documentType.includes("combined") + ? "Interrogatories and Request for Production" + : null; + + const copyString = `COMES NOW, Respondent(s), ${respondent}, through counsel, in response to the ${docCopy} + served by ${servingParty}, and states as follows:`; + + return ( +
+

{copyString}

+
+ ); + }, + caseNumber: "Case No.", + versusText: "v.", + }, }; export const outgoingComesNow = (state, fetchedCase) => { diff --git a/src/styles/docedit-page.scss b/src/styles/docedit-page.scss index cd3b4fb..2265071 100644 --- a/src/styles/docedit-page.scss +++ b/src/styles/docedit-page.scss @@ -248,6 +248,15 @@ color: #373737; } +.centered-text { + text-align: center; + margin-bottom: 30px; +} + +.plain-text { + font-weight: 400 !important; +} + .docedit-uppercol2 { display: flex; flex-direction: column;