Skip to content

Commit 0dfeee1

Browse files
committed
Merge branch 'TTA-66-create-new-environment-in-tt-ui-to-be-able-to-deploy-tt-ui-in-producion-with-only-google-auth-0' into TTA-67-refactor-tt-ui-secrets-injection-and-ci-cd-pipelines
2 parents dbdfe5c + dbadc7d commit 0dfeee1

File tree

47 files changed

+127
-778
lines changed

Some content is hidden

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

47 files changed

+127
-778
lines changed

.dev.env

497 Bytes
Binary file not shown.

.env

102 Bytes
Binary file not shown.
Binary file not shown.

.git-crypt/keys/default/0/C9EB0C98CA1F391730E957CD78A3C138527A1D25.gpg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
�^EB���y�@=� &Pe<s iҵDY�`v��e�^���i�d0���5�e��\�5P��%oV�S��wAoT�)��1�' ���A����Q C��$�g����7�c�F �p��Tѡ� ��'�v���9��D�K�[L� ?�.��L,}�й �d掽�t�ܨI$��FZ�m){��@�,Ȁ�t(�Cm����������c@g�\}0vz���~���w,*����A��Cbw���=&!"+�@?�+��߲\Ƙ��"u����_�F��������
Binary file not shown.

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
.env filter=git-crypt diff=git-crypt
1+
.dev.env filter=git-crypt diff=git-crypt
22
src/environments/.keys.json filter=git-crypt diff=git-crypt
33
src/environments/keys.ts filter=git-crypt diff=git-crypt

.github/workflows/time-tracker-ui-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ jobs:
3030
with:
3131
ssh-private-key: ${{ secrets.INFRA_TERRAFORM_MODULES_SSH_PRIV_KEY }}
3232

33-
- name: build docker
34-
run: make build
35-
3633
- name: Inject Secrets
3734
env:
3835
AUTHORITY: ${{ secrets.AUTHORITY }}
@@ -47,6 +44,9 @@ jobs:
4744
chmod +x ./scripts/populate-keys.sh
4845
sh ./scripts/populate-keys.sh
4946
47+
- name: build docker
48+
run: make build
49+
5050
- name: Running tests
5151
run: |
5252
chmod -R 777 ./$home

angular.json

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,34 @@
7878
"maximumError": "10kb"
7979
}
8080
]
81+
},
82+
"productionlegacy": {
83+
"fileReplacements": [
84+
{
85+
"replace": "src/environments/environment.ts",
86+
"with": "src/environments/environment.prodlegacy.ts"
87+
}
88+
],
89+
"optimization": true,
90+
"outputHashing": "all",
91+
"sourceMap": false,
92+
"extractCss": true,
93+
"namedChunks": false,
94+
"extractLicenses": true,
95+
"vendorChunk": false,
96+
"buildOptimizer": true,
97+
"budgets": [
98+
{
99+
"type": "initial",
100+
"maximumWarning": "2mb",
101+
"maximumError": "5mb"
102+
},
103+
{
104+
"type": "anyComponentStyle",
105+
"maximumWarning": "6kb",
106+
"maximumError": "10kb"
107+
}
108+
]
81109
}
82110
}
83111
},

docker-compose.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ services:
1010
- 4200:4200
1111
- 9876:9876
1212
environment:
13+
API_URL: ${API_URL}
1314
AUTHORITY: ${AUTHORITY}
1415
API_URL: ${API_URL}
1516
CLIENT_ID: ${CLIENT_ID}
@@ -38,11 +39,12 @@ services:
3839
- 9876:9876
3940
environment:
4041
CHROME_BIN: /opt/google/chrome/google-chrome
42+
API_URL: ${API_URL}
4143
AUTHORITY: ${AUTHORITY}
4244
API_URL: ${API_URL}
4345
CLIENT_ID: ${CLIENT_ID}
4446
CLIENT_URL: ${CLIENT_URL}
4547
SCOPES: ${SCOPES}
4648
STACK_EXCHANGE_ID: ${STACK_EXCHANGE_ID}
4749
STACK_EXCHANGE_ACCESS_TOKEN: ${STACK_EXCHANGE_ACCESS_TOKEN}
48-
AZURE_APP_CONFIGURATION_CONNECTION_STRING: ${AZURE_APP_CONFIGURATION_CONNECTION_STRING}
50+
AZURE_APP_CONFIGURATION_CONNECTION_STRING: ${AZURE_APP_CONFIGURATION_CONNECTION_STRING}

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"ng": "ng",
77
"start": "ng serve",
88
"build": "ng build --prod",
9+
"build-legacy": "ng build --configuration productionlegacy",
910
"test": "ng test --browsers ChromeHeadless",
1011
"test-headless": "ng test --browsers ChromeHeadless",
1112
"ci-test": "ng test --no-watch --no-progress --browsers ChromeHeadless",

0 commit comments

Comments
 (0)