X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.module.ts;h=342589003ccbe75d352cd27cd4738c08aff650c2;hb=26c6ee80d0fecfce595e8970f15717560b4f4ceb;hp=8a072eaac2507beb27a7d68ff71a27cc256a6f66;hpb=8635a2c70cc24a4c52558162ac058de95750271f;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts index 8a072eaac..342589003 100644 --- a/client/src/app/app.module.ts +++ b/client/src/app/app.module.ts @@ -1,29 +1,28 @@ -import { ApplicationRef, NgModule } from '@angular/core'; -import { BrowserModule } from '@angular/platform-browser'; +import { ApplicationRef, NgModule } from '@angular/core' +import { BrowserModule } from '@angular/platform-browser' import { removeNgStyles, createNewHosts, createInputTransfer -} from '@angularclass/hmr'; - -import { MetaModule, MetaLoader, MetaStaticLoader, PageTitlePositioning } from '@nglibs/meta'; -// 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, InternalStateType } from './app.service'; - -import { AccountModule } from './account'; -import { CoreModule } from './core'; -import { LoginModule } from './login'; -import { SignupModule } from './signup'; -import { SharedModule } from './shared'; -import { VideosModule } from './videos'; - -export function metaFactory(): MetaLoader { +} from '@angularclass/hmr' + +import { MetaModule, MetaLoader, MetaStaticLoader, PageTitlePositioning } from '@ngx-meta/core' +import 'bootstrap-loader' + +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 { SignupModule } from './signup' +import { SharedModule } from './shared' +import { VideosModule } from './videos' +import { MenuComponent, MenuAdminComponent } from './menu' + +export function metaFactory (): MetaLoader { return new MetaStaticLoader({ pageTitlePositioning: PageTitlePositioning.PrependPageTitle, pageTitleSeparator: ' - ', @@ -32,24 +31,27 @@ export function metaFactory(): MetaLoader { 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 ], declarations: [ - AppComponent + AppComponent, + + MenuComponent, + MenuAdminComponent ], imports: [ BrowserModule, @@ -77,59 +79,59 @@ const APP_PROVIDERS = [ ] }) export class AppModule { - constructor( + constructor ( public appRef: ApplicationRef, public appState: AppState ) {} - public hmrOnInit(store: StoreType) { + public hmrOnInit (store: StoreType) { if (!store || !store.state) { - return; + return } - console.log('HMR store', JSON.stringify(store, null, 2)); + console.log('HMR store', JSON.stringify(store, null, 2)) /** * Set state */ - this.appState._state = store.state; + this.appState._state = store.state /** * Set input values */ if ('restoreInputValues' in store) { - let restoreInputValues = store.restoreInputValues; - setTimeout(restoreInputValues); + let restoreInputValues = store.restoreInputValues + setTimeout(restoreInputValues) } - this.appRef.tick(); - delete store.state; - delete store.restoreInputValues; + this.appRef.tick() + delete store.state + delete store.restoreInputValues } - public hmrOnDestroy(store: StoreType) { - const cmpLocation = this.appRef.components.map((cmp) => cmp.location.nativeElement); + public hmrOnDestroy (store: StoreType) { + const cmpLocation = this.appRef.components.map((cmp) => cmp.location.nativeElement) /** * Save state */ - const state = this.appState._state; - store.state = state; + const state = this.appState._state + store.state = state /** * Recreate root elements */ - store.disposeOldHosts = createNewHosts(cmpLocation); + store.disposeOldHosts = createNewHosts(cmpLocation) /** * Save input values */ - store.restoreInputValues = createInputTransfer(); + store.restoreInputValues = createInputTransfer() /** * Remove styles */ - removeNgStyles(); + removeNgStyles() } - public hmrAfterDestroy(store: StoreType) { + public hmrAfterDestroy (store: StoreType) { /** * Display new elements */ - store.disposeOldHosts(); - delete store.disposeOldHosts; + store.disposeOldHosts() + delete store.disposeOldHosts } }