Merge branch 'development'

CRCunha · Mar 22, 2021 · 64e9d42 · 64e9d42
2 parents 75058d1 + ce3dff2
commit 64e9d42
Show file tree

Hide file tree

Showing 13 changed files with 14,677 additions and 63 deletions.
diff --git a/.vscode/bookmarks.json b/.vscode/bookmarks.json
@@ -4,7 +4,7 @@
 			"path": "src/components/menu/index.js",
 			"bookmarks": [
 				{
-					"line": 31,
+					"line": 36,
 					"column": 35,
 					"label": ""
 				}

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -8,6 +8,8 @@
     "@material-ui/lab": "^4.0.0-alpha.56",
     "@nivo/calendar": "^0.67.0",
     "@nivo/core": "^0.67.0",
+    "@nivo/geo": "^0.67.0",
+    "@nivo/line": "^0.67.0",
     "@nivo/pie": "^0.67.0",
     "@nivo/radar": "^0.67.0",
     "@nivo/stream": "^0.67.0",

diff --git a/src/assets/data/line.json b/src/assets/data/line.json
@@ -0,0 +1,272 @@
+[
+  {
+    "id": "japan",
+    "color": "hsl(141, 70%, 50%)",
+    "data": [
+      {
+        "x": "plane",
+        "y": 174
+      },
+      {
+        "x": "helicopter",
+        "y": 34
+      },
+      {
+        "x": "boat",
+        "y": 185
+      },
+      {
+        "x": "train",
+        "y": 142
+      },
+      {
+        "x": "subway",
+        "y": 210
+      },
+      {
+        "x": "bus",
+        "y": 153
+      },
+      {
+        "x": "car",
+        "y": 158
+      },
+      {
+        "x": "moto",
+        "y": 281
+      },
+      {
+        "x": "bicycle",
+        "y": 131
+      },
+      {
+        "x": "horse",
+        "y": 57
+      },
+      {
+        "x": "skateboard",
+        "y": 54
+      },
+      {
+        "x": "others",
+        "y": 38
+      }
+    ]
+  },
+  {
+    "id": "france",
+    "color": "hsl(72, 70%, 50%)",
+    "data": [
+      {
+        "x": "plane",
+        "y": 151
+      },
+      {
+        "x": "helicopter",
+        "y": 261
+      },
+      {
+        "x": "boat",
+        "y": 38
+      },
+      {
+        "x": "train",
+        "y": 187
+      },
+      {
+        "x": "subway",
+        "y": 97
+      },
+      {
+        "x": "bus",
+        "y": 153
+      },
+      {
+        "x": "car",
+        "y": 143
+      },
+      {
+        "x": "moto",
+        "y": 108
+      },
+      {
+        "x": "bicycle",
+        "y": 170
+      },
+      {
+        "x": "horse",
+        "y": 99
+      },
+      {
+        "x": "skateboard",
+        "y": 290
+      },
+      {
+        "x": "others",
+        "y": 280
+      }
+    ]
+  },
+  {
+    "id": "us",
+    "color": "hsl(324, 70%, 50%)",
+    "data": [
+      {
+        "x": "plane",
+        "y": 141
+      },
+      {
+        "x": "helicopter",
+        "y": 52
+      },
+      {
+        "x": "boat",
+        "y": 225
+      },
+      {
+        "x": "train",
+        "y": 20
+      },
+      {
+        "x": "subway",
+        "y": 111
+      },
+      {
+        "x": "bus",
+        "y": 208
+      },
+      {
+        "x": "car",
+        "y": 78
+      },
+      {
+        "x": "moto",
+        "y": 266
+      },
+      {
+        "x": "bicycle",
+        "y": 148
+      },
+      {
+        "x": "horse",
+        "y": 114
+      },
+      {
+        "x": "skateboard",
+        "y": 268
+      },
+      {
+        "x": "others",
+        "y": 251
+      }
+    ]
+  },
+  {
+    "id": "germany",
+    "color": "hsl(194, 70%, 50%)",
+    "data": [
+      {
+        "x": "plane",
+        "y": 111
+      },
+      {
+        "x": "helicopter",
+        "y": 105
+      },
+      {
+        "x": "boat",
+        "y": 249
+      },
+      {
+        "x": "train",
+        "y": 135
+      },
+      {
+        "x": "subway",
+        "y": 112
+      },
+      {
+        "x": "bus",
+        "y": 18
+      },
+      {
+        "x": "car",
+        "y": 275
+      },
+      {
+        "x": "moto",
+        "y": 102
+      },
+      {
+        "x": "bicycle",
+        "y": 91
+      },
+      {
+        "x": "horse",
+        "y": 204
+      },
+      {
+        "x": "skateboard",
+        "y": 118
+      },
+      {
+        "x": "others",
+        "y": 200
+      }
+    ]
+  },
+  {
+    "id": "norway",
+    "color": "hsl(14, 70%, 50%)",
+    "data": [
+      {
+        "x": "plane",
+        "y": 204
+      },
+      {
+        "x": "helicopter",
+        "y": 284
+      },
+      {
+        "x": "boat",
+        "y": 156
+      },
+      {
+        "x": "train",
+        "y": 225
+      },
+      {
+        "x": "subway",
+        "y": 56
+      },
+      {
+        "x": "bus",
+        "y": 205
+      },
+      {
+        "x": "car",
+        "y": 221
+      },
+      {
+        "x": "moto",
+        "y": 88
+      },
+      {
+        "x": "bicycle",
+        "y": 233
+      },
+      {
+        "x": "horse",
+        "y": 101
+      },
+      {
+        "x": "skateboard",
+        "y": 118
+      },
+      {
+        "x": "others",
+        "y": 175
+      }
+    ]
+  }
+]