X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.module.ts;h=9f46d49a2e59c212f8217a6f8ba63477784ba7be;hb=15f35256af15b97d2298cc44e76ffcafe73a1c88;hp=7fbc6463b0dd8c03ad89aa9df65e76f03eee16f8;hpb=67ed6552b831df66713bac9e672738796128d33f;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index 7fbc6463b..9f46d49a2 100644
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -1,30 +1,28 @@
 import 'focus-visible'
+import { environment } from 'src/environments/environment'
 import { APP_BASE_HREF, registerLocaleData } from '@angular/common'
-import { LOCALE_ID, NgModule, TRANSLATIONS, TRANSLATIONS_FORMAT } from '@angular/core'
+import { NgModule } from '@angular/core'
 import { BrowserModule } from '@angular/platform-browser'
-import { ServerService } from '@app/core'
+import { ServiceWorkerModule } from '@angular/service-worker'
 import localeOc from '@app/helpers/locales/oc'
-import { ResetPasswordModule } from '@app/reset-password'
-import { SearchModule } from '@app/search'
-import { MetaLoader, MetaModule, MetaStaticLoader, PageTitlePositioning } from '@ngx-meta/core'
-import { buildFileLocale, getCompleteLocale, isDefaultLocale } from '@shared/models'
 import { AppRoutingModule } from './app-routing.module'
 import { AppComponent } from './app.component'
 import { CoreModule } from './core'
+import { EmptyComponent } from './empty.component'
 import { HeaderComponent, SearchTypeaheadComponent, SuggestionComponent } from './header'
-import { LoginModule } from './login'
-import { AvatarNotificationComponent, LanguageChooserComponent, MenuComponent } from './menu'
+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 { WelcomeModalComponent } from './modal/welcome-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'
-import { VideosModule } from './videos'
 
 registerLocaleData(localeOc, 'oc')
 
@@ -33,14 +31,16 @@ registerLocaleData(localeOc, 'oc')
 
   declarations: [
     AppComponent,
+    EmptyComponent,
 
     MenuComponent,
     LanguageChooserComponent,
     QuickSettingsModalComponent,
-    AvatarNotificationComponent,
+    NotificationComponent,
     HeaderComponent,
     SearchTypeaheadComponent,
     SuggestionComponent,
+    HighlightPipe,
 
     CustomModalComponent,
     WelcomeModalComponent,
@@ -50,6 +50,7 @@ registerLocaleData(localeOc, 'oc')
 
   imports: [
     BrowserModule,
+    ServiceWorkerModule.register('ngsw-worker.js', { enabled: environment.production }),
 
     CoreModule,
     SharedMainModule,
@@ -57,28 +58,7 @@ registerLocaleData(localeOc, 'oc')
     SharedUserInterfaceSettingsModule,
     SharedGlobalIconModule,
     SharedInstanceModule,
-
-    LoginModule,
-    ResetPasswordModule,
-    SearchModule,
-
-    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 ]
-    }),
+    SharedActorImageModule,
 
     AppRoutingModule // Put it after all the module because it has the 404 route
   ],
@@ -87,21 +67,7 @@ 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' }
+    }
   ]
 })
 export class AppModule {}