Skip to content

Commit

Permalink
Merge branch 'fix/error-legibility-and-reporting' into 'main'
Browse files Browse the repository at this point in the history
fix(frontend): improve error legibility and reporting

See merge request m-team/ai/cookiecutter-web!14
  • Loading branch information
vykozlov committed Dec 2, 2024
2 parents e419af4 + 78e4dfc commit 6e8053c
Show file tree
Hide file tree
Showing 43 changed files with 4,548 additions and 151,649 deletions.
1 change: 1 addition & 0 deletions .env-example
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ OAUTH_AUTHORITY="https://aai-demo.egi.eu/auth/realms/egi/"
## Backend configuration
PROJECT_NAME=cookiecutter-web
REPOSITORY_URL="https://github.com/m-team-kit/templates-hub.git"
ISSUES_URL="https://github.com/m-team-kit/templates-hub/issues"
CORS_ORIGINS="http://localhost,http://localhost:3000,http://localhost:5000,https://localhost"
[email protected]
[email protected]
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
.env
cookie_secret.txt
traefik/
data/
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ Copy `.env-example` to `.env` and refer to the comments to fill in desired confi

# Running the application

Run `docker compose -f docker-compose.base.yaml -f docker-compose.prod.yaml up --build -d` to deploy the application in production mode.
Run `docker compose -f compose.base.yaml -f compose.prod.yaml up --build -d` to deploy the application in production mode.

Run `docker compose -f docker-compose.base.yaml -f docker-compose.prod.yaml -f docker-compose.frontend-only.yaml up --build -d` to deploy the application with the frontend only (e.g. to have different frontends with still the same backend hosted on another instance).
Run `docker compose -f compose.base.yaml -f compose.prod.yaml -f compose.frontend-only.yaml up --build -d` to deploy the application with the frontend only (e.g. to have different frontends with still the same backend hosted on another instance).

Run `docker compose -f docker-compose.base.yaml -f docker-compose.dev.yaml up --build` to deploy the application in development mode for testing.
Run `docker compose -f compose.base.yaml -f compose.dev.yaml up --build` to deploy the application in development mode for testing.

# Deployed service
Deployed service can be found in [https://templates.services.fedcloud.eu/](https://templates.services.fedcloud.eu/)
Expand Down
2 changes: 2 additions & 0 deletions docker-compose.base.yaml → compose.base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ services:
NEXT_PUBLIC_OIDC_CLIENT_ID: ${FRONTEND_OIDC_CLIENT_ID}
NEXT_PUBLIC_TEMPLATE_REPOSITORY: ${REPOSITORY_URL}
NEXT_PUBLIC_FORCED_TAGS: ${FRONTEND_PLATFORM_TAGS}
NEXT_PUBLIC_REPOSITORY_URL: ${REPOSITORY_URL}
NEXT_PUBLIC_ISSUES_URL: ${ISSUES_URL}
labels:
traefik.http.routers.webapp.rule: Host(`${DOMAIN}`)

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions frontend/.npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@fortawesome:registry=https://registry.npmjs.org/
Loading

0 comments on commit 6e8053c

Please sign in to comment.