Merge pull request #72 from myslak71/develop

refactor
myslak71 · Feb 23, 2019 · 12e1a97 · 12e1a97
2 parents c16e9e6 + 97fe04e
commit 12e1a97
Show file tree

Hide file tree

Showing 7 changed files with 3,506 additions and 302 deletions.
diff --git a/chart_test.html b/chart_test.html
@@ -46,13 +46,11 @@
 
 </style>
 <body>
-<script src="src/d3.v3.min.js"></script>
-<script>
+<script src="https://d3js.org/d3.v5.js"></script><script>
 
 var width = 960,
     size = 230,
     padding = 20;
-
 var x = d3.scale.linear()
     .range([padding / 2, size - padding / 2]);
 
@@ -72,14 +70,6 @@
 var color = d3.scale.category10();
 
 d3.csv("test.csv", function(error, data) {
-     // data = [{"R": "74", "G": "85", "B": "123", "result": "skin"},
-     //        {"R": "74", "G": "76", "B": "30", "result": "non-skin"},
-     //        {"R": "30", "G": "27", "B": "23", "result": "non-skin"},
-     //        {"R": "121", "G": "121", "B": "121", "result": "non-skin"},
-     //        {"R": "181", "G": "178", "B": "133", "result": "non-skin"},
-     //        {"R": "121", "G": "151", "B": "102", "result": "non-skin"},
-     //        {"R": "103", "G": "141", "B": "199", "result": "skin"}]
-     //    var centroids = [{"R": "74", "G": "85", "B": "123", "result": "skin"}]
     console.log(data[0])
   if (error) throw error;
 

diff --git a/new_chart.html b/new_chart.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<style>
+</style>
+<body>
+<script src="https://d3js.org/d3.v5.min.js"></script>
+
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "@vx/mock-data": "0.0.182",
     "antd": "^3.7.3",
     "axios": "^0.18.0",
-    "d3": "^5.7.0",
+    "d3": "^3.5.17",
     "d3-latest": "^5.0.4",
     "d3-svg-legend": "^2.25.6",
     "mathjs": "^5.4.2",