Merge branch 'release/4.2.0' into develop

[github/Chocobozzz/PeerTube.git] / client / src / app / core / core.module.ts

diff --git a/client/src/app/core/core.module.ts b/client/src/app/core/core.module.ts
index 6c0a2245d2263f4a528093423de0554182cf47d6..d80f95ed63afcd4fb5d54f91e213dfe643c16706 100644 (file)
--- a/client/src/app/core/core.module.ts
+++ b/client/src/app/core/core.module.ts
@@ -5,12 +5,7 @@ import { CommonModule } from '@angular/common'
 import { NgModule, Optional, SkipSelf } from '@angular/core'
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
 import { PeerTubeSocket } from '@app/core/notification/peertube-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 { HooksService, PluginService } from '@app/core/plugins'
 import { AuthService } from './auth'
 import { ConfirmService } from './confirm'
 import { CheatSheetComponent } from './hotkeys'
@@ -19,12 +14,23 @@ 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 {
+  HomepageRedirectComponent,
+  LoginGuard,
+  MetaGuard,
+  MetaService,
+  PeerTubeRouterService,
+  RedirectService,
+  ScrollService,
+  UnloggedGuard,
+  UserRightGuard
+} from './routing'
 import { CanDeactivateGuard } from './routing/can-deactivate-guard.service'
 import { ServerConfigResolver } from './routing/server-config-resolver.service'
+import { ScopedTokensService } from './scoped-tokens'
 import { ServerService } from './server'
 import { ThemeService } from './theme'
-import { UserService } from './users'
+import { UserLocalStorageService, UserService } from './users'
 import { LocalStorageService, ScreenService, SessionStorageService } from './wrappers'
 
 @NgModule({
@@ -32,9 +38,6 @@ import { LocalStorageService, ScreenService, SessionStorageService } from './wra
     CommonModule,
     BrowserAnimationsModule,
 
-    LoadingBarHttpClientModule,
-    LoadingBarRouterModule,
-    LoadingBarModule,
     ToastModule,
 
     HotkeyModule.forRoot({
@@ -43,20 +46,20 @@ import { LocalStorageService, ScreenService, SessionStorageService } from './wra
   ],
 
   declarations: [
-    CheatSheetComponent
+    CheatSheetComponent,
+    HomepageRedirectComponent
   ],
 
   exports: [
-    LoadingBarHttpClientModule,
-    LoadingBarModule,
-
     ToastModule,
 
-    CheatSheetComponent
+    CheatSheetComponent,
+    HomepageRedirectComponent
   ],
 
   providers: [
     AuthService,
+    ScopedTokensService,
     ConfirmService,
     ServerService,
     ThemeService,
@@ -76,6 +79,7 @@ import { LocalStorageService, ScreenService, SessionStorageService } from './wra
     RestService,
 
     UserService,
+    UserLocalStorageService,
 
     ScreenService,
     LocalStorageService,
@@ -86,7 +90,12 @@ import { LocalStorageService, ScreenService, SessionStorageService } from './wra
     MessageService,
     PeerTubeSocket,
     ServerConfigResolver,
-    CanDeactivateGuard
+    CanDeactivateGuard,
+    PeerTubeRouterService,
+    ScrollService,
+
+    MetaService,
+    MetaGuard
   ]
 })
 export class CoreModule {