Merge from ecomp 718fd196 - Modern UI

Issue-ID: VID-378

Change-Id: I2736b98426e324ec3aa233b034229ba84d99839f
Signed-off-by: Ittay Stern <ittay.stern@att.com>

1 files changed, 36 insertions, 35 deletions

diff --git a/vid-webpack-master/package.json b/vid-webpack-master/package.json
index ff2682b46..d718b2235 100644
--- a/vid-webpack-master/package.json
+++ b/vid-webpack-master/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vid-cli",
   "version": "0.0.0",
-  "license": "Apache-2.0",
+  "license": "MIT",
   "scripts": {
     "ng": "ng",
     "start": "ng serve --port 4201",
@@ -19,7 +19,7 @@
     "e2e": "ng e2e",
     "build-watch": "ng build --watch",
     "cypress:open": "cypress open",
-    "cypress": "cypress open --config baseUrl=http://localhost:8080/vid ",
+    "cypress": "cypress open --config watchForFileChanges=false,baseUrl=http://localhost:8080/vid",
     "cypress:run": "cypress run",
     "cypress:headless": "cypress run --config baseUrl=http://localhost:8080/vid",
     "format": "prettier",
@@ -28,32 +28,32 @@
   },
   "private": true,
   "dependencies": {
-    "@angular-redux/store": "^9.0.0",
-    "@angular/animations": "^7.1.4",
-    "@angular/cdk": "^7.2.2",
-    "@angular/common": "^7.1.4",
-    "@angular/compiler": "^7.1.4",
-    "@angular/core": "^7.1.4",
-    "@angular/forms": "^7.1.4",
-    "@angular/http": "^7.1.4",
+    "@angular-redux/store": "9.0.0",
+    "@angular/animations": "7.1.4",
+    "@angular/cdk": "7.2.2",
+    "@angular/common": "7.1.4",
+    "@angular/compiler": "7.1.4",
+    "@angular/core": "7.1.4",
+    "@angular/forms": "7.1.4",
+    "@angular/http": "7.1.4",
     "@angular/material": "7.2.2",
-    "@angular/platform-browser": "^7.1.4",
-    "@angular/platform-browser-dynamic": "^7.1.4",
-    "@angular/platform-server": "^7.1.4",
-    "@angular/router": "^7.1.4",
+    "@angular/platform-browser": "7.1.4",
+    "@angular/platform-browser-dynamic": "7.1.4",
+    "@angular/platform-server": "7.1.4",
+    "@angular/router": "7.1.4",
     "@harmowatch/ngx-redux-core": "0.2.2",
     "@nicky-lenaers/ngx-scroll-to": "^0.6.1",
-    "@turf/turf": "^5.1.6",
-    "@types/lodash": "4.14.91",
-    "angular-svg-icon": "^5.0.0",
+    "@turf/turf": "5.1.6",
+    "@types/lodash": "4.14.121",
+    "angular-svg-icon": "5.0.0",
     "angular-tree-component": "7.0.1",
     "angular2-datatable": "0.6.0",
     "angular2-multiselect-dropdown": "2.5.0",
     "angular5-csv": "^0.2.10",
-    "bootstrap": "^4.1.2",
-    "core-js": "^2.6.1",
-    "font-awesome": "^4.7.0",
-    "install": "^0.12.2",
+    "bootstrap": "3.3.7",
+    "core-js": "2.6.1",
+    "font-awesome": "4.7.0",
+    "install": "0.12.2",
     "jest-image-snapshot": "2.8.1",
     "jest-preset-angular": "6.0.2",
     "ng-multiselect-dropdown": "0.1.3",
@@ -73,25 +73,24 @@
     "zone.js": "^0.8.26"
   },
   "devDependencies": {
-    "@angular-builders/jest": "^7.1.2",
-    "@angular-devkit/build-angular": "^0.11.4",
-    "@angular/cli": "^7.1.4",
-    "@angular/compiler-cli": "^7.1.4",
-    "@angular/language-service": "^7.1.4",
-    "@babel/preset-env": "^7.2.3",
+    "@angular-builders/jest": "7.3.1",
+    "@angular-devkit/build-angular": "0.13.1",
+    "@angular/cli": "7.3.1",
+    "@angular/compiler-cli": "7.2.5",
+    "@angular/language-service": "7.2.5",
+    "@babel/preset-env": "7.3.1",
     "@bahmutov/add-typescript-to-cypress": "2.0.0",
-    "@types/chai": "^4.1.3",
-    "@types/cypress": "1.1.3",
+    "@types/chai": "4.1.7",
     "@types/jest": "24.0.6",
     "@types/jest-each": "0.3.4",
     "@types/node": "^10.12.18",
-    "angular2-template-loader": "^0.6.2",
+    "angular2-template-loader": "0.6.2",
     "babel-jest": "24.1.0",
-    "codelyzer": "^4.5.0",
-    "cypress": "^3.1.0",
+    "codelyzer": "4.5.0",
+    "cypress": "^3.1.5",
     "hammerjs": "2.0.8",
     "husky": "^1.3.1",
-    "istanbul-reports": "^2.0.1",
+    "istanbul-reports": "2.1.1",
     "jest": "24.1.0",
     "jest-each": "24.0.0",
     "jest-junit": "6.3.0",
@@ -105,7 +104,7 @@
     "ts-mockito": "2.3.1",
     "ts-node": "~5.0.1",
     "tslint": "^5.12.0",
-    "typescript": "^3.1.6",
+    "typescript": "3.1.6",
     "wallaby-webpack": "^3.9.11",
     "webpack": "^4.28.2"
   },
@@ -115,7 +114,9 @@
   },
   "jest": {
     "preset": "jest-preset-angular",
-    "setupFilesAfterEnv": ["<rootDir>/src/setupJest.ts"],
+    "setupFilesAfterEnv": [
+      "<rootDir>/src/setupJest.ts"
+    ],
     "transform": {
       "^.+\\.(ts|html)$": "<rootDir>/node_modules/jest-preset-angular/preprocessor.js",
       "^.+\\.js$": "babel-jest"