-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 { ServerService } from '@app/core'
+import { ResetPasswordModule } from '@app/reset-password'
-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 { MetaLoader, MetaModule, MetaStaticLoader, PageTitlePositioning } from '@ngx-meta/core'
+import 'focus-visible'
-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, SearchTypeaheadComponent, SuggestionsComponent, SuggestionComponent } from './header'
import { LoginModule } from './login'
-import { SignupModule } from './signup'
+import { AvatarNotificationComponent, LanguageChooserComponent, MenuComponent } from './menu'
import { SharedModule } from './shared'
import { VideosModule } 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'
- }
- })
-}
-
-type StoreType = {
- state: InternalStateType,
- restoreInputValues: () => void,
- disposeOldHosts: () => void
-}
-
-// Application wide providers
-const APP_PROVIDERS = [
- AppState
-]
+import { SearchModule } from '@app/search'
+import { WelcomeModalComponent } from '@app/modal/welcome-modal.component'
+import { InstanceConfigWarningModalComponent } from '@app/modal/instance-config-warning-modal.component'
+import { buildFileLocale, getCompleteLocale, isDefaultLocale } from '@shared/models'
+import { APP_BASE_HREF } from '@angular/common'
+import { QuickSettingsModalComponent } from '@app/modal/quick-settings-modal.component'
+import { CustomModalComponent } from '@app/modal/custom-modal.component'
@NgModule({
bootstrap: [ AppComponent ],
declarations: [
- AppComponent
+ AppComponent,
+
+ MenuComponent,
+ LanguageChooserComponent,
+ QuickSettingsModalComponent,
+ AvatarNotificationComponent,
+ HeaderComponent,
+ SearchTypeaheadComponent,
+ SuggestionsComponent,
+ SuggestionComponent,
+
+ CustomModalComponent,
+ WelcomeModalComponent,
+ InstanceConfigWarningModalComponent
],
imports: [
BrowserModule,
CoreModule,
SharedModule,
- AppRoutingModule,
-
- AccountModule,
CoreModule,
LoginModule,
- SignupModule,
+ ResetPasswordModule,
+ SearchModule,
SharedModule,
VideosModule,
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
- ) {}
+ useFactory: (serverService: ServerService) => {
+ return new MetaStaticLoader({
+ pageTitlePositioning: PageTitlePositioning.PrependPageTitle,
+ pageTitleSeparator: ' - ',
+ get applicationName () { return serverService.getTmpConfig().instance.name },
+ defaults: {
+ get title () { return serverService.getTmpConfig().instance.name },
+ get description () { return serverService.getTmpConfig().instance.shortDescription }
+ }
+ })
+ },
+ deps: [ ServerService ]
+ }),
- 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)
- }
+ AppRoutingModule // Put it after all the module because it has the 404 route
+ ],
- this.appRef.tick()
- delete store.state
- delete store.restoreInputValues
- }
+ providers: [
+ {
+ provide: APP_BASE_HREF,
+ useValue: '/'
+ },
- 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()
- }
+ {
+ provide: TRANSLATIONS,
+ useFactory: (locale: string) => {
+ // Default locale, nothing to translate
+ const completeLocale = getCompleteLocale(locale)
+ if (isDefaultLocale(completeLocale)) return ''
- public hmrAfterDestroy (store: StoreType) {
- /**
- * Display new elements
- */
- store.disposeOldHosts ()
- delete store.disposeOldHosts
- }
-}
+ const fileLocale = buildFileLocale(locale)
+ return require(`raw-loader!../locale/angular.${fileLocale}.xlf`).default
+ },
+ deps: [ LOCALE_ID ]
+ },
+ { provide: TRANSLATIONS_FORMAT, useValue: 'xlf' }
+ ]
+})
+export class AppModule {}
projects / oweals / peertube.git / blobdiff