Merge branch 'upgrade-to-ng9-nebular5' into feat/material-theme

package-lock.json

@@ -4,6 +4,11 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@akveo/ng2-completer": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/@akveo/ng2-completer/-/ng2-completer-9.0.1.tgz",
+      "integrity": "sha512-iACL0heOUmGV1GBKD3srwBJMFLZykld1MiTDvmbgEEXMhavp0UA45GdNsv7BBKI9XauuFKpOqHLlC+fT6DLGAQ=="
+    },
     "@angular-devkit/architect": {
       "version": "0.900.4",
       "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.900.4.tgz",
@@ -363,9 +368,9 @@
       "integrity": "sha512-zTCgrIAA9FYPMbqqpQnoNltiLR58q0FMfzP2t96q/1tjyVy/Y/IaNgVQ7eL0HeQ0nG6IAzQ1HVx8Xeneg4Yj5Q=="
     },
     "@angular/cdk": {
-      "version": "9.1.0",
+      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-9.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-9.1.2.tgz",
-      "integrity": "sha512-qKpAudJx9z0MD+ADptS0OZViJBTA49+JCKym0hPQUkcB9Po4Al6gu6oZ1VSXV5Ln3T84z9aAw/AhUGP/YCFNSQ==",
+      "integrity": "sha512-x5niyE0iYrbVtLYjJFw2MoS+OoSbJn6y/G2pNScviDwyjBBgqRh4YgUox2kMhdPumkvuh+eA6blZoE9qpvSo2w==",
       "requires": {
         "parse5": "^5.0.0"
       },
@@ -1959,24 +1964,24 @@
       "dev": true
     },
     "@nebular/auth": {
-      "version": "5.0.0-beta.8",
+      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@nebular/auth/-/auth-5.0.0-beta.8.tgz",
+      "resolved": "https://registry.npmjs.org/@nebular/auth/-/auth-5.0.0.tgz",
-      "integrity": "sha512-1QiCB14VOLrgkIGXdEOKlJYUjMrZY96RUhNWru9HBxYOC4MPLOdnDo58cnhsvHxP+ys1l/gYR+WlLvIOhuf6bA=="
+      "integrity": "sha512-oD8XP8hqgjvKRE90Qrixb2n2qbYpkwUnpiqOHcLvDN7i+MVGpr8aZOogidTGZi+BkBlG7P6fAkPFjlhAmXlxzg=="
     },
     "@nebular/eva-icons": {
-      "version": "5.0.0-beta.8",
+      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@nebular/eva-icons/-/eva-icons-5.0.0-beta.8.tgz",
+      "resolved": "https://registry.npmjs.org/@nebular/eva-icons/-/eva-icons-5.0.0.tgz",
-      "integrity": "sha512-TABPqTbL5EBQ77ofm6TLC3VUQaqnKKDen3IzVUJdErlXbxAKOUCrjWYJd+RZO3XYUzmYDZRBNgvbpkuY6pYwUg=="
+      "integrity": "sha512-1kCsQlfEJiNAfd3VxmhZUdk86FHSiNTkKtIvpyA72KKbyiBb4YTqOj3QDsTY9GLScyCxTJZcYF5Dp7KG2DSTUg=="
     },
     "@nebular/security": {
-      "version": "5.0.0-beta.8",
+      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@nebular/security/-/security-5.0.0-beta.8.tgz",
+      "resolved": "https://registry.npmjs.org/@nebular/security/-/security-5.0.0.tgz",
-      "integrity": "sha512-Hf53WbbPLT5jhQJkoLN8kpLHS2s7X7joO2ioEdpDvTYTesiFd9nBTDj4JLMwo9jIpMY8L3MQrjF8X5UMp+Mojw=="
+      "integrity": "sha512-tF1e+JoYCcyLynBUlkyfJRRzd6JZytxZt1Fh74AYe1l+LrVaKbHiKWJuieEW3s4S/n4dVrA3KqZG7HIyzTLCjA=="
     },
     "@nebular/theme": {
-      "version": "5.0.0-beta.8",
+      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@nebular/theme/-/theme-5.0.0-beta.8.tgz",
+      "resolved": "https://registry.npmjs.org/@nebular/theme/-/theme-5.0.0.tgz",
-      "integrity": "sha512-tOQgVNJUCUu+9im2Kq0t+6DDaxeKTpgo7knc6VeNhdqY8uRV4ozyVGuWBpzCWj0v3x8AYVti7lLrggu6/GBN6A==",
+      "integrity": "sha512-xSYyRyuvgT/UPQePB4br6lZtqjTupC2M+QUdLzuezwjeYwWvQw8q+04DQJK+JT+YI2s+LRkkwPsk8b716Ubhfg==",
       "requires": {
         "intersection-observer": "0.7.0"
       }
@@ -2576,11 +2581,6 @@
         "chart.js": "^2.3.0"
       }
     },
-    "angular2-toaster": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/angular2-toaster/-/angular2-toaster-7.0.0.tgz",
-      "integrity": "sha512-+nKyzg7X9r9knVghyURR63eXpbvErd/Hm7c7rx/v4gfqI7jNAkWHxO1tikVKEQFoD+au6Fu54LOGhEmXb0ECxg=="
-    },
     "ansi-colors": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
@@ -6942,9 +6942,9 @@
       "dev": true
     },
     "eva-icons": {
-      "version": "1.1.0",
+      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/eva-icons/-/eva-icons-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/eva-icons/-/eva-icons-1.1.3.tgz",
-      "integrity": "sha512-Tural3pSMSL7PoKz8zNXTwy6/0YzJqtNieYs0jTUmaVCXs7XwqFDBFfeWaPUVrKS3C5j2MsZniGOnTi3tb8b6g=="
+      "integrity": "sha512-QBSEWNbEx1H0numXP1qgxKVCZHonRaky5ft4pGzQBcO4cy7mEja6TuJ8rc7BqX2pmkvetVQWKDH+DK/8y7GTag=="
     },
     "event-stream": {
       "version": "3.3.4",
@@ -12749,6 +12749,21 @@
       "resolved": "https://registry.npmjs.org/ng2-ckeditor/-/ng2-ckeditor-1.2.2.tgz",
       "integrity": "sha512-4md+hLpELy1ni0SbUYDD0XPpwjn9PUT+Loq8AyXzJutwg3xBQB7K4P2TxDr6wTiYZX+ZVSqmUOFwTL25LW129A=="
     },
+    "ng2-smart-table": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/ng2-smart-table/-/ng2-smart-table-1.6.0.tgz",
+      "integrity": "sha512-ejAIcVgEznsMD79xg+HfCha804KyGEiX9KH5BnmVzQZFzpC782I5W2wn4zackp4Gi9km1H6pKf3+MXLCF8IRXQ==",
+      "requires": {
+        "lodash": "^4.17.10"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.15",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+          "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
+        }
+      }
+    },
     "ngx-echarts": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/ngx-echarts/-/ngx-echarts-4.2.2.tgz",

package.json

@@ -30,8 +30,9 @@
     "postinstall": "ngcc --properties es2015 es5 browser module main --first-only --create-ivy-entry-points"
   },
   "dependencies": {
+    "@akveo/ng2-completer": "^9.0.1",
     "@angular/animations": "^9.0.4",
-    "@angular/cdk": "^9.1.0",
+    "@angular/cdk": "^9.1.2",
     "@angular/common": "^9.0.4",
     "@angular/compiler": "^9.0.4",
     "@angular/core": "^9.0.4",
@@ -42,25 +43,25 @@
     "@angular/platform-browser-dynamic": "^9.0.4",
     "@angular/router": "^9.0.4",
     "@asymmetrik/ngx-leaflet": "3.0.1",
-    "@nebular/auth": "5.0.0-beta.8",
+    "@nebular/auth": "5.0.0",
-    "@nebular/eva-icons": "5.0.0-beta.8",
+    "@nebular/eva-icons": "5.0.0",
-    "@nebular/security": "5.0.0-beta.8",
+    "@nebular/security": "5.0.0",
-    "@nebular/theme": "5.0.0-beta.8",
+    "@nebular/theme": "5.0.0",
     "@swimlane/ngx-charts": "^13.0.2",
     "angular2-chartjs": "0.4.1",
-    "angular2-toaster": "^7.0.0",
     "bootstrap": "4.3.1",
     "chart.js": "2.7.1",
     "ckeditor": "4.7.3",
     "classlist.js": "1.1.20150312",
     "core-js": "2.5.1",
     "echarts": "^4.0.2",
-    "eva-icons": "^1.1.0",
+    "eva-icons": "^1.1.3",
     "intl": "1.2.5",
     "ionicons": "2.0.1",
     "leaflet": "1.2.0",
     "nebular-icons": "1.1.0",
     "ng2-ckeditor": "^1.2.2",
+    "ng2-smart-table": "^1.6.0",
     "ngx-echarts": "^4.2.2",
     "node-sass": "^4.12.0",
     "normalize.css": "6.0.0",

src/app/pages/modal-overlays/toastr/toastr.component.ts

@@ -1,13 +1,11 @@
 import { Component } from '@angular/core';
-import { ToasterConfig } from 'angular2-toaster';
-
-import 'style-loader!angular2-toaster/toaster.css';
 import {
   NbComponentStatus,
   NbGlobalLogicalPosition,
   NbGlobalPhysicalPosition,
   NbGlobalPosition,
   NbToastrService,
+  NbToastrConfig,
 } from '@nebular/theme';
 
 @Component({
@@ -18,7 +16,7 @@ import {
 export class ToastrComponent {
   constructor(private toastrService: NbToastrService) {}
 
-  config: ToasterConfig;
+  config: NbToastrConfig;
 
   index = 1;
   destroyByClick = true;

src/app/pages/tables/smart-table/smart-table.component.html

@@ -1,4 +1,4 @@
-<!-- <nb-card>
+<nb-card>
   <nb-card-header>
     Smart Table
   </nb-card-header>
@@ -7,4 +7,4 @@
     <ng2-smart-table [settings]="settings" [source]="source" (deleteConfirm)="onDeleteConfirm($event)">
     </ng2-smart-table>
   </nb-card-body>
-</nb-card> -->
+</nb-card>

src/app/pages/tables/smart-table/smart-table.component.ts

@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-// import { LocalDataSource } from 'ng2-smart-table';
+import { LocalDataSource } from 'ng2-smart-table';
 
-// import { SmartTableData } from '../../../@core/data/smart-table';
+import { SmartTableData } from '../../../@core/data/smart-table';
 
 @Component({
   selector: 'ngx-smart-table',
@@ -53,12 +53,12 @@ export class SmartTableComponent {
     },
   };
 
-  // source: LocalDataSource = new LocalDataSource();
+  source: LocalDataSource = new LocalDataSource();
 
-  // constructor(private service: SmartTableData) {
+  constructor(private service: SmartTableData) {
-  //   const data = this.service.getData();
+    const data = this.service.getData();
-  //   this.source.load(data);
+    this.source.load(data);
-  // }
+  }
 
   onDeleteConfirm(event): void {
     if (window.confirm('Are you sure you want to delete?')) {

src/app/pages/tables/tables-routing.module.ts

@@ -2,17 +2,17 @@ import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 
 import { TablesComponent } from './tables.component';
-// import { SmartTableComponent } from './smart-table/smart-table.component';
+import { SmartTableComponent } from './smart-table/smart-table.component';
 import { TreeGridComponent } from './tree-grid/tree-grid.component';
 
 const routes: Routes = [{
   path: '',
   component: TablesComponent,
   children: [
-    // {
+    {
-    //   path: 'smart-table',
+      path: 'smart-table',
-    //   component: SmartTableComponent,
+      component: SmartTableComponent,
-    // },
+    },
     {
       path: 'tree-grid',
       component: TreeGridComponent,
@@ -28,6 +28,6 @@ export class TablesRoutingModule { }
 
 export const routedComponents = [
   TablesComponent,
-  // SmartTableComponent,
+  SmartTableComponent,
   TreeGridComponent,
 ];

src/app/pages/tables/tables.module.ts

@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { NbCardModule, NbIconModule, NbInputModule, NbTreeGridModule } from '@nebular/theme';
-// import { Ng2SmartTableModule } from 'ng2-smart-table';
+import { Ng2SmartTableModule } from 'ng2-smart-table';
 
 import { ThemeModule } from '../../@theme/theme.module';
 import { TablesRoutingModule, routedComponents } from './tables-routing.module';
@@ -14,7 +14,7 @@ import { FsIconComponent } from './tree-grid/tree-grid.component';
     NbInputModule,
     ThemeModule,
     TablesRoutingModule,
-    // Ng2SmartTableModule,
+    Ng2SmartTableModule,
   ],
   declarations: [
     ...routedComponents,