X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.module.ts;h=7e4fac730fee05aec961e4d85a3e8a835fe620c5;hb=52798aa5f277492d4dd2482bca9396d2e982fa19;hp=1e2936a37bf6cdd7841db53a52fbe574c5be1d12;hpb=b6a1dd4d1b3b0032f8b968e72cbd074f646e8827;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index 1e2936a37..7e4fac730 100644
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -1,89 +1,96 @@
-import { LOCALE_ID, NgModule, TRANSLATIONS, TRANSLATIONS_FORMAT } from '@angular/core'
-import { BrowserModule } from '@angular/platform-browser'
-import { ServerService } from '@app/core'
-import { ResetPasswordModule } from '@app/reset-password'
-
-import { MetaLoader, MetaModule, MetaStaticLoader, PageTitlePositioning } from '@ngx-meta/core'
-import { ClipboardModule } from 'ngx-clipboard'
 import 'focus-visible'
-
+import { tap } from 'rxjs/operators'
+import { environment } from 'src/environments/environment'
+import { APP_BASE_HREF, registerLocaleData } from '@angular/common'
+import { APP_INITIALIZER, NgModule } from '@angular/core'
+import { BrowserModule } from '@angular/platform-browser'
+import { ServiceWorkerModule } from '@angular/service-worker'
+import localeOc from '@app/helpers/locales/oc'
 import { AppRoutingModule } from './app-routing.module'
 import { AppComponent } from './app.component'
-import { CoreModule } from './core'
-import { HeaderComponent } from './header'
-import { LoginModule } from './login'
-import { AvatarNotificationComponent, LanguageChooserComponent, MenuComponent } from './menu'
-import { SharedModule } from './shared'
-import { VideosModule } from './videos'
-import { buildFileLocale, getCompleteLocale, isDefaultLocale } from '../../../shared/models/i18n'
-import { getDevLocale, isOnDevLocale } from '@app/shared/i18n/i18n-utils'
-import { SearchModule } from '@app/search'
+import { CoreModule, PluginService, RedirectService, ServerService } from './core'
+import { EmptyComponent } from './empty.component'
+import { HeaderComponent, SearchTypeaheadComponent, SuggestionComponent } from './header'
+import { HighlightPipe } from './header/highlight.pipe'
+import { LanguageChooserComponent, MenuComponent, NotificationComponent } from './menu'
+import { ConfirmComponent } from './modal/confirm.component'
+import { CustomModalComponent } from './modal/custom-modal.component'
+import { InstanceConfigWarningModalComponent } from './modal/instance-config-warning-modal.component'
+import { QuickSettingsModalComponent } from './modal/quick-settings-modal.component'
+import { AdminWelcomeModalComponent } from './modal/admin-welcome-modal.component'
+import { AccountSetupWarningModalComponent } from './modal/account-setup-warning-modal.component'
+import { SharedActorImageModule } from './shared/shared-actor-image/shared-actor-image.module'
+import { SharedFormModule } from './shared/shared-forms'
+import { SharedGlobalIconModule } from './shared/shared-icons'
+import { SharedInstanceModule } from './shared/shared-instance'
+import { SharedMainModule } from './shared/shared-main'
+import { SharedUserInterfaceSettingsModule } from './shared/shared-user-settings'
 
-export function metaFactory (serverService: ServerService): MetaLoader {
-  return new MetaStaticLoader({
-    pageTitlePositioning: PageTitlePositioning.PrependPageTitle,
-    pageTitleSeparator: ' - ',
-    get applicationName () { return serverService.getConfig().instance.name },
-    defaults: {
-      get title () { return serverService.getConfig().instance.name },
-      get description () { return serverService.getConfig().instance.shortDescription }
-    }
-  })
+registerLocaleData(localeOc, 'oc')
+
+export function loadConfigFactory (server: ServerService, pluginService: PluginService, redirectService: RedirectService) {
+  const initializeServices = () => {
+    redirectService.init()
+    pluginService.initializePlugins()
+  }
+
+  return () => {
+    const result = server.loadHTMLConfig()
+    if (result) return result.pipe(tap(() => initializeServices()))
+
+    initializeServices()
+  }
 }
 
 @NgModule({
   bootstrap: [ AppComponent ],
+
   declarations: [
     AppComponent,
+    EmptyComponent,
 
     MenuComponent,
     LanguageChooserComponent,
-    AvatarNotificationComponent,
-    HeaderComponent
+    QuickSettingsModalComponent,
+    NotificationComponent,
+    HeaderComponent,
+    SearchTypeaheadComponent,
+    SuggestionComponent,
+    HighlightPipe,
+
+    AccountSetupWarningModalComponent,
+    CustomModalComponent,
+    AdminWelcomeModalComponent,
+    InstanceConfigWarningModalComponent,
+    ConfirmComponent
   ],
+
   imports: [
     BrowserModule,
-    // FIXME: https://github.com/maxisam/ngx-clipboard/issues/133
-    ClipboardModule,
-
-    CoreModule,
-    SharedModule,
+    ServiceWorkerModule.register('ngsw-worker.js', { enabled: environment.production }),
 
     CoreModule,
-    LoginModule,
-    ResetPasswordModule,
-    SearchModule,
-    SharedModule,
-    VideosModule,
-
-    MetaModule.forRoot({
-      provide: MetaLoader,
-      useFactory: (metaFactory),
-      deps: [ ServerService ]
-    }),
+    SharedMainModule,
+    SharedFormModule,
+    SharedUserInterfaceSettingsModule,
+    SharedGlobalIconModule,
+    SharedInstanceModule,
+    SharedActorImageModule,
 
     AppRoutingModule // Put it after all the module because it has the 404 route
   ],
+
   providers: [
     {
-      provide: TRANSLATIONS,
-      useFactory: (locale: string) => {
-        // On dev mode, test localization
-        if (isOnDevLocale()) {
-          locale = buildFileLocale(getDevLocale())
-          return require(`raw-loader!../locale/target/angular_${locale}.xml`)
-        }
-
-        // Default locale, nothing to translate
-        const completeLocale = getCompleteLocale(locale)
-        if (isDefaultLocale(completeLocale)) return ''
-
-        const fileLocale = buildFileLocale(locale)
-        return require(`raw-loader!../locale/target/angular_${fileLocale}.xml`)
-      },
-      deps: [ LOCALE_ID ]
+      provide: APP_BASE_HREF,
+      useValue: '/'
     },
-    { provide: TRANSLATIONS_FORMAT, useValue: 'xlf' }
+    {
+      provide: APP_INITIALIZER,
+      useFactory: loadConfigFactory,
+      deps: [ ServerService, PluginService, RedirectService ],
+      multi: true
+    }
   ]
 })
 export class AppModule {}