Skip to content

Commit 28878be

Browse files
dobromirtsdobromirts
committed
Merge branch 'vnext' of https://github.com/IgniteUI/igniteui-angular-samples into vnext
2 parents d80f584 + 5c49715 commit 28878be

839 files changed

Lines changed: 16273 additions & 21961 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎azure-devops/app-cd.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,8 @@ steps:
3333
script: |
3434
# List of files to update
3535
$files = @(
36-
"projects/app-lob/src/app/grid-dynamic-chart-data/grid-dynamic-chart-data.module.ts",
3736
"projects/app-lob/src/app/grid-dynamic-chart-data/grid-dynamic-chart-data.component.ts",
3837
"projects/app-lob/src/app/grid-dynamic-chart-data/data-analysis-dock-manager/data-analysis-dock-manager.component.ts",
39-
"projects/app-lob/src/app/app.module.ts",
4038
"package.json")
4139
foreach ($file in $files) {
4240
(Get-Content -Path $file) -replace 'igniteui-angular-extras', '$(ReplacementText)' | Set-Content -Path $file

‎azure-devops/app-crm-cd-yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,8 @@ steps:
3333
script: |
3434
# List of files to update
3535
$files = @(
36-
"projects/app-lob/src/app/grid-dynamic-chart-data/grid-dynamic-chart-data.module.ts",
3736
"projects/app-lob/src/app/grid-dynamic-chart-data/grid-dynamic-chart-data.component.ts",
3837
"projects/app-lob/src/app/grid-dynamic-chart-data/data-analysis-dock-manager/data-analysis-dock-manager.component.ts",
39-
"projects/app-lob/src/app/app.module.ts",
4038
"package.json")
4139
foreach ($file in $files) {
4240
(Get-Content -Path $file) -replace 'igniteui-angular-extras', '$(ReplacementText)' | Set-Content -Path $file

‎azure-devops/app-lob-cd.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,8 @@ steps:
3333
script: |
3434
# List of files to update
3535
$files = @(
36-
"projects/app-lob/src/app/grid-dynamic-chart-data/grid-dynamic-chart-data.module.ts",
3736
"projects/app-lob/src/app/grid-dynamic-chart-data/grid-dynamic-chart-data.component.ts",
3837
"projects/app-lob/src/app/grid-dynamic-chart-data/data-analysis-dock-manager/data-analysis-dock-manager.component.ts",
39-
"projects/app-lob/src/app/app.module.ts",
4038
"package.json")
4139
foreach ($file in $files) {
4240
(Get-Content -Path $file) -replace 'igniteui-angular-extras', '$(ReplacementText)' | Set-Content -Path $file

‎azure-devops/templates/cd-template.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,17 +112,17 @@ steps:
112112
- task: CopyFiles@2
113113
displayName: Copy web.config
114114
inputs:
115-
SourceFolder: $(Build.SourcesDirectory)
115+
SourceFolder: $(Build.SourcesDirectory)/projects/app-crm/
116116
Contents: web.config
117-
TargetFolder: $(Build.SourcesDirectory)/${{ parameters.targetFolder }}
117+
TargetFolder: $(Build.SourcesDirectory)/${{ parameters.targetFolder }}/browser
118118

119119
- script: |
120-
sed -i 's/${{ parameters.findRegex }}/${{ parameters.submoduleDir }}/g' $(Build.SourcesDirectory)/${{ parameters.targetFolder }}/web.config
120+
sed -i 's/${{ parameters.findRegex }}/${{ parameters.submoduleDir }}/g' $(Build.SourcesDirectory)/${{ parameters.targetFolder }}/browser/web.config
121121
displayName: 'Update web.config file'
122122
workingDirectory: ${{ parameters.workingDir }}
123123
124124
- script: |
125-
sourcePath="$(Build.SourcesDirectory)/${{ parameters.targetFolder }}"
125+
sourcePath="$(Build.SourcesDirectory)/${{ parameters.targetFolder }}/browser"
126126
destinationZip="$(Build.ArtifactStagingDirectory)/output.zip"
127127
cd "$sourcePath"
128128
zip -r "$destinationZip" ./

‎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/AccordionConfigGenerator.ts‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ import {
77
IgxSwitchModule,
88
IgxIconModule
99
} from 'igniteui-angular';
10-
import { AppModuleConfig, Config, IConfigGenerator } from 'igniteui-live-editing';
10+
import { AppModuleConfig, Config, IConfigGenerator } from 'igniteui-live-editing'
11+
import { BaseAppConfig } from './BaseConfig';
1112

1213
export class AccordionConfigGenerator implements IConfigGenerator {
1314

@@ -16,33 +17,26 @@ export class AccordionConfigGenerator implements IConfigGenerator {
1617

1718
configs.push(new Config({
1819
component: 'AccordionSample1Component',
19-
appModuleConfig: new AppModuleConfig({
20-
imports: ['AccordionSample1Component', 'IgxAccordionModule', 'IgxSwitchModule'],
21-
ngDeclarations: ['AccordionSample1Component'],
22-
ngImports: ['IgxAccordionModule', 'IgxSwitchModule']
23-
}),
20+
appConfig: BaseAppConfig,
2421
shortenComponentPathBy: '/layouts/accordion/'
2522
}));
2623

2724
configs.push(new Config({
2825
component: 'AccordionSample2Component',
29-
appModuleConfig: new AppModuleConfig({
30-
imports: ['AccordionSample2Component', 'IgxAccordionModule', 'IgxSwitchModule'],
31-
ngDeclarations: ['AccordionSample2Component'],
32-
ngImports: ['IgxAccordionModule', 'IgxSwitchModule']
33-
}),
26+
appConfig: BaseAppConfig,
3427
shortenComponentPathBy: '/layouts/accordion/'
3528
}));
3629

3730
configs.push(new Config({
3831
component: 'AccordionSample3Component',
39-
appModuleConfig: new AppModuleConfig({
40-
imports: ['IgxCheckboxModule', 'IgxSliderModule',
41-
'IgxRadioModule', 'IgxTimePickerModule', 'AccordionSample3Component', 'IgxAccordionModule', 'IgxIconModule'],
42-
ngDeclarations: ['AccordionSample3Component'],
43-
ngImports: ['IgxCheckboxModule', 'IgxSliderModule',
44-
'IgxRadioModule', 'IgxTimePickerModule', 'IgxAccordionModule', 'IgxIconModule']
45-
}),
32+
appConfig: BaseAppConfig,
33+
shortenComponentPathBy: '/layouts/accordion/'
34+
}));
35+
36+
configs.push(new Config({
37+
component: 'AccordionStyleComponent',
38+
additionalFiles: ["/src/app/layouts/accordion/accordion-style/layout.scss"],
39+
appConfig: BaseAppConfig,
4640
shortenComponentPathBy: '/layouts/accordion/'
4741
}));
4842

‎live-editing/configs/ActionStripConfigGenerator.ts‎

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
/* eslint-disable max-len */
2-
import {IgxActionStripModule,
3-
IgxRippleModule,
4-
IgxButtonModule,
5-
IgxIconModule,
6-
IgxButtonGroupModule} from 'igniteui-angular';
7-
import {AppModuleConfig, Config, IConfigGenerator} from 'igniteui-live-editing';
2+
import {
3+
IgxActionStripModule,
4+
IgxRippleModule,
5+
IgxButtonModule,
6+
IgxIconModule,
7+
IgxButtonGroupModule
8+
} from 'igniteui-angular';
9+
import { AppModuleConfig, Config, IConfigGenerator } from 'igniteui-live-editing'
10+
import { BaseAppConfig } from './BaseConfig';
811
export class ActionStripConfigGenerator implements IConfigGenerator {
912

1013

@@ -13,31 +16,20 @@ export class ActionStripConfigGenerator implements IConfigGenerator {
1316

1417
configs.push(new Config({
1518
component: 'ActionStripParagraphComponent',
16-
appModuleConfig: new AppModuleConfig({
17-
imports: ['IgxActionStripModule', 'ActionStripParagraphComponent', 'IgxRippleModule', 'IgxButtonGroupModule', 'IgxButtonModule', 'IgxIconModule'],
18-
ngDeclarations: ['ActionStripParagraphComponent'],
19-
ngImports: ['IgxActionStripModule', 'IgxRippleModule', 'IgxButtonGroupModule', 'IgxButtonModule', 'IgxIconModule']
20-
}),
19+
appConfig: BaseAppConfig,
2120
shortenComponentPathBy: '/menus/action-strip/'
2221
}));
2322

2423
configs.push(new Config({
2524
component: 'ActionStripParagraphMenuComponent',
26-
appModuleConfig: new AppModuleConfig({
27-
imports: ['IgxActionStripModule', 'ActionStripParagraphMenuComponent', 'IgxRippleModule', 'IgxButtonModule', 'IgxIconModule'],
28-
ngDeclarations: ['ActionStripParagraphMenuComponent'],
29-
ngImports: ['IgxActionStripModule', 'IgxRippleModule', 'IgxButtonModule', 'IgxIconModule']
30-
}),
25+
appConfig: BaseAppConfig,
3126
shortenComponentPathBy: '/menus/action-strip/'
3227
}));
3328

3429
configs.push(new Config({
3530
component: 'ActionStripStylingComponent',
36-
appModuleConfig: new AppModuleConfig({
37-
imports: ['IgxActionStripModule', 'ActionStripStylingComponent', 'IgxRippleModule', 'IgxButtonModule', 'IgxIconModule'],
38-
ngDeclarations: ['ActionStripStylingComponent'],
39-
ngImports: ['IgxActionStripModule', 'IgxRippleModule', 'IgxButtonModule', 'IgxIconModule']
40-
}),
31+
additionalFiles: ["/src/app/menus/action-strip/action-strip-paragraph-styling/layout.scss"],
32+
appConfig: BaseAppConfig,
4133
shortenComponentPathBy: '/menus/action-strip/'
4234
}));
4335

0 commit comments

Comments
 (0)