-
Notifications
You must be signed in to change notification settings - Fork 0
Feat/capacity and resources #2
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
Open
crsstha
wants to merge
13
commits into
develop
Choose a base branch
from
feat/capacity-and-resources
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
acae344
feat: navbar and link component
crsstha d7d003b
feat(team/galleries): added team and galleries pages
crsstha 6b12a11
feat(login): added login page, info card and keycard
crsstha b1226a4
fix(lint): address the lint not working
crsstha 725c741
fix(teamList): added team list page
crsstha 6f0c635
feat(web-app-serve): added we app serve
crsstha 957bf7a
feat(home): added active operation map
crsstha cc79da3
feat(data-and-report): added data and report, galleries, team pages
crsstha 022af50
feat(our-work): add tab and tab content
crsstha 7221a43
feat(capaticy-and-resources): add the route and page of capaticity an…
crsstha d238bba
feat(risk-analysis): added risk-analysis page
crsstha 9c37b34
stylelint fix
crsstha 3091dbd
feat(prepredness): added all emergency table and fix pr review req ch…
crsstha File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| # dotenv environment variables file | ||
| .env | ||
| .env* | ||
| **/.env | ||
| **/.env* | ||
|
|
||
| # Sensitive Deploy Files | ||
| deploy/eb/ | ||
|
|
||
| # tox | ||
| ./.tox | ||
|
|
||
|
|
||
| # Backend | ||
| backend | ||
| !backend/schema.graphql |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| - Addresses XXX | ||
| - Depends on XXX | ||
|
|
||
| ## Changes | ||
|
|
||
| - Detailed list or prose of changes | ||
| - Breaking changes | ||
| - Changes to configurations | ||
|
|
||
| ## This PR doesn't introduce any | ||
|
|
||
| - [ ] temporary files, auto-generated files or secret keys | ||
| - [ ] build works | ||
| - [ ] eslint issues | ||
| - [ ] typescript issues | ||
| - [ ] codegen errors | ||
| - [ ] `console.log` meant for debugging | ||
| - [ ] typos | ||
| - [ ] unwanted comments | ||
| - [ ] conflict markers | ||
|
|
||
| ## This PR includes | ||
|
|
||
| - [ ] Translation | ||
| - [ ] Permission | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| name: CI | ||
|
|
||
| on: | ||
| pull_request: | ||
| push: | ||
| branches: | ||
| - "main" | ||
|
|
||
| env: | ||
| APP_GRAPHQL_CODEGEN_ENDPOINT: "./backend/schema.graphql" | ||
| APP_GRAPHQL_ENDPOINT: "http://web:8000/graphql/" | ||
| APP_TITLE: "ERCS" | ||
| APP_ENVIRONMENT: "development" | ||
| GITHUB_WORKFLOW: true | ||
|
|
||
| jobs: | ||
| lint: | ||
| name: Lint | ||
| runs-on: ubuntu-latest | ||
| env: | ||
| PIPELINE_TYPE: ci | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| submodules: recursive | ||
| - name: Install pnpm | ||
| run: npm install -g pnpm | ||
|
|
||
| - uses: actions/setup-node@v4 | ||
| with: | ||
| node-version: "22.x" | ||
| cache: "pnpm" | ||
|
|
||
| - name: Install dependencies | ||
| run: pnpm install --frozen-lockfile | ||
|
|
||
| - name: Lint | ||
| run: pnpm lint | ||
| build: | ||
| name: Build | ||
| needs: [lint] | ||
| runs-on: ubuntu-latest | ||
| env: | ||
| PIPELINE_TYPE: ci | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| submodules: recursive | ||
|
|
||
| - uses: pnpm/action-setup@v4 | ||
| name: Install pnpm | ||
|
|
||
| - name: Install Node.js | ||
| uses: actions/setup-node@v4 | ||
| with: | ||
| node-version: "22.x" | ||
| cache: "pnpm" | ||
|
|
||
| - name: Install dependencies | ||
| run: pnpm install --frozen-lockfile | ||
|
|
||
| - name: Generate Type | ||
| run: pnpm generate:type | ||
|
|
||
| - name: Build | ||
| run: pnpm build |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| name: Publish web app serve | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
| push: | ||
| branches: | ||
| - develop | ||
|
|
||
| permissions: | ||
| packages: write | ||
|
|
||
| jobs: | ||
| publish_image: | ||
| name: Publish Docker Image | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| submodules: true | ||
|
|
||
| - name: Publish web-app-serve | ||
| uses: toggle-corp/web-app-serve-action@v0.1.1 | ||
| with: | ||
| github_token: ${{ secrets.GITHUB_TOKEN }} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,9 @@ | ||
| [submodule "backend"] | ||
| path = backend | ||
| url = https://github.com/toggle-corp/ercs-backend.git | ||
| [submodule "go-risk-module-api"] | ||
| path = go-risk-module-api | ||
| url = git@github.com:IFRCGo/go-risk-module-api.git | ||
| [submodule "go-api"] | ||
| path = go-api | ||
| url = https://github.com/IFRCGo/go-api.git |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,41 +1,43 @@ | ||
| FROM node:22-bookworm AS dev | ||
|
|
||
| RUN apt-get update -y \ | ||
| && apt-get install -y --no-install-recommends \ | ||
| git bash g++ make \ | ||
| && rm -rf /var/lib/apt/lists/* | ||
|
|
||
| RUN corepack enable | ||
| && apt-get install -y --no-install-recommends git \ | ||
| && rm -rf /var/lib/apt/lists/* \ | ||
| # NOTE: yarn > 1.22.19 breaks yarn-install invoked by pnpm | ||
| && npm install -g pnpm@10.33.0 yarn@1.22.19 --force \ | ||
| && git config --global --add safe.directory /code | ||
|
|
||
| WORKDIR /code | ||
| RUN git config --global --add safe.directory /code | ||
|
|
||
| COPY package.json pnpm-lock.yaml /code/ | ||
| RUN corepack prepare pnpm@latest --activate | ||
|
|
||
| # -------------------------- Nginx - Builder -------------------------------- | ||
| FROM dev AS nginx-build | ||
| FROM dev AS web-app-serve-build | ||
|
|
||
| COPY ./package.json ./pnpm-lock.yaml /code/ | ||
|
|
||
| RUN pnpm install --frozen-lockfile | ||
| RUN pnpm install | ||
|
|
||
| COPY . . | ||
| COPY . /code/ | ||
|
|
||
| ENV APP_TITLE=APP_TITLE_PLACEHOLDER | ||
| ENV APP_GRAPHQL_ENDPOINT=APP_GRAPHQL_ENDPOINT_PLACEHOLDER | ||
| # # Build variables (Requires backend pulled) | ||
| ENV APP_TITLE=ercs-eoc | ||
| ENV APP_ENVIRONMENT=development | ||
| ENV APP_GRAPHQL_ENDPOINT=http://localhost:8000 | ||
| ENV APP_GRAPHQL_CODEGEN_ENDPOINT=./backend/schema.graphql | ||
| ENV APP_MAPBOX_TOKEN=APP_MAPBOX_TOKEN_PLACEHOLDER | ||
| ENV APP_GO_API=WEB_APP_SERVE_PLACEHOLDER__APP_GO_API_PLACEHOLDER | ||
| ENV APP_GO_URL=WEB_APP_SERVE_PLACEHOLDER__APP_GO_URL_PLACEHOLDER | ||
| ENV APP_GO_RISK_API_ENDPOINT=WEB_APP_SERVE_PLACEHOLDER__APP_GO_RISK_API_ENDPOINT_PLACEHOLDER | ||
|
|
||
| RUN pnpm generate:type && pnpm build | ||
|
|
||
| RUN pnpm generate:type && WEB_APP_SERVE_ENABLED=true pnpm build | ||
|
|
||
| # --------------------------------------------------------------------------- | ||
| FROM nginx:1 AS nginx-serve | ||
| FROM ghcr.io/toggle-corp/web-app-serve:v0.1.2 AS web-app-serve | ||
|
|
||
| LABEL maintainer="Togglecorp Dev" | ||
| LABEL org.opencontainers.image.source="https://github.com/ToogleCorp/ercs-client" | ||
|
|
||
| COPY ./nginx-serve/apply-config.sh /docker-entrypoint.d/ | ||
| COPY ./nginx-serve/nginx.conf.template /etc/nginx/templates/default.conf.template | ||
| COPY --from=nginx-build /code/build /code/build | ||
|
|
||
| # Env for apply-config script | ||
| ENV APPLY_CONFIG__SOURCE_DIRECTORY=/code/build/ | ||
| ENV APPLY_CONFIG__DESTINATION_DIRECTORY=/usr/share/nginx/html/ | ||
| ENV APPLY_CONFIG__OVERWRITE_DESTINATION=true | ||
|
|
||
| COPY --from=web-app-serve-build /code/build "$APPLY_CONFIG__SOURCE_DIRECTORY" |
Empty file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please replace this with: