From 7d49b22e8f682a94bc38c5ea82e090533afe07d7 Mon Sep 17 00:00:00 2001
From: Lukas Kimpel <lukas.kimpel@mni.thm.de>
Date: Tue, 20 Mar 2018 15:47:56 +0100
Subject: [PATCH] Rename content-carousel Rename models

---
 src/app/app-routing.module.ts                               | 2 +-
 src/app/app.module.ts                                       | 2 +-
 .../content-choice-creator.component.ts                     | 2 +-
 .../content-choice-participant.component.ts                 | 2 +-
 .../content-text-creator/content-text-creator.component.ts  | 2 +-
 .../content-text-participant.component.ts                   | 2 +-
 .../components/fragments/statistics/statistics.component.ts | 4 ++--
 .../content-carousel.component.html}                        | 0
 .../content-carousel.component.scss}                        | 0
 .../content-carousel.component.spec.ts}                     | 2 +-
 .../content-carousel.component.ts}                          | 6 +++---
 src/app/models/{choice-answer.ts => answer-choice.ts}       | 0
 src/app/models/{choice-content.ts => content-choice.ts}     | 2 +-
 src/app/models/{text-content.ts => content-text.ts}         | 2 +-
 src/app/models/{content-type.ts => content-type.enum.ts}    | 0
 src/app/models/content.ts                                   | 2 +-
 src/app/services/http/in-memory-data.service.ts             | 2 +-
 17 files changed, 16 insertions(+), 16 deletions(-)
 rename src/app/components/pages/{participant-content-carousel-page/participant-content-carousel-page.component.html => content-carousel/content-carousel.component.html} (100%)
 rename src/app/components/pages/{participant-content-carousel-page/participant-content-carousel-page.component.scss => content-carousel/content-carousel.component.scss} (100%)
 rename src/app/components/pages/{participant-content-carousel-page/participant-content-carousel-page.component.spec.ts => content-carousel/content-carousel.component.spec.ts} (86%)
 rename src/app/components/pages/{participant-content-carousel-page/participant-content-carousel-page.component.ts => content-carousel/content-carousel.component.ts} (63%)
 rename src/app/models/{choice-answer.ts => answer-choice.ts} (100%)
 rename src/app/models/{choice-content.ts => content-choice.ts} (93%)
 rename src/app/models/{text-content.ts => content-text.ts} (88%)
 rename src/app/models/{content-type.ts => content-type.enum.ts} (100%)

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 90e82f67b..a4f0e5f10 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -15,7 +15,7 @@ import { AnswerStatisticsComponent } from './components/fragments/statistics/sta
 import { AddContentComponent } from './components/pages/content-create/content-create.component';
 import {
   ParticipantContentCarouselPageComponent
-} from './components/pages/participant-content-carousel-page/participant-content-carousel-page.component';
+} from './components/pages/content-carousel/content-carousel.component';
 
 const routes: Routes = [
   {
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 5c15dc801..4ab46ffa2 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -76,7 +76,7 @@ import { CreatorChoiceContentComponent } from './components/fragments/content-ch
 import { AddContentComponent } from './components/pages/content-create/content-create.component';
 import {
   ParticipantContentCarouselPageComponent
-} from './components/pages/participant-content-carousel-page/participant-content-carousel-page.component';
+} from './components/pages/content-carousel/content-carousel.component';
 import { ParticipantTextContentComponent } from './components/fragments/content-text-participant/content-text-participant.component';
 import { CreatorTextContentComponent } from './components/fragments/content-text-creator/content-text-creator.component';
 import { AuthenticationInterceptor } from './interceptors/authentication.interceptor';
diff --git a/src/app/components/fragments/content-choice-creator/content-choice-creator.component.ts b/src/app/components/fragments/content-choice-creator/content-choice-creator.component.ts
index bf2c3b0cd..6b7bb5481 100644
--- a/src/app/components/fragments/content-choice-creator/content-choice-creator.component.ts
+++ b/src/app/components/fragments/content-choice-creator/content-choice-creator.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { AnswerOption } from '../../../models/answer-option';
-import { ChoiceContent } from '../../../models/choice-content';
+import { ChoiceContent } from '../../../models/content-choice';
 import { ContentService } from '../../../services/http/content.service';
 
 export class DisplayAnswer {
diff --git a/src/app/components/fragments/content-choice-participant/content-choice-participant.component.ts b/src/app/components/fragments/content-choice-participant/content-choice-participant.component.ts
index 21948e3cf..d31e0acb4 100644
--- a/src/app/components/fragments/content-choice-participant/content-choice-participant.component.ts
+++ b/src/app/components/fragments/content-choice-participant/content-choice-participant.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { ChoiceContent } from '../../../models/choice-content';
+import { ChoiceContent } from '../../../models/content-choice';
 import { AnswerOption } from '../../../models/answer-option';
 import { ContentAnswerService } from '../../../services/http/content-answer.service';
 
diff --git a/src/app/components/fragments/content-text-creator/content-text-creator.component.ts b/src/app/components/fragments/content-text-creator/content-text-creator.component.ts
index a822830b6..c0f6cf42d 100644
--- a/src/app/components/fragments/content-text-creator/content-text-creator.component.ts
+++ b/src/app/components/fragments/content-text-creator/content-text-creator.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { TextContent } from '../../../models/text-content';
+import { TextContent } from '../../../models/content-text';
 import { ContentService } from '../../../services/http/content.service';
 
 @Component({
diff --git a/src/app/components/fragments/content-text-participant/content-text-participant.component.ts b/src/app/components/fragments/content-text-participant/content-text-participant.component.ts
index da27dda59..24d7d7fd3 100644
--- a/src/app/components/fragments/content-text-participant/content-text-participant.component.ts
+++ b/src/app/components/fragments/content-text-participant/content-text-participant.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { TextContent } from '../../../models/text-content';
+import { TextContent } from '../../../models/content-text';
 import { ContentAnswerService } from '../../../services/http/content-answer.service';
 import { AnswerText } from '../../../models/answer-text';
 
diff --git a/src/app/components/fragments/statistics/statistics.component.ts b/src/app/components/fragments/statistics/statistics.component.ts
index bef7f2fa7..d0a510ce7 100644
--- a/src/app/components/fragments/statistics/statistics.component.ts
+++ b/src/app/components/fragments/statistics/statistics.component.ts
@@ -5,8 +5,8 @@ import { Content } from '../../../models/content';
 import { ContentService } from '../../../services/http/content.service';
 import { ContentAnswerService } from '../../../services/http/content-answer.service';
 import { AnswerText } from '../../../models/answer-text';
-import { ChoiceAnswer } from '../../../models/choice-answer';
-import { ContentType } from '../../../models/content-type';
+import { ChoiceAnswer } from '../../../models/answer-choice';
+import { ContentType } from '../../../models/content-type.enum';
 
 @Component({
   selector: 'app-answer-statistics',
diff --git a/src/app/components/pages/participant-content-carousel-page/participant-content-carousel-page.component.html b/src/app/components/pages/content-carousel/content-carousel.component.html
similarity index 100%
rename from src/app/components/pages/participant-content-carousel-page/participant-content-carousel-page.component.html
rename to src/app/components/pages/content-carousel/content-carousel.component.html
diff --git a/src/app/components/pages/participant-content-carousel-page/participant-content-carousel-page.component.scss b/src/app/components/pages/content-carousel/content-carousel.component.scss
similarity index 100%
rename from src/app/components/pages/participant-content-carousel-page/participant-content-carousel-page.component.scss
rename to src/app/components/pages/content-carousel/content-carousel.component.scss
diff --git a/src/app/components/pages/participant-content-carousel-page/participant-content-carousel-page.component.spec.ts b/src/app/components/pages/content-carousel/content-carousel.component.spec.ts
similarity index 86%
rename from src/app/components/pages/participant-content-carousel-page/participant-content-carousel-page.component.spec.ts
rename to src/app/components/pages/content-carousel/content-carousel.component.spec.ts
index 6719ec8ee..cd52a9061 100644
--- a/src/app/components/pages/participant-content-carousel-page/participant-content-carousel-page.component.spec.ts
+++ b/src/app/components/pages/content-carousel/content-carousel.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { ParticipantContentCarouselPageComponent } from './participant-content-carousel-page.component';
+import { ParticipantContentCarouselPageComponent } from './content-carousel.component';
 
 describe('ParticipantContentCarouselPageComponent', () => {
   let component: ParticipantContentCarouselPageComponent;
diff --git a/src/app/components/pages/participant-content-carousel-page/participant-content-carousel-page.component.ts b/src/app/components/pages/content-carousel/content-carousel.component.ts
similarity index 63%
rename from src/app/components/pages/participant-content-carousel-page/participant-content-carousel-page.component.ts
rename to src/app/components/pages/content-carousel/content-carousel.component.ts
index 4b1460bcf..319d18eac 100644
--- a/src/app/components/pages/participant-content-carousel-page/participant-content-carousel-page.component.ts
+++ b/src/app/components/pages/content-carousel/content-carousel.component.ts
@@ -1,11 +1,11 @@
 import { Component, OnInit } from '@angular/core';
 import { Content } from '../../../models/content';
-import { ContentType } from '../../../models/content-type';
+import { ContentType } from '../../../models/content-type.enum';
 
 @Component({
   selector: 'app-participant-content-carousel-page',
-  templateUrl: './participant-content-carousel-page.component.html',
-  styleUrls: ['./participant-content-carousel-page.component.scss']
+  templateUrl: './content-carousel.component.html',
+  styleUrls: ['./content-carousel.component.scss']
 })
 export class ParticipantContentCarouselPageComponent implements OnInit {
   ContentType: ContentType;
diff --git a/src/app/models/choice-answer.ts b/src/app/models/answer-choice.ts
similarity index 100%
rename from src/app/models/choice-answer.ts
rename to src/app/models/answer-choice.ts
diff --git a/src/app/models/choice-content.ts b/src/app/models/content-choice.ts
similarity index 93%
rename from src/app/models/choice-content.ts
rename to src/app/models/content-choice.ts
index a6b26d79d..ce8c39835 100644
--- a/src/app/models/choice-content.ts
+++ b/src/app/models/content-choice.ts
@@ -1,6 +1,6 @@
 import { AnswerOption } from './answer-option';
 import { Content } from './content';
-import { ContentType } from './content-type';
+import { ContentType } from './content-type.enum';
 
 export class ChoiceContent extends Content {
   options: AnswerOption[];
diff --git a/src/app/models/text-content.ts b/src/app/models/content-text.ts
similarity index 88%
rename from src/app/models/text-content.ts
rename to src/app/models/content-text.ts
index 02b7081d5..6f86a6365 100644
--- a/src/app/models/text-content.ts
+++ b/src/app/models/content-text.ts
@@ -1,5 +1,5 @@
 import { Content } from './content';
-import { ContentType } from './content-type';
+import { ContentType } from './content-type.enum';
 
 export class TextContent extends Content {
 
diff --git a/src/app/models/content-type.ts b/src/app/models/content-type.enum.ts
similarity index 100%
rename from src/app/models/content-type.ts
rename to src/app/models/content-type.enum.ts
diff --git a/src/app/models/content.ts b/src/app/models/content.ts
index bcb3b4084..c4a4cf5a3 100644
--- a/src/app/models/content.ts
+++ b/src/app/models/content.ts
@@ -1,4 +1,4 @@
-import { ContentType } from './content-type';
+import { ContentType } from './content-type.enum';
 
 export class Content {
   contentId: string;
diff --git a/src/app/services/http/in-memory-data.service.ts b/src/app/services/http/in-memory-data.service.ts
index c68f6bba4..815bfe581 100644
--- a/src/app/services/http/in-memory-data.service.ts
+++ b/src/app/services/http/in-memory-data.service.ts
@@ -1,5 +1,5 @@
 import { InMemoryDbService } from 'angular-in-memory-web-api';
-import { ContentType } from '../../models/content-type';
+import { ContentType } from '../../models/content-type.enum';
 
 export class InMemoryDataService implements InMemoryDbService {
   /**
-- 
GitLab