Merge pull request #99 from creativetimofficial/feature/v2.5.0

Feature/v2.5.0

Author: rarestoma

CHANGELOG.md

@@ -1,3 +1,9 @@
+## [2.5.0] - 2020-10-07
+### Updates
+- update to Angular 10
+- update all dependencies to match Angular 10 version
+
+
 ## [2.4.0] - 2020-03-05
 ### Updates
 - update to Angular 9

README.md

@@ -245,4 +245,4 @@ Instagram: <https://www.instagram.com/CreativeTimOfficial>
 
 [CHANGELOG]: ./CHANGELOG.md
 
-[version-badge]: https://img.shields.io/badge/version-2.4.0-blue.svg
+[version-badge]: https://img.shields.io/badge/version-2.5.0-blue.svg

angular.json

@@ -34,6 +34,11 @@
               "node_modules/perfect-scrollbar/dist/perfect-scrollbar.min.js",
               "node_modules/bootstrap-notify/bootstrap-notify.js",
               "node_modules/chartist/dist/chartist.js"
+            ],
+            "allowedCommonJsDependencies" : [
+              "rxjs/add/operator/filter",
+              "jquery",
+              "chartist"
             ]
           },
           "configurations": {
@@ -150,4 +155,4 @@
   "cli": {
     "analytics": false
   }
-}
+}

documentation/tutorial-components.html

@@ -110,7 +110,7 @@
           <h1>Material Dashboard Angular
           </h1>
 
-          <h3 class="title">Documentation v2.4.0</h3>
+          <h3 class="title">Documentation v2.5.0</h3>
           <br/>
           <a href="https://demos.creative-tim.com/material-dashboard-angular2/documentation/tutorial" class="btn btn-white btn-round">View documentation</a>
         </div>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "material-dashboard-angular",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "license": "MIT",
   "scripts": {
     "ng": "ng",
@@ -17,62 +17,62 @@
   },
   "private": true,
   "dependencies": {
-    "@agm/core": "1.1.0",
-    "@angular/animations": "9.0.5",
-    "@angular/cdk": "9.1.1",
-    "@angular/common": "9.0.5",
-    "@angular/compiler": "9.0.5",
-    "@angular/core": "9.0.5",
-    "@angular/forms": "9.0.5",
-    "@angular/http": "7.2.16",
-    "@angular/material": "9.1.1",
-    "@angular/platform-browser": "9.0.5",
-    "@angular/platform-browser-dynamic": "9.0.5",
-    "@angular/platform-server": "9.0.5",
-    "@angular/router": "9.0.5",
-    "ajv": "6.12.0",
+    "@agm/core": "^1.1.0",
+    "@angular/animations": "10.1.4",
+    "@angular/cdk": "10.2.4",
+    "@angular/common": "10.1.4",
+    "@angular/compiler": "10.1.4",
+    "@angular/core": "10.1.4",
+    "@angular/forms": "10.1.4",
+    "@angular/material": "10.2.4",
+    "@angular/platform-browser": "10.1.4",
+    "@angular/platform-browser-dynamic": "10.1.4",
+    "@angular/platform-server": "10.1.4",
+    "@angular/router": "10.1.4",
+    "ajv": "6.12.5",
     "arrive": "2.4.1",
-    "bootstrap": "4.3.1",
-    "bootstrap-material-design": "4.1.2",
+    "bootstrap": "4.5.2",
+    "bootstrap-material-design": "4.1.3",
     "bootstrap-notify": "3.1.3",
-    "chartist": "0.11.2",
+    "chartist": "0.11.4",
     "classlist.js": "1.1.20150312",
-    "core-js": "3.1.3",
+    "core-js": "3.6.5",
+    "eslint": "^7.10.0",
     "express": "4.17.1",
-    "googleapis": "40.0.0",
+    "googleapis": "61.0.0",
     "hammerjs": "2.0.8",
-    "jquery": "3.4.1",
-    "moment": "2.24.0",
-    "perfect-scrollbar": "1.1.0",
-    "popper.js": "1.15.0",
-    "rxjs": "6.5.2",
-    "rxjs-compat": "6.5.2",
-    "web-animations-js": "2.3.1",
-    "zone.js": "0.10.2"
+    "jquery": "3.5.1",
+    "moment": "2.29.1",
+    "perfect-scrollbar": "1.5.0",
+    "popper.js": "1.16.1",
+    "rxjs": "6.6.3",
+    "rxjs-compat": "6.6.3",
+    "web-animations-js": "2.3.2",
+    "zone.js": "0.11.1"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "0.900.5",
-    "@angular/cli": "9.0.5",
-    "@angular/compiler-cli": "9.0.5",
-    "@angular/language-service": "9.0.5",
-    "@types/bootstrap": "4.3.0",
-    "@types/chartist": "0.9.46",
-    "@types/googlemaps": "3.36.4",
-    "@types/jasmine": "3.3.13",
-    "@types/jquery": "3.3.29",
-    "@types/node": "12.0.7",
-    "codelyzer": "5.2.1",
-    "jasmine-core": "3.5.0",
-    "jasmine-spec-reporter": "4.2.1",
-    "karma": "4.4.1",
+    "@angular-devkit/build-angular": "0.1001.4",
+    "@angular/cli": "10.1.4",
+    "@angular/compiler-cli": "10.1.4",
+    "@angular/language-service": "10.1.4",
+    "@types/bootstrap": "4.5.0",
+    "@types/chartist": "0.11.0",
+    "@types/googlemaps": "3.39.14",
+    "@types/jasmine": "3.5.14",
+    "@types/jquery": "3.5.2",
+    "@types/node": "14.11.5",
+    "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",
-    "karma-jasmine-html-reporter": "1.5.2",
-    "protractor": "5.4.3",
-    "ts-node": "8.6.2",
-    "tslint": "6.0.0",
-    "typescript": "3.7.5"
+    "karma-coverage-istanbul-reporter": "3.0.3",
+    "karma-jasmine": "4.0.1",
+    "karma-jasmine-html-reporter": "1.5.4",
+    "protractor": "7.0.0",
+    "ts-node": "9.0.0",
+    "tslint": "6.1.3",
+    "typescript": "4.0.3"
   }
 }

src/app/app.module.ts

@@ -1,7 +1,7 @@
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { HttpModule } from '@angular/http';
+import { HttpClientModule } from '@angular/common/http';
 import { RouterModule } from '@angular/router';
 
 
@@ -28,7 +28,7 @@ import { AdminLayoutComponent } from './layouts/admin-layout/admin-layout.compon
     BrowserAnimationsModule,
     FormsModule,
     ReactiveFormsModule,
-    HttpModule,
+    HttpClientModule,
     ComponentsModule,
     RouterModule,
     AppRoutingModule,

src/assets/scss/material-dashboard.scss

@@ -1,7 +1,7 @@
 /*!
 
 =========================================================
-* Material Dashboard Angular - v2.4.0
+* Material Dashboard Angular - v2.5.0
 =========================================================
 
 * Product Page: https://www.creative-tim.com/product/material-dashboard-angular2

src/index.html

@@ -1,7 +1,7 @@
 <!--
 
 =========================================================
-* Material Dashboard Angular - v2.4.0
+* Material Dashboard Angular - v2.5.0
 =========================================================
 
 * Product Page: https://www.creative-tim.com/product/material-dashboard-angular2