Upgrade client dependencies

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

diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index e9bb800f4f2dfb2a5b793e82afa7e01147e997f8..874fc43aa28cafdc1a2b177f7a00b323b6531693 100644 (file)
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -1,83 +1,66 @@
-import { ApplicationRef, NgModule } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
-import { removeNgStyles, createNewHosts } from '@angularclass/hmr';
+import { NgModule } from '@angular/core'
+import { BrowserModule } from '@angular/platform-browser'
+import { AboutModule } from '@app/about'
+import { ServerService } from '@app/core'
+import { ResetPasswordModule } from '@app/reset-password'
 
-import { MetaModule, MetaConfig } from 'ng2-meta';
+import { MetaLoader, MetaModule, MetaStaticLoader, PageTitlePositioning } from '@ngx-meta/core'
+import { ClipboardModule } from 'ngx-clipboard'
 
-import { ENV_PROVIDERS } from './environment';
-import { AppRoutingModule } from './app-routing.module';
-import { AppComponent } from './app.component';
-import { AppState } from './app.service';
+import { AppRoutingModule } from './app-routing.module'
+import { AppComponent } from './app.component'
+import { CoreModule } from './core'
+import { HeaderComponent } from './header'
+import { LoginModule } from './login'
+import { MenuComponent } from './menu'
+import { SharedModule } from './shared'
+import { SignupModule } from './signup'
+import { VideosModule } from './videos'
 
-import { AccountModule } from './account';
-import { AdminModule } from './admin';
-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
-];
+export function metaFactory (serverService: ServerService): MetaLoader {
+  return new MetaStaticLoader({
+    pageTitlePositioning: PageTitlePositioning.PrependPageTitle,
+    pageTitleSeparator: ' - ',
+    get applicationName () { return serverService.getConfig().instance.name },
+    defaults: {
+      get title () { return serverService.getConfig().instance.name },
+      get description () { return serverService.getConfig().instance.shortDescription }
+    }
+  })
+}
 
 @NgModule({
   bootstrap: [ AppComponent ],
   declarations: [
-    AppComponent
+    AppComponent,
+
+    MenuComponent,
+    HeaderComponent
   ],
   imports: [
     BrowserModule,
+    // FIXME: https://github.com/maxisam/ngx-clipboard/issues/133
+    ClipboardModule,
 
     CoreModule,
     SharedModule,
 
     AppRoutingModule,
 
-    MetaModule.forRoot(metaConfig),
-
-    AccountModule,
-    AdminModule,
     CoreModule,
     LoginModule,
+    ResetPasswordModule,
+    SignupModule,
     SharedModule,
-    VideosModule
+    VideosModule,
+    AboutModule,
+
+    MetaModule.forRoot({
+      provide: MetaLoader,
+      useFactory: (metaFactory),
+      deps: [ ServerService ]
+    })
   ],
-  providers: [ // expose our Services and Providers into Angular's dependency injection
-    ENV_PROVIDERS,
-    APP_PROVIDERS
-  ]
+  providers: [ ]
 })
-export class AppModule {
-  constructor(public appRef: ApplicationRef, public appState: AppState) {}
-  hmrOnInit(store) {
-    if (!store || !store.state) return;
-    console.log('HMR store', store);
-    this.appState._state = store.state;
-    this.appRef.tick();
-    delete store.state;
-  }
-  hmrOnDestroy(store) {
-    const cmpLocation = this.appRef.components.map(cmp => cmp.location.nativeElement);
-    // recreate elements
-    const state = this.appState._state;
-    store.state = state;
-    store.disposeOldHosts = createNewHosts(cmpLocation);
-    // remove styles
-    removeNgStyles();
-  }
-  hmrAfterDestroy(store) {
-    // display new elements
-    store.disposeOldHosts();
-    delete store.disposeOldHosts;
-  }
-}
+export class AppModule {}