From 1884a8c483a230a8e3d550b444430e72ffd9a548 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Mau=C3=9F?= <lukas.mauss@mni.thm.de>
Date: Tue, 6 Nov 2018 14:13:14 +0100
Subject: [PATCH] Fix routes for components in new subfolder 'home'
---
src/app/app-routing.module.ts | 2 +-
src/app/app.module.ts | 10 +++++-----
.../password-reset/password-reset.component.ts | 4 ++--
.../home/_dialogs/register/register.component.ts | 4 ++--
.../user-activation/user-activation.component.ts | 4 ++--
.../components/home/login-page/login-page.component.ts | 2 +-
src/app/components/home/login/login.component.ts | 6 +++---
.../components/shared/room-join/room-join.component.ts | 2 +-
8 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 2701a63cf..1279c5b43 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -1,6 +1,6 @@
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
-import { LoginPageComponent } from './components/login-page/login-page.component';
+import { LoginPageComponent } from './components/home/login-page/login-page.component';
import { FooterImprintComponent } from './components/shared/footer-imprint/footer-imprint.component';
import { PageNotFoundComponent } from './components/shared/page-not-found/page-not-found.component';
import { CreatorModule } from './components/creator/creator.module';
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 708631139..9597fe202 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -1,13 +1,13 @@
import { NgModule } from '@angular/core';
import { AppComponent } from './app.component';
-import { LoginComponent } from './components/login/login.component';
-import { RegisterComponent } from './components/_dialogs/register/register.component';
-import { PasswordResetComponent } from './components/_dialogs/password-reset/password-reset.component';
+import { LoginComponent } from './components/home/login/login.component';
+import { RegisterComponent } from './components/home/_dialogs/register/register.component';
+import { PasswordResetComponent } from './components/home/_dialogs/password-reset/password-reset.component';
import { AppRoutingModule } from './app-routing.module';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
import { HTTP_INTERCEPTORS } from '@angular/common/http';
import { UserService } from './services/http/user.service';
-import { LoginPageComponent } from './components/login-page/login-page.component';
+import { LoginPageComponent } from './components/home/login-page/login-page.component';
import { NotificationService } from './services/util/notification.service';
import { AuthenticationService } from './services/http/authentication.service';
import { AuthenticationGuard } from './guards/authentication.guard';
@@ -16,7 +16,7 @@ import { CommentService } from './services/http/comment.service';
import { DataStoreService } from './services/util/data-store.service';
import { ContentService } from './services/http/content.service';
import { ContentAnswerService } from './services/http/content-answer.service';
-import { UserActivationComponent } from './components/_dialogs/user-activation/user-activation.component';
+import { UserActivationComponent } from './components/home/_dialogs/user-activation/user-activation.component';
import { AuthenticationInterceptor } from './interceptors/authentication.interceptor';
import { GenericDataDialogComponent } from './components/shared/_dialogs/generic-data-dialog/generic-data-dialog.component';
import { FooterLoginDialogComponent } from './components/shared/_dialogs/footer-login-dialog/footer-login-dialog.component';
diff --git a/src/app/components/home/_dialogs/password-reset/password-reset.component.ts b/src/app/components/home/_dialogs/password-reset/password-reset.component.ts
index 9057d6147..ff2378684 100644
--- a/src/app/components/home/_dialogs/password-reset/password-reset.component.ts
+++ b/src/app/components/home/_dialogs/password-reset/password-reset.component.ts
@@ -2,8 +2,8 @@ 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 { RegisterComponent } from '../register/register.component';
-import { AuthenticationService } from '../../../services/http/authentication.service';
-import { NotificationService } from '../../../services/util/notification.service';
+import { AuthenticationService } from '../../../../services/http/authentication.service';
+import { NotificationService } from '../../../../services/util/notification.service';
import { TranslateService } from '@ngx-translate/core';
export class PasswordResetErrorStateMatcher implements ErrorStateMatcher {
diff --git a/src/app/components/home/_dialogs/register/register.component.ts b/src/app/components/home/_dialogs/register/register.component.ts
index a34d2ed63..fb5869355 100644
--- a/src/app/components/home/_dialogs/register/register.component.ts
+++ b/src/app/components/home/_dialogs/register/register.component.ts
@@ -1,8 +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 '../../../services/http/authentication.service';
-import { NotificationService } from '../../../services/util/notification.service';
+import { AuthenticationService } from '../../../../services/http/authentication.service';
+import { NotificationService } from '../../../../services/util/notification.service';
import { TranslateService } from '@ngx-translate/core';
export class RegisterErrorStateMatcher implements ErrorStateMatcher {
diff --git a/src/app/components/home/_dialogs/user-activation/user-activation.component.ts b/src/app/components/home/_dialogs/user-activation/user-activation.component.ts
index f9519ba3f..f0f71df0d 100644
--- a/src/app/components/home/_dialogs/user-activation/user-activation.component.ts
+++ b/src/app/components/home/_dialogs/user-activation/user-activation.component.ts
@@ -1,6 +1,6 @@
import { Component, Inject, OnInit } from '@angular/core';
-import { NotificationService } from '../../../services/util/notification.service';
-import { UserService } from '../../../services/http/user.service';
+import { NotificationService } from '../../../../services/util/notification.service';
+import { UserService } from '../../../../services/http/user.service';
import { FormControl, Validators} from '@angular/forms';
import { MAT_DIALOG_DATA, MatDialogRef} from '@angular/material';
import { TranslateService } from '@ngx-translate/core';
diff --git a/src/app/components/home/login-page/login-page.component.ts b/src/app/components/home/login-page/login-page.component.ts
index c6b788cbd..05ba1d015 100644
--- a/src/app/components/home/login-page/login-page.component.ts
+++ b/src/app/components/home/login-page/login-page.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
import { MatDialog } from '@angular/material';
import { RegisterComponent } from '../_dialogs/register/register.component';
import { PasswordResetComponent } from '../_dialogs/password-reset/password-reset.component';
-import { UserRole } from '../../models/user-roles.enum';
+import { UserRole } from '../../../models/user-roles.enum';
@Component({
selector: 'app-login-page',
diff --git a/src/app/components/home/login/login.component.ts b/src/app/components/home/login/login.component.ts
index 47278a73f..c27b42247 100644
--- a/src/app/components/home/login/login.component.ts
+++ b/src/app/components/home/login/login.component.ts
@@ -1,10 +1,10 @@
import { Component, Input, OnInit, OnChanges, SimpleChanges } from '@angular/core';
-import { AuthenticationService } from '../../services/http/authentication.service';
+import { AuthenticationService } from '../../../services/http/authentication.service';
import { Router } from '@angular/router';
-import { NotificationService } from '../../services/util/notification.service';
+import { NotificationService } from '../../../services/util/notification.service';
import { ErrorStateMatcher, MatDialog } from '@angular/material';
import { FormControl, FormGroupDirective, NgForm, Validators } from '@angular/forms';
-import { UserRole } from '../../models/user-roles.enum';
+import { UserRole } from '../../../models/user-roles.enum';
import { TranslateService } from '@ngx-translate/core';
import { UserActivationComponent } from '../_dialogs/user-activation/user-activation.component';
diff --git a/src/app/components/shared/room-join/room-join.component.ts b/src/app/components/shared/room-join/room-join.component.ts
index 7525e1164..d8475228f 100644
--- a/src/app/components/shared/room-join/room-join.component.ts
+++ b/src/app/components/shared/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 '../../_dialogs/register/register.component';
+import { RegisterErrorStateMatcher } from '../../home/_dialogs/register/register.component';
import { FormControl, FormGroupDirective, NgForm, Validators } from '@angular/forms';
import { ErrorStateMatcher } from '@angular/material';
import { NotificationService } from '../../../services/util/notification.service';
--
GitLab