From ec8d8440a893ba64075da2e57ea04c7976e0b303 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 19 Sep 2016 22:49:31 +0200 Subject: [PATCH] Client: use templateUrl/styleUrls instead of require --- client/src/app/account/account.component.ts | 2 +- .../src/app/admin/friends/friend-add/friend-add.component.ts | 4 ++-- .../app/admin/friends/friend-list/friend-list.component.ts | 4 ++-- client/src/app/admin/menu-admin.component.ts | 2 +- client/src/app/admin/users/user-add/user-add.component.ts | 2 +- client/src/app/admin/users/user-list/user-list.component.ts | 4 ++-- client/src/app/app.component.ts | 4 ++-- client/src/app/login/login.component.ts | 2 +- client/src/app/menu.component.ts | 2 +- client/src/app/shared/search/search.component.ts | 2 +- client/src/app/videos/shared/loader/loader.component.ts | 4 ++-- client/src/app/videos/video-add/video-add.component.ts | 4 ++-- client/src/app/videos/video-list/video-list.component.ts | 4 ++-- client/src/app/videos/video-list/video-miniature.component.ts | 4 ++-- client/src/app/videos/video-list/video-sort.component.ts | 2 +- client/src/app/videos/video-watch/video-watch.component.ts | 4 ++-- 16 files changed, 25 insertions(+), 25 deletions(-) diff --git a/client/src/app/account/account.component.ts b/client/src/app/account/account.component.ts index b503406c9..851eaf198 100644 --- 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 68363b482..7aab82b97 100644 --- 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 c76fc4df2..afbb48c1c 100644 --- 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 a9115d49f..59ffccf9f 100644 --- 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 b79437795..ab96fb01d 100644 --- 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 d3827eb28..03f4e5c0a 100644 --- 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 e81993a3f..d6b83c684 100644 --- 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 378714ca1..c4ff7050b 100644 --- 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 425a12e5d..6cfc854dd 100644 --- 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 7878471dc..b6237469b 100644 --- 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 cdd07d1b4..e72d2f3f3 100644 --- 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 16a8409be..d12a7d572 100644 --- 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 fa8e497aa..6b086e938 100644 --- 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 38317f832..f807d17ac 100644 --- 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 0d76b54b7..ca94b07c2 100644 --- 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 2a60e9327..ada20fc96 100644 --- 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 {