Client: use templateUrl/styleUrls instead of require

diff --git a/client/src/app/account/account.component.ts b/client/src/app/account/account.component.ts
index b503406c93f2b5e4299302cf1d755de093fb01e4..851eaf198e1ae73dc9b4d84e6d95c815a7d76e80 100644 (file)
--- a/client/src/app/account/account.component.ts
+++ b/client/src/app/account/account.component.ts
@@ -8,7 +8,7 @@ import { FormReactive, USER_PASSWORD } from '../shared';
 
 @Component({
   selector: 'my-account',
-  template: require('./account.component.html')
+  templateUrl: './account.component.html'
 })
 
 export class AccountComponent extends FormReactive implements OnInit {

diff --git a/client/src/app/admin/friends/friend-add/friend-add.component.ts b/client/src/app/admin/friends/friend-add/friend-add.component.ts
index 68363b482509cae5c237232fd141faacf29c708c..7aab82b971227e8b88b04d90f92517374aa0a516 100644 (file)
--- a/client/src/app/admin/friends/friend-add/friend-add.component.ts
+++ b/client/src/app/admin/friends/friend-add/friend-add.component.ts
@@ -7,8 +7,8 @@ import { FriendService } from '../shared';
 
 @Component({
   selector: 'my-friend-add',
-  template: require('./friend-add.component.html'),
-  styles: [ require('./friend-add.component.scss') ]
+  templateUrl: './friend-add.component.html',
+  styleUrls: [ './friend-add.component.scss' ]
 })
 export class FriendAddComponent implements OnInit {
   form: FormGroup;

diff --git a/client/src/app/admin/friends/friend-list/friend-list.component.ts b/client/src/app/admin/friends/friend-list/friend-list.component.ts
index c76fc4df2e2e6b09acb725decc70cbc9f1bf094c..afbb48c1c348f0b8234f16f042ed7eb10b9f35ff 100644 (file)
--- a/client/src/app/admin/friends/friend-list/friend-list.component.ts
+++ b/client/src/app/admin/friends/friend-list/friend-list.component.ts
@@ -4,8 +4,8 @@ import { Friend, FriendService } from '../shared';
 
 @Component({
   selector: 'my-friend-list',
-  template: require('./friend-list.component.html'),
-  styles: [ require('./friend-list.component.scss') ]
+  templateUrl: './friend-list.component.html',
+  styleUrls: [ './friend-list.component.scss' ]
 })
 export class FriendListComponent implements OnInit {
   friends: Friend[];

diff --git a/client/src/app/admin/menu-admin.component.ts b/client/src/app/admin/menu-admin.component.ts
index a9115d49f92d86858575c74475344c7fef06f998..59ffccf9f6c9658689e257e88bd61672fd81b5d6 100644 (file)
--- a/client/src/app/admin/menu-admin.component.ts
+++ b/client/src/app/admin/menu-admin.component.ts
@@ -2,6 +2,6 @@ import { Component } from '@angular/core';
 
 @Component({
   selector: 'my-menu-admin',
-  template: require('./menu-admin.component.html')
+  templateUrl: './menu-admin.component.html'
 })
 export class MenuAdminComponent { }

diff --git a/client/src/app/admin/users/user-add/user-add.component.ts b/client/src/app/admin/users/user-add/user-add.component.ts
index b79437795e9b2edc5be1f6d401f9f4d69aed0766..ab96fb01dac65e3883c37e5e5d1ff11d3942a60c 100644 (file)
--- a/client/src/app/admin/users/user-add/user-add.component.ts
+++ b/client/src/app/admin/users/user-add/user-add.component.ts
@@ -7,7 +7,7 @@ import { FormReactive, USER_USERNAME, USER_PASSWORD } from '../../../shared';
 
 @Component({
   selector: 'my-user-add',
-  template: require('./user-add.component.html')
+  templateUrl: './user-add.component.html'
 })
 export class UserAddComponent extends FormReactive implements OnInit {
   error: string = null;

diff --git a/client/src/app/admin/users/user-list/user-list.component.ts b/client/src/app/admin/users/user-list/user-list.component.ts
index d3827eb288dad602ff3c19b5afc152711b55363e..03f4e5c0aa0f31e7f50fc0268c94e7ac0a49b2b9 100644 (file)
--- a/client/src/app/admin/users/user-list/user-list.component.ts
+++ b/client/src/app/admin/users/user-list/user-list.component.ts
@@ -5,8 +5,8 @@ import { UserService } from '../shared';
 
 @Component({
   selector: 'my-user-list',
-  template: require('./user-list.component.html'),
-  styles: [ require('./user-list.component.scss') ]
+  templateUrl: './user-list.component.html',
+  styleUrls: [ './user-list.component.scss' ]
 })
 export class UserListComponent implements OnInit {
   totalUsers: number;

diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts
index e81993a3f0ed2bd4b6ecb7a5b752ef0a9c4389eb..d6b83c684012153583120f0a0db2985889ad1181 100644 (file)
--- a/client/src/app/app.component.ts
+++ b/client/src/app/app.component.ts
@@ -3,8 +3,8 @@ import { Router } from '@angular/router';
 
 @Component({
     selector: 'my-app',
-    template: require('./app.component.html'),
-    styles: [ require('./app.component.scss') ]
+    templateUrl: './app.component.html',
+    styleUrls: [ './app.component.scss' ]
 })
 
 export class AppComponent {

diff --git a/client/src/app/login/login.component.ts b/client/src/app/login/login.component.ts
index 378714ca1ce540c246ce0f90619e400de3c51e1d..c4ff7050bf1f422301180e31d1e645421844ac91 100644 (file)
--- a/client/src/app/login/login.component.ts
+++ b/client/src/app/login/login.component.ts
@@ -6,7 +6,7 @@ import { AuthService, FormReactive } from '../shared';
 
 @Component({
   selector: 'my-login',
-  template: require('./login.component.html')
+  templateUrl: './login.component.html'
 })
 
 export class LoginComponent extends FormReactive implements OnInit {

diff --git a/client/src/app/menu.component.ts b/client/src/app/menu.component.ts
index 425a12e5d021ce79541418435daa834a489e53f9..6cfc854dde757801c4fe165a0305c56e4edc391b 100644 (file)
--- a/client/src/app/menu.component.ts
+++ b/client/src/app/menu.component.ts
@@ -5,7 +5,7 @@ import { AuthService, AuthStatus } from './shared';
 
 @Component({
   selector: 'my-menu',
-  template: require('./menu.component.html')
+  templateUrl: './menu.component.html'
 })
 export class MenuComponent implements OnInit {
   isLoggedIn: boolean;

diff --git a/client/src/app/shared/search/search.component.ts b/client/src/app/shared/search/search.component.ts
index 7878471dc03213835808e8fd38e4ed45432816dc..b6237469b0efd2ead2440c0350abc77d1787be9c 100644 (file)
--- a/client/src/app/shared/search/search.component.ts
+++ b/client/src/app/shared/search/search.component.ts
@@ -7,7 +7,7 @@ import { SearchService } from './search.service';
 
 @Component({
   selector: 'my-search',
-  template: require('./search.component.html')
+  templateUrl: './search.component.html'
 })
 
 export class SearchComponent implements OnInit {

diff --git a/client/src/app/videos/shared/loader/loader.component.ts b/client/src/app/videos/shared/loader/loader.component.ts
index cdd07d1b4e6a565b7607ff6d9939ef4e97332d02..e72d2f3f3d605bd0d5f0fcdb87f3a41e976229f9 100644 (file)
--- a/client/src/app/videos/shared/loader/loader.component.ts
+++ b/client/src/app/videos/shared/loader/loader.component.ts
@@ -2,8 +2,8 @@ import { Component, Input } from '@angular/core';
 
 @Component({
   selector: 'my-loader',
-  styles: [ require('./loader.component.scss') ],
-  template: require('./loader.component.html')
+  styleUrls: [ './loader.component.scss' ],
+  templateUrl: './loader.component.html'
 })
 
 export class LoaderComponent {

diff --git a/client/src/app/videos/video-add/video-add.component.ts b/client/src/app/videos/video-add/video-add.component.ts
index 16a8409be1da6fb55096dea3c5a9c23e6e610204..d12a7d572481365dc311818bde864f91426d7a05 100644 (file)
--- a/client/src/app/videos/video-add/video-add.component.ts
+++ b/client/src/app/videos/video-add/video-add.component.ts
@@ -8,8 +8,8 @@ import { AuthService, FormReactive, VIDEO_NAME, VIDEO_DESCRIPTION, VIDEO_TAGS }
 
 @Component({
   selector: 'my-videos-add',
-  styles: [ require('./video-add.component.scss') ],
-  template: require('./video-add.component.html')
+  styleUrls: [ './video-add.component.scss' ],
+  templateUrl: './video-add.component.html'
 })
 
 export class VideoAddComponent extends FormReactive implements OnInit {

diff --git a/client/src/app/videos/video-list/video-list.component.ts b/client/src/app/videos/video-list/video-list.component.ts
index fa8e497aab8338760093676a11a1d93da03aded8..6b086e93880b34cee8c2fba58f4878406b215d7a 100644 (file)
--- a/client/src/app/videos/video-list/video-list.component.ts
+++ b/client/src/app/videos/video-list/video-list.component.ts
@@ -12,8 +12,8 @@ import { SearchService } from '../../shared';
 
 @Component({
   selector: 'my-videos-list',
-  styles: [ require('./video-list.component.scss') ],
-  template: require('./video-list.component.html')
+  styleUrls: [ './video-list.component.scss' ],
+  templateUrl: './video-list.component.html'
 })
 
 export class VideoListComponent implements OnInit, OnDestroy {

diff --git a/client/src/app/videos/video-list/video-miniature.component.ts b/client/src/app/videos/video-list/video-miniature.component.ts
index 38317f8320b20668dc399f81f45a59b010a4044d..f807d17ac5606a9830becc959e081fde702cc7c8 100644 (file)
--- a/client/src/app/videos/video-list/video-miniature.component.ts
+++ b/client/src/app/videos/video-list/video-miniature.component.ts
@@ -5,8 +5,8 @@ import { User } from '../../shared';
 
 @Component({
   selector: 'my-video-miniature',
-  styles: [ require('./video-miniature.component.scss') ],
-  template: require('./video-miniature.component.html')
+  styleUrls: [ './video-miniature.component.scss' ],
+  templateUrl: './video-miniature.component.html'
 })
 
 export class VideoMiniatureComponent {

diff --git a/client/src/app/videos/video-list/video-sort.component.ts b/client/src/app/videos/video-list/video-sort.component.ts
index 0d76b54b7a7bd2202368af7afadfbbca83ab6bb8..ca94b07c2e7aa190ee061eb68c0493825883917c 100644 (file)
--- a/client/src/app/videos/video-list/video-sort.component.ts
+++ b/client/src/app/videos/video-list/video-sort.component.ts
@@ -4,7 +4,7 @@ import { SortField } from '../shared';
 
 @Component({
   selector: 'my-video-sort',
-  template: require('./video-sort.component.html')
+  templateUrl: './video-sort.component.html'
 })
 
 export class VideoSortComponent {

diff --git a/client/src/app/videos/video-watch/video-watch.component.ts b/client/src/app/videos/video-watch/video-watch.component.ts
index 2a60e932770be3903495644004ae0ed518df48a7..ada20fc96c6a4efa9c3273d0739db0e59bb2543c 100644 (file)
--- a/client/src/app/videos/video-watch/video-watch.component.ts
+++ b/client/src/app/videos/video-watch/video-watch.component.ts
@@ -6,8 +6,8 @@ import { WebTorrentService } from './webtorrent.service';
 
 @Component({
   selector: 'my-video-watch',
-  template: require('./video-watch.component.html'),
-  styles: [ require('./video-watch.component.scss') ]
+  templateUrl: './video-watch.component.html',
+  styleUrls: [ './video-watch.component.scss' ]
 })
 
 export class VideoWatchComponent implements OnInit, OnDestroy {