Merge pull request #83 from NuCivic/update-packages

Update packages
NuCivic · Oct 17, 2017 · 3896047 · 3896047
2 parents 9c29e93 + 42a8dcb
commit 3896047
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 7 deletions.
diff --git a/examples/settings.js b/examples/settings.js
@@ -64,7 +64,7 @@ export var settings = {
       fetchData: {
         type: 'backend',
         backend: 'csv',
-        url: 'https://dl.dropboxusercontent.com/u/73703010/react_dash_data_0.4/climate_indices.csv'
+        url: 'https://nucivic.github.io/react-dash/data/climate_indices.csv'
       },
     }
     // end dataResources example
@@ -79,11 +79,11 @@ export var settings = {
           type: 'Autocomplete',
           className: 'col-md-6',
           name: 'specialty-autocomplete',
-          id: 'specialty-autocomplete',
+          key: 'specialty-autocomplete',
           className: 'specialty-autocomplete',
           field: 'YearMonth',
           action: 'filter', // sort / groupBy / etc
-          willFilter: ['climateData'], // array of dkanDataResources keys that filters affect 
+          willFilter: ['climateData'], // array of dkanDataResources keys that filters affect
           data: [
             [
               { label: '2010', value: '2010' },
@@ -100,11 +100,13 @@ export var settings = {
     },
     {
       id: 'metrics-row',
+      key: 'metrics-row',
       className: 'row',
       children: [
         {
           type: 'Metric',
           cardStyle: 'metric',
+          key: 'metrics-row1',
           iconClass: 'fa fa-level-up',
           className: 'col-md-4',
           background: "#00b3b3",
@@ -125,6 +127,7 @@ export var settings = {
         {
           type: 'Metric',
           cardStyle: 'metric',
+          key: 'metrics-row2',
           iconClass: 'fa fa-level-down',
           className: 'col-md-4',
           background: '#009999',
@@ -138,7 +141,8 @@ export var settings = {
         },
         {
           type: 'Metric',
-          cardStyle: 'metric',     
+          cardStyle: 'metric',
+          key: 'metrics-row3',
           iconClass: 'fa fa-fire',
           className: 'col-md-4',
           caption: 'Average Temp/',
@@ -159,6 +163,7 @@ export var settings = {
         // choropleth
         {
           type: 'Choropleth',
+          key: 'map-row-1',
           cardStyle: 'map',
           iconClass: 'fa fa-balance-scale',
           header: 'Palmer Hydrological Drought Index',
@@ -172,7 +177,7 @@ export var settings = {
           dataKeyField: 'name',
           dataValueField: 'PHDI',
           geometryKeyField: 'name',
-          geometry: 'https://dl.dropboxusercontent.com/u/73703010/react_dash_data_0.4/map/usa.json', // topojson or geojson
+          geometry: 'https://nucivic.github.io/react-dash/data/map/usa.json', // topojson or geojson
           projection: 'albersUsa', // https://github.com/d3/d3/wiki/Geo-Projections
           scaleDenominator: .75,
           borderColor: 'yellow',
@@ -203,6 +208,7 @@ export var settings = {
       children: [
         {
           type: 'Chart',
+          key: 'chart-row-1',
           cardStyle: 'chart',
           header: 'Standard Precipitation Index',
           iconClass: 'fa fa-cloud',

diff --git a/package.json b/package.json
@@ -76,11 +76,14 @@
     "d3": "^3.5.16",
     "dkan-es6-data-backend": "git+https://github.com/NuCivic/dkan-es6-data-backend.git",
     "fetch-polyfill": "^0.8.2",
+    "fixed-data-table": "^0.6.4",
     "fixed-data-table-2": "^0.7.15",
     "flux": "^2.1.1",
     "geojson": "^0.3.0",
     "lodash": "^4.6.1",
+    "react": "15.6.2",
     "react-collapsible": "^1.4.0",
+    "react-dom": "15.6.2",
     "react-input-autosize": "1.1.0",
     "react-nvd3": "git+https://github.com/NuCivic/react-nvd3.git",
     "react-responsive-accordion": "git+https://github.com/NuCivic/react-responsive-accordion#master",

diff --git a/yarn.lock b/yarn.lock
@@ -1509,6 +1509,14 @@ create-react-class@^15.5.2:
     loose-envify "^1.3.1"
     object-assign "^4.1.1"
 
+create-react-class@^15.6.0:
+  version "15.6.2"
+  resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.2.tgz#cf1ed15f12aad7f14ef5f2dfe05e6c42f91ef02a"
+  dependencies:
+    fbjs "^0.8.9"
+    loose-envify "^1.3.1"
+    object-assign "^4.1.1"
+
 cross-spawn@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
@@ -2230,6 +2238,12 @@ fixed-data-table-2@^0.7.15:
     create-react-class "^15.5.2"
     prop-types "^15.5.8"
 
+fixed-data-table@^0.6.4:
+  version "0.6.4"
+  resolved "https://registry.yarnpkg.com/fixed-data-table/-/fixed-data-table-0.6.4.tgz#48c420d053b15d836832311f470ffad7356b6573"
+  dependencies:
+    prop-types "^15.5.0"
+
 flatten@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
@@ -3243,7 +3257,7 @@ longest@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
 
-loose-envify@^1.0.0, loose-envify@^1.2.0, loose-envify@^1.3.1:
+loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
   dependencies:
@@ -4095,7 +4109,7 @@ promise@^7.0.3, promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
-prop-types@^15.5.4, prop-types@^15.5.8:
+prop-types@^15.5.0, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.8:
   version "15.5.10"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.10.tgz#2797dfc3126182e3a95e3dfbb2e893ddd7456154"
   dependencies:
@@ -4224,6 +4238,15 @@ react-deep-force-update@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/react-deep-force-update/-/react-deep-force-update-2.0.1.tgz#4f7f6c12c3e7de42f345992a3c518236fa1ecad3"
 
+[email protected]:
+  version "15.6.2"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.2.tgz#41cfadf693b757faf2708443a1d1fd5a02bef730"
+  dependencies:
+    fbjs "^0.8.9"
+    loose-envify "^1.1.0"
+    object-assign "^4.1.0"
+    prop-types "^15.5.10"
+
 react-hot-loader@^3.0.0-beta.6:
   version "3.0.0-beta.7"
   resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-3.0.0-beta.7.tgz#d5847b8165d731c4d5b30d86d5d4716227a0fa83"
@@ -4273,6 +4296,16 @@ react-router@^2.7.0:
     classnames "^2.2.4"
     react-input-autosize "^1.1.0"
 
+[email protected]:
+  version "15.6.2"
+  resolved "https://registry.yarnpkg.com/react/-/react-15.6.2.tgz#dba0434ab439cfe82f108f0f511663908179aa72"
+  dependencies:
+    create-react-class "^15.6.0"
+    fbjs "^0.8.9"
+    loose-envify "^1.1.0"
+    object-assign "^4.1.0"
+    prop-types "^15.5.10"
+
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"