-
Notifications
You must be signed in to change notification settings - Fork 1
feat: TT-430 read activities localhost #771
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
a8db62d
feature: TT-430 list and edit status of activities
mandres2015 97e8664
feature: TT-430 hide add new activity in production
mandres2015 edaae8f
feat: TT-430 tests added and environment production enabled
mandres2015 4007a5e
feat: TT-430 column status change in prod or dev mode and delete is m…
mandres2015 f8c7bfa
fix: TT-413 show projects when you do not have the latest projects (#…
ararcos 66e1f58
chore(release): 1.52.6 [skip ci]nn
semantic-release-bot 9c932c3
feat: TT-430 tests added and environment production enabled
mandres2015 8fc28ce
fix: TT-430 rebase with master
mandres2015 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 10 additions & 4 deletions
14
src/app/modules/activities-management/pages/activities-management.component.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,14 @@ | ||
| <div class="col-12 col-md-9 px-0"> | ||
| <div class="hidden"> | ||
| <div class="col-12 px-0"> | ||
| <div *ngIf="showOptionInDevelopment"> | ||
| <app-create-activity | ||
| [showActivityForm]="showActivityForm" (changeValueShowActivityForm)="showActivityForm = $event"></app-create-activity> | ||
| [showActivityForm]="showActivityForm" | ||
| (changeValueShowActivityForm)="showActivityForm = $event" | ||
| > | ||
| </app-create-activity> | ||
| </div> | ||
| <app-activity-list | ||
| (changeValueShowActivityForm)="showActivityForm = $event"></app-activity-list> | ||
| [showOptionInDevelopment]="showOptionInDevelopment" | ||
| (changeValueShowActivityForm)="showActivityForm = $event" | ||
| > | ||
| </app-activity-list> | ||
| </div> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 15 additions & 2 deletions
17
src/app/modules/activities-management/pages/activities-management.component.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,22 @@ | ||
| import { Component, Input } from '@angular/core'; | ||
| import { Component, Input, OnInit } from '@angular/core'; | ||
| import { environment } from 'src/environments/environment'; | ||
|
|
||
| @Component({ | ||
| selector: 'app-activities-management', | ||
| templateUrl: './activities-management.component.html', | ||
| styleUrls: ['./activities-management.component.scss'], | ||
| }) | ||
| export class ActivitiesManagementComponent { | ||
| export class ActivitiesManagementComponent implements OnInit { | ||
| @Input() showActivityForm: boolean; | ||
| showOptionInDevelopment = true; | ||
|
|
||
| ngOnInit() { | ||
| this.showOption(); | ||
| } | ||
|
|
||
| showOption(): void { | ||
| if (environment.production){ | ||
| this.showOptionInDevelopment = false; | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,32 @@ | ||
| import * as keys from './keys'; | ||
|
|
||
| export const environment = { | ||
| production: true | ||
| production: true, | ||
| timeTrackerApiUrl: 'https://timetracker-api.azurewebsites.net', | ||
| stackexchangeApiUrl: 'https://api.stackexchange.com', | ||
| }; | ||
|
|
||
| export const AUTHORITY = keys.AUTHORITY; | ||
| export const CLIENT_ID = keys.CLIENT_ID; | ||
| export const SCOPES = keys.SCOPES; | ||
| export const ITEMS_PER_PAGE = 5; | ||
| export const STACK_EXCHANGE_ID = keys.STACK_EXCHANGE_ID; | ||
| export const STACK_EXCHANGE_ACCESS_TOKEN = keys.STACK_EXCHANGE_ACCESS_TOKEN; | ||
| export const AZURE_APP_CONFIGURATION_CONNECTION_STRING = keys.AZURE_APP_CONFIGURATION_CONNECTION_STRING; | ||
| export const DATE_FORMAT = 'yyyy-MM-dd'; | ||
| export const DATE_FORMAT_YEAR = 'YYYY-MM-DD'; | ||
| export const GROUPS = { | ||
| ADMIN: 'time-tracker-admin', | ||
| TESTER: 'time-tracker-tester', | ||
| }; | ||
|
|
||
| export const ROLES = { | ||
| admin: { | ||
| name: 'admin', | ||
| value: 'time-tracker-admin', | ||
| }, | ||
| tester: { | ||
| name: 'test', | ||
| value: 'time-tracker-tester', | ||
| }, | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.