From a1f3c9ed6009c4684c428998d33b845b0db6fa35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Mau=C3=9F?= <lukas.mauss@mni.thm.de>
Date: Tue, 19 Feb 2019 11:01:10 +0100
Subject: [PATCH] Fix imports etc.
---
src/app/app.module.ts | 6 ++++--
.../creator/_dialogs/room-delete/room-delete.component.ts | 2 +-
.../creator/_dialogs/room-edit/room-edit.component.ts | 2 +-
src/app/components/creator/creator.module.ts | 2 +-
.../home-creator-page/home-creator-page.component.ts | 2 +-
src/app/components/home/room-join/room-join.component.ts | 2 +-
src/app/components/shared/shared.module.ts | 2 +-
7 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 44b86dafb..cf0d78fb2 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -25,8 +25,9 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { LanguageService } from './services/util/language.service';
import { MarkdownService, MarkedOptions } from 'ngx-markdown';
import { NewLandingComponent } from './components/home/new-landing/new-landing.component';
-import { RoomCreateComponent } from './components/creator/_dialogs/room-create/room-create.component';
+import { RoomCreateComponent } from './components/home/_dialogs/room-create/room-create.component';
import { HomePageComponent } from './components/home/home-page/home-page.component';
+import {RoomJoinComponent} from "./components/home/room-join/room-join.component";
export function dialogClose(dialogResult: any) {
}
@@ -40,7 +41,8 @@ export function dialogClose(dialogResult: any) {
UserActivationComponent,
NewLandingComponent,
RoomCreateComponent,
- HomePageComponent
+ HomePageComponent,
+ RoomJoinComponent
],
entryComponents: [
RegisterComponent,
diff --git a/src/app/components/creator/_dialogs/room-delete/room-delete.component.ts b/src/app/components/creator/_dialogs/room-delete/room-delete.component.ts
index 8d6b6c84d..3c3cc0ac8 100644
--- a/src/app/components/creator/_dialogs/room-delete/room-delete.component.ts
+++ b/src/app/components/creator/_dialogs/room-delete/room-delete.component.ts
@@ -2,7 +2,7 @@ import { Component, Inject, OnInit } from '@angular/core';
import { Router } from '@angular/router';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
import { NotificationService } from '../../../../services/util/notification.service';
-import { RoomCreateComponent } from '../room-create/room-create.component';
+import { RoomCreateComponent } from '../../../home/_dialogs/room-create/room-create.component';
import { RoomService } from '../../../../services/http/room.service';
import { Room } from '../../../../models/room';
diff --git a/src/app/components/creator/_dialogs/room-edit/room-edit.component.ts b/src/app/components/creator/_dialogs/room-edit/room-edit.component.ts
index cd52da6b5..7cd86b56d 100644
--- a/src/app/components/creator/_dialogs/room-edit/room-edit.component.ts
+++ b/src/app/components/creator/_dialogs/room-edit/room-edit.component.ts
@@ -1,6 +1,6 @@
import { Component, Inject, OnInit } from '@angular/core';
import { Room } from '../../../../models/room';
-import { RoomCreateComponent } from '../room-create/room-create.component';
+import { RoomCreateComponent } from '../../../home/_dialogs/room-create/room-create.component';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
@Component({
diff --git a/src/app/components/creator/creator.module.ts b/src/app/components/creator/creator.module.ts
index dafab2dc5..07cca77e7 100644
--- a/src/app/components/creator/creator.module.ts
+++ b/src/app/components/creator/creator.module.ts
@@ -9,7 +9,7 @@ import { ContentYesNoCreatorComponent } from './content-yes-no-creator/content-y
import { HomeCreatorPageComponent } from './home-creator-page/home-creator-page.component';
import { RoomCreatorPageComponent } from './room-creator-page/room-creator-page.component';
import { EssentialsModule } from '../essentials/essentials.module';
-import { RoomCreateComponent } from './_dialogs/room-create/room-create.component';
+import { RoomCreateComponent } from '../home/_dialogs/room-create/room-create.component';
import { RoomDeleteComponent } from './_dialogs/room-delete/room-delete.component';
import { RoomEditComponent } from './_dialogs/room-edit/room-edit.component';
import { AnswerEditComponent } from './_dialogs/answer-edit/answer-edit.component';
diff --git a/src/app/components/creator/home-creator-page/home-creator-page.component.ts b/src/app/components/creator/home-creator-page/home-creator-page.component.ts
index e406035e5..ddd1d8be4 100644
--- a/src/app/components/creator/home-creator-page/home-creator-page.component.ts
+++ b/src/app/components/creator/home-creator-page/home-creator-page.component.ts
@@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core';
import { MatDialog } from '@angular/material';
-import { RoomCreateComponent } from '../_dialogs/room-create/room-create.component';
+import { RoomCreateComponent } from '../../home/_dialogs/room-create/room-create.component';
import { TranslateService } from '@ngx-translate/core';
import { LanguageService } from '../../../services/util/language.service';
diff --git a/src/app/components/home/room-join/room-join.component.ts b/src/app/components/home/room-join/room-join.component.ts
index b639d76c7..259cc449e 100644
--- a/src/app/components/home/room-join/room-join.component.ts
+++ b/src/app/components/home/room-join/room-join.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
import { Room } from '../../../models/room';
import { RoomService } from '../../../services/http/room.service';
import { Router } from '@angular/router';
-import { RegisterErrorStateMatcher } from '../../home/_dialogs/register/register.component';
+import { RegisterErrorStateMatcher } from '../_dialogs/register/register.component';
import { FormControl, FormGroupDirective, NgForm, Validators } from '@angular/forms';
import { ErrorStateMatcher } from '@angular/material';
import { NotificationService } from '../../../services/util/notification.service';
diff --git a/src/app/components/shared/shared.module.ts b/src/app/components/shared/shared.module.ts
index 2fb1fe98c..a69940b3b 100644
--- a/src/app/components/shared/shared.module.ts
+++ b/src/app/components/shared/shared.module.ts
@@ -7,7 +7,7 @@ import { FooterComponent } from './footer/footer.component';
import { FooterImprintComponent } from './footer-imprint/footer-imprint.component';
import { HeaderComponent } from './header/header.component';
import { PageNotFoundComponent } from './page-not-found/page-not-found.component';
-import { RoomJoinComponent } from './room-join/room-join.component';
+import { RoomJoinComponent } from '../home/room-join/room-join.component';
import { RoomListComponent } from './room-list/room-list.component';
import { RoomPageComponent } from './room-page/room-page.component';
import { StatisticsPageComponent } from './statistics-page/statistics-page.component';
--
GitLab