diff --git a/package-lock.json b/package-lock.json
index a734851c4a92258ef1f30719fc53adff84a21985..92d902df92db40796cc6c3e14388f15e3e030e11 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -75,11 +75,11 @@
}
},
"@babel/runtime": {
- "version": "7.0.0-beta.49",
- "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0-beta.49.tgz",
- "integrity": "sha1-A7O/B+uYIHLI6FHdLd1RECguYb8=",
+ "version": "7.0.0-beta.51",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.0.0-beta.51.tgz",
+ "integrity": "sha1-SLjtGDBwNMZiD2Q1FGUMoszAFlo=",
"requires": {
- "core-js": "^2.5.6",
+ "core-js": "^2.5.7",
"regenerator-runtime": "^0.11.1"
},
"dependencies": {
@@ -157,9 +157,9 @@
}
},
"@material-ui/core": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-1.2.0.tgz",
- "integrity": "sha512-7rh/FAmdmWsjRYJlOEUT2NajlpvC+I28cbGUq0dNFdOHTcxRL/xsUraFvAEFBXvsLrzLkzNPl3mA2Svn80aLVw==",
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-1.2.1.tgz",
+ "integrity": "sha512-CG1jhJKUedImcdD8OdjQvDO89H/wUH5IVRYP1+cupr25iSpW84T/G0KHGPceoNRNUlbQpmuY98rffHQ7C74yvw==",
"requires": {
"@babel/runtime": "^7.0.0-beta.42",
"@types/jss": "^9.5.3",
@@ -209,9 +209,9 @@
}
},
"@material-ui/lab": {
- "version": "1.0.0-alpha.4",
- "resolved": "https://registry.npmjs.org/@material-ui/lab/-/lab-1.0.0-alpha.4.tgz",
- "integrity": "sha512-sUq3GTUm9lsrHf8dRHLGzP9MHG9gywIYcjFw9FawtmiQP7jQ1xnY3mAOl+WN1BCGzf2skIftmQdEsIeAH7BJxQ=="
+ "version": "1.0.0-alpha.5",
+ "resolved": "https://registry.npmjs.org/@material-ui/lab/-/lab-1.0.0-alpha.5.tgz",
+ "integrity": "sha512-FqDhtfEB78JG7NKr2v8KRK5rhmQ4PT3fBY9iMCGFI02tIynBALqNB9Z3ahanYIoQxdiYftRbxmP+q7lSqvsIgw=="
},
"@mrmlnc/readdir-enhanced": {
"version": "2.2.1",
@@ -260,9 +260,9 @@
"dev": true
},
"@types/react": {
- "version": "16.3.16",
- "resolved": "https://registry.npmjs.org/@types/react/-/react-16.3.16.tgz",
- "integrity": "sha512-fM7YX3Q9a915DXi8T06F8906bWv19sbkVO+k5PUYRIWXU2PINLEHbMMGgySem2phwF6En0+HGI6MOrobp+Ya1g==",
+ "version": "16.3.17",
+ "resolved": "https://registry.npmjs.org/@types/react/-/react-16.3.17.tgz",
+ "integrity": "sha512-f2ZTOSF7l9sRdXSbzLI84Z2wsVnj3qUjfJhtDLSi7lTWFMo1WSou7eQ2vkQga8100zhzzDjSyGbj+Viz7i927g==",
"requires": {
"csstype": "^2.2.0"
}
@@ -276,14 +276,14 @@
}
},
"@webassemblyjs/ast": {
- "version": "1.5.10",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.5.10.tgz",
- "integrity": "sha512-4BObuKRfeAnKdz5PfTp6MqSoCdj0z9EXu00PsQLzqcC55Htw5r9OXebS+sPF8T5tRTRI5/2w0CR52s/4vJ2fkw==",
+ "version": "1.5.12",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.5.12.tgz",
+ "integrity": "sha512-bmTBEKuuhSU6dC95QIW250xO769cdYGx9rWn3uBLTw2pUpud0Z5kVuMw9m9fqbNzGeuOU2HpyuZa+yUt2CTEDA==",
"dev": true,
"requires": {
- "@webassemblyjs/helper-module-context": "1.5.10",
- "@webassemblyjs/helper-wasm-bytecode": "1.5.10",
- "@webassemblyjs/wast-parser": "1.5.10",
+ "@webassemblyjs/helper-module-context": "1.5.12",
+ "@webassemblyjs/helper-wasm-bytecode": "1.5.12",
+ "@webassemblyjs/wast-parser": "1.5.12",
"debug": "^3.1.0",
"mamacro": "^0.0.3"
},
@@ -300,21 +300,21 @@
}
},
"@webassemblyjs/floating-point-hex-parser": {
- "version": "1.5.10",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.10.tgz",
- "integrity": "sha512-ns6H/06BTnk7thnN8O6MK9xMqodgaVKkjBaC8nXGLeAtX2ONHxQL2NnY4XgUzyo7yRwGVAPBxdl7yxzc0iy9Eg==",
+ "version": "1.5.12",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.12.tgz",
+ "integrity": "sha512-epTvkdwOIPpTE9edHS+V+shetYzpTbd91XOzUli1zAS0+NSgSe6ZsNggIqUNzhma1s4bN2f/m8c6B1NMdCERAg==",
"dev": true
},
"@webassemblyjs/helper-api-error": {
- "version": "1.5.10",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.5.10.tgz",
- "integrity": "sha512-OeWjB1Ie44sg5Nr8GVot5l+uclK4fWEQGH1b+HQ7x9GN9UxcJUIG3+u5dj2MTkthneQT1hUo09Wtpb/bY7zfXA==",
+ "version": "1.5.12",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.5.12.tgz",
+ "integrity": "sha512-Goxag86JvLq8ucHLXFNSLYzf9wrR+CJr37DsESTAzSnGoqDTgw5eqiXSQVd/D9Biih7+DIn8UIQCxMs8emRRwg==",
"dev": true
},
"@webassemblyjs/helper-buffer": {
- "version": "1.5.10",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.10.tgz",
- "integrity": "sha512-soggPYDku3gDl+zV1TVle3zLWgiU1Kli4QJdWCoeyX95RhGtF2A5tP7U3ypLlBb74SdoYYFVn3Fm7HXIWj1wzA==",
+ "version": "1.5.12",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.12.tgz",
+ "integrity": "sha512-tJNUjttL5CxiiS/KLxT4/Zk0Nbl/poFhztFxktb46zoQEUWaGHR9ZJ0SnvE7DbFX5PY5JNJDMZ0Li4lm246fWw==",
"dev": true,
"requires": {
"debug": "^3.1.0"
@@ -332,45 +332,57 @@
}
},
"@webassemblyjs/helper-code-frame": {
- "version": "1.5.10",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.10.tgz",
- "integrity": "sha512-1mNetGdoMMSW+spR7eC5kJZCA8g9aK7G0t2Mc5Q0p9Kw8p+gFgf9dO7fbThHP/+tNLHM6+SwUQ+S8s4BLhBtZQ==",
+ "version": "1.5.12",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.12.tgz",
+ "integrity": "sha512-0FrJgiST+MQDMvPigzs+UIk1vslLIqGadkEWdn53Lr0NsUC2JbheG9QaO3Zf6ycK2JwsHiUpGaMFcHYXStTPMA==",
"dev": true,
"requires": {
- "@webassemblyjs/wast-printer": "1.5.10"
+ "@webassemblyjs/wast-printer": "1.5.12"
}
},
"@webassemblyjs/helper-fsm": {
- "version": "1.5.10",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.10.tgz",
- "integrity": "sha512-ekKmiumHOJrlzZhrigZ19COsCbqNeHtnRN2wktMIaCHGobW/FW+d4Qv1svc0BetjoXo/DhSgVvhHoxaKSO3yPw==",
+ "version": "1.5.12",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.12.tgz",
+ "integrity": "sha512-QBHZ45VPUJ7UyYKvUFoaxrSS9H5hbkC9U7tdWgFHmnTMutkXSEgDg2gZg3I/QTsiKOCIwx4qJUJwPd7J4D5CNQ==",
"dev": true
},
"@webassemblyjs/helper-module-context": {
- "version": "1.5.10",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.5.10.tgz",
- "integrity": "sha512-ce2KTWDlSCHhJZMOX+bgHGIKwYsx27MWySqffl8pqu9K+M1G4TlZCfRlN1dV85rAhn5OknOAHRBmRtceklY2/g==",
+ "version": "1.5.12",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.5.12.tgz",
+ "integrity": "sha512-SCXR8hPI4JOG3cdy9HAO8W5/VQ68YXG/Hfs7qDf1cd64zWuMNshyEour5NYnLMVkrrtc0XzfVS/MdeV94woFHA==",
"dev": true,
"requires": {
+ "debug": "^3.1.0",
"mamacro": "^0.0.3"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+ "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+ "dev": true,
+ "requires": {
+ "ms": "2.0.0"
+ }
+ }
}
},
"@webassemblyjs/helper-wasm-bytecode": {
- "version": "1.5.10",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.10.tgz",
- "integrity": "sha512-0noYMZDkkUZvHNpcOp9+ElMTwPxIyEWVc1bdjJ38qZTIX9ytCgRifs2DrF/1FfUxzI3d3xXFqrqCFfp+amAOaA==",
+ "version": "1.5.12",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.12.tgz",
+ "integrity": "sha512-0Gz5lQcyvElNVbOTKwjEmIxGwdWf+zpAW/WGzGo95B7IgMEzyyfZU+PrGHDwiSH9c0knol9G7smQnY0ljrSA6g==",
"dev": true
},
"@webassemblyjs/helper-wasm-section": {
- "version": "1.5.10",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.10.tgz",
- "integrity": "sha512-rXH6br9w+CYY/tN+N7MFmnUD5J/D4sBsl1K8liqKGpAXlsGp9SmEeqXy8yBWJ1wH3J3rNGaxQNbk9VR3qZgn0w==",
+ "version": "1.5.12",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.12.tgz",
+ "integrity": "sha512-ge/CKVKBGpiJhFN9PIOQ7sPtGYJhxm/mW1Y3SpG1L6XBunfRz0YnLjW3TmhcOEFozIVyODPS1HZ9f7VR3GBGow==",
"dev": true,
"requires": {
- "@webassemblyjs/ast": "1.5.10",
- "@webassemblyjs/helper-buffer": "1.5.10",
- "@webassemblyjs/helper-wasm-bytecode": "1.5.10",
- "@webassemblyjs/wasm-gen": "1.5.10",
+ "@webassemblyjs/ast": "1.5.12",
+ "@webassemblyjs/helper-buffer": "1.5.12",
+ "@webassemblyjs/helper-wasm-bytecode": "1.5.12",
+ "@webassemblyjs/wasm-gen": "1.5.12",
"debug": "^3.1.0"
},
"dependencies": {
@@ -386,43 +398,43 @@
}
},
"@webassemblyjs/ieee754": {
- "version": "1.5.10",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.5.10.tgz",
- "integrity": "sha512-WWlO5quQd3qOUT4wJiuodh5E1A8BfXYkOueuZZjEPL3budH5snqdWsPDieTqkBJnfCZGwRkRSn14OH4OPY1hsw==",
+ "version": "1.5.12",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.5.12.tgz",
+ "integrity": "sha512-F+PEv9QBzPi1ThLBouUJbuxhEr+Sy/oua1ftXFKHiaYYS5Z9tKPvK/hgCxlSdq+RY4MSG15jU2JYb/K5pkoybg==",
"dev": true,
"requires": {
"ieee754": "^1.1.11"
}
},
"@webassemblyjs/leb128": {
- "version": "1.5.10",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.5.10.tgz",
- "integrity": "sha512-b+DWTy6RsRznpCKvsP3V5yNkk6YWs+7kLOJ3GU1ITyz846VIzVJda+K0mr31fgXzob/QWToWEx8ajk+PrOegkQ==",
+ "version": "1.5.12",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.5.12.tgz",
+ "integrity": "sha512-cCOx/LVGiWyCwVrVlvGmTdnwHzIP4+zflLjGkZxWpYCpdNax9krVIJh1Pm7O86Ox/c5PrJpbvZU1cZLxndlPEw==",
"dev": true,
"requires": {
"leb": "^0.3.0"
}
},
"@webassemblyjs/utf8": {
- "version": "1.5.10",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.5.10.tgz",
- "integrity": "sha512-MQM04pZd0DoxukOPBJD4uaeVQ4iaWzRqsq7iDvJQBqcxIIEwi2iAPv+xjL2PbVwosCvwkh7FzKK3FHVQUjTlTQ==",
+ "version": "1.5.12",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.5.12.tgz",
+ "integrity": "sha512-FX8NYQMiTRU0TfK/tJVntsi9IEKsedSsna8qtsndWVE0x3zLndugiApxdNMIOoElBV9o4j0BUqR+iwU58QfPxQ==",
"dev": true
},
"@webassemblyjs/wasm-edit": {
- "version": "1.5.10",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.10.tgz",
- "integrity": "sha512-mrMZw5A0+p6A58iquzq/d0SJej481H4pNwPO65rEjzDsHs+yykT6de26VQD2GtaCTThfSNcw3JJXWJ1biqO/+g==",
- "dev": true,
- "requires": {
- "@webassemblyjs/ast": "1.5.10",
- "@webassemblyjs/helper-buffer": "1.5.10",
- "@webassemblyjs/helper-wasm-bytecode": "1.5.10",
- "@webassemblyjs/helper-wasm-section": "1.5.10",
- "@webassemblyjs/wasm-gen": "1.5.10",
- "@webassemblyjs/wasm-opt": "1.5.10",
- "@webassemblyjs/wasm-parser": "1.5.10",
- "@webassemblyjs/wast-printer": "1.5.10",
+ "version": "1.5.12",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.12.tgz",
+ "integrity": "sha512-r/oZAyC4EZl0ToOYJgvj+b0X6gVEKQMLT34pNNbtvWBehQOnaSXvVUA5FIYlH8ubWjFNAFqYaVGgQTjR1yuJdQ==",
+ "dev": true,
+ "requires": {
+ "@webassemblyjs/ast": "1.5.12",
+ "@webassemblyjs/helper-buffer": "1.5.12",
+ "@webassemblyjs/helper-wasm-bytecode": "1.5.12",
+ "@webassemblyjs/helper-wasm-section": "1.5.12",
+ "@webassemblyjs/wasm-gen": "1.5.12",
+ "@webassemblyjs/wasm-opt": "1.5.12",
+ "@webassemblyjs/wasm-parser": "1.5.12",
+ "@webassemblyjs/wast-printer": "1.5.12",
"debug": "^3.1.0"
},
"dependencies": {
@@ -438,28 +450,28 @@
}
},
"@webassemblyjs/wasm-gen": {
- "version": "1.5.10",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.10.tgz",
- "integrity": "sha512-MXYoZg7zaRGmU2h2FBa6Oo+y0etuDZycx0h7nrBD4LzVqhufenoWY4Be6K4IMU0L/fRb/GMp17Vfqg4m/J8EuQ==",
+ "version": "1.5.12",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.12.tgz",
+ "integrity": "sha512-LTu+cr1YRxGGiVIXWhei/35lXXEwTnQU18x4V/gE+qCSJN21QcVTMjJuasTUh8WtmBZtOlqJbOQIeN7fGnHWhg==",
"dev": true,
"requires": {
- "@webassemblyjs/ast": "1.5.10",
- "@webassemblyjs/helper-wasm-bytecode": "1.5.10",
- "@webassemblyjs/ieee754": "1.5.10",
- "@webassemblyjs/leb128": "1.5.10",
- "@webassemblyjs/utf8": "1.5.10"
+ "@webassemblyjs/ast": "1.5.12",
+ "@webassemblyjs/helper-wasm-bytecode": "1.5.12",
+ "@webassemblyjs/ieee754": "1.5.12",
+ "@webassemblyjs/leb128": "1.5.12",
+ "@webassemblyjs/utf8": "1.5.12"
}
},
"@webassemblyjs/wasm-opt": {
- "version": "1.5.10",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.10.tgz",
- "integrity": "sha512-1A1rVPa1URgjCmEVZupRgrrbqwfCh6hJVkogK22JNygS+wn1gg1jgjN82Zd3NDhm738TwY61936n3y25GC+mfQ==",
+ "version": "1.5.12",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.12.tgz",
+ "integrity": "sha512-LBwG5KPA9u/uigZVyTsDpS3CVxx3AePCnTItVL+OPkRCp5LqmLsOp4a3/c5CQE0Lecm0Ss9hjUTDcbYFZkXlfQ==",
"dev": true,
"requires": {
- "@webassemblyjs/ast": "1.5.10",
- "@webassemblyjs/helper-buffer": "1.5.10",
- "@webassemblyjs/wasm-gen": "1.5.10",
- "@webassemblyjs/wasm-parser": "1.5.10",
+ "@webassemblyjs/ast": "1.5.12",
+ "@webassemblyjs/helper-buffer": "1.5.12",
+ "@webassemblyjs/wasm-gen": "1.5.12",
+ "@webassemblyjs/wasm-parser": "1.5.12",
"debug": "^3.1.0"
},
"dependencies": {
@@ -475,42 +487,42 @@
}
},
"@webassemblyjs/wasm-parser": {
- "version": "1.5.10",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.10.tgz",
- "integrity": "sha512-VWSi7NWmfEuMpZ0+CTnBzz8qhxw7R17CwmbcJ+QJ0wfqReWEgP/J5yI4mN/C/lEoYuroFUF+sTWoDQqzH4FNdQ==",
+ "version": "1.5.12",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.12.tgz",
+ "integrity": "sha512-xset3+1AtoFYEfMg30nzCGBnhKmTBzbIKvMyLhqJT06TvYV+kA884AOUpUvhSmP6XPF3G+HVZPm/PbCGxH4/VQ==",
"dev": true,
"requires": {
- "@webassemblyjs/ast": "1.5.10",
- "@webassemblyjs/helper-api-error": "1.5.10",
- "@webassemblyjs/helper-wasm-bytecode": "1.5.10",
- "@webassemblyjs/ieee754": "1.5.10",
- "@webassemblyjs/leb128": "1.5.10",
- "@webassemblyjs/wasm-parser": "1.5.10"
+ "@webassemblyjs/ast": "1.5.12",
+ "@webassemblyjs/helper-api-error": "1.5.12",
+ "@webassemblyjs/helper-wasm-bytecode": "1.5.12",
+ "@webassemblyjs/ieee754": "1.5.12",
+ "@webassemblyjs/leb128": "1.5.12",
+ "@webassemblyjs/utf8": "1.5.12"
}
},
"@webassemblyjs/wast-parser": {
- "version": "1.5.10",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.5.10.tgz",
- "integrity": "sha512-RORXT40qjkFgowmFzqGFGBW3fuNd7UKJwyuYXeXLzqQOoPBySE1lsSrku0aQIcVl086dy297A+De5vPCfF/Rfg==",
+ "version": "1.5.12",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.5.12.tgz",
+ "integrity": "sha512-QWUtzhvfY7Ue9GlJ3HeOB6w5g9vNYUUnG+Y96TWPkFHJTxZlcvGfNrUoACCw6eDb9gKaHrjt77aPq41a7y8svg==",
"dev": true,
"requires": {
- "@webassemblyjs/ast": "1.5.10",
- "@webassemblyjs/floating-point-hex-parser": "1.5.10",
- "@webassemblyjs/helper-api-error": "1.5.10",
- "@webassemblyjs/helper-code-frame": "1.5.10",
- "@webassemblyjs/helper-fsm": "1.5.10",
+ "@webassemblyjs/ast": "1.5.12",
+ "@webassemblyjs/floating-point-hex-parser": "1.5.12",
+ "@webassemblyjs/helper-api-error": "1.5.12",
+ "@webassemblyjs/helper-code-frame": "1.5.12",
+ "@webassemblyjs/helper-fsm": "1.5.12",
"long": "^3.2.0",
"mamacro": "^0.0.3"
}
},
"@webassemblyjs/wast-printer": {
- "version": "1.5.10",
- "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.5.10.tgz",
- "integrity": "sha512-n4zZJmnETVc4RRs9wAZQr3dXUwC+Yyx+xwkaWdTk36NqgM89CPVLBpw8htKyKG+BX/tgk+VOXRwO+1x5Cf3J8Q==",
+ "version": "1.5.12",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.5.12.tgz",
+ "integrity": "sha512-XF9RTeckFgDyl196uRKZWHFFfbkzsMK96QTXp+TC0R9gsV9DMiDGMSIllgy/WdrZ3y3dsQp4fTA5r4GoaOBchA==",
"dev": true,
"requires": {
- "@webassemblyjs/ast": "1.5.10",
- "@webassemblyjs/wast-parser": "1.5.10",
+ "@webassemblyjs/ast": "1.5.12",
+ "@webassemblyjs/wast-parser": "1.5.12",
"long": "^3.2.0"
}
},
@@ -2789,10 +2801,13 @@
"dev": true
},
"chrome-trace-event": {
- "version": "0.1.3",
- "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-0.1.3.tgz",
- "integrity": "sha512-sjndyZHrrWiu4RY7AkHgjn80GfAM2ZSzUkZLV/Js59Ldmh6JDThf0SUmOHU53rFu2rVxxfCzJ30Ukcfch3Gb/A==",
- "dev": true
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz",
+ "integrity": "sha512-xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A==",
+ "dev": true,
+ "requires": {
+ "tslib": "^1.9.0"
+ }
},
"ci-info": {
"version": "1.1.3",
@@ -5870,14 +5885,12 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"minipass": {
"version": "2.2.4",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"safe-buffer": "^5.1.1",
"yallist": "^3.0.0"
@@ -5896,7 +5909,6 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
- "optional": true,
"requires": {
"minimist": "0.0.8"
}
@@ -6076,8 +6088,7 @@
"safe-buffer": {
"version": "5.1.1",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
},
"safer-buffer": {
"version": "2.1.2",
@@ -6183,8 +6194,7 @@
"yallist": {
"version": "3.0.2",
"bundled": true,
- "dev": true,
- "optional": true
+ "dev": true
}
}
},
@@ -6695,9 +6705,9 @@
}
},
"hash.js": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz",
- "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==",
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.4.tgz",
+ "integrity": "sha512-A6RlQvvZEtFS5fLU43IDu0QUmBy+fDO9VMdTXvufKwIkt/rFfvICAViCax5fbDO4zdNzaC3/27ZhKUok5bAJyw==",
"dev": true,
"requires": {
"inherits": "^2.0.3",
@@ -7042,9 +7052,9 @@
}
},
"ieee754": {
- "version": "1.1.11",
- "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.11.tgz",
- "integrity": "sha512-VhDzCKN7K8ufStx/CLj5/PDTMgph+qwN5Pkd5i0sGnVwk56zJ0lkT8Qzi1xqWLS0Wp29DgDtNeS7v8/wMoZeHg==",
+ "version": "1.1.12",
+ "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz",
+ "integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==",
"dev": true
},
"iferr": {
@@ -8829,9 +8839,9 @@
}
},
"jss": {
- "version": "9.8.2",
- "resolved": "https://registry.npmjs.org/jss/-/jss-9.8.2.tgz",
- "integrity": "sha512-XwuTvKBI0DLnTA8elQGag6Fru7g7DwQAuaCylPR0Kj0ztHRbGll5Wg42W6zoiC0EXyF+/L5APjBddrmvUUL0dA==",
+ "version": "9.8.3",
+ "resolved": "https://registry.npmjs.org/jss/-/jss-9.8.3.tgz",
+ "integrity": "sha512-3rywJZAmUTsxS07Af7ww3c4syWwXplQKhZnrgY4QIMuO5047LgF+heowaWdbbkykyREe3TauDcqp4wEpIlRLWw==",
"requires": {
"is-in-browser": "^1.1.3",
"symbol-observable": "^1.1.0",
@@ -11792,9 +11802,9 @@
}
},
"react": {
- "version": "16.4.0",
- "resolved": "https://registry.npmjs.org/react/-/react-16.4.0.tgz",
- "integrity": "sha512-K0UrkLXSAekf5nJu89obKUM7o2vc6MMN9LYoKnCa+c+8MJRAT120xzPLENcWSRc7GYKIg0LlgJRDorrufdglQQ==",
+ "version": "16.4.1",
+ "resolved": "https://registry.npmjs.org/react/-/react-16.4.1.tgz",
+ "integrity": "sha512-3GEs0giKp6E0Oh/Y9ZC60CmYgUPnp7voH9fbjWsvXtYFb4EWtgQub0ADSq0sJR0BbHc4FThLLtzlcFaFXIorwg==",
"requires": {
"fbjs": "^0.8.16",
"loose-envify": "^1.1.0",
@@ -11848,9 +11858,9 @@
}
},
"react-dom": {
- "version": "16.4.0",
- "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.4.0.tgz",
- "integrity": "sha512-bbLd+HYpBEnYoNyxDe9XpSG2t9wypMohwQPvKw8Hov3nF7SJiJIgK56b46zHpBUpHb06a1iEuw7G3rbrsnNL6w==",
+ "version": "16.4.1",
+ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.4.1.tgz",
+ "integrity": "sha512-1Gin+wghF/7gl4Cqcvr1DxFX2Osz7ugxSwl6gBqCMpdrxHjIFUS7GYxrFftZ9Ln44FHw0JxCFD9YtZsrbR5/4A==",
"requires": {
"fbjs": "^0.8.16",
"loose-envify": "^1.1.0",
@@ -11859,13 +11869,23 @@
}
},
"react-event-listener": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/react-event-listener/-/react-event-listener-0.6.0.tgz",
- "integrity": "sha512-CqewJSQ/0p09oPZ9BABNvoFhGMhUAuLQ4B4skPsZXxxgOBx+2SP3AgM9lP7zc68pRmJXlCQBDjgOAQsp1jnhAQ==",
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/react-event-listener/-/react-event-listener-0.6.1.tgz",
+ "integrity": "sha1-QceoCmazmMJ91RHiJxKwLz1OzMo=",
"requires": {
"@babel/runtime": "^7.0.0-beta.42",
"prop-types": "^15.6.0",
- "warning": "^3.0.0"
+ "warning": "^4.0.1"
+ },
+ "dependencies": {
+ "warning": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.1.tgz",
+ "integrity": "sha512-rAVtTNZw+cQPjvGp1ox0XC5Q2IBFyqoqh+QII4J/oguyu83Bax1apbo2eqB8bHRS+fqYUBagys6lqUoVwKSmXQ==",
+ "requires": {
+ "loose-envify": "^1.0.0"
+ }
+ }
}
},
"react-fast-compare": {
@@ -11874,17 +11894,17 @@
"integrity": "sha512-dcQpdWr62flXQJuM8/bVEY5/10ad2SYBUafp8H4q4WHR3fTA/MMlp8mpzX12I0CCoEJc1P6QdiMg7U+7lFS6Rw=="
},
"react-is": {
- "version": "16.4.0",
- "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.4.0.tgz",
- "integrity": "sha512-8ADZg/mBw+t2Fbr5Hm1K64v8q8Q6E+DprV5wQ5A8PSLW6XP0XJFMdUskVEW8efQ5oUgWHn8EYdHEPAMF0Co6hA==",
+ "version": "16.4.1",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.4.1.tgz",
+ "integrity": "sha512-xpb0PpALlFWNw/q13A+1aHeyJyLYCg0/cCHPUA43zYluZuIPHaHL3k8OBsTgQtxqW0FhyDEMvi8fZ/+7+r4OSQ==",
"dev": true
},
"react-jss": {
- "version": "8.4.0",
- "resolved": "https://registry.npmjs.org/react-jss/-/react-jss-8.4.0.tgz",
- "integrity": "sha512-yIi4udcTIIh5u4KJ47wsL3UZYMuSrp5xR1YBvPeRNshpCdRoJxt5BWmCu1RA3LIa+//dnRsAtAQmMAYeg1W9oQ==",
+ "version": "8.5.1",
+ "resolved": "https://registry.npmjs.org/react-jss/-/react-jss-8.5.1.tgz",
+ "integrity": "sha512-5R3qCdGkE+K0+B4tuRyx8idLV7q2pT1QbGomGqberCQ/xLKEQbDukH7ER2QLkpIYqtRkeciG9S03uDJwC1o2gw==",
"requires": {
- "hoist-non-react-statics": "^2.3.1",
+ "hoist-non-react-statics": "^2.5.0",
"jss": "^9.7.0",
"jss-preset-default": "^4.3.0",
"prop-types": "^15.6.0",
@@ -11970,24 +11990,24 @@
}
},
"react-redux-toastr": {
- "version": "7.2.6",
- "resolved": "https://registry.npmjs.org/react-redux-toastr/-/react-redux-toastr-7.2.6.tgz",
- "integrity": "sha512-ANMTPELu0gkTpxSV8Q54m0OiPrZWV6T+hb/Psn05vXtKBhC4ObCtH6AMobHh19hmMHy8/Shaj+gcpKIVWv7KYw==",
+ "version": "7.3.0",
+ "resolved": "https://registry.npmjs.org/react-redux-toastr/-/react-redux-toastr-7.3.0.tgz",
+ "integrity": "sha512-JyhhzhVqK3J9B+DRwWgXWA66TkLQg7jAgO/SdB+8Pb1QvsnPfQ4EGH9KV4MC7xCVAntPKWDgyRhjqCxZU6QfEg==",
"requires": {
"classnames": "^2.2.3",
"eventemitter3": "^2.0.3"
}
},
"react-test-renderer": {
- "version": "16.4.0",
- "resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.4.0.tgz",
- "integrity": "sha512-Seh1t9xFY6TKiV/hRlPzUkqX1xHOiKIMsctfU0cggo1ajsLjoIJFL520LlrxV+4/VIj+clrCeH6s/aVv/vTStg==",
+ "version": "16.4.1",
+ "resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.4.1.tgz",
+ "integrity": "sha512-wyyiPxRZOTpKnNIgUBOB6xPLTpIzwcQMIURhZvzUqZzezvHjaGNsDPBhMac5fIY3Jf5NuKxoGvV64zDSOECPPQ==",
"dev": true,
"requires": {
"fbjs": "^0.8.16",
"object-assign": "^4.1.1",
"prop-types": "^15.6.0",
- "react-is": "^16.4.0"
+ "react-is": "^16.4.1"
}
},
"react-themeable": {
@@ -12727,6 +12747,7 @@
"version": "1.1.11",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -12895,6 +12916,7 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@@ -14862,21 +14884,21 @@
"dev": true
},
"webpack": {
- "version": "4.11.1",
- "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.11.1.tgz",
- "integrity": "sha512-8HGSxsLm9LTVgYiyfjY849c3Rgtb0bI0fPpdQsMmO6Hg8JXUOCudGD3j6sPfo6DaAdti1icUUZNh8XpY3igHqQ==",
+ "version": "4.12.0",
+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.12.0.tgz",
+ "integrity": "sha512-EJj2FfhgtjrTbJbJaNulcVpDxi9vsQVvTahHN7xJvIv6W+k4r/E6Hxy4eyOrj+IAFWqYgaUtnpxmSGYP8MSZJw==",
"dev": true,
"requires": {
- "@webassemblyjs/ast": "1.5.10",
- "@webassemblyjs/helper-module-context": "1.5.10",
- "@webassemblyjs/wasm-edit": "1.5.10",
- "@webassemblyjs/wasm-opt": "1.5.10",
- "@webassemblyjs/wasm-parser": "1.5.10",
- "acorn": "^5.0.0",
+ "@webassemblyjs/ast": "1.5.12",
+ "@webassemblyjs/helper-module-context": "1.5.12",
+ "@webassemblyjs/wasm-edit": "1.5.12",
+ "@webassemblyjs/wasm-opt": "1.5.12",
+ "@webassemblyjs/wasm-parser": "1.5.12",
+ "acorn": "^5.6.2",
"acorn-dynamic-import": "^3.0.0",
"ajv": "^6.1.0",
"ajv-keywords": "^3.1.0",
- "chrome-trace-event": "^0.1.1",
+ "chrome-trace-event": "^1.0.0",
"enhanced-resolve": "^4.0.0",
"eslint-scope": "^3.7.1",
"json-parse-better-errors": "^1.0.2",
@@ -14892,6 +14914,14 @@
"uglifyjs-webpack-plugin": "^1.2.4",
"watchpack": "^1.5.0",
"webpack-sources": "^1.0.1"
+ },
+ "dependencies": {
+ "acorn": {
+ "version": "5.7.1",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz",
+ "integrity": "sha512-d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ==",
+ "dev": true
+ }
}
},
"webpack-addons": {
@@ -15341,9 +15371,9 @@
}
},
"webpack-merge": {
- "version": "4.1.2",
- "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.2.tgz",
- "integrity": "sha512-/0QYwW/H1N/CdXYA2PNPVbsxO3u2Fpz34vs72xm03SRfg6bMNGfMJIQEpQjKRvkG2JvT6oRJFpDtSrwbX8Jzvw==",
+ "version": "4.1.3",
+ "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.3.tgz",
+ "integrity": "sha512-zxwAIGK7nKdu5CIZL0BjTQoq3elV0t0MfB7rUC1zj668geid52abs6hN/ACwZdK6LeMS8dC9B6WmtF978zH5mg==",
"dev": true,
"requires": {
"lodash": "^4.17.5"
diff --git a/package.json b/package.json
index c6edf3235a6ed8d86b5e46849add88e103aebd5e..75201a8078caae4054800f861d95a3908a1eeb5c 100644
--- a/package.json
+++ b/package.json
@@ -43,17 +43,17 @@
"html-webpack-plugin": "^3.0.7",
"jest": "^22.4.4",
"jest-enzyme": "^6.0.1",
- "react-test-renderer": "^16.4.0",
+ "react-test-renderer": "^16.4.1",
"style-loader": "^0.20.3",
- "webpack": "^4.11.1",
+ "webpack": "^4.12.0",
"webpack-cli": "^2.1.5",
"webpack-dev-server": "^3.1.4",
- "webpack-merge": "^4.1.2"
+ "webpack-merge": "^4.1.3"
},
"dependencies": {
- "@material-ui/core": "^1.2.0",
+ "@material-ui/core": "^1.2.1",
"@material-ui/icons": "^1.1.0",
- "@material-ui/lab": "^1.0.0-alpha.4",
+ "@material-ui/lab": "^1.0.0-alpha.5",
"autosuggest-highlight": "^3.1.1",
"babel-preset-stage-2": "^6.24.1",
"bootstrap": "^4.1.1",
@@ -64,19 +64,19 @@
"leaflet.markercluster": "^1.3.0",
"lodash": "^4.17.10",
"mui-datatables": "^2.0.0-beta-8",
- "react": "^16.4.0",
+ "react": "^16.4.1",
"react-alert-template-basic": "^1.0.0",
"react-autosuggest": "^9.3.4",
"react-data-grid": "^4.0.7",
"react-data-grid-addons": "^4.0.8",
- "react-dom": "^16.4.0",
+ "react-dom": "^16.4.1",
"react-leaflet": "^1.9.1",
"react-leaflet-control": "^1.4.1",
"react-leaflet-fullscreen": "0.0.6",
"react-leaflet-google": "^3.3.0",
"react-leaflet-markercluster": "^1.1.8",
"react-redux": "^5.0.7",
- "react-redux-toastr": "^7.2.6",
+ "react-redux-toastr": "^7.3.0",
"react-virtualized": "^9.19.1",
"redux": "^4.0.0",
"redux-observable": "^0.18.0",
diff --git a/src/client/components/VirtualizedTable.js b/src/client/components/VirtualizedTable.js
index 293fc288192e47e59cf8db7ecb5cf123525baff9..8a89e668df2d3ea6014db15be211551c715245a3 100644
--- a/src/client/components/VirtualizedTable.js
+++ b/src/client/components/VirtualizedTable.js
@@ -6,12 +6,11 @@ import {
Column,
Table,
SortDirection,
- SortIndicator
} from 'react-virtualized';
import { withStyles } from '@material-ui/core/styles';
const styles = theme => ({
- root: {
+ Table: {
width: '100%',
marginTop: theme.spacing.unit * 25,
},
@@ -48,7 +47,8 @@ class VirtualizedTable extends React.PureComponent {
constructor(props) {
super(props);
- const sortBy = 'source';
+ //const sortBy = 'broaderAreaLabel';
+ const sortBy = 'typeLabel';
const sortDirection = SortDirection.ASC;
const sortedList = this._sortList({sortBy, sortDirection});
@@ -68,7 +68,6 @@ class VirtualizedTable extends React.PureComponent {
};
this._getRowHeight = this._getRowHeight.bind(this);
- this._headerRenderer = this._headerRenderer.bind(this);
this._noRowsRenderer = this._noRowsRenderer.bind(this);
this._onRowCountChange = this._onRowCountChange.bind(this);
this._onScrollToRowChange = this._onScrollToRowChange.bind(this);
@@ -158,15 +157,6 @@ class VirtualizedTable extends React.PureComponent {
return this._getDatum(list, index).size;
}
- _headerRenderer({dataKey, sortBy, sortDirection}) {
- return (
- <div>
- Full Name
- {sortBy === dataKey && <SortIndicator sortDirection={sortDirection} />}
- </div>
- );
- }
-
_noRowsRenderer() {
const { classes } = this.props;
return <div className={classes.noRows}>No rows</div>;
@@ -209,6 +199,8 @@ class VirtualizedTable extends React.PureComponent {
_sortList({sortBy, sortDirection}) {
const list = this.props.list;
+ //console.log(list);
+ //console.log(list.sortBy(item => item[sortBy]));
return list
.sortBy(item => item[sortBy])
diff --git a/src/client/containers/MapApp.js b/src/client/containers/MapApp.js
index 9fe68e92d8017d01313bf7066d86d769858509fc..c60c61ca3409ced1f75a49e4dd7dc687a0e6de94 100644
--- a/src/client/containers/MapApp.js
+++ b/src/client/containers/MapApp.js
@@ -120,7 +120,6 @@ let MapApp = (props) => {
const { classes, error, theme, drawerIsOpen, mapReady } = props;
const anchor = 'left';
- //console.log(props.search.results)
let resultList = [];
if (props.search.results.length > 0) {
resultList = Immutable.List(props.search.results);