Skip to content

Commit 8af7ee2

Browse files
committed
Merge branch 'rkolev/tabsBottonNavTabsDefinitionMode' of https://github.com/IgniteUI/igniteui-angular-samples into rkolev/tabsBottonNavTabsDefinitionMode
2 parents 3f6a14f + 5197172 commit 8af7ee2

File tree

670 files changed

+177542
-43639
lines changed

Some content is hidden

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

670 files changed

+177542
-43639
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ node_js:
55
- '10.14.1'
66
script:
77
- npm run lint
8-
- travis_wait 30 npm run build
8+
- travis_wait 60 npm run build

README.md

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
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)
12
[![Build Status](https://travis-ci.org/IgniteUI/igniteui-angular-samples.svg?branch=master)](https://travis-ci.org/IgniteUI/igniteui-angular-samples)
23

34
# Ignite UI for Angular - Samples
@@ -21,25 +22,45 @@ npm run build
2122
This 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.
2223

2324
## Dev Server
24-
To start the dev server run:
25+
To start the dev server (including IE support) run:
2526

2627
```
2728
npm run start
2829
```
2930

31+
To start in modern browsers only, run:
32+
33+
```
34+
npm run start:es6
35+
```
36+
37+
### Starting from Angular v8 the project will not be supported/start in IE due to the new default compilation target es2015.
38+
3039
## Dev Server and Live Editing
31-
To generate the live editing applications along with the dev server run:
40+
To generate the live editing applications along with the dev server (including IE support) run:
3241
```
3342
npm run start:live-editing
3443
```
3544

45+
To start in modern browsers only, run:
46+
47+
```
48+
npm run start:live-editing:es6
49+
```
50+
3651
## Live Editing Watcher
37-
Use this command to start the server with capability to regenerate [live editing](https://github.com/IgniteUI/igniteui-angular-samples/blob/master/live-editing/README.md) JSON files (e.g. `"/src/assets/samples/avatar-sample-3.json"`) when a change related to the samples is made:
52+
Use this command to start the server with capability to regenerate [live editing](https://github.com/IgniteUI/igniteui-angular-samples/blob/master/live-editing/README.md) JSON files (e.g. `"/src/assets/samples/avatar-sample-3.json"`) when a change related to the samples is made (including IE support):
3853

3954
```
4055
npm run start:watch-live-editing
4156
```
4257

58+
To start in modern browsers only, run:
59+
60+
```
61+
npm run start:watch-live-editing:es6
62+
```
63+
4364
## Generate Live Editing JSON files
4465
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:
4566
```

angular.json

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
"src/styles.scss"
2626
],
2727
"scripts": [],
28-
"es5BrowserSupport": true
28+
"es5BrowserSupport": true,
29+
"webWorkerTsConfig": "tsconfig.worker.json"
2930
},
3031
"configurations": {
3132
"production": {
@@ -44,6 +45,9 @@
4445
"with": "src/environments/environment.prod.ts"
4546
}
4647
]
48+
},
49+
"es5": {
50+
"tsConfig": "src/tsconfig-es5.app.json"
4751
}
4852
}
4953
},
@@ -55,6 +59,9 @@
5559
"configurations": {
5660
"production": {
5761
"browserTarget": "my-app:build:production"
62+
},
63+
"es5": {
64+
"browserTarget": "my-app:build:es5"
5865
}
5966
}
6067
},
@@ -86,7 +93,8 @@
8693
"options": {
8794
"tsConfig": [
8895
"src/tsconfig.app.json",
89-
"src/tsconfig.spec.json"
96+
"src/tsconfig.spec.json",
97+
"tsconfig.worker.json"
9098
],
9199
"exclude": [
92100
"**/node_modules/**"

live-editing/LiveEditingManager.ts

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,24 @@ class LiveEditingManager {
1616
fs.mkdirSync(ASSETS_SAMPLES_DIR);
1717
fs.mkdirSync(ASSETS_SAMPLES_CSS_SUPPORT_DIR);
1818

19-
console.log("Live-Editing... CSS with logs:");
20-
this._run(StyleSyntax.CSS, false);
21-
console.log("Live-Editing... SASS without logs:");
22-
this._run(StyleSyntax.Sass, false);
19+
this.generate(StyleSyntax.CSS, false);
20+
this.generate(StyleSyntax.Sass, false);
21+
22+
console.log("-----------------------------------------------------");
23+
console.log("Live-Editing - output folder: " + ASSETS_SAMPLES_DIR);
2324
}
2425

25-
public _run(styleSyntax: StyleSyntax, showLogs?: boolean) {
26+
private generate(styleSyntax: StyleSyntax, showLogs?: boolean) {
27+
28+
let logInfo = "";
29+
if (styleSyntax === StyleSyntax.CSS) {
30+
logInfo = "CSS syntax"
31+
} else {
32+
logInfo = "Sass syntax"
33+
}
34+
console.log("-----------------------------------------------------");
35+
console.log("Live-Editing - with " + logInfo);
36+
2637
new SharedAssetsGenerator(styleSyntax, showLogs).generateSharedAssets();
2738
new SampleAssetsGenerator(styleSyntax, showLogs).generateSamplesAssets();
2839
new MetaDataGenerator(styleSyntax).Generate();
Lines changed: 68 additions & 145 deletions
Original file line numberDiff line numberDiff line change
@@ -1,157 +1,80 @@
11
/* tslint:disable:object-literal-sort-keys */
2+
// tslint:disable:object-literal-shorthand
3+
// tslint:disable:max-line-length
4+
// tslint:disable:member-ordering
5+
// tslint:disable:prefer-const
26
import { IgxSliderModule } from "igniteui-angular";
37
import { IgxCategoryChartModule } from "igniteui-angular-charts/ES5/igx-category-chart-module";
4-
import {
5-
CategoryChartAnnotationsComponent
6-
} from "../../src/app/charts/category-chart/annotations/category-chart-annotations.component";
7-
import {
8-
CategoryChartAxisOptionsComponent
9-
} from "../../src/app/charts/category-chart/axis-options/category-chart-axis-options-sample.component";
10-
import {
11-
CategoryChartConfigOptionsComponent
12-
} from "../../src/app/charts/category-chart/config-options/category-chart-config-options-sample.component";
13-
import {
14-
CategoryChartHighFrequencyComponent
15-
} from "../../src/app/charts/category-chart/high-frequency/category-chart-high-frequency-sample.component";
16-
import {
17-
CategoryChartHighVolumeComponent
18-
} from "../../src/app/charts/category-chart/high-volume/category-chart-high-volume-sample.component";
19-
import {
20-
CategoryChartHighlightingComponent
21-
} from "../../src/app/charts/category-chart/highlighting/category-chart-highlighting.component";
22-
import {
23-
CategoryChartOverlapColumnsComponent
24-
} from "../../src/app/charts/category-chart/overlap-columns/category-chart-overlap-columns.component";
25-
import {
26-
CategoryChartOverviewComponent
27-
} from "../../src/app/charts/category-chart/overview/category-chart-overview-sample.component";
28-
import {
29-
CategoryChartTooltipTemplateComponent
30-
} from "../../src/app/charts/category-chart/tooltip-template/category-chart-tooltip-template.component";
31-
import {
32-
CategoryChartTooltipTypesComponent
33-
} from "../../src/app/charts/category-chart/tooltip-types/category-chart-tooltip-types.component";
34-
import {
35-
CategoryChartTrendlinesComponent
36-
} from "../../src/app/charts/category-chart/trendline/category-chart-trendlines.component";
8+
9+
import { CategoryChartAnnotationsComponent } from "../../src/app/charts/category-chart/annotations/category-chart-annotations.component";
10+
import { CategoryChartAxisOptionsComponent } from "../../src/app/charts/category-chart/axis-options/category-chart-axis-options-sample.component";
11+
import { CategoryChartConfigOptionsComponent } from "../../src/app/charts/category-chart/config-options/category-chart-config-options-sample.component";
12+
import { CategoryChartHighFrequencyComponent } from "../../src/app/charts/category-chart/high-frequency/category-chart-high-frequency-sample.component";
13+
import { CategoryChartHighVolumeComponent } from "../../src/app/charts/category-chart/high-volume/category-chart-high-volume-sample.component";
14+
import { CategoryChartHighlightingComponent } from "../../src/app/charts/category-chart/highlighting/category-chart-highlighting.component";
15+
import { CategoryChartOverlapColumnsComponent } from "../../src/app/charts/category-chart/overlap-columns/category-chart-overlap-columns.component";
16+
import { CategoryChartOverviewComponent } from "../../src/app/charts/category-chart/overview/category-chart-overview-sample.component";
17+
import { CategoryChartTooltipTemplateComponent } from "../../src/app/charts/category-chart/tooltip-template/category-chart-tooltip-template.component";
18+
import { CategoryChartTooltipTypesComponent } from "../../src/app/charts/category-chart/tooltip-types/category-chart-tooltip-types.component";
19+
import { CategoryChartTrendlinesComponent } from "../../src/app/charts/category-chart/trendline/category-chart-trendlines.component";
20+
3721
import { DependenciesType } from "../services/DependenciesType";
38-
import { AppModuleConfig } from "./core/AppModuleConfig";
3922
import { Config } from "./core/Config";
40-
import { IConfigGenerator } from "./core/IConfigGenerator";
23+
import { BaseConfigGenerator } from "./core/BaseConfigGenerator";
24+
25+
export class CategoryChartConfigGenerator extends BaseConfigGenerator {
26+
27+
constructor() {
28+
super(DependenciesType.Charts, "/charts/category-chart/");
29+
}
4130

42-
export class CategoryChartConfigGenerator implements IConfigGenerator {
4331
public generateConfigs(): Config[] {
4432
const configs = new Array<Config>();
4533

46-
configs.push(new Config({
47-
component: CategoryChartOverviewComponent,
48-
appModuleConfig: new AppModuleConfig({
49-
imports: [IgxCategoryChartModule, CategoryChartOverviewComponent],
50-
ngDeclarations: [CategoryChartOverviewComponent],
51-
ngImports: [IgxCategoryChartModule]
52-
}),
53-
dependenciesType: DependenciesType.Charts,
54-
shortenComponentPathBy: "/charts/category-chart/"
55-
}));
56-
57-
configs.push(new Config({
58-
component: CategoryChartHighVolumeComponent,
59-
appModuleConfig: new AppModuleConfig({
60-
imports: [IgxCategoryChartModule, CategoryChartHighVolumeComponent, IgxSliderModule],
61-
ngDeclarations: [CategoryChartHighVolumeComponent],
62-
ngImports: [IgxCategoryChartModule, IgxSliderModule]
63-
}),
64-
dependenciesType: DependenciesType.Charts,
65-
shortenComponentPathBy: "/charts/category-chart/"
66-
}));
67-
68-
configs.push(new Config({
69-
component: CategoryChartHighFrequencyComponent,
70-
appModuleConfig: new AppModuleConfig({
71-
imports: [IgxCategoryChartModule, CategoryChartHighFrequencyComponent, IgxSliderModule],
72-
ngDeclarations: [CategoryChartHighFrequencyComponent],
73-
ngImports: [IgxCategoryChartModule, IgxSliderModule]
74-
}),
75-
dependenciesType: DependenciesType.Charts,
76-
shortenComponentPathBy: "/charts/category-chart/"
77-
}));
78-
79-
configs.push(new Config({
80-
component: CategoryChartTooltipTemplateComponent,
81-
appModuleConfig: new AppModuleConfig({
82-
imports: [IgxCategoryChartModule, CategoryChartTooltipTemplateComponent],
83-
ngDeclarations: [CategoryChartTooltipTemplateComponent],
84-
ngImports: [IgxCategoryChartModule]
85-
}),
86-
dependenciesType: DependenciesType.Charts,
87-
shortenComponentPathBy: "/charts/category-chart/"
88-
}));
89-
90-
configs.push(new Config({
91-
component: CategoryChartConfigOptionsComponent,
92-
appModuleConfig: new AppModuleConfig({
93-
imports: [IgxCategoryChartModule, CategoryChartConfigOptionsComponent],
94-
ngDeclarations: [CategoryChartConfigOptionsComponent],
95-
ngImports: [IgxCategoryChartModule]
96-
}),
97-
dependenciesType: DependenciesType.Charts,
98-
shortenComponentPathBy: "/charts/category-chart/"
99-
}));
100-
101-
configs.push(new Config({
102-
component: CategoryChartAxisOptionsComponent,
103-
appModuleConfig: new AppModuleConfig({
104-
imports: [IgxCategoryChartModule, CategoryChartAxisOptionsComponent],
105-
ngDeclarations: [CategoryChartAxisOptionsComponent],
106-
ngImports: [IgxCategoryChartModule]
107-
}),
108-
dependenciesType: DependenciesType.Charts,
109-
shortenComponentPathBy: "/charts/category-chart/"
110-
}));
111-
112-
configs.push(new Config({
113-
component: CategoryChartAnnotationsComponent,
114-
appModuleConfig: new AppModuleConfig({
115-
imports: [IgxCategoryChartModule, CategoryChartAnnotationsComponent],
116-
ngDeclarations: [CategoryChartAnnotationsComponent],
117-
ngImports: [IgxCategoryChartModule]
118-
}),
119-
dependenciesType: DependenciesType.Charts,
120-
shortenComponentPathBy: "/charts/category-chart/"
121-
}));
122-
123-
configs.push(new Config({
124-
component: CategoryChartHighlightingComponent,
125-
appModuleConfig: new AppModuleConfig({
126-
imports: [IgxCategoryChartModule, CategoryChartHighlightingComponent],
127-
ngDeclarations: [CategoryChartHighlightingComponent],
128-
ngImports: [IgxCategoryChartModule]
129-
}),
130-
dependenciesType: DependenciesType.Charts,
131-
shortenComponentPathBy: "/charts/category-chart/"
132-
}));
133-
134-
configs.push(new Config({
135-
component: CategoryChartTooltipTypesComponent,
136-
appModuleConfig: new AppModuleConfig({
137-
imports: [IgxCategoryChartModule, CategoryChartTooltipTypesComponent],
138-
ngDeclarations: [CategoryChartTooltipTypesComponent],
139-
ngImports: [IgxCategoryChartModule]
140-
}),
141-
dependenciesType: DependenciesType.Charts,
142-
shortenComponentPathBy: "/charts/category-chart/"
143-
}));
144-
145-
configs.push(new Config({
146-
component: CategoryChartOverlapColumnsComponent,
147-
appModuleConfig: new AppModuleConfig({
148-
imports: [IgxCategoryChartModule, CategoryChartOverlapColumnsComponent],
149-
ngDeclarations: [CategoryChartOverlapColumnsComponent],
150-
ngImports: [IgxCategoryChartModule]
151-
}),
152-
dependenciesType: DependenciesType.Charts,
153-
shortenComponentPathBy: "/charts/category-chart/"
154-
}));
34+
configs.push(this.getConfig(
35+
CategoryChartOverviewComponent,
36+
[IgxCategoryChartModule]));
37+
38+
configs.push(this.getConfig(
39+
CategoryChartHighVolumeComponent,
40+
[IgxCategoryChartModule, IgxSliderModule]));
41+
42+
configs.push(this.getConfig(
43+
CategoryChartHighFrequencyComponent,
44+
[IgxCategoryChartModule, IgxSliderModule]));
45+
46+
configs.push(this.getConfig(
47+
CategoryChartTooltipTemplateComponent,
48+
[IgxCategoryChartModule]));
49+
50+
configs.push(this.getConfig(
51+
CategoryChartConfigOptionsComponent,
52+
[IgxCategoryChartModule]));
53+
54+
configs.push(this.getConfig(
55+
CategoryChartAxisOptionsComponent,
56+
[IgxCategoryChartModule]));
57+
58+
configs.push(this.getConfig(
59+
CategoryChartAnnotationsComponent,
60+
[IgxCategoryChartModule]));
61+
62+
configs.push(this.getConfig(
63+
CategoryChartHighlightingComponent,
64+
[IgxCategoryChartModule]));
65+
66+
configs.push(this.getConfig(
67+
CategoryChartTooltipTypesComponent,
68+
[IgxCategoryChartModule]));
69+
70+
configs.push(this.getConfig(
71+
CategoryChartOverlapColumnsComponent,
72+
[IgxCategoryChartModule]));
73+
74+
configs.push(this.getConfig(
75+
CategoryChartTrendlinesComponent,
76+
[IgxCategoryChartModule]));
77+
15578
return configs;
15679
}
15780
}

live-editing/configs/ChipConfigGenerator.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* tslint:disable:object-literal-sort-keys */
2-
import { IgxAvatarModule, IgxChipsModule, IgxDropDownModule, IgxInputGroupModule, IgxToastModule, IgxButtonModule
2+
import { IgxAvatarModule, IgxButtonModule, IgxChipsModule, IgxDropDownModule, IgxInputGroupModule, IgxToastModule
33
} from "igniteui-angular";
44
import { ChipSampleComponent, EmailFilterPipe } from "../../src/app/data-display/chip/chip.component";
55
import { AppModuleConfig } from "./core/AppModuleConfig";

0 commit comments

Comments
 (0)