From 0b753946f38d8a7e5a8e2e2ac51d32b36d8dfed0 Mon Sep 17 00:00:00 2001 From: xidedix Date: Mon, 18 Feb 2019 17:23:24 +0100 Subject: [PATCH 1/4] chore: dependencies update - update: `@angular/animations` to `^7.2.5` - update: `@angular/common` to `^7.2.5` - update: `@angular/compiler` to `^7.2.5` - update: `@angular/core` to `^7.2.5` - update: `@angular/forms` to `^7.2.5` - update: `@angular/http` to `^7.2.5` - update: `@angular/platform-browser` to `^7.2.5` - update: `@angular/platform-browser-dynamic` to `^7.2.5` - update: `@angular/router` to `^7.2.5` - update: `@coreui/angular` to `^2.4.0` - update: `bootstrap` to `^4.3.1` - update: `core-js` to `^2.6.5` - update: `moment` to `^2.24.0` - update: `ngx-bootstrap` to `^3.2.0` - update: `rxjs` to `^6.4.0` - update: `tsickle` to `^0.34.3` - update: `zone.js` to `^0.8.29` - update: `@angular-devkit/build-angular` to `^0.13.2` - update: `@angular/cli` to `^7.3.2` - update: `@angular/compiler-cli` to `^7.2.5` - update: `@angular/language-service` to `^7.2.5` - update: `@types/jasmine` to `^3.3.9` - update: `@types/node` to `^10.12.26` - update: `karma` to `^4.0.0` - update: `karma-coverage-istanbul-reporter` to `^2.0.5` --- package.json | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/package.json b/package.json index ff01cc769..9a35652aa 100644 --- a/package.json +++ b/package.json @@ -27,54 +27,54 @@ }, "private": true, "dependencies": { - "@angular/animations": "^7.2.1", - "@angular/common": "^7.2.1", - "@angular/compiler": "^7.2.1", - "@angular/core": "^7.2.1", - "@angular/forms": "^7.2.1", - "@angular/http": "^7.2.1", - "@angular/platform-browser": "^7.2.1", - "@angular/platform-browser-dynamic": "^7.2.1", - "@angular/router": "^7.2.1", - "@coreui/angular": "^2.2.4", + "@angular/animations": "^7.2.5", + "@angular/common": "^7.2.5", + "@angular/compiler": "^7.2.5", + "@angular/core": "^7.2.5", + "@angular/forms": "^7.2.5", + "@angular/http": "^7.2.5", + "@angular/platform-browser": "^7.2.5", + "@angular/platform-browser-dynamic": "^7.2.5", + "@angular/router": "^7.2.5", + "@coreui/angular": "^2.4.0", "@coreui/coreui": "^2.1.6", "@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0", "@coreui/icons": "0.3.0", - "bootstrap": "^4.2.1", + "bootstrap": "^4.3.1", "chart.js": "^2.7.3", - "core-js": "^2.6.2", + "core-js": "^2.6.5", "flag-icon-css": "^3.2.1", "font-awesome": "^4.7.0", - "moment": "^2.23.0", + "moment": "^2.24.0", "mutationobserver-shim": "^0.3.3", "ng2-charts": "^1.6.0", - "ngx-bootstrap": "^3.1.4", + "ngx-bootstrap": "^3.2.0", "ngx-perfect-scrollbar": "^7.2.0", - "rxjs": "^6.3.3", + "rxjs": "^6.4.0", "simple-line-icons": "^2.4.1", "ts-helpers": "^1.1.2", - "tsickle": "^0.34.0", + "tsickle": "^0.34.3", "tslib": "^1.9.0", - "zone.js": "^0.8.28" + "zone.js": "^0.8.29" }, "devDependencies": { - "@angular-devkit/build-angular": "^0.12.2", - "@angular/cli": "^7.2.2", - "@angular/compiler-cli": "^7.2.1", - "@angular/language-service": "^7.2.1", - "@types/jasmine": "^3.3.7", + "@angular-devkit/build-angular": "^0.13.2", + "@angular/cli": "^7.3.2", + "@angular/compiler-cli": "^7.2.5", + "@angular/language-service": "^7.2.5", + "@types/jasmine": "^3.3.9", "@types/jasminewd2": "^2.0.6", - "@types/node": "^10.12.18", + "@types/node": "^11.9.4", "codelyzer": "^4.5.0", "jasmine-core": "^3.3.0", "jasmine-spec-reporter": "^4.2.1", - "karma": "^3.1.4", + "karma": "^4.0.0", "karma-chrome-launcher": "^2.2.0", - "karma-coverage-istanbul-reporter": "^2.0.4", + "karma-coverage-istanbul-reporter": "^2.0.5", "karma-jasmine": "^2.0.1", "karma-jasmine-html-reporter": "^1.4.0", "protractor": "^5.4.2", - "ts-node": "^7.0.1", + "ts-node": "^8.0.2", "tslint": "^5.12.1", "typescript": "~3.2.4" }, From b7dcfdb1c03b4019dce484f4e8322e2a8edc9da1 Mon Sep 17 00:00:00 2001 From: xidedix Date: Mon, 18 Feb 2019 17:24:51 +0100 Subject: [PATCH 2/4] refactor(_nav.ts): update interface NavData - future usage --- src/app/_nav.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/app/_nav.ts b/src/app/_nav.ts index 51125dbd9..74765952c 100644 --- a/src/app/_nav.ts +++ b/src/app/_nav.ts @@ -9,6 +9,8 @@ export interface NavData { attributes?: object; divider?: boolean; class?: string; + label?: any; + wrapper?: any; } export const navItems: NavData[] = [ From b2e95ed3f13982c086c487bd1c8e4683c5396a2a Mon Sep 17 00:00:00 2001 From: xidedix Date: Mon, 18 Feb 2019 17:26:11 +0100 Subject: [PATCH 3/4] refactor(default-layout): use `cui-breadcrumb` --- .../default-layout.component.html | 18 +++++++++++++++--- .../default-layout/default-layout.component.ts | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/app/containers/default-layout/default-layout.component.html b/src/app/containers/default-layout/default-layout.component.html index 571e474c4..3491573b3 100644 --- a/src/app/containers/default-layout/default-layout.component.html +++ b/src/app/containers/default-layout/default-layout.component.html @@ -55,8 +55,8 @@
-
    - + +
  1. @@ -65,7 +65,19 @@  Settings
    2. -
+ + + + + + + + + + + + +
diff --git a/src/app/containers/default-layout/default-layout.component.ts b/src/app/containers/default-layout/default-layout.component.ts index 349eb3776..f03ddcdc9 100644 --- a/src/app/containers/default-layout/default-layout.component.ts +++ b/src/app/containers/default-layout/default-layout.component.ts @@ -1,6 +1,6 @@ import { Component, OnDestroy, Inject } from '@angular/core'; import { DOCUMENT } from '@angular/common'; -import { navItems } from './../../_nav'; +import { navItems } from '../../_nav'; @Component({ From fce5b2397504abedfb70b1f356bf49c1eb484529 Mon Sep 17 00:00:00 2001 From: xidedix Date: Mon, 18 Feb 2019 18:35:09 +0100 Subject: [PATCH 4/4] Ship: v2.4.0 --- CHANGELOG.md | 30 +++++++++++ e2e/app.po.ts | 2 +- package.json | 4 +- .../views/dashboard/dashboard.component.html | 52 +++++++++---------- src/index.html | 2 +- src/polyfills.ts | 2 + 6 files changed, 62 insertions(+), 30 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 04e072ee5..4d1235817 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,35 @@ ## [angular](./README.md) version `changelog` +###### `v2.4.0` +- fix(sidebar): navItems reassignment bug #126, #42 +- refactor(default-layout): use `cui-breadcrumb` instead of deprecated `app-breadcrumb` (migrate when ready) +- fix(polyfills.ts): ie issues add `core-js/es7/array` and `core-js/es7/object` +- update: `@angular/animations` to `^7.2.5` +- update: `@angular/common` to `^7.2.5` +- update: `@angular/compiler` to `^7.2.5` +- update: `@angular/core` to `^7.2.5` +- update: `@angular/forms` to `^7.2.5` +- update: `@angular/http` to `^7.2.5` +- update: `@angular/platform-browser` to `^7.2.5` +- update: `@angular/platform-browser-dynamic` to `^7.2.5` +- update: `@angular/router` to `^7.2.5` +- update: `@coreui/angular` to `^2.4.1` +- update: `bootstrap` to `^4.3.1` +- update: `core-js` to `^2.6.5` +- update: `moment` to `^2.24.0` +- update: `ngx-bootstrap` to `^3.2.0` +- update: `rxjs` to `^6.4.0` +- update: `tsickle` to `^0.34.3` +- update: `zone.js` to `^0.8.29` +- update: `@angular-devkit/build-angular` to `^0.13.2` +- update: `@angular/cli` to `^7.3.2` +- update: `@angular/compiler-cli` to `^7.2.5` +- update: `@angular/language-service` to `^7.2.5` +- update: `@types/jasmine` to `^3.3.9` +- update: `@types/node` to `^10.12.26` +- update: `karma` to `^4.0.0` +- update: `karma-coverage-istanbul-reporter` to `^2.0.5` + ###### `v2.2.4` - refactor(colors): use 'DOCUMENT' of '@angular/common' - refactor(default-layout): use 'DOCUMENT' of '@angular/common' #133 - thanks @damingerdai diff --git a/e2e/app.po.ts b/e2e/app.po.ts index aea5a60d8..f13c79681 100644 --- a/e2e/app.po.ts +++ b/e2e/app.po.ts @@ -6,6 +6,6 @@ export class CoreUIPage { } getParagraphText() { - return element(by.tagName('footer')).getText(); + return element(by.className('app-footer')).getText(); } } diff --git a/package.json b/package.json index 9a35652aa..493a3c90f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@coreui/coreui-free-angular-admin-template", - "version": "2.2.4", + "version": "2.4.0", "description": "CoreUI Free Angular 2+ Admin Template", "author": { "name": "Łukasz Holeczek", @@ -36,7 +36,7 @@ "@angular/platform-browser": "^7.2.5", "@angular/platform-browser-dynamic": "^7.2.5", "@angular/router": "^7.2.5", - "@coreui/angular": "^2.4.0", + "@coreui/angular": "^2.4.1", "@coreui/coreui": "^2.1.6", "@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0", "@coreui/icons": "0.3.0", diff --git a/src/app/views/dashboard/dashboard.component.html b/src/app/views/dashboard/dashboard.component.html index 67cf66607..def79ec0b 100644 --- a/src/app/views/dashboard/dashboard.component.html +++ b/src/app/views/dashboard/dashboard.component.html @@ -1,5 +1,25 @@
+
+
+
+ +
9.823
+
Members online
+
+
+ +
+
+
@@ -19,32 +39,12 @@
-
-
-
-
-
-
- -
9.823
-
Members online
-
-
- + [datasets]="lineChart1Data" + [labels]="lineChart1Labels" + [options]="lineChart1Options" + [colors]="lineChart1Colours" + [legend]="lineChart1Legend" + [chartType]="lineChart1Type">
diff --git a/src/index.html b/src/index.html index 8376d9d29..8f7895ff5 100644 --- a/src/index.html +++ b/src/index.html @@ -1,6 +1,6 @@