Improve remote runner config UX

[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 e9bb800f4f2dfb2a5b793e82afa7e01147e997f8..7e4fac730fee05aec961e4d85a3e8a835fe620c5 100644 (file)
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -1,83 +1,96 @@
-import { ApplicationRef, NgModule } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
-import { removeNgStyles, createNewHosts } from '@angularclass/hmr';
+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, PluginService, RedirectService, 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'
 
-import { MetaModule, MetaConfig } from 'ng2-meta';
+registerLocaleData(localeOc, 'oc')
 
-import { ENV_PROVIDERS } from './environment';
-import { AppRoutingModule } from './app-routing.module';
-import { AppComponent } from './app.component';
-import { AppState } from './app.service';
+export function loadConfigFactory (server: ServerService, pluginService: PluginService, redirectService: RedirectService) {
+  const initializeServices = () => {
+    redirectService.init()
+    pluginService.initializePlugins()
+  }
 
-import { AccountModule } from './account';
-import { AdminModule } from './admin';
-import { CoreModule } from './core';
-import { LoginModule } from './login';
-import { SharedModule } from './shared';
-import { VideosModule } from './videos';
+  return () => {
+    const result = server.loadHTMLConfig()
+    if (result) return result.pipe(tap(() => initializeServices()))
 
-const metaConfig: MetaConfig = {
-  //Append a title suffix such as a site name to all titles
-  //Defaults to false
-  useTitleSuffix: true,
-  defaults: {
-    title: 'PeerTube'
+    initializeServices()
   }
-};
-
-// Application wide providers
-const APP_PROVIDERS = [
-  AppState
-];
+}
 
 @NgModule({
   bootstrap: [ AppComponent ],
+
   declarations: [
-    AppComponent
+    AppComponent,
+    EmptyComponent,
+
+    MenuComponent,
+    LanguageChooserComponent,
+    QuickSettingsModalComponent,
+    NotificationComponent,
+    HeaderComponent,
+    SearchTypeaheadComponent,
+    SuggestionComponent,
+    HighlightPipe,
+
+    AccountSetupWarningModalComponent,
+    CustomModalComponent,
+    AdminWelcomeModalComponent,
+    InstanceConfigWarningModalComponent,
+    ConfirmComponent
   ],
+
   imports: [
     BrowserModule,
+    ServiceWorkerModule.register('ngsw-worker.js', { enabled: environment.production }),
 
     CoreModule,
-    SharedModule,
-
-    AppRoutingModule,
+    SharedMainModule,
+    SharedFormModule,
+    SharedUserInterfaceSettingsModule,
+    SharedGlobalIconModule,
+    SharedInstanceModule,
+    SharedActorImageModule,
 
-    MetaModule.forRoot(metaConfig),
-
-    AccountModule,
-    AdminModule,
-    CoreModule,
-    LoginModule,
-    SharedModule,
-    VideosModule
+    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: '/'
+    },
+    {
+      provide: APP_INITIALIZER,
+      useFactory: loadConfigFactory,
+      deps: [ ServerService, PluginService, RedirectService ],
+      multi: true
+    }
   ]
 })
-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 {}