From d64fe317e5820e4514c58cbaa05a2bbdea3b5fed Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2024 16:44:07 +0000 Subject: [PATCH] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .github/pull_request_template.md | 2 +- .github/workflows/ecs-deploy.yml | 3 --- docs/sysadmins/ci-cd.md | 2 +- docs/sysadmins/deployment.md | 4 ++-- frontend/src/components/partners/messages.js | 2 +- .../src/components/partners/partnersStats.js | 2 +- frontend/src/components/partners/styles.scss | 4 ++-- frontend/src/locales/en.json | 2 +- .../tasking-manager.template.js | 24 +++++++++---------- 9 files changed, 21 insertions(+), 24 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index eb790148c2..7c560f4e9f 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -36,6 +36,6 @@ Notes for the reviewer. How to test this change? - ✅ Provide tests for your changes. - 📝 Use descriptive commit messages. - 📗 Update any related documentation and include any relevant screenshots. -- 🔠 Does this PR introduce or change any environment variables? If so, make sure to specify this change in the description. +- 🔠 Does this PR introduce or change any environment variables? If so, make sure to specify this change in the description. ## [optional] What gif best describes this PR or how it makes you feel? diff --git a/.github/workflows/ecs-deploy.yml b/.github/workflows/ecs-deploy.yml index 1958b26c80..25e355e557 100644 --- a/.github/workflows/ecs-deploy.yml +++ b/.github/workflows/ecs-deploy.yml @@ -97,6 +97,3 @@ jobs: service: ${{ env.ECS_SERVICE }} cluster: ${{ env.ECS_CLUSTER }} wait-for-service-stability: true - - - diff --git a/docs/sysadmins/ci-cd.md b/docs/sysadmins/ci-cd.md index 5c15ff5b0c..95d9a19345 100644 --- a/docs/sysadmins/ci-cd.md +++ b/docs/sysadmins/ci-cd.md @@ -10,7 +10,7 @@ We use CircleCI to manage Continuous Integration and Continuous Deployment. | TeachOSM | deployment/teachosm-tasking-manager | | Indonesia | deployment/id-tasking-manager | -Each environment has its own set of environment variables which are stored as secrets in the CircleCI Organization Settings under Contexts. At the moment, these variables are for the frontend builds only. See the [deployment docs](deployment.md) for updating backend variables. +Each environment has its own set of environment variables which are stored as secrets in the CircleCI Organization Settings under Contexts. At the moment, these variables are for the frontend builds only. See the [deployment docs](deployment.md) for updating backend variables. - OPSGENIE_API - TM_APP_API_URL diff --git a/docs/sysadmins/deployment.md b/docs/sysadmins/deployment.md index 0186668318..d33cf445b3 100644 --- a/docs/sysadmins/deployment.md +++ b/docs/sysadmins/deployment.md @@ -36,7 +36,7 @@ aws s3 sync build/ --delete When deploying updates to the infrastructure or code, follow the steps below. #### Backup Database -Before updating it's always recommended to backup the database. You can make a snapshot in AWS RDS console, or run the database dump directly. You will need sufficient access to a server on the same VPC as the RDS instance in order to connect to it directly. +Before updating it's always recommended to backup the database. You can make a snapshot in AWS RDS console, or run the database dump directly. You will need sufficient access to a server on the same VPC as the RDS instance in order to connect to it directly. ``` PGPASSWORD= pg_dump -Fc \ @@ -48,7 +48,7 @@ PGPASSWORD= pg_dump -Fc \ #### Update backend infrastructure -If the deployment contains any changes to the cloudformation template, including new or changes to environment variables, then we must update the infrastructure prior to deployment. These changes are deliberately set outside the CI/CD process to prevent accidental deletion of data. For the HOT Tasking Manager, only staff with sufficient AWS privileges have the ability to perform these functions. +If the deployment contains any changes to the cloudformation template, including new or changes to environment variables, then we must update the infrastructure prior to deployment. These changes are deliberately set outside the CI/CD process to prevent accidental deletion of data. For the HOT Tasking Manager, only staff with sufficient AWS privileges have the ability to perform these functions. 1. Pull the latest changes locally 2. Run the `cfn-config update` command, keeping in mind to update any new parameters that were added. diff --git a/frontend/src/components/partners/messages.js b/frontend/src/components/partners/messages.js index 1701f64714..3d429a1899 100644 --- a/frontend/src/components/partners/messages.js +++ b/frontend/src/components/partners/messages.js @@ -84,7 +84,7 @@ export default defineMessages({ learnToMap: { id: 'management.partners.learnToMap', defaultMessage: 'Learn to Map', - }, + }, myPartners: { id: 'management.filter.buttons.myPartners', defaultMessage: 'My Partners', diff --git a/frontend/src/components/partners/partnersStats.js b/frontend/src/components/partners/partnersStats.js index f18225d539..156f80bcb9 100644 --- a/frontend/src/components/partners/partnersStats.js +++ b/frontend/src/components/partners/partnersStats.js @@ -38,7 +38,7 @@ export const StatsColumn = ({ label, value, icon }: Object) => { }; export const StatsSection = ({ partner }) => { - + return ( <>
diff --git a/frontend/src/components/partners/styles.scss b/frontend/src/components/partners/styles.scss index 312dbe3ed3..421bab943e 100644 --- a/frontend/src/components/partners/styles.scss +++ b/frontend/src/components/partners/styles.scss @@ -8,8 +8,8 @@ opacity: 1; background: rgba(0, 0, 0, 0.2); } - + .swiper-pagination-bullet-active { color: #fff !important; background: #D73F3F !important; - } \ No newline at end of file + } diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 4141ede5e1..d49f245145 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -1329,4 +1329,4 @@ "pages.edit_project.sections.custom_editor": "Custom Editor", "pages.create_campaign.duplicate": "A campaign with the same name already exists", "pages.create_campaign.error": "There was an error saving this campaign." -} \ No newline at end of file +} diff --git a/scripts/aws/cloudformation/tasking-manager.template.js b/scripts/aws/cloudformation/tasking-manager.template.js index ae1025b03d..d5dc21ec30 100644 --- a/scripts/aws/cloudformation/tasking-manager.template.js +++ b/scripts/aws/cloudformation/tasking-manager.template.js @@ -654,10 +654,10 @@ const Resources = { SecurityGroups: [cf.importValue(cf.join('-', ['hotosm-network-production', cf.ref('NetworkEnvironment'), 'elbs-security-group', cf.region]))], Subnets: cf.ref('ELBSubnets'), Type: 'application', - Tags: [ { - "Key": "stack_name", - "Value": cf.stackName - }, + Tags: [ { + "Key": "stack_name", + "Value": cf.stackName + }, { Key: 'project', Value: 'tasking-manager' @@ -726,11 +726,11 @@ const Resources = { Port: 8000, Protocol: 'HTTP', VpcId: cf.importValue(cf.join('-', ['hotosm-network-production', 'default-vpc', cf.region])), - Tags: [ - { - "Key": "stack_name", - "Value": cf.stackName - }, + Tags: [ + { + "Key": "stack_name", + "Value": cf.stackName + }, { Key: 'project', Value: 'tasking-manager' @@ -809,7 +809,7 @@ const Resources = { DBSnapshotIdentifier: cf.if('UseASnapshot', cf.ref('DBSnapshot'), cf.noValue), VPCSecurityGroups: [cf.importValue(cf.join('-', ['hotosm-network-production', cf.ref('NetworkEnvironment'), 'ec2s-security-group', cf.region]))], PubliclyAccessible: false, - Tags: [ + Tags: [ { Key: 'project', Value: 'tasking-manager' @@ -838,7 +838,7 @@ const Resources = { IndexDocument: 'index.html' }, AccessControl: "Private", - Tags: [ + Tags: [ { Key: 'project', Value: 'tasking-manager' @@ -985,7 +985,7 @@ const Resources = { SslSupportMethod: 'sni-only' } }, - Tags: [ + Tags: [ { Key: 'project', Value: 'tasking-manager'