Skip to content

Commit 8bb0a00

Browse files
authored
Merge pull request #396 from AppQuality/develop
Pull Request triggered from POEditor
2 parents 81e8c16 + c964243 commit 8bb0a00

File tree

138 files changed

+6823
-1738
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+6823
-1738
lines changed

.github/workflows/deploy-to-staging.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ jobs:
1818
build:
1919
# The type of runner that the job will run on
2020
runs-on: ubuntu-latest
21+
environment: Staging
2122

2223
# Steps represent a sequence of tasks that will be executed as part of the job
2324
steps:
@@ -43,7 +44,7 @@ jobs:
4344
fi
4445
echo "##[set-output name=tag;]$TAG"
4546
id: extract_branch
46-
- name: "Generate dist zip"
47+
- name: 'Generate dist zip'
4748
run: |
4849
cd deployment
4950
echo -n "${{steps.environment.outputs.ECR_REPOSITORY}}:${{steps.extract_branch.outputs.tag}}" > docker-image.txt
@@ -53,7 +54,7 @@ jobs:
5354
S3_BUCKET: ${{steps.environment.outputs.DEPLOY_BUCKET}}
5455
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
5556
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
56-
AWS_REGION: "eu-west-1" # optional: defaults to us-east-1
57+
AWS_REGION: 'eu-west-1' # optional: defaults to us-east-1
5758
FILE: ./deployment/dist.zip
5859
S3_KEY: ${{steps.environment.outputs.DEPLOY_KEY}}
5960
- name: configure AWS creds

.github/workflows/release.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ env:
1515
jobs:
1616
push-to-ecr:
1717
name: Push Image
18+
environment: production
1819
runs-on: ubuntu-latest
1920
steps:
2021
- name: Checkout
@@ -34,7 +35,7 @@ jobs:
3435
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
3536
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
3637
aws-region: eu-west-1
37-
38+
3839
- name: Login to Amazon ECR
3940
id: login-ecr
4041
uses: aws-actions/amazon-ecr-login@aaf69d68aa3fb14c1d5a6be9ac61fe15b48453a2
@@ -75,7 +76,7 @@ jobs:
7576
echo "##[set-output name=ASG_NAME;]$ASG_NAME"
7677
echo "##[set-output name=PIPELINE;]$PIPELINE"
7778
id: extract_tag
78-
- name: "Generate dist zip"
79+
- name: 'Generate dist zip'
7980
run: |
8081
cd deployment
8182
echo -n "${{ steps.extract_tag.outputs.ECR_REPOSITORY }}:${{steps.extract_tag.outputs.tag}}" > docker-image.txt
@@ -85,7 +86,7 @@ jobs:
8586
S3_BUCKET: ${{ steps.extract_tag.outputs.DEPLOY_PROD_BUCKET }}
8687
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
8788
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
88-
AWS_REGION: "eu-west-1"
89+
AWS_REGION: 'eu-west-1'
8990
FILE: ./deployment/dist.zip
9091
S3_KEY: ${{ steps.extract_tag.outputs.DEPLOY_PROD_KEY }}
9192
- name: configure AWS creds
@@ -100,7 +101,7 @@ jobs:
100101
env:
101102
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
102103
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
103-
AWS_REGION: "eu-west-1"
104+
AWS_REGION: 'eu-west-1'
104105
ASG_NAME: ${{ steps.extract_tag.outputs.ASG_NAME }}
105106
DESIRED_INSTANCES: 2
106107
MAX_INSTANCES: 2
@@ -114,7 +115,7 @@ jobs:
114115
env:
115116
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
116117
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
117-
AWS_REGION: "eu-west-1"
118+
AWS_REGION: 'eu-west-1'
118119
ASG_NAME: ${{ steps.extract_tag.outputs.ASG_NAME }}
119120
DESIRED_INSTANCES: ${{ steps.update-asg.outputs.original_desired }}
120121
MAX_INSTANCES: ${{ steps.update-asg.outputs.original_max }}
@@ -124,12 +125,12 @@ jobs:
124125
env:
125126
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
126127
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
127-
AWS_REGION: "eu-west-1"
128+
AWS_REGION: 'eu-west-1'
128129
PIPELINE_NAME: ${{ steps.extract_tag.outputs.PIPELINE }}
129130
- name: Update release with deployment url
130131
uses: tubone24/update_release@v1.0
131132
env:
132133
GITHUB_TOKEN: ${{ github.token }}
133134
with:
134-
body: "[![](https://img.shields.io/badge/AWS-Redeploy-blueviolet)](${{ steps.codedeploy.outputs.codedeploy_url }})"
135+
body: '[![](https://img.shields.io/badge/AWS-Redeploy-blueviolet)](${{ steps.codedeploy.outputs.codedeploy_url }})'
135136
isAppendBody: true

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "1.4.0",
44
"private": true,
55
"dependencies": {
6-
"@appquality/unguess-design-system": "2.12.57",
6+
"@appquality/unguess-design-system": "2.12.73",
77
"@headwayapp/react-widget": "^0.0.4",
88
"@reduxjs/toolkit": "^1.8.0",
99
"@rtk-query/codegen-openapi": "^1.0.0-alpha.1",
File renamed without changes.

src/assets/icons/details-icon.svg

Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading

src/assets/icons/father-icon.svg

Lines changed: 4 additions & 0 deletions
Loading
Lines changed: 16 additions & 0 deletions
Loading
Lines changed: 4 additions & 0 deletions
Loading

src/assets/icons/share-stroke.svg

Lines changed: 3 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)