Skip to content
This repository was archived by the owner on Nov 21, 2024. It is now read-only.

Commit 1cc96ba

Browse files
committed
feat(srcgen): Update "web-page" template for rucken@2.0.0
1 parent 524a15b commit 1cc96ba

8 files changed

Lines changed: 31 additions & 39 deletions

File tree

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<div class="container-fluid">
2+
<h3 class="page-header">{{(activatedRoute.data | async)?.title | translate}}</h3>
3+
</div>
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import { Component } from '@angular/core';
2+
import { ActivatedRoute } from '@angular/router';
3+
4+
@Component({
5+
selector: '<%=page.name%>-page',
6+
templateUrl: './<%=page.name%>-page.component.html'
7+
})
8+
export class <%=page.classPrefix%>PageComponent {
9+
10+
constructor(
11+
public activatedRoute: ActivatedRoute
12+
) {
13+
}
14+
}

srcgen/web-page/%app.folder%/src/app/pages/%page.name%-page/%page.name%-page.module.ts renamed to srcgen/web-page/%app.folder%/src/app/components/pages/%page.name%-page/%page.name%-page.module.ts

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
import { ModuleWithProviders, NgModule } from '@angular/core';
22
import { RouterModule } from '@angular/router';
3-
import { RuckenWebPipes, SharedModule, PipesModule } from '@rucken/web';
4-
import { PageHeaderModule } from '@rucken/web';
5-
3+
import { SharedModule } from '../../../shared/shared.module';
64
import { <%=page.classPrefix%>PageComponent } from './<%=page.name%>-page.component';
75
import { <%=page.classPrefix%>PageRoutes } from './<%=page.name%>-page.routes';
86

97
@NgModule({
108
imports: [
11-
SharedModule.forRoot(),
12-
PageHeaderModule.forRoot(),
13-
PipesModule.forRoot(),
9+
SharedModule,
1410
RouterModule.forChild(<%=page.classPrefix%>PageRoutes)
1511
],
16-
declarations: [<%=page.classPrefix%>PageComponent],
17-
exports: [<%=page.classPrefix%>PageComponent],
18-
entryComponents: [<%=page.classPrefix%>PageComponent]
12+
declarations: [
13+
<%=page.classPrefix%>PageComponent
14+
]
1915
})
2016
export class <%=page.classPrefix%>PageModule {
2117
static forRoot(): ModuleWithProviders {

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
1-
import { translate } from '@rucken/core';
2-
import { AuthGuardService } from '@rucken/web';
3-
41
import { <%=page.classPrefix%>PageComponent } from './<%=page.name%>-page.component';
2+
import { translate } from '@rucken/core';
53

64
export const <%=page.classPrefix%>PageRoutes = [{
75
path: '',
8-
pathMatch: 'full',
96
component: <%=page.classPrefix%>PageComponent,
107
data: {
118
name: '<%=page.name%>',
129
title: translate('<%=page.title%>'),
13-
visible: true
14-
},
15-
canActivate: [AuthGuardService]
10+
visible: false
11+
}
1612
}];

srcgen/web-page/%app.folder%/src/app/pages/%page.name%-page/%page.name%-page.component.html

Lines changed: 0 additions & 3 deletions
This file was deleted.

srcgen/web-page/%app.folder%/src/app/pages/%page.name%-page/%page.name%-page.component.scss

Lines changed: 0 additions & 3 deletions
This file was deleted.

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

Lines changed: 0 additions & 10 deletions
This file was deleted.

test/cmd-generator-page._spec.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@ describe('Generator-page-command: create page with name "apple"', () => {
2121
dir: _dir,
2222
dirLocal: `test/${_dirLocal}`,
2323
files: [
24-
path.resolve(`${_dir}/src/app/pages/apple-page/apple-page.component.html`),
25-
path.resolve(`${_dir}/src/app/pages/apple-page/apple-page.component.scss`),
26-
path.resolve(`${_dir}/src/app/pages/apple-page/apple-page.component.ts`),
27-
path.resolve(`${_dir}/src/app/pages/apple-page/apple-page.module.ts`),
28-
path.resolve(`${_dir}/src/app/pages/apple-page/apple-page.routes.ts`)
24+
path.resolve(`${_dir}/src/app/components/pages/apple-page/apple-page.component.html`),
25+
path.resolve(`${_dir}/src/app/components/pages/apple-page/apple-page.component.ts`),
26+
path.resolve(`${_dir}/src/app/components/pages/apple-page/apple-page.module.ts`),
27+
path.resolve(`${_dir}/src/app/components/pages/apple-page/apple-page.routes.ts`)
2928
]
3029
});
3130
beforeEach(() => {
@@ -58,7 +57,7 @@ describe('Generator-page-command: create page with name "apple"', () => {
5857
dir: dir,
5958
dirLocal: dirLocal,
6059
files: files
61-
}) => {
60+
}) => {
6261
it(`not exists files generated for "${dirLocal}"`, () => {
6362
files.forEach((file: string) => {
6463
assert.equal(fsExtra.existsSync(file), false);
@@ -91,7 +90,7 @@ describe('Generator-page-command: create page with name "apple"', () => {
9190
dir: dir,
9291
dirLocal: dirLocal,
9392
files: files
94-
}) => {
93+
}) => {
9594
files.forEach((file: string) => {
9695
assert.equal(fsExtra.existsSync(file), true);
9796
});

0 commit comments

Comments
 (0)