X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fcore%2Fcore.module.ts;h=8a6654aa176cc2db2016c577237bf37399333a59;hb=06471769fc29a82446ed5da6c65d2e9219bec73b;hp=9ca94dd0e7b138b0c60d44c5b881acf7286aa094;hpb=e7dbeae8d915cdf4470ceb51c2724b04148b30b5;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/core/core.module.ts b/client/src/app/core/core.module.ts
index 9ca94dd0e..8a6654aa1 100644
--- a/client/src/app/core/core.module.ts
+++ b/client/src/app/core/core.module.ts
@@ -1,51 +1,67 @@
-import { NgModule, Optional, SkipSelf } from '@angular/core'
 import { CommonModule } from '@angular/common'
-import { HttpModule } from '@angular/http'
-import { RouterModule } from '@angular/router'
+import { NgModule, Optional, SkipSelf } from '@angular/core'
+import { FormsModule } from '@angular/forms'
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
+import { RouterModule } from '@angular/router'
+import { LoadingBarModule } from '@ngx-loading-bar/core'
+import { LoadingBarHttpClientModule } from '@ngx-loading-bar/http-client'
+import { LoadingBarRouterModule } from '@ngx-loading-bar/router'
 
 import { SimpleNotificationsModule } from 'angular2-notifications'
-import { ModalModule } from 'ngx-bootstrap/modal'
 
 import { AuthService } from './auth'
-import { ConfigService } from './config'
 import { ConfirmComponent, ConfirmService } from './confirm'
-import { MenuComponent, MenuAdminComponent } from './menu'
 import { throwIfAlreadyLoaded } from './module-import-guard'
+import { LoginGuard, RedirectService, UserRightGuard } from './routing'
+import { ServerService } from './server'
+import { ThemeService } from './theme'
+import { HotkeyModule } from 'angular2-hotkeys'
+import { CheatSheetComponent } from '@app/core/hotkeys'
 
 @NgModule({
   imports: [
     CommonModule,
-    HttpModule,
     RouterModule,
+    FormsModule,
     BrowserAnimationsModule,
 
-    ModalModule,
-    SimpleNotificationsModule.forRoot()
+    SimpleNotificationsModule.forRoot(),
+
+    LoadingBarHttpClientModule,
+    LoadingBarRouterModule,
+    LoadingBarModule,
+
+    HotkeyModule.forRoot({
+      cheatSheetCloseEsc: true
+    })
   ],
 
   declarations: [
     ConfirmComponent,
-    MenuComponent,
-    MenuAdminComponent
+    CheatSheetComponent
   ],
 
   exports: [
     SimpleNotificationsModule,
+    LoadingBarHttpClientModule,
+    LoadingBarModule,
 
     ConfirmComponent,
-    MenuComponent,
-    MenuAdminComponent
+    CheatSheetComponent
   ],
 
   providers: [
     AuthService,
     ConfirmService,
-    ConfigService
+    ServerService,
+    ThemeService,
+    LoginGuard,
+    UserRightGuard,
+    RedirectService
   ]
 })
 export class CoreModule {
-  constructor ( @Optional() @SkipSelf() parentModule: CoreModule) {
+  constructor (@Optional() @SkipSelf() parentModule: CoreModule) {
     throwIfAlreadyLoaded(parentModule, 'CoreModule')
   }
 }