Merge pull request #39 from Stivin/fix_meta

Перенес meta в директорию shared

Author: Gorniv

src/app/app.module.ts

@@ -6,7 +6,6 @@ import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 // libs
 import { CookieService } from 'ngx-cookie-service';
-import { MetaLoader, MetaModule, MetaSettings, MetaStaticLoader, PageTitlePositioning, } from '@ngx-meta/core';
 import { PrebootModule } from 'preboot';
 // shared
 import { TransferHttpModule } from '../modules/transfer-http/transfer-http.module';
@@ -15,29 +14,7 @@ import { SharedModule } from '@shared/shared.module';
 import { AppRoutes } from './app.routing';
 import { AppComponent } from './app.component';
 
-export function metaFactory(): MetaLoader {
-  const setting: MetaSettings = {
-    callback: (key: string) => key,
-    pageTitlePositioning: PageTitlePositioning.PrependPageTitle,
-    pageTitleSeparator: ' | ',
-    applicationName: 'App Universal',
-    // applicationUrl: 'https://gorniv.com/',
-    defaults: {
-      title: 'default page title',
-      description: 'default description',
-      'og:site_name': 'App site Universal',
-      'og:type': 'website',
-      'og:locale': 'ru_RU',
-      'og:locale:alternate': 'en_GB'
-    }
-  };
-  return new MetaStaticLoader(setting);
-}
-
 @NgModule({
-  declarations: [
-    AppComponent,
-  ],
   imports: [
     BrowserModule.withServerTransition({ appId: 'my-app' }),
     PrebootModule.withConfig({ appRoot: 'app-root' }),
@@ -47,12 +24,8 @@ export function metaFactory(): MetaLoader {
     TransferHttpModule,
     BrowserAnimationsModule,
     SharedModule.forRoot(),
-    MetaModule.forRoot({
-      provide: MetaLoader,
-      useFactory: metaFactory,
-      deps: []
-    }),
   ],
+  declarations: [AppComponent],
   providers: [CookieService],
   bootstrap: [AppComponent]
 })

src/app/app.routing.ts

@@ -6,25 +6,10 @@ import { WrapperComponent } from '@shared/layouts/wrapper/wrapper.component';
 const routes: Routes = [
   { path: '', redirectTo: 'home', pathMatch: 'full' },
   {
-    path: '', component: WrapperComponent, children: [
-      {
-        path: 'home', loadChildren: './home/home.module#HomeModule',
-        data: {
-          // for override default meta
-          meta: {
-            title: 'home title',
-            override: true,
-            description: 'home description'
-          }
-        },
-        // need for default meta
-        canActivateChild: [MetaGuard],
-      },
-      // without meta
+    path: '', component: WrapperComponent, canActivateChild: [MetaGuard], children: [
+      { path: 'home', loadChildren: './home/home.module#HomeModule' },
       { path: 'mock', loadChildren: './mock-server-browser/mock-server-browser.module#MockServerBrowserModule' },
-      // with meta
-      { path: 'back', loadChildren: './transfer-back/transfer-back.module#TransferBackModule', canActivateChild: [MetaGuard] },
-      // 404
+      { path: 'back', loadChildren: './transfer-back/transfer-back.module#TransferBackModule' },
       { path: '**', loadChildren: './not-found/not-found.module#NotFoundModule' },
     ]
   }

src/app/home/home.routing.ts

@@ -2,7 +2,16 @@ import { HomeComponent } from './home.component';
 import { Routes, RouterModule } from '@angular/router';
 
 const routes: Routes = [
-  { path: '', component: HomeComponent },
+  {
+    path: '', component: HomeComponent,
+    data: {
+      meta: {
+        title: 'Home title',
+        override: true,
+        description: 'Home description'
+      }
+    },
+  },
 ];
 
 export const HomeRoutes = RouterModule.forChild(routes);

src/app/mock-server-browser/mock-server-browser.routing.ts

@@ -2,7 +2,15 @@ import { Routes, RouterModule } from '@angular/router';
 import { MockServerBrowserComponent } from './mock-server-browser.component';
 
 const routes: Routes = [
-  { path: '', component: MockServerBrowserComponent },
+  {
+    path: '', component: MockServerBrowserComponent,
+    data: {
+      meta: {
+        title: 'Mock title',
+        description: 'Mock description'
+      }
+    },
+  },
 ];
 
 export const MockServerBrowserRoutes = RouterModule.forChild(routes);

src/app/not-found/not-found.routing.ts

@@ -2,7 +2,15 @@ import { NotFoundComponent } from './not-found.component';
 import { Routes, RouterModule } from '@angular/router';
 
 const routes: Routes = [
-  { path: '' , component: NotFoundComponent},
+  {
+    path: '', component: NotFoundComponent,
+    data: {
+      meta: {
+        title: 'Not Found',
+        description: 'Page not found'
+      }
+    },
+  },
 ];
 
 export const NotFoundRoutes = RouterModule.forChild(routes);

src/app/shared/shared-meta/index.ts

@@ -0,0 +1 @@
+export { SharedMetaModule } from './shared-meta.module';

src/app/shared/shared-meta/shared-meta.module.ts

@@ -0,0 +1,31 @@
+import { NgModule } from '@angular/core';
+import { MetaLoader, MetaModule, MetaStaticLoader, PageTitlePositioning } from '@ngx-meta/core';
+
+export function metaFactory(): MetaLoader {
+  return new MetaStaticLoader({
+    callback: (key: string): string => key,
+    pageTitlePositioning: PageTitlePositioning.PrependPageTitle,
+    pageTitleSeparator: ' | ',
+    applicationName: 'App Universal',
+    defaults: {
+      title: 'Default page title',
+      description: 'Default description',
+      'og:site_name': 'App site Universal',
+      'og:type': 'website',
+      'og:locale': 'ru_RU',
+      'og:locale:alternate': 'en_GB'
+    }
+  });
+}
+
+@NgModule({
+  imports: [
+    MetaModule.forRoot({
+      provide: MetaLoader,
+      useFactory: metaFactory,
+      deps: []
+    })
+  ]
+})
+export class SharedMetaModule {
+}

src/app/shared/shared.module.ts

@@ -1,10 +1,12 @@
 import { ModuleWithProviders, NgModule } from '@angular/core';
 
 import { LayoutsModule } from './layouts/layouts.module';
+import { SharedMetaModule } from './shared-meta';
 
 @NgModule({
   exports: [
     LayoutsModule,
+    SharedMetaModule
   ],
   providers: []
 })

src/app/transfer-back/transfer-back.routing.ts

@@ -2,7 +2,15 @@ import { TransferBackComponent } from './transfer-back.component';
 import { Routes, RouterModule } from '@angular/router';
 
 const routes: Routes = [
-  { path: '' , component: TransferBackComponent},
+  {
+    path: '', component: TransferBackComponent,
+    data: {
+      meta: {
+        title: 'Back title',
+        description: 'Back description'
+      }
+    },
+  },
 ];
 
 export const TransferBackRoutes = RouterModule.forChild(routes);