From f93f40b6cefbdc145f0941c38928debfd6dd4b0d Mon Sep 17 00:00:00 2001
From: Lukas Kimpel <lukas.kimpel@mni.thm.de>
Date: Tue, 20 Mar 2018 16:29:06 +0100
Subject: [PATCH] Rename class names Rename identifiers
---
src/app/app-routing.module.ts | 54 +++++++++----------
src/app/app.module.ts | 46 ++++++++--------
.../room-create/room-create.component.ts | 2 +-
.../room-delete/room-delete.component.ts | 2 +-
.../dialogs/room-edit/room-edit.component.ts | 2 +-
.../answers-list/answers-list.component.ts | 2 +-
.../content-choice-creator.component.ts | 2 +-
.../content-choice-participant.component.ts | 2 +-
.../content-text-creator.component.ts | 2 +-
.../content-text-participant.component.ts | 2 +-
.../fragments/login/login.component.spec.ts | 2 +-
.../room-join/room-join.component.ts | 2 +-
.../statistics/statistics.component.ts | 2 +-
.../comment-create-page.component.html} | 0
.../comment-create-page.component.scss} | 0
.../comment-create-page.component.spec.ts} | 12 ++---
.../comment-create-page.component.ts} | 8 +--
.../content-carousel-page.component.html} | 0
.../content-carousel-page.component.scss} | 0
.../content-carousel-page.component.spec.ts | 25 +++++++++
.../content-carousel-page.component.ts} | 8 +--
.../content-create-page.component.html} | 0
.../content-create-page.component.scss} | 0
.../content-create-page.component.spec.ts} | 12 ++---
.../content-create-page.component.ts | 14 +++++
.../content-create.component.ts | 14 -----
.../home-creator-page.component.html} | 0
.../home-creator-page.component.scss} | 0
.../home-creator-page.component.spec.ts} | 12 ++---
.../home-creator-page.component.ts} | 8 +--
.../home-creator.component.spec.ts | 25 ---------
.../home-participant-page.component.html} | 0
.../home-participant-page.component.scss} | 0
.../home-participant-page.component.spec.ts | 25 +++++++++
.../home-participant-page.component.ts | 15 ++++++
.../home-participant.component.ts | 15 ------
.../login-page.component.html} | 0
.../login-page.component.scss} | 0
.../login-page.component.spec.ts} | 12 ++---
.../login-page.component.ts} | 8 +--
.../page-not-found-page.component.html} | 0
.../page-not-found-page.component.scss} | 0
.../page-not-found-page.component.spec.ts} | 12 ++---
.../page-not-found-page.component.ts | 15 ++++++
.../page-not-found.component.spec.ts | 25 ---------
.../page-not-found.component.ts | 15 ------
.../room-creator-page.component.html} | 0
.../room-creator-page.component.scss} | 0
.../room-creator-page.component.spec.ts} | 12 ++---
.../room-creator-page.component.ts} | 10 ++--
.../room-page.component.html} | 2 +-
.../room-page.component.scss} | 0
.../room-page.component.spec.ts} | 12 ++---
.../room-page.component.ts} | 8 +--
.../room-participant-page.component.html} | 0
.../room-participant-page.component.scss} | 0
.../room-participant-page.component.spec.ts | 25 +++++++++
.../room-participant-page.component.ts} | 8 +--
.../room-participant.component.spec.ts | 25 ---------
.../services/http/authentication.service.ts | 2 +-
src/app/services/http/room.service.ts | 2 +-
61 files changed, 252 insertions(+), 256 deletions(-)
rename src/app/components/pages/{comment-create/comment-create.component.html => comment-create-page/comment-create-page.component.html} (100%)
rename src/app/components/pages/{comment-create/comment-create.component.scss => comment-create-page/comment-create-page.component.scss} (100%)
rename src/app/components/pages/{content-create/content-create.component.spec.ts => comment-create-page/comment-create-page.component.spec.ts} (50%)
rename src/app/components/pages/{comment-create/comment-create.component.ts => comment-create-page/comment-create-page.component.ts} (90%)
rename src/app/components/pages/{content-carousel/content-carousel.component.html => content-carousel-page/content-carousel-page.component.html} (100%)
rename src/app/components/pages/{content-carousel/content-carousel.component.scss => content-carousel-page/content-carousel-page.component.scss} (100%)
create mode 100644 src/app/components/pages/content-carousel-page/content-carousel-page.component.spec.ts
rename src/app/components/pages/{content-carousel/content-carousel.component.ts => content-carousel-page/content-carousel-page.component.ts} (56%)
rename src/app/components/pages/{content-create/content-create.component.html => content-create-page/content-create-page.component.html} (100%)
rename src/app/components/pages/{content-create/content-create.component.scss => content-create-page/content-create-page.component.scss} (100%)
rename src/app/components/pages/{content-carousel/content-carousel.component.spec.ts => content-create-page/content-create-page.component.spec.ts} (50%)
create mode 100644 src/app/components/pages/content-create-page/content-create-page.component.ts
delete mode 100644 src/app/components/pages/content-create/content-create.component.ts
rename src/app/components/pages/{home-creator/home-creator.component.html => home-creator-page/home-creator-page.component.html} (100%)
rename src/app/components/pages/{home-creator/home-creator.component.scss => home-creator-page/home-creator-page.component.scss} (100%)
rename src/app/components/pages/{home-participant/home-participant.component.spec.ts => home-creator-page/home-creator-page.component.spec.ts} (51%)
rename src/app/components/pages/{home-creator/home-creator.component.ts => home-creator-page/home-creator-page.component.ts} (65%)
delete mode 100644 src/app/components/pages/home-creator/home-creator.component.spec.ts
rename src/app/components/pages/{home-participant/home-participant.component.html => home-participant-page/home-participant-page.component.html} (100%)
rename src/app/components/pages/{home-participant/home-participant.component.scss => home-participant-page/home-participant-page.component.scss} (100%)
create mode 100644 src/app/components/pages/home-participant-page/home-participant-page.component.spec.ts
create mode 100644 src/app/components/pages/home-participant-page/home-participant-page.component.ts
delete mode 100644 src/app/components/pages/home-participant/home-participant.component.ts
rename src/app/components/pages/{login/login.component.html => login-page/login-page.component.html} (100%)
rename src/app/components/pages/{login/login.component.scss => login-page/login-page.component.scss} (100%)
rename src/app/components/pages/{login/login.component.spec.ts => login-page/login-page.component.spec.ts} (55%)
rename src/app/components/pages/{login/login.component.ts => login-page/login-page.component.ts} (80%)
rename src/app/components/pages/{page-not-found/page-not-found.component.html => page-not-found-page/page-not-found-page.component.html} (100%)
rename src/app/components/pages/{page-not-found/page-not-found.component.scss => page-not-found-page/page-not-found-page.component.scss} (100%)
rename src/app/components/pages/{comment-create/comment-create.component.spec.ts => page-not-found-page/page-not-found-page.component.spec.ts} (51%)
create mode 100644 src/app/components/pages/page-not-found-page/page-not-found-page.component.ts
delete mode 100644 src/app/components/pages/page-not-found/page-not-found.component.spec.ts
delete mode 100644 src/app/components/pages/page-not-found/page-not-found.component.ts
rename src/app/components/pages/{room-creator/room-creator.component.html => room-creator-page/room-creator-page.component.html} (100%)
rename src/app/components/pages/{room-creator/room-creator.component.scss => room-creator-page/room-creator-page.component.scss} (100%)
rename src/app/components/pages/{room-creator/room-creator.component.spec.ts => room-creator-page/room-creator-page.component.spec.ts} (51%)
rename src/app/components/pages/{room-creator/room-creator.component.ts => room-creator-page/room-creator-page.component.ts} (90%)
rename src/app/components/pages/{room/room.component.html => room-page/room-page.component.html} (93%)
rename src/app/components/pages/{room/room.component.scss => room-page/room-page.component.scss} (100%)
rename src/app/components/pages/{room/room.component.spec.ts => room-page/room-page.component.spec.ts} (55%)
rename src/app/components/pages/{room/room.component.ts => room-page/room-page.component.ts} (83%)
rename src/app/components/pages/{room-participant/room-participant.component.html => room-participant-page/room-participant-page.component.html} (100%)
rename src/app/components/pages/{room-participant/room-participant.component.scss => room-participant-page/room-participant-page.component.scss} (100%)
create mode 100644 src/app/components/pages/room-participant-page/room-participant-page.component.spec.ts
rename src/app/components/pages/{room-participant/room-participant.component.ts => room-participant-page/room-participant-page.component.ts} (78%)
delete mode 100644 src/app/components/pages/room-participant/room-participant.component.spec.ts
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index b6e5dbbd3..0bcec1833 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -1,21 +1,21 @@
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
-import { PageNotFoundComponent } from './components/pages/page-not-found/page-not-found.component';
-import { LoginComponent } from './components/pages/login/login.component';
-import { HomeCreatorComponent } from './components/pages/home-creator/home-creator.component';
-import { CommentCreateComponent } from './components/pages/comment-create/comment-create.component';
-import { HomeParticipantComponent } from './components/pages/home-participant/home-participant.component';
+import { PageNotFoundPageComponent } from './components/pages/page-not-found-page/page-not-found-page.component';
+import { LoginComponentPage } from './components/pages/login-page/login-page.component';
+import { HomeCreatorPageComponent } from './components/pages/home-creator-page/home-creator-page.component';
+import { CommentCreatePageComponent } from './components/pages/comment-create-page/comment-create-page.component';
+import { HomeParticipantPageComponent } from './components/pages/home-participant-page/home-participant-page.component';
import { AuthenticationGuard } from './guards/authentication.guard';
import { UserRole } from './models/user-roles.enum';
-import { RoomParticipantComponent } from './components/pages/room-participant/room-participant.component';
-import { RoomCreatorComponent } from './components/pages/room-creator/room-creator.component';
+import { RoomParticipantPageComponent } from './components/pages/room-participant-page/room-participant-page.component';
+import { RoomCreatorPageComponent } from './components/pages/room-creator-page/room-creator-page.component';
import { CommentListComponent } from './components/fragments/comment-list/comment-list.component';
import { ContentListComponent } from './components/fragments/content-list/content-list.component';
import { StatisticsComponent } from './components/fragments/statistics/statistics.component';
-import { ContentCreateComponent } from './components/pages/content-create/content-create.component';
+import { ContentCreatePageComponent } from './components/pages/content-create-page/content-create-page.component';
import {
- ContentCarouselComponent
-} from './components/pages/content-carousel/content-carousel.component';
+ ContentCarouselPageComponent
+} from './components/pages/content-carousel-page/content-carousel-page.component';
const routes: Routes = [
{
@@ -25,71 +25,71 @@ const routes: Routes = [
},
{
path: 'home',
- component: LoginComponent
+ component: LoginComponentPage
},
{
path: 'creator',
- component: HomeCreatorComponent,
+ component: HomeCreatorPageComponent,
canActivate: [AuthenticationGuard],
data: { roles: [UserRole.CREATOR] }
},
{
- path: 'creator/room/:roomId',
- component: RoomCreatorComponent,
+ path: 'creator/room-page/:roomId',
+ component: RoomCreatorPageComponent,
canActivate: [AuthenticationGuard],
data: { roles: [UserRole.CREATOR] }
},
{
- path: 'creator/room/:roomId/content-create',
- component: ContentCreateComponent,
+ path: 'creator/room-page/:roomId/content-create-page',
+ component: ContentCreatePageComponent,
canActivate: [AuthenticationGuard],
data: { roles: [UserRole.CREATOR] }
},
{
- path: 'creator/room/:roomId/statistics',
+ path: 'creator/room-page/:roomId/statistics',
component: StatisticsComponent,
canActivate: [AuthenticationGuard],
data: { roles: [UserRole.CREATOR] }
},
{
- path: 'creator/room/:roomId/comments',
+ path: 'creator/room-page/:roomId/comments',
component: CommentListComponent,
canActivate: [AuthenticationGuard],
data: { roles: [UserRole.CREATOR] }
},
{
- path: 'creator/room/:roomId/content',
+ path: 'creator/room-page/:roomId/content',
component: ContentListComponent,
canActivate: [AuthenticationGuard],
data: { roles: [UserRole.CREATOR] }
},
{
path: 'participant',
- component: HomeParticipantComponent,
+ component: HomeParticipantPageComponent,
canActivate: [AuthenticationGuard],
data: { roles: [UserRole.PARTICIPANT] }
},
{
- path: 'participant/room/:roomId',
- component: RoomParticipantComponent,
+ path: 'participant/room-page/:roomId',
+ component: RoomParticipantPageComponent,
canActivate: [AuthenticationGuard],
data: { roles: [UserRole.PARTICIPANT] }
},
{
- path: 'participant/room/:roomId/comment-create',
- component: CommentCreateComponent,
+ path: 'participant/room-page/:roomId/comment-create-page',
+ component: CommentCreatePageComponent,
canActivate: [AuthenticationGuard],
data: { roles: [UserRole.PARTICIPANT] }
},
{
- path: 'participant/room/:roomId/questions',
- component: ContentCarouselComponent,
+ path: 'participant/room-page/:roomId/questions',
+ component: ContentCarouselPageComponent,
canActivate: [AuthenticationGuard],
data: { roles: [UserRole.PARTICIPANT] }
},
{
path: '**',
- component: PageNotFoundComponent
+ component: PageNotFoundPageComponent
}
];
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 75d21fd39..54bb93ed7 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -1,7 +1,6 @@
import { BrowserModule } from '@angular/platform-browser';
import { NgModule } from '@angular/core';
-
import { AppComponent } from './app.component';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { RoomJoinComponent } from './components/fragments/room-join/room-join.component';
@@ -9,10 +8,9 @@ import { LoginComponent } from './components/fragments/login/login.component';
import { RegisterComponent } from './components/dialogs/register/register.component';
import { PasswordResetComponent } from './components/dialogs/password-reset/password-reset.component';
import { CommentListComponent } from './components/fragments/comment-list/comment-list.component';
-
import { AppRoutingModule } from './app-routing.module';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { PageNotFoundComponent } from './components/pages/page-not-found/page-not-found.component';
+import { PageNotFoundPageComponent } from './components/pages/page-not-found-page/page-not-found-page.component';
import { FlexLayoutModule } from '@angular/flex-layout';
import {
MatAutocompleteModule,
@@ -48,22 +46,21 @@ import {
MatTooltipModule
} from '@angular/material';
import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
-import { RoomComponent } from './components/pages/room/room.component';
+import { RoomPageComponent } from './components/pages/room-page/room-page.component';
import { RoomCreateComponent } from './components/dialogs/room-create/room-create.component';
-import { LoginComponent } from './components/pages/login/login.component';
+import { LoginComponentPage } from './components/pages/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';
import { RoomService } from './services/http/room.service';
import { RoomListComponent } from './components/fragments/room-list/room-list.component';
-import { HomeCreatorComponent } from './components/pages/home-creator/home-creator.component';
-import { CommentCreateComponent } from './components/pages/comment-create/comment-create.component';
+import { HomeCreatorPageComponent } from './components/pages/home-creator-page/home-creator-page.component';
+import { CommentCreatePageComponent } from './components/pages/comment-create-page/comment-create-page.component';
import { CommentService } from './services/http/comment.service';
-import { HomeParticipantComponent } from './components/pages/home-participant/home-participant.component';
-import { RoomParticipantComponent } from './components/pages/room-participant/room-participant.component';
+import { HomeParticipantPageComponent } from './components/pages/home-participant-page/home-participant-page.component';
+import { RoomParticipantPageComponent } from './components/pages/room-participant-page/room-participant-page.component';
import { DataStoreService } from './services/util/data-store.service';
-import { RoomCreatorComponent } from './components/pages/room-creator/room-creator.component';
-import { ContentDetailComponent } from './components/pages/content-detail/content-detail.component';
+import { RoomCreatorPageComponent } from './components/pages/room-creator-page/room-creator-page.component';
import { ContentListComponent } from './components/fragments/content-list/content-list.component';
import { ContentService } from './services/http/content.service';
import { AnswersListComponent } from './components/fragments/answers-list/answers-list.component';
@@ -73,10 +70,10 @@ import { StatisticsComponent } from './components/fragments/statistics/statistic
import { RoomEditComponent } from './components/dialogs/room-edit/room-edit.component';
import { ContentChoiceParticipantComponent } from './components/fragments/content-choice-participant/content-choice-participant.component';
import { ContentChoiceCreatorComponent } from './components/fragments/content-choice-creator/content-choice-creator.component';
-import { ContentCreateComponent } from './components/pages/content-create/content-create.component';
+import { ContentCreatePageComponent } from './components/pages/content-create-page/content-create-page.component';
import {
- ContentCarouselComponent
-} from './components/pages/content-carousel/content-carousel.component';
+ ContentCarouselPageComponent
+} from './components/pages/content-carousel-page/content-carousel-page.component';
import { ContentTextParticipantComponent } from './components/fragments/content-text-participant/content-text-participant.component';
import { ContentTextCreatorComponent } from './components/fragments/content-text-creator/content-text-creator.component';
import { AuthenticationInterceptor } from './interceptors/authentication.interceptor';
@@ -86,30 +83,29 @@ import { AuthenticationInterceptor } from './interceptors/authentication.interce
AppComponent,
RoomJoinComponent,
AppComponent,
+ LoginComponentPage,
LoginComponent,
- LoginComponent,
- PageNotFoundComponent,
+ PageNotFoundPageComponent,
PasswordResetComponent,
RegisterComponent,
- RoomComponent,
+ RoomPageComponent,
RegisterComponent,
RoomCreateComponent,
RoomListComponent,
- HomeCreatorComponent,
- CommentCreateComponent,
- HomeParticipantComponent,
+ HomeCreatorPageComponent,
+ CommentCreatePageComponent,
+ HomeParticipantPageComponent,
CommentListComponent,
- RoomParticipantComponent,
- RoomCreatorComponent,
- ContentDetailComponent,
+ RoomParticipantPageComponent,
+ RoomCreatorPageComponent,
ContentListComponent,
AnswersListComponent,
RoomDeleteComponent,
RoomEditComponent,
ContentChoiceParticipantComponent,
ContentChoiceCreatorComponent,
- ContentCreateComponent,
- ContentCarouselComponent,
+ ContentCreatePageComponent,
+ ContentCarouselPageComponent,
ContentTextParticipantComponent,
StatisticsComponent,
ContentTextCreatorComponent
diff --git a/src/app/components/dialogs/room-create/room-create.component.ts b/src/app/components/dialogs/room-create/room-create.component.ts
index 999b8f02b..654cefc74 100644
--- a/src/app/components/dialogs/room-create/room-create.component.ts
+++ b/src/app/components/dialogs/room-create/room-create.component.ts
@@ -6,7 +6,7 @@ import { NotificationService } from '../../../services/util/notification.service
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
@Component({
- selector: 'app-room-creation',
+ selector: 'app-room-create',
templateUrl: './room-create.component.html',
styleUrls: ['./room-create.component.scss']
})
diff --git a/src/app/components/dialogs/room-delete/room-delete.component.ts b/src/app/components/dialogs/room-delete/room-delete.component.ts
index 52ce622f8..21d11cf71 100644
--- a/src/app/components/dialogs/room-delete/room-delete.component.ts
+++ b/src/app/components/dialogs/room-delete/room-delete.component.ts
@@ -7,7 +7,7 @@ import { RoomService } from '../../../services/http/room.service';
import { Room } from '../../../models/room';
@Component({
- selector: 'app-room-deletion',
+ selector: 'app-room-delete',
templateUrl: './room-delete.component.html',
styleUrls: ['./room-delete.component.scss']
})
diff --git a/src/app/components/dialogs/room-edit/room-edit.component.ts b/src/app/components/dialogs/room-edit/room-edit.component.ts
index 36344b96e..99158d159 100644
--- a/src/app/components/dialogs/room-edit/room-edit.component.ts
+++ b/src/app/components/dialogs/room-edit/room-edit.component.ts
@@ -7,7 +7,7 @@ import { NotificationService } from '../../../services/util/notification.service
import { Router } from '@angular/router';
@Component({
- selector: 'app-room-modification',
+ selector: 'app-room-edit',
templateUrl: './room-edit.component.html',
styleUrls: ['./room-edit.component.scss']
})
diff --git a/src/app/components/fragments/answers-list/answers-list.component.ts b/src/app/components/fragments/answers-list/answers-list.component.ts
index 64b7fe7ab..f551b2c25 100644
--- a/src/app/components/fragments/answers-list/answers-list.component.ts
+++ b/src/app/components/fragments/answers-list/answers-list.component.ts
@@ -5,7 +5,7 @@ import { ActivatedRoute } from '@angular/router';
import { ContentService } from '../../../services/http/content.service';
@Component({
- selector: 'app-content-answers-list',
+ selector: 'app-answers-list',
templateUrl: './answers-list.component.html',
styleUrls: ['./answers-list.component.scss']
})
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 41454d2f9..48b8a0b08 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
@@ -14,7 +14,7 @@ export class DisplayAnswer {
}
@Component({
- selector: 'app-creator-choice-content',
+ selector: 'app-content-choice-creator',
templateUrl: './content-choice-creator.component.html',
styleUrls: ['./content-choice-creator.component.scss']
})
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 48e17341d..b7890316f 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
@@ -14,7 +14,7 @@ class CheckedAnswer {
}
@Component({
- selector: 'app-participant-choice-content',
+ selector: 'app-content-choice-participant',
templateUrl: './content-choice-participant.component.html',
styleUrls: ['./content-choice-participant.component.scss']
})
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 29d66e4ea..c7edf502e 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
@@ -3,7 +3,7 @@ import { ContentText } from '../../../models/content-text';
import { ContentService } from '../../../services/http/content.service';
@Component({
- selector: 'app-creator-text-content',
+ selector: 'app-content-text-creator',
templateUrl: './content-text-creator.component.html',
styleUrls: ['./content-text-creator.component.scss']
})
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 dae2ffc4c..fb2b11c90 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
@@ -4,7 +4,7 @@ import { ContentAnswerService } from '../../../services/http/content-answer.serv
import { AnswerText } from '../../../models/answer-text';
@Component({
- selector: 'app-participant-text-content',
+ selector: 'app-content-text-participant',
templateUrl: './content-text-participant.component.html',
styleUrls: ['./content-text-participant.component.scss']
})
diff --git a/src/app/components/fragments/login/login.component.spec.ts b/src/app/components/fragments/login/login.component.spec.ts
index d6d85a846..d79ec79b9 100644
--- a/src/app/components/fragments/login/login.component.spec.ts
+++ b/src/app/components/fragments/login/login.component.spec.ts
@@ -2,7 +2,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { LoginComponent } from './login.component';
-describe('LoginComponent', () => {
+describe('LoginComponentPage', () => {
let component: LoginComponent;
let fixture: ComponentFixture<LoginComponent>;
diff --git a/src/app/components/fragments/room-join/room-join.component.ts b/src/app/components/fragments/room-join/room-join.component.ts
index 815c41a0b..8827f35a6 100644
--- a/src/app/components/fragments/room-join/room-join.component.ts
+++ b/src/app/components/fragments/room-join/room-join.component.ts
@@ -15,7 +15,7 @@ export class JoinErrorStateMatcher implements ErrorStateMatcher {
}
@Component({
- selector: 'app-join-room',
+ selector: 'app-room-join',
templateUrl: './room-join.component.html',
styleUrls: ['./room-join.component.scss']
})
diff --git a/src/app/components/fragments/statistics/statistics.component.ts b/src/app/components/fragments/statistics/statistics.component.ts
index 0e3e59de6..1e7deec03 100644
--- a/src/app/components/fragments/statistics/statistics.component.ts
+++ b/src/app/components/fragments/statistics/statistics.component.ts
@@ -9,7 +9,7 @@ import { AnswerChoice } from '../../../models/answer-choice';
import { ContentType } from '../../../models/content-type.enum';
@Component({
- selector: 'app-answer-statistics',
+ selector: 'app-statistics',
templateUrl: './statistics.component.html',
styleUrls: ['./statistics.component.scss']
})
diff --git a/src/app/components/pages/comment-create/comment-create.component.html b/src/app/components/pages/comment-create-page/comment-create-page.component.html
similarity index 100%
rename from src/app/components/pages/comment-create/comment-create.component.html
rename to src/app/components/pages/comment-create-page/comment-create-page.component.html
diff --git a/src/app/components/pages/comment-create/comment-create.component.scss b/src/app/components/pages/comment-create-page/comment-create-page.component.scss
similarity index 100%
rename from src/app/components/pages/comment-create/comment-create.component.scss
rename to src/app/components/pages/comment-create-page/comment-create-page.component.scss
diff --git a/src/app/components/pages/content-create/content-create.component.spec.ts b/src/app/components/pages/comment-create-page/comment-create-page.component.spec.ts
similarity index 50%
rename from src/app/components/pages/content-create/content-create.component.spec.ts
rename to src/app/components/pages/comment-create-page/comment-create-page.component.spec.ts
index cdb92eb43..620a2fadd 100644
--- a/src/app/components/pages/content-create/content-create.component.spec.ts
+++ b/src/app/components/pages/comment-create-page/comment-create-page.component.spec.ts
@@ -1,20 +1,20 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ContentCreateComponent } from './content-create.component';
+import { CommentCreatePageComponent } from './comment-create-page.component';
-describe('ContentCreateComponent', () => {
- let component: ContentCreateComponent;
- let fixture: ComponentFixture<ContentCreateComponent>;
+describe('CommentCreatePageComponent', () => {
+ let component: CommentCreatePageComponent;
+ let fixture: ComponentFixture<CommentCreatePageComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
- declarations: [ ContentCreateComponent ]
+ declarations: [ CommentCreatePageComponent ]
})
.compileComponents();
}));
beforeEach(() => {
- fixture = TestBed.createComponent(ContentCreateComponent);
+ fixture = TestBed.createComponent(CommentCreatePageComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
diff --git a/src/app/components/pages/comment-create/comment-create.component.ts b/src/app/components/pages/comment-create-page/comment-create-page.component.ts
similarity index 90%
rename from src/app/components/pages/comment-create/comment-create.component.ts
rename to src/app/components/pages/comment-create-page/comment-create-page.component.ts
index 0eb1e2f6b..0df47cf08 100644
--- a/src/app/components/pages/comment-create/comment-create.component.ts
+++ b/src/app/components/pages/comment-create-page/comment-create-page.component.ts
@@ -11,11 +11,11 @@ import { User } from '../../../models/user';
import { CommentListComponent } from '../../fragments/comment-list/comment-list.component';
@Component({
- selector: 'app-create-comment',
- templateUrl: './comment-create.component.html',
- styleUrls: ['./comment-create.component.scss']
+ selector: 'app-comment-create-page',
+ templateUrl: './comment-create-page.component.html',
+ styleUrls: ['./comment-create-page.component.scss']
})
-export class CommentCreateComponent implements OnInit {
+export class CommentCreatePageComponent implements OnInit {
@ViewChild(CommentListComponent) child: CommentListComponent;
@Input() room: Room;
user: User;
diff --git a/src/app/components/pages/content-carousel/content-carousel.component.html b/src/app/components/pages/content-carousel-page/content-carousel-page.component.html
similarity index 100%
rename from src/app/components/pages/content-carousel/content-carousel.component.html
rename to src/app/components/pages/content-carousel-page/content-carousel-page.component.html
diff --git a/src/app/components/pages/content-carousel/content-carousel.component.scss b/src/app/components/pages/content-carousel-page/content-carousel-page.component.scss
similarity index 100%
rename from src/app/components/pages/content-carousel/content-carousel.component.scss
rename to src/app/components/pages/content-carousel-page/content-carousel-page.component.scss
diff --git a/src/app/components/pages/content-carousel-page/content-carousel-page.component.spec.ts b/src/app/components/pages/content-carousel-page/content-carousel-page.component.spec.ts
new file mode 100644
index 000000000..2bc8beb7a
--- /dev/null
+++ b/src/app/components/pages/content-carousel-page/content-carousel-page.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ContentCarouselPageComponent } from './content-carousel-page.component';
+
+describe('ContentCarouselPageComponent', () => {
+ let component: ContentCarouselPageComponent;
+ let fixture: ComponentFixture<ContentCarouselPageComponent>;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ ContentCarouselPageComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(ContentCarouselPageComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/components/pages/content-carousel/content-carousel.component.ts b/src/app/components/pages/content-carousel-page/content-carousel-page.component.ts
similarity index 56%
rename from src/app/components/pages/content-carousel/content-carousel.component.ts
rename to src/app/components/pages/content-carousel-page/content-carousel-page.component.ts
index b4d465f99..3fa5301e9 100644
--- a/src/app/components/pages/content-carousel/content-carousel.component.ts
+++ b/src/app/components/pages/content-carousel-page/content-carousel-page.component.ts
@@ -3,11 +3,11 @@ import { Content } from '../../../models/content';
import { ContentType } from '../../../models/content-type.enum';
@Component({
- selector: 'app-participant-content-carousel-page',
- templateUrl: './content-carousel.component.html',
- styleUrls: ['./content-carousel.component.scss']
+ selector: 'app-content-carousel-page',
+ templateUrl: './content-carousel-page.component.html',
+ styleUrls: ['./content-carousel-page.component.scss']
})
-export class ContentCarouselComponent implements OnInit {
+export class ContentCarouselPageComponent implements OnInit {
ContentType: ContentType;
contents: Content[];
diff --git a/src/app/components/pages/content-create/content-create.component.html b/src/app/components/pages/content-create-page/content-create-page.component.html
similarity index 100%
rename from src/app/components/pages/content-create/content-create.component.html
rename to src/app/components/pages/content-create-page/content-create-page.component.html
diff --git a/src/app/components/pages/content-create/content-create.component.scss b/src/app/components/pages/content-create-page/content-create-page.component.scss
similarity index 100%
rename from src/app/components/pages/content-create/content-create.component.scss
rename to src/app/components/pages/content-create-page/content-create-page.component.scss
diff --git a/src/app/components/pages/content-carousel/content-carousel.component.spec.ts b/src/app/components/pages/content-create-page/content-create-page.component.spec.ts
similarity index 50%
rename from src/app/components/pages/content-carousel/content-carousel.component.spec.ts
rename to src/app/components/pages/content-create-page/content-create-page.component.spec.ts
index 08426152c..587087470 100644
--- a/src/app/components/pages/content-carousel/content-carousel.component.spec.ts
+++ b/src/app/components/pages/content-create-page/content-create-page.component.spec.ts
@@ -1,20 +1,20 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ContentCarouselComponent } from './content-carousel.component';
+import { ContentCreatePageComponent } from './content-create-page.component';
-describe('ContentCarouselComponent', () => {
- let component: ContentCarouselComponent;
- let fixture: ComponentFixture<ContentCarouselComponent>;
+describe('ContentCreatePageComponent', () => {
+ let component: ContentCreatePageComponent;
+ let fixture: ComponentFixture<ContentCreatePageComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
- declarations: [ ContentCarouselComponent ]
+ declarations: [ ContentCreatePageComponent ]
})
.compileComponents();
}));
beforeEach(() => {
- fixture = TestBed.createComponent(ContentCarouselComponent);
+ fixture = TestBed.createComponent(ContentCreatePageComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
diff --git a/src/app/components/pages/content-create-page/content-create-page.component.ts b/src/app/components/pages/content-create-page/content-create-page.component.ts
new file mode 100644
index 000000000..e206171bd
--- /dev/null
+++ b/src/app/components/pages/content-create-page/content-create-page.component.ts
@@ -0,0 +1,14 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+ selector: 'app-content-create-page',
+ templateUrl: './content-create-page.component.html',
+ styleUrls: ['./content-create-page.component.scss']
+})
+export class ContentCreatePageComponent implements OnInit {
+
+ constructor() { }
+
+ ngOnInit() {
+ }
+}
diff --git a/src/app/components/pages/content-create/content-create.component.ts b/src/app/components/pages/content-create/content-create.component.ts
deleted file mode 100644
index 98c6d179d..000000000
--- a/src/app/components/pages/content-create/content-create.component.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
- selector: 'app-add-content',
- templateUrl: './content-create.component.html',
- styleUrls: ['./content-create.component.scss']
-})
-export class ContentCreateComponent implements OnInit {
-
- constructor() { }
-
- ngOnInit() {
- }
-}
diff --git a/src/app/components/pages/home-creator/home-creator.component.html b/src/app/components/pages/home-creator-page/home-creator-page.component.html
similarity index 100%
rename from src/app/components/pages/home-creator/home-creator.component.html
rename to src/app/components/pages/home-creator-page/home-creator-page.component.html
diff --git a/src/app/components/pages/home-creator/home-creator.component.scss b/src/app/components/pages/home-creator-page/home-creator-page.component.scss
similarity index 100%
rename from src/app/components/pages/home-creator/home-creator.component.scss
rename to src/app/components/pages/home-creator-page/home-creator-page.component.scss
diff --git a/src/app/components/pages/home-participant/home-participant.component.spec.ts b/src/app/components/pages/home-creator-page/home-creator-page.component.spec.ts
similarity index 51%
rename from src/app/components/pages/home-participant/home-participant.component.spec.ts
rename to src/app/components/pages/home-creator-page/home-creator-page.component.spec.ts
index 543929a27..faf88860e 100644
--- a/src/app/components/pages/home-participant/home-participant.component.spec.ts
+++ b/src/app/components/pages/home-creator-page/home-creator-page.component.spec.ts
@@ -1,20 +1,20 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { HomeParticipantComponent } from './home-participant.component';
+import { HomeCreatorPageComponent } from './home-creator-page.component';
-describe('HomeParticipantComponent', () => {
- let component: HomeParticipantComponent;
- let fixture: ComponentFixture<HomeParticipantComponent>;
+describe('HomeCreatorPageComponent', () => {
+ let component: HomeCreatorPageComponent;
+ let fixture: ComponentFixture<HomeCreatorPageComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
- declarations: [ HomeParticipantComponent ]
+ declarations: [ HomeCreatorPageComponent ]
})
.compileComponents();
}));
beforeEach(() => {
- fixture = TestBed.createComponent(HomeParticipantComponent);
+ fixture = TestBed.createComponent(HomeCreatorPageComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
diff --git a/src/app/components/pages/home-creator/home-creator.component.ts b/src/app/components/pages/home-creator-page/home-creator-page.component.ts
similarity index 65%
rename from src/app/components/pages/home-creator/home-creator.component.ts
rename to src/app/components/pages/home-creator-page/home-creator-page.component.ts
index 1fc95d18c..965d3dd0c 100644
--- a/src/app/components/pages/home-creator/home-creator.component.ts
+++ b/src/app/components/pages/home-creator-page/home-creator-page.component.ts
@@ -3,11 +3,11 @@ import { MatDialog } from '@angular/material';
import { RoomCreateComponent } from '../../dialogs/room-create/room-create.component';
@Component({
- selector: 'app-creator-home-screen',
- templateUrl: './home-creator.component.html',
- styleUrls: ['./home-creator.component.scss']
+ selector: 'app-home-creator-page',
+ templateUrl: './home-creator-page.component.html',
+ styleUrls: ['./home-creator-page.component.scss']
})
-export class HomeCreatorComponent implements OnInit {
+export class HomeCreatorPageComponent implements OnInit {
constructor(public dialog: MatDialog) {
}
diff --git a/src/app/components/pages/home-creator/home-creator.component.spec.ts b/src/app/components/pages/home-creator/home-creator.component.spec.ts
deleted file mode 100644
index 0aa43ba7f..000000000
--- a/src/app/components/pages/home-creator/home-creator.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { HomeCreatorComponent } from './home-creator.component';
-
-describe('HomeCreatorComponent', () => {
- let component: HomeCreatorComponent;
- let fixture: ComponentFixture<HomeCreatorComponent>;
-
- beforeEach(async(() => {
- TestBed.configureTestingModule({
- declarations: [ HomeCreatorComponent ]
- })
- .compileComponents();
- }));
-
- beforeEach(() => {
- fixture = TestBed.createComponent(HomeCreatorComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/src/app/components/pages/home-participant/home-participant.component.html b/src/app/components/pages/home-participant-page/home-participant-page.component.html
similarity index 100%
rename from src/app/components/pages/home-participant/home-participant.component.html
rename to src/app/components/pages/home-participant-page/home-participant-page.component.html
diff --git a/src/app/components/pages/home-participant/home-participant.component.scss b/src/app/components/pages/home-participant-page/home-participant-page.component.scss
similarity index 100%
rename from src/app/components/pages/home-participant/home-participant.component.scss
rename to src/app/components/pages/home-participant-page/home-participant-page.component.scss
diff --git a/src/app/components/pages/home-participant-page/home-participant-page.component.spec.ts b/src/app/components/pages/home-participant-page/home-participant-page.component.spec.ts
new file mode 100644
index 000000000..105cf20c8
--- /dev/null
+++ b/src/app/components/pages/home-participant-page/home-participant-page.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { HomeParticipantPageComponent } from './home-participant-page.component';
+
+describe('HomeParticipantPageComponent', () => {
+ let component: HomeParticipantPageComponent;
+ let fixture: ComponentFixture<HomeParticipantPageComponent>;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ HomeParticipantPageComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(HomeParticipantPageComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/components/pages/home-participant-page/home-participant-page.component.ts b/src/app/components/pages/home-participant-page/home-participant-page.component.ts
new file mode 100644
index 000000000..cdf91279c
--- /dev/null
+++ b/src/app/components/pages/home-participant-page/home-participant-page.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+ selector: 'app-home-participant-page',
+ templateUrl: './home-participant-page.component.html',
+ styleUrls: ['./home-participant-page.component.scss']
+})
+export class HomeParticipantPageComponent implements OnInit {
+
+ constructor() { }
+
+ ngOnInit() {
+ }
+
+}
diff --git a/src/app/components/pages/home-participant/home-participant.component.ts b/src/app/components/pages/home-participant/home-participant.component.ts
deleted file mode 100644
index 073db93da..000000000
--- a/src/app/components/pages/home-participant/home-participant.component.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
- selector: 'app-participant-home-screen',
- templateUrl: './home-participant.component.html',
- styleUrls: ['./home-participant.component.scss']
-})
-export class HomeParticipantComponent implements OnInit {
-
- constructor() { }
-
- ngOnInit() {
- }
-
-}
diff --git a/src/app/components/pages/login/login.component.html b/src/app/components/pages/login-page/login-page.component.html
similarity index 100%
rename from src/app/components/pages/login/login.component.html
rename to src/app/components/pages/login-page/login-page.component.html
diff --git a/src/app/components/pages/login/login.component.scss b/src/app/components/pages/login-page/login-page.component.scss
similarity index 100%
rename from src/app/components/pages/login/login.component.scss
rename to src/app/components/pages/login-page/login-page.component.scss
diff --git a/src/app/components/pages/login/login.component.spec.ts b/src/app/components/pages/login-page/login-page.component.spec.ts
similarity index 55%
rename from src/app/components/pages/login/login.component.spec.ts
rename to src/app/components/pages/login-page/login-page.component.spec.ts
index d6d85a846..fc0471ca5 100644
--- a/src/app/components/pages/login/login.component.spec.ts
+++ b/src/app/components/pages/login-page/login-page.component.spec.ts
@@ -1,20 +1,20 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { LoginComponent } from './login.component';
+import { LoginComponentPage } from './login-page.component';
-describe('LoginComponent', () => {
- let component: LoginComponent;
- let fixture: ComponentFixture<LoginComponent>;
+describe('LoginComponentPage', () => {
+ let component: LoginComponentPage;
+ let fixture: ComponentFixture<LoginComponentPage>;
beforeEach(async(() => {
TestBed.configureTestingModule({
- declarations: [ LoginComponent ]
+ declarations: [ LoginComponentPage ]
})
.compileComponents();
}));
beforeEach(() => {
- fixture = TestBed.createComponent(LoginComponent);
+ fixture = TestBed.createComponent(LoginComponentPage);
component = fixture.componentInstance;
fixture.detectChanges();
});
diff --git a/src/app/components/pages/login/login.component.ts b/src/app/components/pages/login-page/login-page.component.ts
similarity index 80%
rename from src/app/components/pages/login/login.component.ts
rename to src/app/components/pages/login-page/login-page.component.ts
index 11f209d12..9bc4b4e8e 100644
--- a/src/app/components/pages/login/login.component.ts
+++ b/src/app/components/pages/login-page/login-page.component.ts
@@ -5,11 +5,11 @@ import { PasswordResetComponent } from '../../dialogs/password-reset/password-re
import { UserRole } from '../../../models/user-roles.enum';
@Component({
- selector: 'app-login-screen',
- templateUrl: './login.component.html',
- styleUrls: ['./login.component.scss']
+ selector: 'app-login-page',
+ templateUrl: './login-page.component.html',
+ styleUrls: ['./login-page.component.scss']
})
-export class LoginComponent implements OnInit {
+export class LoginComponentPage implements OnInit {
// Make UserRole available to the template
UserRole = UserRole;
diff --git a/src/app/components/pages/page-not-found/page-not-found.component.html b/src/app/components/pages/page-not-found-page/page-not-found-page.component.html
similarity index 100%
rename from src/app/components/pages/page-not-found/page-not-found.component.html
rename to src/app/components/pages/page-not-found-page/page-not-found-page.component.html
diff --git a/src/app/components/pages/page-not-found/page-not-found.component.scss b/src/app/components/pages/page-not-found-page/page-not-found-page.component.scss
similarity index 100%
rename from src/app/components/pages/page-not-found/page-not-found.component.scss
rename to src/app/components/pages/page-not-found-page/page-not-found-page.component.scss
diff --git a/src/app/components/pages/comment-create/comment-create.component.spec.ts b/src/app/components/pages/page-not-found-page/page-not-found-page.component.spec.ts
similarity index 51%
rename from src/app/components/pages/comment-create/comment-create.component.spec.ts
rename to src/app/components/pages/page-not-found-page/page-not-found-page.component.spec.ts
index fd17d5a87..ed19b3e10 100644
--- a/src/app/components/pages/comment-create/comment-create.component.spec.ts
+++ b/src/app/components/pages/page-not-found-page/page-not-found-page.component.spec.ts
@@ -1,20 +1,20 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { CommentCreateComponent } from './comment-create.component';
+import { PageNotFoundPageComponent } from './page-not-found-page.component';
-describe('CommentCreateComponent', () => {
- let component: CommentCreateComponent;
- let fixture: ComponentFixture<CommentCreateComponent>;
+describe('PageNotFoundPageComponent', () => {
+ let component: PageNotFoundPageComponent;
+ let fixture: ComponentFixture<PageNotFoundPageComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
- declarations: [ CommentCreateComponent ]
+ declarations: [ PageNotFoundPageComponent ]
})
.compileComponents();
}));
beforeEach(() => {
- fixture = TestBed.createComponent(CommentCreateComponent);
+ fixture = TestBed.createComponent(PageNotFoundPageComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
diff --git a/src/app/components/pages/page-not-found-page/page-not-found-page.component.ts b/src/app/components/pages/page-not-found-page/page-not-found-page.component.ts
new file mode 100644
index 000000000..4c0551a75
--- /dev/null
+++ b/src/app/components/pages/page-not-found-page/page-not-found-page.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+ selector: 'app-page-not-found-page',
+ templateUrl: './page-not-found-page.component.html',
+ styleUrls: ['./page-not-found-page.component.scss']
+})
+export class PageNotFoundPageComponent implements OnInit {
+
+ constructor() { }
+
+ ngOnInit() {
+ }
+
+}
diff --git a/src/app/components/pages/page-not-found/page-not-found.component.spec.ts b/src/app/components/pages/page-not-found/page-not-found.component.spec.ts
deleted file mode 100644
index 697a94657..000000000
--- a/src/app/components/pages/page-not-found/page-not-found.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { PageNotFoundComponent } from './page-not-found.component';
-
-describe('PageNotFoundComponent', () => {
- let component: PageNotFoundComponent;
- let fixture: ComponentFixture<PageNotFoundComponent>;
-
- beforeEach(async(() => {
- TestBed.configureTestingModule({
- declarations: [ PageNotFoundComponent ]
- })
- .compileComponents();
- }));
-
- beforeEach(() => {
- fixture = TestBed.createComponent(PageNotFoundComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/src/app/components/pages/page-not-found/page-not-found.component.ts b/src/app/components/pages/page-not-found/page-not-found.component.ts
deleted file mode 100644
index 31ae4d80f..000000000
--- a/src/app/components/pages/page-not-found/page-not-found.component.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
- selector: 'app-page-not-found',
- templateUrl: './page-not-found.component.html',
- styleUrls: ['./page-not-found.component.scss']
-})
-export class PageNotFoundComponent implements OnInit {
-
- constructor() { }
-
- ngOnInit() {
- }
-
-}
diff --git a/src/app/components/pages/room-creator/room-creator.component.html b/src/app/components/pages/room-creator-page/room-creator-page.component.html
similarity index 100%
rename from src/app/components/pages/room-creator/room-creator.component.html
rename to src/app/components/pages/room-creator-page/room-creator-page.component.html
diff --git a/src/app/components/pages/room-creator/room-creator.component.scss b/src/app/components/pages/room-creator-page/room-creator-page.component.scss
similarity index 100%
rename from src/app/components/pages/room-creator/room-creator.component.scss
rename to src/app/components/pages/room-creator-page/room-creator-page.component.scss
diff --git a/src/app/components/pages/room-creator/room-creator.component.spec.ts b/src/app/components/pages/room-creator-page/room-creator-page.component.spec.ts
similarity index 51%
rename from src/app/components/pages/room-creator/room-creator.component.spec.ts
rename to src/app/components/pages/room-creator-page/room-creator-page.component.spec.ts
index faf0c6c12..513ef45f9 100644
--- a/src/app/components/pages/room-creator/room-creator.component.spec.ts
+++ b/src/app/components/pages/room-creator-page/room-creator-page.component.spec.ts
@@ -1,20 +1,20 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { RoomCreatorComponent } from './room-creator.component';
+import { RoomCreatorPageComponent } from './room-creator-page.component';
-describe('RoomCreatorComponent', () => {
- let component: RoomCreatorComponent;
- let fixture: ComponentFixture<RoomCreatorComponent>;
+describe('RoomCreatorPageComponent', () => {
+ let component: RoomCreatorPageComponent;
+ let fixture: ComponentFixture<RoomCreatorPageComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
- declarations: [ RoomCreatorComponent ]
+ declarations: [ RoomCreatorPageComponent ]
})
.compileComponents();
}));
beforeEach(() => {
- fixture = TestBed.createComponent(RoomCreatorComponent);
+ fixture = TestBed.createComponent(RoomCreatorPageComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
diff --git a/src/app/components/pages/room-creator/room-creator.component.ts b/src/app/components/pages/room-creator-page/room-creator-page.component.ts
similarity index 90%
rename from src/app/components/pages/room-creator/room-creator.component.ts
rename to src/app/components/pages/room-creator-page/room-creator-page.component.ts
index f6ec6d65c..de14a416a 100644
--- a/src/app/components/pages/room-creator/room-creator.component.ts
+++ b/src/app/components/pages/room-creator-page/room-creator-page.component.ts
@@ -1,7 +1,7 @@
import { Component, OnInit } from '@angular/core';
import { RoomService } from '../../../services/http/room.service';
import { ActivatedRoute } from '@angular/router';
-import { RoomComponent } from '../room/room.component';
+import { RoomPageComponent } from '../room-page/room-page.component';
import { Room } from '../../../models/room';
import { Location } from '@angular/common';
import { NotificationService } from '../../../services/util/notification.service';
@@ -10,11 +10,11 @@ import { RoomDeleteComponent } from '../../dialogs/room-delete/room-delete.compo
import { RoomEditComponent } from '../../dialogs/room-edit/room-edit.component';
@Component({
- selector: 'app-creator-room',
- templateUrl: './room-creator.component.html',
- styleUrls: ['./room-creator.component.scss']
+ selector: 'app-room-creator-page',
+ templateUrl: './room-creator-page.component.html',
+ styleUrls: ['./room-creator-page.component.scss']
})
-export class RoomCreatorComponent extends RoomComponent implements OnInit {
+export class RoomCreatorPageComponent extends RoomPageComponent implements OnInit {
room: Room;
updRoom: Room;
diff --git a/src/app/components/pages/room/room.component.html b/src/app/components/pages/room-page/room-page.component.html
similarity index 93%
rename from src/app/components/pages/room/room.component.html
rename to src/app/components/pages/room-page/room-page.component.html
index e4bc6fc71..b7b68fb77 100644
--- a/src/app/components/pages/room/room.component.html
+++ b/src/app/components/pages/room-page/room-page.component.html
@@ -8,4 +8,4 @@
<mat-list-item>Closed: {{room.closed}}</mat-list-item>
</mat-list>
-<!-- content-type of room-->
+<!-- content-type of room-page-->
diff --git a/src/app/components/pages/room/room.component.scss b/src/app/components/pages/room-page/room-page.component.scss
similarity index 100%
rename from src/app/components/pages/room/room.component.scss
rename to src/app/components/pages/room-page/room-page.component.scss
diff --git a/src/app/components/pages/room/room.component.spec.ts b/src/app/components/pages/room-page/room-page.component.spec.ts
similarity index 55%
rename from src/app/components/pages/room/room.component.spec.ts
rename to src/app/components/pages/room-page/room-page.component.spec.ts
index f51b2a994..594afc11e 100644
--- a/src/app/components/pages/room/room.component.spec.ts
+++ b/src/app/components/pages/room-page/room-page.component.spec.ts
@@ -1,20 +1,20 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { RoomComponent } from './room.component';
+import { RoomPageComponent } from './room-page.component';
-describe('RoomComponent', () => {
- let component: RoomComponent;
- let fixture: ComponentFixture<RoomComponent>;
+describe('RoomPageComponent', () => {
+ let component: RoomPageComponent;
+ let fixture: ComponentFixture<RoomPageComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
- declarations: [ RoomComponent ]
+ declarations: [ RoomPageComponent ]
})
.compileComponents();
}));
beforeEach(() => {
- fixture = TestBed.createComponent(RoomComponent);
+ fixture = TestBed.createComponent(RoomPageComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
diff --git a/src/app/components/pages/room/room.component.ts b/src/app/components/pages/room-page/room-page.component.ts
similarity index 83%
rename from src/app/components/pages/room/room.component.ts
rename to src/app/components/pages/room-page/room-page.component.ts
index a876549a9..74b9e8a8f 100644
--- a/src/app/components/pages/room/room.component.ts
+++ b/src/app/components/pages/room-page/room-page.component.ts
@@ -5,11 +5,11 @@ import { ActivatedRoute } from '@angular/router';
import { Location } from '@angular/common';
@Component({
- selector: 'app-room',
- templateUrl: './room.component.html',
- styleUrls: ['./room.component.scss']
+ selector: 'app-room-page',
+ templateUrl: './room-page.component.html',
+ styleUrls: ['./room-page.component.scss']
})
-export class RoomComponent implements OnInit {
+export class RoomPageComponent implements OnInit {
room: Room = null;
isLoading = true;
diff --git a/src/app/components/pages/room-participant/room-participant.component.html b/src/app/components/pages/room-participant-page/room-participant-page.component.html
similarity index 100%
rename from src/app/components/pages/room-participant/room-participant.component.html
rename to src/app/components/pages/room-participant-page/room-participant-page.component.html
diff --git a/src/app/components/pages/room-participant/room-participant.component.scss b/src/app/components/pages/room-participant-page/room-participant-page.component.scss
similarity index 100%
rename from src/app/components/pages/room-participant/room-participant.component.scss
rename to src/app/components/pages/room-participant-page/room-participant-page.component.scss
diff --git a/src/app/components/pages/room-participant-page/room-participant-page.component.spec.ts b/src/app/components/pages/room-participant-page/room-participant-page.component.spec.ts
new file mode 100644
index 000000000..97d79529d
--- /dev/null
+++ b/src/app/components/pages/room-participant-page/room-participant-page.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { RoomParticipantPageComponent } from './room-participant-page.component';
+
+describe('RoomParticipantPageComponent', () => {
+ let component: RoomParticipantPageComponent;
+ let fixture: ComponentFixture<RoomParticipantPageComponent>;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ RoomParticipantPageComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(RoomParticipantPageComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/components/pages/room-participant/room-participant.component.ts b/src/app/components/pages/room-participant-page/room-participant-page.component.ts
similarity index 78%
rename from src/app/components/pages/room-participant/room-participant.component.ts
rename to src/app/components/pages/room-participant-page/room-participant-page.component.ts
index cc1524f69..886ae3cb7 100644
--- a/src/app/components/pages/room-participant/room-participant.component.ts
+++ b/src/app/components/pages/room-participant-page/room-participant-page.component.ts
@@ -5,11 +5,11 @@ import { RoomService } from '../../../services/http/room.service';
import { ActivatedRoute } from '@angular/router';
@Component({
- selector: 'app-participant-room',
- templateUrl: './room-participant.component.html',
- styleUrls: ['./room-participant.component.scss']
+ selector: 'app-room-participant-page',
+ templateUrl: './room-participant-page.component.html',
+ styleUrls: ['./room-participant-page.component.scss']
})
-export class RoomParticipantComponent implements OnInit {
+export class RoomParticipantPageComponent implements OnInit {
room: Room;
isLoading = true;
diff --git a/src/app/components/pages/room-participant/room-participant.component.spec.ts b/src/app/components/pages/room-participant/room-participant.component.spec.ts
deleted file mode 100644
index 2c4a9241f..000000000
--- a/src/app/components/pages/room-participant/room-participant.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { RoomParticipantComponent } from './room-participant.component';
-
-describe('RoomParticipantComponent', () => {
- let component: RoomParticipantComponent;
- let fixture: ComponentFixture<RoomParticipantComponent>;
-
- beforeEach(async(() => {
- TestBed.configureTestingModule({
- declarations: [ RoomParticipantComponent ]
- })
- .compileComponents();
- }));
-
- beforeEach(() => {
- fixture = TestBed.createComponent(RoomParticipantComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/src/app/services/http/authentication.service.ts b/src/app/services/http/authentication.service.ts
index 456c6adec..5793791f7 100644
--- a/src/app/services/http/authentication.service.ts
+++ b/src/app/services/http/authentication.service.ts
@@ -15,7 +15,7 @@ export class AuthenticationService {
base : 'https://arsnova-staging.mni.thm.de/api',
v2 : 'https://arsnova-staging.mni.thm.de/api/v2',
auth : '/auth',
- login : '/login',
+ login : '/login-page',
user : '/user',
register : '/register',
registered : '/registered',
diff --git a/src/app/services/http/room.service.ts b/src/app/services/http/room.service.ts
index 02fa5ef70..f5f8accfa 100644
--- a/src/app/services/http/room.service.ts
+++ b/src/app/services/http/room.service.ts
@@ -14,7 +14,7 @@ const httpOptions = {
export class RoomService extends BaseHttpService {
private apiUrl = {
base: 'https://arsnova-staging.mni.thm.de/api',
- rooms: '/room',
+ rooms: '/room-page',
user: '/user',
findRooms: '/find'
};
--
GitLab