resolve icon issue and remove redundent code (#741)

Remove items with conflicting licenses and update dependencies.

Signed-off-by: Jason You <[email protected]>

Author: Jasonyou1995

.gitignore

@@ -49,3 +49,7 @@ lerna-debug.log
 
 # Ignore data
 data/
+
+# Ignore temp test files
+test/
+temp/

lerna.json

@@ -15,6 +15,8 @@
         "packages/caliper-cli",
         "packages/caliper-publish",
         "packages/caliper-tests-integration",
+		    "packages/caliper-gui-dashboard",
+		    "packages/caliper-gui-server",
         "packages/caliper-generator/generator-caliper"
 	],
 	"version": "0.3.1-unstable",

packages/caliper-core/package.json

@@ -26,7 +26,7 @@
         "compare-versions": "^3.4.0",
         "dockerode": "3.1.0",
         "fs-extra": "8.1.0",
-        "js-yaml": "^3.12.0",
+        "js-yaml": "^3.13.1",
         "mustache": "^2.3.0",
         "mqtt": "3.0.0",
         "nconf": "^0.10.0",
@@ -90,7 +90,7 @@
         }
     },
     "optionalDependencies": {
-        "ajv": "^6.0.0"
+        "ajv": "6.12.0"
     },
     "nyc": {
         "exclude": [

packages/caliper-ethereum/package.json

@@ -26,7 +26,7 @@
         "ethereumjs-wallet": "^0.6.3"
     },
     "devDependencies": {
-        "web3": "1.2.2",
+        "web3": "0.20.7",
         "chai": "^3.5.0",
         "eslint": "^5.16.0",
         "mocha": "3.4.2",

packages/caliper-gui-dashboard/package.json

@@ -14,7 +14,7 @@
         "test": "npm run lint",
         "lint": "npx eslint .",
         "nyc": "nyc mocha --recursive -t 10000",
-        "start": "react-scripts start",
+        "start": "SKIP_PREFLIGHT_CHECK=true react-scripts start",
         "build": "react-scripts build",
         "eject": "react-scripts eject",
         "install:clean": "rm -rf node_modules/ && rm -rf package-lock.json && npm install && npm start",
@@ -27,34 +27,38 @@
         "npm": ">=5.6.0"
     },
     "dependencies": {
-        "axios": "^0.19.0",
-        "bootstrap": "4.3.1",
-        "chart.js": "^2.8.0",
-        "d3": "^5.9.7",
-        "history": "4.9.0",
+        "@fortawesome/fontawesome-svg-core": "^1.2.27",
+        "@fortawesome/free-brands-svg-icons": "^5.12.1",
+        "@fortawesome/free-solid-svg-icons": "^5.12.1",
+        "@fortawesome/react-fontawesome": "^0.1.8",
+        "axios": "^0.19.2",
+        "bootstrap": "4.4.1",
+        "chart.js": "^2.9.3",
+        "d3": "^5.15.0",
+        "history": "4.10.1",
         "js-yaml": "^3.13.1",
         "mime-types": "^2.1.24",
-        "node-sass": "4.12.0",
+        "node-sass": "4.13.1",
         "patternomaly": "^1.3.2",
-        "perfect-scrollbar": "1.4.0",
-        "react": "^16.8.6",
-        "react-chartjs-2": "^2.7.6",
-        "react-copy-to-clipboard": "^5.0.1",
-        "react-d3-graph": "^2.1.0",
-        "react-dom": "16.8.6",
+        "perfect-scrollbar": "1.5.0",
+        "react": "^16.12.0",
+        "react-chartjs-2": "^2.9.0",
+        "react-copy-to-clipboard": "^5.0.2",
+        "react-d3-graph": "^2.3.0",
+        "react-dom": "16.12.0",
         "react-google-maps": "9.4.5",
         "react-notification-alert": "0.0.12",
-        "react-router": "5.0.0",
-        "react-router-dom": "5.0.0",
-        "react-scripts": "3.0.1",
-        "react-textarea-autosize": "^7.1.0",
-        "reactstrap": "8.0.0"
+        "react-router": "5.1.2",
+        "react-router-dom": "5.1.2",
+        "react-scripts": "3.4.0",
+        "react-textarea-autosize": "^7.1.2",
+        "reactstrap": "8.4.1"
     },
     "devDependencies": {
         "babel-eslint": "10.0.1",
         "chai": "^3.5.0",
         "eslint": "^5.16.0",
-        "eslint-plugin-react": "^7.16.0",
+        "eslint-plugin-react": "^7.18.3",
         "license-check-and-add": "2.3.6",
         "mocha": "3.4.2",
         "nyc": "11.1.0",
@@ -71,12 +75,12 @@
         "not op_mini all"
     ],
     "optionalDependencies": {
-        "@types/googlemaps": "3.36.2",
+        "@types/googlemaps": "3.39.3",
         "@types/markerclustererplus": "2.1.33",
-        "@types/react": "16.8.19",
-        "ajv": "6.10.0",
+        "@types/react": "16.9.23",
+        "ajv": "6.12.0",
         "jquery": "3.4.1",
-        "typescript": "3.4.5"
+        "typescript": "3.8.2"
     },
     "license-check-and-add-config": {
         "folder": ".",
@@ -89,7 +93,7 @@
             ".gitignore",
             "log",
             ".jshintrc",
-            "gui-client/caliper-gui-dashboard/.gitignore"
+            "src/assets/.DS_Store"
         ],
         "file_type_method": "EXCLUDE",
         "file_types": [

packages/caliper-gui-dashboard/public/index.html

@@ -66,10 +66,8 @@
       href="https://fonts.googleapis.com/css?family=Montserrat:400,700,200"
       rel="stylesheet"
     />
-    <link
-      rel="stylesheet"
-      href="https://use.fontawesome.com/releases/v5.3.1/css/all.css"
-    />
+    <!-- Fontawesome latest kit -->
+   <script src="https://kit.fontawesome.com/71d2d3ed2e.js" crossorigin="anonymous"></script>
 
     <title>Hyperledger Caliper Dashboard</title>
   </head>