From 11cf4bcb69b78ff4321dace59b100e03db10349c Mon Sep 17 00:00:00 2001
From: Lukas Kimpel <lukas.kimpel@mni.thm.de>
Date: Tue, 20 Mar 2018 14:48:40 +0100
Subject: [PATCH] Fix imports Remove unwanted imports and functions Fix tslint
---
src/app/app-routing.module.ts | 4 +++-
src/app/app.module.ts | 8 +++-----
.../dialogs/password-reset/password-reset.component.ts | 4 ++--
src/app/components/dialogs/register/register.component.ts | 5 ++---
.../creator-text-content.component.ts | 4 ++--
.../pages/creator-room/creator-room.component.ts | 8 --------
.../pages/login-screen/login-screen.component.ts | 6 +++---
7 files changed, 15 insertions(+), 24 deletions(-)
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index cc72673fa..38fd8da0e 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -14,7 +14,9 @@ import { ContentListComponent } from './components/fragments/content-list/conten
import { ContentDetailComponent } from './components/pages/content-detail/content-detail.component';
import { AnswerStatisticsComponent } from './components/fragments/answer-statistics/answer-statistics.component';
import { AddContentComponent } from './components/pages/add-content/add-content.component';
-import { ParticipantContentCarouselPageComponent } from './components/pages/participant-content-carousel-page/participant-content-carousel-page.component';
+import {
+ ParticipantContentCarouselPageComponent
+} from './components/pages/participant-content-carousel-page/participant-content-carousel-page.component';
const routes: Routes = [
{
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 89cfdec93..540d7c0fd 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -47,7 +47,6 @@ import {
MatToolbarModule,
MatTooltipModule
} from '@angular/material';
-import { ContentAnswersComponent } from './content-answers/content-answers.component';
import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
import { RoomComponent } from './components/pages/room/room.component';
import { RoomCreationComponent } from './components/dialogs/room-creation/room-creation.component';
@@ -55,7 +54,6 @@ import { LoginScreenComponent } from './components/pages/login-screen/login-scre
import { NotificationService } from './services/util/notification.service';
import { AuthenticationService } from './services/http/authentication.service';
import { AuthenticationGuard } from './guards/authentication.guard';
-import { ContentCreationComponent } from './content-creation/content-creation.component';
import { RoomService } from './services/http/room.service';
import { RoomListComponent } from './components/fragments/room-list/room-list.component';
import { CreatorHomeScreenComponent } from './components/pages/creator-home-screen/creator-home-screen.component';
@@ -76,7 +74,9 @@ import { RoomModificationComponent } from './components/dialogs/room-modificatio
import { ParticipantChoiceContentComponent } from './components/fragments/participant-choice-content/participant-choice-content.component';
import { CreatorChoiceContentComponent } from './components/fragments/creator-choice-content/creator-choice-content.component';
import { AddContentComponent } from './components/pages/add-content/add-content.component';
-import { ParticipantContentCarouselPageComponent } from './components/pages/participant-content-carousel-page/participant-content-carousel-page.component';
+import {
+ ParticipantContentCarouselPageComponent
+} from './components/pages/participant-content-carousel-page/participant-content-carousel-page.component';
import { ParticipantTextContentComponent } from './components/fragments/participant-text-content/participant-text-content.component';
import { CreatorTextContentComponent } from './components/fragments/creator-text-content/creator-text-content.component';
import { AuthenticationInterceptor } from './interceptors/authentication.interceptor';
@@ -91,7 +91,6 @@ import { AuthenticationInterceptor } from './interceptors/authentication.interce
PageNotFoundComponent,
PasswordResetComponent,
RegisterComponent,
- ContentCreationComponent,
RoomComponent,
RegisterComponent,
RoomCreationComponent,
@@ -100,7 +99,6 @@ import { AuthenticationInterceptor } from './interceptors/authentication.interce
CreateCommentComponent,
ParticipantHomeScreenComponent,
CommentListComponent,
- ContentAnswersComponent,
ParticipantRoomComponent,
CreatorRoomComponent,
ContentDetailComponent,
diff --git a/src/app/components/dialogs/password-reset/password-reset.component.ts b/src/app/components/dialogs/password-reset/password-reset.component.ts
index 07a439cda..af3a40155 100644
--- a/src/app/components/dialogs/password-reset/password-reset.component.ts
+++ b/src/app/components/dialogs/password-reset/password-reset.component.ts
@@ -1,9 +1,9 @@
import { Component, Inject, OnInit } from '@angular/core';
import { FormControl, FormGroupDirective, NgForm, Validators } from '@angular/forms';
import { ErrorStateMatcher, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
-import { AuthenticationService } from '../authentication.service';
-import { NotificationService } from '../notification.service';
import { RegisterComponent } from '../register/register.component';
+import { AuthenticationService } from '../../../services/http/authentication.service';
+import { NotificationService } from '../../../services/util/notification.service';
export class PasswordResetErrorStateMatcher implements ErrorStateMatcher {
isErrorState(control: FormControl | null, form: FormGroupDirective | NgForm | null): boolean {
diff --git a/src/app/components/dialogs/register/register.component.ts b/src/app/components/dialogs/register/register.component.ts
index 1416e8b1c..7a7674706 100644
--- a/src/app/components/dialogs/register/register.component.ts
+++ b/src/app/components/dialogs/register/register.component.ts
@@ -1,9 +1,8 @@
import { Component, Inject, OnInit } from '@angular/core';
import { ErrorStateMatcher, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
import { FormControl, FormGroupDirective, NgForm, Validators } from '@angular/forms';
-import { AuthenticationService } from '../authentication.service';
-import { NotificationService } from '../notification.service';
-import { Router } from '@angular/router';
+import { AuthenticationService } from '../../../services/http/authentication.service';
+import { NotificationService } from '../../../services/util/notification.service';
export class RegisterErrorStateMatcher implements ErrorStateMatcher {
isErrorState(control: FormControl | null, form: FormGroupDirective | NgForm | null): boolean {
diff --git a/src/app/components/fragments/creator-text-content/creator-text-content.component.ts b/src/app/components/fragments/creator-text-content/creator-text-content.component.ts
index e3c37aac0..239a39889 100644
--- a/src/app/components/fragments/creator-text-content/creator-text-content.component.ts
+++ b/src/app/components/fragments/creator-text-content/creator-text-content.component.ts
@@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core';
-import { TextContent } from '../text-content';
-import { ContentService } from '../content.service';
+import { TextContent } from '../../../models/text-content';
+import { ContentService } from '../../../services/http/content.service';
@Component({
selector: 'app-creator-text-content',
diff --git a/src/app/components/pages/creator-room/creator-room.component.ts b/src/app/components/pages/creator-room/creator-room.component.ts
index 20387e270..d80195d85 100644
--- a/src/app/components/pages/creator-room/creator-room.component.ts
+++ b/src/app/components/pages/creator-room/creator-room.component.ts
@@ -6,7 +6,6 @@ import { Room } from '../../../models/room';
import { Location } from '@angular/common';
import { NotificationService } from '../../../services/util/notification.service';
import { MatDialog } from '@angular/material';
-import { ContentCreationComponent } from '../content-creation/content-creation.component';
import { RoomDeletionComponent } from '../../dialogs/room-deletion/room-deletion.component';
import { RoomModificationComponent } from '../../dialogs/room-modification/room-modification.component';
@@ -61,13 +60,6 @@ export class CreatorRoomComponent extends RoomComponent implements OnInit {
this.delete(room);
}
- createContentDialog(): void {
- const dialogRef = this.dialog.open(ContentCreationComponent, {
- width: '350px'
- });
- dialogRef.componentInstance.roomId = this.room.id;
- }
-
confirmDeletion(dialogAnswer: string): void {
if (dialogAnswer === 'delete') {
this.deleteRoom(this.room);
diff --git a/src/app/components/pages/login-screen/login-screen.component.ts b/src/app/components/pages/login-screen/login-screen.component.ts
index 4de62b9a8..0f40f5f8b 100644
--- a/src/app/components/pages/login-screen/login-screen.component.ts
+++ b/src/app/components/pages/login-screen/login-screen.component.ts
@@ -1,8 +1,8 @@
import { Component, OnInit } from '@angular/core';
import { MatDialog } from '@angular/material';
-import { RegisterComponent } from '../register/register.component';
-import { PasswordResetComponent } from '../password-reset/password-reset.component';
-import { UserRole } from '../user-roles.enum';
+import { RegisterComponent } from '../../dialogs/register/register.component';
+import { PasswordResetComponent } from '../../dialogs/password-reset/password-reset.component';
+import { UserRole } from '../../../models/user-roles.enum';
@Component({
selector: 'app-login-screen',
--
GitLab