Skip to content

Commit bc7d092

Browse files
committed
Merge branch 'vNext' of https://github.com/IgniteUI/igniteui-angular-samples into vNext
2 parents 8e6977c + bb0fc24 commit bc7d092

454 files changed

Lines changed: 91300 additions & 7209 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.

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[submodule "igniteui-live-editing-samples"]
22
path = igniteui-live-editing-samples
33
url = https://github.com/IgniteUI/igniteui-live-editing-samples
4-
branch = vNext
4+
branch = master

.travis.yml

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

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
[![Build Status](https://dev.azure.com/IgniteUI/igniteui-angular/_apis/build/status/IgniteUI.igniteui-angular-samples?branchName=master)](https://dev.azure.com/IgniteUI/igniteui-angular/_build/latest?definitionId=4&branchName=master)
2-
[![Build Status](https://travis-ci.org/IgniteUI/igniteui-angular-samples.svg?branch=master)](https://travis-ci.org/IgniteUI/igniteui-angular-samples)
1+
[![CI](https://github.com/IgniteUI/igniteui-angular-samples/actions/workflows/build-app-lob.yml/badge.svg)](https://github.com/IgniteUI/igniteui-angular-samples/actions/workflows/build-app-lob.yml)
2+
[![Build Status](https://dev.azure.com/IgniteUI/igniteui-angular/_apis/build/status/IgniteUI.igniteui-angular-samples?branchName=refs%2Fpull%2F2995%2Fmerge)](https://dev.azure.com/IgniteUI/igniteui-angular/_build/latest?definitionId=4&branchName=refs%2Fpull%2F2995%2Fmerge)
33

44
# Ignite UI for Angular - Samples
55

@@ -8,7 +8,7 @@ This project is using Ignite UI for Angular components to demonstrate different
88
The project is divided into two separate applications:
99

1010

11-
- A `default application`, which uses all the [igniteui-angular](https://travis-ci.org/IgniteUI/igniteui-angular) components to demonstrate sample applications
11+
- A `default application`, which uses all the [igniteui-angular](https://www.infragistics.com/products/ignite-ui-angular) components to demonstrate sample applications
1212

1313
- A `Line of Business` application, complemented with UI and functionality from the **Ignite UI for Angular Charts** and **Ignite UI for Angular Excel library**.
1414

@@ -34,7 +34,7 @@ To build the application project run:
3434
npm run build:app-lob
3535
```
3636

37-
### These commands will produce an AOT build and [live editing](https://github.com/IgniteUI/igniteui-angular-samples/blob/master/live-editing/README.md) samples supporting both Sass and CSS.
37+
### These commands will produce an AOT build and [live editing](https://github.com/IgniteUI/igniteui-live-editing/blob/master/README.md) samples supporting both Sass and CSS.
3838

3939
## Dev Server
4040

@@ -113,7 +113,7 @@ npm run start:watch-live-editing:es6
113113
```
114114

115115
### Generate Live-Editing JSON files
116-
To generate only the [live editing](https://github.com/IgniteUI/igniteui-angular-samples/blob/master/live-editing/README.md) samples files (e.g. `"/src/assets/samples/avatar-sample-3.json"`) run:
116+
To generate only the [live editing](https://github.com/IgniteUI/igniteui-live-editing/blob/master/README.md) samples files (e.g. `"/src/assets/samples/avatar-sample-3.json"`) run:
117117

118118
#### Default App
119119
With **CSS** styling generation

live-editing/Routes.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import { DataDisplayModule } from '../src/app/data-display/data-display.module';
1717
import * as DataEntriesRouting from '../src/app/data-entries/data-entries-routing.module';
1818
import { DataEntriesModule } from '../src/app/data-entries/data-entries.module';
1919
import * as GridRouting from '../src/app/grid/grids-routing.module';
20+
import * as PivotGridRouting from '../src/app/pivot-grid/pivot-grids-routing.module';
2021
import { GridsModule } from '../src/app/grid/grids.module';
2122
import * as HierarchicalGridRouting from '../src/app/hierarchical-grid/hierarchical-grid-routing.module';
2223
import { HierarchicalGridModule } from '../src/app/hierarchical-grid/hierarchical-grid.module';
@@ -43,6 +44,8 @@ import * as GridFinJSDockManagerRoutingModule from '../projects/app-lob/src/app/
4344
import { GridFinJSDockManagerModule } from '../projects/app-lob/src/app/grid-finjs-dock-manager/grid-finjs-dock-manager.module';
4445
import { PaginationModule } from '../src/app/pagination/pagination.module';
4546
import * as PaginatorRouting from '../src/app/pagination/pagination-routing.module';
47+
import { PivotGridsModule } from '../src/app/pivot-grid/pivot-grids.module';
48+
import { PivotGridsRoutingModule } from '../src/app/pivot-grid/pivot-grids-routing.module';
4649

4750
export const MODULE_ROUTES = [
4851
{
@@ -100,6 +103,11 @@ export const MODULE_ROUTES = [
100103
path: 'grid',
101104
routes: GridRouting.gridsRoutes
102105
},
106+
{
107+
module: PivotGridsModule,
108+
path: 'pivot-grid',
109+
routes: PivotGridRouting.gridsRoutes
110+
},
103111
{
104112
module: HierarchicalGridModule,
105113
path: 'hierarchical-grid',

live-editing/configs/ComboConfigGenerator.ts

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ import {
99
IgxSwitchModule,
1010
IgxToastModule,
1111
IgxIconModule,
12-
IgxPrefixModule
12+
IgxPrefixModule,
13+
IgxSimpleComboModule
1314
} from 'igniteui-angular';
1415
import { IgxFinancialChartModule } from 'igniteui-angular-charts';
1516
import { AppModuleConfig, Config, IConfigGenerator } from 'igniteui-live-editing';
@@ -108,46 +109,43 @@ export class ComboConfigGenerator implements IConfigGenerator {
108109

109110
configs.push(new Config({
110111
additionalFiles: ['/src/app/data/stocks-data.ts'],
112+
additionalDependencies: ['igniteui-angular-charts', 'igniteui-angular-core'],
111113
appModuleConfig: new AppModuleConfig({
112-
imports: ['IgxButtonGroupModule', 'IgxComboModule', 'IgxFinancialChartModule', 'SimpleComboMainComponent'],
114+
imports: ['IgxButtonGroupModule', 'IgxComboModule', 'IgxFinancialChartModule', 'IgxSimpleComboModule', 'SimpleComboMainComponent'],
113115
ngDeclarations: ['SimpleComboMainComponent'],
114-
ngImports: ['IgxButtonGroupModule', 'IgxComboModule', 'IgxFinancialChartModule']
116+
ngImports: ['IgxButtonGroupModule', 'IgxComboModule', 'IgxFinancialChartModule', 'IgxSimpleComboModule']
115117
}),
116-
component: 'SimpleComboMainComponent',
117-
shortenComponentPathBy: '/lists/combo/'
118+
component: 'SimpleComboMainComponent'
118119
}));
119120

120121
configs.push(new Config({
121122
additionalFiles: ['/src/app/data/cities15000-regions-countries.ts'],
122123
appModuleConfig: new AppModuleConfig({
123-
imports: ['IgxComboModule', 'SimpleComboUsageComponent'],
124+
imports: ['IgxComboModule', 'SimpleComboUsageComponent', 'IgxSimpleComboModule'],
124125
ngDeclarations: ['SimpleComboUsageComponent'],
125-
ngImports: ['IgxComboModule']
126+
ngImports: ['IgxComboModule', 'IgxSimpleComboModule']
126127
}),
127-
component: 'SimpleComboUsageComponent',
128-
shortenComponentPathBy: '/lists/combo/'
128+
component: 'SimpleComboUsageComponent'
129129
}));
130130

131131
configs.push(new Config({
132132
additionalFiles: ['/src/app/data/cities15000-regions-countries.ts'],
133133
appModuleConfig: new AppModuleConfig({
134-
imports: ['IgxComboModule', 'SimpleComboCascadingComponent'],
134+
imports: ['IgxComboModule', 'IgxSimpleComboModule', 'SimpleComboCascadingComponent'],
135135
ngDeclarations: ['SimpleComboCascadingComponent'],
136-
ngImports: ['IgxComboModule']
136+
ngImports: ['IgxComboModule', 'IgxSimpleComboModule']
137137
}),
138-
component: 'SimpleComboCascadingComponent',
139-
shortenComponentPathBy: '/lists/combo/'
138+
component: 'SimpleComboCascadingComponent'
140139
}));
141140

142141
configs.push(new Config({
143142
additionalFiles: ['/src/app/data/cities15000-regions-countries.ts'],
144143
appModuleConfig: new AppModuleConfig({
145-
imports: ['IgxComboModule', 'SimpleComboStylingComponent'],
144+
imports: ['IgxComboModule', 'IgxSimpleComboModule', 'SimpleComboStylingComponent'],
146145
ngDeclarations: ['SimpleComboStylingComponent'],
147-
ngImports: ['IgxComboModule']
146+
ngImports: ['IgxComboModule', 'IgxSimpleComboModule']
148147
}),
149-
component: 'SimpleComboStylingComponent',
150-
shortenComponentPathBy: '/lists/combo/'
148+
component: 'SimpleComboStylingComponent'
151149
}));
152150

153151
return configs;

live-editing/configs/GridConfigGenerator.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,6 +1037,17 @@ export class GridConfigGenerator implements IConfigGenerator {
10371037
})
10381038
}));
10391039

1040+
configs.push(new Config({
1041+
component: 'GridSummaryTemplateComponent',
1042+
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/nwindData.ts'],
1043+
appModuleConfig: new AppModuleConfig({
1044+
imports: ['GridSummaryTemplateComponent', 'IgxGridModule', 'IgxInputGroupModule',
1045+
'IgxButtonGroupModule', 'IgxSwitchModule', 'IgxPreventDocumentScrollModule'],
1046+
ngDeclarations: ['GridSummaryTemplateComponent'],
1047+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxGridModule', 'IgxInputGroupModule', 'IgxButtonGroupModule', 'IgxSwitchModule']
1048+
})
1049+
}));
1050+
10401051
configs.push(new Config({
10411052
component: 'GridCollapsibleColumnGroupsComponent',
10421053
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/invoiceData.ts'],

0 commit comments

Comments
 (0)