-import { ApplicationRef, NgModule } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { HttpModule, RequestOptions, XHRBackend } from '@angular/http';
-import { RouterModule } from '@angular/router';
-import { removeNgStyles, createNewHosts } from '@angularclass/hmr';
-
-import { BytesPipe } from 'angular-pipes/src/math/bytes.pipe';
-
-import { DropdownModule } from 'ng2-bootstrap/components/dropdown';
-import { ProgressbarModule } from 'ng2-bootstrap/components/progressbar';
-import { PaginationModule } from 'ng2-bootstrap/components/pagination';
-import { ModalModule } from 'ng2-bootstrap/components/modal';
+import { ApplicationRef, NgModule } from '@angular/core'
+import { BrowserModule } from '@angular/platform-browser'
+import {
+ removeNgStyles,
+ createNewHosts,
+ createInputTransfer
+} from '@angularclass/hmr'
-import { FileUploadModule } from 'ng2-file-upload/ng2-file-upload';
+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 { MetaConfig, MetaModule } from 'ng2-meta';
+import { ENV_PROVIDERS } from './environment'
+import { AppRoutingModule } from './app-routing.module'
+import { AppComponent } from './app.component'
+import { AppState, InternalStateType } from './app.service'
-/*
- * Platform and Environment providers/directives/pipes
- */
-import { ENV_PROVIDERS } from './environment';
-import { routes } from './app.routes';
-// App is our top level component
-import { AppComponent } from './app.component';
-import { AppState } 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 {
- AdminComponent,
- FriendsComponent,
- FriendAddComponent,
- FriendListComponent,
- FriendService,
- MenuAdminComponent,
- RequestsComponent,
- RequestStatsComponent,
- RequestService,
- UsersComponent,
- UserAddComponent,
- UserListComponent,
- UserService
-} from './admin';
-import { AccountComponent, AccountService } from './account';
-import { LoginComponent } from './login';
-import { MenuComponent } from './menu.component';
-import { AuthService, AuthHttp, RestExtractor, RestService, SearchComponent, SearchService } from './shared';
-import {
- LoaderComponent,
- VideosComponent,
- VideoAddComponent,
- VideoListComponent,
- VideoMiniatureComponent,
- VideoSortComponent,
- VideoWatchComponent,
- VideoService,
- WebTorrentService
-} from './videos';
+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'
+ }
+ })
+}
-const metaConfig: MetaConfig = {
- //Append a title suffix such as a site name to all titles
- //Defaults to false
- useTitleSuffix: true,
- defaults: {
- title: 'PeerTube'
- }
-};
+type StoreType = {
+ state: InternalStateType,
+ restoreInputValues: () => void,
+ disposeOldHosts: () => void
+}
// Application wide providers
const APP_PROVIDERS = [
- AppState,
+ AppState
+]
- {
- provide: AuthHttp,
- useFactory: (backend: XHRBackend, defaultOptions: RequestOptions, authService: AuthService) => {
- return new AuthHttp(backend, defaultOptions, authService);
- },
- deps: [ XHRBackend, RequestOptions, AuthService ]
- },
-
- AuthService,
- RestExtractor,
- RestService,
-
- VideoService,
- SearchService,
- FriendService,
- RequestService,
- UserService,
- AccountService,
- WebTorrentService
-];
-/**
- * `AppModule` is the main entry point into Angular2's bootstraping process
- */
@NgModule({
bootstrap: [ AppComponent ],
declarations: [
- AccountComponent,
- AdminComponent,
- AppComponent,
- BytesPipe,
- FriendAddComponent,
- FriendListComponent,
- FriendsComponent,
- LoaderComponent,
- LoginComponent,
- MenuAdminComponent,
- MenuComponent,
- RequestsComponent,
- RequestStatsComponent,
- SearchComponent,
- UserAddComponent,
- UserListComponent,
- UsersComponent,
- VideoAddComponent,
- VideoListComponent,
- VideoMiniatureComponent,
- VideosComponent,
- VideoSortComponent,
- VideoWatchComponent,
+ AppComponent
],
- imports: [ // import Angular's modules
+ imports: [
BrowserModule,
- FormsModule,
- ReactiveFormsModule,
- HttpModule,
- RouterModule.forRoot(routes),
- DropdownModule,
- ProgressbarModule,
- PaginationModule,
- ModalModule,
+ CoreModule,
+ SharedModule,
- FileUploadModule,
+ AppRoutingModule,
- MetaModule.forRoot(metaConfig)
+ AccountModule,
+ CoreModule,
+ LoginModule,
+ SignupModule,
+ SharedModule,
+ VideosModule,
+
+ MetaModule.forRoot({
+ provide: MetaLoader,
+ useFactory: (metaFactory)
+ })
],
providers: [ // expose our Services and Providers into Angular's dependency injection
ENV_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
}
}
projects / github / Chocobozzz / PeerTube.git / blobdiff