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

Commit 553ce59

Browse files
committed
feat(srcgen): Update "web-frame" template for rucken@2.0.0
1 parent 1cc96ba commit 553ce59

8 files changed

Lines changed: 42 additions & 33 deletions

File tree

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

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
import { ModuleWithProviders, NgModule } from '@angular/core';
2+
import { FormsModule } from '@angular/forms';
23
import { RouterModule } from '@angular/router';
3-
import { RuckenWebPipes, SharedModule, PipesModule } from '@rucken/web';
4-
import { PageHeaderModule } from '@rucken/web';
5-
4+
import { SharedModule } from '../../../../shared/shared.module';
65
import { <%=frame.classPrefix%>FrameComponent } from './<%=frame.name%>-frame.component';
76
import { <%=frame.classPrefix%>FrameRoutes } from './<%=frame.name%>-frame.routes';
7+
import { NgxPermissionsModule } from 'ngx-permissions';
88

99
@NgModule({
1010
imports: [
11-
SharedModule.forRoot(),
12-
PageHeaderModule.forRoot(),
13-
PipesModule.forRoot(),
14-
RouterModule.forChild(<%=frame.classPrefix%>FrameRoutes)
11+
SharedModule,
12+
NgxPermissionsModule.forChild(),
13+
RouterModule.forChild(<%=frame.classPrefix%>FrameRoutes),
14+
FormsModule
1515
],
16-
declarations: [<%=frame.classPrefix%>FrameComponent],
17-
exports: [<%=frame.classPrefix%>FrameComponent],
18-
entryComponents: [<%=frame.classPrefix%>FrameComponent]
16+
declarations: [
17+
<%=frame.classPrefix%>FrameComponent
18+
]
1919
})
2020
export class <%=frame.classPrefix%>FrameModule {
2121
static forRoot(): ModuleWithProviders {

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
import { translate } from '@rucken/core';
2-
import { AuthGuardService } from '@rucken/web';
3-
2+
import { NgxPermissionsGuard } from 'ngx-permissions';
43
import { <%=frame.classPrefix%>FrameComponent } from './<%=frame.name%>-frame.component';
4+
import { environment } from '../../../../../environments/environment';
55

66
export const <%=frame.classPrefix%>FrameRoutes = [{
77
path: '',
88
component: <%=frame.classPrefix%>FrameComponent,
99
data: {
1010
name: '<%=frame.name%>',
1111
title: translate('<%=frame.title%>'),
12-
visible: true
12+
permissions: {
13+
only: 'read_<%=frame.name%>-frame'
14+
}
1315
},
14-
canActivate: [AuthGuardService]
16+
...(environment.server ? {} : { canActivate: [NgxPermissionsGuard] })
1517
}];

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

Lines changed: 0 additions & 1 deletion
This file was deleted.

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

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

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

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

test/cmd-generator-frame._spec.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@ describe('Generator-frame-command: create frame with name "banana" on page "appl
2121
dir: _dir,
2222
dirLocal: `test/${_dirLocal}`,
2323
files: [
24-
path.resolve(`${_dir}/src/app/pages/apple-page/banana-frame/banana-frame.component.html`),
25-
path.resolve(`${_dir}/src/app/pages/apple-page/banana-frame/banana-frame.component.scss`),
26-
path.resolve(`${_dir}/src/app/pages/apple-page/banana-frame/banana-frame.component.ts`),
27-
path.resolve(`${_dir}/src/app/pages/apple-page/banana-frame/banana-frame.module.ts`),
28-
path.resolve(`${_dir}/src/app/pages/apple-page/banana-frame/banana-frame.routes.ts`)
24+
path.resolve(`${_dir}/src/app/components/pages/apple-page/banana-frame/banana-frame.component.html`),
25+
path.resolve(`${_dir}/src/app/components/pages/apple-page/banana-frame/banana-frame.component.ts`),
26+
path.resolve(`${_dir}/src/app/components/pages/apple-page/banana-frame/banana-frame.module.ts`),
27+
path.resolve(`${_dir}/src/app/components/pages/apple-page/banana-frame/banana-frame.routes.ts`)
2928
]
3029
});
3130
beforeEach(() => {

0 commit comments

Comments
 (0)