X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.module.ts;h=482a9b5b7d85c223767d8f64f1dbbdbcd9460b6c;hb=b99290b1d5d736083513fb8f66e91f61bfe07e0b;hp=980625f13495cd8a612f56d635c1b0334e9d2a7e;hpb=a6375e69668ea42e19531c6bc68dcd37f3f7cbd7;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index 980625f13..482a9b5b7 100644
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -1,119 +1,55 @@
 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 { BytesPipe } from 'angular-pipes/src/math/bytes.pipe';
-import { ProgressbarModule } from 'ng2-bootstrap/components/progressbar';
-import { PaginationModule } from 'ng2-bootstrap/components/pagination';
-import { FileUploadModule } from 'ng2-file-upload/ng2-file-upload';
+import { MetaModule, MetaConfig } from 'ng2-meta';
+import 'bootstrap-loader';
 
-/*
- * Platform and Environment providers/directives/pipes
- */
 import { ENV_PROVIDERS } from './environment';
-import { routes } from './app.routes';
-// App is our top level component
+import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
 import { AppState } from './app.service';
 
-import {
-  AdminComponent,
-  FriendsComponent,
-  FriendAddComponent,
-  FriendListComponent,
-  FriendService,
-  MenuAdminComponent,
-  RequestsComponent,
-  RequestStatsComponent,
-  RequestService,
-  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,
-  VideoAddComponent,
-  VideoListComponent,
-  VideoMiniatureComponent,
-  VideoSortComponent,
-  VideoWatchComponent,
-  VideoService,
-  WebTorrentService
-} from './videos';
+import { AccountModule } from './account';
+import { CoreModule } from './core';
+import { LoginModule } from './login';
+import { SharedModule } from './shared';
+import { VideosModule } from './videos';
+
+const metaConfig: MetaConfig = {
+  //Append a title suffix such as a site name to all titles
+  //Defaults to false
+  useTitleSuffix: true,
+  defaults: {
+    title: 'PeerTube'
+  }
+};
 
 // Application wide providers
 const APP_PROVIDERS = [
-  AppState,
-
-  {
-    provide: AuthHttp,
-    useFactory: (backend: XHRBackend, defaultOptions: RequestOptions, authService: AuthService) => {
-      return new AuthHttp(backend, defaultOptions, authService);
-    },
-    deps: [ XHRBackend, RequestOptions, AuthService ]
-  },
-
-  AuthService,
-  RestExtractor,
-  RestService,
-
-  VideoService,
-  SearchService,
-  FriendService,
-  RequestService,
-  UserService,
-  AccountService,
-  WebTorrentService
+  AppState
 ];
-/**
- * `AppModule` is the main entry point into Angular2's bootstraping process
- */
+
 @NgModule({
   bootstrap: [ AppComponent ],
   declarations: [
-    AccountComponent,
-    AdminComponent,
-    AppComponent,
-    BytesPipe,
-    FriendAddComponent,
-    FriendListComponent,
-    FriendsComponent,
-    LoaderComponent,
-    LoginComponent,
-    MenuAdminComponent,
-    MenuComponent,
-    RequestsComponent,
-    RequestStatsComponent,
-    SearchComponent,
-    UserAddComponent,
-    UserListComponent,
-    UsersComponent,
-    VideoAddComponent,
-    VideoListComponent,
-    VideoMiniatureComponent,
-    VideosComponent,
-    VideoSortComponent,
-    VideoWatchComponent,
+    AppComponent
   ],
-  imports: [ // import Angular's modules
+  imports: [
     BrowserModule,
-    FormsModule,
-    ReactiveFormsModule,
-    HttpModule,
-    RouterModule.forRoot(routes),
 
-    ProgressbarModule,
-    PaginationModule,
-    FileUploadModule
+    CoreModule,
+    SharedModule,
+
+    AppRoutingModule,
+
+    MetaModule.forRoot(metaConfig),
+
+    AccountModule,
+    CoreModule,
+    LoginModule,
+    SharedModule,
+    VideosModule
   ],
   providers: [ // expose our Services and Providers into Angular's dependency injection
     ENV_PROVIDERS,