fix(generators): Fix errors in templates web page and frame generators

Author: EndyKaufman

srcgen/web-frame/%app.folder%/src/app/pages/%page.name%-page/%frame.name%-frame/%frame.name%-frame.module.ts

@@ -1,15 +1,17 @@
 import { ModuleWithProviders, NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { RuckenWebPipes, SharedModule, PipesModule } from '@rucken/web';
-import { FrameHeaderModule } from '@rucken/web';
+import { PageHeaderModule } from '@rucken/web';
 
 import { <%=frame.classPrefix%>FrameComponent } from './<%=frame.name%>-frame.component';
+import { <%=frame.classPrefix%>FrameRoutes } from './<%=frame.name%>-frame.routes';
 
 @NgModule({
   imports: [
     SharedModule.forRoot(),
-    FrameHeaderModule.forRoot(),
-    PipesModule.forRoot()
+    PageHeaderModule.forRoot(),
+    PipesModule.forRoot(),
+    RouterModule.forChild(<%=frame.classPrefix%>FrameRoutes)
   ],
   declarations: [<%=frame.classPrefix%>FrameComponent],
   exports: [<%=frame.classPrefix%>FrameComponent],

srcgen/web-frame/%app.folder%/src/app/pages/%page.name%-page/%frame.name%-frame/%frame.name%-frame.routes.ts

@@ -1,5 +1,5 @@
 import { translate } from '@rucken/core';
-import { <%=app.classPrefix%>AuthGuardService } from '../../../shared/guards/auth-guard.service';
+import { AuthGuardService } from '@rucken/web';
 
 import { <%=frame.classPrefix%>FrameComponent } from './<%=frame.name%>-frame.component';
 
@@ -11,5 +11,5 @@ export const <%=frame.classPrefix%>FrameRoutes = [{
     title: translate('<%=frame.title%>'),
     visible: true
   },
-  canActivate: [<%=app.classPrefix%>AuthGuardService]
+  canActivate: [AuthGuardService]
 }];

srcgen/web-page+frame/%app.folder%/src/app/pages/%page.name%-page/%frame.name%-frame/%frame.name%-frame.module.ts

@@ -1,15 +1,17 @@
 import { ModuleWithProviders, NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { RuckenWebPipes, SharedModule, PipesModule } from '@rucken/web';
-import { FrameHeaderModule } from '@rucken/web';
+import { PageHeaderModule } from '@rucken/web';
 
 import { <%=frame.classPrefix%>FrameComponent } from './<%=frame.name%>-frame.component';
+import { <%=frame.classPrefix%>FrameRoutes } from './<%=frame.name%>-frame.routes';
 
 @NgModule({
   imports: [
     SharedModule.forRoot(),
-    FrameHeaderModule.forRoot(),
-    PipesModule.forRoot()
+    PageHeaderModule.forRoot(),
+    PipesModule.forRoot(),
+    RouterModule.forChild(<%=frame.classPrefix%>FrameRoutes)
   ],
   declarations: [<%=frame.classPrefix%>FrameComponent],
   exports: [<%=frame.classPrefix%>FrameComponent],

srcgen/web-page+frame/%app.folder%/src/app/pages/%page.name%-page/%frame.name%-frame/%frame.name%-frame.routes.ts

@@ -1,5 +1,5 @@
 import { translate } from '@rucken/core';
-import { <%=app.classPrefix%>AuthGuardService } from '../../../shared/guards/auth-guard.service';
+import { AuthGuardService } from '@rucken/web';
 
 import { <%=frame.classPrefix%>FrameComponent } from './<%=frame.name%>-frame.component';
 
@@ -11,5 +11,5 @@ export const <%=frame.classPrefix%>FrameRoutes = [{
     title: translate('<%=frame.title%>'),
     visible: true
   },
-  canActivate: [<%=app.classPrefix%>AuthGuardService]
+  canActivate: [AuthGuardService]
 }];

srcgen/web-page+frame/%app.folder%/src/app/pages/%page.name%-page/%page.name%-page.module.ts

@@ -2,6 +2,7 @@ import { ModuleWithProviders, NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { RuckenWebPipes, SharedModule, PipesModule } from '@rucken/web';
 import { PageHeaderModule } from '@rucken/web';
+import { BasePageModule } from '@rucken/web';
 
 import { <%=page.classPrefix%>PageComponent } from './<%=page.name%>-page.component';
 import { <%=page.classPrefix%>PageRoutes } from './<%=page.name%>-page.routes';
@@ -11,7 +12,8 @@ import { <%=page.classPrefix%>PageRoutes } from './<%=page.name%>-page.routes';
     SharedModule.forRoot(),
     PageHeaderModule.forRoot(),
     PipesModule.forRoot(),
-    RouterModule.forChild(<%=page.classPrefix%>PageRoutes)
+    RouterModule.forChild(<%=page.classPrefix%>PageRoutes),
+    BasePageModule.forRoot()
   ],
   declarations: [<%=page.classPrefix%>PageComponent],
   exports: [<%=page.classPrefix%>PageComponent],

srcgen/web-page+frame/%app.folder%/src/app/pages/%page.name%-page/%page.name%-page.routes.ts

@@ -1,26 +1,29 @@
 import { translate } from '@rucken/core';
-import { <%=app.classPrefix%>AuthGuardService } from '../../shared/guards/auth-guard.service';
+import { AuthGuardService } from '@rucken/web';
+import { Routes } from '@angular/router';
 
 import { <%=page.classPrefix%>PageComponent } from './<%=page.name%>-page.component';
 import { <%=frame.classPrefix%>FrameRoutes } from './<%=frame.name%>-frame/<%=frame.name%>-frame.routes';
 
 const children = [
-  { path: '', redirectTo: '/<%=frame.name%>', pathMatch: 'full' },
   {
     path: '<%=frame.name%>',
     loadChildren: './<%=frame.name%>-frame/<%=frame.name%>-frame.module#<%=frame.classPrefix%>FrameModule',
     data: <%=frame.classPrefix%>FrameRoutes[0].data,
-    canActivate: [<%=app.classPrefix%>AuthGuardService]
+    canActivate: [AuthGuardService]
   }
 ];
-export const <%=page.classPrefix%>PageRoutes = [{
-  component: <%=page.classPrefix%>PageComponent,
-  data: {
-    name: '<%=page.name%>',
-    title: translate('<%=page.title%>'),
-    visible: true,
-    children: children
-  },
-  children: children,
-  canActivate: [<%=app.classPrefix%>AuthGuardService]
+export const <%=page.classPrefix%>PageRoutes: Routes = [
+  { path: '', redirectTo: '/<%=page.name%>/<%=frame.name%>', pathMatch: 'full' },
+  {
+    path: '',
+    component: <%=page.classPrefix%>PageComponent,
+    data: {
+      name: '<%=page.name%>',
+      title: translate('<%=page.title%>'),
+      visible: true,
+      children: children
+    },
+    children: children,
+    canActivate: [AuthGuardService]
 }];

srcgen/web-page/%app.folder%/src/app/pages/%page.name%-page/%page.name%-page.routes.ts

@@ -1,5 +1,5 @@
 import { translate } from '@rucken/core';
-import { <%=app.classPrefix%>AuthGuardService } from '../../shared/guards/auth-guard.service';
+import { AuthGuardService } from '@rucken/web';
 
 import { <%=page.classPrefix%>PageComponent } from './<%=page.name%>-page.component';
 
@@ -12,5 +12,5 @@ export const <%=page.classPrefix%>PageRoutes = [{
     title: translate('<%=page.title%>'),
     visible: true
   },
-  canActivate: [<%=app.classPrefix%>AuthGuardService]
+  canActivate: [AuthGuardService]
 }];