Merge branch 'master' into skeleton

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fuse",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "license": "https://themeforest.net/licenses/terms/regular",
   "scripts": {
     "ng": "ng",
@@ -20,39 +20,39 @@
   "dependencies": {
     "@agm/core": "1.0.0-beta.2",
     "@angular/animations": "6.0.0",
-    "@angular/cdk": "6.0.0",
+    "@angular/cdk": "6.0.1",
     "@angular/common": "6.0.0",
     "@angular/compiler": "6.0.0",
     "@angular/core": "6.0.0",
     "@angular/flex-layout": "6.0.0-beta.15",
     "@angular/forms": "6.0.0",
     "@angular/http": "6.0.0",
-    "@angular/material": "6.0.0",
+    "@angular/material": "6.0.1",
-    "@angular/material-moment-adapter": "6.0.0",
+    "@angular/material-moment-adapter": "6.0.1",
     "@angular/platform-browser": "6.0.0",
     "@angular/platform-browser-dynamic": "6.0.0",
     "@angular/router": "6.0.0",
-    "@ngrx/effects": "5.2.0",
+    "@ngrx/effects": "6.0.0-beta.1",
-    "@ngrx/router-store": "5.2.0",
+    "@ngrx/router-store": "6.0.0-beta.1",
-    "@ngrx/store": "5.2.0",
+    "@ngrx/store": "6.0.0-beta.1",
-    "@ngrx/store-devtools": "5.2.0",
+    "@ngrx/store-devtools": "6.0.0-beta.1",
     "@ngx-translate/core": "10.0.1",
-    "@swimlane/ngx-charts": "7.3.0",
+    "@swimlane/ngx-charts": "8.0.0",
-    "@swimlane/ngx-datatable": "11.3.2",
+    "@swimlane/ngx-datatable": "12.0.0",
-    "@swimlane/ngx-dnd": "3.2.0",
+    "@swimlane/ngx-dnd": "4.0.0",
     "@types/prismjs": "1.9.0",
     "angular-calendar": "0.24.0",
     "angular-in-memory-web-api": "0.6.0",
     "chart.js": "2.7.2",
     "classlist.js": "1.1.20150312",
-    "core-js": "2.5.5",
+    "core-js": "2.5.6",
-    "d3": "5.1.0",
+    "d3": "5.2.0",
     "hammerjs": "2.0.8",
     "lodash": "4.17.10",
     "moment": "2.22.1",
     "ng2-charts": "1.6.0",
     "ngrx-store-freeze": "0.2.2",
-    "ngx-color-picker": "5.3.8",
+    "ngx-color-picker": "6.0.0",
     "ngx-cookie-service": "1.0.10",
     "perfect-scrollbar": "1.3.0",
     "prismjs": "1.14.0",

src/@fuse/components/countdown/countdown.component.ts

@@ -1,6 +1,7 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
+
-import 'rxjs/add/observable/interval';
+import { interval } from 'rxjs';
+import { map } from 'rxjs/operators';
 
 import * as moment from 'moment';
 
@@ -31,22 +32,21 @@ export class FuseCountdownComponent implements OnInit
 
         let diff = eventDate.diff(currDate, 'seconds');
 
-        const countDown =
+        const countDown = interval(1000).pipe(
-                  Observable
+            map(value => {
-                      .interval(1000)
+                return diff = diff - 1;
-                      .map(value => {
+            }),
-                          return diff = diff - 1;
+            map(value => {
-                      })
+                const timeLeft = moment.duration(value, 'seconds');
-                      .map(value => {
-                          const timeLeft = moment.duration(value, 'seconds');
 
-                          return {
+                return {
-                              days   : timeLeft.asDays().toFixed(0),
+                    days   : timeLeft.asDays().toFixed(0),
-                              hours  : timeLeft.hours(),
+                    hours  : timeLeft.hours(),
-                              minutes: timeLeft.minutes(),
+                    minutes: timeLeft.minutes(),
-                              seconds: timeLeft.seconds()
+                    seconds: timeLeft.seconds()
-                          };
+                };
-                      });
+            })
+        );
 
         countDown.subscribe(value => {
             this.countdown = value;

src/@fuse/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.ts

@@ -1,7 +1,8 @@
 import { Component, HostBinding, HostListener, Input, OnDestroy } from '@angular/core';
+import { Subscription } from 'rxjs';
+
 import { fuseAnimations } from '../../../../animations/index';
 import { FuseConfigService } from '../../../../services/config.service';
-import { Subscription } from 'rxjs/Subscription';
 
 @Component({
     selector   : 'fuse-nav-horizontal-collapse',

src/@fuse/components/navigation/navigation.service.ts

@@ -1,5 +1,5 @@
-import { EventEmitter, Injectable } from '@angular/core';
+import { Injectable } from '@angular/core';
-import { Subject } from 'rxjs/Subject';
+import { Subject } from 'rxjs';
 
 @Injectable()
 export class FuseNavigationService

src/@fuse/components/search-bar/search-bar.component.ts

@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Output } from '@angular/core';
-import { Subscription } from 'rxjs/Subscription';
+import { Subscription } from 'rxjs';
 
 import { FuseConfigService } from '@fuse/services/config.service';
 

src/@fuse/components/shortcuts/shortcuts.component.ts

@@ -1,6 +1,7 @@
 import { Component, ElementRef, Input, OnDestroy, OnInit, Renderer2, ViewChild } from '@angular/core';
-import { Subscription } from 'rxjs/Subscription';
 import { ObservableMedia } from '@angular/flex-layout';
+
+import { Subscription } from 'rxjs';
 import { CookieService } from 'ngx-cookie-service';
 
 import { FuseMatchMediaService } from '@fuse/services/match-media.service';

src/@fuse/components/sidebar/sidebar.component.ts

@@ -1,7 +1,7 @@
 import { Component, ElementRef, HostBinding, HostListener, Input, OnDestroy, OnInit, Renderer2, ViewEncapsulation } from '@angular/core';
 import { animate, AnimationBuilder, AnimationPlayer, style } from '@angular/animations';
 import { ObservableMedia } from '@angular/flex-layout';
-import { Subscription } from 'rxjs/Subscription';
+import { Subscription } from 'rxjs';
 
 import { FuseSidebarService } from './sidebar.service';
 import { FuseMatchMediaService } from '@fuse/services/match-media.service';

src/@fuse/components/theme-options/theme-options.component.ts

@@ -1,6 +1,6 @@
 import { Component, ElementRef, HostBinding, Input, OnDestroy, OnInit, Renderer2, ViewChild } from '@angular/core';
 import { style, animate, AnimationBuilder, AnimationPlayer } from '@angular/animations';
-import { Subscription } from 'rxjs/Subscription';
+import { Subscription } from 'rxjs';
 
 import { fuseAnimations } from '@fuse/animations';
 import { FuseConfigService } from '@fuse/services/config.service';

src/@fuse/directives/fuse-mat-sidenav/fuse-mat-sidenav.directive.ts

@@ -1,7 +1,7 @@
 import { Directive, Input, OnInit, HostListener, OnDestroy, HostBinding } from '@angular/core';
 import { MatSidenav } from '@angular/material';
 import { ObservableMedia } from '@angular/flex-layout';
-import { Subscription } from 'rxjs/Subscription';
+import { Subscription } from 'rxjs';
 
 import { FuseMatchMediaService } from '@fuse/services/match-media.service';
 import { FuseMatSidenavHelperService } from '@fuse/directives/fuse-mat-sidenav/fuse-mat-sidenav.service';

src/@fuse/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive.ts

@@ -1,6 +1,6 @@
 import { AfterViewInit, Directive, ElementRef, HostListener, OnDestroy, OnInit } from '@angular/core';
 import { Platform } from '@angular/cdk/platform';
-import { Subscription } from 'rxjs/Subscription';
+import { Subscription } from 'rxjs';
 
 import PerfectScrollbar from 'perfect-scrollbar';
 

src/@fuse/services/config.service.ts

@@ -1,7 +1,8 @@
 import { Inject, Injectable, InjectionToken } from '@angular/core';
 import { NavigationEnd, NavigationStart, Router } from '@angular/router';
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
 import { Platform } from '@angular/cdk/platform';
+import { BehaviorSubject } from 'rxjs';
+
 import * as _ from 'lodash';
 
 // Create the injection token for the custom config

src/@fuse/services/match-media.service.ts

@@ -1,6 +1,6 @@
 import { MediaChange, ObservableMedia } from '@angular/flex-layout';
 import { Injectable } from '@angular/core';
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
+import { BehaviorSubject } from 'rxjs';
 
 @Injectable()
 export class FuseMatchMediaService

src/app/main/content/content.component.ts

@@ -1,9 +1,8 @@
 import { Component, HostBinding, OnDestroy } from '@angular/core';
 import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
 
-import { Subscription } from 'rxjs/Subscription';
+import { Subscription } from 'rxjs';
-import 'rxjs/add/operator/filter';
+import { filter, map } from 'rxjs/operators';
-import 'rxjs/add/operator/map';
 
 import { fuseAnimations } from '@fuse/animations/index';
 import { FuseConfigService } from '@fuse/services/config.service';
@@ -31,29 +30,29 @@ export class FuseContentComponent implements OnDestroy
         private fuseConfig: FuseConfigService
     )
     {
-        this.router.events
+        this.router.events.pipe(
-            .filter((event) => event instanceof NavigationEnd)
+            filter((event) => event instanceof NavigationEnd),
-            .map(() => this.activatedRoute)
+            map(() => this.activatedRoute)
-            .subscribe((event) => {
+        ).subscribe((event) => {
-                switch ( this.fuseSettings.routerAnimation )
+            switch ( this.fuseSettings.routerAnimation )
-                {
+            {
-                    case 'fadeIn':
+                case 'fadeIn':
-                        this.routeAnimationFade = !this.routeAnimationFade;
+                    this.routeAnimationFade = !this.routeAnimationFade;
-                        break;
+                    break;
-                    case 'slideUp':
+                case 'slideUp':
-                        this.routeAnimationUp = !this.routeAnimationUp;
+                    this.routeAnimationUp = !this.routeAnimationUp;
-                        break;
+                    break;
-                    case 'slideDown':
+                case 'slideDown':
-                        this.routeAnimationDown = !this.routeAnimationDown;
+                    this.routeAnimationDown = !this.routeAnimationDown;
-                        break;
+                    break;
-                    case 'slideRight':
+                case 'slideRight':
-                        this.routeAnimationRight = !this.routeAnimationRight;
+                    this.routeAnimationRight = !this.routeAnimationRight;
-                        break;
+                    break;
-                    case 'slideLeft':
+                case 'slideLeft':
-                        this.routeAnimationLeft = !this.routeAnimationLeft;
+                    this.routeAnimationLeft = !this.routeAnimationLeft;
-                        break;
+                    break;
-                }
+            }
-            });
+        });
 
         this.onConfigChanged =
             this.fuseConfig.onConfigChanged

src/app/main/main.component.ts

@@ -1,7 +1,7 @@
 import { Component, ElementRef, HostBinding, Inject, OnDestroy, Renderer2, ViewEncapsulation } from '@angular/core';
 import { DOCUMENT } from '@angular/common';
 import { Platform } from '@angular/cdk/platform';
-import { Subscription } from 'rxjs/Subscription';
+import { Subscription } from 'rxjs';
 
 import { FuseConfigService } from '@fuse/services/config.service';
 

src/app/main/navbar/navbar.component.ts

@@ -1,6 +1,7 @@
 import { Component, Input, OnDestroy, OnInit, ViewChild, ViewEncapsulation } from '@angular/core';
 import { NavigationEnd, Router } from '@angular/router';
-import { Subscription } from 'rxjs/Subscription';
+
+import { Subscription } from 'rxjs';
 
 import { FusePerfectScrollbarDirective } from '@fuse/directives/fuse-perfect-scrollbar/fuse-perfect-scrollbar.directive';
 import { FuseSidebarService } from '@fuse/components/sidebar/sidebar.service';