Part integration

Fafnur · Feb 16, 2020 · 4360bb8 · 4360bb8
1 parent 58f5465
commit 4360bb8
Show file tree

Hide file tree

Showing 33 changed files with 260 additions and 84 deletions.
diff --git a/apps/frontend/common-styles/src/app/app.browser.module.ts b/apps/frontend/common-styles/src/app/app.browser.module.ts
@@ -1,8 +1,10 @@
+import { HttpClient } from '@angular/common/http';
 import { NgModule } from '@angular/core';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreDevtoolsModule } from '@ngrx/store-devtools';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
-import { BrowserTranslationModule } from '@medium-stories/translation';
+import { translateHttpFactory, TRANSLATION_PREFIX, TRANSLATION_SUFFIX } from '@medium-stories/translation';
 
 import { environment } from '../environments/environment';
 import { AppModule } from './app.module';
@@ -14,8 +16,12 @@ import { CoreModule } from './core/core.module';
     AppModule,
     CoreModule,
     BrowserAnimationsModule,
-    BrowserTranslationModule.forRoot({
-      config: environment.translation
+    TranslateModule.forRoot({
+      loader: {
+        provide: TranslateLoader,
+        useFactory: translateHttpFactory,
+        deps: [HttpClient, TRANSLATION_PREFIX, TRANSLATION_SUFFIX]
+      }
     }),
     !environment.production ? StoreDevtoolsModule.instrument({ logOnly: environment.production }) : []
   ],

diff --git a/apps/frontend/common-styles/src/app/app.server.module.ts b/apps/frontend/common-styles/src/app/app.server.module.ts
@@ -1,9 +1,10 @@
 import { NgModule } from '@angular/core';
 import { ServerModule, ServerTransferStateModule } from '@angular/platform-server';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
-import { ServerTranslationModule } from '@medium-stories/translation';
+import { APP_DIST } from '@medium-stories/common';
+import { serverTranslateFactory, TRANSLATION_PREFIX, TRANSLATION_SUFFIX } from '@medium-stories/translation';
 
-import { environment } from '../environments/environment';
 import { AppModule } from './app.module';
 import { AppComponent } from './core/containers/app/app.component';
 import { CoreModule } from './core/core.module';
@@ -13,8 +14,12 @@ import { CoreModule } from './core/core.module';
     AppModule,
     CoreModule,
     ServerModule,
-    ServerTranslationModule.forRoot({
-      config: environment.translation
+    TranslateModule.forRoot({
+      loader: {
+        provide: TranslateLoader,
+        useFactory: serverTranslateFactory,
+        deps: [APP_DIST, TRANSLATION_PREFIX, TRANSLATION_SUFFIX]
+      }
     }),
     ServerTransferStateModule
   ],

diff --git a/apps/frontend/common-styles/src/app/core/core.module.ts b/apps/frontend/common-styles/src/app/core/core.module.ts
@@ -6,14 +6,19 @@ import { NxModule } from '@nrwl/angular';
 
 import { StorageModule } from '@medium-stories/storage';
 import { RootStoreModule } from '@medium-stories/store';
+import { TranslationModule } from '@medium-stories/translation';
 
+import { environment } from '../../environments/environment';
 import { coreContainers, coreRoutes } from './core.common';
 
 @NgModule({
   imports: [
     CommonModule,
     StorageModule.forRoot(),
     NxModule.forRoot(),
+    TranslationModule.forRoot({
+      config: environment.translation
+    }),
     RouterModule.forRoot(coreRoutes, { initialNavigation: 'enabled' }),
     RootStoreModule,
     TranslateModule

diff --git a/apps/frontend/forms/src/app/app.browser.module.ts b/apps/frontend/forms/src/app/app.browser.module.ts
@@ -1,8 +1,10 @@
+import { HttpClient } from '@angular/common/http';
 import { NgModule } from '@angular/core';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreDevtoolsModule } from '@ngrx/store-devtools';
 
-import { BrowserTranslationModule } from '@medium-stories/translation';
+import { translateHttpFactory, TRANSLATION_PREFIX, TRANSLATION_SUFFIX, TranslationModule } from '@medium-stories/translation';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
 import { environment } from '../environments/environment';
 import { AppModule } from './app.module';
@@ -14,8 +16,12 @@ import { CoreModule } from './core/core.module';
     AppModule,
     CoreModule,
     BrowserAnimationsModule,
-    BrowserTranslationModule.forRoot({
-      config: environment.translation
+    TranslateModule.forRoot({
+      loader: {
+        provide: TranslateLoader,
+        useFactory: translateHttpFactory,
+        deps: [HttpClient, TRANSLATION_PREFIX, TRANSLATION_SUFFIX]
+      }
     }),
     !environment.production ? StoreDevtoolsModule.instrument({ logOnly: environment.production }) : []
   ],

diff --git a/apps/frontend/forms/src/app/app.server.module.ts b/apps/frontend/forms/src/app/app.server.module.ts
@@ -1,9 +1,10 @@
 import { NgModule } from '@angular/core';
 import { ServerModule, ServerTransferStateModule } from '@angular/platform-server';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
-import { ServerTranslationModule } from '@medium-stories/translation';
+import { APP_DIST } from '@medium-stories/common';
+import { serverTranslateFactory, TRANSLATION_PREFIX, TRANSLATION_SUFFIX } from '@medium-stories/translation';
 
-import { environment } from '../environments/environment';
 import { AppModule } from './app.module';
 import { AppComponent } from './core/containers/app/app.component';
 import { CoreModule } from './core/core.module';
@@ -13,8 +14,12 @@ import { CoreModule } from './core/core.module';
     AppModule,
     CoreModule,
     ServerModule,
-    ServerTranslationModule.forRoot({
-      config: environment.translation
+    TranslateModule.forRoot({
+      loader: {
+        provide: TranslateLoader,
+        useFactory: serverTranslateFactory,
+        deps: [APP_DIST, TRANSLATION_PREFIX, TRANSLATION_SUFFIX]
+      }
     }),
     ServerTransferStateModule
   ],

diff --git a/apps/frontend/forms/src/app/core/core.module.ts b/apps/frontend/forms/src/app/core/core.module.ts
@@ -3,7 +3,6 @@ import localeEn from '@angular/common/locales/en';
 import localeRu from '@angular/common/locales/ru';
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { StorageModule } from '@medium-stories/storage';
 import { TranslateModule } from '@ngx-translate/core';
 import { NxModule } from '@nrwl/angular';
 import { APOLLO_OPTIONS, ApolloModule } from 'apollo-angular';
@@ -13,7 +12,9 @@ import { InMemoryCache } from 'apollo-cache-inmemory';
 import { API_SOURCES, APP_DIST } from '@medium-stories/common';
 import { FOOTER_GROUPS_LINKS, FOOTER_NAV_LINKS, LayoutsCoreModule, NAV_LINKS } from '@medium-stories/layouts';
 import { RESPONSIVE_SIZE_DEFAULT, ResponsiveModule } from '@medium-stories/responsive';
+import { StorageModule } from '@medium-stories/storage';
 import { RootStoreModule } from '@medium-stories/store';
+import { TranslationModule } from '@medium-stories/translation';
 
 import { environment } from '../../environments/environment';
 import { coreContainers, coreFooterGroupsLinks, coreFooterNavLinks, coreNavLinks, coreRoutes } from './core.common';
@@ -33,6 +34,9 @@ export function createApollo(httpLink: HttpLink) {
     NxModule.forRoot(),
     LayoutsCoreModule,
     StorageModule.forRoot(),
+    TranslationModule.forRoot({
+      config: environment.translation
+    }),
     ResponsiveModule.forRoot({
       mode: {
         mobile: 'lg',

diff --git a/apps/frontend/graphql/src/app/app.browser.module.ts b/apps/frontend/graphql/src/app/app.browser.module.ts
@@ -1,8 +1,10 @@
+import { HttpClient } from '@angular/common/http';
 import { NgModule } from '@angular/core';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreDevtoolsModule } from '@ngrx/store-devtools';
 
-import { BrowserTranslationModule } from '@medium-stories/translation';
+import { translateHttpFactory, TRANSLATION_PREFIX, TRANSLATION_SUFFIX, TranslationModule } from '@medium-stories/translation';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
 import { environment } from '../environments/environment';
 import { AppModule } from './app.module';
@@ -14,8 +16,12 @@ import { CoreModule } from './core/core.module';
     AppModule,
     CoreModule,
     BrowserAnimationsModule,
-    BrowserTranslationModule.forRoot({
-      config: environment.translation
+    TranslateModule.forRoot({
+      loader: {
+        provide: TranslateLoader,
+        useFactory: translateHttpFactory,
+        deps: [HttpClient, TRANSLATION_PREFIX, TRANSLATION_SUFFIX]
+      }
     }),
     !environment.production ? StoreDevtoolsModule.instrument({ logOnly: environment.production }) : []
   ],

diff --git a/apps/frontend/graphql/src/app/app.server.module.ts b/apps/frontend/graphql/src/app/app.server.module.ts
@@ -1,9 +1,10 @@
 import { NgModule } from '@angular/core';
 import { ServerModule, ServerTransferStateModule } from '@angular/platform-server';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
-import { ServerTranslationModule } from '@medium-stories/translation';
+import { APP_DIST } from '@medium-stories/common';
+import { serverTranslateFactory, TRANSLATION_PREFIX, TRANSLATION_SUFFIX } from '@medium-stories/translation';
 
-import { environment } from '../environments/environment';
 import { AppModule } from './app.module';
 import { AppComponent } from './core/containers/app/app.component';
 import { CoreModule } from './core/core.module';
@@ -13,8 +14,12 @@ import { CoreModule } from './core/core.module';
     AppModule,
     CoreModule,
     ServerModule,
-    ServerTranslationModule.forRoot({
-      config: environment.translation
+    TranslateModule.forRoot({
+      loader: {
+        provide: TranslateLoader,
+        useFactory: serverTranslateFactory,
+        deps: [APP_DIST, TRANSLATION_PREFIX, TRANSLATION_SUFFIX]
+      }
     }),
     ServerTransferStateModule
   ],

diff --git a/apps/frontend/graphql/src/app/core/core.module.ts b/apps/frontend/graphql/src/app/core/core.module.ts
@@ -3,7 +3,6 @@ import localeEn from '@angular/common/locales/en';
 import localeRu from '@angular/common/locales/ru';
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { StorageModule } from '@medium-stories/storage';
 import { TranslateModule } from '@ngx-translate/core';
 import { NxModule } from '@nrwl/angular';
 import { APOLLO_OPTIONS, ApolloModule } from 'apollo-angular';
@@ -13,7 +12,9 @@ import { InMemoryCache } from 'apollo-cache-inmemory';
 import { API_SOURCES, APP_DIST } from '@medium-stories/common';
 import { FOOTER_GROUPS_LINKS, FOOTER_NAV_LINKS, LayoutsCoreModule, NAV_LINKS } from '@medium-stories/layouts';
 import { RESPONSIVE_SIZE_DEFAULT, ResponsiveModule } from '@medium-stories/responsive';
+import { StorageModule } from '@medium-stories/storage';
 import { RootStoreModule } from '@medium-stories/store';
+import { TranslationModule } from '@medium-stories/translation';
 
 import { environment } from '../../environments/environment';
 import { coreContainers, coreFooterGroupsLinks, coreFooterNavLinks, coreNavLinks, coreRoutes } from './core.common';
@@ -33,6 +34,9 @@ export function createApollo(httpLink: HttpLink) {
     NxModule.forRoot(),
     LayoutsCoreModule,
     StorageModule.forRoot(),
+    TranslationModule.forRoot({
+      config: environment.translation
+    }),
     ResponsiveModule.forRoot({
       mode: {
         mobile: 'lg',

diff --git a/apps/frontend/markup/src/app/app.browser.module.ts b/apps/frontend/markup/src/app/app.browser.module.ts
@@ -1,8 +1,10 @@
+import { HttpClient } from '@angular/common/http';
 import { NgModule } from '@angular/core';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreDevtoolsModule } from '@ngrx/store-devtools';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
-import { BrowserTranslationModule } from '@medium-stories/translation';
+import { translateHttpFactory, TRANSLATION_PREFIX, TRANSLATION_SUFFIX } from '@medium-stories/translation';
 
 import { environment } from '../environments/environment';
 import { AppModule } from './app.module';
@@ -14,8 +16,12 @@ import { CoreModule } from './core/core.module';
     AppModule,
     CoreModule,
     BrowserAnimationsModule,
-    BrowserTranslationModule.forRoot({
-      config: environment.translation
+    TranslateModule.forRoot({
+      loader: {
+        provide: TranslateLoader,
+        useFactory: translateHttpFactory,
+        deps: [HttpClient, TRANSLATION_PREFIX, TRANSLATION_SUFFIX]
+      }
     }),
     !environment.production ? StoreDevtoolsModule.instrument({ logOnly: environment.production }) : []
   ],

diff --git a/apps/frontend/markup/src/app/app.server.module.ts b/apps/frontend/markup/src/app/app.server.module.ts
@@ -1,9 +1,10 @@
 import { NgModule } from '@angular/core';
 import { ServerModule, ServerTransferStateModule } from '@angular/platform-server';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
-import { ServerTranslationModule } from '@medium-stories/translation';
+import { APP_DIST } from '@medium-stories/common';
+import { serverTranslateFactory, TRANSLATION_PREFIX, TRANSLATION_SUFFIX } from '@medium-stories/translation';
 
-import { environment } from '../environments/environment';
 import { AppModule } from './app.module';
 import { AppComponent } from './core/containers/app/app.component';
 import { CoreModule } from './core/core.module';
@@ -13,8 +14,12 @@ import { CoreModule } from './core/core.module';
     AppModule,
     CoreModule,
     ServerModule,
-    ServerTranslationModule.forRoot({
-      config: environment.translation
+    TranslateModule.forRoot({
+      loader: {
+        provide: TranslateLoader,
+        useFactory: serverTranslateFactory,
+        deps: [APP_DIST, TRANSLATION_PREFIX, TRANSLATION_SUFFIX]
+      }
     }),
     ServerTransferStateModule
   ],

diff --git a/apps/frontend/markup/src/app/core/core.module.ts b/apps/frontend/markup/src/app/core/core.module.ts
@@ -8,6 +8,8 @@ import { FOOTER_GROUPS_LINKS, FOOTER_NAV_LINKS, NAV_LINKS } from '@medium-storie
 import { RESPONSIVE_SIZE_DEFAULT, ResponsiveModule } from '@medium-stories/responsive';
 import { StorageModule } from '@medium-stories/storage';
 import { RootStoreModule } from '@medium-stories/store';
+import { TranslationModule } from '@medium-stories/translation';
+import { environment } from '../../environments/environment';
 
 import { coreContainers, coreFooterGroupsLinks, coreFooterNavLinks, coreNavLinks, coreRoutes } from './core.common';
 
@@ -16,6 +18,9 @@ import { coreContainers, coreFooterGroupsLinks, coreFooterNavLinks, coreNavLinks
     CommonModule,
     NxModule.forRoot(),
     StorageModule.forRoot(),
+    TranslationModule.forRoot({
+      config: environment.translation
+    }),
     ResponsiveModule.forRoot({
       mode: {
         mobile: 'lg',

diff --git a/apps/frontend/responsive/src/app/app.browser.module.ts b/apps/frontend/responsive/src/app/app.browser.module.ts
@@ -1,8 +1,10 @@
+import { HttpClient } from '@angular/common/http';
 import { NgModule } from '@angular/core';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { StoreDevtoolsModule } from '@ngrx/store-devtools';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
-import { BrowserTranslationModule } from '@medium-stories/translation';
+import { translateHttpFactory, TRANSLATION_PREFIX, TRANSLATION_SUFFIX } from '@medium-stories/translation';
 
 import { environment } from '../environments/environment';
 import { AppModule } from './app.module';
@@ -14,8 +16,12 @@ import { CoreModule } from './core/core.module';
     AppModule,
     CoreModule,
     BrowserAnimationsModule,
-    BrowserTranslationModule.forRoot({
-      config: environment.translation
+    TranslateModule.forRoot({
+      loader: {
+        provide: TranslateLoader,
+        useFactory: translateHttpFactory,
+        deps: [HttpClient, TRANSLATION_PREFIX, TRANSLATION_SUFFIX]
+      }
     }),
     !environment.production ? StoreDevtoolsModule.instrument({ logOnly: environment.production }) : []
   ],

diff --git a/apps/frontend/responsive/src/app/app.server.module.ts b/apps/frontend/responsive/src/app/app.server.module.ts
@@ -1,9 +1,10 @@
 import { NgModule } from '@angular/core';
 import { ServerModule, ServerTransferStateModule } from '@angular/platform-server';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
-import { ServerTranslationModule } from '@medium-stories/translation';
+import { APP_DIST } from '@medium-stories/common';
+import { serverTranslateFactory, TRANSLATION_PREFIX, TRANSLATION_SUFFIX } from '@medium-stories/translation';
 
-import { environment } from '../environments/environment';
 import { AppModule } from './app.module';
 import { AppComponent } from './core/containers/app/app.component';
 import { CoreModule } from './core/core.module';
@@ -13,8 +14,12 @@ import { CoreModule } from './core/core.module';
     AppModule,
     CoreModule,
     ServerModule,
-    ServerTranslationModule.forRoot({
-      config: environment.translation
+    TranslateModule.forRoot({
+      loader: {
+        provide: TranslateLoader,
+        useFactory: serverTranslateFactory,
+        deps: [APP_DIST, TRANSLATION_PREFIX, TRANSLATION_SUFFIX]
+      }
     }),
     ServerTransferStateModule
   ],

diff --git a/apps/frontend/responsive/src/app/core/core.module.ts b/apps/frontend/responsive/src/app/core/core.module.ts
@@ -7,14 +7,19 @@ import { NxModule } from '@nrwl/angular';
 import { ResponsiveModule } from '@medium-stories/responsive';
 import { StorageModule } from '@medium-stories/storage';
 import { RootStoreModule } from '@medium-stories/store';
+import { TranslationModule } from '@medium-stories/translation';
 
+import { environment } from '../../environments/environment';
 import { coreContainers, coreRoutes } from './core.common';
 
 @NgModule({
   imports: [
     CommonModule,
     NxModule.forRoot(),
     StorageModule.forRoot(),
+    TranslationModule.forRoot({
+      config: environment.translation
+    }),
     ResponsiveModule.forRoot(),
     RouterModule.forRoot(coreRoutes, { initialNavigation: 'enabled' }),
     RootStoreModule,