merge conflicts fixed

.cursorrules

@@ -0,0 +1,23 @@
+Care is a React Typescript Project, built with Vite and styled with TailwindCSS.
+
+Care uses a Plugin Architecture. Apps are installed in /apps. 
+
+Care uses a custom useQuery hook to fetch data from the API. APIs are defined in the api.tsx file
+
+Here's an example of how to use the useQuery hook to fetch data from the API:
+
+```
+useQuery from "@/Common/hooks/useQuery";
+const { data, loading, error } = useQuery(routes.getFacilityUsers, {
+  facility_id: "1",
+});
+
+request from "@/Common/utils/request";
+const { res } = await request(routes.partialUpdateAsset, {
+  pathParams: { external_id: assetId },
+  body: data,
+});
+```
+
+
+

.devcontainer/devcontainer.json

@@ -26,7 +26,7 @@
     "cpus": 4
   },
   "waitFor": "onCreateCommand",
-  "postCreateCommand": "npm install",
+  "postCreateCommand": "npm run install-all",
   "postAttachCommand": {
     "server": "npm run dev"
   },

.env

@@ -12,3 +12,4 @@ REACT_CARE_API_URL=https://careapi.ohc.network
 # Dev envs
 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"

.env.docker

@@ -0,0 +1,2 @@
+# Care API URL without the /api prefix
+REACT_CARE_API_URL=http://localhost:9000

.example.env

@@ -16,6 +16,8 @@ REACT_PLAUSIBLE_SITE_DOMAIN=
 # Plausible server URL (default: https://plausible.10bedicu.in)
 REACT_PLAUSIBLE_SERVER_URL=
 
+# Care Apps. repo@branch seperated by commas
+REACT_ENABLED_APPS="ohcnetwork/care_livekit_fe@main,ohcnetwork/care_scribe"
 
 # Main logo (JSON string with light and dark properties)
 REACT_HEADER_LOGO=
@@ -58,7 +60,6 @@ REACT_KASP_FULL_STRING=Karunya Arogya Suraksha Padhathi
 
 # Sample format file paths
 REACT_SAMPLE_FORMAT_ASSET_IMPORT=/asset-import-template.xlsx
-REACT_SAMPLE_FORMAT_EXTERNAL_RESULT_IMPORT=/External-Results-Template.csv
 
 # Camera feed, still watching idle timeout (in seconds; default: 180)
 REACT_STILL_WATCHING_IDLE_TIMEOUT=
@@ -69,11 +70,13 @@ REACT_STILL_WATCHING_PROMPT_DURATION=
 # Feature flags
 REACT_ENABLE_HCX=true
 REACT_ENABLE_ABDM=true
-REACT_ENABLE_SCRIBE=true
 REACT_WARTIME_SHIFTING=true
 
 # JWT token refresh interval (in milliseconds) (default: 5 minutes)
 REACT_JWT_TOKEN_REFRESH_INTERVAL=
 
 # Minimum encounter date (default: 2020-01-01)
 REACT_MIN_ENCOUNTER_DATE=
+
+# Available languages to switch between (2 Digit language code seperated by comas. See src->Locale->config.ts for available codes)
+REACT_ALLOWED_LOCALES="en,hi,ta,ml,mr,kn"

.github/workflows/cypress.yaml

@@ -70,7 +70,7 @@ jobs:
           node-version: "20"
 
       - name: Install dependencies 📦
-        run: npm install
+        run: npm run install-all
 
       - name: Build ⚙️
         run: npm run build

.gitignore

@@ -58,3 +58,7 @@ bun.lockb
 # Cypress
 cypress/downloads
 cypress/fixtures/token.json
+
+# Care Apps
+/apps/*
+src/pluginMap.ts

.nvmrc

@@ -0,0 +1 @@
+20

.prettierrc.json

@@ -5,7 +5,6 @@
   "semi": true,
   "jsxSingleQuote": false,
   "arrowParens": "always",
-  "tailwindFunctions": [
-    "classNames"
-  ]
-}
+  "tailwindFunctions": ["classNames"],
+  "plugins": ["prettier-plugin-tailwindcss"]
+}

Dockerfile

@@ -13,6 +13,8 @@ RUN npm install
 
 COPY . .
 
+RUN npm run setup
+
 RUN npm run build
 
 

README.md

@@ -1,27 +1,29 @@
 <a href="https://ohc.network/">
   <p align="center">
     <picture>
-      <source media="(prefers-color-scheme: dark)" srcset="https://cdn.ohc.network/light-logo.svg">
-      <img alt="CARE Logo" src="https://user-images.githubusercontent.com/25143503/193396107-27e0d587-b195-4e95-a795-5d0663d5cd81.svg">
+      <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/ohcnetwork/branding/refs/heads/main/Care/SVG/Logo/Care-Logo_gradient_mark_with_white_wordmark.svg">
+      <img alt="CARE Logo" src="https://raw.githubusercontent.com/ohcnetwork/branding/refs/heads/main/Care/SVG/Logo/Care-Logo_gradient_mark_with_dark_wordmark.svg" width="400">
     </picture>
   </p>
 </a>
 <p align="center"><b>Our goal is to continuously improve the quality and accessibility of public healthcare services using digital tools.</b></p>
 <h2></h2>
-<h3 align="center"><a href="https://care.ohc.network" target="_blank">🚀 Staging Deploy</a></h3>
-<p align="center"><img src="https://api.netlify.com/api/v1/badges/fd123f42-ef65-448c-9b03-39959d60e60b/deploy-status"></p>
+<h3 align="center"><a href="https://care.ohc.network" target="_blank">🚀 Staging Deployment</a></h3>
+<center>
+
+[![Netlify Status](https://api.netlify.com/api/v1/badges/de76351f-b1f0-4bf8-8445-d9faf6391b13/deploy-status)](https://app.netlify.com/sites/care-ohc/deploys)
+
+</center>
 <p align="center">Auto deployed to <a href="https://care.ohc.network/">care.ohc.network</a> for <code>develop</code> branch. All pull requests have preview builds powered by <a href="https://netlify.com">Netlify</a>.</p>
 
 [![](https://sourcerer.io/fame/tomahawk-pilot/ohcnetwork/care_fe/images/0)](https://sourcerer.io/fame/tomahawk-pilot/ohcnetwork/care_fe/links/0)[![](https://sourcerer.io/fame/tomahawk-pilot/ohcnetwork/care_fe/images/1)](https://sourcerer.io/fame/tomahawk-pilot/ohcnetwork/care_fe/links/1)[![](https://sourcerer.io/fame/tomahawk-pilot/ohcnetwork/care_fe/images/2)](https://sourcerer.io/fame/tomahawk-pilot/ohcnetwork/care_fe/links/2)[![](https://sourcerer.io/fame/tomahawk-pilot/ohcnetwork/care_fe/images/3)](https://sourcerer.io/fame/tomahawk-pilot/ohcnetwork/care_fe/links/3)[![](https://sourcerer.io/fame/tomahawk-pilot/ohcnetwork/care_fe/images/4)](https://sourcerer.io/fame/tomahawk-pilot/ohcnetwork/care_fe/links/4)[![](https://sourcerer.io/fame/tomahawk-pilot/ohcnetwork/care_fe/images/5)](https://sourcerer.io/fame/tomahawk-pilot/ohcnetwork/care_fe/links/5)[![](https://sourcerer.io/fame/tomahawk-pilot/ohcnetwork/care_fe/images/6)](https://sourcerer.io/fame/tomahawk-pilot/ohcnetwork/care_fe/links/6)[![](https://sourcerer.io/fame/tomahawk-pilot/ohcnetwork/care_fe/images/7)](https://sourcerer.io/fame/tomahawk-pilot/ohcnetwork/care_fe/links/7)
 
-[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=coronasafe_care_fe&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=coronasafe_care_fe)
 ![Code scanning - action](https://github.com/ohcnetwork/care_fe/workflows/Code%20scanning%20-%20action/badge.svg)
 ![OSSAR](https://github.com/ohcnetwork/care_fe/workflows/OSSAR/badge.svg)
 [![Cypress Tests](https://img.shields.io/endpoint?url=https://cloud.cypress.io/badge/simple/wf7d2m/develop&style=flat&logo=cypress)](https://cloud.cypress.io/projects/wf7d2m/runs)
 ![Staging Release](https://github.com/ohcnetwork/care_fe/workflows/CARE%20Develop%20Registry/badge.svg)
 ![Production Release](https://github.com/ohcnetwork/care_fe/workflows/Production%20Release/badge.svg)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/200482ab117e4b5397ff3f5ae5719aa2)](https://www.codacy.com/gh/ohcnetwork/care_fe?utm_source=github.com&utm_medium=referral&utm_content=ohcnetwork/care_fe&utm_campaign=Badge_Grade)
-[![CircleCI](https://circleci.com/gh/ohcnetwork/care_fe.svg?style=svg)](https://circleci.com/gh/ohcnetwork/care_fe)
 [![Maintainability](https://api.codeclimate.com/v1/badges/f1438f693aa459805301/maintainability)](https://codeclimate.com/github/ohcnetwork/care_fe/maintainability)
 
 ## Getting started
@@ -33,7 +35,14 @@
 #### Install the required dependencies
 
 ```sh
-npm install
+npm run install-all
+```
+#### First-time setup
+
+For first-time setup, run the following command to generate the pluginMap and install plugin configurations:
+
+```sh
+npm run setup
 ```
 
 #### 🏃 Run the app in development mode
@@ -70,6 +79,10 @@ Authenticate to staging API with any of the following credentials
 - Once the code review is done, the PR will be marked with a "Needs Testing" label where it'll be queued for QA testing.
 - Once tested, the PR would be marked with a "Tested" label and would be queued for merge.
 
+### Translations
+
+All strings must be encased in i18n translations. New translation strings must be specified in `src`->`Locale`->`en`. Do not add translations for languages other than english through pull requests. Other language translations can be contributed through [Crowdin](https://crowdin.com/project/ohccarefe)
+
 ### Testing
 
 To ensure the quality of our pull requests, we use a variety of tools:

care.config.ts

@@ -31,13 +31,16 @@ const careConfig = {
     dark: "https://cdn.ohc.network/header_logo.png",
   }),
   mainLogo: logo(env.REACT_MAIN_LOGO, {
-    light: "https://cdn.ohc.network/light-logo.svg",
-    dark: "https://cdn.ohc.network/black-logo.svg",
+    light: "/images/care_logo.svg",
+    dark: "/images/care_logo.svg",
   }),
   stateLogo: logo(env.REACT_STATE_LOGO),
   customLogo: logo(env.REACT_CUSTOM_LOGO),
   customLogoAlt: logo(env.REACT_CUSTOM_LOGO_ALT),
   customDescription: env.REACT_CUSTOM_DESCRIPTION,
+  availableLocales: (env.REACT_ALLOWED_LOCALES || "")
+    .split(",")
+    .map((l) => l.trim()),
 
   gmapsApiKey:
     env.REACT_GMAPS_API_KEY || "AIzaSyDsBAc3y7deI5ZO3NtK5GuzKwtUzQNJNUk",
@@ -58,9 +61,6 @@ const careConfig = {
   sampleFormats: {
     assetImport:
       env.REACT_SAMPLE_FORMAT_ASSET_IMPORT || "/asset-import-template.xlsx",
-    externalResultImport:
-      env.REACT_SAMPLE_FORMAT_EXTERNAL_RESULT_IMPORT ||
-      "/External-Results-Template.csv",
   },
 
   wartimeShifting: env.REACT_WARTIME_SHIFTING === "true",
@@ -104,9 +104,12 @@ const careConfig = {
     enabled: (env.REACT_ENABLE_ABDM ?? "true") === "true",
   },
 
-  scribe: {
-    enabled: env.REACT_ENABLE_SCRIBE === "true",
-  },
+  careApps: env.REACT_ENABLED_APPS
+    ? env.REACT_ENABLED_APPS.split(",").map((app) => ({
+        branch: app.split("@")[1],
+        package: app.split("@")[0],
+      }))
+    : [],
 } as const;
 
 export default careConfig;

components.json

@@ -0,0 +1,20 @@
+{
+  "$schema": "https://ui.shadcn.com/schema.json",
+  "style": "new-york",
+  "rsc": false,
+  "tsx": true,
+  "tailwind": {
+    "config": "tailwind.config.js",
+    "css": "src/style/index.css",
+    "baseColor": "gray",
+    "cssVariables": false,
+    "prefix": ""
+  },
+  "aliases": {
+    "components": "@/components",
+    "utils": "@/lib/utils",
+    "ui": "@/components/ui",
+    "lib": "@/lib",
+    "hooks": "@/hooks"
+  }
+}

cypress/e2e/assets_spec/AssetHomepage.cy.ts

@@ -99,9 +99,9 @@ describe("Asset Tab", () => {
   it("Export asset", () => {
     assetPage.selectassetimportbutton();
     cy.wait(2000);
-    assetPage.selectjsonexportbutton();
+    assetPage.selectJsonExportButton();
     assetPage.selectassetimportbutton();
-    assetPage.selectcsvexportbutton();
+    assetPage.selectCsvExportButton();
   });
 
   afterEach(() => {

cypress/e2e/assets_spec/AssetsCreation.cy.ts

@@ -129,7 +129,7 @@ describe("Asset", () => {
       "d5694af2-21e2-4a39-9bad-2fb98d9818bd",
     );
     assetPage.clickConfigureAsset();
-    assetPage.verifyAssetConfiguration(200);
+    assetPage.verifyAssetConfiguration();
   });
 
   it("Add an vital monitor asset and configure it", () => {

cypress/e2e/auth_spec/auth.cy.ts

@@ -6,7 +6,8 @@ describe("Authorisation/Authentication", () => {
   it("Try login as admin with correct password", () => {
     cy.loginByApi("devdistrictadmin", "Coronasafe@123");
     cy.awaitUrl("/facility");
-    cy.get("p").contains("Sign Out").click();
+    cy.get("#user-profile-name").click();
+    cy.get("#sign-out-button").contains("Sign Out").click();
     cy.url().should("include", "/");
   });
 

cypress/e2e/auth_spec/roles.cy.ts

@@ -11,7 +11,7 @@ describe("authentication", () => {
   });
   afterEach(() => {
     cy.log("Logging out");
-    cy.get("p").contains("Sign Out").click();
+    cy.get("#sign-out-button").contains("Sign Out").click();
     cy.getLocalStorage("care_access_token").should("be.null");
     cy.getLocalStorage("care_refresh_token").should("be.null");
     cy.url().should("include", "/");