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

diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index 482a9b5b7..804a7a71e 100644
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -1,34 +1,50 @@
-import { ApplicationRef, NgModule } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
-import { removeNgStyles, createNewHosts } from '@angularclass/hmr';
+import { ApplicationRef, NgModule } from '@angular/core'
+import { BrowserModule } from '@angular/platform-browser'
+import {
+  removeNgStyles,
+  createNewHosts,
+  createInputTransfer
+} from '@angularclass/hmr'
 
-import { MetaModule, MetaConfig } from 'ng2-meta';
-import 'bootstrap-loader';
+import { MetaModule, MetaLoader, MetaStaticLoader, PageTitlePositioning } from '@ngx-meta/core'
+// TODO: remove, we need this to avoid error in ng2-smart-table
+import 'rxjs/add/operator/toPromise'
+import 'bootstrap-loader'
 
-import { ENV_PROVIDERS } from './environment';
-import { AppRoutingModule } from './app-routing.module';
-import { AppComponent } from './app.component';
-import { AppState } from './app.service';
+import { ENV_PROVIDERS } from './environment'
+import { AppRoutingModule } from './app-routing.module'
+import { AppComponent } from './app.component'
+import { AppState, InternalStateType } from './app.service'
 
-import { AccountModule } from './account';
-import { CoreModule } from './core';
-import { LoginModule } from './login';
-import { SharedModule } from './shared';
-import { VideosModule } from './videos';
+import { AccountModule } from './account'
+import { CoreModule } from './core'
+import { LoginModule } from './login'
+import { SignupModule } from './signup'
+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'
-  }
-};
+export function metaFactory (): MetaLoader {
+  return new MetaStaticLoader({
+    pageTitlePositioning: PageTitlePositioning.PrependPageTitle,
+    pageTitleSeparator: ' - ',
+    applicationName: 'PeerTube',
+    defaults: {
+      title: 'PeerTube',
+      description: 'PeerTube, a decentralized video streaming platform using P2P (BitTorrent) directly in the web browser'
+    }
+  })
+}
+
+type StoreType = {
+  state: InternalStateType,
+  restoreInputValues: () => void,
+  disposeOldHosts: () => void
+}
 
 // Application wide providers
 const APP_PROVIDERS = [
   AppState
-];
+]
 
 @NgModule({
   bootstrap: [ AppComponent ],
@@ -43,13 +59,17 @@ const APP_PROVIDERS = [
 
     AppRoutingModule,
 
-    MetaModule.forRoot(metaConfig),
-
     AccountModule,
     CoreModule,
     LoginModule,
+    SignupModule,
     SharedModule,
-    VideosModule
+    VideosModule,
+
+    MetaModule.forRoot({
+      provide: MetaLoader,
+      useFactory: (metaFactory)
+    })
   ],
   providers: [ // expose our Services and Providers into Angular's dependency injection
     ENV_PROVIDERS,
@@ -57,26 +77,59 @@ const APP_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;
+  constructor (
+    public appRef: ApplicationRef,
+    public appState: AppState
+  ) {}
+
+  public hmrOnInit (store: StoreType) {
+    if (!store || !store.state) {
+      return
+    }
+    console.log('HMR store', JSON.stringify(store, null, 2))
+    /**
+     * Set state
+     */
+    this.appState._state = store.state
+    /**
+     * Set input values
+     */
+    if ('restoreInputValues' in store) {
+      let restoreInputValues = store.restoreInputValues
+      setTimeout(restoreInputValues)
+    }
+
+    this.appRef.tick()
+    delete store.state
+    delete store.restoreInputValues
   }
-  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();
+
+  public hmrOnDestroy (store: StoreType) {
+    const cmpLocation = this.appRef.components.map((cmp) => cmp.location.nativeElement)
+    /**
+     * Save state
+     */
+    const state = this.appState._state
+    store.state = state
+    /**
+     * Recreate root elements
+     */
+    store.disposeOldHosts = createNewHosts(cmpLocation)
+    /**
+     * Save input values
+     */
+    store.restoreInputValues = createInputTransfer()
+    /**
+     * Remove styles
+     */
+    removeNgStyles()
   }
-  hmrAfterDestroy(store) {
-    // display new elements
-    store.disposeOldHosts();
-    delete store.disposeOldHosts;
+
+  public hmrAfterDestroy (store: StoreType) {
+    /**
+     * Display new elements
+     */
+    store.disposeOldHosts ()
+    delete store.disposeOldHosts
   }
 }