From 1d2c322082d45c158985c12ef324398314034bed Mon Sep 17 00:00:00 2001
From: Alex Windett <windettalex@gmail.com>
Date: Wed, 25 Jan 2017 13:50:27 +0000
Subject: [PATCH 01/32] adding in functionality to determin current
 organisation when changing member role

---
 .../src/components/people-list/table/index.js |  5 ++++-
 .../people-list/table/person-role.js          |  5 ++++-
 .../components/people-list/table/tooltip.js   |  5 ++++-
 frontend/src/containers/org/people.js         |  4 +++-
 frontend/src/state/reducers/orgs.js           | 20 ++++++++++---------
 frontend/src/state/selectors.js               |  6 ++++++
 package.json                                  |  3 ++-
 yarn.lock                                     |  9 ++++++---
 8 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/frontend/src/components/people-list/table/index.js b/frontend/src/components/people-list/table/index.js
index ddc7fb5c..53fb9dbf 100644
--- a/frontend/src/components/people-list/table/index.js
+++ b/frontend/src/components/people-list/table/index.js
@@ -13,7 +13,8 @@ const PeopleTable = (props) => {
     handleRoleUpdate,
     handleStatusTooltip,
     people = [],
-    orgUI = {}
+    orgUI = {},
+    orgIndex
   } = props;
 
   const columns = [{
@@ -49,6 +50,7 @@ const PeopleTable = (props) => {
         handleRoleTooltip={handleRoleTooltip}
         handleRoleUpdate={handleRoleUpdate}
         membersRolesOptions={orgUI.members_roles}
+        orgIndex={orgIndex}
         person={person}
         personIndex={index}
         toggledID={orgUI.member_role_tooltip}
@@ -76,6 +78,7 @@ PeopleTable.propTypes = {
   handleRoleTooltip: React.PropTypes.func,
   handleRoleUpdate: React.PropTypes.func,
   handleStatusTooltip: React.PropTypes.func,
+  orgIndex: React.PropTypes.number,
   orgUI: React.PropTypes.object,
   people: React.PropTypes.array,
 };
diff --git a/frontend/src/components/people-list/table/person-role.js b/frontend/src/components/people-list/table/person-role.js
index da48ed25..856026c2 100644
--- a/frontend/src/components/people-list/table/person-role.js
+++ b/frontend/src/components/people-list/table/person-role.js
@@ -54,7 +54,8 @@ const PersonRole = (props) => {
     person,
     personIndex,
     handleRoleTooltip,
-    handleRoleUpdate
+    handleRoleUpdate,
+    orgIndex
   } = props;
 
   const toggled = toggledID;
@@ -78,6 +79,7 @@ const PersonRole = (props) => {
         ? <Tooltip
           handleSelect={handleOptionSelect}
           options={membersRolesOptions}
+          orgIndex={orgIndex}
           person={_person}
           personIndex={personIndex}
           />
@@ -90,6 +92,7 @@ PersonRole.propTypes = {
   handleRoleTooltip: React.PropTypes.func,
   handleRoleUpdate: React.PropTypes.func,
   membersRolesOptions: React.PropTypes.array,
+  orgIndex: React.PropTypes.number,
   person: React.PropTypes.object,
   personIndex: React.PropTypes.number,
   toggledID: React.PropTypes.oneOfType([
diff --git a/frontend/src/components/people-list/table/tooltip.js b/frontend/src/components/people-list/table/tooltip.js
index 80cc6294..a24fd3a5 100644
--- a/frontend/src/components/people-list/table/tooltip.js
+++ b/frontend/src/components/people-list/table/tooltip.js
@@ -18,6 +18,7 @@ module.exports = ({
   person = {},
   personIndex,
   options = [],
+  orgIndex,
 }) => {
 
   const _options = options.map( (option, i) => {
@@ -28,7 +29,8 @@ module.exports = ({
         status: person.status,
         role: option
       },
-      personIndex
+      personIndex,
+      orgIndex,
     };
 
     const _onClick = () => handleSelect(payload);
@@ -59,6 +61,7 @@ module.exports = ({
 module.exports.propTypes = {
   handleSelect: React.PropTypes.func,
   options: React.PropTypes.array,
+  orgIndex: React.PropTypes.number,
   person: React.PropTypes.object,
   personIndex: React.PropTypes.number,
 };
\ No newline at end of file
diff --git a/frontend/src/containers/org/people.js b/frontend/src/containers/org/people.js
index 3e56bac1..c7707fb6 100644
--- a/frontend/src/containers/org/people.js
+++ b/frontend/src/containers/org/people.js
@@ -12,7 +12,8 @@ const {
 const {
   peopleByOrgIdSelector,
   orgUISelector,
-  membersSelector
+  orgIndexSelector,
+  membersSelector,
 } = selectors;
 
 const {
@@ -36,6 +37,7 @@ const mapStateToProps = (state, {
 }) => ({
   people: peopleByOrgIdSelector(params.org)(state),
   orgUI: orgUISelector(state),
+  orgIndex: orgIndexSelector(params.org)(state),
   platformMembers: membersSelector(state)
 });
 
diff --git a/frontend/src/state/reducers/orgs.js b/frontend/src/state/reducers/orgs.js
index 896ff027..dce5f5bb 100644
--- a/frontend/src/state/reducers/orgs.js
+++ b/frontend/src/state/reducers/orgs.js
@@ -48,9 +48,11 @@ module.exports = handleActions({
     };
   },
   [handleRoleUpdate.toString()]: (state, action) => {
-    // TODO:
-    // Change "1" to org index. At the moment only updates
-    // "biz-tech"
+    const {
+      orgIndex,
+      person,
+      personIndex,
+    } = action.payload;
 
     return {
       ...state,
@@ -59,18 +61,18 @@ module.exports = handleActions({
         member_role_tooltip: false
       },
       data: [
-        ...state.data.slice(0, 1),
+        ...state.data.slice(0, orgIndex),
         {
-          ...state.data[1],
+          ...state.data[orgIndex],
           members: [
-            ...state.data[1].members.slice(0, action.payload.personIndex),
+            ...state.data[orgIndex].members.slice(0, personIndex),
             {
-              ...action.payload.person
+              ...person,
             },
-            ...state.data[1].members.slice(action.payload.personIndex + 1)
+            ...state.data[orgIndex].members.slice(personIndex + 1)
           ]
         },
-        ...state.data.slice(1+1),
+        ...state.data.slice(orgIndex + 1),
       ]
     };
   }
diff --git a/frontend/src/state/selectors.js b/frontend/src/state/selectors.js
index 9e6700c9..b9f83dfb 100644
--- a/frontend/src/state/selectors.js
+++ b/frontend/src/state/selectors.js
@@ -35,6 +35,11 @@ const orgById = (orgId) => createSelector(
   (orgs) => find(orgs, ['id', orgId])
 );
 
+const orgIndexById = (orgId) => createSelector(
+  orgs,
+  (orgs) => orgs.map((o) => o.id).indexOf(orgId)
+);
+
 const serviceById = (serviceId) => createSelector(
   [services],
   (services) => find(services, ['id', serviceId])
@@ -140,6 +145,7 @@ module.exports = {
   orgByIdSelector: orgById,
   orgsSelector: orgs,
   orgUISelector: orgUI,
+  orgIndexSelector: orgIndexById,
   servicesSelector: services,
   serviceByIdSelector: serviceById,
   orgSectionsSelector: orgSections,
diff --git a/package.json b/package.json
index 538e8eaf..025e1df5 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,8 @@
   },
   "dependencies": {
     "husky": "^0.11.9",
-    "license-to-fail": "^2.2.0"
+    "license-to-fail": "^2.2.0",
+    "lodash.findindex": "^4.6.0"
   },
   "devDependencies": {
     "tap-xunit": "^1.4.0"
diff --git a/yarn.lock b/yarn.lock
index 4e0ab1a9..89ef85a5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1,7 +1,5 @@
 # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
 # yarn lockfile v1
-
-
 abbrev@1:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"
@@ -136,7 +134,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@~2.0.1:
+inherits@~2.0.1, inherits@2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
@@ -190,6 +188,10 @@ license-to-fail@^2.2.0:
   dependencies:
     license-checker "^7.1.0"
 
+lodash.findindex:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.findindex/-/lodash.findindex-4.6.0.tgz#a3245dee61fb9b6e0624b535125624bb69c11106"
+
 lodash@^3.5.0:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
@@ -389,3 +391,4 @@ xmlbuilder@~4.1.0:
 xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+

From a9b789d8612dbb2ed73efa8786596fd85d03a675 Mon Sep 17 00:00:00 2001
From: Alex Windett <windettalex@gmail.com>
Date: Wed, 25 Jan 2017 13:58:12 +0000
Subject: [PATCH 02/32] regenerating yarn.lock files

---
 frontend/yarn.lock | 334 +++++++++++++++++++++-----------------
 ui/yarn.lock       |   1 +
 yarn.lock          | 394 ---------------------------------------------
 3 files changed, 187 insertions(+), 542 deletions(-)
 delete mode 100644 yarn.lock

diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 02bdb635..1f9a3e7e 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -1,10 +1,8 @@
 # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
 # yarn lockfile v1
-
-
 "@tomgco/joyent-portal-ui@alpha":
-  version "0.0.1-530"
-  resolved "https://registry.yarnpkg.com/@tomgco/joyent-portal-ui/-/joyent-portal-ui-0.0.1-530.tgz#fbaff494298f40d040462bf39b0f5ce35748e308"
+  version "0.0.1-554"
+  resolved "https://registry.yarnpkg.com/@tomgco/joyent-portal-ui/-/joyent-portal-ui-0.0.1-554.tgz#de27c9ff4b630e32303d333690144bdc08401f85"
   dependencies:
     build-array "^1.0.0"
     chart.js "^2.4.0"
@@ -77,10 +75,6 @@ acorn-jsx@^3.0.0, acorn-jsx@^3.0.1:
   dependencies:
     acorn "^3.0.4"
 
-acorn@>=2.5.2, acorn@^4.0.1, acorn@^4.0.3, acorn@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.4.tgz#17a8d6a7a6c4ef538b814ec9abac2779293bf30a"
-
 acorn@^2.1.0, acorn@^2.4.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-2.7.0.tgz#ab6e7d9d886aaca8b085bc3312b79a198433f0e7"
@@ -89,13 +83,17 @@ acorn@^3.0.4:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
 
+acorn@^4.0.1, acorn@^4.0.3, acorn@^4.0.4, acorn@>=2.5.2:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.4.tgz#17a8d6a7a6c4ef538b814ec9abac2779293bf30a"
+
 ajv-keywords@^1.0.0, ajv-keywords@^1.1.1:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.0.tgz#c11e6859eafff83e0dafc416929472eca946aa2c"
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
 
 ajv@^4.7.0:
-  version "4.10.4"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.10.4.tgz#c0974dd00b3464984892d6010aa9c2c945933254"
+  version "4.11.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.2.tgz#f166c3c11cbc6cb9dcc102a5bcfe5b72c95287e6"
   dependencies:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
@@ -232,11 +230,11 @@ array-unique@^0.2.1:
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
 
 array.prototype.find@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.0.1.tgz#1557f888df6c57e4d1256f20852d687a25b51fde"
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.0.3.tgz#08c3ec33e32ec4bab362a2958e686ae92f59271d"
   dependencies:
     define-properties "^1.1.2"
-    es-abstract "^1.5.0"
+    es-abstract "^1.7.0"
 
 arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
@@ -299,14 +297,14 @@ auto-bind@^0.1.0:
   resolved "https://registry.yarnpkg.com/auto-bind/-/auto-bind-0.1.0.tgz#7a29efc8c2388d3d578e02fc2df531c81ffc1ee1"
 
 autoprefixer@^6.3.1:
-  version "6.6.1"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.6.1.tgz#11a4077abb4b313253ec2f6e1adb91ad84253519"
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.0.tgz#88992cf04df141e7b8293550f2ee716c565d1cae"
   dependencies:
-    browserslist "~1.5.1"
-    caniuse-db "^1.0.30000604"
+    browserslist "~1.6.0"
+    caniuse-db "^1.0.30000613"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^5.2.8"
+    postcss "^5.2.11"
     postcss-value-parser "^3.2.3"
 
 ava-files@^0.2.0:
@@ -1381,11 +1379,12 @@ browserify-zlib@^0.1.4:
   dependencies:
     pako "~0.2.0"
 
-browserslist@^1.0.1, browserslist@^1.4.0, browserslist@^1.5.2, browserslist@~1.5.1:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.5.2.tgz#1c82fde0ee8693e6d15c49b7bff209dc06298c56"
+browserslist@^1.0.1, browserslist@^1.4.0, browserslist@^1.5.2, browserslist@~1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.6.0.tgz#85fb7c993540d3fda31c282baf7f5aee698ac9ee"
   dependencies:
-    caniuse-db "^1.0.30000604"
+    caniuse-db "^1.0.30000613"
+    electron-to-chromium "^1.2.0"
 
 buf-compare@^1.0.0:
   version "1.0.1"
@@ -1499,9 +1498,9 @@ caniuse-api@^1.5.2:
     lodash.uniq "^4.3.0"
     shelljs "^0.7.0"
 
-caniuse-db@^1.0.30000346, caniuse-db@^1.0.30000604:
-  version "1.0.30000613"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000613.tgz#639133b7a5380c1416f9701d23d54d093dd68299"
+caniuse-db@^1.0.30000346, caniuse-db@^1.0.30000613:
+  version "1.0.30000615"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000615.tgz#605bc071db4c5031acfb5e469c3b50a531dd5d04"
 
 capture-stack-trace@^1.0.0:
   version "1.0.0"
@@ -1757,21 +1756,21 @@ colormin@^1.0.5:
     css-color-names "0.0.4"
     has "^1.0.1"
 
-colors@0.5.x:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-0.5.1.tgz#7d0023eaeb154e8ee9fce75dcb923d0ed1667774"
-
 colors@^1.1.2, colors@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
 
+colors@0.5.x:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-0.5.1.tgz#7d0023eaeb154e8ee9fce75dcb923d0ed1667774"
+
 combined-stream@^1.0.5, combined-stream@~1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@2, commander@^2.8.1, commander@^2.9.0:
+commander@^2.8.1, commander@^2.9.0, commander@2:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
   dependencies:
@@ -2089,9 +2088,9 @@ csso@~2.2.1:
     clap "^1.0.9"
     source-map "^0.5.3"
 
-cssom@0.3.x, "cssom@>= 0.3.0 < 0.4.0":
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.1.tgz#c9e37ef2490e64f6d1baa10fda852257082c25d3"
+"cssom@>= 0.3.0 < 0.4.0", cssom@0.3.x:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
 
 "cssstyle@>= 0.2.36 < 0.3.0":
   version "0.2.37"
@@ -2105,6 +2104,12 @@ currently-unhandled@^0.4.1:
   dependencies:
     array-find-index "^1.0.1"
 
+d@^0.1.1, d@~0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/d/-/d-0.1.1.tgz#da184c535d18d8ee7ba2aa229b914009fae11309"
+  dependencies:
+    es5-ext "~0.10.2"
+
 d3-array@1, d3-array@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.0.2.tgz#174237bf356a852fadd6af87743d928631de7655"
@@ -2251,9 +2256,9 @@ d3-time@1, d3-time@1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-1.0.4.tgz#2ceba09a76b7450c992a1ded4e10fc6195e69649"
 
-d3-timer@1, d3-timer@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.3.tgz#7a308a10c8524778e6b32d1d6c1c329209ae0ebf"
+d3-timer@1, d3-timer@1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.4.tgz#adaf7f60c7b54c99b2ffabd28c15a0c108a75321"
 
 d3-transition@1, d3-transition@1.0.3:
   version "1.0.3"
@@ -2281,8 +2286,8 @@ d3-zoom@1.1.1:
     d3-transition "1"
 
 d3@^4.4.1:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/d3/-/d3-4.4.2.tgz#7173647bd46c7f9b9dc6b41c1b999de0fc206a26"
+  version "4.4.4"
+  resolved "https://registry.yarnpkg.com/d3/-/d3-4.4.4.tgz#15d4e455687bc7a8ff2eeb4b25354a6ba4f24f57"
   dependencies:
     d3-array "1.0.2"
     d3-axis "1.0.4"
@@ -2310,17 +2315,11 @@ d3@^4.4.1:
     d3-shape "1.0.4"
     d3-time "1.0.4"
     d3-time-format "2.0.3"
-    d3-timer "1.0.3"
+    d3-timer "1.0.4"
     d3-transition "1.0.3"
     d3-voronoi "1.1.1"
     d3-zoom "1.1.1"
 
-d@^0.1.1, d@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/d/-/d-0.1.1.tgz#da184c535d18d8ee7ba2aa229b914009fae11309"
-  dependencies:
-    es5-ext "~0.10.2"
-
 damerau-levenshtein@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.3.tgz#ae4f4ce0b62acae10ff63a01bb08f652f5213af2"
@@ -2456,7 +2455,7 @@ doctrine@^1.2.2:
     esutils "^2.0.2"
     isarray "^1.0.0"
 
-dom-serializer@0, dom-serializer@~0.1.0:
+dom-serializer@~0.1.0, dom-serializer@0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
   dependencies:
@@ -2471,7 +2470,7 @@ domain-browser@^1.1.1:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
 
-domelementtype@1, domelementtype@^1.3.0:
+domelementtype@^1.3.0, domelementtype@1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
 
@@ -2485,7 +2484,7 @@ domhandler@^2.3.0:
   dependencies:
     domelementtype "1"
 
-domutils@1.5.1, domutils@^1.5.1:
+domutils@^1.5.1, domutils@1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
   dependencies:
@@ -2498,16 +2497,16 @@ dot-prop@^3.0.0:
   dependencies:
     is-obj "^1.0.0"
 
+duplexer@~0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
+
 duplexer2@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
   dependencies:
     readable-stream "^2.0.2"
 
-duplexer@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
-
 eastasianwidth@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.1.1.tgz#44d656de9da415694467335365fb3147b8572b7c"
@@ -2522,6 +2521,10 @@ ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
 
+electron-to-chromium@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.2.1.tgz#63ac7579a1c5bedb296c8607621f2efc9a54b968"
+
 elliptic@^6.0.0:
   version "6.3.2"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.3.2.tgz#e4c81e0829cf0a65ab70e998b8232723b5c1bc48"
@@ -2575,8 +2578,8 @@ entities@^1.1.1, entities@~1.1.1:
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
 
 enzyme@^2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-2.7.0.tgz#772477800547ca2514cc0af258e647c166aee899"
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-2.7.1.tgz#76370e1d99e91f73091bb8c4314b7c128cc2d621"
   dependencies:
     cheerio "^0.22.0"
     function.prototype.name "^1.0.0"
@@ -2606,9 +2609,9 @@ error-stack-parser@^1.3.6:
   dependencies:
     stackframe "^0.3.1"
 
-es-abstract@^1.5.0, es-abstract@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.6.1.tgz#bb8a2064120abcf928a086ea3d9043114285ec99"
+es-abstract@^1.6.1, es-abstract@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.7.0.tgz#dfade774e01bfcd97f96180298c449c8623fb94c"
   dependencies:
     es-to-primitive "^1.1.1"
     function-bind "^1.1.0"
@@ -2663,7 +2666,7 @@ es6-set@~0.1.3:
     es6-symbol "3"
     event-emitter "~0.3.4"
 
-es6-symbol@3, es6-symbol@~3.1, es6-symbol@~3.1.0:
+es6-symbol@~3.1, es6-symbol@~3.1.0, es6-symbol@3:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.0.tgz#94481c655e7a7cad82eba832d97d5433496d7ffa"
   dependencies:
@@ -2744,8 +2747,8 @@ eslint-plugin-standard@^2.0.1:
   resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-2.0.1.tgz#3589699ff9c917f2c25f76a916687f641c369ff3"
 
 eslint@^3.13.1:
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.13.1.tgz#564d2646b5efded85df96985332edd91a23bff25"
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.14.0.tgz#2c617e5f782fda5cbee5bc8be7ef5053af8e63a3"
   dependencies:
     babel-code-frame "^6.16.0"
     chalk "^1.1.3"
@@ -2854,7 +2857,7 @@ events@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
 
-eventsource@~0.1.6:
+eventsource@0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-0.1.6.tgz#0acede849ed7dd1ccc32c811bb11b944d4f29232"
   dependencies:
@@ -2948,8 +2951,8 @@ faye-websocket@^0.10.0:
     websocket-driver ">=0.5.1"
 
 faye-websocket@~0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.0.tgz#d9ccf0e789e7db725d74bc4877d23aa42972ac50"
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.1.tgz#f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"
   dependencies:
     websocket-driver ">=0.5.1"
 
@@ -3425,7 +3428,7 @@ htmlparser2@^3.9.1:
     inherits "^2.0.1"
     readable-stream "^2.0.2"
 
-http-errors@~1.5.0:
+http-errors@~1.5.0, http-errors@~1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.5.1.tgz#788c0d2c1de2c81b9e6e8c01843b6b97eb920750"
   dependencies:
@@ -3465,7 +3468,7 @@ hyphenate-style-name@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.2.tgz#31160a36930adaf1fc04c6074f7eb41465d4ec4b"
 
-iconv-lite@0.4, iconv-lite@^0.4.13, iconv-lite@~0.4.13:
+iconv-lite@^0.4.13, iconv-lite@~0.4.13, iconv-lite@0.4:
   version "0.4.15"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb"
 
@@ -3529,7 +3532,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1:
+inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@2, inherits@2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
@@ -3578,7 +3581,7 @@ intl-messageformat-parser@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-1.2.0.tgz#5906b7f953ab7470e0dc8549097b648b991892ff"
 
-intl-messageformat@1.3.0, intl-messageformat@^1.3.0:
+intl-messageformat@^1.3.0, intl-messageformat@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-1.3.0.tgz#f7d926aded7a3ab19b2dc601efd54e99a4bd4eae"
   dependencies:
@@ -3851,14 +3854,14 @@ is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
 
+isarray@^1.0.0, isarray@~1.0.0, isarray@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
 
-isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-
 isemail@2.x.x:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/isemail/-/isemail-2.2.1.tgz#0353d3d9a62951080c262c2aa0a42b8ea8e9e2a6"
@@ -4116,7 +4119,7 @@ loader-runner@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.2.0.tgz#824c1b699c4e7a2b6501b85902d5b862bf45b3fa"
 
-loader-utils@0.2.x, loader-utils@^0.2, loader-utils@^0.2.11, loader-utils@^0.2.16, loader-utils@~0.2.2, loader-utils@~0.2.5:
+loader-utils@^0.2, loader-utils@^0.2.11, loader-utils@^0.2.16, loader-utils@~0.2.2, loader-utils@~0.2.5, loader-utils@0.2.x:
   version "0.2.16"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.16.tgz#f08632066ed8282835dff88dfb52704765adee6d"
   dependencies:
@@ -4314,7 +4317,7 @@ lowercase-keys@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
 
-lru-cache@4.0.x, lru-cache@^4.0.1:
+lru-cache@^4.0.1, lru-cache@4.0.x:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.0.2.tgz#1d17679c069cda5d040991a09dbc2c0db377e55e"
   dependencies:
@@ -4336,8 +4339,8 @@ matcher@^0.1.1:
     escape-string-regexp "^1.0.4"
 
 math-expression-evaluator@^1.2.14:
-  version "1.2.14"
-  resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.14.tgz#39511771ed9602405fba9affff17eb4d2a3843ab"
+  version "1.2.15"
+  resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.15.tgz#38dc5f0194c5bf5ff1c690ad4c4b64df71ac0187"
   dependencies:
     lodash.indexof "^4.0.5"
 
@@ -4431,7 +4434,7 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-mime-db@1.x.x, "mime-db@>= 1.24.0 < 2", mime-db@~1.26.0:
+"mime-db@>= 1.24.0 < 2", mime-db@~1.26.0, mime-db@1.x.x:
   version "1.26.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.26.0.tgz#eaffcd0e4fc6935cf8134da246e2e6c35305adff"
 
@@ -4441,14 +4444,14 @@ mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.13, mime-types@~2.1.7:
   dependencies:
     mime-db "~1.26.0"
 
+mime@^1.3.4, mime@1.3.4:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
+
 mime@1.2.x:
   version "1.2.11"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.2.11.tgz#58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"
 
-mime@1.3.4, mime@^1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
-
 mimos@3.x.x:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/mimos/-/mimos-3.0.3.tgz#b9109072ad378c2b72f6a0101c43ddfb2b36641f"
@@ -4472,15 +4475,19 @@ minimatch@^3.0.0, minimatch@^3.0.2:
   dependencies:
     brace-expansion "^1.0.0"
 
-minimist@0.0.8, minimist@~0.0.1:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-
 minimist@^1.1.3, minimist@^1.2.0, minimist@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
-"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
+minimist@~0.0.1:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+
+minimist@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+
+mkdirp@^0.5.0, mkdirp@^0.5.1, "mkdirp@>=0.5 0", mkdirp@~0.5.0, mkdirp@~0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   dependencies:
@@ -4490,14 +4497,14 @@ moment@^2.10.6, moment@^2.17.1:
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.17.1.tgz#fed9506063f36b10f066c8b59a144d7faebe1d82"
 
+ms@^0.7.1, ms@0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
+
 ms@0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
 
-ms@0.7.2, ms@^0.7.1:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
-
 multimatch@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
@@ -4512,8 +4519,8 @@ mute-stream@0.0.5:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
 
 nan@^2.3.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.5.0.tgz#aa8f1e34531d807e9e27755b234b4a6ec0c152a8"
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.5.1.tgz#d5b01691253326a97a2bbee9e61c55d8d60351e2"
 
 natural-compare@^1.4.0:
   version "1.4.0"
@@ -4524,8 +4531,8 @@ ncp@^2.0.0:
   resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"
 
 nearley@^2.7.7:
-  version "2.7.10"
-  resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.7.10.tgz#06f9531e06a1730244635acd7dd005485550a623"
+  version "2.7.11"
+  resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.7.11.tgz#826d928d93c078e5e2a12ebc269842ba5fe64086"
   dependencies:
     nomnom "~1.6.2"
     railroad-diagrams "^1.0.0"
@@ -4972,16 +4979,16 @@ path-parse@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
 
-path-to-regexp@0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
-
 path-to-regexp@^1.5.3:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d"
   dependencies:
     isarray "0.0.1"
 
+path-to-regexp@0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
+
 path-type@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
@@ -5296,7 +5303,7 @@ postcss-zindex@^2.0.1:
     postcss "^5.0.4"
     uniqs "^2.0.0"
 
-postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.8:
+postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.11:
   version "5.2.11"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.11.tgz#ff29bcd6d2efb98bfe08a022055ec599bbe7b761"
   dependencies:
@@ -5437,27 +5444,34 @@ public-encrypt@^4.0.0:
     parse-asn1 "^5.0.0"
     randombytes "^2.0.1"
 
-punycode@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
-
 punycode@^1.2.4, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
+punycode@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
+
 q@^1.1.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
 
-qs@6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.0.tgz#3b7848c03c2dece69a9522b0fae8c4126d745f3b"
-
 qs@~6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.0.tgz#f403b264f23bc01228c74131b407f18d5ea5d442"
 
-query-string@4.2.3, query-string@^4.1.0:
+qs@6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.0.tgz#3b7848c03c2dece69a9522b0fae8c4126d745f3b"
+
+query-string@^4.1.0:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.1.tgz#54baada6713eafc92be75c47a731f2ebd09cd11d"
+  dependencies:
+    object-assign "^4.1.0"
+    strict-uri-encode "^1.0.0"
+
+query-string@4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.2.3.tgz#9f27273d207a25a8ee4c7b8c74dcd45d556db822"
   dependencies:
@@ -5468,7 +5482,7 @@ querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
 
-querystring@0.2.0, querystring@^0.2.0:
+querystring@^0.2.0, querystring@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
 
@@ -5960,7 +5974,7 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2, rimraf@^2.2.8, rimraf@^2.3.3, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.0, rimraf@^2.5.4, rimraf@~2.5.1, rimraf@~2.5.4:
+rimraf@^2.2.8, rimraf@^2.3.3, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.0, rimraf@^2.5.4, rimraf@~2.5.1, rimraf@~2.5.4, rimraf@2:
   version "2.5.4"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04"
   dependencies:
@@ -5977,14 +5991,14 @@ run-async@^0.1.0:
     once "^1.3.0"
 
 rw@1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.2.tgz#14ef5137ff7547c73ecf0e0af1f0aee07e5401ee"
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4"
 
 rx-lite@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
 
-sax@>=0.6.0, sax@^1.1.4, sax@~1.2.1:
+sax@^1.1.4, sax@>=0.6.0, sax@~1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a"
 
@@ -5994,7 +6008,7 @@ semver-diff@^2.0.0:
   dependencies:
     semver "^5.0.3"
 
-"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@~5.3.0:
+semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@~5.3.0, "semver@2 || 3 || 4 || 5":
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
 
@@ -6016,6 +6030,24 @@ send@0.14.1:
     range-parser "~1.2.0"
     statuses "~1.3.0"
 
+send@0.14.2:
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.14.2.tgz#39b0438b3f510be5dc6f667a11f71689368cdeef"
+  dependencies:
+    debug "~2.2.0"
+    depd "~1.1.0"
+    destroy "~1.0.4"
+    encodeurl "~1.0.1"
+    escape-html "~1.0.3"
+    etag "~1.7.0"
+    fresh "0.3.0"
+    http-errors "~1.5.1"
+    mime "1.3.4"
+    ms "0.7.2"
+    on-finished "~2.3.0"
+    range-parser "~1.2.0"
+    statuses "~1.3.1"
+
 serve-index@^1.7.2:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.8.0.tgz#7c5d96c13fb131101f93c1c5774f8516a1e78d3b"
@@ -6029,13 +6061,13 @@ serve-index@^1.7.2:
     parseurl "~1.3.1"
 
 serve-static@~1.11.1:
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.11.1.tgz#d6cce7693505f733c759de57befc1af76c0f0805"
+  version "1.11.2"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.11.2.tgz#2cf9889bd4435a320cc36895c9aa57bd662e6ac7"
   dependencies:
     encodeurl "~1.0.1"
     escape-html "~1.0.3"
     parseurl "~1.3.1"
-    send "0.14.1"
+    send "0.14.2"
 
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
@@ -6133,11 +6165,11 @@ sntp@1.x.x:
     hoek "2.x.x"
 
 sockjs-client@^1.0.3:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.1.1.tgz#284843e9a9784d7c474b1571b3240fca9dda4bb0"
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.1.2.tgz#f0212a8550e4c9468c8cceaeefd2e3493c033ad5"
   dependencies:
     debug "^2.2.0"
-    eventsource "~0.1.6"
+    eventsource "0.1.6"
     faye-websocket "~0.11.0"
     inherits "^2.0.1"
     json3 "^3.3.2"
@@ -6252,7 +6284,7 @@ statehood@5.x.x:
     items "2.x.x"
     joi "10.x.x"
 
-"statuses@>= 1.3.1 < 2", statuses@~1.3.0:
+"statuses@>= 1.3.1 < 2", statuses@~1.3.0, statuses@~1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
 
@@ -6281,6 +6313,10 @@ strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
 
+string_decoder@^0.10.25, string_decoder@~0.10.x:
+  version "0.10.31"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
@@ -6296,10 +6332,6 @@ string-width@^2.0.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^3.0.0"
 
-string_decoder@^0.10.25, string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-
 stringifier@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/stringifier/-/stringifier-1.3.0.tgz#def18342f6933db0f2dbfc9aa02175b448c17959"
@@ -6347,8 +6379,8 @@ strip-json-comments@~2.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 
 styled-components@^1.3.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-1.3.1.tgz#219aebf87405d890e0c60c8f702089d947aafc0a"
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-1.4.0.tgz#a094d2ebd1c3227cd591d4d999d48860bf3f76b7"
   dependencies:
     buffer "^5.0.2"
     css-to-react-native "^1.0.6"
@@ -6357,7 +6389,6 @@ styled-components@^1.3.0:
     inline-style-prefixer "^2.0.5"
     is-function "^1.0.1"
     is-plain-object "^2.0.1"
-    supports-color "^3.1.2"
 
 subtext@^4.3.x:
   version "4.3.0"
@@ -6441,8 +6472,8 @@ tap-parser@~1.2.2:
     readable-stream "^2"
 
 tap-xunit@^1.5.1:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/tap-xunit/-/tap-xunit-1.6.0.tgz#5f734eedb84d966f6e9409008598194ae01d8690"
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/tap-xunit/-/tap-xunit-1.7.0.tgz#c0fe296a4ff270e042467e754419b5f049bef8be"
   dependencies:
     duplexer "~0.1.1"
     minimist "~1.2.0"
@@ -6500,6 +6531,10 @@ thenify@^3.2.1:
   dependencies:
     any-promise "^1.0.0"
 
+through@^2.3.6:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+
 through2@^2.0.0, through2@~2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
@@ -6507,10 +6542,6 @@ through2@^2.0.0, through2@~2.0.0:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
 
-through@^2.3.6:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-
 time-require@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/time-require/-/time-require-0.1.2.tgz#f9e12cb370fc2605e11404582ba54ef5ca2b2d98"
@@ -6713,16 +6744,16 @@ url-parse-lax@^1.0.0:
   dependencies:
     prepend-http "^1.0.1"
 
-url-parse@1.0.x:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.0.5.tgz#0854860422afdcfefeb6c965c662d4800169927b"
+url-parse@^1.1.1:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.1.7.tgz#025cff999653a459ab34232147d89514cc87d74a"
   dependencies:
     querystringify "0.0.x"
     requires-port "1.0.x"
 
-url-parse@^1.1.1:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.1.7.tgz#025cff999653a459ab34232147d89514cc87d74a"
+url-parse@1.0.x:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.0.5.tgz#0854860422afdcfefeb6c965c662d4800169927b"
   dependencies:
     querystringify "0.0.x"
     requires-port "1.0.x"
@@ -6748,7 +6779,7 @@ util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
 
-util@0.10.3, util@^0.10.3:
+util@^0.10.3, util@0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
   dependencies:
@@ -6925,7 +6956,7 @@ which-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
 
-which@1.2.x, which@^1.2.4, which@^1.2.9:
+which@^1.2.4, which@^1.2.9, which@1.2.x:
   version "1.2.12"
   resolved "https://registry.yarnpkg.com/which/-/which-1.2.12.tgz#de67b5e450269f194909ef23ece4ebe416fa1192"
   dependencies:
@@ -6947,10 +6978,6 @@ window-size@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
 
-wordwrap@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
-
 wordwrap@~0.0.2:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
@@ -6959,6 +6986,10 @@ wordwrap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
 
+wordwrap@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
+
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
@@ -7026,7 +7057,13 @@ xml2js@^0.4:
     sax ">=0.6.0"
     xmlbuilder "^4.1.0"
 
-xmlbuilder@^4.1.0, xmlbuilder@~4.1.0:
+xmlbuilder@^4.1.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-4.2.1.tgz#aa58a3041a066f90eaa16c2f5389ff19f3f461a5"
+  dependencies:
+    lodash "^4.0.0"
+
+xmlbuilder@~4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-4.1.0.tgz#687e84d9c4145af8db438d8bec88805df66249f4"
   dependencies:
@@ -7080,3 +7117,4 @@ yargs@~3.10.0:
     cliui "^2.1.0"
     decamelize "^1.0.0"
     window-size "0.1.0"
+
diff --git a/ui/yarn.lock b/ui/yarn.lock
index 52cf1bb4..9f56085d 100644
--- a/ui/yarn.lock
+++ b/ui/yarn.lock
@@ -6972,3 +6972,4 @@ yargs@~3.10.0:
     cliui "^2.1.0"
     decamelize "^1.0.0"
     window-size "0.1.0"
+
diff --git a/yarn.lock b/yarn.lock
deleted file mode 100644
index 89ef85a5..00000000
--- a/yarn.lock
+++ /dev/null
@@ -1,394 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-abbrev@1:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"
-
-ansi-regex@^0.2.0, ansi-regex@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9"
-
-ansi-styles@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de"
-
-argparse@^1.0.7:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
-  dependencies:
-    sprintf-js "~1.0.2"
-
-asap@^2.0.0:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.5.tgz#522765b50c3510490e52d7dcfe085ef9ba96958f"
-
-balanced-match@^0.4.1:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
-
-brace-expansion@^1.0.0:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.6.tgz#7197d7eaa9b87e648390ea61fc66c84427420df9"
-  dependencies:
-    balanced-match "^0.4.1"
-    concat-map "0.0.1"
-
-buffer-shims@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51"
-
-builtin-modules@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
-
-chalk@~0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.5.1.tgz#663b3a648b68b55d04690d49167aa837858f2174"
-  dependencies:
-    ansi-styles "^1.1.0"
-    escape-string-regexp "^1.0.0"
-    has-ansi "^0.1.0"
-    strip-ansi "^0.3.0"
-    supports-color "^0.2.0"
-
-ci-info@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.0.0.tgz#dc5285f2b4e251821683681c381c3388f46ec534"
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-
-core-util-is@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-
-debug@^2.2.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.0.tgz#bc596bcabe7617f11d9fa15361eded5608b8499b"
-  dependencies:
-    ms "0.7.2"
-
-debuglog@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
-
-dezalgo@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
-  dependencies:
-    asap "^2.0.0"
-    wrappy "1"
-
-duplexer@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
-
-escape-string-regexp@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-
-esprima@^2.6.0:
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
-
-events-to-array@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/events-to-array/-/events-to-array-1.0.2.tgz#b3484465534fe4ff66fbdd1a83b777713ba404aa"
-
-glob@^6.0.0:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
-  dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "2 || 3"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-graceful-fs@^4.1.2:
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-
-has-ansi@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-0.1.0.tgz#84f265aae8c0e6a88a12d7022894b7568894c62e"
-  dependencies:
-    ansi-regex "^0.2.0"
-
-hosted-git-info@^2.1.4:
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.1.5.tgz#0ba81d90da2e25ab34a332e6ec77936e1598118b"
-
-husky@^0.11.9:
-  version "0.11.9"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-0.11.9.tgz#28cd1dc16bffdca1d4d93592814e5f3c327b38ee"
-  dependencies:
-    is-ci "^1.0.9"
-    normalize-path "^1.0.0"
-
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@~2.0.1, inherits@2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-
-is-builtin-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
-  dependencies:
-    builtin-modules "^1.0.0"
-
-is-ci@^1.0.9:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.0.10.tgz#f739336b2632365061a9d48270cd56ae3369318e"
-  dependencies:
-    ci-info "^1.0.0"
-
-isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-
-jju@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/jju/-/jju-1.3.0.tgz#dadd9ef01924bc728b03f2f7979bdbd62f7a2aaa"
-
-js-yaml@^3.2.7:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^2.6.0"
-
-json-parse-helpfulerror@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz#13f14ce02eed4e981297b64eb9e3b932e2dd13dc"
-  dependencies:
-    jju "^1.1.0"
-
-license-checker@^7.1.0:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/license-checker/-/license-checker-7.1.1.tgz#b0a3ec47f2469fe3a639e52a1151cd26fc2c2905"
-  dependencies:
-    chalk "~0.5.1"
-    debug "^2.2.0"
-    mkdirp "^0.3.5"
-    nopt "^2.2.0"
-    read-installed "~4.0.3"
-    treeify "^1.0.1"
-
-license-to-fail@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/license-to-fail/-/license-to-fail-2.2.0.tgz#6d5929f3b1edfb0866e05eb22919a5e1de32ff37"
-  dependencies:
-    license-checker "^7.1.0"
-
-lodash.findindex:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.findindex/-/lodash.findindex-4.6.0.tgz#a3245dee61fb9b6e0624b535125624bb69c11106"
-
-lodash@^3.5.0:
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
-
-"minimatch@2 || 3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
-  dependencies:
-    brace-expansion "^1.0.0"
-
-minimist@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-
-mkdirp@^0.3.5:
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.5.tgz#de3e5f8961c88c787ee1368df849ac4413eca8d7"
-
-ms@0.7.2:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
-
-nopt@^2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-2.2.1.tgz#2aa09b7d1768487b3b89a9c5aa52335bff0baea7"
-  dependencies:
-    abbrev "1"
-
-normalize-package-data@^2.0.0:
-  version "2.3.5"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.5.tgz#8d924f142960e1777e7ffe170543631cc7cb02df"
-  dependencies:
-    hosted-git-info "^2.1.4"
-    is-builtin-module "^1.0.0"
-    semver "2 || 3 || 4 || 5"
-    validate-npm-package-license "^3.0.1"
-
-normalize-path@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz#32d0e472f91ff345701c15a8311018d3b0a90379"
-
-once@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  dependencies:
-    wrappy "1"
-
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-
-process-nextick-args@~1.0.6:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
-
-read-installed@~4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/read-installed/-/read-installed-4.0.3.tgz#ff9b8b67f187d1e4c29b9feb31f6b223acd19067"
-  dependencies:
-    debuglog "^1.0.1"
-    read-package-json "^2.0.0"
-    readdir-scoped-modules "^1.0.0"
-    semver "2 || 3 || 4 || 5"
-    slide "~1.1.3"
-    util-extend "^1.0.1"
-  optionalDependencies:
-    graceful-fs "^4.1.2"
-
-read-package-json@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.0.4.tgz#61ed1b2256ea438d8008895090be84b8e799c853"
-  dependencies:
-    glob "^6.0.0"
-    json-parse-helpfulerror "^1.0.2"
-    normalize-package-data "^2.0.0"
-  optionalDependencies:
-    graceful-fs "^4.1.2"
-
-readable-stream@^2, readable-stream@^2.1.5:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.2.tgz#a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"
-  dependencies:
-    buffer-shims "^1.0.0"
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
-    string_decoder "~0.10.x"
-    util-deprecate "~1.0.1"
-
-readdir-scoped-modules@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747"
-  dependencies:
-    debuglog "^1.0.1"
-    dezalgo "^1.0.0"
-    graceful-fs "^4.1.2"
-    once "^1.3.0"
-
-"semver@2 || 3 || 4 || 5":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
-
-slide@~1.1.3:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
-
-spdx-correct@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
-  dependencies:
-    spdx-license-ids "^1.0.2"
-
-spdx-expression-parse@~1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c"
-
-spdx-license-ids@^1.0.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
-
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-
-string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-
-strip-ansi@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.3.0.tgz#25f48ea22ca79187f3174a4db8759347bb126220"
-  dependencies:
-    ansi-regex "^0.2.1"
-
-supports-color@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-0.2.0.tgz#d92de2694eb3f67323973d7ae3d8b55b4c22190a"
-
-tap-parser@~1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/tap-parser/-/tap-parser-1.2.2.tgz#5e2f6970611f079c7cf857de1dc7aa1b480de7a5"
-  dependencies:
-    events-to-array "^1.0.1"
-    inherits "~2.0.1"
-    js-yaml "^3.2.7"
-  optionalDependencies:
-    readable-stream "^2"
-
-tap-xunit@^1.4.0:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/tap-xunit/-/tap-xunit-1.5.1.tgz#e58e6d26f5896a87cdc6ffbb146dd8c1f418a8a6"
-  dependencies:
-    duplexer "~0.1.1"
-    minimist "~1.2.0"
-    tap-parser "~1.2.2"
-    through2 "~2.0.0"
-    xmlbuilder "~4.1.0"
-    xtend "~4.0.0"
-
-through2@~2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
-  dependencies:
-    readable-stream "^2.1.5"
-    xtend "~4.0.1"
-
-treeify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/treeify/-/treeify-1.0.1.tgz#69b3cd022022a168424e7cfa1ced44c939d3eb2f"
-
-util-deprecate@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-
-util-extend@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz#a7c216d267545169637b3b6edc6ca9119e2ff93f"
-
-validate-npm-package-license@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
-  dependencies:
-    spdx-correct "~1.0.0"
-    spdx-expression-parse "~1.0.0"
-
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-
-xmlbuilder@~4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-4.1.0.tgz#687e84d9c4145af8db438d8bec88805df66249f4"
-  dependencies:
-    lodash "^3.5.0"
-
-xtend@~4.0.0, xtend@~4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
-

From 9e302e093aa5c856d90dd488a6e310be7159e47e Mon Sep 17 00:00:00 2001
From: Alex Windett <windettalex@gmail.com>
Date: Wed, 25 Jan 2017 14:05:42 +0000
Subject: [PATCH 03/32] re-adding yarn.lock file in top directory

---
 yarn.lock | 394 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 394 insertions(+)
 create mode 100644 yarn.lock

diff --git a/yarn.lock b/yarn.lock
new file mode 100644
index 00000000..c71ef327
--- /dev/null
+++ b/yarn.lock
@@ -0,0 +1,394 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+abbrev@1:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"
+
+ansi-regex@^0.2.0, ansi-regex@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9"
+
+ansi-styles@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de"
+
+argparse@^1.0.7:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
+  dependencies:
+    sprintf-js "~1.0.2"
+
+asap@^2.0.0:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.5.tgz#522765b50c3510490e52d7dcfe085ef9ba96958f"
+
+balanced-match@^0.4.1:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
+
+brace-expansion@^1.0.0:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.6.tgz#7197d7eaa9b87e648390ea61fc66c84427420df9"
+  dependencies:
+    balanced-match "^0.4.1"
+    concat-map "0.0.1"
+
+buffer-shims@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51"
+
+builtin-modules@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
+
+chalk@~0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.5.1.tgz#663b3a648b68b55d04690d49167aa837858f2174"
+  dependencies:
+    ansi-styles "^1.1.0"
+    escape-string-regexp "^1.0.0"
+    has-ansi "^0.1.0"
+    strip-ansi "^0.3.0"
+    supports-color "^0.2.0"
+
+ci-info@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.0.0.tgz#dc5285f2b4e251821683681c381c3388f46ec534"
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+
+core-util-is@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+
+debug@^2.2.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.0.tgz#bc596bcabe7617f11d9fa15361eded5608b8499b"
+  dependencies:
+    ms "0.7.2"
+
+debuglog@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
+
+dezalgo@^1.0.0:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
+  dependencies:
+    asap "^2.0.0"
+    wrappy "1"
+
+duplexer@~0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
+
+escape-string-regexp@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+
+esprima@^2.6.0:
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
+
+events-to-array@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/events-to-array/-/events-to-array-1.0.2.tgz#b3484465534fe4ff66fbdd1a83b777713ba404aa"
+
+glob@^6.0.0:
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
+  dependencies:
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "2 || 3"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+graceful-fs@^4.1.2:
+  version "4.1.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
+
+has-ansi@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-0.1.0.tgz#84f265aae8c0e6a88a12d7022894b7568894c62e"
+  dependencies:
+    ansi-regex "^0.2.0"
+
+hosted-git-info@^2.1.4:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.1.5.tgz#0ba81d90da2e25ab34a332e6ec77936e1598118b"
+
+husky@^0.11.9:
+  version "0.11.9"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-0.11.9.tgz#28cd1dc16bffdca1d4d93592814e5f3c327b38ee"
+  dependencies:
+    is-ci "^1.0.9"
+    normalize-path "^1.0.0"
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@~2.0.1, inherits@2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+
+is-builtin-module@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
+  dependencies:
+    builtin-modules "^1.0.0"
+
+is-ci@^1.0.9:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.0.10.tgz#f739336b2632365061a9d48270cd56ae3369318e"
+  dependencies:
+    ci-info "^1.0.0"
+
+isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+
+jju@^1.1.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/jju/-/jju-1.3.0.tgz#dadd9ef01924bc728b03f2f7979bdbd62f7a2aaa"
+
+js-yaml@^3.2.7:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^2.6.0"
+
+json-parse-helpfulerror@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz#13f14ce02eed4e981297b64eb9e3b932e2dd13dc"
+  dependencies:
+    jju "^1.1.0"
+
+license-checker@^7.1.0:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/license-checker/-/license-checker-7.1.1.tgz#b0a3ec47f2469fe3a639e52a1151cd26fc2c2905"
+  dependencies:
+    chalk "~0.5.1"
+    debug "^2.2.0"
+    mkdirp "^0.3.5"
+    nopt "^2.2.0"
+    read-installed "~4.0.3"
+    treeify "^1.0.1"
+
+license-to-fail@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/license-to-fail/-/license-to-fail-2.2.0.tgz#6d5929f3b1edfb0866e05eb22919a5e1de32ff37"
+  dependencies:
+    license-checker "^7.1.0"
+
+lodash.findindex@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.findindex/-/lodash.findindex-4.6.0.tgz#a3245dee61fb9b6e0624b535125624bb69c11106"
+
+lodash@^3.5.0:
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
+
+"minimatch@2 || 3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
+  dependencies:
+    brace-expansion "^1.0.0"
+
+minimist@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+
+mkdirp@^0.3.5:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.5.tgz#de3e5f8961c88c787ee1368df849ac4413eca8d7"
+
+ms@0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
+
+nopt@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-2.2.1.tgz#2aa09b7d1768487b3b89a9c5aa52335bff0baea7"
+  dependencies:
+    abbrev "1"
+
+normalize-package-data@^2.0.0:
+  version "2.3.5"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.5.tgz#8d924f142960e1777e7ffe170543631cc7cb02df"
+  dependencies:
+    hosted-git-info "^2.1.4"
+    is-builtin-module "^1.0.0"
+    semver "2 || 3 || 4 || 5"
+    validate-npm-package-license "^3.0.1"
+
+normalize-path@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz#32d0e472f91ff345701c15a8311018d3b0a90379"
+
+once@^1.3.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  dependencies:
+    wrappy "1"
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+
+process-nextick-args@~1.0.6:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
+
+read-installed@~4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/read-installed/-/read-installed-4.0.3.tgz#ff9b8b67f187d1e4c29b9feb31f6b223acd19067"
+  dependencies:
+    debuglog "^1.0.1"
+    read-package-json "^2.0.0"
+    readdir-scoped-modules "^1.0.0"
+    semver "2 || 3 || 4 || 5"
+    slide "~1.1.3"
+    util-extend "^1.0.1"
+  optionalDependencies:
+    graceful-fs "^4.1.2"
+
+read-package-json@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.0.4.tgz#61ed1b2256ea438d8008895090be84b8e799c853"
+  dependencies:
+    glob "^6.0.0"
+    json-parse-helpfulerror "^1.0.2"
+    normalize-package-data "^2.0.0"
+  optionalDependencies:
+    graceful-fs "^4.1.2"
+
+readable-stream@^2, readable-stream@^2.1.5:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.2.tgz#a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"
+  dependencies:
+    buffer-shims "^1.0.0"
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "~1.0.0"
+    process-nextick-args "~1.0.6"
+    string_decoder "~0.10.x"
+    util-deprecate "~1.0.1"
+
+readdir-scoped-modules@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747"
+  dependencies:
+    debuglog "^1.0.1"
+    dezalgo "^1.0.0"
+    graceful-fs "^4.1.2"
+    once "^1.3.0"
+
+"semver@2 || 3 || 4 || 5":
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
+
+slide@~1.1.3:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
+
+spdx-correct@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
+  dependencies:
+    spdx-license-ids "^1.0.2"
+
+spdx-expression-parse@~1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c"
+
+spdx-license-ids@^1.0.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
+
+sprintf-js@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+
+string_decoder@~0.10.x:
+  version "0.10.31"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+
+strip-ansi@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.3.0.tgz#25f48ea22ca79187f3174a4db8759347bb126220"
+  dependencies:
+    ansi-regex "^0.2.1"
+
+supports-color@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-0.2.0.tgz#d92de2694eb3f67323973d7ae3d8b55b4c22190a"
+
+tap-parser@~1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/tap-parser/-/tap-parser-1.2.2.tgz#5e2f6970611f079c7cf857de1dc7aa1b480de7a5"
+  dependencies:
+    events-to-array "^1.0.1"
+    inherits "~2.0.1"
+    js-yaml "^3.2.7"
+  optionalDependencies:
+    readable-stream "^2"
+
+tap-xunit@^1.4.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/tap-xunit/-/tap-xunit-1.7.0.tgz#c0fe296a4ff270e042467e754419b5f049bef8be"
+  dependencies:
+    duplexer "~0.1.1"
+    minimist "~1.2.0"
+    tap-parser "~1.2.2"
+    through2 "~2.0.0"
+    xmlbuilder "~4.1.0"
+    xtend "~4.0.0"
+
+through2@~2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
+  dependencies:
+    readable-stream "^2.1.5"
+    xtend "~4.0.1"
+
+treeify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/treeify/-/treeify-1.0.1.tgz#69b3cd022022a168424e7cfa1ced44c939d3eb2f"
+
+util-deprecate@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+
+util-extend@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz#a7c216d267545169637b3b6edc6ca9119e2ff93f"
+
+validate-npm-package-license@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
+  dependencies:
+    spdx-correct "~1.0.0"
+    spdx-expression-parse "~1.0.0"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+
+xmlbuilder@~4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-4.1.0.tgz#687e84d9c4145af8db438d8bec88805df66249f4"
+  dependencies:
+    lodash "^3.5.0"
+
+xtend@~4.0.0, xtend@~4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+

From 2093530f175574636ab24ea4c324c64a348c6ec8 Mon Sep 17 00:00:00 2001
From: Alex Windett <windettalex@gmail.com>
Date: Wed, 25 Jan 2017 14:11:31 +0000
Subject: [PATCH 04/32] adding in check for member/people length to be greater
 then 0

---
 frontend/src/components/people-list/index.js |  6 +++++-
 frontend/src/state/selectors.js              | 12 +++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/people-list/index.js b/frontend/src/components/people-list/index.js
index 765f6794..aa1dea90 100644
--- a/frontend/src/components/people-list/index.js
+++ b/frontend/src/components/people-list/index.js
@@ -16,6 +16,7 @@ const People = (props) => {
   const {
     orgUI = {},
     handleToggle,
+    people
   } = props;
 
   return (
@@ -36,7 +37,9 @@ const People = (props) => {
 
       <Row>
         <Column xs={12}>
-          <PeopleTable {...props} />
+          { people.length > 0
+            ? <PeopleTable {...props} />
+            : <h3>There is nobody in this orgnaisation</h3> }
         </Column>
       </Row>
     </div>
@@ -46,6 +49,7 @@ const People = (props) => {
 People.propTypes = {
   handleToggle: React.PropTypes.func,
   orgUI: React.PropTypes.object,
+  people: React.PropTypes.array
 };
 
 module.exports = People;
\ No newline at end of file
diff --git a/frontend/src/state/selectors.js b/frontend/src/state/selectors.js
index b9f83dfb..da739a6e 100644
--- a/frontend/src/state/selectors.js
+++ b/frontend/src/state/selectors.js
@@ -129,12 +129,14 @@ const instancesByProjectId = (projectId) => createSelector(
 const peopleByOrgId = (orgId) => createSelector(
   [members, orgById(orgId)], (members, org) => {
     const matched = [];
-    org.members.filter((m) => {
-      matched.push({
-        ...find(members, ['uuid', m.uuid]),
-        ...m
+    if (Object.keys(org.members).length > 0) {
+      org.members.filter((m) => {
+        matched.push({
+          ...find(members, ['uuid', m.uuid]),
+          ...m
+        });
       });
-    });
+    }
     return matched;
   }
 );

From 14d54de58b3890f51481996b368430defdb7014f Mon Sep 17 00:00:00 2001
From: Tom Gallacher <tomgallacher23@gmail.com>
Date: Wed, 25 Jan 2017 13:38:28 +0000
Subject: [PATCH 05/32] Adding missing prometheus service to local-compose

---
 local-compose.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/local-compose.yml b/local-compose.yml
index 1764a9d4..8a2134e7 100644
--- a/local-compose.yml
+++ b/local-compose.yml
@@ -49,3 +49,14 @@ nginx:
     - consul:consul
   ports:
     - 80:8001
+prometheus:
+  extends:
+    file: docker-compose.yml
+    service: prometheus
+  restart: never
+  environment:
+    - CONSUL=consul
+  links:
+    - consul:consul
+  ports:
+    - 9090:9090

From 4d94830d306f0b0d3f6740ad78a5a8fd6c2af8c3 Mon Sep 17 00:00:00 2001
From: Tom Gallacher <tomgallacher23@gmail.com>
Date: Wed, 25 Jan 2017 15:49:05 +0000
Subject: [PATCH 06/32] Add stat collection

---
 cloudapi-graphql/Dockerfile      |  2 +-
 docker-compose.yml               |  1 -
 frontend/Dockerfile              |  2 +-
 frontend/etc/containerpilot.json | 21 ++++++++++++++++++++-
 ui/Dockerfile                    |  2 +-
 ui/Dockerfile.build              |  2 +-
 ui/etc/containerpilot.json       | 21 ++++++++++++++++++++-
 7 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/cloudapi-graphql/Dockerfile b/cloudapi-graphql/Dockerfile
index db2992cb..63a65e64 100644
--- a/cloudapi-graphql/Dockerfile
+++ b/cloudapi-graphql/Dockerfile
@@ -1 +1 @@
-FROM quay.io/yldio/alpine-node-containerpilot:6.9.3
+FROM quay.io/yldio/alpine-node-containerpilot:6.9.4
diff --git a/docker-compose.yml b/docker-compose.yml
index 095e102f..b778fac7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -76,7 +76,6 @@ nginx:
   ports:
     - 80:80
     - 443:443
-    - 9090:9090
   env_file: .env
   environment:
     - CONSUL_AGENT=1
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index db2992cb..63a65e64 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -1 +1 @@
-FROM quay.io/yldio/alpine-node-containerpilot:6.9.3
+FROM quay.io/yldio/alpine-node-containerpilot:6.9.4
diff --git a/frontend/etc/containerpilot.json b/frontend/etc/containerpilot.json
index 2c2bd9b1..dc86246b 100644
--- a/frontend/etc/containerpilot.json
+++ b/frontend/etc/containerpilot.json
@@ -10,5 +10,24 @@
     }
   ],
   "backends": [
-  ]
+  ],
+  "telemetry": {
+    "port": 9090,
+    "sensors": [
+      {
+        "name": "frontend_memory_percent",
+        "help": "percentage of memory used",
+        "type": "gauge",
+        "poll": 5,
+        "check": ["/bin/sensor", "memory"]
+      },
+      {
+        "name": "frontend_cpu_load",
+        "help": "cpu load",
+        "type": "gauge",
+        "poll": 5,
+        "check": ["/bin/sensor", "cpu"]
+      }
+    ]
+  }
 }
diff --git a/ui/Dockerfile b/ui/Dockerfile
index ee19c339..ff2d47d7 100644
--- a/ui/Dockerfile
+++ b/ui/Dockerfile
@@ -1,2 +1,2 @@
-FROM quay.io/yldio/alpine-node-containerpilot:6.9.3
+FROM quay.io/yldio/alpine-node-containerpilot:6.9.4
 RUN yarn add st
diff --git a/ui/Dockerfile.build b/ui/Dockerfile.build
index 10d037d9..d1da7a49 100644
--- a/ui/Dockerfile.build
+++ b/ui/Dockerfile.build
@@ -1,4 +1,4 @@
-FROM quay.io/yldio/alpine-node-containerpilot:6.9.3
+FROM quay.io/yldio/alpine-node-containerpilot:6.9.4
 ARG NPM_TOKEN
 ARG CIRCLE_BUILD_NUM
 ENV NPM_TOKEN ${NPM_TOKEN}
diff --git a/ui/etc/containerpilot.json b/ui/etc/containerpilot.json
index 6f47cb5d..299ed9fc 100644
--- a/ui/etc/containerpilot.json
+++ b/ui/etc/containerpilot.json
@@ -10,5 +10,24 @@
     }
   ],
   "backends": [
-  ]
+  ],
+  "telemetry": {
+    "port": 9090,
+    "sensors": [
+      {
+        "name": "ui_memory_percent",
+        "help": "percentage of memory used",
+        "type": "gauge",
+        "poll": 5,
+        "check": ["/bin/sensor", "memory"]
+      },
+      {
+        "name": "ui_cpu_load",
+        "help": "cpu load",
+        "type": "gauge",
+        "poll": 5,
+        "check": ["/bin/sensor", "cpu"]
+      }
+    ]
+  }
 }

From 8b0e745beabd71d349ee460d89b18ba66ab0c06f Mon Sep 17 00:00:00 2001
From: Alex Windett <windettalex@gmail.com>
Date: Wed, 25 Jan 2017 16:06:18 +0000
Subject: [PATCH 07/32] implimenting assinging status update  to team memember

---
 .../src/components/people-list/table/index.js |  4 +++
 .../people-list/table/person-role.js          |  1 +
 .../people-list/table/person-status.js        | 26 +++++++++++++--
 .../components/people-list/table/tooltip.js   |  5 ++-
 frontend/src/containers/org/people.js         |  5 ++-
 frontend/src/state/actions.js                 |  3 +-
 frontend/src/state/reducers/orgs.js           | 33 ++++++++++++++++++-
 7 files changed, 71 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/people-list/table/index.js b/frontend/src/components/people-list/table/index.js
index 53fb9dbf..44c6f692 100644
--- a/frontend/src/components/people-list/table/index.js
+++ b/frontend/src/components/people-list/table/index.js
@@ -12,6 +12,7 @@ const PeopleTable = (props) => {
     handleRoleTooltip,
     handleRoleUpdate,
     handleStatusTooltip,
+    handleStatusUpdate,
     people = [],
     orgUI = {},
     orgIndex
@@ -38,7 +39,9 @@ const PeopleTable = (props) => {
     const status = (person) => (
       <PersonStatus
         handleStatusTooltip={handleStatusTooltip}
+        handleStatusUpdate={handleStatusUpdate}
         membersStatusOptions={orgUI.members_status}
+        orgIndex={orgIndex}
         person={person}
         personIndex={index}
         toggledID={orgUI.member_status_tooltip}
@@ -78,6 +81,7 @@ PeopleTable.propTypes = {
   handleRoleTooltip: React.PropTypes.func,
   handleRoleUpdate: React.PropTypes.func,
   handleStatusTooltip: React.PropTypes.func,
+  handleStatusUpdate: React.PropTypes.func,
   orgIndex: React.PropTypes.number,
   orgUI: React.PropTypes.object,
   people: React.PropTypes.array,
diff --git a/frontend/src/components/people-list/table/person-role.js b/frontend/src/components/people-list/table/person-role.js
index 856026c2..7d3913e7 100644
--- a/frontend/src/components/people-list/table/person-role.js
+++ b/frontend/src/components/people-list/table/person-role.js
@@ -81,6 +81,7 @@ const PersonRole = (props) => {
           options={membersRolesOptions}
           orgIndex={orgIndex}
           person={_person}
+          personAttr="role"
           personIndex={personIndex}
           />
         : null }
diff --git a/frontend/src/components/people-list/table/person-status.js b/frontend/src/components/people-list/table/person-status.js
index 4aa1929a..d73a4b01 100644
--- a/frontend/src/components/people-list/table/person-status.js
+++ b/frontend/src/components/people-list/table/person-status.js
@@ -49,14 +49,26 @@ const PlainButton = styled.button`
 const PersonStatus = (props) => {
 
   const {
-    handleStatusTooltip,
     toggledID,
     membersStatusOptions,
     person,
+    personIndex,
+    handleStatusTooltip,
+    handleStatusUpdate,
+    orgIndex
   } = props;
 
   const toggled = toggledID;
   const handleClick = () => handleStatusTooltip(person.uuid);
+  const handleOptionSelect = (updatedMember) =>
+    handleStatusUpdate(updatedMember);
+
+  // Only send relevent info as props
+  const _person =  {
+    uuid: person.uuid,
+    status: person.status,
+    role: person.role
+  };
 
   return (
     <StyledWrapper toggled={toggled}>
@@ -65,7 +77,14 @@ const PersonStatus = (props) => {
       </PlainButton>
 
       { toggledID === person.uuid
-        ? <Tooltip options={membersStatusOptions} person={person} />
+        ? <Tooltip
+          handleSelect={handleOptionSelect}
+          options={membersStatusOptions}
+          orgIndex={orgIndex}
+          person={_person}
+          personAttr="status"
+          personIndex={personIndex}
+          />
         : null }
     </StyledWrapper>
   );
@@ -73,8 +92,11 @@ const PersonStatus = (props) => {
 
 PersonStatus.propTypes = {
   handleStatusTooltip: React.PropTypes.func,
+  handleStatusUpdate: React.PropTypes.func,
   membersStatusOptions: React.PropTypes.array,
+  orgIndex: React.PropTypes.number,
   person: React.PropTypes.object,
+  personIndex: React.PropTypes.number,
   toggledID: React.PropTypes.oneOfType([
     React.PropTypes.string,
     React.PropTypes.bool,
diff --git a/frontend/src/components/people-list/table/tooltip.js b/frontend/src/components/people-list/table/tooltip.js
index a24fd3a5..0d6b270c 100644
--- a/frontend/src/components/people-list/table/tooltip.js
+++ b/frontend/src/components/people-list/table/tooltip.js
@@ -16,6 +16,7 @@ const arrowPosition = {
 module.exports = ({
   handleSelect,
   person = {},
+  personAttr,
   personIndex,
   options = [],
   orgIndex,
@@ -27,7 +28,8 @@ module.exports = ({
       person: {
         uuid: person.uuid,
         status: person.status,
-        role: option
+        role: person.role,
+        [`${personAttr}`]: option
       },
       personIndex,
       orgIndex,
@@ -63,5 +65,6 @@ module.exports.propTypes = {
   options: React.PropTypes.array,
   orgIndex: React.PropTypes.number,
   person: React.PropTypes.object,
+  personAttr: React.PropTypes.string,
   personIndex: React.PropTypes.number,
 };
\ No newline at end of file
diff --git a/frontend/src/containers/org/people.js b/frontend/src/containers/org/people.js
index c7707fb6..074470ec 100644
--- a/frontend/src/containers/org/people.js
+++ b/frontend/src/containers/org/people.js
@@ -20,7 +20,8 @@ const {
   handleInviteToggle,
   handlePeopleRoleTooltip,
   handlePeopleStatusTooltip,
-  handleRoleUpdate
+  handleRoleUpdate,
+  handleStatusUpdate,
 } = actions;
 
 const People = (props) => {
@@ -47,6 +48,8 @@ const mapDispatchToProps = (dispatch) => ({
   handleRoleTooltip: (id) => dispatch(handlePeopleRoleTooltip(id)),
   handleRoleUpdate: (updatedMember) =>
       dispatch(handleRoleUpdate(updatedMember)),
+  handleStatusUpdate: (updatedMember) =>
+    dispatch(handleStatusUpdate(updatedMember)),
 });
 
 module.exports = connect(
diff --git a/frontend/src/state/actions.js b/frontend/src/state/actions.js
index 0ee97f57..e67159e7 100644
--- a/frontend/src/state/actions.js
+++ b/frontend/src/state/actions.js
@@ -22,5 +22,6 @@ module.exports = {
       createAction(`${APP}/HANDLE_PERSON_STATUS_TOOLTIP`),
   handlePeopleRoleTooltip:
     createAction(`${APP}/HANDLE_PERSON_ROLE_TOOLTIP`),
-  handleRoleUpdate: createAction(`${APP}/HANDLE_PERSON_ROLE_UPDATE`),
+  handleMemberUpdate: createAction(`${APP}/HANDLE_PERSON_ROLE_UPDATE`),
+  handleStatusUpdate: createAction(`${APP}/HANDLE_PERSON_STATUS_UPDATE`),
 };
diff --git a/frontend/src/state/reducers/orgs.js b/frontend/src/state/reducers/orgs.js
index dce5f5bb..f98e7fd3 100644
--- a/frontend/src/state/reducers/orgs.js
+++ b/frontend/src/state/reducers/orgs.js
@@ -10,7 +10,8 @@ const {
   handleInviteToggle,
   handlePeopleRoleTooltip,
   handlePeopleStatusTooltip,
-  handleRoleUpdate
+  handleRoleUpdate,
+  handleStatusUpdate,
 } = actions;
 
 module.exports = handleActions({
@@ -75,5 +76,35 @@ module.exports = handleActions({
         ...state.data.slice(orgIndex + 1),
       ]
     };
+  },
+  [handleStatusUpdate.toString()]: (state, action) => {
+    const {
+      orgIndex,
+      person,
+      personIndex,
+    } = action.payload;
+
+    return {
+      ...state,
+      ui: {
+        ...state.ui,
+        member_status_tooltip: false,
+        member_role_tooltip: false
+      },
+      data: [
+        ...state.data.slice(0, orgIndex),
+        {
+          ...state.data[orgIndex],
+          members: [
+            ...state.data[orgIndex].members.slice(0, personIndex),
+            {
+              ...person,
+            },
+            ...state.data[orgIndex].members.slice(personIndex + 1)
+          ]
+        },
+        ...state.data.slice(orgIndex + 1),
+      ]
+    };
   }
 }, {});

From 581d9734fc45904d372399d44de3e5000b710da9 Mon Sep 17 00:00:00 2001
From: Alex Windett <windettalex@gmail.com>
Date: Wed, 25 Jan 2017 16:15:06 +0000
Subject: [PATCH 08/32] refactoring redux action and reducer for member update
 to use same dispatch function

---
 .../src/components/people-list/table/index.js | 10 +++---
 .../people-list/table/person-role.js          |  7 ++--
 .../people-list/table/person-status.js        |  6 ++--
 frontend/src/containers/org/people.js         | 10 +++---
 frontend/src/state/actions.js                 |  3 +-
 frontend/src/state/reducers/orgs.js           | 34 ++-----------------
 6 files changed, 18 insertions(+), 52 deletions(-)

diff --git a/frontend/src/components/people-list/table/index.js b/frontend/src/components/people-list/table/index.js
index 44c6f692..88b4d970 100644
--- a/frontend/src/components/people-list/table/index.js
+++ b/frontend/src/components/people-list/table/index.js
@@ -10,9 +10,8 @@ const PeopleTable = (props) => {
 
   const {
     handleRoleTooltip,
-    handleRoleUpdate,
     handleStatusTooltip,
-    handleStatusUpdate,
+    handleMemberUpdate,
     people = [],
     orgUI = {},
     orgIndex
@@ -38,8 +37,8 @@ const PeopleTable = (props) => {
   const data = people.map( (person, index) => {
     const status = (person) => (
       <PersonStatus
+        handleMemberUpdate={handleMemberUpdate}
         handleStatusTooltip={handleStatusTooltip}
-        handleStatusUpdate={handleStatusUpdate}
         membersStatusOptions={orgUI.members_status}
         orgIndex={orgIndex}
         person={person}
@@ -50,8 +49,8 @@ const PeopleTable = (props) => {
 
     const role = (person) => (
       <PersonRole
+        handleMemberUpdate={handleMemberUpdate}
         handleRoleTooltip={handleRoleTooltip}
-        handleRoleUpdate={handleRoleUpdate}
         membersRolesOptions={orgUI.members_roles}
         orgIndex={orgIndex}
         person={person}
@@ -78,10 +77,9 @@ const PeopleTable = (props) => {
 };
 
 PeopleTable.propTypes = {
+  handleMemberUpdate: React.PropTypes.func,
   handleRoleTooltip: React.PropTypes.func,
-  handleRoleUpdate: React.PropTypes.func,
   handleStatusTooltip: React.PropTypes.func,
-  handleStatusUpdate: React.PropTypes.func,
   orgIndex: React.PropTypes.number,
   orgUI: React.PropTypes.object,
   people: React.PropTypes.array,
diff --git a/frontend/src/components/people-list/table/person-role.js b/frontend/src/components/people-list/table/person-role.js
index 7d3913e7..902f7af5 100644
--- a/frontend/src/components/people-list/table/person-role.js
+++ b/frontend/src/components/people-list/table/person-role.js
@@ -54,13 +54,14 @@ const PersonRole = (props) => {
     person,
     personIndex,
     handleRoleTooltip,
-    handleRoleUpdate,
+    handleMemberUpdate,
     orgIndex
   } = props;
 
   const toggled = toggledID;
   const handleClick = () => handleRoleTooltip(person.uuid);
-  const handleOptionSelect = (updatedMember) => handleRoleUpdate(updatedMember);
+  const handleOptionSelect = (updatedMember) =>
+    handleMemberUpdate(updatedMember);
 
   // Only send relevent info as props
   const _person =  {
@@ -90,8 +91,8 @@ const PersonRole = (props) => {
 };
 
 PersonRole.propTypes = {
+  handleMemberUpdate: React.PropTypes.func,
   handleRoleTooltip: React.PropTypes.func,
-  handleRoleUpdate: React.PropTypes.func,
   membersRolesOptions: React.PropTypes.array,
   orgIndex: React.PropTypes.number,
   person: React.PropTypes.object,
diff --git a/frontend/src/components/people-list/table/person-status.js b/frontend/src/components/people-list/table/person-status.js
index d73a4b01..8c0f5164 100644
--- a/frontend/src/components/people-list/table/person-status.js
+++ b/frontend/src/components/people-list/table/person-status.js
@@ -54,14 +54,14 @@ const PersonStatus = (props) => {
     person,
     personIndex,
     handleStatusTooltip,
-    handleStatusUpdate,
+    handleMemberUpdate,
     orgIndex
   } = props;
 
   const toggled = toggledID;
   const handleClick = () => handleStatusTooltip(person.uuid);
   const handleOptionSelect = (updatedMember) =>
-    handleStatusUpdate(updatedMember);
+    handleMemberUpdate(updatedMember);
 
   // Only send relevent info as props
   const _person =  {
@@ -91,8 +91,8 @@ const PersonStatus = (props) => {
 };
 
 PersonStatus.propTypes = {
+  handleMemberUpdate: React.PropTypes.func,
   handleStatusTooltip: React.PropTypes.func,
-  handleStatusUpdate: React.PropTypes.func,
   membersStatusOptions: React.PropTypes.array,
   orgIndex: React.PropTypes.number,
   person: React.PropTypes.object,
diff --git a/frontend/src/containers/org/people.js b/frontend/src/containers/org/people.js
index 074470ec..38444c66 100644
--- a/frontend/src/containers/org/people.js
+++ b/frontend/src/containers/org/people.js
@@ -20,8 +20,7 @@ const {
   handleInviteToggle,
   handlePeopleRoleTooltip,
   handlePeopleStatusTooltip,
-  handleRoleUpdate,
-  handleStatusUpdate,
+  handleMemberUpdate
 } = actions;
 
 const People = (props) => {
@@ -46,10 +45,9 @@ const mapDispatchToProps = (dispatch) => ({
   handleToggle: () => dispatch(handleInviteToggle()),
   handleStatusTooltip: (id) => dispatch(handlePeopleStatusTooltip(id)),
   handleRoleTooltip: (id) => dispatch(handlePeopleRoleTooltip(id)),
-  handleRoleUpdate: (updatedMember) =>
-      dispatch(handleRoleUpdate(updatedMember)),
-  handleStatusUpdate: (updatedMember) =>
-    dispatch(handleStatusUpdate(updatedMember)),
+  handleMemberUpdate: (updatedMember) =>
+      dispatch(handleMemberUpdate(updatedMember)),
+
 });
 
 module.exports = connect(
diff --git a/frontend/src/state/actions.js b/frontend/src/state/actions.js
index e67159e7..8edb6883 100644
--- a/frontend/src/state/actions.js
+++ b/frontend/src/state/actions.js
@@ -22,6 +22,5 @@ module.exports = {
       createAction(`${APP}/HANDLE_PERSON_STATUS_TOOLTIP`),
   handlePeopleRoleTooltip:
     createAction(`${APP}/HANDLE_PERSON_ROLE_TOOLTIP`),
-  handleMemberUpdate: createAction(`${APP}/HANDLE_PERSON_ROLE_UPDATE`),
-  handleStatusUpdate: createAction(`${APP}/HANDLE_PERSON_STATUS_UPDATE`),
+  handleMemberUpdate: createAction(`${APP}/HANDLE_MEMBER_UPDATE`),
 };
diff --git a/frontend/src/state/reducers/orgs.js b/frontend/src/state/reducers/orgs.js
index f98e7fd3..e8cea8aa 100644
--- a/frontend/src/state/reducers/orgs.js
+++ b/frontend/src/state/reducers/orgs.js
@@ -10,8 +10,7 @@ const {
   handleInviteToggle,
   handlePeopleRoleTooltip,
   handlePeopleStatusTooltip,
-  handleRoleUpdate,
-  handleStatusUpdate,
+  handleMemberUpdate,
 } = actions;
 
 module.exports = handleActions({
@@ -48,36 +47,7 @@ module.exports = handleActions({
       }
     };
   },
-  [handleRoleUpdate.toString()]: (state, action) => {
-    const {
-      orgIndex,
-      person,
-      personIndex,
-    } = action.payload;
-
-    return {
-      ...state,
-      ui: {
-        ...state.ui,
-        member_role_tooltip: false
-      },
-      data: [
-        ...state.data.slice(0, orgIndex),
-        {
-          ...state.data[orgIndex],
-          members: [
-            ...state.data[orgIndex].members.slice(0, personIndex),
-            {
-              ...person,
-            },
-            ...state.data[orgIndex].members.slice(personIndex + 1)
-          ]
-        },
-        ...state.data.slice(orgIndex + 1),
-      ]
-    };
-  },
-  [handleStatusUpdate.toString()]: (state, action) => {
+  [handleMemberUpdate.toString()]: (state, action) => {
     const {
       orgIndex,
       person,

From 4ac20bac7328e03fd518ab3e01fbc43e906befb3 Mon Sep 17 00:00:00 2001
From: Alex Windett <windettalex@gmail.com>
Date: Wed, 25 Jan 2017 16:37:26 +0000
Subject: [PATCH 09/32] deleting member from org

---
 .../src/components/people-list/table/index.js | 15 ++++++-
 .../people-list/table/person-delete.js        | 43 +++++++++++++++++++
 frontend/src/containers/org/people.js         |  5 ++-
 frontend/src/state/actions.js                 |  1 +
 frontend/src/state/reducers/orgs.js           | 24 ++++++++++-
 5 files changed, 84 insertions(+), 4 deletions(-)
 create mode 100644 frontend/src/components/people-list/table/person-delete.js

diff --git a/frontend/src/components/people-list/table/index.js b/frontend/src/components/people-list/table/index.js
index 88b4d970..9dbde524 100644
--- a/frontend/src/components/people-list/table/index.js
+++ b/frontend/src/components/people-list/table/index.js
@@ -5,6 +5,7 @@ const Checkbox  = require('@ui/components/checkbox');
 
 const PersonStatus = require('./person-status');
 const PersonRole = require('./person-role');
+const PersonDelete = require('./person-delete');
 
 const PeopleTable = (props) => {
 
@@ -14,7 +15,8 @@ const PeopleTable = (props) => {
     handleMemberUpdate,
     people = [],
     orgUI = {},
-    orgIndex
+    orgIndex,
+    removeMember
   } = props;
 
   const columns = [{
@@ -59,12 +61,20 @@ const PeopleTable = (props) => {
       />
     );
 
+    const remove = (person) => (
+      <PersonDelete
+        orgIndex={orgIndex}
+        personIndex={index}
+        removeMember={removeMember}
+      />
+    );
+
     return {
       checkbox: <Checkbox />,
       name: person.name,
       status: status(person),
       role: role(person),
-      bin: ''
+      bin: people.length > 1 ? remove(person) : null
     };
   });
 
@@ -83,6 +93,7 @@ PeopleTable.propTypes = {
   orgIndex: React.PropTypes.number,
   orgUI: React.PropTypes.object,
   people: React.PropTypes.array,
+  removeMember: React.PropTypes.func,
 };
 
 module.exports = PeopleTable;
\ No newline at end of file
diff --git a/frontend/src/components/people-list/table/person-delete.js b/frontend/src/components/people-list/table/person-delete.js
new file mode 100644
index 00000000..87f592fc
--- /dev/null
+++ b/frontend/src/components/people-list/table/person-delete.js
@@ -0,0 +1,43 @@
+const React = require('react');
+const Styled = require('styled-components');
+
+const {
+  default: styled
+} = Styled;
+
+const PlainButton = styled.button`
+  background: transparent;
+  font-size: inherit;
+  border: none;
+  zIndex: 0;
+  font-family: inherit;
+  color: inherit;
+`;
+
+const PersonDelete = (props) => {
+
+  const {
+    personIndex,
+    orgIndex,
+    removeMember
+  } = props;
+
+  const _onClick = () => removeMember({
+    personIndex,
+    orgIndex
+  });
+
+  return (
+    <PlainButton onClick={_onClick} >
+      Delete
+    </PlainButton>
+  );
+};
+
+PersonDelete.propTypes = {
+  orgIndex: React.PropTypes.number,
+  personIndex: React.PropTypes.number,
+  removeMember: React.PropTypes.func,
+};
+
+module.exports = PersonDelete;
\ No newline at end of file
diff --git a/frontend/src/containers/org/people.js b/frontend/src/containers/org/people.js
index 38444c66..55726513 100644
--- a/frontend/src/containers/org/people.js
+++ b/frontend/src/containers/org/people.js
@@ -20,7 +20,8 @@ const {
   handleInviteToggle,
   handlePeopleRoleTooltip,
   handlePeopleStatusTooltip,
-  handleMemberUpdate
+  handleMemberUpdate,
+  removeMember,
 } = actions;
 
 const People = (props) => {
@@ -47,6 +48,8 @@ const mapDispatchToProps = (dispatch) => ({
   handleRoleTooltip: (id) => dispatch(handlePeopleRoleTooltip(id)),
   handleMemberUpdate: (updatedMember) =>
       dispatch(handleMemberUpdate(updatedMember)),
+  removeMember: (removeData) =>
+    dispatch(removeMember(removeData)),
 
 });
 
diff --git a/frontend/src/state/actions.js b/frontend/src/state/actions.js
index 8edb6883..7f32be8f 100644
--- a/frontend/src/state/actions.js
+++ b/frontend/src/state/actions.js
@@ -23,4 +23,5 @@ module.exports = {
   handlePeopleRoleTooltip:
     createAction(`${APP}/HANDLE_PERSON_ROLE_TOOLTIP`),
   handleMemberUpdate: createAction(`${APP}/HANDLE_MEMBER_UPDATE`),
+  removeMember: createAction(`${APP}/REMOVE_MEMBER_FROM_ROLE`),
 };
diff --git a/frontend/src/state/reducers/orgs.js b/frontend/src/state/reducers/orgs.js
index e8cea8aa..25f6a7aa 100644
--- a/frontend/src/state/reducers/orgs.js
+++ b/frontend/src/state/reducers/orgs.js
@@ -11,6 +11,7 @@ const {
   handlePeopleRoleTooltip,
   handlePeopleStatusTooltip,
   handleMemberUpdate,
+  removeMember,
 } = actions;
 
 module.exports = handleActions({
@@ -76,5 +77,26 @@ module.exports = handleActions({
         ...state.data.slice(orgIndex + 1),
       ]
     };
-  }
+  },
+  [removeMember.toString()]: (state, action) => {
+    const {
+      orgIndex,
+      personIndex,
+    } = action.payload;
+
+    return {
+      ...state,
+      data: [
+        ...state.data.slice(0, orgIndex),
+        {
+          ...state.data[orgIndex],
+          members: [
+            ...state.data[orgIndex].members.slice(0, personIndex),
+            ...state.data[orgIndex].members.slice(personIndex + 1)
+          ]
+        },
+        ...state.data.slice(orgIndex + 1),
+      ]
+    };
+  },
 }, {});

From 0c8971e372662f52a79f8484458d170e5439f91e Mon Sep 17 00:00:00 2001
From: Alex Windett <windettalex@gmail.com>
Date: Wed, 25 Jan 2017 17:36:56 +0000
Subject: [PATCH 10/32] addjusting positioning of tooltip elements

---
 frontend/src/components/people-list/table/person-role.js  | 8 +++++---
 .../src/components/people-list/table/person-status.js     | 8 +++++---
 frontend/src/components/people-list/table/tooltip.js      | 3 ++-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/frontend/src/components/people-list/table/person-role.js b/frontend/src/components/people-list/table/person-role.js
index 902f7af5..85531679 100644
--- a/frontend/src/components/people-list/table/person-role.js
+++ b/frontend/src/components/people-list/table/person-role.js
@@ -24,6 +24,8 @@ const borderSide = props => props.toggled
 
 const StyledWrapper = styled.div`
   position: relative;
+  display: inline-block;
+  min-width: ${remcalc(130)};
   
   &:after {
     border-left: ${remcalc(5)} solid transparent;
@@ -31,8 +33,8 @@ const StyledWrapper = styled.div`
     border-${borderSide}: ${remcalc(5)} solid black;
     
     ${pseudoEl({
-      top: '50%',
-      right: remcalc(10)
+      top: '40%',
+      right: remcalc(-10)
     })}
   }
 `;
@@ -58,7 +60,7 @@ const PersonRole = (props) => {
     orgIndex
   } = props;
 
-  const toggled = toggledID;
+  const toggled = toggledID === person.uuid;
   const handleClick = () => handleRoleTooltip(person.uuid);
   const handleOptionSelect = (updatedMember) =>
     handleMemberUpdate(updatedMember);
diff --git a/frontend/src/components/people-list/table/person-status.js b/frontend/src/components/people-list/table/person-status.js
index 8c0f5164..c81059ef 100644
--- a/frontend/src/components/people-list/table/person-status.js
+++ b/frontend/src/components/people-list/table/person-status.js
@@ -24,6 +24,8 @@ const borderSide = props => props.toggled
 
 const StyledWrapper = styled.div`
   position: relative;
+  display: inline-block;
+  min-width: ${remcalc(130)};
   
   &:after {
     border-left: ${remcalc(5)} solid transparent;
@@ -31,8 +33,8 @@ const StyledWrapper = styled.div`
     border-${borderSide}: ${remcalc(5)} solid black;
     
     ${pseudoEl({
-      top: '50%',
-      right: remcalc(10)
+      top: '40%',
+      right: remcalc(-10)
     })}
   }
 `;
@@ -58,7 +60,7 @@ const PersonStatus = (props) => {
     orgIndex
   } = props;
 
-  const toggled = toggledID;
+  const toggled = toggledID === person.uuid;
   const handleClick = () => handleStatusTooltip(person.uuid);
   const handleOptionSelect = (updatedMember) =>
     handleMemberUpdate(updatedMember);
diff --git a/frontend/src/components/people-list/table/tooltip.js b/frontend/src/components/people-list/table/tooltip.js
index 0d6b270c..83353dbd 100644
--- a/frontend/src/components/people-list/table/tooltip.js
+++ b/frontend/src/components/people-list/table/tooltip.js
@@ -5,7 +5,8 @@ const Tooltip = require('@ui/components/tooltip');
 const tooltipStyle = {
   position: 'absolute',
   top: '30px',
-  zIndex: 1
+  zIndex: 1,
+  right: '-36px',
 };
 
 const arrowPosition = {

From 058d056b7930439374ce52b64d0c75e49d69d0c2 Mon Sep 17 00:00:00 2001
From: Alex Windett <windettalex@gmail.com>
Date: Wed, 25 Jan 2017 17:38:02 +0000
Subject: [PATCH 11/32] correcting spelling mistake

---
 frontend/src/mock-state.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/mock-state.json b/frontend/src/mock-state.json
index 12d5c2d5..c00677d4 100644
--- a/frontend/src/mock-state.json
+++ b/frontend/src/mock-state.json
@@ -494,7 +494,7 @@
       ],
       "members_roles": [
         "Owner",
-        "Unnassigned",
+        "Unassigned",
         "Read Only"
       ]
     },

From abc4ff8a34ea915a6c384fb6fa085e351e919ec7 Mon Sep 17 00:00:00 2001
From: Alex Windett <windettalex@gmail.com>
Date: Wed, 25 Jan 2017 17:50:45 +0000
Subject: [PATCH 12/32] regenerating yarn.lock files

---
 ui/yarn.lock | 132 ++++++++++++++++++++++++++++++---------------------
 1 file changed, 77 insertions(+), 55 deletions(-)

diff --git a/ui/yarn.lock b/ui/yarn.lock
index 9f56085d..9b87bf13 100644
--- a/ui/yarn.lock
+++ b/ui/yarn.lock
@@ -150,12 +150,12 @@ airbnb-js-shims@^1.0.1:
     string.prototype.padstart "^3.0.0"
 
 ajv-keywords@^1.0.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.0.tgz#c11e6859eafff83e0dafc416929472eca946aa2c"
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
 
 ajv@^4.7.0:
-  version "4.10.4"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.10.4.tgz#c0974dd00b3464984892d6010aa9c2c945933254"
+  version "4.11.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.2.tgz#f166c3c11cbc6cb9dcc102a5bcfe5b72c95287e6"
   dependencies:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
@@ -288,11 +288,11 @@ array-unique@^0.2.1:
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
 
 array.prototype.find@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.0.1.tgz#1557f888df6c57e4d1256f20852d687a25b51fde"
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.0.3.tgz#08c3ec33e32ec4bab362a2958e686ae92f59271d"
   dependencies:
     define-properties "^1.1.2"
-    es-abstract "^1.5.0"
+    es-abstract "^1.7.0"
 
 arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
@@ -355,14 +355,14 @@ auto-bind@^0.1.0:
   resolved "https://registry.yarnpkg.com/auto-bind/-/auto-bind-0.1.0.tgz#7a29efc8c2388d3d578e02fc2df531c81ffc1ee1"
 
 autoprefixer@^6.0.0, autoprefixer@^6.3.1, autoprefixer@^6.3.7:
-  version "6.6.1"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.6.1.tgz#11a4077abb4b313253ec2f6e1adb91ad84253519"
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.0.tgz#88992cf04df141e7b8293550f2ee716c565d1cae"
   dependencies:
-    browserslist "~1.5.1"
-    caniuse-db "^1.0.30000604"
+    browserslist "~1.6.0"
+    caniuse-db "^1.0.30000613"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^5.2.8"
+    postcss "^5.2.11"
     postcss-value-parser "^3.2.3"
 
 ava-files@^0.2.0:
@@ -1433,11 +1433,12 @@ browserify-zlib@^0.1.4:
   dependencies:
     pako "~0.2.0"
 
-browserslist@^1.0.1, browserslist@^1.1.1, browserslist@^1.1.3, browserslist@^1.4.0, browserslist@^1.5.2, browserslist@~1.5.1:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.5.2.tgz#1c82fde0ee8693e6d15c49b7bff209dc06298c56"
+browserslist@^1.0.1, browserslist@^1.1.1, browserslist@^1.1.3, browserslist@^1.4.0, browserslist@^1.5.2, browserslist@~1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.6.0.tgz#85fb7c993540d3fda31c282baf7f5aee698ac9ee"
   dependencies:
-    caniuse-db "^1.0.30000604"
+    caniuse-db "^1.0.30000613"
+    electron-to-chromium "^1.2.0"
 
 buf-compare@^1.0.0:
   version "1.0.1"
@@ -1536,9 +1537,9 @@ caniuse-api@^1.5.2:
     lodash.uniq "^4.3.0"
     shelljs "^0.7.0"
 
-caniuse-db@^1.0.30000187, caniuse-db@^1.0.30000346, caniuse-db@^1.0.30000604:
-  version "1.0.30000613"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000613.tgz#639133b7a5380c1416f9701d23d54d093dd68299"
+caniuse-db@^1.0.30000187, caniuse-db@^1.0.30000346, caniuse-db@^1.0.30000613:
+  version "1.0.30000615"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000615.tgz#605bc071db4c5031acfb5e469c3b50a531dd5d04"
 
 capture-stack-trace@^1.0.0:
   version "1.0.0"
@@ -2105,8 +2106,8 @@ csso@~2.2.1:
     source-map "^0.5.3"
 
 "cssom@>= 0.3.0 < 0.4.0", cssom@0.3.x:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.1.tgz#c9e37ef2490e64f6d1baa10fda852257082c25d3"
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
 
 "cssstyle@>= 0.2.36 < 0.3.0":
   version "0.2.37"
@@ -2272,9 +2273,9 @@ d3-time@1, d3-time@1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-1.0.4.tgz#2ceba09a76b7450c992a1ded4e10fc6195e69649"
 
-d3-timer@1, d3-timer@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.3.tgz#7a308a10c8524778e6b32d1d6c1c329209ae0ebf"
+d3-timer@1, d3-timer@1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.4.tgz#adaf7f60c7b54c99b2ffabd28c15a0c108a75321"
 
 d3-transition@1, d3-transition@1.0.3:
   version "1.0.3"
@@ -2302,8 +2303,8 @@ d3-zoom@1.1.1:
     d3-transition "1"
 
 d3@^4.4.1:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/d3/-/d3-4.4.2.tgz#7173647bd46c7f9b9dc6b41c1b999de0fc206a26"
+  version "4.4.4"
+  resolved "https://registry.yarnpkg.com/d3/-/d3-4.4.4.tgz#15d4e455687bc7a8ff2eeb4b25354a6ba4f24f57"
   dependencies:
     d3-array "1.0.2"
     d3-axis "1.0.4"
@@ -2331,7 +2332,7 @@ d3@^4.4.1:
     d3-shape "1.0.4"
     d3-time "1.0.4"
     d3-time-format "2.0.3"
-    d3-timer "1.0.3"
+    d3-timer "1.0.4"
     d3-transition "1.0.3"
     d3-voronoi "1.1.1"
     d3-zoom "1.1.1"
@@ -2548,6 +2549,10 @@ ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
 
+electron-to-chromium@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.2.1.tgz#63ac7579a1c5bedb296c8607621f2efc9a54b968"
+
 element-class@^0.2.0:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/element-class/-/element-class-0.2.2.tgz#9d3bbd0767f9013ef8e1c8ebe722c1402a60050e"
@@ -2586,8 +2591,8 @@ entities@^1.1.1, entities@~1.1.1:
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
 
 enzyme@^2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-2.7.0.tgz#772477800547ca2514cc0af258e647c166aee899"
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-2.7.1.tgz#76370e1d99e91f73091bb8c4314b7c128cc2d621"
   dependencies:
     cheerio "^0.22.0"
     function.prototype.name "^1.0.0"
@@ -2611,9 +2616,9 @@ error-ex@^1.2.0:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.4.3, es-abstract@^1.5.0, es-abstract@^1.5.1, es-abstract@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.6.1.tgz#bb8a2064120abcf928a086ea3d9043114285ec99"
+es-abstract@^1.4.3, es-abstract@^1.5.0, es-abstract@^1.5.1, es-abstract@^1.6.1, es-abstract@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.7.0.tgz#dfade774e01bfcd97f96180298c449c8623fb94c"
   dependencies:
     es-to-primitive "^1.1.1"
     function-bind "^1.1.0"
@@ -2669,8 +2674,8 @@ es6-set@~0.1.3:
     event-emitter "~0.3.4"
 
 es6-shim@^0.35.1:
-  version "0.35.2"
-  resolved "https://registry.yarnpkg.com/es6-shim/-/es6-shim-0.35.2.tgz#45c5b3eb2f792ed28f130d826239be50affb897f"
+  version "0.35.3"
+  resolved "https://registry.yarnpkg.com/es6-shim/-/es6-shim-0.35.3.tgz#9bfb7363feffff87a6cdb6cd93e405ec3c4b6f26"
 
 es6-symbol@~3.1, es6-symbol@~3.1.0, es6-symbol@3:
   version "3.1.0"
@@ -2753,8 +2758,8 @@ eslint-plugin-standard@^2.0.1:
   resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-2.0.1.tgz#3589699ff9c917f2c25f76a916687f641c369ff3"
 
 eslint@^3.13.1:
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.13.1.tgz#564d2646b5efded85df96985332edd91a23bff25"
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.14.0.tgz#2c617e5f782fda5cbee5bc8be7ef5053af8e63a3"
   dependencies:
     babel-code-frame "^6.16.0"
     chalk "^1.1.3"
@@ -3376,7 +3381,7 @@ htmlparser2@^3.9.1:
     inherits "^2.0.1"
     readable-stream "^2.0.2"
 
-http-errors@~1.5.0:
+http-errors@~1.5.0, http-errors@~1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.5.1.tgz#788c0d2c1de2c81b9e6e8c01843b6b97eb920750"
   dependencies:
@@ -4240,8 +4245,8 @@ matcher@^0.1.1:
     escape-string-regexp "^1.0.4"
 
 math-expression-evaluator@^1.2.14:
-  version "1.2.14"
-  resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.14.tgz#39511771ed9602405fba9affff17eb4d2a3843ab"
+  version "1.2.15"
+  resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.15.tgz#38dc5f0194c5bf5ff1c690ad4c4b64df71ac0187"
   dependencies:
     lodash.indexof "^4.0.5"
 
@@ -4404,16 +4409,16 @@ mute-stream@0.0.5:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
 
 nan@^2.3.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.5.0.tgz#aa8f1e34531d807e9e27755b234b4a6ec0c152a8"
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.5.1.tgz#d5b01691253326a97a2bbee9e61c55d8d60351e2"
 
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
 
 nearley@^2.7.7:
-  version "2.7.10"
-  resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.7.10.tgz#06f9531e06a1730244635acd7dd005485550a623"
+  version "2.7.11"
+  resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.7.11.tgz#826d928d93c078e5e2a12ebc269842ba5fe64086"
   dependencies:
     nomnom "~1.6.2"
     railroad-diagrams "^1.0.0"
@@ -5208,7 +5213,7 @@ postcss-zindex@^2.0.1:
     postcss "^5.0.4"
     uniqs "^2.0.0"
 
-postcss@^5.0.0, postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.18, postcss@^5.0.2, postcss@^5.0.20, postcss@^5.0.21, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.4, postcss@^5.2.5, postcss@^5.2.8:
+postcss@^5.0.0, postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.18, postcss@^5.0.2, postcss@^5.0.20, postcss@^5.0.21, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.11, postcss@^5.2.4, postcss@^5.2.5:
   version "5.2.11"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.11.tgz#ff29bcd6d2efb98bfe08a022055ec599bbe7b761"
   dependencies:
@@ -5840,8 +5845,8 @@ run-async@^0.1.0:
     once "^1.3.0"
 
 rw@1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.2.tgz#14ef5137ff7547c73ecf0e0af1f0aee07e5401ee"
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4"
 
 rx-lite@^3.1.2:
   version "3.1.2"
@@ -5879,6 +5884,24 @@ send@0.14.1:
     range-parser "~1.2.0"
     statuses "~1.3.0"
 
+send@0.14.2:
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.14.2.tgz#39b0438b3f510be5dc6f667a11f71689368cdeef"
+  dependencies:
+    debug "~2.2.0"
+    depd "~1.1.0"
+    destroy "~1.0.4"
+    encodeurl "~1.0.1"
+    escape-html "~1.0.3"
+    etag "~1.7.0"
+    fresh "0.3.0"
+    http-errors "~1.5.1"
+    mime "1.3.4"
+    ms "0.7.2"
+    on-finished "~2.3.0"
+    range-parser "~1.2.0"
+    statuses "~1.3.1"
+
 serve-favicon@^2.3.0:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/serve-favicon/-/serve-favicon-2.3.2.tgz#dd419e268de012ab72b319d337f2105013f9381f"
@@ -5889,13 +5912,13 @@ serve-favicon@^2.3.0:
     parseurl "~1.3.1"
 
 serve-static@~1.11.1:
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.11.1.tgz#d6cce7693505f733c759de57befc1af76c0f0805"
+  version "1.11.2"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.11.2.tgz#2cf9889bd4435a320cc36895c9aa57bd662e6ac7"
   dependencies:
     encodeurl "~1.0.1"
     escape-html "~1.0.3"
     parseurl "~1.3.1"
-    send "0.14.1"
+    send "0.14.2"
 
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
@@ -6082,7 +6105,7 @@ stack-utils@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-0.4.0.tgz#940cb82fccfa84e8ff2f3fdf293fe78016beccd1"
 
-"statuses@>= 1.3.1 < 2", statuses@~1.3.0:
+"statuses@>= 1.3.1 < 2", statuses@~1.3.0, statuses@~1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
 
@@ -6206,8 +6229,8 @@ style-search@^0.1.0:
   resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902"
 
 styled-components@^1.3.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-1.3.1.tgz#219aebf87405d890e0c60c8f702089d947aafc0a"
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-1.4.0.tgz#a094d2ebd1c3227cd591d4d999d48860bf3f76b7"
   dependencies:
     buffer "^5.0.2"
     css-to-react-native "^1.0.6"
@@ -6216,7 +6239,6 @@ styled-components@^1.3.0:
     inline-style-prefixer "^2.0.5"
     is-function "^1.0.1"
     is-plain-object "^2.0.1"
-    supports-color "^3.1.2"
 
 stylehacks@^2.3.0:
   version "2.3.1"
@@ -6383,8 +6405,8 @@ tap-parser@~1.2.2:
     readable-stream "^2"
 
 tap-xunit@^1.5.1:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/tap-xunit/-/tap-xunit-1.6.0.tgz#5f734eedb84d966f6e9409008598194ae01d8690"
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/tap-xunit/-/tap-xunit-1.7.0.tgz#c0fe296a4ff270e042467e754419b5f049bef8be"
   dependencies:
     duplexer "~0.1.1"
     minimist "~1.2.0"

From 3cb2713c713bf10353521d0e8e22df20a9f172a4 Mon Sep 17 00:00:00 2001
From: Tom Gallacher <tomgallacher23@gmail.com>
Date: Thu, 26 Jan 2017 12:12:57 +0000
Subject: [PATCH 13/32] Fix ui deployment

---
 ui/Dockerfile |   1 -
 ui/Makefile   |   3 +-
 ui/yarn.lock  | 357 ++++++++++++++++++++++++--------------------------
 3 files changed, 175 insertions(+), 186 deletions(-)

diff --git a/ui/Dockerfile b/ui/Dockerfile
index ff2d47d7..63a65e64 100644
--- a/ui/Dockerfile
+++ b/ui/Dockerfile
@@ -1,2 +1 @@
 FROM quay.io/yldio/alpine-node-containerpilot:6.9.4
-RUN yarn add st
diff --git a/ui/Makefile b/ui/Makefile
index fc915dcc..0ca04c59 100644
--- a/ui/Makefile
+++ b/ui/Makefile
@@ -36,8 +36,7 @@ start:
 	$(bindir)/start-storybook -p 8080
 
 .PHONY: install-production
-install-production: compile clean
-	yarn install --production --pure-lockfile --prefer-offline
+install-production: compile
 
 .PHONY: compile
 compile: install
diff --git a/ui/yarn.lock b/ui/yarn.lock
index 9b87bf13..87e55c90 100644
--- a/ui/yarn.lock
+++ b/ui/yarn.lock
@@ -1,5 +1,7 @@
 # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
 # yarn lockfile v1
+
+
 "@kadira/react-split-pane@^1.4.0":
   version "1.4.7"
   resolved "https://registry.yarnpkg.com/@kadira/react-split-pane/-/react-split-pane-1.4.7.tgz#6d753d4a9fe62fe82056e323a6bcef7f026972b5"
@@ -97,6 +99,13 @@
     webpack-dev-middleware "^1.6.0"
     webpack-hot-middleware "^2.13.2"
 
+JSONStream@^0.8.4:
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-0.8.4.tgz#91657dfe6ff857483066132b4618b62e8f4887bd"
+  dependencies:
+    jsonparse "0.0.5"
+    through ">=2.2.7 <3"
+
 abab@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.3.tgz#b81de5f7274ec4e756d797cd834f303642724e5d"
@@ -786,6 +795,14 @@ babel-plugin-transform-async-to-generator@^6.22.0, babel-plugin-transform-async-
     babel-plugin-syntax-async-functions "^6.8.0"
     babel-runtime "^6.22.0"
 
+babel-plugin-transform-class-properties@6.16.0:
+  version "6.16.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.16.0.tgz#969bca24d34e401d214f36b8af5c1346859bc904"
+  dependencies:
+    babel-helper-function-name "^6.8.0"
+    babel-plugin-syntax-class-properties "^6.8.0"
+    babel-runtime "^6.9.1"
+
 babel-plugin-transform-class-properties@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.22.0.tgz#aa78f8134495c7de06c097118ba061844e1dc1d8"
@@ -795,14 +812,6 @@ babel-plugin-transform-class-properties@^6.22.0:
     babel-runtime "^6.22.0"
     babel-template "^6.22.0"
 
-babel-plugin-transform-class-properties@6.16.0:
-  version "6.16.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.16.0.tgz#969bca24d34e401d214f36b8af5c1346859bc904"
-  dependencies:
-    babel-helper-function-name "^6.8.0"
-    babel-plugin-syntax-class-properties "^6.8.0"
-    babel-runtime "^6.9.1"
-
 babel-plugin-transform-decorators@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.22.0.tgz#c03635b27a23b23b7224f49232c237a73988d27c"
@@ -856,18 +865,18 @@ babel-plugin-transform-es2015-computed-properties@^6.22.0, babel-plugin-transfor
     babel-runtime "^6.22.0"
     babel-template "^6.22.0"
 
-babel-plugin-transform-es2015-destructuring@^6.22.0, babel-plugin-transform-es2015-destructuring@^6.6.0, babel-plugin-transform-es2015-destructuring@^6.6.5:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.22.0.tgz#8e0af2f885a0b2cf999d47c4c1dd23ce88cfa4c6"
-  dependencies:
-    babel-runtime "^6.22.0"
-
 babel-plugin-transform-es2015-destructuring@6.16.0:
   version "6.16.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.16.0.tgz#050fe0866f5d53b36062ee10cdf5bfe64f929627"
   dependencies:
     babel-runtime "^6.9.0"
 
+babel-plugin-transform-es2015-destructuring@^6.22.0, babel-plugin-transform-es2015-destructuring@^6.6.0, babel-plugin-transform-es2015-destructuring@^6.6.5:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.22.0.tgz#8e0af2f885a0b2cf999d47c4c1dd23ce88cfa4c6"
+  dependencies:
+    babel-runtime "^6.22.0"
+
 babel-plugin-transform-es2015-duplicate-keys@^6.22.0, babel-plugin-transform-es2015-duplicate-keys@^6.6.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.22.0.tgz#672397031c21610d72dd2bbb0ba9fb6277e1c36b"
@@ -935,17 +944,6 @@ babel-plugin-transform-es2015-object-super@^6.22.0, babel-plugin-transform-es201
     babel-helper-replace-supers "^6.22.0"
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-parameters@^6.22.0, babel-plugin-transform-es2015-parameters@^6.6.0, babel-plugin-transform-es2015-parameters@^6.7.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.22.0.tgz#57076069232019094f27da8c68bb7162fe208dbb"
-  dependencies:
-    babel-helper-call-delegate "^6.22.0"
-    babel-helper-get-function-arity "^6.22.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.22.0"
-    babel-traverse "^6.22.0"
-    babel-types "^6.22.0"
-
 babel-plugin-transform-es2015-parameters@6.17.0:
   version "6.17.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.17.0.tgz#e06d30cef897f46adb4734707bbe128a0d427d58"
@@ -957,6 +955,17 @@ babel-plugin-transform-es2015-parameters@6.17.0:
     babel-traverse "^6.16.0"
     babel-types "^6.16.0"
 
+babel-plugin-transform-es2015-parameters@^6.22.0, babel-plugin-transform-es2015-parameters@^6.6.0, babel-plugin-transform-es2015-parameters@^6.7.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.22.0.tgz#57076069232019094f27da8c68bb7162fe208dbb"
+  dependencies:
+    babel-helper-call-delegate "^6.22.0"
+    babel-helper-get-function-arity "^6.22.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.22.0"
+    babel-traverse "^6.22.0"
+    babel-types "^6.22.0"
+
 babel-plugin-transform-es2015-shorthand-properties@^6.22.0, babel-plugin-transform-es2015-shorthand-properties@^6.3.13, babel-plugin-transform-es2015-shorthand-properties@^6.5.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.22.0.tgz#8ba776e0affaa60bff21e921403b8a652a2ff723"
@@ -1013,13 +1022,6 @@ babel-plugin-transform-flow-strip-types@^6.22.0, babel-plugin-transform-flow-str
     babel-plugin-syntax-flow "^6.18.0"
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-object-rest-spread@^6.20.2, babel-plugin-transform-object-rest-spread@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.22.0.tgz#1d419b55e68d2e4f64a5ff3373bd67d73c8e83bc"
-  dependencies:
-    babel-plugin-syntax-object-rest-spread "^6.8.0"
-    babel-runtime "^6.22.0"
-
 babel-plugin-transform-object-rest-spread@6.16.0:
   version "6.16.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.16.0.tgz#db441d56fffc1999052fdebe2e2f25ebd28e36a9"
@@ -1027,6 +1029,13 @@ babel-plugin-transform-object-rest-spread@6.16.0:
     babel-plugin-syntax-object-rest-spread "^6.8.0"
     babel-runtime "^6.0.0"
 
+babel-plugin-transform-object-rest-spread@^6.20.2, babel-plugin-transform-object-rest-spread@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.22.0.tgz#1d419b55e68d2e4f64a5ff3373bd67d73c8e83bc"
+  dependencies:
+    babel-plugin-syntax-object-rest-spread "^6.8.0"
+    babel-runtime "^6.22.0"
+
 babel-plugin-transform-react-constant-elements@6.9.1:
   version "6.9.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-constant-elements/-/babel-plugin-transform-react-constant-elements-6.9.1.tgz#125b86d96cb322e2139b607fd749ad5fbb17f005"
@@ -1039,13 +1048,6 @@ babel-plugin-transform-react-display-name@^6.22.0, babel-plugin-transform-react-
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-react-jsx-self@^6.11.0, babel-plugin-transform-react-jsx-self@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.22.0.tgz#df6d80a9da2612a121e6ddd7558bcbecf06e636e"
-  dependencies:
-    babel-plugin-syntax-jsx "^6.8.0"
-    babel-runtime "^6.22.0"
-
 babel-plugin-transform-react-jsx-self@6.11.0:
   version "6.11.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.11.0.tgz#605c9450c1429f97a930f7e1dfe3f0d9d0dbd0f4"
@@ -1053,9 +1055,9 @@ babel-plugin-transform-react-jsx-self@6.11.0:
     babel-plugin-syntax-jsx "^6.8.0"
     babel-runtime "^6.9.0"
 
-babel-plugin-transform-react-jsx-source@^6.22.0, babel-plugin-transform-react-jsx-source@^6.3.13:
+babel-plugin-transform-react-jsx-self@^6.11.0, babel-plugin-transform-react-jsx-self@^6.22.0:
   version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.22.0.tgz#66ac12153f5cd2d17b3c19268f4bf0197f44ecd6"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.22.0.tgz#df6d80a9da2612a121e6ddd7558bcbecf06e636e"
   dependencies:
     babel-plugin-syntax-jsx "^6.8.0"
     babel-runtime "^6.22.0"
@@ -1067,6 +1069,13 @@ babel-plugin-transform-react-jsx-source@6.9.0:
     babel-plugin-syntax-jsx "^6.8.0"
     babel-runtime "^6.9.0"
 
+babel-plugin-transform-react-jsx-source@^6.22.0, babel-plugin-transform-react-jsx-source@^6.3.13:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.22.0.tgz#66ac12153f5cd2d17b3c19268f4bf0197f44ecd6"
+  dependencies:
+    babel-plugin-syntax-jsx "^6.8.0"
+    babel-runtime "^6.22.0"
+
 babel-plugin-transform-react-jsx@^6.22.0, babel-plugin-transform-react-jsx@^6.3.13:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.22.0.tgz#48556b7dd4c3fe97d1c943bcd54fc3f2561c1817"
@@ -1075,12 +1084,6 @@ babel-plugin-transform-react-jsx@^6.22.0, babel-plugin-transform-react-jsx@^6.3.
     babel-plugin-syntax-jsx "^6.8.0"
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-regenerator@^6.22.0, babel-plugin-transform-regenerator@^6.6.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.22.0.tgz#65740593a319c44522157538d690b84094617ea6"
-  dependencies:
-    regenerator-transform "0.9.8"
-
 babel-plugin-transform-regenerator@6.16.1:
   version "6.16.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.16.1.tgz#a75de6b048a14154aae14b0122756c5bed392f59"
@@ -1089,11 +1092,11 @@ babel-plugin-transform-regenerator@6.16.1:
     babel-types "^6.16.0"
     private "~0.1.5"
 
-babel-plugin-transform-runtime@^6.15.0:
+babel-plugin-transform-regenerator@^6.22.0, babel-plugin-transform-regenerator@^6.6.0:
   version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.22.0.tgz#10968d760bbf6517243081eec778e10fa828551c"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.22.0.tgz#65740593a319c44522157538d690b84094617ea6"
   dependencies:
-    babel-runtime "^6.22.0"
+    regenerator-transform "0.9.8"
 
 babel-plugin-transform-runtime@6.15.0:
   version "6.15.0"
@@ -1101,6 +1104,12 @@ babel-plugin-transform-runtime@6.15.0:
   dependencies:
     babel-runtime "^6.9.0"
 
+babel-plugin-transform-runtime@^6.15.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.22.0.tgz#10968d760bbf6517243081eec778e10fa828551c"
+  dependencies:
+    babel-runtime "^6.22.0"
+
 babel-plugin-transform-strict-mode@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.22.0.tgz#e008df01340fdc87e959da65991b7e05970c8c7c"
@@ -1230,18 +1239,6 @@ babel-preset-react-app@^1.0.0:
     babel-preset-react "6.16.0"
     babel-runtime "6.11.6"
 
-babel-preset-react@^6.16.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-react/-/babel-preset-react-6.22.0.tgz#7bc97e2d73eec4b980fb6b4e4e0884e81ccdc165"
-  dependencies:
-    babel-plugin-syntax-flow "^6.3.13"
-    babel-plugin-syntax-jsx "^6.3.13"
-    babel-plugin-transform-flow-strip-types "^6.22.0"
-    babel-plugin-transform-react-display-name "^6.22.0"
-    babel-plugin-transform-react-jsx "^6.22.0"
-    babel-plugin-transform-react-jsx-self "^6.22.0"
-    babel-plugin-transform-react-jsx-source "^6.22.0"
-
 babel-preset-react@6.16.0:
   version "6.16.0"
   resolved "https://registry.yarnpkg.com/babel-preset-react/-/babel-preset-react-6.16.0.tgz#aa117d60de0928607e343c4828906e4661824316"
@@ -1254,6 +1251,18 @@ babel-preset-react@6.16.0:
     babel-plugin-transform-react-jsx-self "^6.11.0"
     babel-plugin-transform-react-jsx-source "^6.3.13"
 
+babel-preset-react@^6.16.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-react/-/babel-preset-react-6.22.0.tgz#7bc97e2d73eec4b980fb6b4e4e0884e81ccdc165"
+  dependencies:
+    babel-plugin-syntax-flow "^6.3.13"
+    babel-plugin-syntax-jsx "^6.3.13"
+    babel-plugin-transform-flow-strip-types "^6.22.0"
+    babel-plugin-transform-react-display-name "^6.22.0"
+    babel-plugin-transform-react-jsx "^6.22.0"
+    babel-plugin-transform-react-jsx-self "^6.22.0"
+    babel-plugin-transform-react-jsx-source "^6.22.0"
+
 babel-preset-stage-2@^6.17.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-preset-stage-2/-/babel-preset-stage-2-6.22.0.tgz#ccd565f19c245cade394b21216df704a73b27c07"
@@ -1285,13 +1294,6 @@ babel-register@^6.18.0, babel-register@^6.22.0:
     mkdirp "^0.5.1"
     source-map-support "^0.4.2"
 
-babel-runtime@^6.0.0, babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.5.0, babel-runtime@^6.9.0, babel-runtime@^6.9.1, babel-runtime@^6.9.2, babel-runtime@6.x.x:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.22.0.tgz#1cf8b4ac67c77a4ddb0db2ae1f74de52ac4ca611"
-  dependencies:
-    core-js "^2.4.0"
-    regenerator-runtime "^0.10.0"
-
 babel-runtime@6.11.6:
   version "6.11.6"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.11.6.tgz#6db707fef2d49c49bfa3cb64efdb436b518b8222"
@@ -1299,6 +1301,13 @@ babel-runtime@6.11.6:
     core-js "^2.4.0"
     regenerator-runtime "^0.9.5"
 
+babel-runtime@6.x.x, babel-runtime@^6.0.0, babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.5.0, babel-runtime@^6.9.0, babel-runtime@^6.9.1, babel-runtime@^6.9.2:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.22.0.tgz#1cf8b4ac67c77a4ddb0db2ae1f74de52ac4ca611"
+  dependencies:
+    core-js "^2.4.0"
+    regenerator-runtime "^0.10.0"
+
 babel-template@^6.16.0, babel-template@^6.22.0, babel-template@^6.7.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.22.0.tgz#403d110905a4626b317a2a1fcb8f3b73204b2edb"
@@ -1538,8 +1547,8 @@ caniuse-api@^1.5.2:
     shelljs "^0.7.0"
 
 caniuse-db@^1.0.30000187, caniuse-db@^1.0.30000346, caniuse-db@^1.0.30000613:
-  version "1.0.30000615"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000615.tgz#605bc071db4c5031acfb5e469c3b50a531dd5d04"
+  version "1.0.30000617"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000617.tgz#9b7fd81f58a35526315c83e60cb5f076f0beb392"
 
 capture-stack-trace@^1.0.0:
   version "1.0.0"
@@ -1805,21 +1814,21 @@ colormin@^1.0.5:
     css-color-names "0.0.4"
     has "^1.0.1"
 
-colors@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
-
 colors@0.5.x:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/colors/-/colors-0.5.1.tgz#7d0023eaeb154e8ee9fce75dcb923d0ed1667774"
 
+colors@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
+
 combined-stream@^1.0.5, combined-stream@~1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^2.8.1, commander@^2.9.0, commander@2:
+commander@2, commander@^2.8.1, commander@^2.9.0:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
   dependencies:
@@ -2105,7 +2114,7 @@ csso@~2.2.1:
     clap "^1.0.9"
     source-map "^0.5.3"
 
-"cssom@>= 0.3.0 < 0.4.0", cssom@0.3.x:
+cssom@0.3.x, "cssom@>= 0.3.0 < 0.4.0":
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
 
@@ -2121,12 +2130,6 @@ currently-unhandled@^0.4.1:
   dependencies:
     array-find-index "^1.0.1"
 
-d@^0.1.1, d@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/d/-/d-0.1.1.tgz#da184c535d18d8ee7ba2aa229b914009fae11309"
-  dependencies:
-    es5-ext "~0.10.2"
-
 d3-array@1, d3-array@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.0.2.tgz#174237bf356a852fadd6af87743d928631de7655"
@@ -2337,6 +2340,12 @@ d3@^4.4.1:
     d3-voronoi "1.1.1"
     d3-zoom "1.1.1"
 
+d@^0.1.1, d@~0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/d/-/d-0.1.1.tgz#da184c535d18d8ee7ba2aa229b914009fae11309"
+  dependencies:
+    es5-ext "~0.10.2"
+
 damerau-levenshtein@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.3.tgz#ae4f4ce0b62acae10ff63a01bb08f652f5213af2"
@@ -2481,7 +2490,7 @@ doiuse@^2.4.1:
     through2 "^0.6.3"
     yargs "^3.5.4"
 
-dom-serializer@~0.1.0, dom-serializer@0:
+dom-serializer@0, dom-serializer@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
   dependencies:
@@ -2492,7 +2501,7 @@ domain-browser@^1.1.1:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
 
-domelementtype@^1.3.0, domelementtype@1:
+domelementtype@1, domelementtype@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
 
@@ -2506,7 +2515,7 @@ domhandler@^2.3.0:
   dependencies:
     domelementtype "1"
 
-domutils@^1.5.1, domutils@1.5.1:
+domutils@1.5.1, domutils@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
   dependencies:
@@ -2519,9 +2528,11 @@ dot-prop@^3.0.0:
   dependencies:
     is-obj "^1.0.0"
 
-duplexer@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
+duplexer2@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
+  dependencies:
+    readable-stream "~1.1.9"
 
 duplexer2@^0.1.4:
   version "0.1.4"
@@ -2529,11 +2540,9 @@ duplexer2@^0.1.4:
   dependencies:
     readable-stream "^2.0.2"
 
-duplexer2@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
-  dependencies:
-    readable-stream "~1.1.9"
+duplexer@~0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
 
 eastasianwidth@^0.1.1:
   version "0.1.1"
@@ -2677,7 +2686,7 @@ es6-shim@^0.35.1:
   version "0.35.3"
   resolved "https://registry.yarnpkg.com/es6-shim/-/es6-shim-0.35.3.tgz#9bfb7363feffff87a6cdb6cd93e405ec3c4b6f26"
 
-es6-symbol@~3.1, es6-symbol@~3.1.0, es6-symbol@3:
+es6-symbol@3, es6-symbol@~3.1, es6-symbol@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.0.tgz#94481c655e7a7cad82eba832d97d5433496d7ffa"
   dependencies:
@@ -2758,8 +2767,8 @@ eslint-plugin-standard@^2.0.1:
   resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-2.0.1.tgz#3589699ff9c917f2c25f76a916687f641c369ff3"
 
 eslint@^3.13.1:
-  version "3.14.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.14.0.tgz#2c617e5f782fda5cbee5bc8be7ef5053af8e63a3"
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.14.1.tgz#8a62175f2255109494747a1b25128d97b8eb3d97"
   dependencies:
     babel-code-frame "^6.16.0"
     chalk "^1.1.3"
@@ -3337,7 +3346,7 @@ hoek@2.x.x:
   version "2.16.3"
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
 
-hoist-non-react-statics@^1.2.0, hoist-non-react-statics@1.x.x:
+hoist-non-react-statics@1.x.x, hoist-non-react-statics@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb"
 
@@ -3405,7 +3414,7 @@ hyphenate-style-name@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.2.tgz#31160a36930adaf1fc04c6074f7eb41465d4ec4b"
 
-iconv-lite@^0.4.13, iconv-lite@~0.4.13, iconv-lite@0.4:
+iconv-lite@0.4, iconv-lite@^0.4.13, iconv-lite@~0.4.13:
   version "0.4.15"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb"
 
@@ -3458,7 +3467,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@2, inherits@2.0.3:
+inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
@@ -3503,7 +3512,7 @@ interpret@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.1.tgz#d579fb7f693b858004947af39fa0db49f795602c"
 
-invariant@^2.2.0, invariant@2.x.x:
+invariant@2.x.x, invariant@^2.2.0:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
   dependencies:
@@ -3756,14 +3765,14 @@ is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
 
-isarray@^1.0.0, isarray@~1.0.0, isarray@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
 
+isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+
 isexe@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-1.1.2.tgz#36f3e22e60750920f5e7241a476a8c6a42275ad0"
@@ -3945,13 +3954,6 @@ jsonpointer@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
 
-JSONStream@^0.8.4:
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-0.8.4.tgz#91657dfe6ff857483066132b4618b62e8f4887bd"
-  dependencies:
-    jsonparse "0.0.5"
-    through ">=2.2.7 <3"
-
 jsprim@^1.2.2:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.3.1.tgz#2a7256f70412a29ee3670aaca625994c4dcff252"
@@ -4031,7 +4033,7 @@ load-json-file@^1.0.0, load-json-file@^1.1.0:
     pinkie-promise "^2.0.0"
     strip-bom "^2.0.0"
 
-loader-utils@^0.2, loader-utils@^0.2.11, loader-utils@^0.2.16, loader-utils@^0.2.7, loader-utils@~0.2.2, loader-utils@~0.2.5, loader-utils@0.2.x:
+loader-utils@0.2.x, loader-utils@^0.2, loader-utils@^0.2.11, loader-utils@^0.2.16, loader-utils@^0.2.7, loader-utils@~0.2.2, loader-utils@~0.2.5:
   version "0.2.16"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.16.tgz#f08632066ed8282835dff88dfb52704765adee6d"
   dependencies:
@@ -4176,14 +4178,14 @@ lodash.uniq@^4.3.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
 
+lodash@4.x.x, lodash@^4.0.0, lodash@^4.1.0, lodash@^4.10.0, lodash@^4.12.0, lodash@^4.17.2, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0:
+  version "4.17.4"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
+
 lodash@^3.5.0:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
-lodash@^4.0.0, lodash@^4.1.0, lodash@^4.10.0, lodash@^4.12.0, lodash@^4.17.2, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@4.x.x:
-  version "4.17.4"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
-
 log-symbols@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
@@ -4347,33 +4349,29 @@ mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.13, mime-types@~2.1.7:
   dependencies:
     mime-db "~1.26.0"
 
-mime@^1.3.4, mime@~1.3.4, mime@1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
-
 mime@1.2.x:
   version "1.2.11"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.2.11.tgz#58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"
 
+mime@1.3.4, mime@^1.3.4, mime@~1.3.4:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
+
 minimatch@^3.0.0, minimatch@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
   dependencies:
     brace-expansion "^1.0.0"
 
+minimist@0.0.8, minimist@~0.0.1:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+
 minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0, minimist@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
-minimist@~0.0.1:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-
-mkdirp@^0.5.0, mkdirp@^0.5.1, "mkdirp@>=0.5 0", mkdirp@~0.5.0, mkdirp@~0.5.1:
+"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   dependencies:
@@ -4387,14 +4385,14 @@ moment@^2.10.6, moment@^2.17.1:
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.17.1.tgz#fed9506063f36b10f066c8b59a144d7faebe1d82"
 
-ms@^0.7.1, ms@0.7.2:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
-
 ms@0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
 
+ms@0.7.2, ms@^0.7.1:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
+
 multimatch@^2.0.0, multimatch@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
@@ -4424,7 +4422,7 @@ nearley@^2.7.7:
     railroad-diagrams "^1.0.0"
     randexp "^0.4.2"
 
-negotiator@~0.6.1, negotiator@0.6.1:
+negotiator@0.6.1, negotiator@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
 
@@ -5340,26 +5338,26 @@ pseudomap@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
 
-punycode@^1.2.4, punycode@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-
 punycode@1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
 
+punycode@^1.2.4, punycode@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+
 q@^1.1.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
 
-qs@^6.1.0, qs@^6.2.0, qs@~6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.0.tgz#f403b264f23bc01228c74131b407f18d5ea5d442"
-
 qs@6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.0.tgz#3b7848c03c2dece69a9522b0fae8c4126d745f3b"
 
+qs@^6.1.0, qs@^6.2.0, qs@~6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.0.tgz#f403b264f23bc01228c74131b407f18d5ea5d442"
+
 query-string@^4.1.0:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.1.tgz#54baada6713eafc92be75c47a731f2ebd09cd11d"
@@ -5371,7 +5369,7 @@ querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
 
-querystring@^0.2.0, querystring@0.2.0:
+querystring@0.2.0, querystring@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
 
@@ -5551,6 +5549,15 @@ read-pkg@^1.0.0:
     normalize-package-data "^2.3.2"
     path-type "^1.0.0"
 
+"readable-stream@>=1.0.33-1 <1.1.0-0":
+  version "1.0.34"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
+
 readable-stream@^1.0.33, readable-stream@~1.1.9:
   version "1.1.14"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
@@ -5572,15 +5579,6 @@ readable-stream@^2, readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13",
     string_decoder "~0.10.x"
     util-deprecate "~1.0.1"
 
-"readable-stream@>=1.0.33-1 <1.1.0-0":
-  version "1.0.34"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
 readable-stream@~2.0.5:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
@@ -5828,7 +5826,7 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@^2.2.8, rimraf@^2.3.3, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.4, rimraf@~2.5.1, rimraf@~2.5.4, rimraf@2:
+rimraf@2, rimraf@^2.2.8, rimraf@^2.3.3, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.4, rimraf@~2.5.1, rimraf@~2.5.4:
   version "2.5.4"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04"
   dependencies:
@@ -5852,7 +5850,7 @@ rx-lite@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
 
-sax@^1.1.4, sax@>=0.6.0, sax@~1.2.1:
+sax@>=0.6.0, sax@^1.1.4, sax@~1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a"
 
@@ -5862,7 +5860,7 @@ semver-diff@^2.0.0:
   dependencies:
     semver "^5.0.3"
 
-semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@~5.3.0, "semver@2 || 3 || 4 || 5":
+"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
 
@@ -5940,7 +5938,7 @@ sha.js@2.2.6:
   version "2.2.6"
   resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.2.6.tgz#17ddeddc5f722fb66501658895461977867315ba"
 
-shallowequal@^0.2.2, shallowequal@0.2.x:
+shallowequal@0.2.x, shallowequal@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-0.2.2.tgz#1e32fd5bcab6ad688a4812cb0cc04efc75c7014e"
   dependencies:
@@ -6137,10 +6135,6 @@ strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
 
-string_decoder@^0.10.25, string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
@@ -6172,6 +6166,10 @@ string.prototype.padstart@^3.0.0:
     es-abstract "^1.4.3"
     function-bind "^1.0.2"
 
+string_decoder@^0.10.25, string_decoder@~0.10.x:
+  version "0.10.31"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+
 stringifier@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/stringifier/-/stringifier-1.3.0.tgz#def18342f6933db0f2dbfc9aa02175b448c17959"
@@ -6458,10 +6456,6 @@ the-argv@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/the-argv/-/the-argv-1.0.0.tgz#0084705005730dd84db755253c931ae398db9522"
 
-through@^2.3.6, "through@>=2.2.7 <3", through@~2.3.4:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-
 through2@^0.6.1, through2@^0.6.3, through2@~0.6.1:
   version "0.6.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48"
@@ -6476,6 +6470,10 @@ through2@^2.0.0, through2@~2.0.0:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
 
+"through@>=2.2.7 <3", through@^2.3.6, through@~2.3.4:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+
 time-require@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/time-require/-/time-require-0.1.2.tgz#f9e12cb370fc2605e11404582ba54ef5ca2b2d98"
@@ -6683,7 +6681,7 @@ util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
 
-util@^0.10.3, util@0.10.3:
+util@0.10.3, util@^0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
   dependencies:
@@ -6816,7 +6814,7 @@ which-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
 
-which@^1.2.4, which@^1.2.9, which@1.2.x:
+which@1.2.x, which@^1.2.4, which@^1.2.9:
   version "1.2.12"
   resolved "https://registry.yarnpkg.com/which/-/which-1.2.12.tgz#de67b5e450269f194909ef23ece4ebe416fa1192"
   dependencies:
@@ -6834,13 +6832,17 @@ widest-line@^1.0.0:
   dependencies:
     string-width "^1.0.1"
 
+window-size@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
+
 window-size@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"
 
-window-size@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
+wordwrap@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
 
 wordwrap@~0.0.2:
   version "0.0.3"
@@ -6850,10 +6852,6 @@ wordwrap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
 
-wordwrap@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
-
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
@@ -6918,13 +6916,7 @@ xml2js@^0.4:
     sax ">=0.6.0"
     xmlbuilder "^4.1.0"
 
-xmlbuilder@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-4.2.1.tgz#aa58a3041a066f90eaa16c2f5389ff19f3f461a5"
-  dependencies:
-    lodash "^4.0.0"
-
-xmlbuilder@~4.1.0:
+xmlbuilder@^4.1.0, xmlbuilder@~4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-4.1.0.tgz#687e84d9c4145af8db438d8bec88805df66249f4"
   dependencies:
@@ -6934,7 +6926,7 @@ xmlhttprequest@1:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc"
 
-xtend@^4.0.0, "xtend@>=4.0.0 <4.1.0-0", xtend@~4.0.0, xtend@~4.0.1:
+"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
 
@@ -6994,4 +6986,3 @@ yargs@~3.10.0:
     cliui "^2.1.0"
     decamelize "^1.0.0"
     window-size "0.1.0"
-

From 178b84c53c8205db7a4c09f0ecd791c33d452c9c Mon Sep 17 00:00:00 2001
From: Tom Gallacher <tomgallacher23@gmail.com>
Date: Thu, 26 Jan 2017 12:35:49 +0000
Subject: [PATCH 14/32] Correcting sensors path

---
 cloudapi-graphql/etc/containerpilot.json | 21 ++++++++++++++++++++-
 frontend/etc/containerpilot.json         |  4 ++--
 ui/etc/containerpilot.json               |  4 ++--
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/cloudapi-graphql/etc/containerpilot.json b/cloudapi-graphql/etc/containerpilot.json
index b1882eac..494556e9 100644
--- a/cloudapi-graphql/etc/containerpilot.json
+++ b/cloudapi-graphql/etc/containerpilot.json
@@ -10,5 +10,24 @@
     }
   ],
   "backends": [
-  ]
+  ],
+  "telemetry": {
+    "port": 9090,
+    "sensors": [
+      {
+        "name": "graphql_memory_percent",
+        "help": "percentage of memory used",
+        "type": "gauge",
+        "poll": 5,
+        "check": ["/bin/sensors", "memory"]
+      },
+      {
+        "name": "graphql_cpu_load",
+        "help": "cpu load",
+        "type": "gauge",
+        "poll": 5,
+        "check": ["/bin/sensors", "cpu"]
+      }
+    ]
+  }
 }
diff --git a/frontend/etc/containerpilot.json b/frontend/etc/containerpilot.json
index dc86246b..e27b33ce 100644
--- a/frontend/etc/containerpilot.json
+++ b/frontend/etc/containerpilot.json
@@ -19,14 +19,14 @@
         "help": "percentage of memory used",
         "type": "gauge",
         "poll": 5,
-        "check": ["/bin/sensor", "memory"]
+        "check": ["/bin/sensors", "memory"]
       },
       {
         "name": "frontend_cpu_load",
         "help": "cpu load",
         "type": "gauge",
         "poll": 5,
-        "check": ["/bin/sensor", "cpu"]
+        "check": ["/bin/sensors", "cpu"]
       }
     ]
   }
diff --git a/ui/etc/containerpilot.json b/ui/etc/containerpilot.json
index 299ed9fc..cfd9b53f 100644
--- a/ui/etc/containerpilot.json
+++ b/ui/etc/containerpilot.json
@@ -19,14 +19,14 @@
         "help": "percentage of memory used",
         "type": "gauge",
         "poll": 5,
-        "check": ["/bin/sensor", "memory"]
+        "check": ["/bin/sensors", "memory"]
       },
       {
         "name": "ui_cpu_load",
         "help": "cpu load",
         "type": "gauge",
         "poll": 5,
-        "check": ["/bin/sensor", "cpu"]
+        "check": ["/bin/sensors", "cpu"]
       }
     ]
   }

From 8f6e4d5f3229c5f8b0e84f39009068090f1a30b5 Mon Sep 17 00:00:00 2001
From: Tom Gallacher <tomgallacher23@gmail.com>
Date: Thu, 26 Jan 2017 14:41:41 +0000
Subject: [PATCH 15/32] Add new telemetry for application

---
 cloudapi-graphql/Dockerfile              |  2 +-
 cloudapi-graphql/etc/containerpilot.json | 14 ++++++++++++++
 frontend/Dockerfile                      |  2 +-
 frontend/etc/containerpilot.json         | 14 ++++++++++++++
 local-compose.yml                        |  2 +-
 ui/Dockerfile                            |  2 +-
 ui/etc/containerpilot.json               | 14 ++++++++++++++
 7 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/cloudapi-graphql/Dockerfile b/cloudapi-graphql/Dockerfile
index 63a65e64..7b02444a 100644
--- a/cloudapi-graphql/Dockerfile
+++ b/cloudapi-graphql/Dockerfile
@@ -1 +1 @@
-FROM quay.io/yldio/alpine-node-containerpilot:6.9.4
+FROM quay.io/yldio/alpine-node-containerpilot:6.9.4-2
diff --git a/cloudapi-graphql/etc/containerpilot.json b/cloudapi-graphql/etc/containerpilot.json
index 494556e9..4ee6bdfa 100644
--- a/cloudapi-graphql/etc/containerpilot.json
+++ b/cloudapi-graphql/etc/containerpilot.json
@@ -27,6 +27,20 @@
         "type": "gauge",
         "poll": 5,
         "check": ["/bin/sensors", "cpu"]
+      },
+      {
+        "name": "graphql_disk_capacity",
+        "help": "disk capacity",
+        "type": "gauge",
+        "poll": 60,
+        "check": ["/bin/sensors", "diskcapacity"]
+      },
+      {
+        "name": "graphql_disk_usage",
+        "help": "disk usage",
+        "type": "gauge",
+        "poll": 60,
+        "check": ["/bin/sensors", "diskusage"]
       }
     ]
   }
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 63a65e64..7b02444a 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -1 +1 @@
-FROM quay.io/yldio/alpine-node-containerpilot:6.9.4
+FROM quay.io/yldio/alpine-node-containerpilot:6.9.4-2
diff --git a/frontend/etc/containerpilot.json b/frontend/etc/containerpilot.json
index e27b33ce..a82ba53a 100644
--- a/frontend/etc/containerpilot.json
+++ b/frontend/etc/containerpilot.json
@@ -27,6 +27,20 @@
         "type": "gauge",
         "poll": 5,
         "check": ["/bin/sensors", "cpu"]
+      },
+      {
+        "name": "frontend_disk_capacity",
+        "help": "disk capacity",
+        "type": "gauge",
+        "poll": 60,
+        "check": ["/bin/sensors", "diskcapacity"]
+      },
+      {
+        "name": "frontend_disk_usage",
+        "help": "disk usage",
+        "type": "gauge",
+        "poll": 60,
+        "check": ["/bin/sensors", "diskusage"]
       }
     ]
   }
diff --git a/local-compose.yml b/local-compose.yml
index 8a2134e7..0b7d0c1c 100644
--- a/local-compose.yml
+++ b/local-compose.yml
@@ -48,7 +48,7 @@ nginx:
   links:
     - consul:consul
   ports:
-    - 80:8001
+    - 8001:80
 prometheus:
   extends:
     file: docker-compose.yml
diff --git a/ui/Dockerfile b/ui/Dockerfile
index 63a65e64..7b02444a 100644
--- a/ui/Dockerfile
+++ b/ui/Dockerfile
@@ -1 +1 @@
-FROM quay.io/yldio/alpine-node-containerpilot:6.9.4
+FROM quay.io/yldio/alpine-node-containerpilot:6.9.4-2
diff --git a/ui/etc/containerpilot.json b/ui/etc/containerpilot.json
index cfd9b53f..c832cf3b 100644
--- a/ui/etc/containerpilot.json
+++ b/ui/etc/containerpilot.json
@@ -27,6 +27,20 @@
         "type": "gauge",
         "poll": 5,
         "check": ["/bin/sensors", "cpu"]
+      },
+      {
+        "name": "ui_disk_capacity",
+        "help": "disk capacity",
+        "type": "gauge",
+        "poll": 60,
+        "check": ["/bin/sensors", "diskcapacity"]
+      },
+      {
+        "name": "ui_disk_usage",
+        "help": "disk usage",
+        "type": "gauge",
+        "poll": 60,
+        "check": ["/bin/sensors", "diskusage"]
       }
     ]
   }

From 20048eb35c342346719dc678471b2da9ad647ee2 Mon Sep 17 00:00:00 2001
From: Alex Windett <windettalex@gmail.com>
Date: Thu, 26 Jan 2017 14:23:29 +0000
Subject: [PATCH 16/32] updating props index name to be more generic as it will
 be used for another container

---
 .../src/components/people-list/table/index.js | 10 ++++----
 .../people-list/table/person-delete.js        |  6 ++---
 .../people-list/table/person-role.js          |  6 ++---
 .../people-list/table/person-status.js        |  6 ++---
 .../components/people-list/table/tooltip.js   |  6 ++---
 frontend/src/containers/org/people.js         |  2 +-
 frontend/src/state/reducers/orgs.js           | 25 +++++++++----------
 7 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/frontend/src/components/people-list/table/index.js b/frontend/src/components/people-list/table/index.js
index 9dbde524..39196a55 100644
--- a/frontend/src/components/people-list/table/index.js
+++ b/frontend/src/components/people-list/table/index.js
@@ -15,7 +15,7 @@ const PeopleTable = (props) => {
     handleMemberUpdate,
     people = [],
     orgUI = {},
-    orgIndex,
+    parentIndex,
     removeMember
   } = props;
 
@@ -42,7 +42,7 @@ const PeopleTable = (props) => {
         handleMemberUpdate={handleMemberUpdate}
         handleStatusTooltip={handleStatusTooltip}
         membersStatusOptions={orgUI.members_status}
-        orgIndex={orgIndex}
+        parentIndex={parentIndex}
         person={person}
         personIndex={index}
         toggledID={orgUI.member_status_tooltip}
@@ -54,7 +54,7 @@ const PeopleTable = (props) => {
         handleMemberUpdate={handleMemberUpdate}
         handleRoleTooltip={handleRoleTooltip}
         membersRolesOptions={orgUI.members_roles}
-        orgIndex={orgIndex}
+        parentIndex={parentIndex}
         person={person}
         personIndex={index}
         toggledID={orgUI.member_role_tooltip}
@@ -63,7 +63,7 @@ const PeopleTable = (props) => {
 
     const remove = (person) => (
       <PersonDelete
-        orgIndex={orgIndex}
+        parentIndex={parentIndex}
         personIndex={index}
         removeMember={removeMember}
       />
@@ -90,8 +90,8 @@ PeopleTable.propTypes = {
   handleMemberUpdate: React.PropTypes.func,
   handleRoleTooltip: React.PropTypes.func,
   handleStatusTooltip: React.PropTypes.func,
-  orgIndex: React.PropTypes.number,
   orgUI: React.PropTypes.object,
+  parentIndex: React.PropTypes.number,
   people: React.PropTypes.array,
   removeMember: React.PropTypes.func,
 };
diff --git a/frontend/src/components/people-list/table/person-delete.js b/frontend/src/components/people-list/table/person-delete.js
index 87f592fc..c648591c 100644
--- a/frontend/src/components/people-list/table/person-delete.js
+++ b/frontend/src/components/people-list/table/person-delete.js
@@ -18,13 +18,13 @@ const PersonDelete = (props) => {
 
   const {
     personIndex,
-    orgIndex,
+    parentIndex,
     removeMember
   } = props;
 
   const _onClick = () => removeMember({
     personIndex,
-    orgIndex
+    parentIndex
   });
 
   return (
@@ -35,7 +35,7 @@ const PersonDelete = (props) => {
 };
 
 PersonDelete.propTypes = {
-  orgIndex: React.PropTypes.number,
+  parentIndex: React.PropTypes.number,
   personIndex: React.PropTypes.number,
   removeMember: React.PropTypes.func,
 };
diff --git a/frontend/src/components/people-list/table/person-role.js b/frontend/src/components/people-list/table/person-role.js
index 85531679..58e97431 100644
--- a/frontend/src/components/people-list/table/person-role.js
+++ b/frontend/src/components/people-list/table/person-role.js
@@ -57,7 +57,7 @@ const PersonRole = (props) => {
     personIndex,
     handleRoleTooltip,
     handleMemberUpdate,
-    orgIndex
+    parentIndex
   } = props;
 
   const toggled = toggledID === person.uuid;
@@ -82,7 +82,7 @@ const PersonRole = (props) => {
         ? <Tooltip
           handleSelect={handleOptionSelect}
           options={membersRolesOptions}
-          orgIndex={orgIndex}
+          parentIndex={parentIndex}
           person={_person}
           personAttr="role"
           personIndex={personIndex}
@@ -96,7 +96,7 @@ PersonRole.propTypes = {
   handleMemberUpdate: React.PropTypes.func,
   handleRoleTooltip: React.PropTypes.func,
   membersRolesOptions: React.PropTypes.array,
-  orgIndex: React.PropTypes.number,
+  parentIndex: React.PropTypes.number,
   person: React.PropTypes.object,
   personIndex: React.PropTypes.number,
   toggledID: React.PropTypes.oneOfType([
diff --git a/frontend/src/components/people-list/table/person-status.js b/frontend/src/components/people-list/table/person-status.js
index c81059ef..eee07788 100644
--- a/frontend/src/components/people-list/table/person-status.js
+++ b/frontend/src/components/people-list/table/person-status.js
@@ -57,7 +57,7 @@ const PersonStatus = (props) => {
     personIndex,
     handleStatusTooltip,
     handleMemberUpdate,
-    orgIndex
+    parentIndex
   } = props;
 
   const toggled = toggledID === person.uuid;
@@ -82,7 +82,7 @@ const PersonStatus = (props) => {
         ? <Tooltip
           handleSelect={handleOptionSelect}
           options={membersStatusOptions}
-          orgIndex={orgIndex}
+          parentIndex={parentIndex}
           person={_person}
           personAttr="status"
           personIndex={personIndex}
@@ -96,7 +96,7 @@ PersonStatus.propTypes = {
   handleMemberUpdate: React.PropTypes.func,
   handleStatusTooltip: React.PropTypes.func,
   membersStatusOptions: React.PropTypes.array,
-  orgIndex: React.PropTypes.number,
+  parentIndex: React.PropTypes.number,
   person: React.PropTypes.object,
   personIndex: React.PropTypes.number,
   toggledID: React.PropTypes.oneOfType([
diff --git a/frontend/src/components/people-list/table/tooltip.js b/frontend/src/components/people-list/table/tooltip.js
index 83353dbd..17ef7ed7 100644
--- a/frontend/src/components/people-list/table/tooltip.js
+++ b/frontend/src/components/people-list/table/tooltip.js
@@ -20,7 +20,7 @@ module.exports = ({
   personAttr,
   personIndex,
   options = [],
-  orgIndex,
+  parentIndex,
 }) => {
 
   const _options = options.map( (option, i) => {
@@ -33,7 +33,7 @@ module.exports = ({
         [`${personAttr}`]: option
       },
       personIndex,
-      orgIndex,
+      parentIndex,
     };
 
     const _onClick = () => handleSelect(payload);
@@ -64,7 +64,7 @@ module.exports = ({
 module.exports.propTypes = {
   handleSelect: React.PropTypes.func,
   options: React.PropTypes.array,
-  orgIndex: React.PropTypes.number,
+  parentIndex: React.PropTypes.number,
   person: React.PropTypes.object,
   personAttr: React.PropTypes.string,
   personIndex: React.PropTypes.number,
diff --git a/frontend/src/containers/org/people.js b/frontend/src/containers/org/people.js
index 55726513..991275f0 100644
--- a/frontend/src/containers/org/people.js
+++ b/frontend/src/containers/org/people.js
@@ -38,7 +38,7 @@ const mapStateToProps = (state, {
 }) => ({
   people: peopleByOrgIdSelector(params.org)(state),
   orgUI: orgUISelector(state),
-  orgIndex: orgIndexSelector(params.org)(state),
+  parentIndex: orgIndexSelector(params.org)(state),
   platformMembers: membersSelector(state)
 });
 
diff --git a/frontend/src/state/reducers/orgs.js b/frontend/src/state/reducers/orgs.js
index 25f6a7aa..e5d034d7 100644
--- a/frontend/src/state/reducers/orgs.js
+++ b/frontend/src/state/reducers/orgs.js
@@ -50,11 +50,10 @@ module.exports = handleActions({
   },
   [handleMemberUpdate.toString()]: (state, action) => {
     const {
-      orgIndex,
+      parentIndex,
       person,
       personIndex,
     } = action.payload;
-
     return {
       ...state,
       ui: {
@@ -63,39 +62,39 @@ module.exports = handleActions({
         member_role_tooltip: false
       },
       data: [
-        ...state.data.slice(0, orgIndex),
+        ...state.data.slice(0, parentIndex),
         {
-          ...state.data[orgIndex],
+          ...state.data[parentIndex],
           members: [
-            ...state.data[orgIndex].members.slice(0, personIndex),
+            ...state.data[parentIndex].members.slice(0, personIndex),
             {
               ...person,
             },
-            ...state.data[orgIndex].members.slice(personIndex + 1)
+            ...state.data[parentIndex].members.slice(personIndex + 1)
           ]
         },
-        ...state.data.slice(orgIndex + 1),
+        ...state.data.slice(parentIndex + 1),
       ]
     };
   },
   [removeMember.toString()]: (state, action) => {
     const {
-      orgIndex,
+      parentIndex,
       personIndex,
     } = action.payload;
 
     return {
       ...state,
       data: [
-        ...state.data.slice(0, orgIndex),
+        ...state.data.slice(0, parentIndex),
         {
-          ...state.data[orgIndex],
+          ...state.data[parentIndex],
           members: [
-            ...state.data[orgIndex].members.slice(0, personIndex),
-            ...state.data[orgIndex].members.slice(personIndex + 1)
+            ...state.data[parentIndex].members.slice(0, personIndex),
+            ...state.data[parentIndex].members.slice(personIndex + 1)
           ]
         },
-        ...state.data.slice(orgIndex + 1),
+        ...state.data.slice(parentIndex + 1),
       ]
     };
   },

From 46070b9b1b912ae7e41deefbac35a3e47b6999ac Mon Sep 17 00:00:00 2001
From: Alex Windett <windettalex@gmail.com>
Date: Thu, 26 Jan 2017 14:34:06 +0000
Subject: [PATCH 17/32] updating UI props name to be more generic for future
 use

---
 frontend/src/components/people-list/index.js       | 10 +++++-----
 frontend/src/components/people-list/table/index.js | 14 +++++++-------
 frontend/src/containers/org/people.js              |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/frontend/src/components/people-list/index.js b/frontend/src/components/people-list/index.js
index aa1dea90..f07be5c4 100644
--- a/frontend/src/components/people-list/index.js
+++ b/frontend/src/components/people-list/index.js
@@ -14,7 +14,7 @@ const buttonStyle = {
 const People = (props) => {
 
   const {
-    orgUI = {},
+    UI = {},
     handleToggle,
     people
   } = props;
@@ -24,7 +24,7 @@ const People = (props) => {
       <Row>
         <Column smOffset={9} xs={2}>
           <Button
-            disabled={orgUI.invite_toggled}
+            disabled={UI.invite_toggled}
             onClick={handleToggle}
             style={buttonStyle}
           >
@@ -33,7 +33,7 @@ const People = (props) => {
         </Column>
       </Row>
 
-      {orgUI.invite_toggled ? <Invite {...props} /> : null}
+      {UI.invite_toggled ? <Invite {...props} /> : null}
 
       <Row>
         <Column xs={12}>
@@ -47,9 +47,9 @@ const People = (props) => {
 };
 
 People.propTypes = {
+  UI: React.PropTypes.object,
   handleToggle: React.PropTypes.func,
-  orgUI: React.PropTypes.object,
-  people: React.PropTypes.array
+  people: React.PropTypes.array,
 };
 
 module.exports = People;
\ No newline at end of file
diff --git a/frontend/src/components/people-list/table/index.js b/frontend/src/components/people-list/table/index.js
index 39196a55..aa423f71 100644
--- a/frontend/src/components/people-list/table/index.js
+++ b/frontend/src/components/people-list/table/index.js
@@ -14,9 +14,9 @@ const PeopleTable = (props) => {
     handleStatusTooltip,
     handleMemberUpdate,
     people = [],
-    orgUI = {},
     parentIndex,
-    removeMember
+    removeMember,
+    UI = {},
   } = props;
 
   const columns = [{
@@ -41,11 +41,11 @@ const PeopleTable = (props) => {
       <PersonStatus
         handleMemberUpdate={handleMemberUpdate}
         handleStatusTooltip={handleStatusTooltip}
-        membersStatusOptions={orgUI.members_status}
+        membersStatusOptions={UI.members_status}
         parentIndex={parentIndex}
         person={person}
         personIndex={index}
-        toggledID={orgUI.member_status_tooltip}
+        toggledID={UI.member_status_tooltip}
       />
     );
 
@@ -53,11 +53,11 @@ const PeopleTable = (props) => {
       <PersonRole
         handleMemberUpdate={handleMemberUpdate}
         handleRoleTooltip={handleRoleTooltip}
-        membersRolesOptions={orgUI.members_roles}
+        membersRolesOptions={UI.members_roles}
         parentIndex={parentIndex}
         person={person}
         personIndex={index}
-        toggledID={orgUI.member_role_tooltip}
+        toggledID={UI.member_role_tooltip}
       />
     );
 
@@ -87,10 +87,10 @@ const PeopleTable = (props) => {
 };
 
 PeopleTable.propTypes = {
+  UI: React.PropTypes.object,
   handleMemberUpdate: React.PropTypes.func,
   handleRoleTooltip: React.PropTypes.func,
   handleStatusTooltip: React.PropTypes.func,
-  orgUI: React.PropTypes.object,
   parentIndex: React.PropTypes.number,
   people: React.PropTypes.array,
   removeMember: React.PropTypes.func,
diff --git a/frontend/src/containers/org/people.js b/frontend/src/containers/org/people.js
index 991275f0..553b33e1 100644
--- a/frontend/src/containers/org/people.js
+++ b/frontend/src/containers/org/people.js
@@ -37,7 +37,7 @@ const mapStateToProps = (state, {
   params = {}
 }) => ({
   people: peopleByOrgIdSelector(params.org)(state),
-  orgUI: orgUISelector(state),
+  UI: orgUISelector(state),
   parentIndex: orgIndexSelector(params.org)(state),
   platformMembers: membersSelector(state)
 });

From a19ac68619eb868f24223e5c695e85c73113dbe4 Mon Sep 17 00:00:00 2001
From: Alex Windett <windettalex@gmail.com>
Date: Thu, 26 Jan 2017 15:29:06 +0000
Subject: [PATCH 18/32] correcting spelling mistake

---
 ui/src/components/table-data-table/readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/components/table-data-table/readme.md b/ui/src/components/table-data-table/readme.md
index cd285205..c7f9515c 100644
--- a/ui/src/components/table-data-table/readme.md
+++ b/ui/src/components/table-data-table/readme.md
@@ -29,7 +29,7 @@ const React = require('react');
 const Avatar = require('ui/table');
 
 const columns = [{
-  title: 'Memeber',
+  title: 'Member',
   dataID: 'member',
   dataKey: 'member',
   width: ''

From 2cacb7b1c83c9d7efd6f94d59cc2ddf93c37c7ea Mon Sep 17 00:00:00 2001
From: Tom Gallacher <tomgallacher23@gmail.com>
Date: Thu, 26 Jan 2017 17:17:44 +0000
Subject: [PATCH 19/32] Bumping Dockerfile versions

---
 cloudapi-graphql/Dockerfile | 2 +-
 frontend/Dockerfile         | 2 +-
 ui/Dockerfile               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cloudapi-graphql/Dockerfile b/cloudapi-graphql/Dockerfile
index 7b02444a..68b84ed9 100644
--- a/cloudapi-graphql/Dockerfile
+++ b/cloudapi-graphql/Dockerfile
@@ -1 +1 @@
-FROM quay.io/yldio/alpine-node-containerpilot:6.9.4-2
+FROM quay.io/yldio/alpine-node-containerpilot:6.9.4-3
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 7b02444a..68b84ed9 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -1 +1 @@
-FROM quay.io/yldio/alpine-node-containerpilot:6.9.4-2
+FROM quay.io/yldio/alpine-node-containerpilot:6.9.4-3
diff --git a/ui/Dockerfile b/ui/Dockerfile
index 7b02444a..68b84ed9 100644
--- a/ui/Dockerfile
+++ b/ui/Dockerfile
@@ -1 +1 @@
-FROM quay.io/yldio/alpine-node-containerpilot:6.9.4-2
+FROM quay.io/yldio/alpine-node-containerpilot:6.9.4-3

From 329fd0a7eb055b01f127c6640a2f85e6d0b1d31b Mon Sep 17 00:00:00 2001
From: Tom Gallacher <tomgallacher23@gmail.com>
Date: Fri, 27 Jan 2017 12:49:48 +0000
Subject: [PATCH 20/32] Add docs service

---
 docker-compose.yml        |  14 ++++
 docs/.gitignore           |   1 +
 docs/Dockerfile           |  16 ++++
 docs/Makefile             |  56 +++++++++++++
 docs/README.rst           |  49 ++++++++++++
 docs/circle.yml           |  22 ++++++
 docs/source/conf.py       | 161 ++++++++++++++++++++++++++++++++++++++
 docs/source/deployment.md |  48 ++++++++++++
 docs/source/index.rst     |  17 ++++
 local-compose.yml         |   7 ++
 10 files changed, 391 insertions(+)
 create mode 100644 docs/.gitignore
 create mode 100644 docs/Dockerfile
 create mode 100644 docs/Makefile
 create mode 100644 docs/README.rst
 create mode 100644 docs/circle.yml
 create mode 100644 docs/source/conf.py
 create mode 100644 docs/source/deployment.md
 create mode 100644 docs/source/index.rst

diff --git a/docker-compose.yml b/docker-compose.yml
index b778fac7..328cea21 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -96,3 +96,17 @@ prometheus:
   labels:
     - triton.cns.services=prometheus
     - com.docker.swarm.affinities=["container!=~*prometheus*"]
+#############################################################################
+#  docs is an open source performance monitoring tool
+#  it is included here for demo purposes and is not required
+#############################################################################
+docs:
+  image: quay.io/yldio/joyent-portal-docs
+  restart: always
+  mem_limit: 128m
+  env_file: .env
+  ports:
+    - 80:80
+  labels:
+    - triton.cns.services=docs
+    - com.docker.swarm.affinities=["container!=~*docs*"]
diff --git a/docs/.gitignore b/docs/.gitignore
new file mode 100644
index 00000000..378eac25
--- /dev/null
+++ b/docs/.gitignore
@@ -0,0 +1 @@
+build
diff --git a/docs/Dockerfile b/docs/Dockerfile
new file mode 100644
index 00000000..aea2d3cf
--- /dev/null
+++ b/docs/Dockerfile
@@ -0,0 +1,16 @@
+FROM jfloff/alpine-python:3.4-slim
+RUN /entrypoint.sh \
+  -p sphinx \
+  -p recommonmark \
+  -p sphinx_rtd_theme \
+  -a make \
+&& echo
+
+RUN mkdir -p /docs/
+WORKDIR /docs/
+COPY Makefile .
+COPY source ./source/
+RUN make html
+WORKDIR /docs/build/html/
+EXPOSE 8080
+CMD ["python", "-m", "http.server", "8080"]
diff --git a/docs/Makefile b/docs/Makefile
new file mode 100644
index 00000000..08e599c9
--- /dev/null
+++ b/docs/Makefile
@@ -0,0 +1,56 @@
+NAME := $(lastword $(subst /, ,$(CURDIR)))
+# Minimal makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+SPHINXPROJ    = PrototypeJoyentPortal
+SOURCEDIR     = source
+BUILDDIR      = build
+
+# Put it first so that "make" without argument is like "make help".
+help:
+	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+.PHONY: help Makefile
+
+# Catch-all target: route all unknown targets to Sphinx using the new
+# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
+%: Makefile
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+.PHONY: build
+build:
+	docker build -t quay.io/yldio/joyent-dashboard-$(NAME) .
+
+.PHONY: push
+push:
+	docker push quay.io/yldio/joyent-dashboard-$(NAME)
+	
+.PHONY: test
+test:
+
+.PHONY: test-ci
+test-ci:
+
+.PHONY: install
+install: 
+
+.PHONY: start
+start:
+
+.PHONY: install-production
+install-production: 
+
+.PHONY: clean
+clean:
+
+.PHONY: lint
+lint:
+
+.PHONY: lint-ci
+lint-ci:
+
+.PHONY: licence-check
+lint-ci:
diff --git a/docs/README.rst b/docs/README.rst
new file mode 100644
index 00000000..7f844c8c
--- /dev/null
+++ b/docs/README.rst
@@ -0,0 +1,49 @@
+Prototype Joyent Portal Docs
+**************
+
+This repo contains the source code for the `Prototype Joyent Portal docs`_.
+
+Contributing
+############
+
+Fork the repo, make an edit, submit a PR. No patch is too small! <3
+
+Building locally
+################
+
+1. Install `Sphinx <http://www.sphinx-doc.org/en/stable/>`_.
+2. Install ``sphinx_rtd_theme`` with ``pip install sphinx_rtd_theme``
+3. Run ``make html``
+4. Open ``build/html/index.html`` in your browser.
+
+Deployment
+##########
+
+``master`` is automatically deployed to `https://xxx <https://xxx/docs>`_.
+
+License
+#######
+
+This project was forked from `https://github.com/shoreditch-ops/artillery-docs`_
+
+::
+
+  The MIT License (MIT)
+  Copyright (c) 2015-2016 Shoreditch Ops Ltd
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included
+  in all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+  FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+  AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/docs/circle.yml b/docs/circle.yml
new file mode 100644
index 00000000..327866c9
--- /dev/null
+++ b/docs/circle.yml
@@ -0,0 +1,22 @@
+machine:
+  python:
+    version: 2.7.5
+  environment:
+    PATH: "/usr/local/bin:${PATH}"
+dependencies:
+  cache_directories:
+    - "~/.apt-cache"
+  pre:
+    - sudo rm -rf /var/cache/apt/archives && sudo ln -s ~/.apt-cache /var/cache/apt/archives && mkdir -p ~/.apt-cache/partial
+    - sudo apt-get update; sudo apt-get install python-sphinx
+    - pip install sphinx_rtd_theme
+    - pip install s3cmd
+test:
+  override:
+    - make html
+deployment:
+  production:
+    branch: master
+    commands:
+      - cp .s3cfg ~/.s3cfg
+      - bash scripts/deploy.sh
diff --git a/docs/source/conf.py b/docs/source/conf.py
new file mode 100644
index 00000000..f45ee3ed
--- /dev/null
+++ b/docs/source/conf.py
@@ -0,0 +1,161 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# Prototype Joyent Portal documentation build configuration file, created by
+# sphinx-quickstart on Fri Jan 27 11:28:13 2017.
+#
+# This file is execfile()d with the current directory set to its
+# containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#
+# import os
+# import sys
+# sys.path.insert(0, os.path.abspath('.'))
+import sphinx_rtd_theme
+
+
+# -- General configuration ------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#
+# needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = ['sphinx.ext.githubpages']
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix(es) of source filenames.
+# You can specify multiple suffix as a list of string:
+from recommonmark.parser import CommonMarkParser
+
+source_parsers = {'.md': CommonMarkParser} 
+source_suffix = ['.rst', '.md']
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = 'Prototype Joyent Portal'
+copyright = '2017, YLD and Make Us Proud'
+author = 'YLD and Make Us Proud'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = '1.0'
+# The full version, including alpha/beta/rc tags.
+release = '1.0.0'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#
+# This is also used if you do content translation via gettext catalogs.
+# Usually you set "language" from the command line for these cases.
+language = None
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+# This patterns also effect to html_static_path and html_extra_path
+exclude_patterns = []
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# If true, `todo` and `todoList` produce output, else they produce nothing.
+todo_include_todos = False
+
+
+# -- Options for HTML output ----------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+#
+html_theme = "sphinx_rtd_theme"
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#
+# html_theme_options = {}
+
+html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+# html_static_path = ['_static']
+
+
+# -- Options for HTMLHelp output ------------------------------------------
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'PrototypeJoyentPortaldoc'
+
+
+# -- Options for LaTeX output ---------------------------------------------
+
+latex_elements = {
+    # The paper size ('letterpaper' or 'a4paper').
+    #
+    # 'papersize': 'letterpaper',
+
+    # The font size ('10pt', '11pt' or '12pt').
+    #
+    # 'pointsize': '10pt',
+
+    # Additional stuff for the LaTeX preamble.
+    #
+    # 'preamble': '',
+
+    # Latex figure (float) alignment
+    #
+    # 'figure_align': 'htbp',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title,
+#  author, documentclass [howto, manual, or own class]).
+latex_documents = [
+    (master_doc, 'PrototypeJoyentPortal.tex', 'Prototype Joyent Portal Documentation',
+     'YLD and Make Us Proud', 'manual'),
+]
+
+
+# -- Options for manual page output ---------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    (master_doc, 'prototypejoyentportal', 'Prototype Joyent Portal Documentation',
+     [author], 1)
+]
+
+
+# -- Options for Texinfo output -------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+texinfo_documents = [
+    (master_doc, 'PrototypeJoyentPortal', 'Prototype Joyent Portal Documentation',
+     author, 'PrototypeJoyentPortal', 'One line description of project.',
+     'Miscellaneous'),
+]
+
+
+
diff --git a/docs/source/deployment.md b/docs/source/deployment.md
new file mode 100644
index 00000000..5ce18498
--- /dev/null
+++ b/docs/source/deployment.md
@@ -0,0 +1,48 @@
+# Deployment
+
+The project as it stands is a monorepo, each part of this prototype
+(cloudapi-graphql, ui, frontend, nginx) can be found in the root directory.
+
+We currently are using [CircleCI](https://circleci.com/gh/yldio/joyent-portal/)
+for continuous deployment. As soon as a commit is push to Github, we fire a hook
+off to CircleCI which kicks off our tests.
+
+CircleCI is configured through the [circle.yaml](https://github.com/yldio/joyent-portal/blob/master/circle.yml)
+found at the root of the project. The main take from this is that we install and
+setup our dependencies such as docker, docker-compose, triton and yarn. CircleCI
+then runs the appropriate Makefile command.
+
+## Configuration
+
+CircleCI is configured purely from environment variables. The current set of
+variables are defined below, The SDC\_ variables are pulled directly from the
+output of `triton env` and inserted into CircleCI to simplifying setting up triton-cli
+in a testing environment.
+
+We also have some \_DOCKER\_ variables, again these are used by triton, but because 
+we wish to build and push the images inside CircleCI we only use them at deployment.
+
+The docker login username and password is derived from a robot account quay.io
+
+
+```
+COMPOSE_HTTP_TIMEOUT
+NPM_TOKEN
+SDC_ACCOUNT
+SDC_KEY_ID
+SDC_URL
+_DOCKER_CERT_PATH
+_DOCKER_HOST
+_DOCKER_LOGIN_PASSWORD
+_DOCKER_LOGIN_USERNAME
+_DOCKER_REGISTRY
+_DOCKER_TLS_VERIFY
+```
+
+## /.bin/deploy
+
+This command is ran at the point when all of the tests are passing. It fires off
+a call to `docker-compose -d up`. This can equally be ran on a developers machine
+if manual intervention is needed.
+
+
diff --git a/docs/source/index.rst b/docs/source/index.rst
new file mode 100644
index 00000000..60169779
--- /dev/null
+++ b/docs/source/index.rst
@@ -0,0 +1,17 @@
+.. Prototype Joyent Portal documentation master file, created by
+   sphinx-quickstart on Fri Jan 27 11:28:13 2017.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+Welcome to Prototype Joyent Portal's documentation!
+===================================================
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Contents:
+
+   deployment
+
+
+Indices and tables
+==================
diff --git a/local-compose.yml b/local-compose.yml
index 0b7d0c1c..a238d2a5 100644
--- a/local-compose.yml
+++ b/local-compose.yml
@@ -60,3 +60,10 @@ prometheus:
     - consul:consul
   ports:
     - 9090:9090
+docs:
+  extends:
+    file: docker-compose.yml
+    service: docs
+  restart: never
+  ports:
+    - 80:8081

From 8d21157996fe1c443f2543d85d23f818da9bd499 Mon Sep 17 00:00:00 2001
From: Tom Gallacher <tomgallacher23@gmail.com>
Date: Fri, 27 Jan 2017 12:56:43 +0000
Subject: [PATCH 21/32] Fix docker image url for docs

---
 docs/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/Makefile b/docs/Makefile
index 08e599c9..532f2e54 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -22,11 +22,11 @@ help:
 
 .PHONY: build
 build:
-	docker build -t quay.io/yldio/joyent-dashboard-$(NAME) .
+	docker build -t quay.io/yldio/joyent-portal-$(NAME) .
 
 .PHONY: push
 push:
-	docker push quay.io/yldio/joyent-dashboard-$(NAME)
+	docker push quay.io/yldio/joyent-portal-$(NAME)
 	
 .PHONY: test
 test:

From 21a8602b7dd6290fee0d16f002a19f14127f6825 Mon Sep 17 00:00:00 2001
From: Tom Gallacher <tomgallacher23@gmail.com>
Date: Fri, 27 Jan 2017 13:09:49 +0000
Subject: [PATCH 22/32] docs, Dockerfile should bind to port 80

---
 docs/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/Dockerfile b/docs/Dockerfile
index aea2d3cf..713e5654 100644
--- a/docs/Dockerfile
+++ b/docs/Dockerfile
@@ -12,5 +12,5 @@ COPY Makefile .
 COPY source ./source/
 RUN make html
 WORKDIR /docs/build/html/
-EXPOSE 8080
-CMD ["python", "-m", "http.server", "8080"]
+EXPOSE 80
+CMD ["python", "-m", "http.server", "80"]

From cbd06447a1e11079c739fc5d922c084a1f082991 Mon Sep 17 00:00:00 2001
From: Tom Gallacher <tomgallacher23@gmail.com>
Date: Fri, 27 Jan 2017 15:53:21 +0000
Subject: [PATCH 23/32] Add more documentation

---
 docs/source/currentprogress.md | 28 ++++++++++++++++++++++++++++
 docs/source/deployment.md      | 14 ++++++++++++--
 docs/source/index.rst          |  5 +----
 3 files changed, 41 insertions(+), 6 deletions(-)
 create mode 100644 docs/source/currentprogress.md

diff --git a/docs/source/currentprogress.md b/docs/source/currentprogress.md
new file mode 100644
index 00000000..4a793dac
--- /dev/null
+++ b/docs/source/currentprogress.md
@@ -0,0 +1,28 @@
+# Current Progress
+
+## UI
+
+[Viewable Here](http://nginx.svc.f4b20699-b323-4452-9091-977895896da6.eu-ams-1.triton.zone/)
+
+The UI is a set of components that have been built using react, they are viewable 
+using the link above, which is a running version of react-storybook.
+
+## Frontend
+
+[Viewable Here](http://frontend.svc.f4b20699-b323-4452-9091-977895896da6.eu-ams-1.triton.zone:8000/)
+
+## Docs
+
+[Viewable Here](http://docs.svc.f4b20699-b323-4452-9091-977895896da6.eu-ams-1.triton.zone/)
+
+## CloudAPI Graphql
+
+[Accessible Here](http://cloudapi.svc.f4b20699-b323-4452-9091-977895896da6.eu-ams-1.triton.zone:3000/)
+
+## Spikes
+
+The spikes within this project is small pieces of work, implementing features that
+we are either not too sure about or wish to find more information on.
+
+Spikes are not currently hosted anywhere, however they are accessible from github
+within the main repository.
diff --git a/docs/source/deployment.md b/docs/source/deployment.md
index 5ce18498..a3f5ed87 100644
--- a/docs/source/deployment.md
+++ b/docs/source/deployment.md
@@ -39,10 +39,20 @@ _DOCKER_REGISTRY
 _DOCKER_TLS_VERIFY
 ```
 
+## Docker Images
+
+Each of the service contained within the Joyent Portal repository is deployed 
+using docker, the are built and tested in CI and when passing are pushed to
+[Quay.io](https://quay.io/repository/) under the yldio organisation.
+
+Images are usually built from our own base image [alpine-node-containerpilot](https://github.com/yldio/alpine-node-containerpilot)
+For prosperity, the alpine-node-containerpilot is tagged in quay.io as `latest`
+always points at `master`. These tags should represent the version of node being
+ran `:6.4.4` and should have a postfix for any no-node changes to the image
+`:6.4.4-2`.
+
 ## /.bin/deploy
 
 This command is ran at the point when all of the tests are passing. It fires off
 a call to `docker-compose -d up`. This can equally be ran on a developers machine
 if manual intervention is needed.
-
-
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 60169779..1da57b72 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -10,8 +10,5 @@ Welcome to Prototype Joyent Portal's documentation!
    :maxdepth: 2
    :caption: Contents:
 
+   currentprogress
    deployment
-
-
-Indices and tables
-==================

From 5c9607e43e935cca117c318eb0149c67689b16c7 Mon Sep 17 00:00:00 2001
From: Tom Gallacher <tomgallacher23@gmail.com>
Date: Fri, 27 Jan 2017 17:37:33 +0000
Subject: [PATCH 24/32] Add CircleCI variables to documentation

---
 docs/source/deployment.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/source/deployment.md b/docs/source/deployment.md
index a3f5ed87..0ba92551 100644
--- a/docs/source/deployment.md
+++ b/docs/source/deployment.md
@@ -39,6 +39,9 @@ _DOCKER_REGISTRY
 _DOCKER_TLS_VERIFY
 ```
 
+Other environment variables in use come directly from CircleCI, and a reference
+of these can be found [here](https://circleci.com/docs/environment-variables/)
+
 ## Docker Images
 
 Each of the service contained within the Joyent Portal repository is deployed 

From 4a81042bd014a71d095c861ffe780c5ef6b17444 Mon Sep 17 00:00:00 2001
From: Tom Gallacher <tomgallacher23@gmail.com>
Date: Fri, 27 Jan 2017 17:49:31 +0000
Subject: [PATCH 25/32] Updating README

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index d6617767..fb302c28 100644
--- a/README.md
+++ b/README.md
@@ -52,6 +52,7 @@ We will also include multiple PoC's of various bits of functionality from UI's p
 ```
 .
 ├── cloudapi-graphql
+├── docs
 ├── frontend
 ├── nginx
 ├── ui
@@ -62,6 +63,11 @@ We will also include multiple PoC's of various bits of functionality from UI's p
 
 An implementation of the [Joyent CloudAPI](https://apidocs.joyent.com/cloudapi/) in GraphQL.
 
+### Docs
+
+Documentation about the project, mainly focused on information for the technical runnings of this project.
+Can be view online at the [documentation website](http://docs.svc.f4b20699-b323-4452-9091-977895896da6.eu-ams-1.triton.zone/)
+
 ### frontend
 
 The client side code with a dev-server, this also includes the production server for the meantime, however we are looking at moving towards a deployment of the build artifacts to manta, and another server to host these assets.

From fb9fc6e25c1045536422a1c08809f4d5a8f9cb95 Mon Sep 17 00:00:00 2001
From: Tom Gallacher <tomgallacher23@gmail.com>
Date: Fri, 27 Jan 2017 17:58:10 +0000
Subject: [PATCH 26/32] Fixes #151

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fb302c28..07557f98 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,8 @@ setup using the triton tool.
 
 Currently requires [yarn](https://yarnpkg.com/en/docs/install) for installing dependencies,
 as well as `docker` and `docker-compose` are installed correctly, this can be done by
-running `make`, make continues without any errors, then you are good to go.
+running `make`, make continues without any errors, then you are good to go. [node-triton](https://github.com/joyent/node-triton)
+is also needed if deployment to Triton is required.
 
 ```
 make && make install

From fdfe2272cd30ebc9f5407a52c57f09fc5919f523 Mon Sep 17 00:00:00 2001
From: Alex Windett <windettalex@gmail.com>
Date: Mon, 30 Jan 2017 11:29:18 +0000
Subject: [PATCH 27/32] moving people/member component into the projects
 container

---
 frontend/src/containers/project/people.js | 62 +++++++++++++--
 frontend/src/mock-state.json              | 22 +++++-
 frontend/src/state/actions.js             | 35 +++++++--
 frontend/src/state/reducers/projects.js   | 94 ++++++++++++++++++++++-
 frontend/src/state/selectors.js           | 24 ++++++
 5 files changed, 222 insertions(+), 15 deletions(-)

diff --git a/frontend/src/containers/project/people.js b/frontend/src/containers/project/people.js
index 5abef63e..0115ee6f 100644
--- a/frontend/src/containers/project/people.js
+++ b/frontend/src/containers/project/people.js
@@ -1,9 +1,59 @@
 const React = require('react');
-
+const ReactRedux = require('react-redux');
+const PeopleSection = require('@components/people-list');
+const selectors = require('@state/selectors');
 const Section = require('./section');
+const actions = require('@state/actions');
 
-module.exports = (props) => (
-  <Section {...props}>
-    <p>people</p>
-  </Section>
-);
+const {
+  connect
+} = ReactRedux;
+
+const {
+  peopleByProjectIdSelector,
+  projectUISelector,
+  projectIndexByIdSelect,
+  membersSelector,
+} = selectors;
+
+const {
+  projecthandleInviteToggle,
+  projecthandlePeopleRoleTooltip,
+  projecthandlePeopleStatusTooltip,
+  projecthandleMemberUpdate,
+  projectremoveMember,
+} = actions;
+
+const People = (props) => {
+
+  return (
+    <Section {...props}>
+      <PeopleSection {...props} />
+    </Section>
+  );
+};
+
+const mapStateToProps = (state, {
+  params = {}
+}) => ({
+  people: peopleByProjectIdSelector(params.projectId)(state),
+  UI: projectUISelector(state),
+  parentIndex: projectIndexByIdSelect(params.projectId)(state),
+  platformMembers: membersSelector(state)
+});
+
+const mapDispatchToProps = (dispatch) => ({
+  handleToggle: () => dispatch(projecthandleInviteToggle()),
+  handleStatusTooltip: (id) => dispatch(projecthandlePeopleStatusTooltip(id)),
+  handleRoleTooltip: (id) => dispatch(projecthandlePeopleRoleTooltip(id)),
+  handleMemberUpdate: (updatedMember) =>
+    dispatch(projecthandleMemberUpdate(updatedMember)),
+  removeMember: (removeData) =>
+    dispatch(projectremoveMember(removeData)),
+
+});
+
+module.exports = connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(People);
diff --git a/frontend/src/mock-state.json b/frontend/src/mock-state.json
index c00677d4..181efda4 100644
--- a/frontend/src/mock-state.json
+++ b/frontend/src/mock-state.json
@@ -541,6 +541,16 @@
         "people",
         "settings",
         "manifest"
+      ],
+      "members_status": [
+        "Active",
+        "Inactive",
+        "Invitation Sent"
+      ],
+      "members_roles": [
+        "Owner",
+        "Unassigned",
+        "Read Only"
       ]
     },
     "data": [{
@@ -548,7 +558,17 @@
       "org": "e12ad7db-91b2-4154-83dd-40dcfc700dcc",
       "id": "forest-foundation-dev",
       "name": "Forest Foundation Dev",
-      "plan": "20.05$ per day"
+      "plan": "20.05$ per day",
+      "members": [{
+        "uuid": "fd853d8f-e1dd-49b5-b7b3-ae9adfea1e2f",
+        "role": "Owner",
+        "status": "Active"
+      },
+      {
+        "uuid": "6deddbaa-3b94-4373-8cf7-97129507a872",
+        "role": "Unassigned",
+        "status": "Sent invitation"
+      }]
     }, {
       "uuid": "9fcb374d-a267-4c2a-9d9c-ba469b804639",
       "org": "e12ad7db-91b2-4154-83dd-40dcfc700dcc",
diff --git a/frontend/src/state/actions.js b/frontend/src/state/actions.js
index 7f32be8f..77f9cc3c 100644
--- a/frontend/src/state/actions.js
+++ b/frontend/src/state/actions.js
@@ -7,6 +7,32 @@ const {
 
 const APP = constantCase(process.env['APP_NAME']);
 
+const projectMemberActions = {
+  projecthandleInviteToggle:
+    createAction(`${APP}/PROJECT_HANDLE_INVITE_MEMBER_TOGGLE`),
+  projecthandlePeopleStatusTooltip:
+    createAction(`${APP}/PROJECT_HANDLE_PERSON_STATUS_TOOLTIP`),
+  projecthandlePeopleRoleTooltip:
+    createAction(`${APP}/PROJECT_HANDLE_PERSON_ROLE_TOOLTIP`),
+  projecthandleMemberUpdate:
+    createAction(`${APP}/PROJECT_HANDLE_MEMBER_UPDATE`),
+  projectremoveMember:
+    createAction(`${APP}/PROJECT_REMOVE_MEMBER_FROM_ROLE`),
+};
+
+const orgMemberActions = {
+  handleInviteToggle:
+    createAction(`${APP}/HANDLE_INVITE_MEMBER_TOGGLE`),
+  handlePeopleStatusTooltip:
+    createAction(`${APP}/HANDLE_PERSON_STATUS_TOOLTIP`),
+  handlePeopleRoleTooltip:
+    createAction(`${APP}/HANDLE_PERSON_ROLE_TOOLTIP`),
+  handleMemberUpdate:
+    createAction(`${APP}/HANDLE_MEMBER_UPDATE`),
+  removeMember:
+    createAction(`${APP}/REMOVE_MEMBER_FROM_ROLE`),
+};
+
 module.exports = {
   ...require('@state/thunks'),
   updateRouter: createAction(`${APP}/UPDATE_ROUTER`),
@@ -17,11 +43,6 @@ module.exports = {
   toggleInstanceCollapsed: createAction(`${APP}/TOGGLE_INSTANCE_COLLAPSED`),
   toggleMonitorView: createAction(`${APP}/TOGGLE_MONITOR_VIEW`),
   switchMonitorViewPage: createAction(`${APP}/SWITCH_MONITOR_VIEW_PAGE`),
-  handleInviteToggle: createAction(`${APP}/HANDLE_INVITE_MEMBER_TOGGLE`),
-  handlePeopleStatusTooltip:
-      createAction(`${APP}/HANDLE_PERSON_STATUS_TOOLTIP`),
-  handlePeopleRoleTooltip:
-    createAction(`${APP}/HANDLE_PERSON_ROLE_TOOLTIP`),
-  handleMemberUpdate: createAction(`${APP}/HANDLE_MEMBER_UPDATE`),
-  removeMember: createAction(`${APP}/REMOVE_MEMBER_FROM_ROLE`),
+  ...orgMemberActions,
+  ...projectMemberActions,
 };
diff --git a/frontend/src/state/reducers/projects.js b/frontend/src/state/reducers/projects.js
index 7fec06fb..e4730190 100644
--- a/frontend/src/state/reducers/projects.js
+++ b/frontend/src/state/reducers/projects.js
@@ -1,9 +1,101 @@
 const ReduxActions = require('redux-actions');
 
+const actions = require('@state/actions');
+
 const {
   handleActions
 } = ReduxActions;
 
+const {
+  projecthandleInviteToggle,
+  projecthandlePeopleRoleTooltip,
+  projecthandlePeopleStatusTooltip,
+  projecthandleMemberUpdate,
+  projectremoveMember,
+} = actions;
+
 module.exports = handleActions({
-  'x': (state) => state // somehow handleActions needs at least one reducer
+  [projecthandleInviteToggle.toString()]: (state, action) => {
+    return {
+      ...state,
+      ui: {
+        ...state.ui,
+        invite_toggled: !state.ui.invite_toggled
+      }
+    };
+  },
+  [projecthandlePeopleStatusTooltip.toString()]: (state, action) => {
+    return {
+      ...state,
+      ui: {
+        ...state.ui,
+        member_status_tooltip:
+          action.payload === state.ui.member_status_tooltip
+            ? ''
+            : action.payload
+      }
+    };
+  },
+  [projecthandlePeopleRoleTooltip.toString()]: (state, action) => {
+    return {
+      ...state,
+      ui: {
+        ...state.ui,
+        member_role_tooltip:
+          action.payload === state.ui.member_role_tooltip
+            ? ''
+            : action.payload
+      }
+    };
+  },
+  [projecthandleMemberUpdate.toString()]: (state, action) => {
+    const {
+      parentIndex,
+      person,
+      personIndex,
+    } = action.payload;
+    return {
+      ...state,
+      ui: {
+        ...state.ui,
+        member_status_tooltip: false,
+        member_role_tooltip: false
+      },
+      data: [
+        ...state.data.slice(0, parentIndex),
+        {
+          ...state.data[parentIndex],
+          members: [
+            ...state.data[parentIndex].members.slice(0, personIndex),
+            {
+              ...person,
+            },
+            ...state.data[parentIndex].members.slice(personIndex + 1)
+          ]
+        },
+        ...state.data.slice(parentIndex + 1),
+      ]
+    };
+  },
+  [projectremoveMember.toString()]: (state, action) => {
+    const {
+      parentIndex,
+      personIndex,
+    } = action.payload;
+
+    return {
+      ...state,
+      data: [
+        ...state.data.slice(0, parentIndex),
+        {
+          ...state.data[parentIndex],
+          members: [
+            ...state.data[parentIndex].members.slice(0, personIndex),
+            ...state.data[parentIndex].members.slice(personIndex + 1)
+          ]
+        },
+        ...state.data.slice(parentIndex + 1),
+      ]
+    };
+  },
 }, {});
diff --git a/frontend/src/state/selectors.js b/frontend/src/state/selectors.js
index da739a6e..e13eb62c 100644
--- a/frontend/src/state/selectors.js
+++ b/frontend/src/state/selectors.js
@@ -15,6 +15,7 @@ const serviceUiSections = (state) => get(state, 'services.ui.sections', []);
 const orgs = (state) => get(state, 'orgs.data', []);
 const orgUI = (state) => get(state, 'orgs.ui', []);
 const projects = (state) => get(state, 'projects.data', []);
+const projectsUI = (state) => get(state, 'projects.ui', []);
 const services = (state) => get(state, 'services.data', []);
 const collapsedServices = (state) => get(state, 'services.ui.collapsed', []);
 const collapsedInstances = (state) => get(state, 'instances.ui.collapsed', []);
@@ -40,6 +41,11 @@ const orgIndexById = (orgId) => createSelector(
   (orgs) => orgs.map((o) => o.id).indexOf(orgId)
 );
 
+const projectIndexById = (projectId) => createSelector(
+  projects,
+  (projects) => projects.map((p) => p.id).indexOf(projectId)
+);
+
 const serviceById = (serviceId) => createSelector(
   [services],
   (services) => find(services, ['id', serviceId])
@@ -141,6 +147,21 @@ const peopleByOrgId = (orgId) => createSelector(
   }
 );
 
+const peopleByProjectId = (projectId) => createSelector(
+  [members, projectById(projectId)], (members, prj) => {
+    const matched = [];
+    if (Object.keys(prj.members).length > 0) {
+      prj.members.filter((m) => {
+        matched.push({
+          ...find(members, ['uuid', m.uuid]),
+          ...m
+        });
+      });
+    }
+    return matched;
+  }
+);
+
 module.exports = {
   accountSelector: account,
   accountUISelector: accountUi,
@@ -163,4 +184,7 @@ module.exports = {
   metricTypeByUuidSelector: metricTypeByUuid,
   peopleByOrgIdSelector: peopleByOrgId,
   membersSelector: members,
+  peopleByProjectIdSelector: peopleByProjectId,
+  projectUISelector: projectsUI,
+  projectIndexByIdSelect: projectIndexById,
 };

From 518023f446ea05fd49e4e5b4ef847a83063a05ca Mon Sep 17 00:00:00 2001
From: Alex Windett <windettalex@gmail.com>
Date: Mon, 30 Jan 2017 11:59:06 +0000
Subject: [PATCH 28/32] changing empty members to array and updating fallback
 copy for no members

---
 frontend/src/components/people-list/index.js |   2 +-
 frontend/src/mock-state.json                 |  10 +-
 ui/yarn.lock                                 | 339 +++++++++----------
 3 files changed, 176 insertions(+), 175 deletions(-)

diff --git a/frontend/src/components/people-list/index.js b/frontend/src/components/people-list/index.js
index f07be5c4..4660c6ea 100644
--- a/frontend/src/components/people-list/index.js
+++ b/frontend/src/components/people-list/index.js
@@ -39,7 +39,7 @@ const People = (props) => {
         <Column xs={12}>
           { people.length > 0
             ? <PeopleTable {...props} />
-            : <h3>There is nobody in this orgnaisation</h3> }
+            : <h3>Noody here!</h3> }
         </Column>
       </Row>
     </div>
diff --git a/frontend/src/mock-state.json b/frontend/src/mock-state.json
index 181efda4..55984b50 100644
--- a/frontend/src/mock-state.json
+++ b/frontend/src/mock-state.json
@@ -506,7 +506,7 @@
       "id": "nicola",
       "name": "Your dashboard",
       "image": "https://pbs.twimg.com/profile_images/641289584580493312/VBfsPlff_400x400.jpg",
-      "members": {}
+      "members": []
     }, {
       "owner": "b94033c1-3665-4c36-afab-d9c3d0b51c01",
       "uuid": "e12ad7db-91b2-4154-83dd-40dcfc700dcc",
@@ -530,7 +530,7 @@
       "id": "make-us-proud",
       "name": "Make Us Proud",
       "image": "/static/images/make-us-proud.svg",
-      "members": {}
+      "members": []
     }]
   },
   "projects": {
@@ -574,13 +574,15 @@
       "org": "e12ad7db-91b2-4154-83dd-40dcfc700dcc",
       "id": "forest-foundation-testing",
       "name": "Forest Foundation Testing",
-      "plan": "20.05$ per day"
+      "plan": "20.05$ per day",
+      "members": []
     }, {
       "uuid": "ac2c2498-e865-4ee3-9e26-8c75a81cbe25",
       "org": "e12ad7db-91b2-4154-83dd-40dcfc700dcc",
       "id": "forest-foundation-production",
       "name": "Forest Foundation Production",
-      "plan": "100.17$ per day"
+      "plan": "100.17$ per day",
+      "members": []
     }]
   },
   "members": {
diff --git a/ui/yarn.lock b/ui/yarn.lock
index 87e55c90..be3efdf1 100644
--- a/ui/yarn.lock
+++ b/ui/yarn.lock
@@ -1,7 +1,5 @@
 # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
 # yarn lockfile v1
-
-
 "@kadira/react-split-pane@^1.4.0":
   version "1.4.7"
   resolved "https://registry.yarnpkg.com/@kadira/react-split-pane/-/react-split-pane-1.4.7.tgz#6d753d4a9fe62fe82056e323a6bcef7f026972b5"
@@ -99,13 +97,6 @@
     webpack-dev-middleware "^1.6.0"
     webpack-hot-middleware "^2.13.2"
 
-JSONStream@^0.8.4:
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-0.8.4.tgz#91657dfe6ff857483066132b4618b62e8f4887bd"
-  dependencies:
-    jsonparse "0.0.5"
-    through ">=2.2.7 <3"
-
 abab@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.3.tgz#b81de5f7274ec4e756d797cd834f303642724e5d"
@@ -795,14 +786,6 @@ babel-plugin-transform-async-to-generator@^6.22.0, babel-plugin-transform-async-
     babel-plugin-syntax-async-functions "^6.8.0"
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-class-properties@6.16.0:
-  version "6.16.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.16.0.tgz#969bca24d34e401d214f36b8af5c1346859bc904"
-  dependencies:
-    babel-helper-function-name "^6.8.0"
-    babel-plugin-syntax-class-properties "^6.8.0"
-    babel-runtime "^6.9.1"
-
 babel-plugin-transform-class-properties@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.22.0.tgz#aa78f8134495c7de06c097118ba061844e1dc1d8"
@@ -812,6 +795,14 @@ babel-plugin-transform-class-properties@^6.22.0:
     babel-runtime "^6.22.0"
     babel-template "^6.22.0"
 
+babel-plugin-transform-class-properties@6.16.0:
+  version "6.16.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.16.0.tgz#969bca24d34e401d214f36b8af5c1346859bc904"
+  dependencies:
+    babel-helper-function-name "^6.8.0"
+    babel-plugin-syntax-class-properties "^6.8.0"
+    babel-runtime "^6.9.1"
+
 babel-plugin-transform-decorators@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.22.0.tgz#c03635b27a23b23b7224f49232c237a73988d27c"
@@ -865,18 +856,18 @@ babel-plugin-transform-es2015-computed-properties@^6.22.0, babel-plugin-transfor
     babel-runtime "^6.22.0"
     babel-template "^6.22.0"
 
-babel-plugin-transform-es2015-destructuring@6.16.0:
-  version "6.16.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.16.0.tgz#050fe0866f5d53b36062ee10cdf5bfe64f929627"
-  dependencies:
-    babel-runtime "^6.9.0"
-
 babel-plugin-transform-es2015-destructuring@^6.22.0, babel-plugin-transform-es2015-destructuring@^6.6.0, babel-plugin-transform-es2015-destructuring@^6.6.5:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.22.0.tgz#8e0af2f885a0b2cf999d47c4c1dd23ce88cfa4c6"
   dependencies:
     babel-runtime "^6.22.0"
 
+babel-plugin-transform-es2015-destructuring@6.16.0:
+  version "6.16.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.16.0.tgz#050fe0866f5d53b36062ee10cdf5bfe64f929627"
+  dependencies:
+    babel-runtime "^6.9.0"
+
 babel-plugin-transform-es2015-duplicate-keys@^6.22.0, babel-plugin-transform-es2015-duplicate-keys@^6.6.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.22.0.tgz#672397031c21610d72dd2bbb0ba9fb6277e1c36b"
@@ -944,17 +935,6 @@ babel-plugin-transform-es2015-object-super@^6.22.0, babel-plugin-transform-es201
     babel-helper-replace-supers "^6.22.0"
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-parameters@6.17.0:
-  version "6.17.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.17.0.tgz#e06d30cef897f46adb4734707bbe128a0d427d58"
-  dependencies:
-    babel-helper-call-delegate "^6.8.0"
-    babel-helper-get-function-arity "^6.8.0"
-    babel-runtime "^6.9.0"
-    babel-template "^6.16.0"
-    babel-traverse "^6.16.0"
-    babel-types "^6.16.0"
-
 babel-plugin-transform-es2015-parameters@^6.22.0, babel-plugin-transform-es2015-parameters@^6.6.0, babel-plugin-transform-es2015-parameters@^6.7.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.22.0.tgz#57076069232019094f27da8c68bb7162fe208dbb"
@@ -966,6 +946,17 @@ babel-plugin-transform-es2015-parameters@^6.22.0, babel-plugin-transform-es2015-
     babel-traverse "^6.22.0"
     babel-types "^6.22.0"
 
+babel-plugin-transform-es2015-parameters@6.17.0:
+  version "6.17.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.17.0.tgz#e06d30cef897f46adb4734707bbe128a0d427d58"
+  dependencies:
+    babel-helper-call-delegate "^6.8.0"
+    babel-helper-get-function-arity "^6.8.0"
+    babel-runtime "^6.9.0"
+    babel-template "^6.16.0"
+    babel-traverse "^6.16.0"
+    babel-types "^6.16.0"
+
 babel-plugin-transform-es2015-shorthand-properties@^6.22.0, babel-plugin-transform-es2015-shorthand-properties@^6.3.13, babel-plugin-transform-es2015-shorthand-properties@^6.5.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.22.0.tgz#8ba776e0affaa60bff21e921403b8a652a2ff723"
@@ -1022,13 +1013,6 @@ babel-plugin-transform-flow-strip-types@^6.22.0, babel-plugin-transform-flow-str
     babel-plugin-syntax-flow "^6.18.0"
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-object-rest-spread@6.16.0:
-  version "6.16.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.16.0.tgz#db441d56fffc1999052fdebe2e2f25ebd28e36a9"
-  dependencies:
-    babel-plugin-syntax-object-rest-spread "^6.8.0"
-    babel-runtime "^6.0.0"
-
 babel-plugin-transform-object-rest-spread@^6.20.2, babel-plugin-transform-object-rest-spread@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.22.0.tgz#1d419b55e68d2e4f64a5ff3373bd67d73c8e83bc"
@@ -1036,6 +1020,13 @@ babel-plugin-transform-object-rest-spread@^6.20.2, babel-plugin-transform-object
     babel-plugin-syntax-object-rest-spread "^6.8.0"
     babel-runtime "^6.22.0"
 
+babel-plugin-transform-object-rest-spread@6.16.0:
+  version "6.16.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.16.0.tgz#db441d56fffc1999052fdebe2e2f25ebd28e36a9"
+  dependencies:
+    babel-plugin-syntax-object-rest-spread "^6.8.0"
+    babel-runtime "^6.0.0"
+
 babel-plugin-transform-react-constant-elements@6.9.1:
   version "6.9.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-constant-elements/-/babel-plugin-transform-react-constant-elements-6.9.1.tgz#125b86d96cb322e2139b607fd749ad5fbb17f005"
@@ -1048,13 +1039,6 @@ babel-plugin-transform-react-display-name@^6.22.0, babel-plugin-transform-react-
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-react-jsx-self@6.11.0:
-  version "6.11.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.11.0.tgz#605c9450c1429f97a930f7e1dfe3f0d9d0dbd0f4"
-  dependencies:
-    babel-plugin-syntax-jsx "^6.8.0"
-    babel-runtime "^6.9.0"
-
 babel-plugin-transform-react-jsx-self@^6.11.0, babel-plugin-transform-react-jsx-self@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.22.0.tgz#df6d80a9da2612a121e6ddd7558bcbecf06e636e"
@@ -1062,9 +1046,9 @@ babel-plugin-transform-react-jsx-self@^6.11.0, babel-plugin-transform-react-jsx-
     babel-plugin-syntax-jsx "^6.8.0"
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-react-jsx-source@6.9.0:
-  version "6.9.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.9.0.tgz#af684a05c2067a86e0957d4f343295ccf5dccf00"
+babel-plugin-transform-react-jsx-self@6.11.0:
+  version "6.11.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.11.0.tgz#605c9450c1429f97a930f7e1dfe3f0d9d0dbd0f4"
   dependencies:
     babel-plugin-syntax-jsx "^6.8.0"
     babel-runtime "^6.9.0"
@@ -1076,6 +1060,13 @@ babel-plugin-transform-react-jsx-source@^6.22.0, babel-plugin-transform-react-js
     babel-plugin-syntax-jsx "^6.8.0"
     babel-runtime "^6.22.0"
 
+babel-plugin-transform-react-jsx-source@6.9.0:
+  version "6.9.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.9.0.tgz#af684a05c2067a86e0957d4f343295ccf5dccf00"
+  dependencies:
+    babel-plugin-syntax-jsx "^6.8.0"
+    babel-runtime "^6.9.0"
+
 babel-plugin-transform-react-jsx@^6.22.0, babel-plugin-transform-react-jsx@^6.3.13:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.22.0.tgz#48556b7dd4c3fe97d1c943bcd54fc3f2561c1817"
@@ -1084,6 +1075,12 @@ babel-plugin-transform-react-jsx@^6.22.0, babel-plugin-transform-react-jsx@^6.3.
     babel-plugin-syntax-jsx "^6.8.0"
     babel-runtime "^6.22.0"
 
+babel-plugin-transform-regenerator@^6.22.0, babel-plugin-transform-regenerator@^6.6.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.22.0.tgz#65740593a319c44522157538d690b84094617ea6"
+  dependencies:
+    regenerator-transform "0.9.8"
+
 babel-plugin-transform-regenerator@6.16.1:
   version "6.16.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.16.1.tgz#a75de6b048a14154aae14b0122756c5bed392f59"
@@ -1092,11 +1089,11 @@ babel-plugin-transform-regenerator@6.16.1:
     babel-types "^6.16.0"
     private "~0.1.5"
 
-babel-plugin-transform-regenerator@^6.22.0, babel-plugin-transform-regenerator@^6.6.0:
+babel-plugin-transform-runtime@^6.15.0:
   version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.22.0.tgz#65740593a319c44522157538d690b84094617ea6"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.22.0.tgz#10968d760bbf6517243081eec778e10fa828551c"
   dependencies:
-    regenerator-transform "0.9.8"
+    babel-runtime "^6.22.0"
 
 babel-plugin-transform-runtime@6.15.0:
   version "6.15.0"
@@ -1104,12 +1101,6 @@ babel-plugin-transform-runtime@6.15.0:
   dependencies:
     babel-runtime "^6.9.0"
 
-babel-plugin-transform-runtime@^6.15.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.22.0.tgz#10968d760bbf6517243081eec778e10fa828551c"
-  dependencies:
-    babel-runtime "^6.22.0"
-
 babel-plugin-transform-strict-mode@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.22.0.tgz#e008df01340fdc87e959da65991b7e05970c8c7c"
@@ -1239,18 +1230,6 @@ babel-preset-react-app@^1.0.0:
     babel-preset-react "6.16.0"
     babel-runtime "6.11.6"
 
-babel-preset-react@6.16.0:
-  version "6.16.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-react/-/babel-preset-react-6.16.0.tgz#aa117d60de0928607e343c4828906e4661824316"
-  dependencies:
-    babel-plugin-syntax-flow "^6.3.13"
-    babel-plugin-syntax-jsx "^6.3.13"
-    babel-plugin-transform-flow-strip-types "^6.3.13"
-    babel-plugin-transform-react-display-name "^6.3.13"
-    babel-plugin-transform-react-jsx "^6.3.13"
-    babel-plugin-transform-react-jsx-self "^6.11.0"
-    babel-plugin-transform-react-jsx-source "^6.3.13"
-
 babel-preset-react@^6.16.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-preset-react/-/babel-preset-react-6.22.0.tgz#7bc97e2d73eec4b980fb6b4e4e0884e81ccdc165"
@@ -1263,6 +1242,18 @@ babel-preset-react@^6.16.0:
     babel-plugin-transform-react-jsx-self "^6.22.0"
     babel-plugin-transform-react-jsx-source "^6.22.0"
 
+babel-preset-react@6.16.0:
+  version "6.16.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-react/-/babel-preset-react-6.16.0.tgz#aa117d60de0928607e343c4828906e4661824316"
+  dependencies:
+    babel-plugin-syntax-flow "^6.3.13"
+    babel-plugin-syntax-jsx "^6.3.13"
+    babel-plugin-transform-flow-strip-types "^6.3.13"
+    babel-plugin-transform-react-display-name "^6.3.13"
+    babel-plugin-transform-react-jsx "^6.3.13"
+    babel-plugin-transform-react-jsx-self "^6.11.0"
+    babel-plugin-transform-react-jsx-source "^6.3.13"
+
 babel-preset-stage-2@^6.17.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-preset-stage-2/-/babel-preset-stage-2-6.22.0.tgz#ccd565f19c245cade394b21216df704a73b27c07"
@@ -1294,6 +1285,13 @@ babel-register@^6.18.0, babel-register@^6.22.0:
     mkdirp "^0.5.1"
     source-map-support "^0.4.2"
 
+babel-runtime@^6.0.0, babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.5.0, babel-runtime@^6.9.0, babel-runtime@^6.9.1, babel-runtime@^6.9.2, babel-runtime@6.x.x:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.22.0.tgz#1cf8b4ac67c77a4ddb0db2ae1f74de52ac4ca611"
+  dependencies:
+    core-js "^2.4.0"
+    regenerator-runtime "^0.10.0"
+
 babel-runtime@6.11.6:
   version "6.11.6"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.11.6.tgz#6db707fef2d49c49bfa3cb64efdb436b518b8222"
@@ -1301,13 +1299,6 @@ babel-runtime@6.11.6:
     core-js "^2.4.0"
     regenerator-runtime "^0.9.5"
 
-babel-runtime@6.x.x, babel-runtime@^6.0.0, babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.5.0, babel-runtime@^6.9.0, babel-runtime@^6.9.1, babel-runtime@^6.9.2:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.22.0.tgz#1cf8b4ac67c77a4ddb0db2ae1f74de52ac4ca611"
-  dependencies:
-    core-js "^2.4.0"
-    regenerator-runtime "^0.10.0"
-
 babel-template@^6.16.0, babel-template@^6.22.0, babel-template@^6.7.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.22.0.tgz#403d110905a4626b317a2a1fcb8f3b73204b2edb"
@@ -1814,21 +1805,21 @@ colormin@^1.0.5:
     css-color-names "0.0.4"
     has "^1.0.1"
 
-colors@0.5.x:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-0.5.1.tgz#7d0023eaeb154e8ee9fce75dcb923d0ed1667774"
-
 colors@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
 
+colors@0.5.x:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-0.5.1.tgz#7d0023eaeb154e8ee9fce75dcb923d0ed1667774"
+
 combined-stream@^1.0.5, combined-stream@~1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@2, commander@^2.8.1, commander@^2.9.0:
+commander@^2.8.1, commander@^2.9.0, commander@2:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
   dependencies:
@@ -2114,7 +2105,7 @@ csso@~2.2.1:
     clap "^1.0.9"
     source-map "^0.5.3"
 
-cssom@0.3.x, "cssom@>= 0.3.0 < 0.4.0":
+"cssom@>= 0.3.0 < 0.4.0", cssom@0.3.x:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
 
@@ -2130,6 +2121,12 @@ currently-unhandled@^0.4.1:
   dependencies:
     array-find-index "^1.0.1"
 
+d@^0.1.1, d@~0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/d/-/d-0.1.1.tgz#da184c535d18d8ee7ba2aa229b914009fae11309"
+  dependencies:
+    es5-ext "~0.10.2"
+
 d3-array@1, d3-array@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.0.2.tgz#174237bf356a852fadd6af87743d928631de7655"
@@ -2340,12 +2337,6 @@ d3@^4.4.1:
     d3-voronoi "1.1.1"
     d3-zoom "1.1.1"
 
-d@^0.1.1, d@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/d/-/d-0.1.1.tgz#da184c535d18d8ee7ba2aa229b914009fae11309"
-  dependencies:
-    es5-ext "~0.10.2"
-
 damerau-levenshtein@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.3.tgz#ae4f4ce0b62acae10ff63a01bb08f652f5213af2"
@@ -2490,7 +2481,7 @@ doiuse@^2.4.1:
     through2 "^0.6.3"
     yargs "^3.5.4"
 
-dom-serializer@0, dom-serializer@~0.1.0:
+dom-serializer@~0.1.0, dom-serializer@0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
   dependencies:
@@ -2501,7 +2492,7 @@ domain-browser@^1.1.1:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
 
-domelementtype@1, domelementtype@^1.3.0:
+domelementtype@^1.3.0, domelementtype@1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
 
@@ -2515,7 +2506,7 @@ domhandler@^2.3.0:
   dependencies:
     domelementtype "1"
 
-domutils@1.5.1, domutils@^1.5.1:
+domutils@^1.5.1, domutils@1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
   dependencies:
@@ -2528,11 +2519,9 @@ dot-prop@^3.0.0:
   dependencies:
     is-obj "^1.0.0"
 
-duplexer2@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
-  dependencies:
-    readable-stream "~1.1.9"
+duplexer@~0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
 
 duplexer2@^0.1.4:
   version "0.1.4"
@@ -2540,9 +2529,11 @@ duplexer2@^0.1.4:
   dependencies:
     readable-stream "^2.0.2"
 
-duplexer@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
+duplexer2@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
+  dependencies:
+    readable-stream "~1.1.9"
 
 eastasianwidth@^0.1.1:
   version "0.1.1"
@@ -2686,7 +2677,7 @@ es6-shim@^0.35.1:
   version "0.35.3"
   resolved "https://registry.yarnpkg.com/es6-shim/-/es6-shim-0.35.3.tgz#9bfb7363feffff87a6cdb6cd93e405ec3c4b6f26"
 
-es6-symbol@3, es6-symbol@~3.1, es6-symbol@~3.1.0:
+es6-symbol@~3.1, es6-symbol@~3.1.0, es6-symbol@3:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.0.tgz#94481c655e7a7cad82eba832d97d5433496d7ffa"
   dependencies:
@@ -3346,7 +3337,7 @@ hoek@2.x.x:
   version "2.16.3"
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
 
-hoist-non-react-statics@1.x.x, hoist-non-react-statics@^1.2.0:
+hoist-non-react-statics@^1.2.0, hoist-non-react-statics@1.x.x:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb"
 
@@ -3414,7 +3405,7 @@ hyphenate-style-name@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.2.tgz#31160a36930adaf1fc04c6074f7eb41465d4ec4b"
 
-iconv-lite@0.4, iconv-lite@^0.4.13, iconv-lite@~0.4.13:
+iconv-lite@^0.4.13, iconv-lite@~0.4.13, iconv-lite@0.4:
   version "0.4.15"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb"
 
@@ -3467,7 +3458,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1:
+inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@2, inherits@2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
@@ -3512,7 +3503,7 @@ interpret@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.1.tgz#d579fb7f693b858004947af39fa0db49f795602c"
 
-invariant@2.x.x, invariant@^2.2.0:
+invariant@^2.2.0, invariant@2.x.x:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
   dependencies:
@@ -3765,14 +3756,14 @@ is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
 
+isarray@^1.0.0, isarray@~1.0.0, isarray@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
 
-isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-
 isexe@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-1.1.2.tgz#36f3e22e60750920f5e7241a476a8c6a42275ad0"
@@ -3954,6 +3945,13 @@ jsonpointer@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
 
+JSONStream@^0.8.4:
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-0.8.4.tgz#91657dfe6ff857483066132b4618b62e8f4887bd"
+  dependencies:
+    jsonparse "0.0.5"
+    through ">=2.2.7 <3"
+
 jsprim@^1.2.2:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.3.1.tgz#2a7256f70412a29ee3670aaca625994c4dcff252"
@@ -4033,7 +4031,7 @@ load-json-file@^1.0.0, load-json-file@^1.1.0:
     pinkie-promise "^2.0.0"
     strip-bom "^2.0.0"
 
-loader-utils@0.2.x, loader-utils@^0.2, loader-utils@^0.2.11, loader-utils@^0.2.16, loader-utils@^0.2.7, loader-utils@~0.2.2, loader-utils@~0.2.5:
+loader-utils@^0.2, loader-utils@^0.2.11, loader-utils@^0.2.16, loader-utils@^0.2.7, loader-utils@~0.2.2, loader-utils@~0.2.5, loader-utils@0.2.x:
   version "0.2.16"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.16.tgz#f08632066ed8282835dff88dfb52704765adee6d"
   dependencies:
@@ -4178,14 +4176,14 @@ lodash.uniq@^4.3.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
 
-lodash@4.x.x, lodash@^4.0.0, lodash@^4.1.0, lodash@^4.10.0, lodash@^4.12.0, lodash@^4.17.2, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0:
-  version "4.17.4"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
-
 lodash@^3.5.0:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
+lodash@^4.0.0, lodash@^4.1.0, lodash@^4.10.0, lodash@^4.12.0, lodash@^4.17.2, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@4.x.x:
+  version "4.17.4"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
+
 log-symbols@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
@@ -4349,29 +4347,29 @@ mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.13, mime-types@~2.1.7:
   dependencies:
     mime-db "~1.26.0"
 
+mime@^1.3.4, mime@~1.3.4, mime@1.3.4:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
+
 mime@1.2.x:
   version "1.2.11"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.2.11.tgz#58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"
 
-mime@1.3.4, mime@^1.3.4, mime@~1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
-
 minimatch@^3.0.0, minimatch@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
   dependencies:
     brace-expansion "^1.0.0"
 
-minimist@0.0.8, minimist@~0.0.1:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-
 minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0, minimist@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
-"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
+minimist@~0.0.1, minimist@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+
+mkdirp@^0.5.0, mkdirp@^0.5.1, "mkdirp@>=0.5 0", mkdirp@~0.5.0, mkdirp@~0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   dependencies:
@@ -4385,14 +4383,14 @@ moment@^2.10.6, moment@^2.17.1:
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.17.1.tgz#fed9506063f36b10f066c8b59a144d7faebe1d82"
 
+ms@^0.7.1, ms@0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
+
 ms@0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
 
-ms@0.7.2, ms@^0.7.1:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
-
 multimatch@^2.0.0, multimatch@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
@@ -4422,7 +4420,7 @@ nearley@^2.7.7:
     railroad-diagrams "^1.0.0"
     randexp "^0.4.2"
 
-negotiator@0.6.1, negotiator@~0.6.1:
+negotiator@~0.6.1, negotiator@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
 
@@ -5338,26 +5336,26 @@ pseudomap@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
 
-punycode@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
-
 punycode@^1.2.4, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
+punycode@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
+
 q@^1.1.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
 
-qs@6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.0.tgz#3b7848c03c2dece69a9522b0fae8c4126d745f3b"
-
 qs@^6.1.0, qs@^6.2.0, qs@~6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.0.tgz#f403b264f23bc01228c74131b407f18d5ea5d442"
 
+qs@6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.0.tgz#3b7848c03c2dece69a9522b0fae8c4126d745f3b"
+
 query-string@^4.1.0:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.1.tgz#54baada6713eafc92be75c47a731f2ebd09cd11d"
@@ -5369,7 +5367,7 @@ querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
 
-querystring@0.2.0, querystring@^0.2.0:
+querystring@^0.2.0, querystring@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
 
@@ -5549,15 +5547,6 @@ read-pkg@^1.0.0:
     normalize-package-data "^2.3.2"
     path-type "^1.0.0"
 
-"readable-stream@>=1.0.33-1 <1.1.0-0":
-  version "1.0.34"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
 readable-stream@^1.0.33, readable-stream@~1.1.9:
   version "1.1.14"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
@@ -5579,6 +5568,15 @@ readable-stream@^2, readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13",
     string_decoder "~0.10.x"
     util-deprecate "~1.0.1"
 
+"readable-stream@>=1.0.33-1 <1.1.0-0":
+  version "1.0.34"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
+
 readable-stream@~2.0.5:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
@@ -5826,7 +5824,7 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2, rimraf@^2.2.8, rimraf@^2.3.3, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.4, rimraf@~2.5.1, rimraf@~2.5.4:
+rimraf@^2.2.8, rimraf@^2.3.3, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.4, rimraf@~2.5.1, rimraf@~2.5.4, rimraf@2:
   version "2.5.4"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04"
   dependencies:
@@ -5850,7 +5848,7 @@ rx-lite@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
 
-sax@>=0.6.0, sax@^1.1.4, sax@~1.2.1:
+sax@^1.1.4, sax@>=0.6.0, sax@~1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a"
 
@@ -5860,7 +5858,7 @@ semver-diff@^2.0.0:
   dependencies:
     semver "^5.0.3"
 
-"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@~5.3.0:
+semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@~5.3.0, "semver@2 || 3 || 4 || 5":
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
 
@@ -5938,7 +5936,7 @@ sha.js@2.2.6:
   version "2.2.6"
   resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.2.6.tgz#17ddeddc5f722fb66501658895461977867315ba"
 
-shallowequal@0.2.x, shallowequal@^0.2.2:
+shallowequal@^0.2.2, shallowequal@0.2.x:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-0.2.2.tgz#1e32fd5bcab6ad688a4812cb0cc04efc75c7014e"
   dependencies:
@@ -6135,6 +6133,10 @@ strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
 
+string_decoder@^0.10.25, string_decoder@~0.10.x:
+  version "0.10.31"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
@@ -6166,10 +6168,6 @@ string.prototype.padstart@^3.0.0:
     es-abstract "^1.4.3"
     function-bind "^1.0.2"
 
-string_decoder@^0.10.25, string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-
 stringifier@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/stringifier/-/stringifier-1.3.0.tgz#def18342f6933db0f2dbfc9aa02175b448c17959"
@@ -6456,6 +6454,10 @@ the-argv@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/the-argv/-/the-argv-1.0.0.tgz#0084705005730dd84db755253c931ae398db9522"
 
+through@^2.3.6, "through@>=2.2.7 <3", through@~2.3.4:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+
 through2@^0.6.1, through2@^0.6.3, through2@~0.6.1:
   version "0.6.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48"
@@ -6470,10 +6472,6 @@ through2@^2.0.0, through2@~2.0.0:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
 
-"through@>=2.2.7 <3", through@^2.3.6, through@~2.3.4:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-
 time-require@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/time-require/-/time-require-0.1.2.tgz#f9e12cb370fc2605e11404582ba54ef5ca2b2d98"
@@ -6681,7 +6679,7 @@ util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
 
-util@0.10.3, util@^0.10.3:
+util@^0.10.3, util@0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
   dependencies:
@@ -6814,7 +6812,7 @@ which-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
 
-which@1.2.x, which@^1.2.4, which@^1.2.9:
+which@^1.2.4, which@^1.2.9, which@1.2.x:
   version "1.2.12"
   resolved "https://registry.yarnpkg.com/which/-/which-1.2.12.tgz#de67b5e450269f194909ef23ece4ebe416fa1192"
   dependencies:
@@ -6832,17 +6830,13 @@ widest-line@^1.0.0:
   dependencies:
     string-width "^1.0.1"
 
-window-size@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
-
 window-size@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"
 
-wordwrap@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
+window-size@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
 
 wordwrap@~0.0.2:
   version "0.0.3"
@@ -6852,6 +6846,10 @@ wordwrap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
 
+wordwrap@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
+
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
@@ -6926,7 +6924,7 @@ xmlhttprequest@1:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc"
 
-"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
+xtend@^4.0.0, "xtend@>=4.0.0 <4.1.0-0", xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
 
@@ -6986,3 +6984,4 @@ yargs@~3.10.0:
     cliui "^2.1.0"
     decamelize "^1.0.0"
     window-size "0.1.0"
+

From 59b678a1014428970abd82fb61b72b3456db238a Mon Sep 17 00:00:00 2001
From: Alex Windett <windettalex@gmail.com>
Date: Mon, 30 Jan 2017 14:15:13 +0000
Subject: [PATCH 29/32] using more explicit action and dispatch names for org
 and project

---
 frontend/src/containers/org/people.js     | 20 +++++++--------
 frontend/src/containers/project/people.js | 20 +++++++--------
 frontend/src/state/actions.js             | 30 +++++++++++------------
 frontend/src/state/reducers/orgs.js       | 20 +++++++--------
 frontend/src/state/reducers/projects.js   | 20 +++++++--------
 5 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/frontend/src/containers/org/people.js b/frontend/src/containers/org/people.js
index 553b33e1..3e486bbb 100644
--- a/frontend/src/containers/org/people.js
+++ b/frontend/src/containers/org/people.js
@@ -17,11 +17,11 @@ const {
 } = selectors;
 
 const {
-  handleInviteToggle,
-  handlePeopleRoleTooltip,
-  handlePeopleStatusTooltip,
-  handleMemberUpdate,
-  removeMember,
+  orgHandleInviteToggle,
+  orgHandlePeopleRoleTooltip,
+  orgHandlePeopleStatusTooltip,
+  orgHandleMemberUpdate,
+  orgRemoveMember,
 } = actions;
 
 const People = (props) => {
@@ -43,13 +43,13 @@ const mapStateToProps = (state, {
 });
 
 const mapDispatchToProps = (dispatch) => ({
-  handleToggle: () => dispatch(handleInviteToggle()),
-  handleStatusTooltip: (id) => dispatch(handlePeopleStatusTooltip(id)),
-  handleRoleTooltip: (id) => dispatch(handlePeopleRoleTooltip(id)),
+  handleToggle: () => dispatch(orgHandleInviteToggle()),
+  handleStatusTooltip: (id) => dispatch(orgHandlePeopleStatusTooltip(id)),
+  handleRoleTooltip: (id) => dispatch(orgHandlePeopleRoleTooltip(id)),
   handleMemberUpdate: (updatedMember) =>
-      dispatch(handleMemberUpdate(updatedMember)),
+      dispatch(orgHandleMemberUpdate(updatedMember)),
   removeMember: (removeData) =>
-    dispatch(removeMember(removeData)),
+    dispatch(orgRemoveMember(removeData)),
 
 });
 
diff --git a/frontend/src/containers/project/people.js b/frontend/src/containers/project/people.js
index 0115ee6f..2107f5fb 100644
--- a/frontend/src/containers/project/people.js
+++ b/frontend/src/containers/project/people.js
@@ -17,11 +17,11 @@ const {
 } = selectors;
 
 const {
-  projecthandleInviteToggle,
-  projecthandlePeopleRoleTooltip,
-  projecthandlePeopleStatusTooltip,
-  projecthandleMemberUpdate,
-  projectremoveMember,
+  projectHandleInviteToggle,
+  projectHandlePeopleRoleTooltip,
+  projectHandlePeopleStatusTooltip,
+  projectHandleMemberUpdate,
+  projectRemoveMember,
 } = actions;
 
 const People = (props) => {
@@ -43,13 +43,13 @@ const mapStateToProps = (state, {
 });
 
 const mapDispatchToProps = (dispatch) => ({
-  handleToggle: () => dispatch(projecthandleInviteToggle()),
-  handleStatusTooltip: (id) => dispatch(projecthandlePeopleStatusTooltip(id)),
-  handleRoleTooltip: (id) => dispatch(projecthandlePeopleRoleTooltip(id)),
+  handleToggle: () => dispatch(projectHandleInviteToggle()),
+  handleStatusTooltip: (id) => dispatch(projectHandlePeopleStatusTooltip(id)),
+  handleRoleTooltip: (id) => dispatch(projectHandlePeopleRoleTooltip(id)),
   handleMemberUpdate: (updatedMember) =>
-    dispatch(projecthandleMemberUpdate(updatedMember)),
+    dispatch(projectHandleMemberUpdate(updatedMember)),
   removeMember: (removeData) =>
-    dispatch(projectremoveMember(removeData)),
+    dispatch(projectRemoveMember(removeData)),
 
 });
 
diff --git a/frontend/src/state/actions.js b/frontend/src/state/actions.js
index 77f9cc3c..b58ac68f 100644
--- a/frontend/src/state/actions.js
+++ b/frontend/src/state/actions.js
@@ -8,29 +8,29 @@ const {
 const APP = constantCase(process.env['APP_NAME']);
 
 const projectMemberActions = {
-  projecthandleInviteToggle:
+  projectHandleInviteToggle:
     createAction(`${APP}/PROJECT_HANDLE_INVITE_MEMBER_TOGGLE`),
-  projecthandlePeopleStatusTooltip:
+  projectHandlePeopleStatusTooltip:
     createAction(`${APP}/PROJECT_HANDLE_PERSON_STATUS_TOOLTIP`),
-  projecthandlePeopleRoleTooltip:
+  projectHandlePeopleRoleTooltip:
     createAction(`${APP}/PROJECT_HANDLE_PERSON_ROLE_TOOLTIP`),
-  projecthandleMemberUpdate:
+  projectHandleMemberUpdate:
     createAction(`${APP}/PROJECT_HANDLE_MEMBER_UPDATE`),
-  projectremoveMember:
+  projectRemoveMember:
     createAction(`${APP}/PROJECT_REMOVE_MEMBER_FROM_ROLE`),
 };
 
 const orgMemberActions = {
-  handleInviteToggle:
-    createAction(`${APP}/HANDLE_INVITE_MEMBER_TOGGLE`),
-  handlePeopleStatusTooltip:
-    createAction(`${APP}/HANDLE_PERSON_STATUS_TOOLTIP`),
-  handlePeopleRoleTooltip:
-    createAction(`${APP}/HANDLE_PERSON_ROLE_TOOLTIP`),
-  handleMemberUpdate:
-    createAction(`${APP}/HANDLE_MEMBER_UPDATE`),
-  removeMember:
-    createAction(`${APP}/REMOVE_MEMBER_FROM_ROLE`),
+  orgHandleInviteToggle:
+    createAction(`${APP}/ORG_HANDLE_INVITE_MEMBER_TOGGLE`),
+  orgHandlePeopleStatusTooltip:
+    createAction(`${APP}/ORG_HANDLE_PERSON_STATUS_TOOLTIP`),
+  orgHandlePeopleRoleTooltip:
+    createAction(`${APP}/ORG_HANDLE_PERSON_ROLE_TOOLTIP`),
+  orgHandleMemberUpdate:
+    createAction(`${APP}/ORG_HANDLE_MEMBER_UPDATE`),
+  orgRemoveMember:
+    createAction(`${APP}/ORG_REMOVE_MEMBER_FROM_ROLE`),
 };
 
 module.exports = {
diff --git a/frontend/src/state/reducers/orgs.js b/frontend/src/state/reducers/orgs.js
index e5d034d7..02339525 100644
--- a/frontend/src/state/reducers/orgs.js
+++ b/frontend/src/state/reducers/orgs.js
@@ -7,15 +7,15 @@ const {
 } = ReduxActions;
 
 const {
-  handleInviteToggle,
-  handlePeopleRoleTooltip,
-  handlePeopleStatusTooltip,
-  handleMemberUpdate,
-  removeMember,
+  orgHandleInviteToggle,
+  orgHandlePeopleRoleTooltip,
+  orgHandlePeopleStatusTooltip,
+  orgHandleMemberUpdate,
+  orgRemoveMember,
 } = actions;
 
 module.exports = handleActions({
-  [handleInviteToggle.toString()]: (state, action) => {
+  [orgHandleInviteToggle.toString()]: (state, action) => {
     return {
       ...state,
       ui: {
@@ -24,7 +24,7 @@ module.exports = handleActions({
       }
     };
   },
-  [handlePeopleStatusTooltip.toString()]: (state, action) => {
+  [orgHandlePeopleStatusTooltip.toString()]: (state, action) => {
     return {
       ...state,
       ui: {
@@ -36,7 +36,7 @@ module.exports = handleActions({
       }
     };
   },
-  [handlePeopleRoleTooltip.toString()]: (state, action) => {
+  [orgHandlePeopleRoleTooltip.toString()]: (state, action) => {
     return {
       ...state,
       ui: {
@@ -48,7 +48,7 @@ module.exports = handleActions({
       }
     };
   },
-  [handleMemberUpdate.toString()]: (state, action) => {
+  [orgHandleMemberUpdate.toString()]: (state, action) => {
     const {
       parentIndex,
       person,
@@ -77,7 +77,7 @@ module.exports = handleActions({
       ]
     };
   },
-  [removeMember.toString()]: (state, action) => {
+  [orgRemoveMember.toString()]: (state, action) => {
     const {
       parentIndex,
       personIndex,
diff --git a/frontend/src/state/reducers/projects.js b/frontend/src/state/reducers/projects.js
index e4730190..8eaac127 100644
--- a/frontend/src/state/reducers/projects.js
+++ b/frontend/src/state/reducers/projects.js
@@ -7,15 +7,15 @@ const {
 } = ReduxActions;
 
 const {
-  projecthandleInviteToggle,
-  projecthandlePeopleRoleTooltip,
-  projecthandlePeopleStatusTooltip,
-  projecthandleMemberUpdate,
-  projectremoveMember,
+  projectHandleInviteToggle,
+  projectHandlePeopleRoleTooltip,
+  projectHandlePeopleStatusTooltip,
+  projectHandleMemberUpdate,
+  projectRemoveMember,
 } = actions;
 
 module.exports = handleActions({
-  [projecthandleInviteToggle.toString()]: (state, action) => {
+  [projectHandleInviteToggle.toString()]: (state, action) => {
     return {
       ...state,
       ui: {
@@ -24,7 +24,7 @@ module.exports = handleActions({
       }
     };
   },
-  [projecthandlePeopleStatusTooltip.toString()]: (state, action) => {
+  [projectHandlePeopleStatusTooltip.toString()]: (state, action) => {
     return {
       ...state,
       ui: {
@@ -36,7 +36,7 @@ module.exports = handleActions({
       }
     };
   },
-  [projecthandlePeopleRoleTooltip.toString()]: (state, action) => {
+  [projectHandlePeopleRoleTooltip.toString()]: (state, action) => {
     return {
       ...state,
       ui: {
@@ -48,7 +48,7 @@ module.exports = handleActions({
       }
     };
   },
-  [projecthandleMemberUpdate.toString()]: (state, action) => {
+  [projectHandleMemberUpdate.toString()]: (state, action) => {
     const {
       parentIndex,
       person,
@@ -77,7 +77,7 @@ module.exports = handleActions({
       ]
     };
   },
-  [projectremoveMember.toString()]: (state, action) => {
+  [projectRemoveMember.toString()]: (state, action) => {
     const {
       parentIndex,
       personIndex,

From 023f7fbe04543505dc0e53125c9b33ed93e5fbe6 Mon Sep 17 00:00:00 2001
From: Alex Windett <windettalex@gmail.com>
Date: Mon, 30 Jan 2017 15:20:37 +0000
Subject: [PATCH 30/32] working on custom dropdown and pulling in platform
 members as datas

---
 frontend/package.json                         |   1 +
 frontend/src/components/people-list/invite.js | 180 +++++++++---------
 frontend/src/mock-state.json                  |   3 +
 3 files changed, 95 insertions(+), 89 deletions(-)

diff --git a/frontend/package.json b/frontend/package.json
index 7120cc5d..a54bf67d 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -43,6 +43,7 @@
     "react-redux": "^5.0.2",
     "react-router": "4.0.0-alpha.6",
     "reduce-reducers": "^0.1.2",
+    "react-select": "^1.0.0-rc.2",
     "redux": "^3.6.0",
     "redux-actions": "^1.2.0",
     "redux-batched-actions": "^0.1.5",
diff --git a/frontend/src/components/people-list/invite.js b/frontend/src/components/people-list/invite.js
index 2771f859..4a49bf62 100644
--- a/frontend/src/components/people-list/invite.js
+++ b/frontend/src/components/people-list/invite.js
@@ -1,107 +1,109 @@
 const React = require('react');
 
-// const PropTypes = require('@root/prop-types');
 const Row = require('@ui/components/row');
 const Column = require('@ui/components/column');
 const Button = require('@ui/components/button');
-// const SelectCustom = require('@ui/components/select-custom');
 
-const Invite = (props) => {
+// TOOD: Require from UI Components - causes issue ATM.
+const Select = require('react-select');
+require('react-select/dist/react-select.css');
 
-  const {
-    // people = [],
-    handleToggle,
-    // platformMembers
-  } = props;
+const Invite = React.createClass({
 
-  // const InputStyle = {
-  //   float: 'left',
-  //   width: '75%'
-  // };
+  propTypes: {
+    // UI: React.PropTypes.object,
+    handleToggle: React.PropTypes.func,
+    // people: React.PropTypes.array,
+    platformMembers: React.PropTypes.array,
+  },
 
-  const AddButtonStyle = {
-    float: 'right',
-    width: '20%'
-  };
+  getInitialState() {
+    return {
+      selectValue: '',
+      members: []
+    };
+  },
 
-  const styleInline = {
-    display: 'inline-block'
-  };
+  getFormattedPlatformMembers() {
+    return this.props.platformMembers.map((m) => ({
+      value: m.email,
+      label: m.name
+    }));
+  },
 
-  // const selectData = [
-  //   {
-  //     value: 'one',
-  //     label: 'One'
-  //   },
-  //   {
-  //     value: 'two',
-  //     label: 'Two'
-  //   },
-  //   {
-  //     value: 'three',
-  //     label: 'Three'
-  //   },
-  //   {
-  //     value: 'four',
-  //     label: 'Four'
-  //   },
-  //   {
-  //     value: 'five',
-  //     label: 'Five'
-  //   },
-  //   {
-  //     value: 'six',
-  //     label: 'Six'
-  //   }
-  // ];
+  render() {
 
-  return (
-    <Row>
-      <Column xs={6}>
-        <p>Search for a person by name or email or enter an email address
-          to invite someone new.</p>
+    const {
+      handleToggle,
+      // UI = {},
+      // people = [],
+    } = this.props;
 
-        <Row>
-          <Column xs={12}>
-            {/*TODO: Fix why there are issues with webpack and nodemodules*/}
-            {/*<SelectCustom*/}
-            {/*multi*/}
-            {/*onChange={function noop() {}}*/}
-            {/*options={selectData}*/}
-            {/*placeholder="Enter an email address or password"*/}
-            {/*style={InputStyle}*/}
-            {/*/>*/}
-            <Button
-              secondary
-              style={AddButtonStyle}
-            >
-              Add
-            </Button>
-          </Column>
-        </Row>
+    const InputStyle = {
+      float: 'left',
+      width: '75%'
+    };
 
-        <Button
-          onClick={handleToggle}
-          secondary
-          style={styleInline}
-        >
-          Cancel
-        </Button>
+    const AddButtonStyle = {
+      float: 'right',
+      width: '20%'
+    };
 
-        <Button
-          style={styleInline}
-        >
-          Send Invitation(s)
-        </Button>
-      </Column>
-    </Row>
-  );
-};
+    const styleInline = {
+      display: 'inline-block'
+    };
 
-Invite.propTypes = {
-  handleToggle: React.PropTypes.func,
-  // orgUI: React.PropTypes.obj,
-  // people: React.PropTypes.arrayOf(PropTypes.person)
-};
+    const selectData = this.getFormattedPlatformMembers();
+
+    const handleSelectChange = (v) => {
+      this.setState({
+        selectValue: v
+      });
+    };
+
+    return (
+      <Row>
+        <Column xs={6}>
+          <p>Search for a person by name or email or enter an email address
+            to invite someone new.</p>
+
+          <Row>
+            <Column xs={12}>
+              {/*TODO: Fix why there are issues with webpack and nodemodules*/}
+              <Select
+
+                onChange={handleSelectChange}
+                options={selectData}
+                placeholder="Enter an email address or password"
+                style={InputStyle}
+                value={this.state.selectValue}
+              />
+              <Button
+                secondary
+                style={AddButtonStyle}
+              >
+                Add
+              </Button>
+            </Column>
+          </Row>
+
+          <Button
+            onClick={handleToggle}
+            secondary
+            style={styleInline}
+          >
+            Cancel
+          </Button>
+
+          <Button
+            style={styleInline}
+          >
+            Send Invitation(s)
+          </Button>
+        </Column>
+      </Row>
+    );
+  },
+});
 
 module.exports = Invite;
\ No newline at end of file
diff --git a/frontend/src/mock-state.json b/frontend/src/mock-state.json
index 55984b50..3808fa1b 100644
--- a/frontend/src/mock-state.json
+++ b/frontend/src/mock-state.json
@@ -535,6 +535,9 @@
   },
   "projects": {
     "ui": {
+      "invite_toggled": true,
+      "member_status_tooltip": false,
+      "member_role_tooltip": false,
       "sections": [
         "services",
         "instances",

From 7920b80426c0ce9965619f0e251eda871450185e Mon Sep 17 00:00:00 2001
From: Alex Windett <windettalex@gmail.com>
Date: Mon, 30 Jan 2017 16:17:04 +0000
Subject: [PATCH 31/32] using alternative syntax for style import

---
 frontend/src/components/people-list/invite.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/people-list/invite.js b/frontend/src/components/people-list/invite.js
index 4a49bf62..4e0be231 100644
--- a/frontend/src/components/people-list/invite.js
+++ b/frontend/src/components/people-list/invite.js
@@ -6,7 +6,9 @@ const Button = require('@ui/components/button');
 
 // TOOD: Require from UI Components - causes issue ATM.
 const Select = require('react-select');
-require('react-select/dist/react-select.css');
+// require('react-select/dist/react-select.css');
+
+require('!style-loader!css-loader!react-select/dist/react-select.css');
 
 const Invite = React.createClass({
 

From 8bbb78132a3b16a845417004912ad914ba614457 Mon Sep 17 00:00:00 2001
From: Alex Windett <windettalex@gmail.com>
Date: Mon, 30 Jan 2017 17:02:02 +0000
Subject: [PATCH 32/32] removing inline of webpack loader to css and excluding
 css from ava test

---
 frontend/src/components/people-list/invite.js | 4 +---
 frontend/test/_hook.js                        | 3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/people-list/invite.js b/frontend/src/components/people-list/invite.js
index 4e0be231..4a49bf62 100644
--- a/frontend/src/components/people-list/invite.js
+++ b/frontend/src/components/people-list/invite.js
@@ -6,9 +6,7 @@ const Button = require('@ui/components/button');
 
 // TOOD: Require from UI Components - causes issue ATM.
 const Select = require('react-select');
-// require('react-select/dist/react-select.css');
-
-require('!style-loader!css-loader!react-select/dist/react-select.css');
+require('react-select/dist/react-select.css');
 
 const Invite = React.createClass({
 
diff --git a/frontend/test/_hook.js b/frontend/test/_hook.js
index 36062abf..8c709b5f 100644
--- a/frontend/test/_hook.js
+++ b/frontend/test/_hook.js
@@ -9,6 +9,7 @@ hook.hook('.woff', () => '');
 hook.hook('.woff2', () => '');
 hook.hook('.ttf', () => '');
 hook.hook('.svg', () => '');
+hook.hook('.css', () => '');
 
 register({
   extensions: ['.js']
@@ -35,4 +36,4 @@ requireHacker.global_hook('inline-svgs', (path) => {
   if(path.match(/!babel-loader!svg-react-loader/)) {
     return `module.exports = ${fakeComponentString}`;
   }
-});
+});
\ No newline at end of file