X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fcore%2Fcore.module.ts;h=22896e2e96ec04d7f136751da234ccc5fa5a909d;hb=66357162f8e1227495f09bd4f68446aad7071c6d;hp=90e2cb1902945464d4fb0c7e67703634adc22d5a;hpb=954605a804da399317ca62afa2fb9244afa11ebf;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/core/core.module.ts b/client/src/app/core/core.module.ts
index 90e2cb190..22896e2e9 100644
--- a/client/src/app/core/core.module.ts
+++ b/client/src/app/core/core.module.ts
@@ -1,54 +1,96 @@
-import { NgModule, Optional, SkipSelf } from '@angular/core'
+import { HotkeyModule } from 'angular2-hotkeys'
+import { MessageService } from 'primeng/api'
+import { ToastModule } from 'primeng/toast'
 import { CommonModule } from '@angular/common'
-import { HttpModule } from '@angular/http'
-import { RouterModule } from '@angular/router'
+import { NgModule, Optional, SkipSelf } from '@angular/core'
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
-
-import { SimpleNotificationsModule } from 'angular2-notifications'
-import { ModalModule } from 'ngx-bootstrap/modal'
-
+import { UserNotificationSocket } from '@app/core/notification/user-notification-socket.service'
+import { HooksService } from '@app/core/plugins/hooks.service'
+import { PluginService } from '@app/core/plugins/plugin.service'
+import { UnloggedGuard } from '@app/core/routing/unlogged-guard.service'
+import { LoadingBarModule } from '@ngx-loading-bar/core'
+import { LoadingBarHttpClientModule } from '@ngx-loading-bar/http-client'
+import { LoadingBarRouterModule } from '@ngx-loading-bar/router'
 import { AuthService } from './auth'
-import { LoginGuard, UserRightGuard } from './routing'
-import { ServerService } from './server'
-import { ConfirmComponent, ConfirmService } from './confirm'
-import { MenuComponent, MenuAdminComponent } from './menu'
+import { ConfirmService } from './confirm'
+import { CheatSheetComponent } from './hotkeys'
+import { MenuService } from './menu'
 import { throwIfAlreadyLoaded } from './module-import-guard'
+import { Notifier } from './notification'
+import { HtmlRendererService, LinkifierService, MarkdownService } from './renderer'
+import { RestExtractor, RestService } from './rest'
+import { LoginGuard, RedirectService, UserRightGuard } from './routing'
+import { CanDeactivateGuard } from './routing/can-deactivate-guard.service'
+import { ServerConfigResolver } from './routing/server-config-resolver.service'
+import { ServerService } from './server'
+import { ThemeService } from './theme'
+import { UserService } from './users'
+import { LocalStorageService, ScreenService, SessionStorageService } from './wrappers'
 
 @NgModule({
   imports: [
     CommonModule,
-    HttpModule,
-    RouterModule,
     BrowserAnimationsModule,
 
-    ModalModule,
-    SimpleNotificationsModule.forRoot()
+    LoadingBarHttpClientModule,
+    LoadingBarRouterModule,
+    LoadingBarModule,
+    ToastModule,
+
+    HotkeyModule.forRoot({
+      cheatSheetCloseEsc: true
+    })
   ],
 
   declarations: [
-    ConfirmComponent,
-    MenuComponent,
-    MenuAdminComponent
+    CheatSheetComponent
   ],
 
   exports: [
-    SimpleNotificationsModule,
+    LoadingBarHttpClientModule,
+    LoadingBarModule,
 
-    ConfirmComponent,
-    MenuComponent,
-    MenuAdminComponent
+    ToastModule,
+
+    CheatSheetComponent
   ],
 
   providers: [
     AuthService,
     ConfirmService,
     ServerService,
+    ThemeService,
+    MenuService,
     LoginGuard,
-    UserRightGuard
+    UserRightGuard,
+    UnloggedGuard,
+
+    PluginService,
+    HooksService,
+
+    HtmlRendererService,
+    LinkifierService,
+    MarkdownService,
+
+    RestExtractor,
+    RestService,
+
+    UserService,
+
+    ScreenService,
+    LocalStorageService,
+    SessionStorageService,
+
+    RedirectService,
+    Notifier,
+    MessageService,
+    UserNotificationSocket,
+    ServerConfigResolver,
+    CanDeactivateGuard
   ]
 })
 export class CoreModule {
-  constructor ( @Optional() @SkipSelf() parentModule: CoreModule) {
+  constructor (@Optional() @SkipSelf() parentModule: CoreModule) {
     throwIfAlreadyLoaded(parentModule, 'CoreModule')
   }
 }