Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Production merge #200

Merged
merged 23 commits into from
Sep 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @ohcnetwork/code-reviewers @ohcnetwork/care-fe-code-reviewers
9 changes: 4 additions & 5 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ on:
branches:
- production


jobs:
build:
name: Build & Push Staging to container registries
Expand Down Expand Up @@ -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:
Expand Down
5 changes: 1 addition & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

yarn lint
pnpm lint
9 changes: 3 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -21,7 +18,7 @@ COPY --from=deps /app/node_modules ./node_modules

COPY . .

RUN yarn build
RUN pnpm build

FROM base AS runner

Expand Down
38 changes: 19 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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.
Expand Down Expand Up @@ -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.
Expand All @@ -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` |
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -58,5 +58,6 @@
"prettier-plugin-tailwindcss": "^0.5.11",
"tailwindcss": "^3.4.1",
"typescript": "^5.3.3"
}
},
"packageManager": "[email protected]+sha512.f549b8a52c9d2b8536762f99c0722205efc5af913e77835dbccc3b0b0b2ca9e7dc8022b78062c17291c48e88749c70ce88eb5a74f1fa8c4bf5e18bb46c8bd83a"
}
Loading