Merge pull request #142 from coreui/dev-vnext

v2.4.3

Author: xidedix

CHANGELOG.md

@@ -1,5 +1,23 @@
 ## [angular](./README.md) version `changelog`
 
+###### `v2.4.3`
+- update: `@coreui/angular` to `^2.4.3`
+- update: `@coreui/coreui` to `^2.1.7`
+- update: `@angular/animations` to `^7.2.6`
+- update: `@angular/common` to `^7.2.6`
+- update: `@angular/compiler` to `^7.2.6`
+- update: `@angular/core` to `^7.2.6`
+- update: `@angular/forms` to `^7.2.6`
+- update: `@angular/http` to `^7.2.6`
+- update: `@angular/platform-browser` to `^7.2.6`
+- update: `@angular/platform-browser-dynamic` to `^7.2.6`
+- update: `@angular/router` to `^7.2.6`
+- update: `@angular-devkit/build-angular` to `^0.13.3`
+- update: `@angular/cli` to `^7.3.3`
+- update: `@angular/compiler-cli` to `^7.2.6`
+- update: `@angular/language-service` to `^7.2.6`
+- update: `ngx-perfect-scrollbar` to `^7.2.1`
+
 ###### `v2.4.0`
 - fix(sidebar): navItems reassignment bug #126, #42
 - refactor(default-layout): use `cui-breadcrumb` instead of deprecated `app-breadcrumb` (migrate when ready)

README.md

@@ -50,8 +50,7 @@ CoreUI is built on top of Bootstrap 4 and supports popular frameworks.
 
 | CoreUI Pro | Prime | Root | Alba | Leaf |
 | --- | --- | --- | --- | --- |
-| [![CoreUI Pro Admin Template](https://coreui.io/assets/img/example-coureui.jpg)](https://coreui.io/pro/angular/) | [![Prime Admin Template](https://genesisui.com/assets/img/templates/prime1280.jpg)](https://genesisui.com/admin-templates/angular/prime/?support=1) | [![Root Admin Template](https://genesisui.com/assets/img/templates/root1280.jpg)](https://genesisui.com/admin-templates/angular/root/?support=1) | [![Alba Admin Template](https://genesisui.com/assets/img/templates/alba1280.jpg)](https://genesisui.com/admin-templates/angular/alba/?support=1) | [![Leaf Admin Template](https://genesisui.com/assets/img/templates/leaf1280.jpg)](https://genesisui.com/admin-templates/angular/leaf/?support=1)
-
+| [![CoreUI Pro Admin Template](https://coreui.io/assets/img/example-coureui.jpg)](https://coreui.io/pro/angular/)| [![Prime Admin Template](https://coreui.io/assets/img/responsive-prime.png)](https://coreui.io/admin-templates/angular/prime/?support=1)| [![Root Admin Template](https://coreui.io/assets/img/responsive-root.png)](https://coreui.io/admin-templates/angular/root/?support=1)| [![Alba Admin Template](https://coreui.io/assets/img/responsive-alba.png)](https://coreui.io/admin-templates/angular/alba/?support=1)| [![Leaf Admin Template](https://coreui.io/assets/img/responsive-leaf.png)](https://coreui.io/admin-templates/angular/leaf/?support=1)
 ## Installation
 
 ### Clone repo

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coreui/coreui-free-angular-admin-template",
-  "version": "2.4.0",
+  "version": "2.4.3",
   "description": "CoreUI Free Angular 2+ Admin Template",
   "author": {
     "name": "Łukasz Holeczek",
@@ -27,17 +27,17 @@
   },
   "private": true,
   "dependencies": {
-    "@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.1",
-    "@coreui/coreui": "^2.1.6",
+    "@angular/animations": "^7.2.6",
+    "@angular/common": "^7.2.6",
+    "@angular/compiler": "^7.2.6",
+    "@angular/core": "^7.2.6",
+    "@angular/forms": "^7.2.6",
+    "@angular/http": "^7.2.6",
+    "@angular/platform-browser": "^7.2.6",
+    "@angular/platform-browser-dynamic": "^7.2.6",
+    "@angular/router": "^7.2.6",
+    "@coreui/angular": "^2.4.3",
+    "@coreui/coreui": "^2.1.7",
     "@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0",
     "@coreui/icons": "0.3.0",
     "bootstrap": "^4.3.1",
@@ -49,7 +49,7 @@
     "mutationobserver-shim": "^0.3.3",
     "ng2-charts": "^1.6.0",
     "ngx-bootstrap": "^3.2.0",
-    "ngx-perfect-scrollbar": "^7.2.0",
+    "ngx-perfect-scrollbar": "^7.2.1",
     "rxjs": "^6.4.0",
     "simple-line-icons": "^2.4.1",
     "ts-helpers": "^1.1.2",
@@ -58,10 +58,10 @@
     "zone.js": "^0.8.29"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.13.2",
-    "@angular/cli": "^7.3.2",
-    "@angular/compiler-cli": "^7.2.5",
-    "@angular/language-service": "^7.2.5",
+    "@angular-devkit/build-angular": "^0.13.3",
+    "@angular/cli": "^7.3.3",
+    "@angular/compiler-cli": "^7.2.6",
+    "@angular/language-service": "^7.2.6",
     "@types/jasmine": "^3.3.9",
     "@types/jasminewd2": "^2.0.6",
     "@types/node": "^11.9.4",

src/app/_nav.ts

@@ -1,16 +1,32 @@
+interface NavAttributes {
+  [propName: string]: any;
+}
+interface NavWrapper {
+  attributes: NavAttributes;
+  element: string;
+}
+interface NavBadge {
+  text: string;
+  variant: string;
+}
+interface NavLabel {
+  class?: string;
+  variant: string;
+}
+
 export interface NavData {
   name?: string;
   url?: string;
   icon?: string;
-  badge?: any;
+  badge?: NavBadge;
   title?: boolean;
-  children?: any;
+  children?: NavData[];
   variant?: string;
-  attributes?: object;
+  attributes?: NavAttributes;
   divider?: boolean;
   class?: string;
-  label?: any;
-  wrapper?: any;
+  label?: NavLabel;
+  wrapper?: NavWrapper;
 }
 
 export const navItems: NavData[] = [

src/app/containers/default-layout/default-layout.component.html

@@ -1,4 +1,5 @@
 <app-header
+  [navbarBrandRouterLink]="['/dashboard']"
   [fixed]="true"
   [navbarBrandFull]="{src: 'assets/img/brand/logo.svg', width: 89, height: 25, alt: 'CoreUI Logo'}"
   [navbarBrandMinimized]="{src: 'assets/img/brand/sygnet.svg', width: 30, height: 30, alt: 'CoreUI Logo'}"

src/app/views/dashboard/dashboard-routing.module.ts

@@ -1,6 +1,5 @@
 import { NgModule } from '@angular/core';
-import { Routes,
-     RouterModule } from '@angular/router';
+import { Routes, RouterModule } from '@angular/router';
 
 import { DashboardComponent } from './dashboard.component';
 

src/polyfills.ts

@@ -33,8 +33,8 @@ import 'core-js/es6/regexp';
 import 'core-js/es6/map';
 import 'core-js/es6/weak-map';
 import 'core-js/es6/set';
-import "core-js/es7/array";
-import "core-js/es7/object";
+import 'core-js/es7/array';
+import 'core-js/es7/object';
 
 /** IE10 and IE11 requires the following for NgClass support on SVG elements */
 // import 'classlist.js';  // Run `npm install --save classlist.js`.