diff --git a/src/app/display/commit-tracker/commit-tracker.component.css b/src/app/display/commit-tracker/commit-tracker.component.css index 71d23b8..a6a5e19 100644 --- a/src/app/display/commit-tracker/commit-tracker.component.css +++ b/src/app/display/commit-tracker/commit-tracker.component.css @@ -33,6 +33,19 @@ #db2828 55%); } +.ui.jira-avatar.image { + width: 45px; + height: auto; + /*font-size: 1em;*/ + margin-right: 4px; + margin-bottom: 0; +} + +.ui.jira-avatar.image > img { + border-radius: 4px; +} + + @keyframes label-progress-active { 0% { opacity: 0.5; diff --git a/src/app/display/commit-tracker/commit-tracker.component.html b/src/app/display/commit-tracker/commit-tracker.component.html index e0b27bc..4141b3b 100644 --- a/src/app/display/commit-tracker/commit-tracker.component.html +++ b/src/app/display/commit-tracker/commit-tracker.component.html @@ -13,7 +13,11 @@ - {{commit.owner}} + +
+ +
+ {{commit.gerrit_time}} {{commit.gerrit_change_subject}} {{commit.gerrit_project}} diff --git a/src/app/display/commit-tracker/commit-tracker.component.ts b/src/app/display/commit-tracker/commit-tracker.component.ts index 86ad84a..d448572 100644 --- a/src/app/display/commit-tracker/commit-tracker.component.ts +++ b/src/app/display/commit-tracker/commit-tracker.component.ts @@ -11,8 +11,10 @@ import { Commit } from '../../shared/commit'; import { CommitStatus } from '../../shared/commit-status.enum'; import { Result } from '../../shared/result.enum'; import { Build } from '../../shared/build'; +import { environment } from '../../../environments/environment'; const TIMER_COMMITTRACKER_REFRESH = 10000; +const DEFAULT_AVATAR = '/assets/riddler.png'; @Component({ selector: 'app-commit-tracker', @@ -140,4 +142,8 @@ export class CommitTrackerComponent implements OnInit, OnDestroy { return false; } } + + public avatarUrl(signum: string): string { + return environment.apiUrl + (signum ? `/avatars/${signum}` : DEFAULT_AVATAR); + } } diff --git a/src/app/display/display-routing.module.ts b/src/app/display/display-routing.module.ts index 9525432..37be86f 100644 --- a/src/app/display/display-routing.module.ts +++ b/src/app/display/display-routing.module.ts @@ -51,6 +51,13 @@ const routes: Routes = [ data: { autoSwitchable: true } + }, { + path: 'commit-tracker-fixed', + component: CommitTrackerComponent, + // canActivate: [AuthGuardService, RoleGuardService], + resolve: { + commits: CommitTrackerService, + } }, { path: 'kanban', component: KanbanBoardComponent,