Fixed npm packages version and cleanup useless code.

diff --git a/webapp/.angular-cli.json b/webapp/.angular-cli.json
index 72cf2c8..ade79a2 100644 (file)
--- a/webapp/.angular-cli.json
+++ b/webapp/.angular-cli.json
@@ -30,10 +30,7 @@
         "./app/@theme/styles/styles.scss"
       ],
       "scripts": [
-        "../node_modules/pace-js/pace.min.js",
-        "./assets/vendors/echarts.min.js",
-        "./assets/vendors/echarts.world.min.js",
-        "../node_modules/chart.js/dist/Chart.min.js"
+        "../node_modules/pace-js/pace.min.js"
       ],
       "environmentSource": "environments/environment.ts",
       "environments": {

diff --git a/webapp/package.json b/webapp/package.json
index 98bd844..8bc3aca 100644 (file)
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -35,60 +35,56 @@
   },
   "dependencies": {
     "@agm/core": "1.0.0-beta.0",
-    "@angular/animations": "^4.4.6",
-    "@angular/common": "^4.4.6",
-    "@angular/compiler": "^4.4.6",
-    "@angular/core": "^4.4.6",
-    "@angular/forms": "^4.4.6",
-    "@angular/http": "^4.4.6",
-    "@angular/platform-browser": "^4.4.6",
-    "@angular/platform-browser-dynamic": "^4.4.6",
-    "@angular/router": "^4.4.6",
+    "@angular/animations": "4.4.6",
+    "@angular/common": "4.4.6",
+    "@angular/compiler": "4.4.6",
+    "@angular/core": "4.4.6",
+    "@angular/forms": "4.4.6",
+    "@angular/http": "4.4.6",
+    "@angular/platform-browser": "4.4.6",
+    "@angular/platform-browser-dynamic": "4.4.6",
+    "@angular/router": "4.4.6",
     "@nebular/auth": "2.0.0-rc.3",
     "@nebular/theme": "2.0.0-rc.3",
     "@ng-bootstrap/ng-bootstrap": "1.0.0-beta.5",
-    "@swimlane/ngx-charts": "5.2.0",
-    "angular2-chartjs": "^0.3.0",
-    "angular2-toaster": "^4.0.0",
+    "angular2-toaster": "4.0.0",
     "bootstrap": "4.0.0-beta.2",
-    "chart.js": "2.5.0",
-    "ckeditor": "4.6.2",
     "classlist.js": "1.1.20150312",
-    "core-js": "^2.4.1",
+    "core-js": "2.4.1",
     "d3": "4.8.0",
     "font-awesome": "4.7.0",
     "font-awesome-animation": "0.0.10",
     "intl": "1.2.5",
     "ionicons": "2.0.1",
+    "jquery": "3.2.1",
     "nebular-icons": "1.0.6",
-    "ng2-ckeditor": "^1.1.9",
-    "ng2-smart-table": "1.1.0",
+    "ng2-smart-table": "1.2.2",
     "ng2-tree": "2.0.0-alpha.10",
-    "ngx-cookie": "^1.0.0",
-    "ngx-echarts": "1.2.2",
+    "ngx-cookie": "1.0.1",
     "normalize.css": "6.0.0",
-    "pace-js": "^1.0.2",
+    "pace-js": "1.0.2",
+    "popper.js": "~1.12.9",
     "roboto-fontface": "0.8.0",
-    "rxjs": "^5.4.2",
+    "rxjs": "5.5.0",
     "socket.io-client": "^1.7.3",
     "socketio": "^1.0.0",
     "tether": "1.4.0",
     "typeface-exo": "0.0.22",
     "web-animations-js": "2.2.5",
-    "zone.js": "^0.8.14"
+    "zone.js": "0.8.18"
   },
   "devDependencies": {
     "@angular/cli": "1.4.9",
-    "@angular/compiler-cli": "^4.4.6",
-    "@angular/language-service": "^4.4.6",
-    "@compodoc/compodoc": "^1.0.1",
+    "@angular/compiler-cli": "4.4.6",
+    "@angular/language-service": "4.4.6",
+    "@compodoc/compodoc": "1.0.1",
     "@types/d3-color": "1.0.4",
     "@types/socket.io-client": "^1.4.31",
     "@types/jasmine": "~2.5.53",
     "@types/jasminewd2": "~2.0.2",
-    "@types/node": "~6.0.60",
-    "codelyzer": "~3.2.0",
-    "conventional-changelog-cli": "^1.3.4",
+    "@types/node": "6.0.90",
+    "codelyzer": "3.2.1",
+    "conventional-changelog-cli": "1.3.4",
     "husky": "0.13.3",
     "jasmine-core": "~2.6.2",
     "jasmine-spec-reporter": "~4.1.0",

diff --git a/webapp/src/app/pages/dashboard/dashboard.module.ts b/webapp/src/app/pages/dashboard/dashboard.module.ts
index 5f3a960..957eff4 100644 (file)
--- a/webapp/src/app/pages/dashboard/dashboard.module.ts
+++ b/webapp/src/app/pages/dashboard/dashboard.module.ts
@@ -17,54 +17,19 @@
 */
 
 import { NgModule } from '@angular/core';
-import { AngularEchartsModule } from 'ngx-echarts';
 
 import { ThemeModule } from '../../@theme/theme.module';
 import { DashboardComponent } from './dashboard.component';
 import { StatusCardComponent } from './status-card/status-card.component';
-/*
-import { ContactsComponent } from './contacts/contacts.component';
-import { RoomsComponent } from './rooms/rooms.component';
-import { RoomSelectorComponent } from './rooms/room-selector/room-selector.component';
-import { TemperatureComponent } from './temperature/temperature.component';
-import { TemperatureDraggerComponent } from './temperature/temperature-dragger/temperature-dragger.component';
-import { TeamComponent } from './team/team.component';
-import { KittenComponent } from './kitten/kitten.component';
-import { SecurityCamerasComponent } from './security-cameras/security-cameras.component';
-import { ElectricityComponent } from './electricity/electricity.component';
-import { ElectricityChartComponent } from './electricity/electricity-chart/electricity-chart.component';
-import { WeatherComponent } from './weather/weather.component';
-import { SolarComponent } from './solar/solar.component';
-import { PlayerComponent } from './rooms/player/player.component';
-import { TrafficComponent } from './traffic/traffic.component';
-import { TrafficChartComponent } from './traffic/traffic-chart.component';
-*/
+
 
 @NgModule({
   imports: [
     ThemeModule,
-    AngularEchartsModule,
   ],
   declarations: [
     DashboardComponent,
     StatusCardComponent,
-    /*
-    TemperatureDraggerComponent,
-    ContactsComponent,
-    RoomSelectorComponent,
-    TemperatureComponent,
-    RoomsComponent,
-    TeamComponent,
-    KittenComponent,
-    SecurityCamerasComponent,
-    ElectricityComponent,
-    ElectricityChartComponent,
-    WeatherComponent,
-    PlayerComponent,
-    SolarComponent,
-    TrafficComponent,
-    TrafficChartComponent,
-    */
   ],
 })
 export class DashboardModule { }

diff --git a/webapp/src/app/pages/pages-menu.ts b/webapp/src/app/pages/pages-menu.ts
index 71acc78..eb5462c 100644 (file)
--- a/webapp/src/app/pages/pages-menu.ts
+++ b/webapp/src/app/pages/pages-menu.ts
@@ -88,130 +88,6 @@ export const MENU_ITEMS: NbMenuItem[] = [
       },
     ],
   },
-  /*
-  {
-    title: 'UI Features',
-    icon: 'nb-keypad',
-    link: '/pages/ui-features',
-    children: [
-      {
-        title: 'Buttons',
-        link: '/pages/ui-features/buttons',
-      },
-      {
-        title: 'Grid',
-        link: '/pages/ui-features/grid',
-      },
-      {
-        title: 'Icons',
-        link: '/pages/ui-features/icons',
-      },
-      {
-        title: 'Modals',
-        link: '/pages/ui-features/modals',
-      },
-      {
-        title: 'Typography',
-        link: '/pages/ui-features/typography',
-      },
-      {
-        title: 'Animated Searches',
-        link: '/pages/ui-features/search-fields',
-      },
-      {
-        title: 'Tabs',
-        link: '/pages/ui-features/tabs',
-      },
-    ],
-  },
-  {
-    title: 'Forms',
-    icon: 'nb-compose',
-    children: [
-      {
-        title: 'Form Inputs',
-        link: '/pages/forms/inputs',
-      },
-      {
-        title: 'Form Layouts',
-        link: '/pages/forms/layouts',
-      },
-    ],
-  },
-  {
-    title: 'Components',
-    icon: 'nb-gear',
-    children: [
-      {
-        title: 'Tree',
-        link: '/pages/components/tree',
-      }, {
-        title: 'Notifications',
-        link: '/pages/components/notifications',
-      },
-    ],
-  },
-  {
-    title: 'Maps',
-    icon: 'nb-location',
-    children: [
-      {
-        title: 'Google Maps',
-        link: '/pages/maps/gmaps',
-      },
-      {
-        title: 'Leaflet Maps',
-        link: '/pages/maps/leaflet',
-      },
-      {
-        title: 'Bubble Maps',
-        link: '/pages/maps/bubble',
-      },
-    ],
-  },
-  {
-    title: 'Charts',
-    icon: 'nb-bar-chart',
-    children: [
-      {
-        title: 'Echarts',
-        link: '/pages/charts/echarts',
-      },
-      {
-        title: 'Charts.js',
-        link: '/pages/charts/chartjs',
-      },
-      {
-        title: 'D3',
-        link: '/pages/charts/d3',
-      },
-    ],
-  },
-  {
-    title: 'Editors',
-    icon: 'nb-title',
-    children: [
-      {
-        title: 'TinyMCE',
-        link: '/pages/editors/tinymce',
-      },
-      {
-        title: 'CKEditor',
-        link: '/pages/editors/ckeditor',
-      },
-    ],
-  },
-  {
-    title: 'Tables',
-    icon: 'nb-tables',
-    children: [
-      {
-        title: 'Smart Table',
-        link: '/pages/tables/smart-table',
-      },
-    ],
-  },
-  */
   {
     title: 'Auth',
     icon: 'nb-locked',

diff --git a/webapp/src/app/pages/projects/project-add-modal/project-add-modal.component.scss b/webapp/src/app/pages/projects/project-add-modal/project-add-modal.component.scss
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/webapp/src/app/pages/projects/project-add-modal/project-add-modal.component.scss
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/webapp/src/app/pages/projects/project-add-modal/project-add-modal.component.ts b/webapp/src/app/pages/projects/project-add-modal/project-add-modal.component.ts
index 3fb99ec..adfc1d8 100644 (file)
--- a/webapp/src/app/pages/projects/project-add-modal/project-add-modal.component.ts
+++ b/webapp/src/app/pages/projects/project-add-modal/project-add-modal.component.ts
@@ -34,7 +34,6 @@ import { XDSConfigService } from '../../../@core-xds/services/xds-config.service
 @Component({
   selector: 'xds-project-add-modal',
   templateUrl: 'project-add-modal.component.html',
-  styleUrls: ['project-add-modal.component.scss'],
 })
 export class ProjectAddModalComponent implements OnInit {
   // @Input('server-id') serverID: string;