Skip to content

Commit

Permalink
feat: post rebase merge from main
Browse files Browse the repository at this point in the history
  • Loading branch information
ymijsters committed Feb 13, 2025
2 parents b159e29 + 99b9693 commit 0d8da6c
Show file tree
Hide file tree
Showing 216 changed files with 8,548 additions and 4,095 deletions.
118 changes: 58 additions & 60 deletions .aws/graasp-stage.json
Original file line number Diff line number Diff line change
@@ -1,60 +1,58 @@
{
"executionRoleArn": "arn:aws:iam::348555061219:role/graasp-staging-ecs-execution-role",
"family": "graasp",
"cpu": "1024",
"memory": "3072",
"requiresCompatibilities": [
"FARGATE"
],
"networkMode": "awsvpc",
"runtimePlatform": {
"operatingSystemFamily": "LINUX",
"cpuArchitecture": null
},
"containerDefinitions": [
{
"name": "graasp",
"logConfiguration": {
"logDriver": "awslogs",
"options": {
"awslogs-group": "/ecs/graasp",
"awslogs-region": "eu-central-2",
"awslogs-stream-prefix": "ecs"
}
},
"portMappings": [
{
"hostPort": 3111,
"protocol": "tcp",
"containerPort": 3111
}
],
"image": null,
"dependsOn": null,
"disableNetworking": null,
"healthCheck": null,
"essential": true
},
{
"logConfiguration": {
"logDriver": "awslogs",
"options": {
"awslogs-group": "/ecs/graasp-nudenet-staging",
"awslogs-region": "eu-central-2",
"awslogs-stream-prefix": "ecs"
}
},
"portMappings": [
{
"hostPort": 8080,
"protocol": "tcp",
"containerPort": 8080
}
],
"essential": true,
"image": "notaitech/nudenet:classifier",
"name": "graasp-nudenet"
}
],
"placementConstraints": []
}
{
"executionRoleArn": "arn:aws:iam::348555061219:role/graasp-staging-ecs-execution-role",
"family": "graasp",
"cpu": "1024",
"memory": "3072",
"requiresCompatibilities": ["FARGATE"],
"networkMode": "awsvpc",
"runtimePlatform": {
"operatingSystemFamily": "LINUX",
"cpuArchitecture": null
},
"containerDefinitions": [
{
"name": "graasp",
"logConfiguration": {
"logDriver": "awslogs",
"options": {
"awslogs-group": "/ecs/graasp",
"awslogs-region": "eu-central-2",
"awslogs-stream-prefix": "ecs"
}
},
"portMappings": [
{
"hostPort": 3111,
"protocol": "tcp",
"containerPort": 3111
}
],
"image": null,
"dependsOn": null,
"disableNetworking": null,
"healthCheck": null,
"essential": true
},
{
"logConfiguration": {
"logDriver": "awslogs",
"options": {
"awslogs-group": "/ecs/graasp-nudenet-staging",
"awslogs-region": "eu-central-2",
"awslogs-stream-prefix": "ecs"
}
},
"portMappings": [
{
"hostPort": 8080,
"protocol": "tcp",
"containerPort": 8080
}
],
"essential": true,
"image": "notaitech/nudenet:classifier",
"name": "graasp-nudenet"
}
],
"placementConstraints": []
}
4 changes: 1 addition & 3 deletions .devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ services:
USER_GID: 1000
environment:
# sane default to allow the server to bind to any interface in the container
HOSTNAME: 0.0.0.0
# the generated links should open the browser locally
PUBLIC_URL: http://localhost:3000
HOSTNAME: 0.0.0.0
# temporary storage for files inside the container
FILE_STORAGE_ROOT_PATH: /tmp/graasp-file-item-storage
# the localfile config host points to the static file server defined below
Expand Down
92 changes: 49 additions & 43 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,43 +1,49 @@
{
"parser": "@typescript-eslint/parser",
"extends": [
"plugin:@typescript-eslint/recommended",
"plugin:import/recommended",
"plugin:import/typescript",
"prettier"
],
"parserOptions": {
"ecmaVersion": 2018,
"sourceType": "module"
},
"rules": {
"semi": ["error", "always"],
"@typescript-eslint/explicit-function-return-type": "off",
"@typescript-eslint/no-explicit-any": 1,
"@typescript-eslint/no-inferrable-types": [
"warn",
{
"ignoreParameters": true
}
],
"import/no-extraneous-dependencies": [
"error",
{
"devDependencies": ["**/*.test.*", "**/test/*", "**/test/**/*"]
}
],
"@typescript-eslint/no-unused-vars": [
"warn",
{
"argsIgnorePattern": "^_",
"varsIgnorePattern": "^_",
"caughtErrorsIgnorePattern": "^_"
}
]
},
"settings": {
"import/resolver": {
"typescript": {} // this loads <rootdir>/tsconfig.json to eslint
}
}
}
{
"parser": "@typescript-eslint/parser",
"extends": [
"plugin:@typescript-eslint/recommended",
"plugin:import/recommended",
"plugin:import/typescript",
"prettier",
],
"parserOptions": {
"ecmaVersion": "latest",
"sourceType": "module",
},
"rules": {
"semi": ["error", "always"],
"@typescript-eslint/explicit-function-return-type": "off",
"@typescript-eslint/no-explicit-any": 1,
"@typescript-eslint/no-inferrable-types": [
"warn",
{
"ignoreParameters": true,
},
],
"import/no-extraneous-dependencies": [
"error",
{
"devDependencies": ["**/*.test.*", "**/test/*", "**/test/**/*"],
},
],
"no-console": [
"warn",
{
"allow": ["error", "warn", "debug"],
},
],
"@typescript-eslint/no-unused-vars": [
"warn",
{
"argsIgnorePattern": "^_",
"varsIgnorePattern": "^_",
"caughtErrorsIgnorePattern": "^_",
},
],
},
"settings": {
"import/resolver": {
"typescript": {}, // this loads <rootdir>/tsconfig.json to eslint
},
},
}
6 changes: 1 addition & 5 deletions .github/workflows/deploy-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,11 @@ jobs:
environment-variables: |
DATABASE_LOGS=${{ vars.DATABASE_LOGS }}
DB_CONNECTION_POOL_SIZE=${{ vars.DB_CONNECTION_POOL_SIZE }}
ANALYTICS_CLIENT_HOST=${{ vars.ANALYTICS_CLIENT_HOST }}
ACCOUNT_CLIENT_HOST=${{ vars.ACCOUNT_CLIENT_HOST }}
APPS_JWT_SECRET=${{ secrets.APPS_JWT_SECRET }}
APPS_PUBLISHER_ID=${{ secrets.APPS_PUBLISHER_ID }}
AUTH_CLIENT_HOST=${{ vars.AUTH_CLIENT_HOST }}
AUTH_TOKEN_EXPIRATION_IN_MINUTES=${{ secrets.AUTH_TOKEN_EXPIRATION_IN_MINUTES }}
AUTH_TOKEN_JWT_SECRET=${{ secrets.AUTH_TOKEN_JWT_SECRET }}
BUILDER_CLIENT_HOST=${{ vars.BUILDER_CLIENT_HOST }}
CLIENT_HOST=${{ vars.CLIENT_HOST }}
COOKIE_DOMAIN=${{ vars.COOKIE_DOMAIN }}
CORS_ORIGIN_REGEX=${{ secrets.CORS_ORIGIN_REGEX }}
DB_HOST=${{ secrets.DB_HOST }}
Expand Down Expand Up @@ -140,7 +137,6 @@ jobs:
MEILISEARCH_REBUILD_SECRET=${{ secrets.MEILISEARCH_REBUILD_SECRET }}
MEILISEARCH_URL=${{ secrets.MEILISEARCH_URL }}
NODE_ENV=${{ vars.NODE_ENV }}
PLAYER_CLIENT_HOST=${{ vars.PLAYER_CLIENT_HOST }}
PORT=${{ vars.PORT }}
PUBLIC_URL=${{ secrets.PUBLIC_URL }}
RECAPTCHA_SECRET_ACCESS_KEY=${{ secrets.RECAPTCHA_SECRET_ACCESS_KEY }}
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,9 @@ env:
# random keys
APPS_JWT_SECRET: ${{ vars.MOCK_APPS_JWT_SECRET }}
APPS_PUBLISHER_ID: 9c9cea73-f3b7-48a3-aa6e-ead82c0685e7 # mock uuid
AUTH_CLIENT_HOST: 'localhost:3001'
AUTH_TOKEN_JWT_SECRET: ${{ vars.MOCK_AUTH_TOKEN_JWT_SECRET }}
BUILDER_CLIENT_HOST: 'http://localhost:3111'
ACCOUNT_CLIENT_HOST: 'http://localhost:3114'
ANALYTICS_CLIENT_HOST: 'http://localhost:3005'
COOKIE_DOMAIN: localhost
CLIENT_HOST: http://localhost:3114
DB_PASSWORD: docker
DB_USERNAME: docker
DB_NAME: docker
Expand All @@ -44,7 +41,6 @@ env:
MAILER_CONFIG_PASSWORD: password
MAILER_CONFIG_SMTP_HOST: localhost
MAILER_CONFIG_USERNAME: username
PLAYER_CLIENT_HOST: 'http://localhost:3112'
RECAPTCHA_SECRET_ACCESS_KEY: 'iamamockkey'
REDIS_HOST: localhost
REDIS_PORT: 6379
Expand Down
Loading

0 comments on commit 0d8da6c

Please sign in to comment.