From 039fae8ff7593d5c37f8fb12e19c086e85364611 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Mau=C3=9F?= <lukas.mauss@mni.thm.de>
Date: Mon, 19 Nov 2018 20:51:04 +0100
Subject: [PATCH] Move content-list-component into creator folder

---
 .../content-choice-creator.component.ts                     | 2 +-
 .../creator/content-creator/content-creator.component.ts    | 2 +-
 .../content-likert-creator.component.ts                     | 2 +-
 .../content-list/content-list.component.html                | 0
 .../content-list/content-list.component.scss                | 0
 .../content-list/content-list.component.spec.ts             | 0
 .../content-list/content-list.component.ts                  | 6 +++---
 .../content-text-creator/content-text-creator.component.ts  | 2 +-
 .../content-yes-no-creator.component.ts                     | 2 +-
 src/app/components/creator/creator-routing.module.ts        | 2 +-
 src/app/components/creator/creator.module.ts                | 4 +++-
 src/app/components/shared/shared.module.ts                  | 3 ---
 12 files changed, 12 insertions(+), 13 deletions(-)
 rename src/app/components/{shared => creator}/content-list/content-list.component.html (100%)
 rename src/app/components/{shared => creator}/content-list/content-list.component.scss (100%)
 rename src/app/components/{shared => creator}/content-list/content-list.component.spec.ts (100%)
 rename src/app/components/{shared => creator}/content-list/content-list.component.ts (95%)

diff --git a/src/app/components/creator/content-choice-creator/content-choice-creator.component.ts b/src/app/components/creator/content-choice-creator/content-choice-creator.component.ts
index 0fa11b155..9856b24dc 100644
--- a/src/app/components/creator/content-choice-creator/content-choice-creator.component.ts
+++ b/src/app/components/creator/content-choice-creator/content-choice-creator.component.ts
@@ -6,7 +6,7 @@ import { NotificationService } from '../../../services/util/notification.service
 import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material';
 import { AnswerEditComponent } from '../_dialogs/answer-edit/answer-edit.component';
 import { ContentType } from '../../../models/content-type.enum';
-import { ContentListComponent } from '../../shared/content-list/content-list.component';
+import { ContentListComponent } from '../content-list/content-list.component';
 import { ContentDeleteComponent } from '../_dialogs/content-delete/content-delete.component';
 import { TranslateService } from '@ngx-translate/core';
 
diff --git a/src/app/components/creator/content-creator/content-creator.component.ts b/src/app/components/creator/content-creator/content-creator.component.ts
index 0fbf4eeb8..9b85bdc62 100644
--- a/src/app/components/creator/content-creator/content-creator.component.ts
+++ b/src/app/components/creator/content-creator/content-creator.component.ts
@@ -2,7 +2,7 @@ import { Component, Inject, Input, OnInit } from '@angular/core';
 import { ContentText } from '../../../models/content-text';
 import { FormControl } from '@angular/forms';
 import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material';
-import { ContentListComponent } from '../../shared/content-list/content-list.component';
+import { ContentListComponent } from '../content-list/content-list.component';
 import { Room } from '../../../models/room';
 import { TranslateService } from '@ngx-translate/core';
 
diff --git a/src/app/components/creator/content-likert-creator/content-likert-creator.component.ts b/src/app/components/creator/content-likert-creator/content-likert-creator.component.ts
index 3e3fe9010..3988c3029 100644
--- a/src/app/components/creator/content-likert-creator/content-likert-creator.component.ts
+++ b/src/app/components/creator/content-likert-creator/content-likert-creator.component.ts
@@ -6,7 +6,7 @@ import { ContentType } from '../../../models/content-type.enum';
 import { ContentService } from '../../../services/http/content.service';
 import { NotificationService } from '../../../services/util/notification.service';
 import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material';
-import { ContentListComponent } from '../../shared/content-list/content-list.component';
+import { ContentListComponent } from '../content-list/content-list.component';
 import { ContentDeleteComponent } from '../_dialogs/content-delete/content-delete.component';
 import { FormControl } from '@angular/forms';
 import { Observable } from 'rxjs/Observable';
diff --git a/src/app/components/shared/content-list/content-list.component.html b/src/app/components/creator/content-list/content-list.component.html
similarity index 100%
rename from src/app/components/shared/content-list/content-list.component.html
rename to src/app/components/creator/content-list/content-list.component.html
diff --git a/src/app/components/shared/content-list/content-list.component.scss b/src/app/components/creator/content-list/content-list.component.scss
similarity index 100%
rename from src/app/components/shared/content-list/content-list.component.scss
rename to src/app/components/creator/content-list/content-list.component.scss
diff --git a/src/app/components/shared/content-list/content-list.component.spec.ts b/src/app/components/creator/content-list/content-list.component.spec.ts
similarity index 100%
rename from src/app/components/shared/content-list/content-list.component.spec.ts
rename to src/app/components/creator/content-list/content-list.component.spec.ts
diff --git a/src/app/components/shared/content-list/content-list.component.ts b/src/app/components/creator/content-list/content-list.component.ts
similarity index 95%
rename from src/app/components/shared/content-list/content-list.component.ts
rename to src/app/components/creator/content-list/content-list.component.ts
index 48f292171..6477738af 100644
--- a/src/app/components/shared/content-list/content-list.component.ts
+++ b/src/app/components/creator/content-list/content-list.component.ts
@@ -8,9 +8,9 @@ import { AnswerOption } from '../../../models/answer-option';
 import { ContentType } from '../../../models/content-type.enum';
 import { ContentGroup } from '../../../models/content-group';
 import { MatDialog } from '@angular/material';
-import { ContentChoiceCreatorComponent } from '../../creator/content-choice-creator/content-choice-creator.component';
-import { ContentLikertCreatorComponent } from '../../creator/content-likert-creator/content-likert-creator.component';
-import { ContentTextCreatorComponent } from '../../creator/content-text-creator/content-text-creator.component';
+import { ContentChoiceCreatorComponent } from '../content-choice-creator/content-choice-creator.component';
+import { ContentLikertCreatorComponent } from '../content-likert-creator/content-likert-creator.component';
+import { ContentTextCreatorComponent } from '../content-text-creator/content-text-creator.component';
 import { NotificationService } from '../../../services/util/notification.service';
 import { Room } from '../../../models/room';
 import { RoomService } from '../../../services/http/room.service';
diff --git a/src/app/components/creator/content-text-creator/content-text-creator.component.ts b/src/app/components/creator/content-text-creator/content-text-creator.component.ts
index 7bc53c640..37e18da98 100644
--- a/src/app/components/creator/content-text-creator/content-text-creator.component.ts
+++ b/src/app/components/creator/content-text-creator/content-text-creator.component.ts
@@ -3,7 +3,7 @@ import { ContentText } from '../../../models/content-text';
 import { ContentService } from '../../../services/http/content.service';
 import { NotificationService } from '../../../services/util/notification.service';
 import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material';
-import { ContentListComponent } from '../../shared/content-list/content-list.component';
+import { ContentListComponent } from '../content-list/content-list.component';
 import { ContentDeleteComponent } from '../_dialogs/content-delete/content-delete.component';
 import { TranslateService } from '@ngx-translate/core';
 
diff --git a/src/app/components/creator/content-yes-no-creator/content-yes-no-creator.component.ts b/src/app/components/creator/content-yes-no-creator/content-yes-no-creator.component.ts
index 20842d411..67040e304 100644
--- a/src/app/components/creator/content-yes-no-creator/content-yes-no-creator.component.ts
+++ b/src/app/components/creator/content-yes-no-creator/content-yes-no-creator.component.ts
@@ -6,7 +6,7 @@ import { NotificationService } from '../../../services/util/notification.service
 import { ContentType } from '../../../models/content-type.enum';
 import { ContentService } from '../../../services/http/content.service';
 import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material';
-import { ContentListComponent } from '../../shared/content-list/content-list.component';
+import { ContentListComponent } from '../content-list/content-list.component';
 import { ContentDeleteComponent } from '../_dialogs/content-delete/content-delete.component';
 import { FormControl } from '@angular/forms';
 import { Observable } from 'rxjs/Observable';
diff --git a/src/app/components/creator/creator-routing.module.ts b/src/app/components/creator/creator-routing.module.ts
index 43d2ef941..cd09cdd33 100644
--- a/src/app/components/creator/creator-routing.module.ts
+++ b/src/app/components/creator/creator-routing.module.ts
@@ -8,7 +8,7 @@ import { ContentCreatePageComponent } from './content-create-page/content-create
 import { StatisticsComponent } from '../shared/statistics/statistics.component';
 import { CommentListComponent } from '../shared/comment-list/comment-list.component';
 import { FeedbackBarometerPageComponent } from '../shared/feedback-barometer-page/feedback-barometer-page.component';
-import { ContentListComponent } from '../shared/content-list/content-list.component';
+import { ContentListComponent } from './content-list/content-list.component';
 
 const routes: Routes = [
   {
diff --git a/src/app/components/creator/creator.module.ts b/src/app/components/creator/creator.module.ts
index 9de8e65a7..4430128da 100644
--- a/src/app/components/creator/creator.module.ts
+++ b/src/app/components/creator/creator.module.ts
@@ -21,6 +21,7 @@ import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { HttpClient } from '@angular/common/http';
 import { TranslateHttpLoader } from '@ngx-translate/http-loader';
 import { ContentCreatorComponent } from './content-creator/content-creator.component';
+import { ContentListComponent } from './content-list/content-list.component';
 
 @NgModule({
   imports: [
@@ -50,7 +51,8 @@ import { ContentCreatorComponent } from './content-creator/content-creator.compo
     RoomCreateComponent,
     RoomDeleteComponent,
     RoomEditComponent,
-    ContentCreatorComponent
+    ContentCreatorComponent,
+    ContentListComponent
   ],
   entryComponents: [
     RoomCreateComponent,
diff --git a/src/app/components/shared/shared.module.ts b/src/app/components/shared/shared.module.ts
index 351f13564..e3af5fe57 100644
--- a/src/app/components/shared/shared.module.ts
+++ b/src/app/components/shared/shared.module.ts
@@ -2,7 +2,6 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { CommentListComponent } from './comment-list/comment-list.component';
 import { ContentGroupsComponent } from './content-groups/content-groups.component';
-import { ContentListComponent } from './content-list/content-list.component';
 import { FeedbackBarometerPageComponent } from './feedback-barometer-page/feedback-barometer-page.component';
 import { FooterComponent } from './footer/footer.component';
 import { FooterImprintComponent } from './footer-imprint/footer-imprint.component';
@@ -32,7 +31,6 @@ import { SharedRoutingModule } from './shared-routing.module';
     RoomPageComponent,
     RoomListComponent,
     ContentGroupsComponent,
-    ContentListComponent,
     HeaderComponent,
     AnswerEditComponent,
     ContentDeleteComponent,
@@ -52,7 +50,6 @@ import { SharedRoutingModule } from './shared-routing.module';
     RoomPageComponent,
     RoomListComponent,
     ContentGroupsComponent,
-    ContentListComponent,
     HeaderComponent,
     AnswerEditComponent,
     ContentDeleteComponent,
-- 
GitLab