X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.module.ts;h=bb20c2d83f2bca1ce15aeb862b09468384a38ea9;hb=c9c0cc5179359b6a9fa7c46bf73df99c4f72c1fc;hp=e61346dac9addbbccb0d45f2b662ef1aa99ecdcf;hpb=b763f88dd0f455ce0ccae9cb81182c985a47c101;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index e61346dac..bb20c2d83 100644
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -1,75 +1,77 @@
-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 '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, SearchTypeaheadComponent, SuggestionsComponent, SuggestionComponent } from './header'
-import { LoginModule } from './login'
-import { AvatarNotificationComponent, LanguageChooserComponent, MenuComponent } from './menu'
-import { SharedModule } from './shared'
-import { VideosModule } from './videos'
-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, registerLocaleData } from '@angular/common'
-import { QuickSettingsModalComponent } from '@app/modal/quick-settings-modal.component'
-import { CustomModalComponent } from '@app/modal/custom-modal.component'
-import localeOc from '@app/shared/locale/oc'
+import { CoreModule, PluginService, 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'
 
 registerLocaleData(localeOc, 'oc')
 
+export function loadConfigFactory (server: ServerService, pluginService: PluginService) {
+  return () => {
+    const result = server.loadHTMLConfig()
+
+    if (result) return result.pipe(tap(() => pluginService.initializePlugins()))
+
+    return pluginService.initializePlugins()
+  }
+}
+
 @NgModule({
   bootstrap: [ AppComponent ],
+
   declarations: [
     AppComponent,
+    EmptyComponent,
 
     MenuComponent,
     LanguageChooserComponent,
     QuickSettingsModalComponent,
-    AvatarNotificationComponent,
+    NotificationComponent,
     HeaderComponent,
     SearchTypeaheadComponent,
-    SuggestionsComponent,
     SuggestionComponent,
+    HighlightPipe,
 
+    AccountSetupWarningModalComponent,
     CustomModalComponent,
-    WelcomeModalComponent,
-    InstanceConfigWarningModalComponent
+    AdminWelcomeModalComponent,
+    InstanceConfigWarningModalComponent,
+    ConfirmComponent
   ],
+
   imports: [
     BrowserModule,
+    ServiceWorkerModule.register('ngsw-worker.js', { enabled: environment.production }),
 
     CoreModule,
-    SharedModule,
-
-    CoreModule,
-    LoginModule,
-    ResetPasswordModule,
-    SearchModule,
-    SharedModule,
-    VideosModule,
-
-    MetaModule.forRoot({
-      provide: MetaLoader,
-      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 ]
-    }),
+    SharedMainModule,
+    SharedFormModule,
+    SharedUserInterfaceSettingsModule,
+    SharedGlobalIconModule,
+    SharedInstanceModule,
+    SharedActorImageModule,
 
     AppRoutingModule // Put it after all the module because it has the 404 route
   ],
@@ -79,20 +81,12 @@ registerLocaleData(localeOc, 'oc')
       provide: APP_BASE_HREF,
       useValue: '/'
     },
-
     {
-      provide: TRANSLATIONS,
-      useFactory: (locale: string) => {
-        // Default locale, nothing to translate
-        const completeLocale = getCompleteLocale(locale)
-        if (isDefaultLocale(completeLocale)) return ''
-
-        const fileLocale = buildFileLocale(locale)
-        return require(`raw-loader!../locale/angular.${fileLocale}.xlf`).default
-      },
-      deps: [ LOCALE_ID ]
-    },
-    { provide: TRANSLATIONS_FORMAT, useValue: 'xlf' }
+      provide: APP_INITIALIZER,
+      useFactory: loadConfigFactory,
+      deps: [ ServerService, PluginService ],
+      multi: true
+    }
   ]
 })
 export class AppModule {}