Merge pull request #200 from ohcnetwork/master

Production merge

.env

@@ -2,4 +2,4 @@ NEXT_PUBLIC_API_URL="https://ayushma-api.ohc.network/api/"
 NEXT_PUBLIC_AI_NAME="Ayushma"
 NEXT_PUBLIC_AI_DESCRIPTION="Ayushma - Revolutionizing Healthcare Delivery Through AI and Open Source"
 NEXT_PUBLIC_AI_WARNING="Please be aware that Ayushma AI may generate inaccurate information; kindly report any concerns to [email protected]"
-NEXT_PUBLIC_GOOGLE_RECAPTCHA_SITE_KEY="6Lerts4nAAAAAKyXaNZkYj4XfRO0M2R-XYIA3qv8"
+NEXT_PUBLIC_GOOGLE_RECAPTCHA_SITE_KEY="6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI"

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @ohcnetwork/code-reviewers @ohcnetwork/care-fe-code-reviewers

.github/workflows/deploy.yml

@@ -6,7 +6,6 @@ on:
     branches:
       - production
 
-
 jobs:
   build:
     name: Build & Push Staging to container registries
@@ -44,18 +43,18 @@ jobs:
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
-          
+
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Run yarn i-all
+      - name: Run pnpm i
         run: |
-          yarn i-all
-      
+          pnpm i
+
       - name: Build image
         uses: docker/build-push-action@v4
         with:

.gitignore

@@ -38,11 +38,8 @@ next-env.d.ts
 
 # lock files
 package-lock.json
-pnpm-lock.yaml
+yarn.lock
 bun.lockb
 
-#chatbot
-public/chatbot.js
-
 # Sentry Config File
 .sentryclirc

.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-yarn lint
+pnpm lint

Dockerfile

@@ -6,12 +6,9 @@ RUN apk add --no-cache libc6-compat python3 build-base
 
 WORKDIR /app
 
-RUN mkdir chatbot
+COPY package.json pnpm-lock.yaml ./
 
-COPY package.json yarn.lock ./
-COPY ./chatbot/package.json ./chatbot/yarn.lock ./chatbot/
-
-RUN yarn i-all
+RUN pnpm i
 
 FROM base AS builder
 
@@ -21,7 +18,7 @@ COPY --from=deps /app/node_modules ./node_modules
 
 COPY . .
 
-RUN yarn build
+RUN pnpm build
 
 FROM base AS runner
 

README.md

@@ -12,7 +12,7 @@
 <hr>
 <h3 align="center"><a href="https://ayushma-staging.ohc.network" target="_blank">🚀 Staging Deployment</a></h3>
 <p align="center"><img src="https://vercelbadge.vercel.app/api/coronasafe/ayushma_fe"></p>
-<p align="center">Auto deployed to <a href="https://ayushma.ohc.network">ayushma.ohc.in</a> for <code>production</code> branch. All pull requests have preview builds powered by <a href="https://vercel.com">Vercel</a>.</p>
+<p align="center">Auto deployed to <a href="https://ayushma.ohc.network">ayushma.ohc.network</a> for <code>production</code> branch. All pull requests have preview builds powered by <a href="https://vercel.com">Vercel</a>.</p>
 
 ## Getting started
 
@@ -22,13 +22,13 @@
 #### Install the required dependencies
 
 ```sh
-yarn i-all
+pnpm i
 ```
 
 #### 🏃 Run the app in development mode
 
 ```sh
-yarn dev
+pnpm dev
 ```
 
 Once the development server has started, open [localhost:3000](http://localhost:3000) in your browser. The page will be automatically reloaded when you make edits and save. You will also see any lint errors in the console.
@@ -56,22 +56,22 @@ You can also register as a new user.
 
 ## 💎 Backend
 
-Ayushma's backend is built on Django. You can find documentation on the [Backend Repository](https://github.com/coronasafe/ayushma)
+Ayushma's backend is built on Django. You can find documentation on the [Backend Repository](https://github.com/ohcnetwork/ayushma)
 
 ## 🚀 Production
 
 #### Build the app for production
 
 ```sh
-yarn build
+pnpm build
 ```
 
 Builds the app for production to the `build` folder. It correctly bundles React in production mode and optimizes the build for the best performance.
 
 #### Start a production `http-server`
 
 ```sh
-yarn start
+pnpm start
 ```
 
 Starts a production http-server in local to run the project with Service worker.
@@ -85,19 +85,19 @@ Ayushma is a white label product. You can customize the app to your needs by cha
 
 ### Images
 
-| Path | Description
-| --- | ---
-| `public/logo_text.svg` | Logo with text
-| `public/logo_white.svg` | Logo with white text
-| `public/logo.svg` | Logo without text
+| Path                    | Description          |
+| ----------------------- | -------------------- |
+| `public/logo_text.svg`  | Logo with text       |
+| `public/logo_white.svg` | Logo with white text |
+| `public/logo.svg`       | Logo without text    |
 
 ### Environment Variables (place in `.env` / `.env.local` file)
 
-| Variable | Description | Default
-| --- | --- | ---
-| `NEXT_PUBLIC_API_URL` | Backend API URL | `https://ayushma-api.ohc.network/api/`
-| `NEXT_PUBLIC_LOCAL_STORAGE` | Local storage key name | `ayushma-storage`
-| `NEXT_PUBLIC_AI_NAME`| Name of the AI | Ayushma
-| `NEXT_PUBLIC_AI_DESCRIPTION` | Description of the AI | Revolutionizing medical diagnosis through AI and Opensource
-| `NEXT_PUBLIC_AI_WARNING` | Warning message for accuracy | Please be aware that Ayushma AI may generate inaccurate information; kindly report any concerns to [email protected]
-| `NEXT_PUBLIC_GOOGLE_RECAPTCHA_SITE_KEY` | Google Recaptcha Site Key | `6Lerts4nAAAAAKyXaNZkYj4XfRO0M2R-XYIA3qv8`
+| Variable                                | Description                  | Default                                                                                                                |
+| --------------------------------------- | ---------------------------- | ---------------------------------------------------------------------------------------------------------------------- |
+| `NEXT_PUBLIC_API_URL`                   | Backend API URL              | `https://ayushma-api.ohc.network/api/`                                                                                 |
+| `NEXT_PUBLIC_LOCAL_STORAGE`             | Local storage key name       | `ayushma-storage`                                                                                                      |
+| `NEXT_PUBLIC_AI_NAME`                   | Name of the AI               | Ayushma                                                                                                                |
+| `NEXT_PUBLIC_AI_DESCRIPTION`            | Description of the AI        | Revolutionizing medical diagnosis through AI and Opensource                                                            |
+| `NEXT_PUBLIC_AI_WARNING`                | Warning message for accuracy | Please be aware that Ayushma AI may generate inaccurate information; kindly report any concerns to [email protected] |
+| `NEXT_PUBLIC_GOOGLE_RECAPTCHA_SITE_KEY` | Google Recaptcha Site Key    | `6Lerts4nAAAAAKyXaNZkYj4XfRO0M2R-XYIA3qv8`                                                                             |

package.json

@@ -7,7 +7,7 @@
     "build": "next build",
     "start": "next start",
     "lint": "next lint",
-    "format": "yarn prettier ./src --write",
+    "format": "prettier ./src --write",
     "prepare": "husky install"
   },
   "dependencies": {
@@ -58,5 +58,6 @@
     "prettier-plugin-tailwindcss": "^0.5.11",
     "tailwindcss": "^3.4.1",
     "typescript": "^5.3.3"
-  }
+  },
+  "packageManager": "[email protected]+sha512.f549b8a52c9d2b8536762f99c0722205efc5af913e77835dbccc3b0b0b2ca9e7dc8022b78062c17291c48e88749c70ce88eb5a74f1fa8c4bf5e18bb46c8bd83a"
 }