diff --git a/.github/workflows/CD-time-tracker-ui.yml b/.github/workflows/CD-time-tracker-ui.yml index 0bb9ddcf4..5ec92a6b7 100644 --- a/.github/workflows/CD-time-tracker-ui.yml +++ b/.github/workflows/CD-time-tracker-ui.yml @@ -29,6 +29,8 @@ jobs: SCOPES: ${{ secrets.scopes }} CLIENT_ID: ${{ secrets.client_id }} AUTHORITY: ${{ secrets.authority }} + STACK_EXCHANGE_ID: ${{ secrets.stack_exchange_id }} + STACK_EXCHANGE_ACCESS_TOKEN: ${{ secrets.stack_exchange_access_token }} run: sudo sh scripts/populate-keys.sh - name: 'run: npm install and build' @@ -44,10 +46,11 @@ jobs: publish-profile: ${{ secrets.AzureAppService_PublishProfile_728dc744f9384bf38e8a0446aaaee29d }} package: dist/time-tracker + - uses: actions/checkout@v2 - name: Slack Notification - uses: wei/curl@v1 + uses: rtCamp/action-slack-notify@v2.0.0 env: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }} - with: - args: -X POST '$env:SLACK_WEBHOOK' --data '{"message":"A new deployment has been successfully executed"}' - + SLACK_ICON: https://avatars.slack-edge.com/2020-04-14/1055222096486_7b0bf047c32f9f666b69_48.jpg + SLACK_TITLE: 'A new version has been cooked:' + SLACK_USERNAME: 'heisenberg-says:' diff --git a/.github/workflows/CI-mutation-tests.yml b/.github/workflows/CI-mutation-tests.yml index c1ee543a6..264dfe2a5 100644 --- a/.github/workflows/CI-mutation-tests.yml +++ b/.github/workflows/CI-mutation-tests.yml @@ -26,6 +26,8 @@ jobs: SCOPES: ${{ secrets.scopes }} CLIENT_ID: ${{ secrets.client_id }} AUTHORITY: ${{ secrets.authority }} + STACK_EXCHANGE_ID: ${{ secrets.stack_exchange_id }} + STACK_EXCHANGE_ACCESS_TOKEN: ${{ secrets.stack_exchange_access_token }} run: sudo sh scripts/populate-keys.sh - name: Run the test diff --git a/.github/workflows/CI-time-tracker-ui.yml b/.github/workflows/CI-time-tracker-ui.yml index d6e26e465..df3f2c3fa 100644 --- a/.github/workflows/CI-time-tracker-ui.yml +++ b/.github/workflows/CI-time-tracker-ui.yml @@ -44,12 +44,14 @@ jobs: SCOPES: ${{ secrets.scopes }} CLIENT_ID: ${{ secrets.client_id }} AUTHORITY: ${{ secrets.authority }} + STACK_EXCHANGE_ID: ${{ secrets.stack_exchange_id }} + STACK_EXCHANGE_ACCESS_TOKEN: ${{ secrets.stack_exchange_access_token }} run: sudo sh scripts/populate-keys.sh - name: Run the test run: npm run ci-test --if-present - name: Generate coverage report - env: + env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} run: bash <(curl -s https://codecov.io/bash) diff --git a/README.md b/README.md index f1c637de0..7abe9e04a 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,8 @@ Create a file keys.ts with the content pinned in our slack channel: export const AUTHORITY = 'XXX'; export const CLIENT_ID = 'XXX'; export const SCOPES = ['XXX']; +export const STACK_EXCHANGE_ID = 'XXX'; +export const STACK_EXCHANGE_ACCESS_TOKEN = 'XXX'; ``` ### Prepare your environment for vscode diff --git a/package-lock.json b/package-lock.json index 0637d52dc..c590736d2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "time-tracker", - "version": "1.0.4", + "version": "1.0.7", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 1d3e8abef..6af4ef87a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "time-tracker", - "version": "1.0.4", + "version": "1.0.7", "scripts": { "ng": "ng", "start": "ng serve", diff --git a/scripts/populate-keys.sh b/scripts/populate-keys.sh index 66239f278..22eaefb2c 100644 --- a/scripts/populate-keys.sh +++ b/scripts/populate-keys.sh @@ -4,3 +4,5 @@ echo 'export const AUTHORITY = "'$AUTHORITY'";' >> src/environments/keys.ts echo 'export const CLIENT_ID = "'$CLIENT_ID'";' >> src/environments/keys.ts echo 'export const SCOPES = ["'$SCOPES'"];' >> src/environments/keys.ts +echo 'export const STACK_EXCHANGE_ID = "'$STACK_EXCHANGE_ID'";' >> src/environments/keys.ts +echo 'export const STACK_EXCHANGE_ACCESS_TOKEN = "'$STACK_EXCHANGE_ACCESS_TOKEN'";' >> src/environments/keys.ts diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 1c8664b38..89e7d1029 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -32,6 +32,7 @@ import { HomeComponent } from './modules/home/home.component'; import { LoginComponent } from './modules/login/login.component'; import { ActivityEffects } from './modules/activities-management/store/activity-management.effects'; import { ProjectEffects } from './modules/project-management/store/project.effects'; +import { TechnologyEffects } from './modules/shared/store/technology.effects'; import { reducers, metaReducers } from './reducers'; import { environment } from '../environments/environment'; import { CustomerComponent } from './modules/customer-managment/pages/customer.component'; @@ -99,7 +100,7 @@ import { CreateProjectTypeComponent } from './modules/customer-managment/compone maxAge: 15, // Retains last 15 states }) : [], - EffectsModule.forRoot([ProjectEffects, ActivityEffects]), + EffectsModule.forRoot([ProjectEffects, ActivityEffects, TechnologyEffects]), ], providers: [], bootstrap: [AppComponent], diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.html b/src/app/modules/shared/components/details-fields/details-fields.component.html index 66a747528..c894c00c9 100644 --- a/src/app/modules/shared/components/details-fields/details-fields.component.html +++ b/src/app/modules/shared/components/details-fields/details-fields.component.html @@ -36,18 +36,41 @@ aria-describedby="inputGroup-sizing-sm" /> +