From 5be7267d257e1a3e4dfd94b10b69aae883036e7b Mon Sep 17 00:00:00 2001 From: Alex Windett Date: Mon, 30 Jan 2017 17:16:52 +0000 Subject: [PATCH 1/8] regenerating yarn.lock files --- frontend/yarn.lock | 186 ++++++++++++++++----------------------------- 1 file changed, 65 insertions(+), 121 deletions(-) diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 1f9a3e7e..04c20cb7 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -1,8 +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-554" - resolved "https://registry.yarnpkg.com/@tomgco/joyent-portal-ui/-/joyent-portal-ui-0.0.1-554.tgz#de27c9ff4b630e32303d333690144bdc08401f85" + version "0.0.1-577" + resolved "https://registry.yarnpkg.com/@tomgco/joyent-portal-ui/-/joyent-portal-ui-0.0.1-577.tgz#f49c9c71a52e36fa8b23b702858222ecce1096be" dependencies: build-array "^1.0.0" chart.js "^2.4.0" @@ -207,10 +207,6 @@ array-find-index@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1" -array-findindex-polyfill@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/array-findindex-polyfill/-/array-findindex-polyfill-0.1.0.tgz#c362665bec7645f22d7a3c3aac9793f71c3622ef" - array-flatten@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" @@ -297,11 +293,11 @@ 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.7.0" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.0.tgz#88992cf04df141e7b8293550f2ee716c565d1cae" + version "6.7.1" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.1.tgz#d14d0842f6ef90741cfb2b1e8152a04e83b39ed2" dependencies: - browserslist "~1.6.0" - caniuse-db "^1.0.30000613" + browserslist "^1.7.1" + caniuse-db "^1.0.30000617" normalize-range "^0.1.2" num2fraction "^1.2.2" postcss "^5.2.11" @@ -1379,12 +1375,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.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.6.0.tgz#85fb7c993540d3fda31c282baf7f5aee698ac9ee" +browserslist@^1.0.1, browserslist@^1.4.0, browserslist@^1.5.2, browserslist@^1.7.1: + version "1.7.1" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.1.tgz#cc9bd193979a2a4b09fdb3df6003fefe48ccefe1" dependencies: - caniuse-db "^1.0.30000613" - electron-to-chromium "^1.2.0" + caniuse-db "^1.0.30000617" + electron-to-chromium "^1.2.1" buf-compare@^1.0.0: version "1.0.1" @@ -1498,9 +1494,9 @@ caniuse-api@^1.5.2: lodash.uniq "^4.3.0" shelljs "^0.7.0" -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" +caniuse-db@^1.0.30000346, caniuse-db@^1.0.30000617: + 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" @@ -1852,9 +1848,9 @@ constants-browserify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" -content-disposition@0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.1.tgz#87476c6a67c8daa87e32e87616df883ba7fb071b" +content-disposition@0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4" content-type-parser@^1.0.1: version "1.0.1" @@ -2081,9 +2077,9 @@ cssesc@^0.1.0: postcss-value-parser "^3.2.3" postcss-zindex "^2.0.1" -csso@~2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/csso/-/csso-2.2.1.tgz#51fbb5347e50e81e6ed51668a48490ae6fe2afe2" +csso@~2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/csso/-/csso-2.3.1.tgz#4f8d91a156f2f1c2aebb40b8fb1b5eb83d94d3b9" dependencies: clap "^1.0.9" source-map "^0.5.3" @@ -2185,9 +2181,9 @@ d3-geo@1.4.0: dependencies: d3-array "1" -d3-hierarchy@1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-1.0.3.tgz#986b4925e81f1e0b4087e9442850f950cf27d338" +d3-hierarchy@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-1.1.1.tgz#6deefccdf19f370dfc77b6538284e953e0e769b3" d3-interpolate@1, d3-interpolate@1.1.3: version "1.1.3" @@ -2286,8 +2282,8 @@ d3-zoom@1.1.1: d3-transition "1" d3@^4.4.1: - version "4.4.4" - resolved "https://registry.yarnpkg.com/d3/-/d3-4.4.4.tgz#15d4e455687bc7a8ff2eeb4b25354a6ba4f24f57" + version "4.5.0" + resolved "https://registry.yarnpkg.com/d3/-/d3-4.5.0.tgz#b68412b84ace3c18a49fee43be1b212b13a23f97" dependencies: d3-array "1.0.2" d3-axis "1.0.4" @@ -2302,7 +2298,7 @@ d3@^4.4.1: d3-force "1.0.4" d3-format "1.0.2" d3-geo "1.4.0" - d3-hierarchy "1.0.3" + d3-hierarchy "1.1.1" d3-interpolate "1.1.3" d3-path "1.0.3" d3-polygon "1.0.2" @@ -2521,7 +2517,7 @@ 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: +electron-to-chromium@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.2.1.tgz#63ac7579a1c5bedb296c8607621f2efc9a54b968" @@ -2747,8 +2743,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" @@ -2886,12 +2882,12 @@ expand-range@^1.8.1: fill-range "^2.1.0" express@^4.13.3: - version "4.14.0" - resolved "https://registry.yarnpkg.com/express/-/express-4.14.0.tgz#c1ee3f42cdc891fb3dc650a8922d51ec847d0d66" + version "4.14.1" + resolved "https://registry.yarnpkg.com/express/-/express-4.14.1.tgz#646c237f766f148c2120aff073817b9e4d7e0d33" dependencies: accepts "~1.3.3" array-flatten "1.1.1" - content-disposition "0.5.1" + content-disposition "0.5.2" content-type "~1.0.2" cookie "0.3.1" cookie-signature "1.0.6" @@ -2900,19 +2896,19 @@ express@^4.13.3: encodeurl "~1.0.1" escape-html "~1.0.3" etag "~1.7.0" - finalhandler "0.5.0" + finalhandler "0.5.1" fresh "0.3.0" merge-descriptors "1.0.1" methods "~1.1.2" on-finished "~2.3.0" parseurl "~1.3.1" path-to-regexp "0.1.7" - proxy-addr "~1.1.2" + proxy-addr "~1.1.3" qs "6.2.0" range-parser "~1.2.0" - send "0.14.1" - serve-static "~1.11.1" - type-is "~1.6.13" + send "0.14.2" + serve-static "~1.11.2" + type-is "~1.6.14" utils-merge "1.0.0" vary "~1.1.0" @@ -3006,14 +3002,14 @@ filled-array@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/filled-array/-/filled-array-1.1.0.tgz#c3c4f6c663b923459a9aa29912d2d031f1507f84" -finalhandler@0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-0.5.0.tgz#e9508abece9b6dba871a6942a1d7911b91911ac7" +finalhandler@0.5.1: + version "0.5.1" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-0.5.1.tgz#2c400d8d4530935bc232549c5fa385ec07de6fcd" dependencies: debug "~2.2.0" escape-html "~1.0.3" on-finished "~2.3.0" - statuses "~1.3.0" + statuses "~1.3.1" unpipe "~1.0.0" find-cache-dir@^0.1.1: @@ -3489,8 +3485,8 @@ ignore-by-default@^1.0.0, ignore-by-default@^1.0.1: resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09" ignore@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.0.tgz#8d88f03c3002a0ac52114db25d2c673b0bf1e435" + version "3.2.2" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.2.tgz#1c51e1ef53bab6ddc15db4d9ac4ec139eceb3410" immutable@^3.8.1: version "3.8.1" @@ -3934,8 +3930,8 @@ istanbul-lib-source-maps@^1.1.0: source-map "^0.5.3" istanbul-reports@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.0.0.tgz#24b4eb2b1d29d50f103b369bd422f6e640aa0777" + version "1.0.1" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.0.1.tgz#9a17176bc4a6cbebdae52b2f15961d52fa623fbc" dependencies: handlebars "^4.0.3" @@ -3966,20 +3962,13 @@ js-tokens@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.0.tgz#a2f2a969caae142fb3cd56228358c89366957bd1" -js-yaml@^3.2.7, js-yaml@^3.5.1: +js-yaml@^3.2.7, js-yaml@^3.5.1, js-yaml@~3.7.0: 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" -js-yaml@~3.6.1: - version "3.6.1" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.6.1.tgz#6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30" - dependencies: - argparse "^1.0.7" - esprima "^2.6.0" - jsbn@~0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.0.tgz#650987da0dd74f4ebf5a11377a2aa2d273e97dfd" @@ -4116,8 +4105,8 @@ load-json-file@^1.0.0, load-json-file@^1.1.0: strip-bom "^2.0.0" loader-runner@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.2.0.tgz#824c1b699c4e7a2b6501b85902d5b862bf45b3fa" + version "2.3.0" + resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2" 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" @@ -4139,10 +4128,6 @@ lodash-es@^4.17.3, lodash-es@^4.2.0, lodash-es@^4.2.1: version "4.17.4" resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.4.tgz#dcc1d7552e150a0640073ba9cb31d70f032950e7" -lodash._getnative@^3.0.0: - version "3.9.1" - resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" - lodash._reinterpolate@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" @@ -4199,14 +4184,6 @@ lodash.indexof@^4.0.5: version "4.0.5" resolved "https://registry.yarnpkg.com/lodash.indexof/-/lodash.indexof-4.0.5.tgz#53714adc2cddd6ed87638f893aa9b6c24e31ef3c" -lodash.isarguments@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a" - -lodash.isarray@^3.0.0: - version "3.0.4" - resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55" - lodash.isempty@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.isempty/-/lodash.isempty-4.4.0.tgz#6f86cbedd8be4ec987be9aaf33c9684db1b31e7e" @@ -4227,14 +4204,6 @@ lodash.isundefined@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/lodash.isundefined/-/lodash.isundefined-3.0.1.tgz#23ef3d9535565203a66cefd5b830f848911afb48" -lodash.keys@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a" - dependencies: - lodash._getnative "^3.0.0" - lodash.isarguments "^3.0.0" - lodash.isarray "^3.0.0" - lodash.map@^4.4.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3" @@ -5419,7 +5388,7 @@ promise@^7.1.1: dependencies: asap "~2.0.3" -proxy-addr@~1.1.2: +proxy-addr@~1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-1.1.3.tgz#dc97502f5722e888467b3fa2297a7b1ff47df074" dependencies: @@ -5746,8 +5715,8 @@ reduce-reducers@^0.1.0, reduce-reducers@^0.1.2: resolved "https://registry.yarnpkg.com/reduce-reducers/-/reduce-reducers-0.1.2.tgz#fa1b4718bc5292a71ddd1e5d839c9bea9770f14b" redux-actions@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/redux-actions/-/redux-actions-1.2.0.tgz#4f421f1aa74c827d5e8abce6c009d5872c4af3e6" + version "1.2.1" + resolved "https://registry.yarnpkg.com/redux-actions/-/redux-actions-1.2.1.tgz#649711d88f49f1dde5bc5a1cea8ceec5b54d9181" dependencies: invariant "^2.2.1" lodash "^4.13.1" @@ -5765,10 +5734,9 @@ redux-batched-actions@^0.1.5: resolved "https://registry.yarnpkg.com/redux-batched-actions/-/redux-batched-actions-0.1.5.tgz#b39b84775f4499a4724f3154b882968073b58bed" redux-form@^6.4.3: - version "6.4.3" - resolved "https://registry.yarnpkg.com/redux-form/-/redux-form-6.4.3.tgz#bd83a77770d9805f7b595a4ff18f00fe4267d3c8" + version "6.5.0" + resolved "https://registry.yarnpkg.com/redux-form/-/redux-form-6.5.0.tgz#8c75ea77018afbabaa02f1389cf6b0e10787c5b8" dependencies: - array-findindex-polyfill "^0.1.0" deep-equal "^1.0.1" es6-error "^4.0.0" hoist-non-react-statics "^1.2.0" @@ -5776,7 +5744,6 @@ redux-form@^6.4.3: is-promise "^2.1.0" lodash "^4.17.3" lodash-es "^4.17.3" - shallowequal "^0.2.2" redux-logger@^2.7.4: version "2.7.4" @@ -6012,24 +5979,6 @@ semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@~5.3.0, "semver@2 || 3 || 4 version "5.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" -send@0.14.1: - version "0.14.1" - resolved "https://registry.yarnpkg.com/send/-/send-0.14.1.tgz#a954984325392f51532a7760760e459598c89f7a" - 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.0" - mime "1.3.4" - ms "0.7.1" - on-finished "~2.3.0" - 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" @@ -6060,7 +6009,7 @@ serve-index@^1.7.2: mime-types "~2.1.11" parseurl "~1.3.1" -serve-static@~1.11.1: +serve-static@~1.11.2: version "1.11.2" resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.11.2.tgz#2cf9889bd4435a320cc36895c9aa57bd662e6ac7" dependencies: @@ -6091,12 +6040,6 @@ sha.js@^2.3.6: dependencies: inherits "^2.0.1" -shallowequal@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-0.2.2.tgz#1e32fd5bcab6ad688a4812cb0cc04efc75c7014e" - dependencies: - lodash.keys "^3.1.2" - shebang-command@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" @@ -6193,8 +6136,8 @@ source-list-map@^0.1.4, source-list-map@~0.1.7: resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106" source-map-support@^0.4.0, source-map-support@^0.4.2: - version "0.4.10" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.10.tgz#d7b19038040a14c0837a18e630a196453952b378" + version "0.4.11" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.11.tgz#647f939978b38535909530885303daf23279f322" dependencies: source-map "^0.5.3" @@ -6284,7 +6227,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: +"statuses@>= 1.3.1 < 2", statuses@~1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e" @@ -6379,8 +6322,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.4.0" - resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-1.4.0.tgz#a094d2ebd1c3227cd591d4d999d48860bf3f76b7" + version "1.4.2" + resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-1.4.2.tgz#4fbb0e30b5adacd5c02ad7f6f1ff869c68fdc9a8" dependencies: buffer "^5.0.2" css-to-react-native "^1.0.6" @@ -6389,6 +6332,7 @@ 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" @@ -6423,13 +6367,13 @@ svg-react-loader@^0.3.7: xml2js "^0.4" svgo@^0.7.0: - version "0.7.1" - resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.1.tgz#287320fed972cb097e72c2bb1685f96fe08f8034" + version "0.7.2" + resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5" dependencies: coa "~1.0.1" colors "~1.1.2" - csso "~2.2.1" - js-yaml "~3.6.1" + csso "~2.3.1" + js-yaml "~3.7.0" mkdirp "~0.5.1" sax "~1.2.1" whet.extend "~0.9.9" @@ -6634,7 +6578,7 @@ type-component@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/type-component/-/type-component-0.0.1.tgz#952a6c81c21efd24d13d811d0c8498cb860e1956" -type-is@~1.6.13: +type-is@~1.6.14: version "1.6.14" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.14.tgz#e219639c17ded1ca0789092dd54a03826b817cb2" dependencies: From c499ac4421d49775f9cab5d85248e11f40f84e68 Mon Sep 17 00:00:00 2001 From: Alex Windett Date: Mon, 30 Jan 2017 17:56:31 +0000 Subject: [PATCH 2/8] adding css loaders --- frontend/package.json | 3 ++- frontend/yarn.lock | 10 ++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index a54bf67d..8baf1065 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -42,8 +42,8 @@ "react-intl-redux": "^0.3.0", "react-redux": "^5.0.2", "react-router": "4.0.0-alpha.6", - "reduce-reducers": "^0.1.2", "react-select": "^1.0.0-rc.2", + "reduce-reducers": "^0.1.2", "redux": "^3.6.0", "redux-actions": "^1.2.0", "redux-batched-actions": "^0.1.5", @@ -53,6 +53,7 @@ "redux-thunk": "^2.1.0", "require-hacker": "^2.1.4", "reselect": "^2.5.4", + "style-loader": "^0.13.1", "styled-components": "^1.3.0", "svg-react-loader": "^0.3.7", "understood": "^1.0.1", diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 04c20cb7..5c31db2f 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -1982,7 +1982,7 @@ css-color-names@0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0" -css-loader@^0.26.1: +css-loader: version "0.26.1" resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.26.1.tgz#2ba7f20131b93597496b3e9bb500785a49cd29ea" dependencies: @@ -4108,7 +4108,7 @@ loader-runner@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2" -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: +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: @@ -6321,6 +6321,12 @@ strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" +style-loader: + version "0.13.1" + resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.13.1.tgz#468280efbc0473023cd3a6cd56e33b5a1d7fc3a9" + dependencies: + loader-utils "^0.2.7" + styled-components@^1.3.0: version "1.4.2" resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-1.4.2.tgz#4fbb0e30b5adacd5c02ad7f6f1ff869c68fdc9a8" From 503a7211bf9c3e7fc33a654233a4228d1c49ffb9 Mon Sep 17 00:00:00 2001 From: Alex Windett Date: Mon, 30 Jan 2017 17:58:02 +0000 Subject: [PATCH 3/8] adding css loaders --- package.json | 3 ++- yarn.lock | 31 +++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 025e1df5..edc66935 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,8 @@ "dependencies": { "husky": "^0.11.9", "license-to-fail": "^2.2.0", - "lodash.findindex": "^4.6.0" + "lodash.findindex": "^4.6.0", + "style-loader": "^0.13.1" }, "devDependencies": { "tap-xunit": "^1.4.0" diff --git a/yarn.lock b/yarn.lock index c71ef327..c2f87d40 100644 --- a/yarn.lock +++ b/yarn.lock @@ -26,6 +26,10 @@ balanced-match@^0.4.1: version "0.4.2" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838" +big.js@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.1.3.tgz#4cada2193652eb3ca9ec8e55c9015669c9806978" + brace-expansion@^1.0.0: version "1.1.6" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.6.tgz#7197d7eaa9b87e648390ea61fc66c84427420df9" @@ -84,6 +88,10 @@ duplexer@~0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1" +emojis-list@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" + 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" @@ -171,6 +179,10 @@ json-parse-helpfulerror@^1.0.2: dependencies: jju "^1.1.0" +json5@^0.5.0: + version "0.5.1" + resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" + license-checker@^7.1.0: version "7.1.1" resolved "https://registry.yarnpkg.com/license-checker/-/license-checker-7.1.1.tgz#b0a3ec47f2469fe3a639e52a1151cd26fc2c2905" @@ -188,6 +200,15 @@ license-to-fail@^2.2.0: dependencies: license-checker "^7.1.0" +loader-utils@^0.2.7: + version "0.2.16" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.16.tgz#f08632066ed8282835dff88dfb52704765adee6d" + dependencies: + big.js "^3.1.3" + emojis-list "^2.0.0" + json5 "^0.5.0" + object-assign "^4.0.1" + lodash.findindex@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash.findindex/-/lodash.findindex-4.6.0.tgz#a3245dee61fb9b6e0624b535125624bb69c11106" @@ -233,6 +254,10 @@ normalize-path@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-1.0.0.tgz#32d0e472f91ff345701c15a8311018d3b0a90379" +object-assign@^4.0.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + once@^1.3.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" @@ -327,6 +352,12 @@ strip-ansi@^0.3.0: dependencies: ansi-regex "^0.2.1" +style-loader: + version "0.13.1" + resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.13.1.tgz#468280efbc0473023cd3a6cd56e33b5a1d7fc3a9" + dependencies: + loader-utils "^0.2.7" + supports-color@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-0.2.0.tgz#d92de2694eb3f67323973d7ae3d8b55b4c22190a" From 876426739d0eb743ebd901ff5242c82054646bda Mon Sep 17 00:00:00 2001 From: Alex Windett Date: Tue, 31 Jan 2017 10:58:26 +0000 Subject: [PATCH 4/8] moving vendor css to frontend, minifying it and changing reference point for storybook --- frontend/static/index.html | 2 +- ui/.storybook/head.html | 2 +- ui/package.json | 2 +- ui/src/vendor/normalize.css | 454 ------------------------------------ 4 files changed, 3 insertions(+), 457 deletions(-) delete mode 100644 ui/src/vendor/normalize.css diff --git a/frontend/static/index.html b/frontend/static/index.html index a6271f18..2050cdd1 100644 --- a/frontend/static/index.html +++ b/frontend/static/index.html @@ -2,7 +2,7 @@ Joyent Frontend - +
diff --git a/ui/.storybook/head.html b/ui/.storybook/head.html index 20c9ece5..f057aef5 100644 --- a/ui/.storybook/head.html +++ b/ui/.storybook/head.html @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/ui/package.json b/ui/package.json index e14aad5b..5a839c2e 100644 --- a/ui/package.json +++ b/ui/package.json @@ -11,7 +11,7 @@ "lint": "make lint", "test": "make test", "build": "make compile", - "storybook": "start-storybook -s ./src/assets,./src/vendor -p 6006", + "storybook": "start-storybook -s ./src/assets,../frontend/static/vendor -p 6006", "build-storybook": "build-storybook" }, "dependencies": { diff --git a/ui/src/vendor/normalize.css b/ui/src/vendor/normalize.css deleted file mode 100644 index 97133c00..00000000 --- a/ui/src/vendor/normalize.css +++ /dev/null @@ -1,454 +0,0 @@ -/************************************************************************** - * NORMALIZE.CSS * - **************************************************************************/ - -article, -aside, -details, -figcaption, -figure, -footer, -header, -main, -menu, -nav, -section, -summary { - display: block; -} - -audio, -canvas, -progress, -video { - display: inline-block; -} - -audio:not([controls]) { - display: none; - height: 0; -} - -progress { - vertical-align: baseline; -} - -template, -[hidden] { - display: none; -} - -a { - background-color: transparent; - -webkit-text-decoration-skip: objects; -} - -a:active, -a:hover { - outline-width: 0; -} - -abbr[title] { - border-bottom: none; - text-decoration: underline; - text-decoration: underline dotted; -} - -b, -strong { - font-weight: inherit; -} - -b, -strong { - font-weight: bolder; -} - -dfn { - font-style: italic; -} - -h1 { - margin: 0.67em 0; -} - -mark { - background-color: #ff0; - color: #000; -} - -small { - font-size: 80%; -} - -sub, -sup { - font-size: 75%; - line-height: 0; - position: relative; - vertical-align: baseline; -} - -sub { - bottom: -0.25em; -} - -sup { - top: -0.5em; -} - -img { - border-style: none; -} - -svg:not(:root) { - overflow: hidden; -} - -code, -kbd, -pre, -samp { - font-family: monospace, monospace; - font-size: 1em; -} - -figure { - margin: 1em calc( (40 / 16) * 1rem); -} - -hr { - -webkit-box-sizing: content-box; - box-sizing: content-box; - height: 0; - overflow: visible; -} - -button, -input, -optgroup, -select, -textarea { - font: inherit; - margin: 0; -} - -optgroup { - font-weight: bold; -} - -button, -input { - overflow: visible ; -} - -button, -select { - text-transform: none; -} - -button, -[type="button"], -[type="reset"], -[type="submit"] { - -webkit-appearance: button; -} - -button::-moz-focus-inner, -[type="button"]::-moz-focus-inner, -[type="reset"]::-moz-focus-inner, -[type="submit"]::-moz-focus-inner { - border-style: none; - padding: 0; -} - -button:-moz-focusring, -[type="button"]:-moz-focusring, -[type="reset"]:-moz-focusring, -[type="submit"]:-moz-focusring { - outline: 1px dotted ButtonText; -} - -fieldset { - border: 1px solid #c0c0c0; - margin: 0 2px; - padding: 0.35em 0.625em 0.75em; -} - -legend { - -webkit-box-sizing: border-box; - box-sizing: border-box; - color: inherit; - display: table; - max-width: 100%; - padding: 0; - white-space: normal; -} - -textarea { - overflow: auto; -} - -[type="checkbox"], -[type="radio"] { - -webkit-box-sizing: border-box; - box-sizing: border-box; - padding: 0; -} - -[type="number"]::-webkit-inner-spin-button, -[type="number"]::-webkit-outer-spin-button { - height: auto; -} - -[type="search"] { - -webkit-appearance: textfield; - outline-offset: -2px; -} - -[type="search"]::-webkit-search-cancel-button, -[type="search"]::-webkit-search-decoration { - -webkit-appearance: none; -} - -::-webkit-input-placeholder { - color: inherit; - opacity: 0.54; -} - -::-webkit-file-upload-button { - -webkit-appearance: button; - font: inherit; -} - -/************************************************************************** - * BOOTSTRAP REBOOT * - **************************************************************************/ - -*, -*::before, -*::after { - box-sizing: inherit; -} - -@-ms-viewport { - width: device-width; -} - -[tabindex="-1"]:focus { - outline: none !important; -} - -/** - * Typography - */ - -h1, -h2, -h3, -h4, -h5, -h6 { - margin-top: 0; - margin-bottom: .5rem; -} - -p { - margin-top: 0; - margin-bottom: 1rem; -} - -abbr[title], -abbr[data-original-title] { - cursor: help; - border-bottom: 1px dotted #FFFFFF; -} - -address { - margin-bottom: 1rem; - font-style: normal; - line-height: inherit; -} - -ol, -ul, -dl { - margin-top: 0; - margin-bottom: 1rem; -} - -ol ol, -ul ul, -ol ul, -ul ol { - margin-bottom: 0; -} - -dt { - font-weight: bold; -} - -dd { - margin-bottom: .5rem; - margin-left: 0; /* Undo browser default */ -} - -blockquote { - margin: 0 0 1rem; -} - -/** - * Links - */ - -a { - color: #364ACD; - text-decoration: underline; - - &:focus, - &:hover { - text-decoration: none; - } - - &:focus { - outline: 5px auto -webkit-focus-ring-color; - outline-offset: 2px; - } -} - -a:not([href]):not([tabindex]) { - color: inherit; - text-decoration: none; - - &:focus, - &:hover { - text-decoration: none; - } - - &:focus { - outline: none; - } -} - -/** - * Code - */ - -pre { - margin-top: 0; - margin-bottom: 1rem; - overflow: auto; -} - -/** - * Figures - */ - -figure { - margin: 0 0 1rem; -} - -/** - * Images - */ - -img { - vertical-align: middle; -} - -[role="button"] { - cursor: pointer; -} - -a, -area, -button, -[role="button"], -input, -label, -select, -summary, -textarea { - touch-action: manipulation; -} - -/** - * Tables - */ - -table { - border-collapse: collapse; - background-color: transparent; -} - -caption { - padding-top: .75rem; - padding-bottom: .75rem; - color: #FFFFFF; - text-align: left; - caption-side: bottom; -} - -th { - text-align: left; -} - -/** - * Forms - */ - -label { - display: inline-block; - margin-bottom: .5rem; -} - -button:focus { - outline: 1px dotted; - outline: 5px auto -webkit-focus-ring-color; -} - -input, -button, -select, -textarea { - line-height: inherit; -} - -input[type="radio"], -input[type="checkbox"] { - - &:disabled { - cursor: disabled; - } -} - -input[type="date"], -input[type="time"], -input[type="datetime-local"], -input[type="month"] { - -webkit-appearance: listbox; -} - -textarea { - resize: vertical; -} - -fieldset { - min-width: 0; - padding: 0; - margin: 0; - border: 0; -} - -legend { - display: block; - width: 100%; - padding: 0; - margin-bottom: .5rem; - font-size: 1.5rem; - line-height: inherit; -} - -input[type="search"] { - -webkit-appearance: none; -} \ No newline at end of file From 2c61693c21d834cc082426333b31c567fa05c749 Mon Sep 17 00:00:00 2001 From: Alex Windett Date: Tue, 31 Jan 2017 11:34:15 +0000 Subject: [PATCH 5/8] implimenting adding member to org and project --- frontend/src/components/people-list/invite.js | 49 +++++++++++++------ frontend/src/containers/org/people.js | 2 + frontend/src/containers/project/people.js | 2 + frontend/src/state/actions.js | 4 ++ frontend/src/state/reducers/orgs.js | 23 +++++++++ frontend/src/state/reducers/projects.js | 23 +++++++++ 6 files changed, 88 insertions(+), 15 deletions(-) diff --git a/frontend/src/components/people-list/invite.js b/frontend/src/components/people-list/invite.js index 4a49bf62..e68a5bbe 100644 --- a/frontend/src/components/people-list/invite.js +++ b/frontend/src/components/people-list/invite.js @@ -11,9 +11,11 @@ require('react-select/dist/react-select.css'); const Invite = React.createClass({ propTypes: { + addMemember: React.PropTypes.func, // UI: React.PropTypes.object, handleToggle: React.PropTypes.func, // people: React.PropTypes.array, + parentIndex: React.PropTypes.number, platformMembers: React.PropTypes.array, }, @@ -31,6 +33,22 @@ const Invite = React.createClass({ })); }, + handleSubmit(e) { + e.preventDefault(); + + const data = { + member: { + name: this.state.selectValue.label, + email: this.state.selectValue.value, + role: 'Unassigned', + status: 'Sent invitation', + }, + parentIndex: this.props.parentIndex, + }; + + this.props.addMemember(data); + }, + render() { const { @@ -69,21 +87,22 @@ const Invite = React.createClass({ - {/*TODO: Fix why there are issues with webpack and nodemodules*/} - + + diff --git a/frontend/src/containers/org/people.js b/frontend/src/containers/org/people.js index 3e486bbb..60f2931c 100644 --- a/frontend/src/containers/org/people.js +++ b/frontend/src/containers/org/people.js @@ -17,6 +17,7 @@ const { } = selectors; const { + addMemberToOrg, orgHandleInviteToggle, orgHandlePeopleRoleTooltip, orgHandlePeopleStatusTooltip, @@ -43,6 +44,7 @@ const mapStateToProps = (state, { }); const mapDispatchToProps = (dispatch) => ({ + addMemember: (member) => dispatch(addMemberToOrg(member)), handleToggle: () => dispatch(orgHandleInviteToggle()), handleStatusTooltip: (id) => dispatch(orgHandlePeopleStatusTooltip(id)), handleRoleTooltip: (id) => dispatch(orgHandlePeopleRoleTooltip(id)), diff --git a/frontend/src/containers/project/people.js b/frontend/src/containers/project/people.js index 2107f5fb..427f0f1e 100644 --- a/frontend/src/containers/project/people.js +++ b/frontend/src/containers/project/people.js @@ -17,6 +17,7 @@ const { } = selectors; const { + addMemberToProject, projectHandleInviteToggle, projectHandlePeopleRoleTooltip, projectHandlePeopleStatusTooltip, @@ -43,6 +44,7 @@ const mapStateToProps = (state, { }); const mapDispatchToProps = (dispatch) => ({ + addMemember: (member) => dispatch(addMemberToProject(member)), handleToggle: () => dispatch(projectHandleInviteToggle()), handleStatusTooltip: (id) => dispatch(projectHandlePeopleStatusTooltip(id)), handleRoleTooltip: (id) => dispatch(projectHandlePeopleRoleTooltip(id)), diff --git a/frontend/src/state/actions.js b/frontend/src/state/actions.js index b58ac68f..3bd3c157 100644 --- a/frontend/src/state/actions.js +++ b/frontend/src/state/actions.js @@ -8,6 +8,8 @@ const { const APP = constantCase(process.env['APP_NAME']); const projectMemberActions = { + addMemberToProject: + createAction(`${APP}/PROJECT_ADD_MEMBER`), projectHandleInviteToggle: createAction(`${APP}/PROJECT_HANDLE_INVITE_MEMBER_TOGGLE`), projectHandlePeopleStatusTooltip: @@ -21,6 +23,8 @@ const projectMemberActions = { }; const orgMemberActions = { + addMemberToOrg: + createAction(`${APP}/ORG_ADD_MEMBER`), orgHandleInviteToggle: createAction(`${APP}/ORG_HANDLE_INVITE_MEMBER_TOGGLE`), orgHandlePeopleStatusTooltip: diff --git a/frontend/src/state/reducers/orgs.js b/frontend/src/state/reducers/orgs.js index 02339525..ef8486c5 100644 --- a/frontend/src/state/reducers/orgs.js +++ b/frontend/src/state/reducers/orgs.js @@ -7,6 +7,7 @@ const { } = ReduxActions; const { + addMemberToOrg, orgHandleInviteToggle, orgHandlePeopleRoleTooltip, orgHandlePeopleStatusTooltip, @@ -15,6 +16,28 @@ const { } = actions; module.exports = handleActions({ + [addMemberToOrg.toString()]: (state, action) => { + + const { + parentIndex, + member, + } = action.payload; + + return { + ...state, + data: [ + ...state.data.slice(0, parentIndex), + { + ...state.data[parentIndex], + members: [ + ...state.data[parentIndex].members, + member + ] + }, + ...state.data.slice(parentIndex + 1), + ] + }; + }, [orgHandleInviteToggle.toString()]: (state, action) => { return { ...state, diff --git a/frontend/src/state/reducers/projects.js b/frontend/src/state/reducers/projects.js index 8eaac127..3126850a 100644 --- a/frontend/src/state/reducers/projects.js +++ b/frontend/src/state/reducers/projects.js @@ -7,6 +7,7 @@ const { } = ReduxActions; const { + addMemberToProject, projectHandleInviteToggle, projectHandlePeopleRoleTooltip, projectHandlePeopleStatusTooltip, @@ -15,6 +16,28 @@ const { } = actions; module.exports = handleActions({ + [addMemberToProject.toString()]: (state, action) => { + + const { + parentIndex, + member, + } = action.payload; + + return { + ...state, + data: [ + ...state.data.slice(0, parentIndex), + { + ...state.data[parentIndex], + members: [ + ...state.data[parentIndex].members, + member + ] + }, + ...state.data.slice(parentIndex + 1), + ] + }; + }, [projectHandleInviteToggle.toString()]: (state, action) => { return { ...state, From 61db98e842a27b4a5a88665f73cee29abe8ab0ac Mon Sep 17 00:00:00 2001 From: Alex Windett Date: Tue, 31 Jan 2017 11:50:37 +0000 Subject: [PATCH 6/8] adding callback to add member dispatch function and allowing for member not on system to be created --- frontend/src/components/people-list/invite.js | 9 +++++++-- frontend/src/containers/org/people.js | 3 ++- frontend/src/containers/project/people.js | 3 ++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/frontend/src/components/people-list/invite.js b/frontend/src/components/people-list/invite.js index e68a5bbe..05a2ad25 100644 --- a/frontend/src/components/people-list/invite.js +++ b/frontend/src/components/people-list/invite.js @@ -46,7 +46,11 @@ const Invite = React.createClass({ parentIndex: this.props.parentIndex, }; - this.props.addMemember(data); + this.props.addMemember(data, () => { + this.setState({ + selectValue: '' + }); + }); }, render() { @@ -88,8 +92,9 @@ const Invite = React.createClass({
-