Add support for shadcn and clean up components (#8706)

... also added figtree as default font Co-authored-by: Gigin George <[email protected]> Co-authored-by: rithviknishad <[email protected]>
ohcnetwork · Oct 8, 2024 · 13a4814 · 13a4814
1 parent 6e4d06b
commit 13a4814
Show file tree

Hide file tree

Showing 154 changed files with 11,505 additions and 9,734 deletions.
diff --git a/components.json b/components.json
@@ -6,7 +6,7 @@
   "tailwind": {
     "config": "tailwind.config.js",
     "css": "src/style/index.css",
-    "baseColor": "zinc",
+    "baseColor": "gray",
     "cssVariables": false,
     "prefix": ""
   },
@@ -17,4 +17,4 @@
     "lib": "@/lib",
     "hooks": "@/hooks"
   }
-}
+}
diff --git a/cypress/e2e/patient_spec/PatientRegistration.cy.ts b/cypress/e2e/patient_spec/PatientRegistration.cy.ts
@@ -304,31 +304,6 @@ describe("Patient Creation with consultation", () => {
     );
   });
 
-  it("Patient Registration using External Result Import", () => {
-    // copy the patient external ID from external results
-    cy.awaitUrl("/external_results");
-    patientExternal.verifyExternalListPatientName(patientExternalName);
-    patientExternal.verifyExternalIdVisible();
-    // cypress have a limitation to work only asynchronously
-    // import the result and create a new patient
-    let extractedId = "";
-    cy.get("#patient-external-id")
-      .invoke("text")
-      .then((text) => {
-        extractedId = text.split("Care external results ID: ")[1];
-        cy.log(`Extracted Care external results ID: ${extractedId}`);
-        cy.awaitUrl("/patients");
-        patientPage.createPatient();
-        patientPage.selectFacility(patientFacility);
-        patientPage.patientformvisibility();
-        patientExternal.clickImportFromExternalResultsButton();
-        patientExternal.typeCareExternalResultId(extractedId);
-        patientExternal.clickImportPatientData();
-      });
-    // verify the patient is successfully created
-    patientExternal.verifyExternalPatientName(patientExternalName);
-  });
-
   afterEach(() => {
     cy.saveLocalStorage();
   });

diff --git a/cypress/pageobject/Patient/PatientExternal.ts b/cypress/pageobject/Patient/PatientExternal.ts