Skip to content

Commit a2c8a0e

Browse files
committed
Merge branch 'vNext' of https://github.com/IgniteUI/igniteui-angular-samples into vNext
2 parents 31f7dc8 + 9cd07a2 commit a2c8a0e

117 files changed

Lines changed: 1489 additions & 783 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.

angular.json

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@
3030
"optimization": false,
3131
"namedChunks": true,
3232
"sourceMap": false,
33-
"progress": true
33+
"progress": true,
34+
"stylePreprocessorOptions": {
35+
"includePaths": ["node_modules"]
36+
}
3437
},
3538
"configurations": {
3639
"production": {
@@ -140,7 +143,10 @@
140143
},
141144
"progress": true,
142145
"optimization": false,
143-
"namedChunks": true
146+
"namedChunks": true,
147+
"stylePreprocessorOptions": {
148+
"includePaths": ["node_modules"]
149+
}
144150
},
145151
"configurations": {
146152
"production": {
@@ -267,7 +273,10 @@
267273
},
268274
"progress": true,
269275
"optimization": false,
270-
"namedChunks": true
276+
"namedChunks": true,
277+
"stylePreprocessorOptions": {
278+
"includePaths": ["node_modules"]
279+
}
271280
},
272281
"configurations": {
273282
"production": {

gulpfile.js

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,66 @@ gulp.task("overwrite-package-json", (done) => {
5050
done();
5151
});
5252

53+
const createPrependerdLobStructure = (cb) => {
54+
const folders = [
55+
'./dist/app-lob/samples',
56+
'./dist/app-lob/samples/grid',
57+
'./dist/app-lob/samples/tree-grid',
58+
'./dist/app-lob/samples/grid-finjs-dock-manager',
59+
'./dist/app-lob/samples/hierarchical-grid',
60+
'./dist/app-lob/grid',
61+
'./dist/app-lob/tree-grid',
62+
'./dist/app-lob/grid-finjs-dock-manager',
63+
'./dist/app-lob/hierarchical-grid'
64+
];
65+
folders.forEach(dir => {
66+
if (!fs.existsSync(dir)) {
67+
fs.mkdirSync(dir);
68+
}
69+
});
70+
cb();
71+
}
72+
73+
const addPrerenderedLobPages = (cb) => {
74+
const { metadata } = require('./projects/app-lob/src/app/metadata');
75+
const indexFilePath = path.resolve(__dirname, './', 'dist/app-lob', 'index.html');
76+
77+
// read in the index.html file
78+
fs.readFile(indexFilePath, 'utf8', function (err, data) {
79+
if (err) {
80+
return console.error(err);
81+
}
82+
83+
metadata.forEach(({ url, title, description, og_url, folder }) => {
84+
let result = data;
85+
result = result.replace(/\$OG_TITLE/g, title);
86+
result = result.replace(/\$OG_DESCRIPTION/g, description);
87+
result = result.replace(/\$OG_URL/g, og_url);
88+
89+
let filename = url.substring(1).replace(/\//g, '-');
90+
if (filename.length) {
91+
filename = filename + '.html';
92+
} else {
93+
filename = 'index.html';
94+
}
95+
96+
fs.writeFile(path.resolve(__dirname, './', './dist/app-lob/samples/' + folder, filename), result, (err) => {
97+
if (err) {
98+
console.log(err);
99+
}
100+
});
101+
fs.writeFile(path.resolve(__dirname, './', './dist/app-lob/' + folder, filename), result, (err) => {
102+
if (err) {
103+
console.log(err);
104+
}
105+
});
106+
})
107+
})
108+
cb();
109+
}
110+
111+
exports.prerenderPages = gulp.series(createPrependerdLobStructure, addPrerenderedLobPages);
112+
53113
gulp.task("watch-live-editing", gulp.series("generate-live-editing", () => {
54114
gulp.watch(["./src/**/*.*", "!./src/assets/**", "./live-editing/**/*.*", "package.json"], function () {
55115
Object.keys(require.cache).forEach(function (key) {

live-editing/configs/PivotGridConfigGenerator.ts

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ import {
88
IgxPivotGridModule,
99
IgxTooltipModule,
1010
IgxToastModule,
11-
IgxSwitchModule
11+
IgxSwitchModule,
12+
IgxExcelExporterService
1213
} from 'igniteui-angular';
1314
import { AppModuleConfig, Config, IConfigGenerator } from 'igniteui-live-editing';
1415
export class PivotGridConfigGenerator implements IConfigGenerator {
@@ -29,6 +30,17 @@ export class PivotGridConfigGenerator implements IConfigGenerator {
2930
component: 'PivotGridBasicSampleComponent'
3031
}));
3132

33+
configs.push(new Config({
34+
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/dataToAnalyze.ts'],
35+
appModuleConfig: new AppModuleConfig({
36+
imports: ['IgxPivotGridModule', 'PivotExportComponent', 'IgxPreventDocumentScrollModule', 'IgxExcelExporterService'],
37+
ngDeclarations: ['PivotExportComponent'],
38+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxPivotGridModule'],
39+
ngProviders: ['IgxExcelExporterService']
40+
}),
41+
component: 'PivotExportComponent'
42+
}));
43+
3244
configs.push(new Config({
3345
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/dataToAnalyze.ts'],
3446
appModuleConfig: new AppModuleConfig({
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
import {IgxQueryBuilderModule} from 'igniteui-angular';
2+
import {AppModuleConfig, Config, IConfigGenerator} from 'igniteui-live-editing'
3+
export class QueryBuilderConfigGenerator implements IConfigGenerator {
4+
5+
6+
public generateConfigs(): Config[] {
7+
const configs = new Array<Config>();
8+
9+
configs.push(new Config({
10+
component: 'QueryBuilderSample1Component',
11+
appModuleConfig: new AppModuleConfig({
12+
imports: ['IgxQueryBuilderModule', 'QueryBuilderSample1Component'],
13+
ngDeclarations: ['QueryBuilderSample1Component'],
14+
ngImports: ['IgxQueryBuilderModule']
15+
}),
16+
shortenComponentPathBy: "/interactions/query-builder/"
17+
}));
18+
19+
configs.push(new Config({
20+
component: 'QueryBuilderStyleComponent',
21+
appModuleConfig: new AppModuleConfig({
22+
imports: ['IgxQueryBuilderModule', 'QueryBuilderStyleComponent'],
23+
ngDeclarations: ['QueryBuilderStyleComponent'],
24+
ngImports: ['IgxQueryBuilderModule']
25+
}),
26+
shortenComponentPathBy: "/interactions/query-builder/"
27+
}));
28+
29+
return configs;
30+
}
31+
}

live-editing/configs/SliderConfigGenerator.ts

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@ import {IgxButtonModule,
22
IgxIconModule,
33
IgxInputGroupModule,
44
IgxSliderModule} from 'igniteui-angular';
5+
import { HammerModule } from '@angular/platform-browser';
56
import {AppModuleConfig, Config, IConfigGenerator} from 'igniteui-live-editing'
67
export class SliderConfigGenerator implements IConfigGenerator {
78

8-
99
public generateConfigs(): Config[] {
1010
const configs = new Array<Config>();
1111

1212
// slider sample 1
1313
configs.push(new Config({
1414
component: 'SliderSample1Component',
1515
appModuleConfig: new AppModuleConfig({
16-
imports: ['IgxInputGroupModule', 'IgxSliderModule', 'SliderSample1Component'],
16+
imports: ['IgxInputGroupModule', 'IgxSliderModule', 'SliderSample1Component', 'HammerModule'],
1717
ngDeclarations: ['SliderSample1Component'],
18-
ngImports: ['IgxInputGroupModule', 'IgxSliderModule']
18+
ngImports: ['IgxInputGroupModule', 'IgxSliderModule', 'HammerModule']
1919
}),
2020
shortenComponentPathBy: "/interactions/slider/"
2121
}));
@@ -24,9 +24,9 @@ export class SliderConfigGenerator implements IConfigGenerator {
2424
configs.push(new Config({
2525
component: 'SliderSample2Component',
2626
appModuleConfig: new AppModuleConfig({
27-
imports: ['IgxSliderModule', 'SliderSample2Component'],
27+
imports: ['IgxSliderModule', 'SliderSample2Component', 'HammerModule'],
2828
ngDeclarations: ['SliderSample2Component'],
29-
ngImports: ['IgxSliderModule']
29+
ngImports: ['IgxSliderModule', 'HammerModule']
3030
}),
3131
shortenComponentPathBy: "/interactions/slider/"
3232
}));
@@ -35,9 +35,9 @@ export class SliderConfigGenerator implements IConfigGenerator {
3535
configs.push(new Config({
3636
component: 'SliderSample3Component',
3737
appModuleConfig: new AppModuleConfig({
38-
imports: ['IgxInputGroupModule', 'IgxSliderModule', 'SliderSample3Component'],
38+
imports: ['IgxInputGroupModule', 'IgxSliderModule', 'SliderSample3Component', 'HammerModule'],
3939
ngDeclarations: ['SliderSample3Component'],
40-
ngImports: ['IgxInputGroupModule', 'IgxSliderModule']
40+
ngImports: ['IgxInputGroupModule', 'IgxSliderModule', 'HammerModule']
4141
}),
4242
shortenComponentPathBy: "/interactions/slider/"
4343
}));
@@ -46,9 +46,9 @@ export class SliderConfigGenerator implements IConfigGenerator {
4646
configs.push(new Config({
4747
component: 'SliderSample4Component',
4848
appModuleConfig: new AppModuleConfig({
49-
imports: ['IgxSliderModule', 'SliderSample4Component'],
49+
imports: ['IgxSliderModule', 'SliderSample4Component', 'HammerModule'],
5050
ngDeclarations: ['SliderSample4Component'],
51-
ngImports: ['IgxSliderModule']
51+
ngImports: ['IgxSliderModule', 'HammerModule']
5252
}),
5353
shortenComponentPathBy: "/interactions/slider/"
5454
}));
@@ -57,9 +57,9 @@ export class SliderConfigGenerator implements IConfigGenerator {
5757
configs.push(new Config({
5858
component: 'SliderSample5Component',
5959
appModuleConfig: new AppModuleConfig({
60-
imports: ['IgxSliderModule', 'SliderSample5Component'],
60+
imports: ['IgxSliderModule', 'SliderSample5Component', 'HammerModule'],
6161
ngDeclarations: ['SliderSample5Component'],
62-
ngImports: ['IgxSliderModule']
62+
ngImports: ['IgxSliderModule', 'HammerModule']
6363
}),
6464
shortenComponentPathBy: "/interactions/slider/"
6565
}));
@@ -68,79 +68,79 @@ export class SliderConfigGenerator implements IConfigGenerator {
6868
configs.push(new Config({
6969
component: 'SliderSample6Component',
7070
appModuleConfig: new AppModuleConfig({
71-
imports: ['IgxSliderModule', 'SliderSample6Component'],
71+
imports: ['IgxSliderModule', 'SliderSample6Component', 'HammerModule'],
7272
ngDeclarations: ['SliderSample6Component'],
73-
ngImports: ['IgxSliderModule']
73+
ngImports: ['IgxSliderModule', 'HammerModule']
7474
}),
7575
shortenComponentPathBy: "/interactions/slider/"
7676
}));
7777

7878
configs.push(new Config({
7979
component: 'SliderSecondaryTicksMirrorComponent',
8080
appModuleConfig: new AppModuleConfig({
81-
imports: ['IgxButtonModule', 'IgxIconModule', 'IgxSliderModule', 'SliderSecondaryTicksMirrorComponent'],
81+
imports: ['IgxButtonModule', 'IgxIconModule', 'IgxSliderModule', 'SliderSecondaryTicksMirrorComponent', 'HammerModule'],
8282
ngDeclarations: ['SliderSecondaryTicksMirrorComponent'],
83-
ngImports: ['IgxButtonModule', 'IgxIconModule', 'IgxSliderModule']
83+
ngImports: ['IgxButtonModule', 'IgxIconModule', 'IgxSliderModule', 'HammerModule']
8484
}),
8585
shortenComponentPathBy: "/interactions/slider/"
8686
}));
8787

8888
configs.push(new Config({
8989
component: 'SliderDiscreteTicksBottomComponent',
9090
appModuleConfig: new AppModuleConfig({
91-
imports: ['IgxSliderModule', 'SliderDiscreteTicksBottomComponent'],
91+
imports: ['IgxSliderModule', 'SliderDiscreteTicksBottomComponent', 'HammerModule'],
9292
ngDeclarations: ['SliderDiscreteTicksBottomComponent'],
93-
ngImports: ['IgxSliderModule']
93+
ngImports: ['IgxSliderModule', 'HammerModule']
9494
}),
9595
shortenComponentPathBy: "/interactions/slider/"
9696
}));
9797

9898
configs.push(new Config({
9999
component: 'SliderTicksBottomtotopLabelsComponent',
100100
appModuleConfig: new AppModuleConfig({
101-
imports: ['IgxInputGroupModule', 'IgxSliderModule', 'SliderTicksBottomtotopLabelsComponent'],
101+
imports: ['IgxInputGroupModule', 'IgxSliderModule', 'SliderTicksBottomtotopLabelsComponent', 'HammerModule'],
102102
ngDeclarations: ['SliderTicksBottomtotopLabelsComponent'],
103-
ngImports: ['IgxInputGroupModule', 'IgxSliderModule']
103+
ngImports: ['IgxInputGroupModule', 'IgxSliderModule', 'HammerModule']
104104
}),
105105
shortenComponentPathBy: "/interactions/slider/"
106106
}));
107107

108108
configs.push(new Config({
109109
component: 'SliderPrimaryTicksTopComponent',
110110
appModuleConfig: new AppModuleConfig({
111-
imports: ['IgxSliderModule', 'SliderPrimaryTicksTopComponent'],
111+
imports: ['IgxSliderModule', 'SliderPrimaryTicksTopComponent', 'HammerModule'],
112112
ngDeclarations: ['SliderPrimaryTicksTopComponent'],
113-
ngImports: ['IgxSliderModule']
113+
ngImports: ['IgxSliderModule', 'HammerModule']
114114
}),
115115
shortenComponentPathBy: "/interactions/slider/"
116116
}));
117117

118118
configs.push(new Config({
119119
component: 'SliderTimeframeComponent',
120120
appModuleConfig: new AppModuleConfig({
121-
imports: ['IgxSliderModule', 'SliderTimeframeComponent'],
121+
imports: ['IgxSliderModule', 'SliderTimeframeComponent', 'HammerModule'],
122122
ngDeclarations: ['SliderTimeframeComponent'],
123-
ngImports: ['IgxSliderModule']
123+
ngImports: ['IgxSliderModule', 'HammerModule']
124124
}),
125125
shortenComponentPathBy: "/interactions/slider/"
126126
}));
127127

128128
configs.push(new Config({
129129
component: 'TickLabelsTemplateComponent',
130130
appModuleConfig: new AppModuleConfig({
131-
imports: ['IgxSliderModule', 'TickLabelsTemplateComponent'],
131+
imports: ['IgxSliderModule', 'TickLabelsTemplateComponent', 'HammerModule'],
132132
ngDeclarations: ['TickLabelsTemplateComponent'],
133-
ngImports: ['IgxSliderModule']
133+
ngImports: ['IgxSliderModule', 'HammerModule']
134134
}),
135135
shortenComponentPathBy: "/interactions/slider/"
136136
}));
137137

138138
configs.push(new Config({
139139
component: 'AppSliderStylingComponent',
140140
appModuleConfig: new AppModuleConfig({
141-
imports: ['IgxSliderModule', 'AppSliderStylingComponent'],
141+
imports: ['IgxSliderModule', 'AppSliderStylingComponent', 'HammerModule'],
142142
ngDeclarations: ['AppSliderStylingComponent'],
143-
ngImports: ['IgxSliderModule']
143+
ngImports: ['IgxSliderModule', 'HammerModule']
144144
}),
145145
shortenComponentPathBy: "/interactions/slider/"
146146
}));

live-editing/generators/ConfigGenerators.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ import { AccordionConfigGenerator } from '../configs/AccordionConfigGenerator';
6060
import { StepperConfigGenerator } from '../configs/StepperConfigGenerator';
6161
import { PaginationConfigGenerator } from '../configs/PaginationConfigGenerator';
6262
import { PivotGridConfigGenerator } from '../configs/PivotGridConfigGenerator';
63+
import { QueryBuilderConfigGenerator } from '../configs/QueryBuilderConfigGenerator';
6364

6465
export const CONFIG_GENERATORS =
6566
[
@@ -132,5 +133,6 @@ export const CONFIG_GENERATORS =
132133
TransactionsConfigGenerator,
133134
SplitterConfigGenerator,
134135
DockManagerConfigGenerator,
135-
PaginationConfigGenerator
136+
PaginationConfigGenerator,
137+
QueryBuilderConfigGenerator
136138
];

0 commit comments

Comments
 (0)