Merge pull request #18 from creativetimofficial/feature/v1.4.0

Feature/v1.4.0

Author: rarestoma

.gitignore

@@ -32,6 +32,7 @@
 npm-debug.log
 testem.log
 /typings
+/.angular
 
 # e2e
 /e2e/*.js
@@ -40,3 +41,4 @@ testem.log
 # System Files
 .DS_Store
 Thumbs.db
+package-lock.json

CHANGELOG.md

@@ -1,3 +1,8 @@
+## [1.4.0] - 2022-05-06
+### Updates
+- update to Angular 13
+- update all dependencies to match Angular 13 version
+- routing issue fixed
 ## [1.3.0] - 2020-12-17
 ### Updates
 - update to Angular 11

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.3.0-blue.svg
+[version-badge]: https://img.shields.io/badge/version-1.4.0-blue.svg
 [license-badge]: https://img.shields.io/badge/license-MIT-blue.svg

angular.json

@@ -23,6 +23,7 @@
             ],
             "styles": [
               "node_modules/perfect-scrollbar/css/perfect-scrollbar.css",
+              "node_modules/bootstrap/dist/css/bootstrap.css",
               "node_modules/ngx-toastr/toastr.css",
               "src/assets/scss/now-ui-dashboard.scss",
               "src/assets/demo/demo.css"
@@ -36,9 +37,7 @@
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
-              "extractCss": true,
               "namedChunks": false,
-              "aot": true,
               "extractLicenses": true,
               "vendorChunk": false,
               "buildOptimizer": true,
@@ -48,6 +47,14 @@
                   "with": "src/environments/environment.prod.ts"
                 }
               ]
+            },
+            "development": {
+              "buildOptimizer": false,
+              "optimization": false,
+              "vendorChunk": true,
+              "extractLicenses": false,
+              "sourceMap": true,
+              "namedChunks": true
             }
           }
         },
@@ -59,7 +66,11 @@
           "configurations": {
             "production": {
               "browserTarget": "now-ui-dashboard-angular:build:production"
-            }
+            },
+            "development": {
+              "browserTarget": "now-ui-dashboard-angular:build:development"
+            },
+            "defaultConfiguration": "development"
           }
         },
         "extract-i18n": {

documentation/css/now-ui-dashboard.css

@@ -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.3.0" rel="stylesheet" />
+    <link href="./css/now-ui-dashboard.css?v=1.4.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.3.0</h3>
+          <h3 class="description">Documentation v1.4.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>

documentation/tutorial-components.html

@@ -1,6 +1,6 @@
 {
   "name": "now-ui-dashboard-angular",
-  "version": "1.2.0",
+  "version": "1.4.0",
   "license": "MIT",
   "scripts": {
     "ng": "ng",
@@ -13,18 +13,22 @@
   },
   "private": true,
   "dependencies": {
-    "@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": "^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",
+    "@adactive/bootstrap-tagsinput": "0.8.2",
+    "@angular/animations": "^13.2.6",
+    "@angular/cdk": "^13.2.6",
+    "@angular/common": "^13.2.6",
+    "@angular/compiler": "^13.2.6",
+    "@angular/core": "^13.2.6",
+    "@angular/elements": "^13.2.6",
+    "@angular/forms": "^13.2.6",
+    "@angular/google-maps": "^13.3.3",
+    "@angular/localize": "^13.2.6",
+    "@angular/material": "^13.2.6",
+    "@angular/platform-browser": "^13.2.6",
+    "@angular/platform-browser-dynamic": "^13.2.6",
+    "@angular/router": "^13.2.6",
+    "@ng-bootstrap/ng-bootstrap": "12.0.1",
+    "@popperjs/core": "^2.11.4",
     "ajv": "7.0.1",
     "ajv-keywords": "4.0.0",
     "bootstrap": "4.5.3",
@@ -43,33 +47,34 @@
     "perfect-scrollbar": "1.5.0",
     "popper.js": "1.16.1",
     "rellax": "1.12.1",
-    "rxjs": "6.6.3",
-    "tslib": "^2.0.3",
+    "rxjs": "^6.5.4",
+    "rxjs-compat": "6.6.7",
     "web-animations-js": "2.3.2",
-    "zone.js": "0.11.3"
+    "zone.js": "~0.11.5"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.1100.4",
-    "@angular/cli": "11.0.4",
-    "@angular/compiler-cli": "11.0.5",
-    "@angular/language-service": "11.0.5",
+    "@angular-devkit/build-angular": "^13.2.6",
+    "@angular/cli": "^13.2.6",
+    "@angular/compiler-cli": "^13.2.6",
+    "@angular/language-service": "13.2.6",
+    "@types/jasmine": "~3.10.3",
+    "@types/jasminewd2": "~2.0.10",
+    "@types/node": "^17.0.21",
+    "codelyzer": "6.0.2",
+    "jasmine-core": "~4.0.1",
+    "jasmine-spec-reporter": "~7.0.0",
+    "karma": "^6.3.17",
+    "karma-chrome-launcher": "~3.1.1",
+    "karma-coverage": "^2.2.0",
+    "karma-coverage-istanbul-reporter": "~3.0.3",
+    "karma-jasmine": "~4.0.1",
+    "karma-jasmine-html-reporter": "^1.7.0",
+    "protractor": "7.0.0",
+    "ts-node": "~10.7.0",
+    "typescript": "~4.4.2",
     "@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": "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"
+    "@types/jquery": "3.5.5"
   }
 }

package.json

@@ -16,7 +16,7 @@ const routes: Routes =[
     children: [
         {
       path: '',
-      loadChildren: './layouts/admin-layout/admin-layout.module#AdminLayoutModule'
+      loadChildren: () => import('./layouts/admin-layout/admin-layout.module').then(x=>x.AdminLayoutModule)
   }]},
   {
     path: '**',

src/app/app.routing.ts

@@ -1,7 +1,7 @@
 /*!
 
 =========================================================
-* Now UI Dashboard Angular - v1.3.0
+* Now UI Dashboard Angular - v1.4.0
 =========================================================
 
 * Product Page: https://www.creative-tim.com/product/now-ui-dashboard-angular

src/assets/demo/demo.css

@@ -1,7 +1,7 @@
 /*!
 
 =========================================================
-* Now UI Dashboard Angular - v1.3.0
+* Now UI Dashboard Angular - v1.4.0
 =========================================================
 
 * Product Page: https://www.creative-tim.com/product/now-ui-dashboard-angular
@@ -15,7 +15,7 @@
 * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
 */
- @import "~bootstrap/scss/bootstrap";
+//  @import "~bootstrap/scss/bootstrap";
  @import 'now-ui-dashboard/variables';
  @import 'now-ui-dashboard/mixins';