Merge pull request #17 from creativetimofficial/feature/v1.3.0

Feature/v1.3.0

Author: rarestoma

CHANGELOG.md

@@ -1,3 +1,8 @@
+## [1.3.0] - 2020-12-17
+### Updates
+- update to Angular 11
+- update all dependencies to match Angular 11 version
+
 ## [1.2.0] - 2020-03-13
 ### Updates
 - update to Angular 9

README.md

@@ -160,5 +160,5 @@ Instagram: <https://instagram.com/creativetimofficial>
 
 [CHANGELOG]: ./CHANGELOG.md
 [LICENSE]: ./LICENSE
-[version-badge]: https://img.shields.io/badge/version-1.2.0-blue.svg
+[version-badge]: https://img.shields.io/badge/version-1.3.0-blue.svg
 [license-badge]: https://img.shields.io/badge/license-MIT-blue.svg

angular.json

@@ -16,6 +16,7 @@
             "main": "src/main.ts",
             "tsConfig": "src/tsconfig.app.json",
             "polyfills": "src/polyfills.ts",
+            "allowedCommonJsDependencies": ["hammerjs", "chart.js"],
             "assets": [
               "src/assets",
               "src/favicon.ico"
@@ -138,4 +139,4 @@
   "cli": {
     "analytics": false
   }
-}
+}

documentation/tutorial-components.html

@@ -14,7 +14,7 @@
     <link href="https://use.fontawesome.com/releases/v5.0.6/css/all.css" rel="stylesheet">
     <!-- CSS Files -->
     <link href="./css/bootstrap.min.css" rel="stylesheet" />
-    <link href="./css/now-ui-dashboard.css?v=1.2.0" rel="stylesheet" />
+    <link href="./css/now-ui-dashboard.css?v=1.3.0" rel="stylesheet" />
     <!-- CSS Just for demo purpose, don't include it in your project -->
     <link href="./css/demo.css" rel="stylesheet" />
 </head>
@@ -58,7 +58,7 @@
           <h1 class="title">
             Now UI Dashboard Angular
           </h1>
-          <h3 class="description">Documentation v1.2.0</h3>
+          <h3 class="description">Documentation v1.3.0</h3>
           <br/>
           <a href="https://creativetimofficial.github.io/now-ui-dashboard-angular/documentation/tutorial" class="btn btn-primary btn-round btn-lg">View documentation</a>
         </div>

package.json

@@ -13,63 +13,63 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "9.0.6",
-    "@angular/common": "9.0.6",
-    "@angular/compiler": "9.0.6",
-    "@angular/core": "9.0.6",
-    "@angular/forms": "9.0.6",
+    "@angular/animations": "11.0.5",
+    "@angular/common": "11.0.5",
+    "@angular/compiler": "11.0.5",
+    "@angular/core": "11.0.5",
+    "@angular/forms": "11.0.5",
     "@angular/http": "7.2.16",
-    "@angular/localize": "^9.0.6",
-    "@angular/platform-browser": "9.0.6",
-    "@angular/platform-browser-dynamic": "9.0.6",
-    "@angular/platform-server": "9.0.6",
-    "@angular/router": "9.0.6",
-    "@ng-bootstrap/ng-bootstrap": "6.0.0",
-    "ajv": "6.12.0",
-    "ajv-keywords": "3.4.1",
-    "bootstrap": "4.2.1",
-    "chart.js": "2.7.3",
-    "chartist": "0.11.0",
+    "@angular/localize": "^11.0.5",
+    "@angular/platform-browser": "11.0.5",
+    "@angular/platform-browser-dynamic": "11.0.5",
+    "@angular/platform-server": "11.0.5",
+    "@angular/router": "11.0.5",
+    "@ng-bootstrap/ng-bootstrap": "8.0.0",
+    "ajv": "7.0.1",
+    "ajv-keywords": "4.0.0",
+    "bootstrap": "4.5.3",
+    "chart.js": "2.9.4",
+    "chartist": "0.11.4",
     "classlist.js": "1.1.20150312",
-    "copy-webpack-plugin": "4.6.0",
-    "core-js": "3.6.4",
+    "copy-webpack-plugin": "7.0.0",
+    "core-js": "3.8.1",
     "font-awesome": "4.7.0",
     "hammerjs": "2.0.8",
-    "jquery": "3.3.1",
-    "jw-bootstrap-switch-ng2": "2.0.4",
-    "ng2-charts": "1.6.0",
-    "ngx-toastr": "12.0.0",
-    "nouislider": "12.1.0",
-    "perfect-scrollbar": "1.4.0",
-    "popper.js": "1.14.6",
-    "rellax": "1.7.2",
-    "rxjs": "6.3.3",
-    "tslib": "^1.11.1",
-    "web-animations-js": "2.3.1",
-    "zone.js": "0.8.27"
+    "jquery": "3.5.1",
+    "jw-bootstrap-switch-ng2": "2.0.5",
+    "ng2-charts": "2.4.2",
+    "ngx-toastr": "13.2.0",
+    "nouislider": "14.6.3",
+    "perfect-scrollbar": "1.5.0",
+    "popper.js": "1.16.1",
+    "rellax": "1.12.1",
+    "rxjs": "6.6.3",
+    "tslib": "^2.0.3",
+    "web-animations-js": "2.3.2",
+    "zone.js": "0.11.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.900.6",
-    "@angular/cli": "9.0.6",
-    "@angular/compiler-cli": "9.0.6",
-    "@angular/language-service": "9.0.6",
-    "@types/bootstrap": "4.2.1",
-    "@types/chartist": "0.9.43",
-    "@types/googlemaps": "3.30.16",
-    "@types/jasmine": "3.3.5",
-    "@types/jquery": "3.3.29",
-    "@types/node": "13.9.1",
-    "codelyzer": "5.2.1",
-    "jasmine-core": "3.5.0",
-    "jasmine-spec-reporter": "4.2.1",
-    "karma": "4.4.1",
+    "@angular-devkit/build-angular": "~0.1100.4",
+    "@angular/cli": "11.0.4",
+    "@angular/compiler-cli": "11.0.5",
+    "@angular/language-service": "11.0.5",
+    "@types/bootstrap": "5.0.1",
+    "@types/chartist": "0.11.0",
+    "@types/googlemaps": "3.40.5",
+    "@types/jasmine": "3.6.2",
+    "@types/jquery": "3.5.5",
+    "@types/node": "14.14.14",
+    "codelyzer": "6.0.1",
+    "jasmine-core": "3.6.0",
+    "jasmine-spec-reporter": "6.0.0",
+    "karma": "5.2.3",
     "karma-chrome-launcher": "3.1.0",
     "karma-cli": "2.0.0",
-    "karma-coverage-istanbul-reporter": "2.1.1",
-    "karma-jasmine": "3.1.1",
-    "protractor": "5.4.3",
-    "ts-node": "7.0.1",
-    "tslint": "5.12.1",
-    "typescript": "3.7.5"
+    "karma-coverage-istanbul-reporter": "3.0.3",
+    "karma-jasmine": "4.0.1",
+    "protractor": "7.0.0",
+    "ts-node": "9.1.1",
+    "tslint": "6.1.3",
+    "typescript": "4.0.3"
   }
 }

src/app/dashboard/dashboard.component.ts

@@ -230,6 +230,9 @@ export class DashboardComponent implements OnInit {
           gridLines: {
             zeroLineColor: "transparent",
             drawBorder: false
+          },
+          ticks: {
+              stepSize: 500
           }
         }],
         xAxes: [{
@@ -379,6 +382,9 @@ export class DashboardComponent implements OnInit {
             gridLines: {
               zeroLineColor: "transparent",
               drawBorder: false
+            },
+            ticks: {
+                stepSize: 20
             }
           }],
           xAxes: [{

src/app/layouts/admin-layout/admin-layout.module.ts

@@ -10,7 +10,7 @@ import { TypographyComponent } from '../../typography/typography.component';
 import { IconsComponent } from '../../icons/icons.component';
 import { MapsComponent } from '../../maps/maps.component';
 import { NotificationsComponent } from '../../notifications/notifications.component';
-import { ChartsModule } from 'ng2-charts/ng2-charts';
+import { ChartsModule } from 'ng2-charts';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { ToastrModule } from 'ngx-toastr';
 import { UpgradeComponent } from '../../upgrade/upgrade.component';

src/assets/demo/demo.css

@@ -1,11 +1,11 @@
 /*!
 
 =========================================================
-* Now UI Dashboard Angular - v1.1.0
+* Now UI Dashboard Angular - v1.3.0
 =========================================================
 
 * Product Page: https://www.creative-tim.com/product/now-ui-dashboard-angular
-* Copyright 2019 Creative Tim (https://www.creative-tim.com)
+* Copyright 2020 Creative Tim (https://www.creative-tim.com)
 * Licensed under MIT (https://github.com/creativetimofficial/now-ui-dashboard-angular/blob/master/LICENSE.md)
 
 * Coded by Creative Tim

src/assets/scss/now-ui-dashboard.scss

@@ -1,11 +1,11 @@
 /*!
 
 =========================================================
-* Now UI Dashboard Angular - v1.1.0
+* Now UI Dashboard Angular - v1.3.0
 =========================================================
 
 * Product Page: https://www.creative-tim.com/product/now-ui-dashboard-angular
-* Copyright 2019 Creative Tim (https://www.creative-tim.com)
+* Copyright 2020 Creative Tim (https://www.creative-tim.com)
 * Licensed under MIT (https://github.com/creativetimofficial/now-ui-dashboard-angular/blob/master/LICENSE.md)
 
 * Coded by Creative Tim

src/assets/scss/now-ui-dashboard/_inputs.scss

@@ -7,6 +7,7 @@
     color: $black-color;
     line-height: normal;
     font-size: $font-size-small;
+    height: auto;
     @include transition-input-focus-color();
     @include box-shadow(none);
 
@@ -193,7 +194,7 @@
     & i{
       opacity: .5;
     }
-    
+
     @include transition-input-focus-color();
 
     .has-danger.input-group-focus &{