X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.module.ts;h=e69edbc4b1c9696c9b0b0b3f0256e924c60fa0e2;hb=4a7eeb62f1364678fff28fef4a83a0e9b640017c;hp=804a7a71ed693d7510a97f8f33fad5b58146a98c;hpb=8b13c289f8db1666a3970882797d42f6cfd6128b;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts index 804a7a71e..e69edbc4b 100644 --- a/client/src/app/app.module.ts +++ b/client/src/app/app.module.ts @@ -1,20 +1,10 @@ -import { ApplicationRef, NgModule } from '@angular/core' +import { NgModule } from '@angular/core' import { BrowserModule } from '@angular/platform-browser' -import { - removeNgStyles, - createNewHosts, - createInputTransfer -} from '@angularclass/hmr' 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, InternalStateType } from './app.service' import { AccountModule } from './account' import { CoreModule } from './core' @@ -22,6 +12,8 @@ import { LoginModule } from './login' import { SignupModule } from './signup' import { SharedModule } from './shared' import { VideosModule } from './videos' +import { MenuComponent } from './menu' +import { HeaderComponent } from './header' export function metaFactory (): MetaLoader { return new MetaStaticLoader({ @@ -35,21 +27,13 @@ export function metaFactory (): MetaLoader { }) } -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, @@ -71,65 +55,6 @@ const APP_PROVIDERS = [ useFactory: (metaFactory) }) ], - 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 - ) {} - - 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 - } - - 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() - } - - public hmrAfterDestroy (store: StoreType) { - /** - * Display new elements - */ - store.disposeOldHosts () - delete store.disposeOldHosts - } -} +export class AppModule {}