From 42dfc654129adcdd659739b188ac26a65e31bc34 Mon Sep 17 00:00:00 2001
From: Lukas Kimpel <lukas.kimpel@mni.thm.de>
Date: Tue, 20 Mar 2018 16:35:36 +0100
Subject: [PATCH] Fix template inclusions
---
src/app/app-routing.module.ts | 4 ++--
src/app/app.module.ts | 4 ++--
.../fragments/login/login.component.spec.ts | 2 +-
.../content-carousel-page.component.html | 4 ++--
.../content-create-page.component.html | 4 ++--
.../home-participant-page.component.html | 2 +-
.../pages/login-page/login-page.component.spec.ts | 12 ++++++------
.../pages/login-page/login-page.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 0bcec1833..4744918af 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -1,7 +1,7 @@
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
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 { LoginComponentPageComponent } 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';
@@ -25,7 +25,7 @@ const routes: Routes = [
},
{
path: 'home',
- component: LoginComponentPage
+ component: LoginComponentPageComponent
},
{
path: 'creator',
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 54bb93ed7..e3397a5b8 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -48,7 +48,7 @@ import {
import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
import { RoomPageComponent } from './components/pages/room-page/room-page.component';
import { RoomCreateComponent } from './components/dialogs/room-create/room-create.component';
-import { LoginComponentPage } from './components/pages/login-page/login-page.component';
+import { LoginComponentPageComponent } 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';
@@ -83,7 +83,7 @@ import { AuthenticationInterceptor } from './interceptors/authentication.interce
AppComponent,
RoomJoinComponent,
AppComponent,
- LoginComponentPage,
+ LoginComponentPageComponent,
LoginComponent,
PageNotFoundPageComponent,
PasswordResetComponent,
diff --git a/src/app/components/fragments/login/login.component.spec.ts b/src/app/components/fragments/login/login.component.spec.ts
index d79ec79b9..cfa3c49d3 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('LoginComponentPage', () => {
+describe('LoginComponentPageComponent', () => {
let component: LoginComponent;
let fixture: ComponentFixture<LoginComponent>;
diff --git a/src/app/components/pages/content-carousel-page/content-carousel-page.component.html b/src/app/components/pages/content-carousel-page/content-carousel-page.component.html
index 38bc1431a..c256a3844 100644
--- a/src/app/components/pages/content-carousel-page/content-carousel-page.component.html
+++ b/src/app/components/pages/content-carousel-page/content-carousel-page.component.html
@@ -9,12 +9,12 @@
-->
<mat-tab label="Text">
<div class="tab-container">
- <app-participant-text-content></app-participant-text-content>
+ <app-content-text-participant></app-content-text-participant>
</div>
</mat-tab>
<mat-tab label="Choice">
<div class="tab-container">
- <app-participant-choice-content></app-participant-choice-content>
+ <app-content-choice-participant></app-content-choice-participant>
</div>
</mat-tab>
</mat-tab-group>
diff --git a/src/app/components/pages/content-create-page/content-create-page.component.html b/src/app/components/pages/content-create-page/content-create-page.component.html
index e55077757..a6cf4afcd 100644
--- a/src/app/components/pages/content-create-page/content-create-page.component.html
+++ b/src/app/components/pages/content-create-page/content-create-page.component.html
@@ -3,12 +3,12 @@
<mat-tab-group>
<mat-tab label="Text">
<div class="tab-container">
- <app-creator-text-content></app-creator-text-content>
+ <app-content-text-creator></app-content-text-creator>
</div>
</mat-tab>
<mat-tab label="Choice">
<div class="tab-container">
- <app-creator-choice-content></app-creator-choice-content>
+ <app-content-choice-creator></app-content-choice-creator>
</div>
</mat-tab>
</mat-tab-group>
diff --git a/src/app/components/pages/home-participant-page/home-participant-page.component.html b/src/app/components/pages/home-participant-page/home-participant-page.component.html
index 68e3b6b6f..4e955fc36 100644
--- a/src/app/components/pages/home-participant-page/home-participant-page.component.html
+++ b/src/app/components/pages/home-participant-page/home-participant-page.component.html
@@ -1,6 +1,6 @@
<div fxLayout="column" fxLayoutAlign="start" fxLayoutGap="20px" fxFill>
<div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="5px">
- <app-join-room></app-join-room>
+ <app-room-join></app-room-join>
</div>
<div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="5px">
<app-room-list></app-room-list>
diff --git a/src/app/components/pages/login-page/login-page.component.spec.ts b/src/app/components/pages/login-page/login-page.component.spec.ts
index fc0471ca5..75f15ff25 100644
--- a/src/app/components/pages/login-page/login-page.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 { LoginComponentPage } from './login-page.component';
+import { LoginComponentPageComponent } from './login-page.component';
-describe('LoginComponentPage', () => {
- let component: LoginComponentPage;
- let fixture: ComponentFixture<LoginComponentPage>;
+describe('LoginComponentPageComponent', () => {
+ let component: LoginComponentPageComponent;
+ let fixture: ComponentFixture<LoginComponentPageComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
- declarations: [ LoginComponentPage ]
+ declarations: [ LoginComponentPageComponent ]
})
.compileComponents();
}));
beforeEach(() => {
- fixture = TestBed.createComponent(LoginComponentPage);
+ fixture = TestBed.createComponent(LoginComponentPageComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
diff --git a/src/app/components/pages/login-page/login-page.component.ts b/src/app/components/pages/login-page/login-page.component.ts
index 9bc4b4e8e..ec893d5c1 100644
--- a/src/app/components/pages/login-page/login-page.component.ts
+++ b/src/app/components/pages/login-page/login-page.component.ts
@@ -9,7 +9,7 @@ import { UserRole } from '../../../models/user-roles.enum';
templateUrl: './login-page.component.html',
styleUrls: ['./login-page.component.scss']
})
-export class LoginComponentPage implements OnInit {
+export class LoginComponentPageComponent implements OnInit {
// Make UserRole available to the template
UserRole = UserRole;
--
GitLab