Skip to content

Commit bb2267c

Browse files
committed
Fixed 'Daily line chart'.
Updated the Angular builder and CLI.
1 parent e8f4526 commit bb2267c

File tree

7 files changed

+31
-10
lines changed

7 files changed

+31
-10
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Sing App Angular Dashboard - Ngx Admin Template (4.3.0 Full version) with Angular 7.0 Final Release support
1+
# Sing App Angular Dashboard - Ngx Admin Template (5.2.2 Full version) with Angular 8.0 Final Release support
22

3-
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.7.3.
3+
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 8.0.3.
44

55
**For upgrade instruction please refer to [https://update.angular.io/](https://update.angular.io/).**
66

changelog.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
11
# Changelog
2+
3+
## [5.2.2]
4+
5+
### Updated
6+
7+
- Updated the Angular builder
8+
- Updated the Angular CLI
9+
10+
### Fixed
11+
12+
- Fixed 'Daily line chart'
13+
214

315
## [5.2.1]
416

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@
9797
},
9898
"devDependencies": {
9999
"@angular-builders/custom-webpack": "^8.1.0",
100-
"@angular-devkit/build-angular": "^0.800.2",
101-
"@angular/cli": "8.0.2",
100+
"@angular-devkit/build-angular": "^0.803.8",
101+
"@angular/cli": "8.0.3",
102102
"@angular/compiler-cli": "8.0.0",
103103
"@angular/language-service": "8.0.0",
104104
"@angularclass/hmr": "^2.1.3",

src/app/pages/analytics/analytics.service.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export class AnalyticsService {
2828
if (!this.config.isBackend) {
2929
new Promise((resolve) => {
3030
resolve(mock.backendData);
31-
}).then(data => {
31+
}).then((data: number[][][]) => {
3232
this.receiveDataSuccess(data);
3333
});
3434
} else {
@@ -40,12 +40,18 @@ export class AnalyticsService {
4040

4141
receiveDataSuccess(payload) {
4242
const {visits, performance, server, revenue, mainChart} = payload;
43+
const mainChartData = mainChart.map((elem: number[][]) => {
44+
return elem.map((item: number[]) => {
45+
return [item[0], item[1] / 1000];
46+
});
47+
});
48+
4349
this.isReceiving = false;
4450
this.visits = visits;
4551
this.performance = performance;
4652
this.server = server;
4753
this.revenue = revenue;
48-
this.mainChart = mainChart;
54+
this.mainChart = mainChartData;
4955
this.onReceiveDataSuccess.emit(true);
5056
}
5157

src/app/pages/analytics/components/main-chart/main-chart.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ export class MainChartComponent {
116116
},
117117
yaxis: {
118118
tickColor: '#f8f9fa',
119-
max: 5,
119+
max: 8,
120120
font: {
121121
lineHeight: 11,
122122
weight: 400,

src/app/styles/_libs-override.scss

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,11 @@ ngx-loading-bar {
218218
/* Dropdown */
219219
/*************************************/
220220
.dropdown-toggle::after {
221-
font-family: LineAwesome, sans-serif;
222-
content: "\F110";
221+
font-family: 'Line Awesome Free';
222+
font-style: normal;
223+
font-variant: normal;
224+
font-weight: 900;
225+
content: "\f107";
223226
border: none;
224227
width: auto;
225228
height: auto;

src/app/styles/application.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
@import "../../../node_modules/font-awesome/scss/font-awesome";
88
@import "../../../node_modules/glyphicons-halflings/scss/glyphicons-halflings";
9-
@import '../../../node_modules/line-awesome/dist/css/line-awesome.css';
9+
@import '../../../node_modules/line-awesome/dist/line-awesome/css/line-awesome.css';
1010
@import './fonts/flaticon/flaticon';
1111

1212
@import "../../../node_modules/animate.css/animate";

0 commit comments

Comments
 (0)