Merge branch 'master' into TTA-196-duration-column-formatting-ui

Author: mmaquina

.dev.env

@@ -34,8 +34,6 @@ jobs:
         CLIENT_ID: ${{ secrets.client_id }}
         CLIENT_URL: ${{ secrets.client_url }}
         STACK_EXCHANGE_ID: ${{ secrets.stack_exchange_id }}
-        AUTH_URL: ${{ secrets.AUTH_URL }}
-        AUTH_APP_NAME: ${{ secrets.AUTH_APP_NAME }}
         STACK_EXCHANGE_ACCESS_TOKEN: ${{ secrets.stack_exchange_access_token }}
         AZURE_APP_CONFIGURATION_CONNECTION_STRING: ${{ secrets.azure_app_configuration_connection_string }}
       run: |

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

@@ -46,8 +46,6 @@ jobs:
         SCOPES: ${{ secrets.SCOPES }}
         CLIENT_ID: ${{ secrets.CLIENT_ID }}
         CLIENT_URL : ${{ secrets.CLIENT_URL }}
-        AUTH_URL: ${{ secrets.AUTH_URL }}
-        AUTH_APP_NAME: ${{ secrets.AUTH_APP_NAME }}
         STACK_EXCHANGE_ID: ${{ secrets.STACK_EXCHANGE_ID }}
         STACK_EXCHANGE_ACCESS_TOKEN: ${{ secrets.STACK_EXCHANGE_ACCESS_TOKEN }}
         AZURE_APP_CONFIGURATION_CONNECTION_STRING: ${{ secrets.AZURE_APP_CONFIGURATION_CONNECTION_STRING }}

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

@@ -29,16 +29,12 @@ jobs:
       with:
         ssh-private-key: ${{ secrets.INFRA_TERRAFORM_MODULES_SSH_PRIV_KEY }}
 
-    - name: Unlock DEV secrets
-      uses: sliteteam/[email protected]
-      env:
-        GIT_CRYPT_KEY: ${{ secrets.GIT_CRYPT_KEY_DEFAULT }}
-
     - name: build docker
       run: make build
 
     - name: Running tests
       run: |
+        chmod -R 777 ./$home
         make test
     - name: Generate coverage report
       env:

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

@@ -41,7 +41,7 @@ remove: ## Delete container timetracker_ui.
 .PHONY: test
 test: ## Run all tests on docker container timetracker_ui at the CLI.
 	docker-compose build timetracker_ui_test
-	docker-compose --env-file=.dev.env up -d timetracker_ui_test
+	docker-compose up -d timetracker_ui_test
 	docker logs -f timetracker_ui_test
 
 .PHONY: testdev
@@ -85,7 +85,7 @@ publish_prod: ## Upload a docker image to the prod azure container registry acr=
 	docker push $(acr).azurecr.io/timetracker_ui:$(image_tag)
 
 .PHONY: login
-login: ## Login in respository of docker images.
+login: ## Login in respository of docker images
 	az acr login --name $(acr)
 
 .PHONY: release

.prod.env

@@ -59,13 +59,6 @@ In project path, open your favourite command line and run `npm install` in order
 
 # Prepare your environment
 
-### **Local DNS Configuration**
-
-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:
-```text
-127.0.0.1 timetracker-dev.ioet.com
-```
-
 ### Set environment variables
 **1**. Using GPG create your key by running this command in your favourite command shell: `gpg --generate-key`.
 

.stage.env

@@ -3,8 +3,6 @@ services:
   timetracker_ui:
     container_name: timetracker_ui
     image: timetracker_ui
-    env_file:
-      - .dev.env
     build:
       context: .
       dockerfile: ./Docker/Dockerfile.dev
@@ -16,8 +14,6 @@ services:
       API_URL: ${API_URL}
       CLIENT_ID: ${CLIENT_ID}
       CLIENT_URL: ${CLIENT_URL}
-      AUTH_URL: ${AUTH_URL}
-      AUTH_APP_NAME: ${AUTH_APP_NAME}
       SCOPES: ${SCOPES}
       STACK_EXCHANGE_ID: ${STACK_EXCHANGE_ID}
       STACK_EXCHANGE_ACCESS_TOKEN: ${STACK_EXCHANGE_ACCESS_TOKEN}