Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
arsnova-lite
Manage
Activity
Members
Labels
Plan
Issues
24
Issue boards
Milestones
Wiki
Code
Merge requests
2
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Privacy
Imprint
Contact
Snippets
Groups
Projects
Show more breadcrumbs
ARSnova
arsnova-lite
Commits
52545eb8
Commit
52545eb8
authored
7 years ago
by
Lukas Mauß
Browse files
Options
Downloads
Patches
Plain Diff
Add loading spinner
Add errorpage for not existing room-links
parent
0f879a39
1 merge request
!64
Resolve "participant home screen - room logic"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/app/participant-room/participant-room.component.html
+6
-2
6 additions, 2 deletions
src/app/participant-room/participant-room.component.html
src/app/participant-room/participant-room.component.ts
+5
-1
5 additions, 1 deletion
src/app/participant-room/participant-room.component.ts
with
11 additions
and
3 deletions
src/app/participant-room/participant-room.component.html
+
6
−
2
View file @
52545eb8
<div
fxLayout=
"column"
fxLayoutAlign=
"start"
fxLayoutGap=
"20px"
fxFill
>
<div
fxLayout=
"column"
fxLayoutAlign=
"start"
fxLayoutGap=
"20px"
fxFill
>
<div
fxLayout=
"row"
fxLayoutAlign=
"center"
>
<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-header>
<mat-card-title><h3
class=
"subheading-2"
>
{{ room.name }}
</h3></mat-card-title>
<mat-card-title><h3
class=
"subheading-2"
>
{{ room.name }}
</h3></mat-card-title>
<mat-card-subtitle>
{{ room.shortId }}
</mat-card-subtitle>
<mat-card-subtitle>
{{ room.shortId }}
</mat-card-subtitle>
...
@@ -13,7 +14,7 @@
...
@@ -13,7 +14,7 @@
</mat-card-content>
</mat-card-content>
<mat-divider></mat-divider>
<mat-divider></mat-divider>
<mat-card-actions>
<mat-card-actions>
<button
mat-icon-button
color=
"primary"
matTooltip=
"Ask something"
routerLink=
"
/
room/{{room
I
d}}/create-comment"
>
<button
mat-icon-button
color=
"primary"
matTooltip=
"Ask something"
routerLink=
"room/{{room
.i
d}}/create-comment"
>
<mat-icon>
question_answer
</mat-icon>
<mat-icon>
question_answer
</mat-icon>
</button>
</button>
<button
mat-icon-button
color=
"primary"
matTooltip=
"Give feedback"
>
<button
mat-icon-button
color=
"primary"
matTooltip=
"Give feedback"
>
...
@@ -30,6 +31,9 @@
...
@@ -30,6 +31,9 @@
</button>
</button>
</mat-card-actions>
</mat-card-actions>
</mat-card>
</mat-card>
<div
*ngIf=
"!isLoading && !room"
>
Error: room could not be found!
</div>
</div>
</div>
<button
mat-button
color=
"primary"
(click)=
"goBack()"
>
Back
</button>
<button
mat-button
color=
"primary"
(click)=
"goBack()"
>
Back
</button>
</div>
</div>
This diff is collapsed.
Click to expand it.
src/app/participant-room/participant-room.component.ts
+
5
−
1
View file @
52545eb8
...
@@ -12,6 +12,7 @@ import { ActivatedRoute } from '@angular/router';
...
@@ -12,6 +12,7 @@ import { ActivatedRoute } from '@angular/router';
export
class
ParticipantRoomComponent
implements
OnInit
{
export
class
ParticipantRoomComponent
implements
OnInit
{
room
:
Room
;
room
:
Room
;
isLoading
=
true
;
constructor
(
private
location
:
Location
,
constructor
(
private
location
:
Location
,
private
roomService
:
RoomService
,
private
roomService
:
RoomService
,
...
@@ -26,7 +27,10 @@ export class ParticipantRoomComponent implements OnInit {
...
@@ -26,7 +27,10 @@ export class ParticipantRoomComponent implements OnInit {
getRoom
(
id
:
string
):
void
{
getRoom
(
id
:
string
):
void
{
this
.
roomService
.
getRoom
(
id
)
this
.
roomService
.
getRoom
(
id
)
.
subscribe
(
room
=>
this
.
room
=
room
);
.
subscribe
(
room
=>
{
this
.
room
=
room
;
this
.
isLoading
=
false
;
});
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment