User dropdown and notifications popover improvements (#3344)

[github/Chocobozzz/PeerTube.git] / client / src / app / app.module.ts

diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index 9e220a3836d83d516ef4cc0c974e260e5af9e070..98dec42449e3378cd7f656b296661863b99d6cdc 100644 (file)
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -1,69 +1,75 @@
-import { LOCALE_ID, NgModule, TRANSLATIONS, TRANSLATIONS_FORMAT } from '@angular/core'
+import 'focus-visible'
+import { APP_BASE_HREF, registerLocaleData } from '@angular/common'
+import { NgModule } from '@angular/core'
 import { BrowserModule } from '@angular/platform-browser'
 import { ServerService } from '@app/core'
-import { ResetPasswordModule } from '@app/reset-password'
-
+import localeOc from '@app/helpers/locales/oc'
 import { MetaLoader, MetaModule, MetaStaticLoader, PageTitlePositioning } from '@ngx-meta/core'
-import 'focus-visible'
-
 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 } from '@angular/common'
+import { EmptyComponent } from './empty.component'
+import { HeaderComponent, SearchTypeaheadComponent, SuggestionComponent } from './header'
+import { HighlightPipe } from './header/highlight.pipe'
+import { NotificationComponent, LanguageChooserComponent, MenuComponent } 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 { 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.getTmpConfig().instance.name },
-    defaults: {
-      get title () { return serverService.getTmpConfig().instance.name },
-      get description () { return serverService.getTmpConfig().instance.shortDescription }
-    }
-  })
-}
+registerLocaleData(localeOc, 'oc')
 
 @NgModule({
   bootstrap: [ AppComponent ],
+
   declarations: [
     AppComponent,
+    EmptyComponent,
 
     MenuComponent,
     LanguageChooserComponent,
-    AvatarNotificationComponent,
+    QuickSettingsModalComponent,
+    NotificationComponent,
     HeaderComponent,
     SearchTypeaheadComponent,
-    SuggestionsComponent,
     SuggestionComponent,
+    HighlightPipe,
 
+    CustomModalComponent,
     WelcomeModalComponent,
-    InstanceConfigWarningModalComponent
+    InstanceConfigWarningModalComponent,
+    ConfirmComponent
   ],
+
   imports: [
     BrowserModule,
 
     CoreModule,
-    SharedModule,
-
-    CoreModule,
-    LoginModule,
-    ResetPasswordModule,
-    SearchModule,
-    SharedModule,
-    VideosModule,
+    SharedMainModule,
+    SharedFormModule,
+    SharedUserInterfaceSettingsModule,
+    SharedGlobalIconModule,
+    SharedInstanceModule,
 
     MetaModule.forRoot({
       provide: MetaLoader,
-      useFactory: (metaFactory),
+      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 ]
     }),
 
@@ -74,21 +80,7 @@ export function metaFactory (serverService: ServerService): MetaLoader {
     {
       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`)
-      },
-      deps: [ LOCALE_ID ]
-    },
-    { provide: TRANSLATIONS_FORMAT, useValue: 'xlf' }
+    }
   ]
 })
 export class AppModule {}