X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.module.ts;h=6e74cd394298b48a4e8d71bb3b8e8aed64613857;hb=745437e3ab402d5b8f85de6e9c09c3b6092e5904;hp=80734f7a2b15599269bdbdae7b5c27c36229c6e4;hpb=2ac6c5256067b13d90c8c1faa310bd59aea9a1fa;p=oweals%2Fpeertube.git

diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index 80734f7a2..6e74cd394 100644
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -1,148 +1,96 @@
-import { ApplicationRef, NgModule } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { HttpModule, RequestOptions, XHRBackend } from '@angular/http';
-import { RouterModule } from '@angular/router';
-import { removeNgStyles, createNewHosts } from '@angularclass/hmr';
+import { LOCALE_ID, NgModule, TRANSLATIONS, TRANSLATIONS_FORMAT } from '@angular/core'
+import { BrowserModule } from '@angular/platform-browser'
+import { ServerService } from '@app/core'
+import { ResetPasswordModule } from '@app/reset-password'
 
-import { BytesPipe } from 'angular-pipes/src/math/bytes.pipe';
-import { DropdownModule } from 'ng2-bootstrap/components/dropdown';
-import { ProgressbarModule } from 'ng2-bootstrap/components/progressbar';
-import { PaginationModule } from 'ng2-bootstrap/components/pagination';
-import { FileUploadModule } from 'ng2-file-upload/ng2-file-upload';
+import { MetaLoader, MetaModule, MetaStaticLoader, PageTitlePositioning } from '@ngx-meta/core'
+import 'focus-visible'
 
-/*
- * Platform and Environment providers/directives/pipes
- */
-import { ENV_PROVIDERS } from './environment';
-import { routes } from './app.routes';
-// App is our top level component
-import { AppComponent } from './app.component';
-import { AppState } from './app.service';
+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 { QuickSettingsModalComponent } from '@app/modal/quick-settings-modal.component'
+import { CustomModalComponent } from '@app/modal/custom-modal.component'
 
-import {
-  AdminComponent,
-  FriendsComponent,
-  FriendAddComponent,
-  FriendListComponent,
-  FriendService,
-  MenuAdminComponent,
-  RequestsComponent,
-  RequestStatsComponent,
-  RequestService,
-  UsersComponent,
-  UserAddComponent,
-  UserListComponent,
-  UserService
-} from './admin';
-import { AccountComponent, AccountService } from './account';
-import { LoginComponent } from './login';
-import { MenuComponent } from './menu.component';
-import { AuthService, AuthHttp, RestExtractor, RestService, SearchComponent, SearchService } from './shared';
-import {
-  LoaderComponent,
-  VideosComponent,
-  VideoAddComponent,
-  VideoListComponent,
-  VideoMiniatureComponent,
-  VideoSortComponent,
-  VideoWatchComponent,
-  VideoService,
-  WebTorrentService
-} from './videos';
-
-// Application wide providers
-const APP_PROVIDERS = [
-  AppState,
-
-  {
-    provide: AuthHttp,
-    useFactory: (backend: XHRBackend, defaultOptions: RequestOptions, authService: AuthService) => {
-      return new AuthHttp(backend, defaultOptions, authService);
-    },
-    deps: [ XHRBackend, RequestOptions, AuthService ]
-  },
-
-  AuthService,
-  RestExtractor,
-  RestService,
-
-  VideoService,
-  SearchService,
-  FriendService,
-  RequestService,
-  UserService,
-  AccountService,
-  WebTorrentService
-];
-/**
- * `AppModule` is the main entry point into Angular2's bootstraping process
- */
 @NgModule({
   bootstrap: [ AppComponent ],
   declarations: [
-    AccountComponent,
-    AdminComponent,
     AppComponent,
-    BytesPipe,
-    FriendAddComponent,
-    FriendListComponent,
-    FriendsComponent,
-    LoaderComponent,
-    LoginComponent,
-    MenuAdminComponent,
+
     MenuComponent,
-    RequestsComponent,
-    RequestStatsComponent,
-    SearchComponent,
-    UserAddComponent,
-    UserListComponent,
-    UsersComponent,
-    VideoAddComponent,
-    VideoListComponent,
-    VideoMiniatureComponent,
-    VideosComponent,
-    VideoSortComponent,
-    VideoWatchComponent,
+    LanguageChooserComponent,
+    QuickSettingsModalComponent,
+    AvatarNotificationComponent,
+    HeaderComponent,
+    SearchTypeaheadComponent,
+    SuggestionsComponent,
+    SuggestionComponent,
+
+    CustomModalComponent,
+    WelcomeModalComponent,
+    InstanceConfigWarningModalComponent
   ],
-  imports: [ // import Angular's modules
+  imports: [
     BrowserModule,
-    FormsModule,
-    ReactiveFormsModule,
-    HttpModule,
-    RouterModule.forRoot(routes),
 
-    DropdownModule,
-    ProgressbarModule,
-    PaginationModule,
-    FileUploadModule
+    CoreModule,
+    SharedModule,
+
+    CoreModule,
+    LoginModule,
+    ResetPasswordModule,
+    SearchModule,
+    SharedModule,
+    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 ]
+    }),
+
+    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: 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 {
-  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 {}