From 5424f33d1e57b014e54bca2c7b2d82b2cc6611f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Mau=C3=9F?= <lukas.mauss@mni.thm.de>
Date: Thu, 9 May 2019 21:38:30 +0200
Subject: [PATCH] Clean up several components
---
src/app/app.component.html | 2 +-
.../content-edit/content-edit.component.scss | 4 ++--
.../content-list/content-list.component.html | 12 ++++++------
.../content-list/content-list.component.ts | 12 +-----------
.../room-creator-page.component.html | 18 +++++++++---------
.../room-creator-page.component.scss | 4 ++--
.../room-creator-page.component.ts | 2 +-
.../new-landing/new-landing.component.html | 2 +-
.../new-landing/new-landing.component.scss | 1 +
.../room-participant-page.component.html | 9 ++++++---
.../room-participant-page.component.scss | 6 ++++--
.../room-participant-page.component.ts | 3 ++-
.../shared/header/header.component.html | 2 +-
.../shared/header/header.component.scss | 4 ++++
.../shared/header/header.component.ts | 3 +--
.../shared/login/login.component.html | 2 +-
.../shared/login/login.component.scss | 19 ++++++++++++-------
.../shared/login/login.component.ts | 3 +++
.../shared/room-list/room-list.component.html | 2 +-
.../shared/room-list/room-list.component.scss | 1 +
src/app/components/shared/shared.module.ts | 2 --
src/app/components/shared/sort.ts | 18 ------------------
src/assets/i18n/home/de.json | 1 +
src/assets/i18n/home/en.json | 1 +
24 files changed, 62 insertions(+), 71 deletions(-)
delete mode 100644 src/app/components/shared/sort.ts
diff --git a/src/app/app.component.html b/src/app/app.component.html
index 86bb7600d..e69c12c15 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,4 +1,4 @@
- <div [ngClass]="header.themeClass" fxLayout="column" fxFill appTheme>
+ <div fxLayout="column" fxFill appTheme>
<app-header #header></app-header>
<div fxFlex class="app-component">
<router-outlet></router-outlet>
diff --git a/src/app/components/creator/_dialogs/content-edit/content-edit.component.scss b/src/app/components/creator/_dialogs/content-edit/content-edit.component.scss
index a29082c41..16599afe7 100644
--- a/src/app/components/creator/_dialogs/content-edit/content-edit.component.scss
+++ b/src/app/components/creator/_dialogs/content-edit/content-edit.component.scss
@@ -9,8 +9,8 @@ textarea {
}
mat-row {
- background-color: var(--dialog-bg);
- border-color: var(--dialog-bg);
+ background-color: var(--dialog);
+ border-color: var(--dialog);
}
h4 {
diff --git a/src/app/components/creator/content-list/content-list.component.html b/src/app/components/creator/content-list/content-list.component.html
index cff4d03e2..058925e14 100644
--- a/src/app/components/creator/content-list/content-list.component.html
+++ b/src/app/components/creator/content-list/content-list.component.html
@@ -15,22 +15,22 @@
<mat-grid-tile>
<button class="actionButton" mat-icon-button
routerLink="/creator/room/{{ roomId }}/create-content">
- <mat-icon class="actionIcon" matTooltip="{{ 'room-page.create-content' | translate}}">note_add</mat-icon>
- <h3>{{ 'room-page.create-content' | translate}}</h3>
+ <mat-icon class="actionIcon">note_add</mat-icon>
+ <h3 *ngIf="deviceType === 'desktop'">{{ 'room-page.create-content' | translate}}</h3>
</button>
</mat-grid-tile>
<mat-grid-tile>
<button class="actionButton" mat-icon-button
routerLink="/creator/room/{{ roomId }}/{{ contentGroup.name }}/presentation">
- <mat-icon class="actionIcon" matTooltip="{{ 'room-page.present' | translate}}">school</mat-icon>
- <h3>{{ 'room-page.present' | translate}}</h3>
+ <mat-icon class="actionIcon">school</mat-icon>
+ <h3 *ngIf="deviceType === 'desktop'">{{ 'room-page.present' | translate}}</h3>
</button>
</mat-grid-tile>
<mat-grid-tile>
<button class="actionButton" mat-icon-button
routerLink="/creator/room/{{ roomId }}/statistics">
- <mat-icon class="actionIcon" matTooltip="{{ 'room-page.answer-statistics' | translate}}">insert_chart</mat-icon>
- <h3>{{ 'room-page.answer-statistics' | translate}}</h3>
+ <mat-icon class="actionIcon">insert_chart</mat-icon>
+ <h3 *ngIf="deviceType === 'desktop'">{{ 'room-page.answer-statistics' | translate}}</h3>
</button>
</mat-grid-tile>
</mat-grid-list>
diff --git a/src/app/components/creator/content-list/content-list.component.ts b/src/app/components/creator/content-list/content-list.component.ts
index 61e01725e..53651c3b8 100644
--- a/src/app/components/creator/content-list/content-list.component.ts
+++ b/src/app/components/creator/content-list/content-list.component.ts
@@ -15,8 +15,6 @@ import { TranslateService } from '@ngx-translate/core';
import { LanguageService } from '../../../services/util/language.service';
import { ContentDeleteComponent } from '../_dialogs/content-delete/content-delete.component';
import { ContentEditComponent } from '../_dialogs/content-edit/content-edit.component';
-import { InnerSubscriber } from 'rxjs/internal/InnerSubscriber';
-
@Component({
selector: 'app-content-list',
@@ -28,24 +26,16 @@ import { InnerSubscriber } from 'rxjs/internal/InnerSubscriber';
export class ContentListComponent implements OnInit {
contents: Content[];
-
contentBackup: Content;
-
contentCBackup: ContentChoice;
-
roomId: string;
-
contentGroup: ContentGroup;
-
room: Room;
-
isLoading = true;
-
collectionName: string;
-
labelMaxLength: number;
-
labels: string[] = [];
+ deviceType = localStorage.getItem('deviceType');
constructor(private contentService: ContentService,
private roomService: RoomService,
diff --git a/src/app/components/creator/room-creator-page/room-creator-page.component.html b/src/app/components/creator/room-creator-page/room-creator-page.component.html
index 7ed3e22ab..142c359d1 100644
--- a/src/app/components/creator/room-creator-page/room-creator-page.component.html
+++ b/src/app/components/creator/room-creator-page/room-creator-page.component.html
@@ -1,4 +1,4 @@
-<div fxLayout="column" fxLayoutAlign="center" fxLayoutGap="20px" fxFill [ngClass]="themeClass">
+<div fxLayout="column" fxLayoutAlign="center" fxLayoutGap="20px" fxFill>
<div fxLayout="row" fxLayoutAlign="center">
<mat-progress-spinner *ngIf="isLoading" color="accent" mode="indeterminate"></mat-progress-spinner>
<mat-card *ngIf="room">
@@ -34,30 +34,30 @@
<mat-grid-tile colspan="1" rowspan="1">
<button mat-icon-button
routerLink="/creator/room/{{ room.shortId }}/create-content">
- <mat-icon matTooltip="{{ 'room-page.create-content' | translate}}">note_add</mat-icon>
- <h3>{{ 'room-page.create-content' | translate}}</h3>
+ <mat-icon>note_add</mat-icon>
+ <h3 *ngIf="deviceType === 'desktop'">{{ 'room-page.create-content' | translate}}</h3>
</button>
</mat-grid-tile>
<mat-grid-tile>
<button mat-icon-button
routerLink="/creator/room/{{ room.shortId }}/comments">
- <mat-icon matTooltip="{{ 'room-page.comments' | translate}}">question_answer</mat-icon>
- <h3>{{ 'room-page.comments' | translate}}</h3>
+ <mat-icon>question_answer</mat-icon>
+ <h3 *ngIf="deviceType === 'desktop'">{{ 'room-page.comments' | translate}}</h3>
</button>
</mat-grid-tile>
</mat-grid-list>
<mat-grid-list cols="2" rowHeight="2:1">
<mat-grid-tile>
<button mat-icon-button routerLink="/creator/room/{{ room.shortId }}/statistics">
- <mat-icon matTooltip="{{ 'room-page.answer-statistics' | translate}}">insert_chart</mat-icon>
- <h3>{{ 'room-page.answer-statistics' | translate}}</h3>
+ <mat-icon>insert_chart</mat-icon>
+ <h3 *ngIf="deviceType === 'desktop'">{{ 'room-page.answer-statistics' | translate}}</h3>
</button>
</mat-grid-tile>
<mat-grid-tile>
<button mat-icon-button routerLink="/creator/room/{{ room.shortId }}/feedback-barometer">
- <mat-icon class="smallerIcon" matTooltip="{{ 'room-page.live-feedback' | translate}}">thumbs_up_down
+ <mat-icon class="smallerIcon">thumbs_up_down
</mat-icon>
- <h3>{{ 'room-page.live-feedback' | translate}}</h3>
+ <h3 *ngIf="deviceType === 'desktop'">{{ 'room-page.live-feedback' | translate}}</h3>
</button>
</mat-grid-tile>
</mat-grid-list>
diff --git a/src/app/components/creator/room-creator-page/room-creator-page.component.scss b/src/app/components/creator/room-creator-page/room-creator-page.component.scss
index 736f57612..c506cd16b 100644
--- a/src/app/components/creator/room-creator-page/room-creator-page.component.scss
+++ b/src/app/components/creator/room-creator-page/room-creator-page.component.scss
@@ -12,14 +12,14 @@ mat-card-content > :first-child {
button {
width: 30%;
- transition: all 0.5s;
+ transition: all 0.3s;
&:hover {
transform: scale(1.25)
}
}
#description {
- margin-bottom: 0px;
+ margin-bottom: 0;
}
.mat-icon-button {
diff --git a/src/app/components/creator/room-creator-page/room-creator-page.component.ts b/src/app/components/creator/room-creator-page/room-creator-page.component.ts
index ac34846cd..8f85d6e28 100644
--- a/src/app/components/creator/room-creator-page/room-creator-page.component.ts
+++ b/src/app/components/creator/room-creator-page/room-creator-page.component.ts
@@ -19,9 +19,9 @@ import { TSMap } from 'typescript-map';
export class RoomCreatorPageComponent extends RoomPageComponent implements OnInit {
room: Room;
updRoom: Room;
- themeClass = localStorage.getItem('classNameOfTheme');
commentThreshold: number;
updCommentThreshold: number;
+ deviceType = localStorage.getItem('deviceType');
constructor(protected roomService: RoomService,
protected notification: NotificationService,
diff --git a/src/app/components/home/new-landing/new-landing.component.html b/src/app/components/home/new-landing/new-landing.component.html
index dcc8cccfa..c9731f48b 100644
--- a/src/app/components/home/new-landing/new-landing.component.html
+++ b/src/app/components/home/new-landing/new-landing.component.html
@@ -1,6 +1,6 @@
<div fxLayout="column" fxLayoutAlign="center center" fxlayoutgap="20px" fxFill>
<app-room-join></app-room-join>
- <button mat-fab class="fab-extended" color="primary" (click)="createSession()">
+ <button mat-fab class="fab-extended" (click)="createSession()">
<mat-icon class="add">add</mat-icon>
{{'home-page.create-session' | translate}}
</button>
diff --git a/src/app/components/home/new-landing/new-landing.component.scss b/src/app/components/home/new-landing/new-landing.component.scss
index f43f1a749..fd55c4f74 100644
--- a/src/app/components/home/new-landing/new-landing.component.scss
+++ b/src/app/components/home/new-landing/new-landing.component.scss
@@ -4,6 +4,7 @@
border-radius: 32px;
margin-bottom: 5%;
font-size: large;
+ background-color: var(--primary);
}
.add {
diff --git a/src/app/components/participant/room-participant-page/room-participant-page.component.html b/src/app/components/participant/room-participant-page/room-participant-page.component.html
index 5d13c6f91..685e9034d 100644
--- a/src/app/components/participant/room-participant-page/room-participant-page.component.html
+++ b/src/app/components/participant/room-participant-page/room-participant-page.component.html
@@ -24,17 +24,20 @@
<mat-grid-list cols="3" rowHeight="2:1">
<mat-grid-tile>
<button mat-icon-button routerLink="/participant/room/{{ room.shortId }}/comments">
- <mat-icon matTooltip="{{ 'room-page.create-comment' | translate}}">question_answer</mat-icon>
+ <mat-icon>question_answer</mat-icon>
+ <h3 *ngIf="deviceType === 'desktop'">{{ 'room-page.create-comment' | translate}}</h3>
</button>
</mat-grid-tile>
<mat-grid-tile>
<button mat-icon-button routerLink="/participant/room/{{ room.shortId }}/feedback-barometer">
- <mat-icon matTooltip="{{ 'room-page.give-feedback' | translate}}">thumbs_up_down</mat-icon>
+ <mat-icon>thumbs_up_down</mat-icon>
+ <h3 *ngIf="deviceType === 'desktop'">{{ 'room-page.give-feedback' | translate}}</h3>
</button>
</mat-grid-tile>
<mat-grid-tile>
<button mat-icon-button routerLink="/participant/room/{{ room.shortId }}/statistics">
- <mat-icon matTooltip="{{ 'statistic.answer-statistic' | translate}}">insert_chart</mat-icon>
+ <mat-icon>insert_chart</mat-icon>
+ <h3 *ngIf="deviceType === 'desktop'">{{ 'statistic.answer-statistic' | translate}}</h3>
</button>
</mat-grid-tile>
</mat-grid-list>
diff --git a/src/app/components/participant/room-participant-page/room-participant-page.component.scss b/src/app/components/participant/room-participant-page/room-participant-page.component.scss
index 69002181e..ed7e5887a 100644
--- a/src/app/components/participant/room-participant-page/room-participant-page.component.scss
+++ b/src/app/components/participant/room-participant-page/room-participant-page.component.scss
@@ -13,7 +13,7 @@ mat-card-content>:first-child {
.mat-icon-button {
width: 75%;
height: 75%;
- margin-bottom: 20px;
+ margin-bottom: 10px;
color: var(--primary)!important;
}
@@ -26,7 +26,7 @@ mat-icon {
button {
width: 30%;
- transition: all 0.5s;
+ transition: all 0.3s;
&:hover {
transform: scale(1.25)
@@ -46,6 +46,8 @@ h2 {
h3 {
font-size: larger;
color: var(--text-3)!important;
+ margin-top: 10px;
+ margin-bottom: 10px;
}
h4 {
diff --git a/src/app/components/participant/room-participant-page/room-participant-page.component.ts b/src/app/components/participant/room-participant-page/room-participant-page.component.ts
index 5f15bb311..69244c222 100644
--- a/src/app/components/participant/room-participant-page/room-participant-page.component.ts
+++ b/src/app/components/participant/room-participant-page/room-participant-page.component.ts
@@ -15,7 +15,8 @@ export class RoomParticipantPageComponent implements OnInit {
room: Room;
isLoading = true;
- themeClass = localStorage.getItem('classNameOfTheme');
+ deviceType = localStorage.getItem('deviceType');
+
constructor(private location: Location,
private roomService: RoomService,
diff --git a/src/app/components/shared/header/header.component.html b/src/app/components/shared/header/header.component.html
index 3557efb89..3630af2b2 100644
--- a/src/app/components/shared/header/header.component.html
+++ b/src/app/components/shared/header/header.component.html
@@ -1,4 +1,4 @@
-<mat-toolbar color="primary">
+<mat-toolbar>
<mat-toolbar-row>
<button *ngIf="router.url !== '/home'" (click)="goBack()" mat-icon-button>
<mat-icon aria-label="Go back">keyboard_arrow_left</mat-icon>
diff --git a/src/app/components/shared/header/header.component.scss b/src/app/components/shared/header/header.component.scss
index b6d58aaad..b1e7f6dd4 100644
--- a/src/app/components/shared/header/header.component.scss
+++ b/src/app/components/shared/header/header.component.scss
@@ -2,3 +2,7 @@
cursor: pointer;
margin: 0 auto;
}
+
+mat-toolbar {
+ background-color: var(--primary);
+}
diff --git a/src/app/components/shared/header/header.component.ts b/src/app/components/shared/header/header.component.ts
index 1ba5921eb..0314511fc 100644
--- a/src/app/components/shared/header/header.component.ts
+++ b/src/app/components/shared/header/header.component.ts
@@ -79,8 +79,7 @@ export class HeaderComponent implements OnInit {
const dialogRef = this.dialog.open(LoginComponent, {
width: '350px'
});
- const role = (isDozent === true) ? UserRole.CREATOR : UserRole.PARTICIPANT;
- dialogRef.componentInstance.role = role;
+ dialogRef.componentInstance.role = (isDozent === true) ? UserRole.CREATOR : UserRole.PARTICIPANT;
dialogRef.componentInstance.isStandard = true;
}
diff --git a/src/app/components/shared/login/login.component.html b/src/app/components/shared/login/login.component.html
index 01e85e02d..055c6116e 100644
--- a/src/app/components/shared/login/login.component.html
+++ b/src/app/components/shared/login/login.component.html
@@ -24,7 +24,7 @@
</button>
</div>
<div fxLayout="row">
- <p>Noch keinen Account?</p>
+ <p>{{ 'login-page.not-registered' | translate }}</p>
<button mat-button color="primary" class="regButton" (click)="openRegisterDialog()">
{{ 'login-page.register' | translate }}
</button>
diff --git a/src/app/components/shared/login/login.component.scss b/src/app/components/shared/login/login.component.scss
index bdb5da25a..979c20185 100644
--- a/src/app/components/shared/login/login.component.scss
+++ b/src/app/components/shared/login/login.component.scss
@@ -1,16 +1,21 @@
.pwReset {
- padding-left: 0px;
+ padding-left: 0;
}
.regButton {
margin-top: 20px;
- padding: 0px;
+ padding: 0;
}
p {
font-size: small;
- margin-bottom: 0px;
- margin-top: 30px;
- margin-left: 30px;
- margin-right: 5px;
-}
\ No newline at end of file
+ margin: 30px 5px 0 30px;
+}
+
+input:-webkit-autofill {
+ background-color: var(--dialog);
+ -webkit-box-shadow: 0 0 0 1000px var(--dialog) inset;
+}
+
+
+
diff --git a/src/app/components/shared/login/login.component.ts b/src/app/components/shared/login/login.component.ts
index e05319c15..9bda7d3ea 100644
--- a/src/app/components/shared/login/login.component.ts
+++ b/src/app/components/shared/login/login.component.ts
@@ -9,6 +9,7 @@ import { TranslateService } from '@ngx-translate/core';
import { UserActivationComponent } from '../../home/_dialogs/user-activation/user-activation.component';
import { PasswordResetComponent } from '../../home/_dialogs/password-reset/password-reset.component';
import { RegisterComponent } from '../../home/_dialogs/register/register.component';
+import { ThemeService } from '../../../../theme/theme.service';
export class LoginErrorStateMatcher implements ErrorStateMatcher {
isErrorState(control: FormControl | null, form: FormGroupDirective | NgForm | null): boolean {
@@ -40,6 +41,7 @@ export class LoginComponent implements OnInit, OnChanges {
public router: Router,
private translationService: TranslateService,
public notificationService: NotificationService,
+ private themeService: ThemeService,
public dialog: MatDialog,
@Inject(MAT_DIALOG_DATA) public data: any) {
}
@@ -105,6 +107,7 @@ export class LoginComponent implements OnInit, OnChanges {
if (this.isStandard) {
if (this.role === UserRole.CREATOR) {
this.router.navigate(['creator']);
+ this.themeService.setActiveThem('dark');
} else {
this.router.navigate(['participant']);
}
diff --git a/src/app/components/shared/room-list/room-list.component.html b/src/app/components/shared/room-list/room-list.component.html
index f15e37d88..cc6dbe0a5 100644
--- a/src/app/components/shared/room-list/room-list.component.html
+++ b/src/app/components/shared/room-list/room-list.component.html
@@ -7,7 +7,7 @@
</mat-expansion-panel>
<mat-expansion-panel *ngFor="let room of rooms" class="matPanel">
<mat-expansion-panel-header class="matPanelListHeader">
- <button mat-button color="primary" routerLink="/{{ baseUrl }}/room/{{ room.shortId }}">
+ <button mat-button routerLink="/{{ baseUrl }}/room/{{ room.shortId }}">
<mat-icon>input</mat-icon>
</button>
<mat-panel-title class="panelTitle">
diff --git a/src/app/components/shared/room-list/room-list.component.scss b/src/app/components/shared/room-list/room-list.component.scss
index 18633b2de..476d30188 100644
--- a/src/app/components/shared/room-list/room-list.component.scss
+++ b/src/app/components/shared/room-list/room-list.component.scss
@@ -1,5 +1,6 @@
button {
margin-right: 10px;
+ color: var(--primary);
}
.mat-expansion-panel-header-description {
diff --git a/src/app/components/shared/shared.module.ts b/src/app/components/shared/shared.module.ts
index d8b7e6719..13a09ef9f 100644
--- a/src/app/components/shared/shared.module.ts
+++ b/src/app/components/shared/shared.module.ts
@@ -23,7 +23,6 @@ import { LoginComponent } from './login/login.component';
import { StatisticHelpComponent } from './_dialogs/statistic-help/statistic-help.component';
import { CommentComponent } from './comment/comment.component';
import { SubmitCommentComponent } from './_dialogs/submit-comment/submit-comment.component';
-import { OrderBy } from './sort';
import { PresentCommentComponent } from './_dialogs/present-comment/present-comment.component';
@NgModule({
@@ -55,7 +54,6 @@ import { PresentCommentComponent } from './_dialogs/present-comment/present-comm
StatisticHelpComponent,
CommentComponent,
SubmitCommentComponent,
- OrderBy,
PresentCommentComponent
],
exports: [
diff --git a/src/app/components/shared/sort.ts b/src/app/components/shared/sort.ts
deleted file mode 100644
index 57bbe8fee..000000000
--- a/src/app/components/shared/sort.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Pipe, PipeTransform } from '@angular/core';
-
-@Pipe({
- name: 'orderBy'
-})
-
-export class OrderBy implements PipeTransform {
- transform(array: Array<string>, args: string): Array<string> {
- array.sort((a: any, b: any) => {
- if (a[args] > b[args]) {
- return -1;
- } else if (a[args] <= b[args]) {
- return 1;
- }
- });
- return array;
- }
-}
diff --git a/src/assets/i18n/home/de.json b/src/assets/i18n/home/de.json
index 0d9bd5084..1ed277ca5 100644
--- a/src/assets/i18n/home/de.json
+++ b/src/assets/i18n/home/de.json
@@ -15,6 +15,7 @@
"creator": "Dozent/in",
"participant": "Student/in",
"password-reset": "Passwort vergessen?",
+ "not-registered": "Noch keinen Account?",
"register": "Registrieren",
"welcome": "Willkommen bei"
},
diff --git a/src/assets/i18n/home/en.json b/src/assets/i18n/home/en.json
index e87024f24..5ab2a6694 100644
--- a/src/assets/i18n/home/en.json
+++ b/src/assets/i18n/home/en.json
@@ -15,6 +15,7 @@
"creator": "Lecturer",
"participant": "Student",
"password-reset": "Forgot your password?",
+ "not-registered": "Don't have an account yet?",
"register": "Register",
"welcome": "Welcome to"
},
--
GitLab