Skip to content

Commit 0ab43d6

Browse files
authored
Merge pull request #3240 from IgniteUI/dTsvetkov/change-grid-crm-live-editing-structure
Change grid crm live editing structure
2 parents 98a70e9 + 119c39d commit 0ab43d6

8 files changed

Lines changed: 48 additions & 89 deletions

File tree

live-editing/Routes.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ import * as GridFinjsRouting from '../projects/app-lob/src/app/grid-finjs/grid-f
33
import { GridFinjsModule } from '../projects/app-lob/src/app/grid-finjs/grid-finjs.module';
44
import * as TreeGridFinjsRouting from '../projects/app-lob/src/app/treegrid-finjs/treegrid-finjs-routing.module';
55
import { TreeGridFinjsModule } from '../projects/app-lob/src/app/treegrid-finjs/treegrid-finjs.module';
6-
7-
import * as GridCRMRouting from '../projects/app-crm/src/app/grid-crm/grid-crm-routing.module';
6+
import * as GridCRMRouting from '../projects/app-crm/src/app/app-routing.module';
87

98
import * as GridsDVRouting from '../projects/app-lob/src/app/grid/grids-routing.module';
109
import { GridsDVModule } from '../projects/app-lob/src/app/grid/grids.module';
@@ -48,9 +47,7 @@ import { PaginationModule } from '../src/app/pagination/pagination.module';
4847
import * as PaginatorRouting from '../src/app/pagination/pagination-routing.module';
4948
import { PivotGridsModule } from '../src/app/pivot-grid/pivot-grids.module';
5049
import { PivotGridsRoutingModule } from '../src/app/pivot-grid/pivot-grids-routing.module';
51-
import { GridCRMComponent } from '../projects/app-crm/src/app/grid-crm/grid-crm.component';
5250
import { AppModule } from '../projects/app-crm/src/app/app.module';
53-
import { GridsCrmModule } from '../projects/app-crm/src/app/grid-crm/grid-crm.module';
5451

5552
export const MODULE_ROUTES = [
5653
{
@@ -165,7 +162,7 @@ export const DV_MODULE_ROUTES = [
165162

166163
export const CRM_MODULE_ROUTES = [
167164
{
168-
module: GridsCrmModule,
165+
module: AppModule,
169166
path: 'grid-crm',
170167
routes: GridCRMRouting.gridCrmRoutes
171168
}

package-lock.json

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
"igniteui-angular-core": "^15.0.0",
7373
"igniteui-angular-i18n": "^15.0.3",
7474
"igniteui-dockmanager": "^1.12.0",
75-
"igniteui-live-editing": "^2.0.5",
75+
"igniteui-live-editing": "^2.0.6",
7676
"igniteui-theming": "^1.2.0",
7777
"igniteui-webcomponents": "^4.1.0",
7878
"immediate": "^3.2.3",
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
import { NgModule } from '@angular/core';
2+
import { RouterModule, Routes } from '@angular/router';
3+
import { GridCRMComponent } from './grid-crm/grid-crm.component';
4+
5+
export const gridCrmRoutes: Routes = [
6+
{
7+
path: '', pathMatch: 'full', component: GridCRMComponent
8+
},
9+
{
10+
path: 'grid-crm', component: GridCRMComponent
11+
}
12+
];
13+
@NgModule({
14+
exports: [
15+
RouterModule
16+
],
17+
imports: [
18+
RouterModule.forRoot(gridCrmRoutes)
19+
]
20+
})
21+
export class AppRoutingModule { }

projects/app-crm/src/app/app.module.ts

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,37 @@
11
import { NgModule } from '@angular/core';
2+
import { FormsModule } from '@angular/forms';
23
import { BrowserModule, HammerModule } from '@angular/platform-browser';
34
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
45
import {
5-
IgxAutocompleteModule, IgxLayoutModule
6+
IgxAutocompleteModule, IgxButtonModule, IgxIconModule, IgxInputGroupModule, IgxLayoutModule,
7+
IgxRippleModule, IgxGridModule, IgxAvatarModule
68
} from 'igniteui-angular';
9+
import { IgxPreventDocumentScrollModule } from '../../../../src/app/directives/prevent-scroll.directive';
710
import { AppComponent } from './app.component';
8-
import { AppRoutingModule } from './app.routing.module';
9-
import { GridsCrmModule } from './grid-crm/grid-crm.module';
11+
import { GridCRMComponent } from './grid-crm/grid-crm.component';
12+
import { AppRoutingModule } from './app-routing.module';
1013

1114
@NgModule({
1215
bootstrap: [AppComponent],
1316
declarations: [
14-
AppComponent
17+
AppComponent,
18+
GridCRMComponent
1519
],
1620
imports: [
1721
IgxAutocompleteModule,
22+
IgxRippleModule,
23+
IgxGridModule,
24+
IgxIconModule,
1825
IgxLayoutModule,
26+
IgxAvatarModule,
27+
IgxInputGroupModule,
1928
BrowserModule,
2029
AppRoutingModule,
2130
BrowserAnimationsModule,
22-
HammerModule,
23-
GridsCrmModule
31+
IgxButtonModule,
32+
FormsModule,
33+
IgxPreventDocumentScrollModule,
34+
HammerModule
2435
],
2536
providers: []
2637
})

projects/app-crm/src/app/app.routing.module.ts

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

projects/app-crm/src/app/grid-crm/grid-crm-routing.module.ts

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

projects/app-crm/src/app/grid-crm/grid-crm.module.ts

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

0 commit comments

Comments
 (0)