Merge branch 'upgrade_angular_version'

Author: Blari

README.md

@@ -1,4 +1,4 @@
-# Light Blue Angular Dashboard - Ngx Admin Template (7.2.0 Full version) with Angular 11.2 Final Release support
+# Light Blue Angular Dashboard - Ngx Admin Template (7.2.2 Full version) with Angular 11.2 Final Release support
 
 This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 11.2.13.
 

angular.json

@@ -34,7 +34,6 @@
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
-              "extractCss": true,
               "namedChunks": false,
               "aot": true,
               "extractLicenses": true,

changelog.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## [7.2.2] - 05/18/2021
+### Fixed
+
+- Fixed error on serving project
+
+###Added packages
+    lodash.isequal: 4.5.0
+
+## [7.2.1] - 05/18/2021
+### Fixed
+
+- Fixed error on serving project
+- Added new package "resize-observer-polyfill"
+- Fixed redirect to login page 
+
+###Updated packages
+    @agm/core: 1.1.0 -> 3.0.0-beta.0
+    ng2-carouselamos: 3.2.0 -> 4.1.0
+
+###Added packages
+    @types/googlemaps: 3.39.12
 
 ## [7.2.0] - 05/14/2021
 ### Updated

package.json

@@ -1,6 +1,6 @@
 {
   "name": "light-blue",
-  "version": "7.2.0",
+  "version": "7.2.2",
   "description": "Light Blue - Angular 11 Dashboard",
   "scripts": {
     "analyze": "npm run build:stats && webpack-bundle-analyzer dist/stats.json --port 4201",
@@ -15,7 +15,7 @@
   },
   "private": true,
   "dependencies": {
-    "@agm/core": "1.1.0",
+    "@agm/core": "3.0.0-beta.0",
     "@amcharts/amcharts4": "4.10.18",
     "@amcharts/amcharts4-geodata": "4.1.20",
     "@angular-slider/ngx-slider": "^2.0.3",
@@ -53,10 +53,11 @@
     "highcharts": "9.1.0",
     "highcharts-angular": "2.10.0",
     "line-awesome": "1.3.0",
+    "lodash.isequal": "^4.5.0",
     "ng-apexcharts": "1.5.9",
     "ng-autosize": "1.1.0",
     "ng-wizard": "1.0.0",
-    "ng2-carouselamos": "3.2.0",
+    "ng2-carouselamos": "4.1.0",
     "ngx-bootstrap": "6.2.0",
     "ngx-chips": "2.2.2",
     "ngx-color-picker": "11.0.0",
@@ -88,6 +89,7 @@
     "@angularclass/hmr": "3.0.0",
     "@types/amcharts": "3.21.6",
     "@types/echarts": "4.9.7",
+    "@types/googlemaps": "3.39.12",
     "@types/node": "15.0.3",
     "@types/photoswipe": "4.1.1",
     "@types/sortablejs": "1.10.6",

src/app/layout/sidebar/sidebar.component.ts

@@ -1,4 +1,5 @@
 import { Component, ElementRef, OnInit, AfterViewInit, Renderer2 } from '@angular/core';
+import { LoginService } from '../../pages/login/login.service';
 
 @Component({
   selector: '[sidebar]',
@@ -24,7 +25,8 @@ export class Sidebar implements OnInit, AfterViewInit {
 
   constructor(
     private renderer: Renderer2,
-    private el: ElementRef
+    private el: ElementRef,
+    private loginService: LoginService
   ) {
   }
 
@@ -86,6 +88,10 @@ export class Sidebar implements OnInit, AfterViewInit {
     this.renderer.setStyle(document
       .querySelector('.content'), 'margin-top', this.sidebarHeight + 'px');
   }
+
+  logout() {
+    this.loginService.logoutUser();
+  }
 }
 
 export interface SidebarState {

src/app/layout/sidebar/sidebar.template.html

@@ -136,7 +136,7 @@ <h6 class="sidebar-nav-title">TEMPLATE</h6>
       [collapse]="sidebarState.extraCollapsed" [isAnimated]="true">
       <li [routerLinkActive]="['active']"><a routerLink="extra/calendar">Calendar</a></li>
       <li [routerLinkActive]="['active']"><a routerLink="extra/invoice">Invoice</a></li>
-      <li><a routerLink="/login">Login</a></li>
+      <li><a (click)="logout()">Login</a></li>
       <li><a routerLink="/error">Error Page</a></li>
       <li [routerLinkActive]="['active']"><a routerLink="extra/gallery">Gallery</a></li>
       <li [routerLinkActive]="['active']"><a routerLink="extra/search">Search</a></li>