Skip to content

Commit 3de7997

Browse files
hanastasovhanastasov
committed
Merge branch 'vNext' of https://github.com/IgniteUI/igniteui-angular-samples into boston-sample-vNext
2 parents aaba9f3 + 3b193ec commit 3de7997

21 files changed

+164
-417
lines changed

‎live-editing/configs/LinearProgressbarConfigGenerator.ts

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
// tslint:disable:object-literal-sort-keys
22
// tslint:disable:max-line-length
33
import { IgxButtonModule, IgxIconModule, IgxProgressBarModule, IgxRippleModule } from "igniteui-angular";
4+
import {
5+
LinearDynamicSampleComponent
6+
} from "../../src/app/data-display/linear-progressbar/linear-dynamic-sample/linear-dynamic-sample.component";
47
import { LinearProgressbarSample1Component
58
} from "../../src/app/data-display/linear-progressbar/linear-progressbar-sample-1/linear-progressbar-sample-1.component";
69
import { LinearProgressbarSample2Component
@@ -18,43 +21,60 @@ export class LinearProgressbarConfigGenerator implements IConfigGenerator {
1821
configs.push(new Config({
1922
component: LinearProgressbarComponent,
2023
appModuleConfig: new AppModuleConfig({
21-
imports: [IgxButtonModule, IgxIconModule, IgxProgressBarModule, IgxRippleModule,
22-
LinearProgressbarComponent],
24+
imports: [IgxProgressBarModule, LinearProgressbarComponent],
2325
ngDeclarations: [LinearProgressbarComponent],
24-
ngImports: [IgxButtonModule, IgxIconModule, IgxProgressBarModule, IgxRippleModule]
26+
ngImports: [IgxProgressBarModule]
2527
}),
2628
shortenComponentPathBy: "/data-display/"
2729
}));
2830

31+
configs.push(new Config({
32+
component: LinearDynamicSampleComponent,
33+
appModuleConfig: new AppModuleConfig({
34+
imports: [
35+
IgxButtonModule,
36+
IgxIconModule,
37+
IgxProgressBarModule,
38+
IgxRippleModule,
39+
LinearDynamicSampleComponent
40+
],
41+
ngDeclarations: [LinearDynamicSampleComponent],
42+
ngImports: [
43+
IgxButtonModule,
44+
IgxIconModule,
45+
IgxProgressBarModule,
46+
IgxRippleModule
47+
]
48+
}),
49+
shortenComponentPathBy: "/data-display/linear-progressbar/"
50+
}));
51+
2952
configs.push(new Config({
3053
component: LinearProgressbarSample1Component,
3154
appModuleConfig: new AppModuleConfig({
32-
imports: [IgxButtonModule, IgxIconModule, IgxProgressBarModule, IgxRippleModule,
33-
LinearProgressbarSample1Component],
55+
imports: [IgxProgressBarModule, LinearProgressbarSample1Component],
3456
ngDeclarations: [LinearProgressbarSample1Component],
35-
ngImports: [IgxButtonModule, IgxIconModule, IgxProgressBarModule, IgxRippleModule]
57+
ngImports: [IgxProgressBarModule]
3658
}),
3759
shortenComponentPathBy: "/data-display/linear-progressbar/"
3860
}));
3961

4062
configs.push(new Config({
4163
component: LinearProgressbarSample2Component,
4264
appModuleConfig: new AppModuleConfig({
43-
imports: [IgxButtonModule, IgxIconModule, IgxProgressBarModule, IgxRippleModule,
44-
LinearProgressbarSample2Component],
65+
imports: [IgxProgressBarModule, LinearProgressbarSample2Component],
4566
ngDeclarations: [LinearProgressbarSample2Component],
46-
ngImports: [IgxButtonModule, IgxIconModule, IgxProgressBarModule, IgxRippleModule]
67+
ngImports: [IgxProgressBarModule]
4768
}),
4869
shortenComponentPathBy: "/data-display/linear-progressbar/"
4970
}));
5071

5172
configs.push(new Config({
5273
component: LinearProgressbarStylingComponent,
5374
appModuleConfig: new AppModuleConfig({
54-
imports: [IgxButtonModule, IgxIconModule, IgxProgressBarModule, IgxRippleModule,
55-
LinearProgressbarStylingComponent],
75+
imports: [IgxProgressBarModule, LinearProgressbarStylingComponent],
5676
ngDeclarations: [LinearProgressbarStylingComponent],
57-
ngImports: [IgxButtonModule, IgxIconModule, IgxProgressBarModule, IgxRippleModule]
77+
ngImports: [IgxProgressBarModule]
5878
}),
5979
shortenComponentPathBy: "/data-display/linear-progressbar"
6080
}));

‎src/app/data-display/data-display-routes-data.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ export const dataDisplayRoutesData = {
1414
"icon-styling": { displayName: "Icon Styling", parentName: "Icon" },
1515
"svg-icon-sample": { displayName: "SVG Icons", parentName: "Icon" },
1616
"igx-for-sample-1": { displayName: "List with igxFor directive", parentName: "For" },
17+
"linear-dynamic-sample": { displayName: "Dynamic Linear Progressbar", parentName: "Linear Progressbar" },
1718
"linear-progressbar": { displayName: "Simple Linear Progressbar", parentName: "Linear Progressbar" },
1819
"linear-progressbar-sample-1": { displayName: "Linear Progressbar Types", parentName: "Linear Progressbar" },
1920
"linear-progressbar-sample-2": { displayName: "Linear Progressbar Styles", parentName: "Linear Progressbar" },

‎src/app/data-display/data-display-routing.module.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ import { IconSample2Component } from "./icon/icon-sample2/icon-sample2.component
1919
import { IconStylingSample } from "./icon/icon-styling-sample/icon-styling-sample.component";
2020
import { SvgIconSampleComponent } from "./icon/svg-icon-sample/svg-icon-sample.component";
2121
import { IgxForComponent } from "./igxFor/igxFor.component";
22+
import {
23+
LinearDynamicSampleComponent
24+
} from "./linear-progressbar/linear-dynamic-sample/linear-dynamic-sample.component";
2225
import { LinearProgressbarSample1Component
2326
} from "./linear-progressbar/linear-progressbar-sample-1/linear-progressbar-sample-1.component";
2427
import { LinearProgressbarSample2Component
@@ -93,6 +96,11 @@ export const dataDisplayRoutes: Routes = [
9396
data: dataDisplayRoutesData["igx-for-sample-1"],
9497
path: "igx-for-sample-1"
9598
},
99+
{
100+
component: LinearDynamicSampleComponent,
101+
data: dataDisplayRoutesData["linear-dynamic-sample"],
102+
path: "linear-dynamic-sample"
103+
},
96104
{
97105
component: LinearProgressbarComponent,
98106
data: dataDisplayRoutesData["linear-progressbar"],

‎src/app/data-display/data-display.module.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ import { IconSample2Component } from "./icon/icon-sample2/icon-sample2.component
2727
import { IconStylingSample } from "./icon/icon-styling-sample/icon-styling-sample.component";
2828
import { SvgIconSampleComponent } from "./icon/svg-icon-sample/svg-icon-sample.component";
2929
import { IgxForComponent } from "./igxFor/igxFor.component";
30+
import {
31+
LinearDynamicSampleComponent
32+
} from "./linear-progressbar/linear-dynamic-sample/linear-dynamic-sample.component";
3033
import {
3134
LinearProgressbarSample1Component
3235
} from "./linear-progressbar/linear-progressbar-sample-1/linear-progressbar-sample-1.component";
@@ -65,6 +68,7 @@ import { TextHighlightStyleComponent } from "./text-highlight/text-highlight-sty
6568
IconStylingSample,
6669
SvgIconSampleComponent,
6770
IgxForComponent,
71+
LinearDynamicSampleComponent,
6872
LinearProgressbarComponent,
6973
LinearProgressbarSample1Component,
7074
LinearProgressbarSample2Component,

‎src/app/data-display/linear-progressbar/linear-dynamic-sample/linear-dynamic-sample.component.html

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<div class="linear-container">
2+
<igx-linear-bar
3+
[value]="currentValue"
4+
[max]="100"
5+
></igx-linear-bar>
6+
7+
<div class="button-container">
8+
<button igxButton="icon" (click)="decrementProgress()">
9+
<igx-icon fontSet="material">remove</igx-icon>
10+
</button>
11+
<button igxButton="icon" (click)="incrementProgress()">
12+
<igx-icon fontSet="material">add</igx-icon>
13+
</button>
14+
</div>
15+
</div>

‎src/app/data-display/linear-progressbar/linear-dynamic-sample/linear-dynamic-sample.component.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.linear-container {
2+
margin-top: 20px;
3+
}

‎src/app/data-display/linear-progressbar/linear-dynamic-sample/linear-dynamic-sample.component.ts

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
import { Component } from "@angular/core";
2+
3+
@Component({
4+
selector: "app-linear-dynamic-sample",
5+
styleUrls: ["./linear-dynamic-sample.component.scss"],
6+
templateUrl: "./linear-dynamic-sample.component.html"
7+
})
8+
export class LinearDynamicSampleComponent {
9+
10+
public currentValue: number;
11+
12+
public ngOnInit() {
13+
this.currentValue = 0;
14+
}
15+
16+
public incrementProgress() {
17+
this.currentValue += 10;
18+
if (this.currentValue > 100) {
19+
this.currentValue = 100;
20+
}
21+
}
22+
23+
public decrementProgress() {
24+
this.currentValue -= 10;
25+
if (this.currentValue < 0) {
26+
this.currentValue = 0;
27+
}
28+
}
29+
}

‎src/app/data-display/linear-progressbar/linear-progressbar-sample-1/linear-progressbar-sample-1.component.html

Lines changed: 7 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,8 @@
1-
<div class="sample-wrapper">
2-
<section class="sample-content">
3-
<article class="linear-samples sample-column">
4-
<h4 class="sample-title">Linear progress bar</h4>
5-
<div class="linear-container">
6-
<igx-linear-bar type="default"></igx-linear-bar>
7-
<igx-linear-bar type="info" [striped]="true"></igx-linear-bar>
8-
<igx-linear-bar type="success"></igx-linear-bar>
9-
<igx-linear-bar type="warning" [striped]="true"></igx-linear-bar>
10-
<igx-linear-bar type="danger"></igx-linear-bar>
11-
</div>
12-
</article>
13-
</section>
14-
<section class="sample-content">
15-
<article class="linear-samples sample-column">
16-
<div class="button-container">
17-
<p>Press the button to start updating the bars</p>
18-
<button igxButton="fab" igxButtonBackground="#333" igxRipple="white" (click)="tick()">
19-
<igx-icon fontSet="material">{{changeIcon()}}</igx-icon>
20-
</button>
21-
</div>
22-
</article>
23-
<article class="linear-samples sample-column">
24-
<div class="button-container">
25-
<p>Press the button to reset the bars</p>
26-
<button igxButton="fab" igxButtonBackground="#333" igxRipple="white" (click)="reset()" [disabled]="disable">
27-
<igx-icon color="white" isActive="true">replay</igx-icon>
28-
</button>
29-
</div>
30-
</article>
31-
</section>
1+
<div class="linear-container">
2+
<igx-linear-bar [value]="100" type="default"></igx-linear-bar>
3+
<igx-linear-bar [value]="100" type="success" [striped]="true"></igx-linear-bar>
4+
<igx-linear-bar [value]="100" type="error"></igx-linear-bar>
5+
<igx-linear-bar [value]="100" type="info" [striped]="true"></igx-linear-bar>
6+
<igx-linear-bar [value]="100" type="warning"></igx-linear-bar>
327
</div>
8+

‎src/app/data-display/linear-progressbar/linear-progressbar-sample-1/linear-progressbar-sample-1.component.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.linear-container {
2+
margin-top: 20px;
3+
}

‎src/app/data-display/linear-progressbar/linear-progressbar-sample-1/linear-progressbar-sample-1.component.spec.ts

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

0 commit comments

Comments
 (0)