From 23bcf666855461ed0e87114d359a777777078e7c Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 9 Sep 2016 22:23:41 +0200 Subject: [PATCH] Client: little app module cleanup --- client/src/app/app.module.ts | 73 ++++++++++++++++++++---------------- 1 file changed, 41 insertions(+), 32 deletions(-) diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts index f071224c5..3b7750a76 100644 --- a/client/src/app/app.module.ts +++ b/client/src/app/app.module.ts @@ -1,14 +1,14 @@ -import { NgModule, ApplicationRef } from '@angular/core'; +import { ApplicationRef, NgModule } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { HttpModule, RequestOptions, XHRBackend } from '@angular/http'; import { RouterModule } from '@angular/router'; import { removeNgStyles, createNewHosts } from '@angularclass/hmr'; -import { FileSelectDirective } from 'ng2-file-upload/ng2-file-upload'; +import { BytesPipe } from 'angular-pipes/src/math/bytes.pipe'; import { ProgressbarModule } from 'ng2-bootstrap/components/progressbar'; import { PaginationModule } from 'ng2-bootstrap/components/pagination'; -import { BytesPipe } from 'angular-pipes/src/math/bytes.pipe'; +import { FileSelectDirective } from 'ng2-file-upload/ng2-file-upload'; /* * Platform and Environment providers/directives/pipes @@ -18,8 +18,23 @@ import { routes } from './app.routes'; // App is our top level component import { AppComponent } from './app.component'; import { AppState } from './app.service'; + +import { + AdminComponent, + FriendsComponent, + FriendAddComponent, + FriendListComponent, + FriendService, + MenuAdminComponent, + UsersComponent, + UserAddComponent, + UserListComponent, + UserService +} from './admin'; import { AccountComponent, AccountService } from './account'; import { LoginComponent } from './login'; +import { MenuComponent } from './menu.component'; +import { AuthService, AuthHttp, RestExtractor, RestService, SearchComponent, SearchService } from './shared'; import { LoaderComponent, VideosComponent, @@ -31,20 +46,6 @@ import { VideoService, WebTorrentService } from './videos'; -import { - FriendsComponent, - FriendAddComponent, - FriendListComponent, - FriendService, - UsersComponent, - UserAddComponent, - UserListComponent, - UserService, - AdminComponent, - MenuAdminComponent -} from './admin'; -import { MenuComponent } from './menu.component'; -import { AuthService, AuthHttp, RestExtractor, RestService, SearchComponent, SearchService } from './shared'; // Application wide providers const APP_PROVIDERS = [ @@ -60,7 +61,14 @@ const APP_PROVIDERS = [ AuthService, RestExtractor, - RestExtractor, RestService, VideoService, SearchService, FriendService, UserService, AccountService, WebTorrentService + RestService, + + VideoService, + SearchService, + FriendService, + UserService, + AccountService, + WebTorrentService ]; /** * `AppModule` is the main entry point into Angular2's bootstraping process @@ -68,28 +76,28 @@ const APP_PROVIDERS = [ @NgModule({ bootstrap: [ AppComponent ], declarations: [ + AccountComponent, + AdminComponent, AppComponent, BytesPipe, FileSelectDirective, - AccountComponent, - LoginComponent, + FriendAddComponent, + FriendListComponent, + FriendsComponent, LoaderComponent, - VideosComponent, + LoginComponent, + MenuAdminComponent, + MenuComponent, + SearchComponent, + UserAddComponent, + UserListComponent, + UsersComponent, VideoAddComponent, VideoListComponent, - VideoSortComponent, VideoMiniatureComponent, + VideosComponent, + VideoSortComponent, VideoWatchComponent, - FriendsComponent, - FriendAddComponent, - FriendListComponent, - UsersComponent, - UserAddComponent, - UserListComponent, - AdminComponent, - MenuAdminComponent, - MenuComponent, - SearchComponent ], imports: [ // import Angular's modules BrowserModule, @@ -97,6 +105,7 @@ const APP_PROVIDERS = [ ReactiveFormsModule, HttpModule, RouterModule.forRoot(routes), + ProgressbarModule, PaginationModule ], -- 2.41.0