Merge pull request #143 from kjannette/refac5

Refac5

src/Components/Case/CaseDetailsPage.js

@@ -43,7 +43,6 @@ const CaseDetailsPage = () => {
     //documentId, responseGenerations, caseId, documentType
     console.log("handle navigate fired docId", docId);
     let docType = "interrogatories";
-
     navigate(`/documents/${docId}/${docType}/${caseId}`);
   };
 
@@ -51,7 +50,9 @@ const CaseDetailsPage = () => {
     if (!documentId || !caseId) {
       return;
     }
-
+    console.log(
+      "hit handleNavEdit----------------------------------------------------------"
+    );
     navigate(`/reqedit/${documentId}/interrogatories-out/${caseId}`);
   };
 
@@ -144,11 +145,7 @@ const CaseDetailsPage = () => {
     );
     if (docType === "complaint") {
       const clientPosition = subCase.clientPosition;
-      const res = await generateOutgoingDiscoveryRequests(
+      generateOutgoingDiscoveryRequests(docId, radioValue, clientPosition);
-        docId,
-        radioValue,
-        clientPosition
-      );
       setTimeout(handleNavEdit, 20000, docId, caseId);
     } else {
       // try to kick off parsing here

src/Components/Document/ReqEditPage.js

@@ -9,7 +9,6 @@ import {
   docEditCopy,
   outgoingComesNow,
 } from "../../Constants/Copy/docEditCopy.js";
-import ConfirmModal from "../Modals/ConfirmModal";
 import Button from "../../pageElements/Button";
 import {
   rogInstructions,
@@ -18,15 +17,7 @@ import {
   standardProd,
 } from "../../Constants/Copy/reqEditCopy.js";
 import { db } from "../../firebase";
-import {
+import { doc, getDoc } from "firebase/firestore";
-  collection,
-  updateDoc,
-  onSnapshot,
-  doc,
-  getDoc,
-  setDoc,
-  increment,
-} from "firebase/firestore";
 import "../../styles/doclist-page.scss";
 
 const RequestEditPage = () => {
@@ -83,12 +74,14 @@ const RequestEditPage = () => {
     }
     getOutgoingRequests(documentId)
       .then((data) => {
-        const merged = [...foundationRogs, ...data[0].requests];
+        const resp = [...foundationRogs, ...data[0].requests].map(
-        const resp = merged.map((item, index) => {
+          (item, index) => {
             // NEVER CHANGE THIS:
             return { showInputEle: false, text: item.text, index: index };
-        });
+          }
-        setRequests(resp);
+        );
+        const calld = [...resp];
+        setRequests(calld);
         setProdReq(standardProd);
       })
       .catch((err) => console.log(err));
@@ -111,6 +104,9 @@ const RequestEditPage = () => {
   }
 
   async function getOutgoingRequests(documentId) {
+    if (!documentId) {
+      return;
+    }
     const docType = String(documentType);
     const docId = String(documentId);
     const response = await fetch(
@@ -178,8 +174,10 @@ const RequestEditPage = () => {
   };
 
   async function postEditedResponses() {
+    if (!requests && requests.length > 1) {
+      return;
+    }
     const mergedRequests = [...requests, ...prodReq];
-
     const docId = documentId;
     const leadAttorneys = fetchedCase?.leadAttorneys
       ? fetchedCase?.leadAttorneys
@@ -385,7 +383,7 @@ const RequestEditPage = () => {
     fetchedCase?.clientPosition === "Defendant"
       ? fetchedCase?.plaintiffParties
       : fetchedCase?.defendantParties;
-  console.log("state", state);
+  console.log("final requests", requests);
   const editingContent = () => {
     return (
       <>
@@ -418,7 +416,8 @@ const RequestEditPage = () => {
           </div>
           <div className="req-editing-sub-wrapper">
             <div className="pleading-header">INTERROGATORIES</div>
-            {requests?.map((req, i) => (
+            {requests &&
+              requests?.map((req, i) => (
                 <div className="request-item-outer-div">
                   <div className="request-text-up">{`${i + 1}.`}</div>
                   <div className="req-item-inner-div">
@@ -431,7 +430,9 @@ const RequestEditPage = () => {
                       }
                       setShowInputEle={setShowInputEle}
                       showInputEle={
-                      requests && requests.length > 1 ? req.showInputEle : null
+                        requests && requests.length > 1
+                          ? req.showInputEle
+                          : null
                       }
                       handleFocus={handleFocus}
                       handleEditValue={handleEditValue}

src/Components/Home/HomePage.js

@@ -33,9 +33,9 @@ const HomePage = () => {
             <div className="row upper-row-one">
               <div className="col-md-12">
                 <div className="heading-one-container">
-                  <h1 className="heading-1">
+                  <h1 className="heading-1">Novodraft: Legal AI.</h1>
-                    Novodraft: Legal AI. Draft documents faster <i>and </i>{" "}
+                  <h1 className="heading-2">
-                    smarter.
+                    Draft documents faster <i>and </i> smarter.
                   </h1>
                 </div>
                 <p className="text-block-1">

src/Constants/Copy/docEditCopy.js

@@ -59,33 +59,23 @@ export const docEditCopy = {
 
 export const outgoingComesNow = (state, fetchedCase) => {
   let copyString;
-  const position = fetchedCase ? fetchedCase?.clientPosition : <></>;
+
-  const parties = fetchedCase ? (
+  const servingParty =
-    fetchedCase?.clientPosition === "Plaintiff" ? (
+    fetchedCase?.clientPosition === "Plaintiff"
-      fetchedCase?.plaintiffParties
+      ? fetchedCase?.plaintiffParties
-    ) : (
+      : fetchedCase?.defendantParties;
-      fetchedCase?.defendantParties
+  const respondingParty =
-    )
+    servingParty === fetchedCase?.plaintiffParties
-  ) : (
+      ? fetchedCase?.defendantParties
-    <></>
+      : fetchedCase?.plaintiffParties;
-  );
-  const adversary = fetchedCase ? (
-    fetchedCase?.clientPosition === "Plaintiff" ? (
-      fetchedCase?.defendantParties
-    ) : (
-      fetchedCase?.plaintiffParties
-    )
-  ) : (
-    <></>
-  );
 
   if (state === "ny") {
-    copyString = `COMES NOW, ${position}, ${parties}, through counsel, and hereby propounds these Interrogatories and Requests for Production on ${adversary}, to be answered under oath, in writing, in accordance with NY CPLR 3120 - 3130.`;
+    copyString = `COMES NOW, ${fetchedCase?.clientPosition}, ${servingParty}, through counsel, and hereby propounds these Interrogatories and Requests for Production on ${respondingParty}, to be answered under oath, in writing, in accordance with NY CPLR 3120 - 3130.`;
   } else if (state === "fl") {
-    copyString = `COMES NOW,  ${position}, ${parties}, through counsel, and hereby propounds these Interrogatories and Requests for Production on ${adversary}, to be answered to be answered under oath, in writing, in accordance with Rule 1.340, Florida Rules of Civil Procedure.`;
+    copyString = `COMES NOW,  ${fetchedCase?.clientPosition}, ${servingParty}, through counsel, and hereby propounds these Interrogatories and Requests for Production on ${respondingParty}, to be answered to be answered under oath, in writing, in accordance with Rule 1.340, Florida Rules of Civil Procedure.`;
   } else if (state === "nj") {
     copyString =
-      `Comes now ${position}, ${parties}, through counsel, and hereby propounds these Interrogatories and Requests for Production on ${adversary}, to be answered to be answered under oath, in writing, in accordance with NJ R. 4:17-1 - 4:18-1,` +
+      `Comes now ${fetchedCase?.clientPosition}, ${servingParty}, through counsel, and hereby propounds these Interrogatories and Requests for Production on ${respondingParty}, to be answered to be answered under oath, in writing, in accordance with NJ R. 4:17-1 - 4:18-1,` +
       <div className="jersey-itals">et. seq.</div> +
       `All questions must be answered unless the court otherwise orders or unless a claim of privilege or protective order is made in accordance with R. 4:17-1(b)(3).`;
   }

src/Constants/Copy/reqEditCopy.js

@@ -68,7 +68,7 @@ export const foundationRogs = [
   },
   {
     id: "fb50e08b-2009-4588-89b8-4842481f434a",
-    text: " Identify all insurance carriers or self-insured funds, by name, address, policy numbers and policy limits, for any insurance policy or fund which may provide coverage for any judgment entered against you in this action.",
+    text: "Identify all insurance carriers or self-insured funds, by name, address, policy numbers and policy limits for any insurance policy or fund which may provide coverage for any judgment entered against you in this action.",
   },
   {
     id: "72680c6f-4d7e-4e6b-a932-477e0392db98",

src/styles/docedit-page.scss

@@ -426,6 +426,7 @@
 .reqedit-report-container {
   width: 90%;
   margin-top: -20px;
+  margin-left: 16px;
 }
 .docedit-report-link {
   font-size: 0.95rem;
@@ -441,7 +442,7 @@
   min-width: 700px;
   display: flex;
   flex-direction: row;
-  margin: 16px 0px;
+  margin: 16px 0px 8px 0px;
 }
 
 @media only screen and (max-width: 1140px) {

src/styles/homepage.scss

@@ -41,8 +41,7 @@ ul.navbar-nav {
 
 section.section-1:before {
   content: "";
-  background: url("../Assets/Images/overlayFlipSmall.png") no-repeat fixed 0%
+  background: url("../Assets/Images/overlayFlip.png") no-repeat fixed 10% 115px;
-    290px;
   background-attachment: local;
   position: absolute;
   top: 0;
@@ -132,26 +131,38 @@ section.section-1 {
   max-width: 370px;
   line-height: 29px;
   text-align: justify;
+  margin-top: -8px;
 }
 
 h1.heading-1 {
   color: #fff;
   font-family: Roboto;
-  font-size: 40px;
+  font-size: 54px;
   font-style: normal;
   font-weight: 500;
   line-height: 52px; /* 140.625% */
-  margin-bottom: 1rem !important;
+  margin-bottom: 0px !important;
+}
+
+h1.heading-2 {
+  color: #fff;
+  font-family: Roboto;
+  font-size: 32px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: 52px; /* 140.625% */
+  margin-bottom: 0px !important;
 }
 
 p.text-block-1 {
   color: #fff;
   font-family: Roboto;
-  font-size: 28px;
+  font-size: 26px;
   font-style: normal;
   font-weight: 400;
   line-height: 29.756px; /* 123.983% */
-  width: 525.308px;
+  width: 525px;
+  margin-top: 28px;
 }
 
 .try-it-button-box {