From 52545eb84682ed46252884586beb97c9cc077e6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Mau=C3=9F?= <lukas.mauss@mni.thm.de>
Date: Fri, 9 Mar 2018 12:21:09 +0100
Subject: [PATCH] Add loading spinner Add errorpage for not existing room-links
---
src/app/participant-room/participant-room.component.html | 8 ++++++--
src/app/participant-room/participant-room.component.ts | 6 +++++-
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/app/participant-room/participant-room.component.html b/src/app/participant-room/participant-room.component.html
index c5cfec539..250352b27 100644
--- a/src/app/participant-room/participant-room.component.html
+++ b/src/app/participant-room/participant-room.component.html
@@ -1,6 +1,7 @@
<div fxLayout="column" fxLayoutAlign="start" fxLayoutGap="20px" fxFill>
<div fxLayout="row" fxLayoutAlign="center">
- <mat-card>
+ <mat-progress-spinner *ngIf="isLoading" mode="indeterminate"></mat-progress-spinner>
+ <mat-card *ngIf="room">
<mat-card-header>
<mat-card-title><h3 class="subheading-2">{{ room.name }}</h3></mat-card-title>
<mat-card-subtitle>{{ room.shortId }}</mat-card-subtitle>
@@ -13,7 +14,7 @@
</mat-card-content>
<mat-divider></mat-divider>
<mat-card-actions>
- <button mat-icon-button color="primary" matTooltip="Ask something" routerLink="/room/{{roomId}}/create-comment">
+ <button mat-icon-button color="primary" matTooltip="Ask something" routerLink="room/{{room.id}}/create-comment">
<mat-icon>question_answer</mat-icon>
</button>
<button mat-icon-button color="primary" matTooltip="Give feedback">
@@ -30,6 +31,9 @@
</button>
</mat-card-actions>
</mat-card>
+ <div *ngIf="!isLoading && !room">
+ Error: room could not be found!
+ </div>
</div>
<button mat-button color="primary" (click)="goBack()">Back</button>
</div>
diff --git a/src/app/participant-room/participant-room.component.ts b/src/app/participant-room/participant-room.component.ts
index 5d3edd75e..f78016239 100644
--- a/src/app/participant-room/participant-room.component.ts
+++ b/src/app/participant-room/participant-room.component.ts
@@ -12,6 +12,7 @@ import { ActivatedRoute } from '@angular/router';
export class ParticipantRoomComponent implements OnInit {
room: Room;
+ isLoading = true;
constructor(private location: Location,
private roomService: RoomService,
@@ -26,7 +27,10 @@ export class ParticipantRoomComponent implements OnInit {
getRoom(id: string): void {
this.roomService.getRoom(id)
- .subscribe(room => this.room = room);
+ .subscribe(room => {
+ this.room = room;
+ this.isLoading = false;
+ });
}
--
GitLab