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 2d6fbaf21964e430e2753668cdd1c19dc6cec1b0..98dec42449e3378cd7f656b296661863b99d6cdc 100644 (file)
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -1,88 +1,86 @@
-import { ApplicationRef, NgModule } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
-import { removeNgStyles, createNewHosts } from '@angularclass/hmr';
+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 localeOc from '@app/helpers/locales/oc'
+import { MetaLoader, MetaModule, MetaStaticLoader, PageTitlePositioning } from '@ngx-meta/core'
+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 { 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'
 
-import { MetaModule, MetaLoader, MetaStaticLoader, PageTitlePositioning } from '@nglibs/meta';
-import 'bootstrap-loader';
-
-import { ENV_PROVIDERS } from './environment';
-import { AppRoutingModule } from './app-routing.module';
-import { AppComponent } from './app.component';
-import { AppState } from './app.service';
-
-import { AccountModule } from './account';
-import { CoreModule } from './core';
-import { LoginModule } from './login';
-import { SharedModule } from './shared';
-import { VideosModule } from './videos';
-
-export function metaFactory(): MetaLoader {
-  return new MetaStaticLoader({
-    pageTitlePositioning: PageTitlePositioning.PrependPageTitle,
-    pageTitleSeparator: ' - ',
-    applicationName: 'PeerTube',
-    defaults: {
-      title: 'PeerTube',
-      description: 'PeerTube, a decentralized video streaming platform using P2P (BitTorrent) directly in the web browser'
-    }
-  });
-}
-
-// Application wide providers
-const APP_PROVIDERS = [
-  AppState
-];
+registerLocaleData(localeOc, 'oc')
 
 @NgModule({
   bootstrap: [ AppComponent ],
+
   declarations: [
-    AppComponent
+    AppComponent,
+    EmptyComponent,
+
+    MenuComponent,
+    LanguageChooserComponent,
+    QuickSettingsModalComponent,
+    NotificationComponent,
+    HeaderComponent,
+    SearchTypeaheadComponent,
+    SuggestionComponent,
+    HighlightPipe,
+
+    CustomModalComponent,
+    WelcomeModalComponent,
+    InstanceConfigWarningModalComponent,
+    ConfirmComponent
   ],
+
   imports: [
     BrowserModule,
 
     CoreModule,
-    SharedModule,
-
-    AppRoutingModule,
-
-    AccountModule,
-    CoreModule,
-    LoginModule,
-    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 ]
+    }),
+
+    AppRoutingModule // Put it after all the module because it has the 404 route
   ],
-  providers: [ // expose our Services and Providers into Angular's dependency injection
-    ENV_PROVIDERS,
-    APP_PROVIDERS
+
+  providers: [
+    {
+      provide: APP_BASE_HREF,
+      useValue: '/'
+    }
   ]
 })
-export class AppModule {
-  constructor(public appRef: ApplicationRef, public appState: AppState) {}
-  hmrOnInit(store) {
-    if (!store || !store.state) return;
-    console.log('HMR store', store);
-    this.appState._state = store.state;
-    this.appRef.tick();
-    delete store.state;
-  }
-  hmrOnDestroy(store) {
-    const cmpLocation = this.appRef.components.map(cmp => cmp.location.nativeElement);
-    // recreate elements
-    const state = this.appState._state;
-    store.state = state;
-    store.disposeOldHosts = createNewHosts(cmpLocation);
-    // remove styles
-    removeNgStyles();
-  }
-  hmrAfterDestroy(store) {
-    // display new elements
-    store.disposeOldHosts();
-    delete store.disposeOldHosts;
-  }
-}
+export class AppModule {}