Skip to content

Commit abe0858

Browse files
jackofdiamond5jackofdiamond5
committed
refactor(live-editing): clean up; update routing
1 parent b3594f5 commit abe0858

4 files changed

Lines changed: 51 additions & 142 deletions

File tree

‎live-editing/Routes.ts‎

Lines changed: 44 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,169 +1,121 @@
11

2-
import * as GridFinjsRouting from '../projects/app-lob/src/app/grid-finjs/grid-finjs-routing.module';
3-
import { GridFinjsModule } from '../projects/app-lob/src/app/grid-finjs/grid-finjs.module';
4-
import * as TreeGridFinjsRouting from '../projects/app-lob/src/app/treegrid-finjs/treegrid-finjs-routing.module';
5-
import { TreeGridFinjsModule } from '../projects/app-lob/src/app/treegrid-finjs/treegrid-finjs.module';
6-
import * as GridCRMRouting from '../projects/app-crm/src/app/app-routing.module';
7-
8-
import * as GridsDVRouting from '../projects/app-lob/src/app/grid/grids-routing.module';
9-
import { GridsDVModule } from '../projects/app-lob/src/app/grid/grids.module';
2+
import * as GridFinjsRouting from '../projects/app-lob/src/app/grid-finjs/grid-finjs.routes';
3+
import * as TreeGridFinjsRouting from '../projects/app-lob/src/app/treegrid-finjs/treegrid-finjs.routes';
4+
import * as GridCRMRouting from '../projects/app-crm/src/app/app.routes';
5+
import * as GridsDVRouting from '../projects/app-lob/src/app/grid/grids.routes';
106
// tslint:disable-next-line: max-line-length
11-
import * as HieararchicalGridsDVRouting from '../projects/app-lob/src/app/hierarchical-grid/hierarchical-grid-routing.module';
12-
import { HierarchicalGridDVModule } from '../projects/app-lob/src/app/hierarchical-grid/hierarchical-grid.module';
13-
import * as TreeGridDvRoutingModule from '../projects/app-lob/src/app/tree-grid/tree-grid-routing.module';
14-
import { TreeGridDVModule } from '../projects/app-lob/src/app/tree-grid/tree-grid.module';
15-
16-
import * as DataDisplayRouting from '../src/app/data-display/data-display-routing.module';
17-
import { DataDisplayModule } from '../src/app/data-display/data-display.module';
18-
import * as DataEntriesRouting from '../src/app/data-entries/data-entries-routing.module';
19-
import { DataEntriesModule } from '../src/app/data-entries/data-entries.module';
20-
import * as GridRouting from '../src/app/grid/grids-routing.module';
21-
import * as PivotGridRouting from '../src/app/pivot-grid/pivot-grids-routing.module';
22-
import { GridsModule } from '../src/app/grid/grids.module';
23-
import * as HierarchicalGridRouting from '../src/app/hierarchical-grid/hierarchical-grid-routing.module';
24-
import { HierarchicalGridModule } from '../src/app/hierarchical-grid/hierarchical-grid.module';
25-
import * as InteractionsRouting from '../src/app/interactions/interactions-routing.module';
26-
import { InteractionsModule } from '../src/app/interactions/interactions.module';
27-
import * as LayoutsRouting from '../src/app/layouts/layouts-routing.module';
28-
import { LayoutsModule } from '../src/app/layouts/layouts.module';
29-
import * as ListsRouting from '../src/app/lists/lists-routing.module';
30-
import { ListsModule } from '../src/app/lists/lists.module';
31-
import * as MenusRouting from '../src/app/menus/menus-routing.module';
32-
import { MenusModule } from '../src/app/menus/menus.module';
33-
import * as NotificationsRouting from '../src/app/notifications/notifications-routing.module';
34-
import { NotificationsModule } from '../src/app/notifications/notifications.module';
35-
import * as SchedulingRouting from '../src/app/scheduling/scheduling-routing.module';
36-
import { SchedulingModule } from '../src/app/scheduling/scheduling.module';
37-
import * as ServicesRouting from '../src/app/services/services-routing.module';
38-
import { ServicesModule } from '../src/app/services/services.module';
39-
import * as ThemingRouting from '../src/app/theming/theming-routing.module';
40-
import { ThemingModule } from '../src/app/theming/theming.module';
41-
import * as TreeGridRouting from '../src/app/tree-grid/tree-grid-routing.module';
42-
import { TreeGridModule } from '../src/app/tree-grid/tree-grid.module';
7+
import * as HieararchicalGridsDVRouting from '../projects/app-lob/src/app/hierarchical-grid/hierarchical-grid.routes';
8+
import * as TreeGridDvRoutingModule from '../projects/app-lob/src/app/tree-grid/tree-grid.routes';
9+
import * as DataDisplayRouting from '../src/app/data-display/data-display.routes';
10+
import * as DataEntriesRouting from '../src/app/data-entries/data-entries.routes';
11+
import * as GridRouting from '../src/app/grid/grids.routes';
12+
import * as PivotGridRouting from '../src/app/pivot-grid/pivot-grids.routes';
13+
import * as HierarchicalGridRouting from '../src/app/hierarchical-grid/hierarchical-grid.routes';
14+
import * as InteractionsRouting from '../src/app/interactions/interactions.routes';
15+
import * as LayoutsRouting from '../src/app/layouts/layouts.routes';
16+
import * as ListsRouting from '../src/app/lists/lists.routes';
17+
import * as MenusRouting from '../src/app/menus/menus.routes';
18+
import * as NotificationsRouting from '../src/app/notifications/notifications.routes';
19+
import * as SchedulingRouting from '../src/app/scheduling/scheduling.routes';
20+
import * as ServicesRouting from '../src/app/services/services.routes';
21+
import * as ThemingRouting from '../src/app/theming/theming.routes';
22+
import * as TreeGridRouting from '../src/app/tree-grid/tree-grid.routes';
4323
// eslint-disable-next-line max-len
44-
import * as GridFinJSDockManagerRoutingModule from '../projects/app-lob/src/app/grid-finjs-dock-manager/grid-finjs-dock-manager-routing.module';
45-
import { GridFinJSDockManagerModule } from '../projects/app-lob/src/app/grid-finjs-dock-manager/grid-finjs-dock-manager.module';
46-
import { PaginationModule } from '../src/app/pagination/pagination.module';
47-
import * as PaginatorRouting from '../src/app/pagination/pagination-routing.module';
48-
import { PivotGridsModule } from '../src/app/pivot-grid/pivot-grids.module';
49-
import { PivotGridsRoutingModule } from '../src/app/pivot-grid/pivot-grids-routing.module';
50-
import { AppModule } from '../projects/app-crm/src/app/app.module';
51-
24+
import * as GridFinJSDockManagerRoutingModule from '../projects/app-lob/src/app/grid-finjs-dock-manager/grid-finjs-dock-manager.routes';
25+
import * as PaginatorRouting from '../src/app/pagination/pagination.routes';
5226
export const MODULE_ROUTES = [
5327
{
54-
module: NotificationsModule,
5528
path: 'notifications',
56-
routes: NotificationsRouting.notificationsRoutes
29+
routes: NotificationsRouting.NotificationsRoutes
5730
},
5831
{
59-
module: DataDisplayModule,
6032
path: 'data-display',
61-
routes: DataDisplayRouting.dataDisplayRoutes
33+
routes: DataDisplayRouting.DataDisplayRoutes
6234
},
6335
{
64-
module: DataEntriesModule,
6536
path: 'data-entries',
66-
routes: DataEntriesRouting.dataEntriesRoutes
37+
routes: DataEntriesRouting.DataEntriesRoutes
6738
},
6839
{
69-
module: ThemingModule,
7040
path: 'theming',
71-
routes: ThemingRouting.themingRoutes
41+
routes: ThemingRouting.ThemingRoutes
7242
},
7343
{
74-
module: MenusModule,
7544
path: 'menus',
76-
routes: MenusRouting.menusRoutes
45+
routes: MenusRouting.MenusRoutes
7746
},
7847
{
79-
module: SchedulingModule,
8048
path: 'scheduling',
81-
routes: SchedulingRouting.schedulingRoutes
49+
routes: SchedulingRouting.SchedulingRoutes
8250
},
8351
{
84-
module: ListsModule,
8552
path: 'lists',
86-
routes: ListsRouting.listsRoutes
53+
routes: ListsRouting.ListsRoutes
8754
},
8855
{
89-
module: InteractionsModule,
9056
path: 'interactions',
91-
routes: InteractionsRouting.interactionsRoutes
57+
routes: InteractionsRouting.InteractionsRoutes
9258
},
9359
{
94-
module: LayoutsModule,
9560
path: 'layouts',
96-
routes: LayoutsRouting.layoutsRoutes
61+
routes: LayoutsRouting.LayoutsRoutes
9762
},
9863
{
99-
module: TreeGridModule,
10064
path: 'tree-grid',
101-
routes: TreeGridRouting.treeGridRoutes
65+
routes: TreeGridRouting.TreeGridRoutes
10266
},
10367
{
104-
module: GridsModule,
10568
path: 'grid',
106-
routes: GridRouting.gridsRoutes
69+
routes: GridRouting.GridsRoutes
10770
},
10871
{
109-
module: PivotGridsModule,
11072
path: 'pivot-grid',
111-
routes: PivotGridRouting.gridsRoutes
73+
routes: PivotGridRouting.PivotGridsRoutes
11274
},
11375
{
114-
module: HierarchicalGridModule,
11576
path: 'hierarchical-grid',
116-
routes: HierarchicalGridRouting.hierarchicalGridRoutes
77+
routes: HierarchicalGridRouting.HierarchicalGridRoutes
11778
},
11879
{
119-
module: ServicesModule,
12080
path: 'services',
121-
routes: ServicesRouting.servicesRoutes
81+
routes: ServicesRouting.ServicesRoutes
12282
},
12383
{
124-
module: PaginationModule,
12584
path: 'pagination',
126-
routes: PaginatorRouting.paginatorRoutes
85+
routes: PaginatorRouting.PaginatorRoutes
12786
}
12887
];
12988

13089
export const DV_MODULE_ROUTES = [
13190
{
132-
module: GridFinjsModule,
13391
path: 'grid-finjs',
134-
routes: GridFinjsRouting.gridfinjsRoutes
92+
routes: GridFinjsRouting.GridfinjsRoutes
13593
},
13694
{
137-
module: TreeGridFinjsModule,
13895
path: 'treegrid-finjs',
139-
routes: TreeGridFinjsRouting.treegridfinjsRoutes
96+
routes: TreeGridFinjsRouting.TreegridfinjsRoutes
14097
},
14198
{
142-
module: GridsDVModule,
14399
path: 'grid',
144-
routes: GridsDVRouting.gridsDVRoutes
100+
routes: GridsDVRouting.GridsDVRoutes
145101
},
146102
{
147-
module: TreeGridDVModule,
148103
path: 'tree-grid',
149-
routes: TreeGridDvRoutingModule.treeGridDVRoutes
104+
routes: TreeGridDvRoutingModule.TreeGridDVRoutes
150105
},
151106
{
152-
module: HierarchicalGridDVModule,
153107
path: 'hierarchical-grid',
154-
routes: HieararchicalGridsDVRouting.hierarchicalGridDVRoutes
108+
routes: HieararchicalGridsDVRouting.HierarchicalGridDVRoutes
155109
},
156110
{
157-
module: GridFinJSDockManagerModule,
158111
path: 'grid-finjs-dock-manager',
159-
routes: GridFinJSDockManagerRoutingModule.gridFinJsDockManagerGridRoutes
112+
routes: GridFinJSDockManagerRoutingModule.GridFinJsDockManagerGridRoutes
160113
}
161114
];
162115

163116
export const CRM_MODULE_ROUTES = [
164117
{
165-
module: AppModule,
166118
path: 'grid-crm',
167-
routes: GridCRMRouting.gridCrmRoutes
119+
routes: GridCRMRouting.GridCrmRoutes
168120
}
169121
];

‎live-editing/configs/GridCRMConfigGenerator.ts‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,6 @@
11
/* eslint-disable max-len */
22
/* eslint-disable @typescript-eslint/naming-convention */
3-
import {HttpClientModule} from '@angular/common/http';
4-
import {
5-
IgxAutocompleteModule,
6-
IgxRippleModule,
7-
IgxGridModule,
8-
IgxIconModule,
9-
IgxLayoutModule,
10-
IgxAvatarModule,
11-
IgxInputGroupModule,
12-
IgxButtonModule } from 'igniteui-angular';
13-
import { RouterTestingModule } from "@angular/router/testing";
143
import { Config, IConfigGenerator, AppModuleConfig } from 'igniteui-live-editing';
15-
import { BrowserModule, HammerModule } from '@angular/platform-browser';
16-
import { RouterModule } from '@angular/router';
17-
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
18-
import { FormsModule } from '@angular/forms';
19-
import { IgxPreventDocumentScrollModule } from '../../src/app/directives/prevent-scroll.directive';
204

215
export class GridCRMConfigGenerator implements IConfigGenerator {
226
public generateConfigs(): Config[] {
@@ -26,20 +10,20 @@ export class GridCRMConfigGenerator implements IConfigGenerator {
2610
component: 'GridCRMComponent',
2711
additionalFiles: [
2812
'/src/app/directives/prevent-scroll.directive.ts',
29-
'/projects/app-crm/src/_app-layout.scss',
13+
'/projects/app-crm/src/_app-layout.scss',
3014
'/projects/app-crm/src/_variables.scss',
3115
'/projects/app-crm/src/app/grid-crm/data.ts'
3216
],
3317
additionalDependencies: [],
3418
appModuleConfig: new AppModuleConfig({
3519
imports: [
36-
'IgxRippleModule',
20+
'IgxRippleModule',
3721
'IgxGridModule', 'IgxIconModule', 'IgxLayoutModule',
3822
'IgxAvatarModule', 'IgxInputGroupModule', 'IgxButtonModule',
39-
'IgxPreventDocumentScrollModule', 'GridCRMComponent', 'RouterTestingModule'
23+
'IgxPreventDocumentScrollDirective', 'GridCRMComponent', 'RouterTestingModule'
4024
],
4125
ngDeclarations: ['GridCRMComponent'],
42-
ngImports: ['IgxPreventDocumentScrollModule', 'IgxRippleModule',
26+
ngImports: ['IgxPreventDocumentScrollDirective', 'IgxRippleModule',
4327
'IgxGridModule', 'IgxIconModule', 'IgxLayoutModule',
4428
'IgxAvatarModule', 'IgxInputGroupModule', 'IgxButtonModule', 'RouterTestingModule']
4529
})

‎live-editing/configs/ThemingConfigGenerator.ts‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,4 @@
1-
import { IgxAvatarModule,
2-
IgxButtonGroupModule,
3-
IgxButtonModule,
4-
IgxCalendarModule,
5-
IgxCardModule,
6-
IgxDatePickerModule,
7-
IgxDialogModule,
8-
IgxDividerModule,
9-
IgxDropDownModule,
10-
IgxExpansionPanelModule,
11-
IgxGridModule,
12-
IgxIconModule,
13-
IgxInputGroupModule,
14-
IgxLayoutModule,
15-
IgxListModule,
16-
IgxRippleModule,
17-
IgxSelectModule,
18-
IgxSnackbarModule,
19-
IgxToggleModule} from 'igniteui-angular';
201
import {AppModuleConfig, Config, IConfigGenerator} from 'igniteui-live-editing';
21-
import { NgModule } from '@angular/core';
22-
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
23-
import { MatButtonModule } from '@angular/material/button';
24-
import { MatFormFieldModule } from '@angular/material/form-field';
25-
import { MatInputModule } from '@angular/material/input';
26-
import { MatMenuModule } from '@angular/material/menu';
27-
import { MatSliderModule } from '@angular/material/slider';
28-
import { MatStepperModule } from '@angular/material/stepper';
29-
import { MatToolbarModule } from '@angular/material/toolbar';
30-
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
312
export class ThemingConfigGenerator implements IConfigGenerator {
323

334
public generateConfigs(): Config[] {

‎projects/app-crm/src/app/app.component.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
import { Component, OnInit } from '@angular/core';
22
import { SEOService } from '../../../app-lob/src/app/seo.service';
3+
import { RouterOutlet } from '@angular/router';
34

45
@Component({
56
selector: 'app-root',
67
styleUrls: ['./app.component.scss'],
7-
templateUrl: './app.component.html'
8+
templateUrl: './app.component.html',
9+
imports: [RouterOutlet]
810
})
911
export class AppComponent implements OnInit {
1012
private title = 'Business propeller - Angular Data Grid Example';

0 commit comments

Comments
 (0)