Merge pull request #2 from ohcnetwork/develop

merge
i0am0arunava · Nov 6, 2024 · 80e48d6 · 80e48d6
2 parents ce241c3 + bbcfef0
commit 80e48d6
Show file tree

Hide file tree

Showing 476 changed files with 5,230 additions and 5,222 deletions.
diff --git a/.env b/.env
@@ -14,4 +14,4 @@ ESLINT_NO_DEV_ERRORS=true
 CARE_CDN_URL="https://egov-s3-facility-10bedicu.s3.amazonaws.com https://egov-s3-patient-data-10bedicu.s3.amazonaws.com http://localhost:4566"
 REACT_ALLOWED_LOCALES="en,hi,ta,ml,mr,kn"
 
-REACT_ENABLED_APPS="ohcnetwork/care_livekit_fe@main"
+REACT_ENABLED_APPS=""
diff --git a/.prettierrc.json b/.prettierrc.json
@@ -6,5 +6,8 @@
   "jsxSingleQuote": false,
   "arrowParens": "always",
   "tailwindFunctions": ["classNames"],
-  "plugins": ["prettier-plugin-tailwindcss"]
-}
+  "importOrder": ["<THIRD_PARTY_MODULES>", "^@/lib/(.*)$", "^@/CAREUI/(.*)$", "^@/components/ui/(.*)$", "^@/components/(.*)$", "^@/hooks/(.*)$", "^@/common/(.*)$", "^@/(.*)$", "^[./]"],
+  "importOrderSeparation": true,
+  "importOrderSortSpecifiers": true,
+  "plugins": ["prettier-plugin-tailwindcss", "@trivago/prettier-plugin-sort-imports"]
+}
diff --git a/cypress.config.ts b/cypress.config.ts
@@ -30,7 +30,6 @@ export default defineConfig({
     baseUrl: "http://localhost:4000",
     retries: 2,
     requestTimeout: 15000,
-    excludeSpecPattern: "**/*roles.cy.ts",
   },
   env: {
     API_URL: process.env.REACT_CARE_API_URL ?? "http://localhost:9000",

diff --git a/cypress/e2e/auth_spec/roles.cy.ts b/cypress/e2e/auth_spec/roles.cy.ts
diff --git a/cypress/fixtures/users.json b/cypress/fixtures/users.json