Skip to content

Commit 98a70e9

Browse files
authored
Merge pull request #3238 from IgniteUI/dTsvetkov/revert-crm-structure
Revert crm docs-layout structure
2 parents 89a8762 + c2ec286 commit 98a70e9

25 files changed

+13
-828
lines changed

Diff for: live-editing/Routes.ts

+2
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ import { PaginationModule } from '../src/app/pagination/pagination.module';
4848
import * as PaginatorRouting from '../src/app/pagination/pagination-routing.module';
4949
import { PivotGridsModule } from '../src/app/pivot-grid/pivot-grids.module';
5050
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';
52+
import { AppModule } from '../projects/app-crm/src/app/app.module';
5153
import { GridsCrmModule } from '../projects/app-crm/src/app/grid-crm/grid-crm.module';
5254

5355
export const MODULE_ROUTES = [

Diff for: projects/app-crm/src/app/app.module.ts

+2-17
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,23 @@
11
import { NgModule } from '@angular/core';
2-
import { FormsModule } from '@angular/forms';
32
import { BrowserModule, HammerModule } from '@angular/platform-browser';
43
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
54
import {
6-
IgxButtonModule, IgxIconModule, IgxInputGroupModule, IgxAutocompleteModule,
7-
IgxLayoutModule, IgxNavbarModule, IgxNavigationDrawerModule, IgxRippleModule
5+
IgxAutocompleteModule, IgxLayoutModule
86
} from 'igniteui-angular';
97
import { AppComponent } from './app.component';
108
import { AppRoutingModule } from './app.routing.module';
119
import { GridsCrmModule } from './grid-crm/grid-crm.module';
12-
import { HomeComponent } from './home/home.component';
13-
import { DocsLayoutComponent } from './index/docs-layout.component';
14-
import { IndexComponent } from './index/index.component';
1510

1611
@NgModule({
1712
bootstrap: [AppComponent],
1813
declarations: [
19-
AppComponent,
20-
HomeComponent,
21-
DocsLayoutComponent,
22-
IndexComponent
14+
AppComponent
2315
],
2416
imports: [
25-
IgxButtonModule,
26-
IgxIconModule,
27-
IgxInputGroupModule,
28-
IgxNavbarModule,
29-
IgxNavigationDrawerModule,
30-
IgxRippleModule,
3117
IgxAutocompleteModule,
3218
IgxLayoutModule,
3319
BrowserModule,
3420
AppRoutingModule,
35-
FormsModule,
3621
BrowserAnimationsModule,
3722
HammerModule,
3823
GridsCrmModule

Diff for: projects/app-crm/src/app/app.routing.module.ts

+9-28
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,21 @@
11
import { NgModule } from '@angular/core';
22
import { RouterModule, Routes } from '@angular/router';
3-
import { HomeComponent } from './home/home.component';
4-
import { DocsLayoutComponent } from './index/docs-layout.component';
5-
import { IndexComponent } from './index/index.component';
63

7-
8-
export const samplesRoutes: Routes = [
4+
export const appRoutes: Routes = [
95
{
10-
component: HomeComponent,
11-
data: { displayName: 'Home' },
12-
path: 'home'
6+
path: '', pathMatch: 'full', redirectTo: '/grid-crm'
137
},
148
{
159
loadChildren: () => import('./grid-crm/grid-crm.module').then(m => m.GridsCrmModule),
1610
path: 'grid-crm'
1711
}
1812
];
19-
20-
export const appRoutes: Routes = [
21-
{
22-
path: '', pathMatch: 'full', redirectTo: '/samples/home'
23-
},
24-
{
25-
children: samplesRoutes,
26-
component: DocsLayoutComponent,
27-
path: ''
28-
},
29-
{
30-
children: samplesRoutes,
31-
component: IndexComponent,
32-
path: 'samples'
33-
}
34-
];
35-
3613
@NgModule({
37-
imports: [RouterModule.forRoot(appRoutes, {})],
38-
exports: [RouterModule]
14+
exports: [
15+
RouterModule
16+
],
17+
imports: [
18+
RouterModule.forRoot(appRoutes)
19+
]
3920
})
40-
export class AppRoutingModule { }
21+
export class AppRoutingModule { }

Diff for: projects/app-crm/src/app/grid-crm/grid-crm-routes-data.ts

-3
This file was deleted.

Diff for: projects/app-crm/src/app/home/home.component.html

-80
This file was deleted.

Diff for: projects/app-crm/src/app/home/home.component.scss

-123
This file was deleted.

Diff for: projects/app-crm/src/app/home/home.component.ts

-10
This file was deleted.

Diff for: projects/app-crm/src/app/index/docs-layout.component.scss

-6
This file was deleted.

Diff for: projects/app-crm/src/app/index/docs-layout.component.ts

-59
This file was deleted.

0 commit comments

Comments
 (0)