Skip to content

Commit ab06c75

Browse files
committed
refactor: TTA-196 Merge branch 'master' into TTA-196-duration-column-formatting-ui
2 parents d433bda + 4f51335 commit ab06c75

37 files changed

+301
-32996
lines changed

.dev.env

139 Bytes
Binary file not shown.
300 Bytes
Binary file not shown.
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

64 Bytes
Binary file not shown.

.stage.env

84 Bytes
Binary file not shown.

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ build: ## Create docker image with dependencies needed for development.
1414
docker-compose build timetracker_ui
1515

1616
.PHONY: cleanup
17-
cleanup: ## Delete image timetracker_ui
17+
cleanup: ## Delete image timetracker_ui.
1818
docker rmi timetracker_ui
1919

2020
.PHONY: run
21-
run: ## Execute timetracker_ui dev docker containe.
22-
docker-compose --env-file=.dev.env up -d timetracker_ui
21+
run: ## Execute timetracker_ui dev docker container.
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

0 commit comments

Comments
 (0)