Fix deleting highlighted thread

[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 14fdb7588b9a3996e6e7b7fe090ca65f25379c7d..6e74cd394298b48a4e8d71bb3b8e8aed64613857 100644 (file)
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -9,7 +9,7 @@ import 'focus-visible'
 import { AppRoutingModule } from './app-routing.module'
 import { AppComponent } from './app.component'
 import { CoreModule } from './core'
-import { HeaderComponent } from './header'
+import { HeaderComponent, SearchTypeaheadComponent, SuggestionsComponent, SuggestionComponent } from './header'
 import { LoginModule } from './login'
 import { AvatarNotificationComponent, LanguageChooserComponent, MenuComponent } from './menu'
 import { SharedModule } from './shared'
@@ -18,18 +18,9 @@ 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'
-
-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 }
-    }
-  })
-}
+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 ],
@@ -38,9 +29,14 @@ export function metaFactory (serverService: ServerService): MetaLoader {
 
     MenuComponent,
     LanguageChooserComponent,
+    QuickSettingsModalComponent,
     AvatarNotificationComponent,
     HeaderComponent,
+    SearchTypeaheadComponent,
+    SuggestionsComponent,
+    SuggestionComponent,
 
+    CustomModalComponent,
     WelcomeModalComponent,
     InstanceConfigWarningModalComponent
   ],
@@ -59,7 +55,17 @@ export function metaFactory (serverService: ServerService): MetaLoader {
 
     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 ]
     }),
 
@@ -67,15 +73,20 @@ export function metaFactory (serverService: ServerService): MetaLoader {
   ],
 
   providers: [
+    {
+      provide: APP_BASE_HREF,
+      useValue: '/'
+    },
+
     {
       provide: TRANSLATIONS,
       useFactory: (locale: string) => {
-                // Default locale, nothing to translate
+        // 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`)
+        return require(`raw-loader!../locale/angular.${fileLocale}.xlf`).default
       },
       deps: [ LOCALE_ID ]
     },