Skip to content

Commit 5863564

Browse files
andresacg30reihtwRodrigo Linsmmaquinasemantic-release-bot
authored
Tta 180 integrate time tracker with auth app (#944)
* refactor: TTA-180 change Client URL for Auth URL * TTA-180: fixing endpoints to send credentials * refactor: TTA-115 refactor backend URL for dev * refactor: TTA-115 pass the environment auth variable link to the a tag * fix: TTA-115 fix error Type 'string' is not assignable to type 'void in login.component * feat: TTA-180 creating logout * fix: TTA-180 fixing tests * fix: TTA-180 fixing environment variables * fix: TTA-180 fixing environment variables * fix: TTA-180 fixing environment variables * fix: TTA-180 fixing environment variables * fix: TTA-180 fixing environment variables * fix: TTA-180 fixing environment variables * feat: TTA-180 updating README.md * fix: TTA-180 removing unused variables * fix: TTA-180 increasing test coveragew * fix: TTA-180 increasing test coveragew * fix: TTA-180 CR fixes * config: TTA-180 added secrets for stage and prod * fix: TTA-181 change husky hint when commit message is wrong (#937) Co-authored-by: mmaquina <[email protected]> * chore(release): 1.75.21 [skip ci]nn * fix: TTA 183 get summary returns 404 at begginning of the month (#938) Co-authored-by: Nicole Garcia <nicolsss> * chore(release): 1.75.22 [skip ci]nn * Update README.md * Update README.md * fix: Tta 193 add loading page to new ip check load time (#939) * feat: TTA-193 add preload page * fix: TTA-181 change husky hint when commit message is wrong (#937) Co-authored-by: mmaquina <[email protected]> * chore(release): 1.75.21 [skip ci]nn * feat: TTA-193 add service and interceptor for spinner loading * feat: TTA-193 add spinner overlay and style it * test: TTA-193 make test * update package-lock.json version * test: add test for interceptor and service * test: TTA-193 increase code coverage * test: TTA-193 increase code coverage * fix: spinner test * fix: spinner test * fix: load spinner when route is recent Co-authored-by: mmaquina <[email protected]> Co-authored-by: mmaquina <[email protected]> Co-authored-by: semantic-release-bot <[email protected]> Co-authored-by: Andres Cabrera <andres@MSI> Co-authored-by: Nicole Garcia <nicolsss> * chore(release): 1.75.24 [skip ci]nn * adding Andres Cabrera ppk to STAGE secrets * adding Andres Cabrera ppk to PROD secrets * Added secrets for auth app on stage and prod * Revert "Tta 180 integrate time tracker with auth app (#940)" (#942) This reverts commit 0d4c2ff. * revert adding stage and prod envs * config: TTA-180 added secrets for stage and prod * Tta 180 integrate time tracker with auth app (#940) * refactor: TTA-180 change Client URL for Auth URL * TTA-180: fixing endpoints to send credentials * refactor: TTA-115 refactor backend URL for dev * refactor: TTA-115 pass the environment auth variable link to the a tag * fix: TTA-115 fix error Type 'string' is not assignable to type 'void in login.component * feat: TTA-180 creating logout * fix: TTA-180 fixing tests * fix: TTA-180 fixing environment variables * fix: TTA-180 fixing environment variables * fix: TTA-180 fixing environment variables * fix: TTA-180 fixing environment variables * fix: TTA-180 fixing environment variables * fix: TTA-180 fixing environment variables * feat: TTA-180 updating README.md * fix: TTA-180 removing unused variables * fix: TTA-180 increasing test coveragew * fix: TTA-180 increasing test coveragew * fix: TTA-180 CR fixes Co-authored-by: Abigail Cabascango <sacabascango1espe.edu.ec> * Added secrets for auth app on stage and prod Co-authored-by: Abigail Cabascango <sacabascango1espe.edu.ec> Co-authored-by: = <[email protected]> Co-authored-by: Rodrigo Lins <[email protected]> Co-authored-by: mmaquina <[email protected]> Co-authored-by: mmaquina <[email protected]> Co-authored-by: semantic-release-bot <[email protected]> Co-authored-by: nicolsss <[email protected]> Co-authored-by: Andres Cabrera <andres@MSI> Co-authored-by: Rodolfo IOET <[email protected]>
1 parent e317676 commit 5863564

File tree

35 files changed

+145
-115
lines changed

35 files changed

+145
-115
lines changed

‎.dev.env‎

138 Bytes
Binary file not shown.

‎.github/workflows/CD-time-tracker-ui.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ jobs:
3434
CLIENT_ID: ${{ secrets.client_id }}
3535
CLIENT_URL: ${{ secrets.client_url }}
3636
STACK_EXCHANGE_ID: ${{ secrets.stack_exchange_id }}
37+
AUTH_URL: ${{ secrets.AUTH_URL }}
38+
AUTH_APP_NAME: ${{ secrets.AUTH_APP_NAME }}
3739
STACK_EXCHANGE_ACCESS_TOKEN: ${{ secrets.stack_exchange_access_token }}
3840
AZURE_APP_CONFIGURATION_CONNECTION_STRING: ${{ secrets.azure_app_configuration_connection_string }}
3941
run: |

‎.github/workflows/CI-time-tracker-ui.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ jobs:
4646
SCOPES: ${{ secrets.SCOPES }}
4747
CLIENT_ID: ${{ secrets.CLIENT_ID }}
4848
CLIENT_URL : ${{ secrets.CLIENT_URL }}
49+
AUTH_URL: ${{ secrets.AUTH_URL }}
50+
AUTH_APP_NAME: ${{ secrets.AUTH_APP_NAME }}
4951
STACK_EXCHANGE_ID: ${{ secrets.STACK_EXCHANGE_ID }}
5052
STACK_EXCHANGE_ACCESS_TOKEN: ${{ secrets.STACK_EXCHANGE_ACCESS_TOKEN }}
5153
AZURE_APP_CONFIGURATION_CONNECTION_STRING: ${{ secrets.AZURE_APP_CONFIGURATION_CONNECTION_STRING }}

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,16 @@ jobs:
2929
with:
3030
ssh-private-key: ${{ secrets.INFRA_TERRAFORM_MODULES_SSH_PRIV_KEY }}
3131

32+
- name: Unlock DEV secrets
33+
uses: sliteteam/[email protected]
34+
env:
35+
GIT_CRYPT_KEY: ${{ secrets.GIT_CRYPT_KEY_DEFAULT }}
36+
3237
- name: build docker
3338
run: make build
3439

3540
- name: Running tests
3641
run: |
37-
chmod -R 777 ./$home
3842
make test
3943
- name: Generate coverage report
4044
env:

‎.prod.env‎

82 Bytes
Binary file not shown.

‎.stage.env‎

36 Bytes
Binary file not shown.

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ cleanup: ## Delete image timetracker_ui
1919

2020
.PHONY: run
2121
run: ## Execute timetracker_ui dev docker containe.
22-
docker-compose --env-file=.dev.env up -d timetracker_ui
22+
docker-compose --env-file=.dev.env up -d timetracker_ui
2323

2424
.PHONY: logs
2525
logs: ## Show logs of timetracker_ui.
@@ -41,7 +41,7 @@ remove: ## Delete container timetracker_ui.
4141
.PHONY: test
4242
test: ## Run all tests on docker container timetracker_ui at the CLI.
4343
docker-compose build timetracker_ui_test
44-
docker-compose up -d timetracker_ui_test
44+
docker-compose --env-file=.dev.env up -d timetracker_ui_test
4545
docker logs -f timetracker_ui_test
4646

4747
.PHONY: testdev

‎README.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,13 @@ In project path, open your favourite command line and run `npm install` in order
5959

6060
# Prepare your environment
6161

62+
### **Local DNS Configuration**
63+
64+
To test the application in a local environment please modify you `/etc/hosts` on Linux/Mac. In Windows `C:\Windows\System32\Drivers\etc\hosts` and add this line:
65+
```text
66+
127.0.0.1 timetracker-dev.ioet.com
67+
```
68+
6269
### Set environment variables
6370
**1**. Using GPG create your key by running this command in your favourite command shell: `gpg --generate-key`.
6471

‎docker-compose.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ services:
33
timetracker_ui:
44
container_name: timetracker_ui
55
image: timetracker_ui
6+
env_file:
7+
- .dev.env
68
build:
79
context: .
810
dockerfile: ./Docker/Dockerfile.dev
@@ -14,6 +16,8 @@ services:
1416
API_URL: ${API_URL}
1517
CLIENT_ID: ${CLIENT_ID}
1618
CLIENT_URL: ${CLIENT_URL}
19+
AUTH_URL: ${AUTH_URL}
20+
AUTH_APP_NAME: ${AUTH_APP_NAME}
1721
SCOPES: ${SCOPES}
1822
STACK_EXCHANGE_ID: ${STACK_EXCHANGE_ID}
1923
STACK_EXCHANGE_ACCESS_TOKEN: ${STACK_EXCHANGE_ACCESS_TOKEN}

‎scripts/populate-keys.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ echo "API_URL='$API_URL'" >> .env
55
echo "AUTHORITY='$AUTHORITY'" >> .env
66
echo "CLIENT_ID='$CLIENT_ID'" >> .env
77
echo "CLIENT_URL='$CLIENT_URL'" >> .env
8+
echo "AUTH_URL='$AUTH_URL'" >> .env
9+
echo "AUTH_APP_NAME='$AUTH_APP_NAME'" >> .env
810
echo "SCOPES='$SCOPES'" >> .env
911
echo "STACK_EXCHANGE_ID='$STACK_EXCHANGE_ID'" >> .env
1012
echo "STACK_EXCHANGE_ACCESS_TOKEN='$STACK_EXCHANGE_ACCESS_TOKEN'" >> .env

0 commit comments

Comments
 (0)