Skip to content
This repository was archived by the owner on Aug 1, 2021. It is now read-only.

Commit f48038a

Browse files
Merge pull request #35 from brunohbrito/dev
Update spinner
2 parents 006f4a9 + 7062bef commit f48038a

File tree

2 files changed

+29
-12
lines changed

2 files changed

+29
-12
lines changed

src/Frontend/Jp.AdminUI/src/app/shared/layout/header/notifications/notifications.component.html

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,34 @@
33
<!-- START list group-->
44
<div class="list-group">
55
<!-- list item-->
6-
<div class="list-group-item list-group-item-action" *ngFor="let notification of notifications | async">
7-
<div class="media">
8-
<div class="align-self-start mr-2">
9-
<em class="fa-2x" [ngClass]="notification.icon"></em>
10-
</div>
11-
<div class="media-body">
12-
<p class="m-0">{{notification.title}}</p>
13-
<p class="m-0 text-muted text-sm">{{notification.description}}</p>
14-
</div>
6+
<div *ngIf="notifications$ | async as notifications; else loading">
7+
<div class="list-group-item list-group-item-action" *ngFor="let notification of notifications">
8+
<div class="media">
9+
<div class="align-self-start mr-2">
10+
<em class="fa-2x" [ngClass]="notification.icon"></em>
11+
</div>
12+
<div class="media-body">
13+
<p class="m-0">{{notification.title}}</p>
14+
<p class="m-0 text-muted text-sm">{{notification.description}}</p>
15+
</div>
16+
</div>
1517
</div>
16-
</div>
18+
</div>
19+
<ng-template #loading>
20+
<div class="list-group-item list-group-item-action">
21+
<div class="media">
22+
<div class="media-body text-center">
23+
<div class="ball-pulse">
24+
<div></div>
25+
<div></div>
26+
<div></div>
27+
</div>
28+
</div>
29+
</div>
30+
</div>
31+
</ng-template>
32+
33+
1734
<!-- last list item-->
1835
<div class="list-group-item list-group-item-action">
1936
<span class="d-flex align-items-center">

src/Frontend/Jp.AdminUI/src/app/shared/layout/header/notifications/notifications.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ import { Observable, of } from 'rxjs';
1010
})
1111
export class NotificationsComponent implements OnInit {
1212

13-
notifications: Observable<Array<NotificationViewModel>>;
13+
notifications$: Observable<Array<NotificationViewModel>>;
1414

1515
constructor(private http: HttpClient) { }
1616

1717
ngOnInit() {
1818
//this.notifications = of<Array<NotificationViewModel>>( JSON.parse('{"notifications":[{"icon":"text-info fas fa-kiwi-bird","title":"Session","description":"2019-05 UI Session improvements"},{"icon":"text-warning fab fa-docker","title":"Docker","description":"2019-04 Docker Ready"},{"icon":"text-info fas fa-code-branch","title":"NET Core 2.2","description":"2019-03 Updated to ASP.NET Core 2.2"},{"icon":"text-success fas fa-id-card","title":"ID4","description":"2019-03 IdentityServer4 2.4 Components"},{"icon":"text-info fas fa-rocket","title":"Launch","description":"2018-10 first release"}]}').notifications);
19-
this.notifications = this.http.get<NotificationViewModel[]>('my-json-server.typicode.com/brunohbrito/JPProject.IdentityServer4.AdminUI/notifications');
19+
this.notifications$ = this.http.get<NotificationViewModel[]>('https://my-json-server.typicode.com/brunohbrito/JPProject.IdentityServer4.AdminUI/notifications');
2020
}
2121

2222
}

0 commit comments

Comments
 (0)