X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.module.ts;h=44552021f3aedcbb351f35c52d4c00b239c14552;hb=989e526abf0c0dd7958deb630df009608561bb67;hp=6aa56b8a797b2c895b2a0ab64eacd6b202828a7e;hpb=d592e0a9b2931c7c9cbedb27fb8efc9aaacad9bb;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index 6aa56b8a7..44552021f 100644
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -1,133 +1,82 @@
-import { ApplicationRef, NgModule } from '@angular/core'
+import { LOCALE_ID, NgModule, TRANSLATIONS, TRANSLATIONS_FORMAT } from '@angular/core'
 import { BrowserModule } from '@angular/platform-browser'
-import {
-  removeNgStyles,
-  createNewHosts,
-  createInputTransfer
-} from '@angularclass/hmr'
+import { AboutModule } from '@app/about'
+import { ServerService } from '@app/core'
+import { ResetPasswordModule } from '@app/reset-password'
 
-import { MetaModule, MetaLoader, MetaStaticLoader, PageTitlePositioning } from '@ngx-meta/core'
-import 'bootstrap-loader'
+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, InternalStateType } from './app.service'
-
-import { AccountModule } from './account'
 import { CoreModule } from './core'
+import { HeaderComponent } from './header'
 import { LoginModule } from './login'
-import { SignupModule } from './signup'
+import { MenuComponent } from './menu'
 import { SharedModule } from './shared'
+import { SignupModule } from './signup'
 import { VideosModule } from './videos'
+import { buildFileLocale, getDefaultLocale } from '../../../shared/models/i18n'
 
-export function metaFactory (): MetaLoader {
+export function metaFactory (serverService: ServerService): MetaLoader {
   return new MetaStaticLoader({
     pageTitlePositioning: PageTitlePositioning.PrependPageTitle,
     pageTitleSeparator: ' - ',
-    applicationName: 'PeerTube',
+    get applicationName () { return serverService.getConfig().instance.name },
     defaults: {
-      title: 'PeerTube',
-      description: 'PeerTube, a decentralized video streaming platform using P2P (BitTorrent) directly in the web browser'
+      get title () { return serverService.getConfig().instance.name },
+      get description () { return serverService.getConfig().instance.shortDescription }
     }
   })
 }
 
-type StoreType = {
-  state: InternalStateType,
-  restoreInputValues: () => void,
-  disposeOldHosts: () => void
-}
-
-// Application wide providers
-const APP_PROVIDERS = [
-  AppState
-]
-
 @NgModule({
   bootstrap: [ AppComponent ],
   declarations: [
-    AppComponent
+    AppComponent,
+
+    MenuComponent,
+    HeaderComponent
   ],
   imports: [
     BrowserModule,
+    // FIXME: https://github.com/maxisam/ngx-clipboard/issues/133
+    ClipboardModule,
 
     CoreModule,
     SharedModule,
 
-    AppRoutingModule,
-
-    AccountModule,
     CoreModule,
     LoginModule,
+    ResetPasswordModule,
     SignupModule,
     SharedModule,
     VideosModule,
+    AboutModule,
 
     MetaModule.forRoot({
       provide: MetaLoader,
-      useFactory: (metaFactory)
-    })
-  ],
-  providers: [ // expose our Services and Providers into Angular's dependency injection
-    ENV_PROVIDERS,
-    APP_PROVIDERS
-  ]
-})
-export class AppModule {
-  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)
-    }
+      useFactory: (metaFactory),
+      deps: [ ServerService ]
+    }),
 
-    this.appRef.tick()
-    delete store.state
-    delete store.restoreInputValues
-  }
+    AppRoutingModule // Put it after all the module because it has the 404 route
+  ],
+  providers: [
+    {
+      provide: TRANSLATIONS,
+      useFactory: (locale) => {
+        const fileLocale = buildFileLocale(locale)
 
-  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()
-  }
+        // Default locale, nothing to translate
+        const defaultFileLocale = buildFileLocale(getDefaultLocale())
+        if (fileLocale === defaultFileLocale) return ''
 
-  public hmrAfterDestroy (store: StoreType) {
-    /**
-     * Display new elements
-     */
-    store.disposeOldHosts ()
-    delete store.disposeOldHosts
-  }
-}
+        return require(`raw-loader!../locale/target/messages_${fileLocale}.xml`)
+      },
+      deps: [ LOCALE_ID ]
+    },
+    { provide: TRANSLATIONS_FORMAT, useValue: 'xlf' }
+  ]
+})
+export class AppModule {}