From 10c1c26d534810432f2452f9747606f07982f374 Mon Sep 17 00:00:00 2001 From: Logan Saether Date: Sun, 23 Dec 2018 19:44:28 -0700 Subject: [PATCH 1/2] added redux, fixed topbar --- package.json | 5 + src/App.jsx | 49 +-- src/actions.js | 6 + src/components/AppContainer/Topbar/index.jsx | 8 +- .../DashboardInterface/Events/Events.jsx | 4 +- src/index.js | 12 +- src/reducers.js | 24 ++ src/store.js | 31 ++ yarn.lock | 299 +++++++++++------- 9 files changed, 295 insertions(+), 143 deletions(-) create mode 100644 src/actions.js create mode 100644 src/reducers.js create mode 100644 src/store.js diff --git a/package.json b/package.json index 1f2de9a..6e50e08 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "@material-ui/core": "3.7.1", "@material-ui/icons": "3.0.1", "axios": "^0.18.0", + "connected-react-router": "^6.0.0", "d3": "4.10.0", "d3-scale": "2.1.2", "downshift": "3.1.8", @@ -17,9 +18,11 @@ "eth-sig-util": "^2.1.0", "ethereum-blockies-base64": "1.0.2", "ganache-cli": "6.2.5", + "history": "^4.7.2", "notistack": "0.4.1", "react": "^16.6.0", "react-dom": "^16.6.3", + "react-redux": "^6.0.0", "react-router-dom": "4.3.1", "react-router-hash-link": "1.2.1", "react-scripts": "2.1.2", @@ -27,6 +30,8 @@ "react-stepzilla": "^4.8.0", "react-text-loop": "1.1.0", "recharts": "1.4.2", + "redux": "^4.0.1", + "redux-saga": "^0.16.2", "styled-components": "4.1.3", "web3": "1.0.0-beta.37" }, diff --git a/src/App.jsx b/src/App.jsx index c9496a4..4b3ee1a 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -11,15 +11,14 @@ import { kombatTheme, slateTheme } from './themes'; /// Notistack import { SnackbarProvider } from 'notistack'; +// Router +import { ConnectedRouter } from 'connected-react-router'; + export default class App extends Component { state = { lights: false, }; - componentDidMount() { - // window.addEventListener - } - toggleLights = () => { this.setState({ lights: !this.state.lights }); }; @@ -34,26 +33,28 @@ export default class App extends Component { }} > - - - - - ( - - )} - /> - - - - - + + + + + + ( + + )} + /> + + + + + + ); diff --git a/src/actions.js b/src/actions.js new file mode 100644 index 0000000..017c3ce --- /dev/null +++ b/src/actions.js @@ -0,0 +1,6 @@ +export const CACHE_BLOCK = 'CACHE_BLOCK'; + +export const cacheBlock = block => ({ + type: CACHE_BLOCK, + block, +}); diff --git a/src/components/AppContainer/Topbar/index.jsx b/src/components/AppContainer/Topbar/index.jsx index 0e757ab..2506c16 100644 --- a/src/components/AppContainer/Topbar/index.jsx +++ b/src/components/AppContainer/Topbar/index.jsx @@ -8,7 +8,7 @@ import { withTheme } from '@material-ui/core/styles'; import Web3Panel from './Web3StatusBar'; import Logo from '../../../assets/logo.png'; -// import WhiteLogo from '../../../assets/logo_white.png'; +import WhiteLogo from '../../../assets/logo_white.png'; const Bar = styled.div` position: static; @@ -18,14 +18,14 @@ const Bar = styled.div` padding: 0 4% 0 4%; display: flex; flex-flow: row wrap; - background: #c3c3c3; + background: ${props => props.bg}; `; const Topbar = props => ( - + Convergent {row.returnValues.who && row.returnValues.who} {row.returnValues.message ? row.returnValues.message : ''} - + {row.returnValues.amount ? removeDecimals(row.returnValues.amount) : ''} - + {row.returnValues.totalCost ? removeDecimals(row.returnValues.totalCost) : ''} diff --git a/src/index.js b/src/index.js index add4e81..7fa3169 100644 --- a/src/index.js +++ b/src/index.js @@ -1,12 +1,16 @@ /* eslint-disable */ import React from 'react'; import ReactDOM from 'react-dom'; -import { HashRouter } from 'react-router-dom'; +// import { HashRouter } from 'react-router-dom'; /// Drizzle import { Drizzle, generateStore } from 'drizzle'; import { DrizzleContext } from 'drizzle-react'; +/// Redux +import { Provider } from 'react-redux'; +import { history, store } from './store'; + /// Styles import './styles/index.css'; @@ -26,9 +30,9 @@ const drizzle = new Drizzle(options, drizzleStore); ReactDOM.render( - - - + + + , document.getElementById('root') ); diff --git a/src/reducers.js b/src/reducers.js new file mode 100644 index 0000000..b61f0e5 --- /dev/null +++ b/src/reducers.js @@ -0,0 +1,24 @@ +import { combineReducers } from 'redux'; +import { drizzleReducers } from 'drizzle'; +import { connectRouter } from 'connected-react-router'; + +// import { CACHE_BLOCK } from './actions'; + +// const cacheBlock = (state = [], action) => { +// switch (action.type) { +// case CACHE_BLOCK: +// return [ +// ...state, +// action.block.event, +// ]; +// default: +// return state; +// }; +// }; + +export default history => + combineReducers({ + router: connectRouter(history), + ...drizzleReducers, + // cacheBlock, + }); diff --git a/src/store.js b/src/store.js new file mode 100644 index 0000000..50d2e2d --- /dev/null +++ b/src/store.js @@ -0,0 +1,31 @@ +import { routerMiddleware } from 'connected-react-router'; +import { drizzleSagas } from 'drizzle'; +import { createHashHistory } from 'history'; +import { applyMiddleware, compose, createStore } from 'redux'; +import createSagaMiddleware from 'redux-saga'; +import { all, fork } from 'redux-saga/effects'; +import rootReducer from './reducers'; + +function* rootSaga() { + yield all(drizzleSagas.map(saga => fork(saga))); +} + +function configureStore(initialState = {}, history) { + const sagaMiddleware = createSagaMiddleware(); + + const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose; + + const store = createStore( + rootReducer(history), + initialState, + composeEnhancers(applyMiddleware(routerMiddleware(history), sagaMiddleware)) + ); + + sagaMiddleware.run(rootSaga); + return store; +} + +const history = createHashHistory(); +const store = configureStore({}, history); + +export { store, history }; diff --git a/yarn.lock b/yarn.lock index 240bd81..6fbb7f6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9,21 +9,21 @@ dependencies: "@babel/highlight" "^7.0.0" -"@babel/core@7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.1.0.tgz#08958f1371179f62df6966d8a614003d11faeb04" - integrity sha512-9EWmD0cQAbcXSc+31RIoYgEHx3KQ2CCSMDBhnXrShWvo45TMw+3/55KVxlhkG53kw9tl87DqINgHDgFVhZJV/Q== +"@babel/core@7.1.6": + version "7.1.6" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.1.6.tgz#3733cbee4317429bc87c62b29cf8587dba7baeb3" + integrity sha512-Hz6PJT6e44iUNpAn8AoyAs6B3bl60g7MJQaI0rZEar6ECzh6+srYO1xlIdssio34mPaUtAb1y+XlkkSJzok3yw== dependencies: "@babel/code-frame" "^7.0.0" - "@babel/generator" "^7.0.0" - "@babel/helpers" "^7.1.0" - "@babel/parser" "^7.1.0" - "@babel/template" "^7.1.0" - "@babel/traverse" "^7.1.0" - "@babel/types" "^7.0.0" + "@babel/generator" "^7.1.6" + "@babel/helpers" "^7.1.5" + "@babel/parser" "^7.1.6" + "@babel/template" "^7.1.2" + "@babel/traverse" "^7.1.6" + "@babel/types" "^7.1.6" convert-source-map "^1.1.0" - debug "^3.1.0" - json5 "^0.5.0" + debug "^4.1.0" + json5 "^2.1.0" lodash "^4.17.10" resolve "^1.3.2" semver "^5.4.1" @@ -49,7 +49,7 @@ semver "^5.4.1" source-map "^0.5.0" -"@babel/generator@^7.0.0", "@babel/generator@^7.2.2": +"@babel/generator@^7.1.6", "@babel/generator@^7.2.2": version "7.2.2" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.2.2.tgz#18c816c70962640eab42fe8cae5f3947a5c65ccc" integrity sha512-I4o675J/iS8k+P38dvJ3IBGqObLXyQLTxtrR4u9cSUJOURvafeEWb/pFMOTwtNrmq73mJzyF6ueTbO1BtN0Zeg== @@ -223,7 +223,7 @@ "@babel/traverse" "^7.1.0" "@babel/types" "^7.2.0" -"@babel/helpers@^7.1.0", "@babel/helpers@^7.2.0": +"@babel/helpers@^7.1.5", "@babel/helpers@^7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.2.0.tgz#8335f3140f3144270dc63c4732a4f8b0a50b7a21" integrity sha512-Fr07N+ea0dMcMN8nFpuK6dUIT7/ivt9yKQdEEnjVS83tG2pHwPi03gYmk/tyuwONnZ+sY+GFFPlWGgCtW1hF9A== @@ -241,11 +241,16 @@ esutils "^2.0.2" js-tokens "^4.0.0" -"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.2.2": +"@babel/parser@^7.0.0", "@babel/parser@^7.2.2": version "7.2.2" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.2.2.tgz#37ebdbc88a2e1ebc6c8dd3d35ea9436e3e39e477" integrity sha512-UNTmQ5cSLDeBGBl+s7JeowkqIHgmFAGBnLDdIzFmUNSuS5JF0XBcN59jsh/vJO/YjfsBqMxhMjoFGmNExmf0FA== +"@babel/parser@^7.1.6", "@babel/parser@^7.2.3": + version "7.2.3" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.2.3.tgz#32f5df65744b70888d17872ec106b02434ba1489" + integrity sha512-0LyEcVlfCoFmci8mXx8A5oIkpkOgyo8dRHtxBnK9RRBwxO2+JZPNsqtVEZQ7mJFPxnXF9lfmU24mHOPI0qnlkA== + "@babel/plugin-proposal-async-generator-functions@^7.1.0", "@babel/plugin-proposal-async-generator-functions@^7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz#b289b306669dce4ad20b0252889a15768c9d417e" @@ -267,10 +272,10 @@ "@babel/helper-replace-supers" "^7.1.0" "@babel/plugin-syntax-class-properties" "^7.0.0" -"@babel/plugin-proposal-decorators@7.1.2": - version "7.1.2" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.1.2.tgz#79829bd75fced6581ec6c7ab1930e8d738e892e7" - integrity sha512-YooynBO6PmBgHvAd0fl5e5Tq/a0pEC6RqF62ouafme8FzdIVH41Mz/u1dn8fFVm4jzEJ+g/MsOxouwybJPuP8Q== +"@babel/plugin-proposal-decorators@7.1.6": + version "7.1.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.1.6.tgz#460c31edbd01953efe45d491583b3ec31661d689" + integrity sha512-U42f8KhUbtlhUDyV/wK4Rq/wWh8vWyttYABckG/v0vVnMPvayOewZC/83CbVdmyP+UhEqI368FEQ7hHMfhBpQA== dependencies: "@babel/helper-plugin-utils" "^7.0.0" "@babel/helper-replace-supers" "^7.1.0" @@ -411,7 +416,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-block-scoping@^7.0.0", "@babel/plugin-transform-block-scoping@^7.2.0": +"@babel/plugin-transform-block-scoping@^7.1.5", "@babel/plugin-transform-block-scoping@^7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.2.0.tgz#f17c49d91eedbcdf5dd50597d16f5f2f770132d4" integrity sha512-vDTgf19ZEV6mx35yiPJe4fS02mPQUUcBNwWQSZFXSzTSbsJFQvHt7DqyS3LK8oOWALFOsJ+8bbqBgkirZteD5Q== @@ -454,10 +459,10 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-destructuring@7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.0.0.tgz#68e911e1935dda2f06b6ccbbf184ffb024e9d43a" - integrity sha512-Fr2GtF8YJSXGTyFPakPFB4ODaEKGU04bPsAllAIabwoXdFrPxL0LVXQX5dQWoxOjjgozarJcC9eWGsj0fD6Zsg== +"@babel/plugin-transform-destructuring@7.1.3": + version "7.1.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.1.3.tgz#e69ff50ca01fac6cb72863c544e516c2b193012f" + integrity sha512-Mb9M4DGIOspH1ExHOUnn2UUXFOyVTiX84fXCd+6B5iWrQg/QMeeRmSwpZ9lnjYLSXtZwiw80ytVMr3zue0ucYw== dependencies: "@babel/helper-plugin-utils" "^7.0.0" @@ -492,10 +497,10 @@ "@babel/helper-builder-binary-assignment-operator-visitor" "^7.1.0" "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-flow-strip-types@7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.0.0.tgz#c40ced34c2783985d90d9f9ac77a13e6fb396a01" - integrity sha512-WhXUNb4It5a19RsgKKbQPrjmy4yWOY1KynpEbNw7bnd1QTcrT/EIl3MJvnGgpgvrKyKbqX7nUNOJfkpLOnoDKA== +"@babel/plugin-transform-flow-strip-types@7.1.6": + version "7.1.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.1.6.tgz#4b7be62604d39e63cfe23b1d00d63e9fb7e763ba" + integrity sha512-0tyFAAjJmnRlr8MVJV39ASn1hv+PbdVP71hf7aAseqLfQ0o9QXk9htbMbq7/ZYXnUIp6gDw0lUUP0+PQMbbtmg== dependencies: "@babel/helper-plugin-utils" "^7.0.0" "@babel/plugin-syntax-flow" "^7.0.0" @@ -705,10 +710,10 @@ "@babel/helper-regex" "^7.0.0" regexpu-core "^4.1.3" -"@babel/preset-env@7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.1.0.tgz#e67ea5b0441cfeab1d6f41e9b5c79798800e8d11" - integrity sha512-ZLVSynfAoDHB/34A17/JCZbyrzbQj59QC1Anyueb4Bwjh373nVPq5/HMph0z+tCmcDjXDe+DlKQq9ywQuvWrQg== +"@babel/preset-env@7.1.6": + version "7.1.6" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.1.6.tgz#a0bf4b96b6bfcf6e000afc5b72b4abe7cc13ae97" + integrity sha512-YIBfpJNQMBkb6MCkjz/A9J76SNCSuGVamOVBgoUkLzpJD/z8ghHi9I42LQ4pulVX68N/MmImz6ZTixt7Azgexw== dependencies: "@babel/helper-module-imports" "^7.0.0" "@babel/helper-plugin-utils" "^7.0.0" @@ -723,7 +728,7 @@ "@babel/plugin-transform-arrow-functions" "^7.0.0" "@babel/plugin-transform-async-to-generator" "^7.1.0" "@babel/plugin-transform-block-scoped-functions" "^7.0.0" - "@babel/plugin-transform-block-scoping" "^7.0.0" + "@babel/plugin-transform-block-scoping" "^7.1.5" "@babel/plugin-transform-classes" "^7.1.0" "@babel/plugin-transform-computed-properties" "^7.0.0" "@babel/plugin-transform-destructuring" "^7.0.0" @@ -825,7 +830,14 @@ dependencies: regenerator-runtime "^0.12.0" -"@babel/runtime@7.2.0", "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2": +"@babel/runtime@7.1.5": + version "7.1.5" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.1.5.tgz#4170907641cf1f61508f563ece3725150cc6fe39" + integrity sha512-xKnPpXG/pvK1B90JkwwxSGii90rQGKtzcMt2gI5G6+M0REXaq6rOHsGC2ay6/d0Uje7zzvSzjEzfR3ENhFlrfA== + dependencies: + regenerator-runtime "^0.12.0" + +"@babel/runtime@7.2.0", "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.2.0.tgz#b03e42eeddf5898e00646e4c840fa07ba8dcad7f" integrity sha512-oouEibCbHMVdZSDlJBO6bZmID/zA/G/Qx3H1d3rSNPTD+L8UNKvCat7aKWSJ74zYbm5zWGh0GQN0hKj8zYFTCg== @@ -856,7 +868,22 @@ globals "^11.1.0" lodash "^4.17.10" -"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.2.2": +"@babel/traverse@^7.1.6": + version "7.2.3" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.2.3.tgz#7ff50cefa9c7c0bd2d81231fdac122f3957748d8" + integrity sha512-Z31oUD/fJvEWVR0lNZtfgvVt512ForCTNKYcJBGbPb1QZfve4WGH8Wsy7+Mev33/45fhP/hwQtvgusNdcCMgSw== + dependencies: + "@babel/code-frame" "^7.0.0" + "@babel/generator" "^7.2.2" + "@babel/helper-function-name" "^7.1.0" + "@babel/helper-split-export-declaration" "^7.0.0" + "@babel/parser" "^7.2.3" + "@babel/types" "^7.2.2" + debug "^4.1.0" + globals "^11.1.0" + lodash "^4.17.10" + +"@babel/types@^7.0.0", "@babel/types@^7.1.6", "@babel/types@^7.2.0", "@babel/types@^7.2.2": version "7.2.2" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.2.2.tgz#44e10fc24e33af524488b716cdaee5360ea8ed1e" integrity sha512-fKCuD6UFUMkR541eDWL+2ih/xFZBXPOg/7EQFeTluMDebfqR4jrpaCjLhkWlQS4hT6nRa2PMEgXKbRB5/H2fpg== @@ -1631,13 +1658,13 @@ attr-accept@^1.1.3: dependencies: core-js "^2.5.0" -autoprefixer@^9.1.5: - version "9.4.2" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.2.tgz#0234d20900684fc4bfb67926493deb68384067f5" - integrity sha512-tYQYJvZvqlJCzF+BLC//uAcdT/Yy4ik9bwZRXr/EehUJ/bjjpTthsWTy8dpowdoIE1sLCDf1ch4Eb2cOSzZC9w== +autoprefixer@^9.3.1: + version "9.4.3" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.3.tgz#c97384a8fd80477b78049163a91bbc725d9c41d9" + integrity sha512-/XSnzDepRkAU//xLcXA/lUWxpsBuw0WiriAHOqnxkuCtzLhaz+fL4it4gp20BQ8n5SyLzK/FOc7A0+u/rti2FQ== dependencies: - browserslist "^4.3.5" - caniuse-lite "^1.0.30000914" + browserslist "^4.3.6" + caniuse-lite "^1.0.30000921" normalize-range "^0.1.2" num2fraction "^1.2.2" postcss "^7.0.6" @@ -1915,10 +1942,10 @@ babel-plugin-macros@2.4.2: cosmiconfig "^5.0.5" resolve "^1.8.1" -babel-plugin-named-asset-import@^0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.2.3.tgz#b40ed50a848e7bb0a2a7e34d990d1f9d46fe9b38" - integrity sha512-9mx2Z9M4EGbutvXxoLV7aUBCY6ps3sqLFl094FeA2tFQzQffIh0XSsmwwQRxiSfpg3rnb5x/o46qRLxS/OzFTg== +babel-plugin-named-asset-import@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.0.tgz#3289ec622d19cd1cc84df8d784b41f1b048bd524" + integrity sha512-to6Shd/r8fMRRg/MaOhDNfqpuXfjlQx3ypWDG6jh4ESCVZDJCgdgIalZbrnVlBPGgH/QeyHMjnGb2W+JJiy+NQ== "babel-plugin-styled-components@>= 1": version "1.9.4" @@ -2170,10 +2197,10 @@ babel-plugin-transform-object-rest-spread@^6.26.0: babel-plugin-syntax-object-rest-spread "^6.8.0" babel-runtime "^6.26.0" -babel-plugin-transform-react-remove-prop-types@0.4.18: - version "0.4.18" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.18.tgz#85ff79d66047b34288c6f7cc986b8854ab384f8c" - integrity sha512-azed2nHo8vmOy7EY26KH+om5oOcWRs0r1U8wOmhwta+SBMMnmJ4H6yaBZRCcHBtMeWp9AVhvBTL/lpR1kEx+Xw== +babel-plugin-transform-react-remove-prop-types@0.4.20: + version "0.4.20" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.20.tgz#688bdea1e27ea0023775dea817fa2d3f8df8802b" + integrity sha512-bWQ8e7LsgdFpyHU/RabjDAjVhL7KLAJXEt0nb0LANFje8YAGA8RlZv88a72aCswOxELWULkYuJqfFoKgs58Tng== babel-plugin-transform-regenerator@^6.22.0: version "6.26.0" @@ -2234,30 +2261,30 @@ babel-preset-jest@^23.2.0: babel-plugin-jest-hoist "^23.2.0" babel-plugin-syntax-object-rest-spread "^6.13.0" -babel-preset-react-app@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-6.1.0.tgz#477ae7f8557eb99ce26d179530127913b733310d" - integrity sha512-8PJ4N+acfYsjhDK4gMWkqJMVRMjDKb93D+nz7lWlNe73Jcv38FNu37i5K/dVQnFDdRYHbe1SjII+Y0mCgink9A== +babel-preset-react-app@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-7.0.0.tgz#86bf71e43cb8d36e40da69f8b4ad5d6f945dec93" + integrity sha512-LQKCB3xxdhAlRbk6IIZdO4ry1yA8gKGVV4phjOIgCEQr3oyaLPXf2j+lfD0zljOE2wkN2axRGOLTzdUPzVDO4w== dependencies: - "@babel/core" "7.1.0" + "@babel/core" "7.1.6" "@babel/plugin-proposal-class-properties" "7.1.0" - "@babel/plugin-proposal-decorators" "7.1.2" + "@babel/plugin-proposal-decorators" "7.1.6" "@babel/plugin-proposal-object-rest-spread" "7.0.0" "@babel/plugin-syntax-dynamic-import" "7.0.0" "@babel/plugin-transform-classes" "7.1.0" - "@babel/plugin-transform-destructuring" "7.0.0" - "@babel/plugin-transform-flow-strip-types" "7.0.0" + "@babel/plugin-transform-destructuring" "7.1.3" + "@babel/plugin-transform-flow-strip-types" "7.1.6" "@babel/plugin-transform-react-constant-elements" "7.0.0" "@babel/plugin-transform-react-display-name" "7.0.0" "@babel/plugin-transform-runtime" "7.1.0" - "@babel/preset-env" "7.1.0" + "@babel/preset-env" "7.1.6" "@babel/preset-react" "7.0.0" "@babel/preset-typescript" "7.1.0" - "@babel/runtime" "7.0.0" + "@babel/runtime" "7.1.5" babel-loader "8.0.4" babel-plugin-dynamic-import-node "2.2.0" babel-plugin-macros "2.4.2" - babel-plugin-transform-react-remove-prop-types "0.4.18" + babel-plugin-transform-react-remove-prop-types "0.4.20" babel-register@^6.26.0: version "6.26.0" @@ -2687,7 +2714,7 @@ browserslist@^3.2.6: caniuse-lite "^1.0.30000844" electron-to-chromium "^1.3.47" -browserslist@^4.0.0, browserslist@^4.1.0, browserslist@^4.1.1, browserslist@^4.3.4, browserslist@^4.3.5: +browserslist@^4.0.0, browserslist@^4.1.0, browserslist@^4.3.4, browserslist@^4.3.6: version "4.3.6" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.3.6.tgz#0f9d9081afc66b36f477c6bdf3813f784f42396a" integrity sha512-kMGKs4BTzRWviZ8yru18xBpx+CyHG9eqgRbj9XbE3IMgtczf4aiA0Y1YCpVdvUieKGZ03kolSPXqTcscBCb9qw== @@ -2926,11 +2953,16 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000884, caniuse-lite@^1.0.30000887, caniuse-lite@^1.0.30000914, caniuse-lite@^1.0.30000921: +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000884, caniuse-lite@^1.0.30000921: version "1.0.30000921" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000921.tgz#7a607c1623444b22351d834e093aedda3c42fbe8" integrity sha512-Bu09ciy0lMWLgpYC77I0YGuI8eFRBPPzaSOYJK1jTI64txCphYCqnWbxJYjHABYVt/TYX/p3jNjLBR87u1Bfpw== +caniuse-lite@^1.0.30000905: + version "1.0.30000923" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000923.tgz#148f9bda508024b5ce957b463ae2e8302b451bb2" + integrity sha512-j5ur7eeluOFjjPUkydtXP4KFAsmH3XaQNch5tvWSO+dLHYt5PE+VgJZLWtbVOodfWij6m6zas28T4gB/cLYq1w== + capture-exit@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f" @@ -3299,6 +3331,14 @@ connect-history-api-fallback@^1.3.0: resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz#b06873934bc5e344fef611a196a6faae0aee015a" integrity sha1-sGhzk0vF40T+9hGhlqb6rgruAVo= +connected-react-router@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/connected-react-router/-/connected-react-router-6.0.0.tgz#cb7ccbbc5ed353832ecd91d68289c916e8aba734" + integrity sha512-TarPqf2wY3cz993Mw3eBg2U12M5OmaGwKzJsinvRQh61nKb8WMUvimyhu6u2HeWS8625PHFXjNOU0OIAMWj/bQ== + dependencies: + immutable "^3.8.1" + seamless-immutable "^7.1.3" + console-browserify@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10" @@ -3611,10 +3651,10 @@ css-what@2.1, css-what@^2.1.2: resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.2.tgz#c0876d9d0480927d7d4920dcd72af3595649554d" integrity sha512-wan8dMWQ0GUeF7DGEPVjhHemVW/vy6xUYmFzRY8RYqgA0JtXC9rJmbScBjqSu6dg9q0lwPQy6ZAmJVr3PPTvqQ== -cssdb@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-3.2.1.tgz#65e7dc90be476ce5b6e567b19f3bd73a8c66bcb5" - integrity sha512-I0IS8zvxED8sQtFZnV7M+AkhWqTgp1HIyfMQJBbjdn4GgurBt7NCZaDgrWiAN2kNJN34mhF1p50aZIMQu290mA== +cssdb@^4.1.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-4.3.0.tgz#2e1229900616f80c66ff2d568ea2b4f92db1c78c" + integrity sha512-VHPES/+c9s+I0ryNj+PXvp84nz+ms843z/efpaEINwP/QfGsINL3gpLp5qjapzDNzNzbXxur8uxKxSXImrg4ag== cssesc@^0.1.0: version "0.1.0" @@ -4740,10 +4780,10 @@ escodegen@^1.11.0, escodegen@^1.9.1: optionalDependencies: source-map "~0.6.1" -eslint-config-react-app@^3.0.5: - version "3.0.5" - resolved "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-3.0.5.tgz#d199088ab486d7ccc56d40dedcb1482b01934fb2" - integrity sha512-GjPuy0pbaCkl4+9wm8p0xpl/x/AGFy3wKuju3WNVefDNDDu8T6Ap1OFMDDJbYnOAI+4jfyAE3VT06lAYcJVpdw== +eslint-config-react-app@^3.0.6: + version "3.0.6" + resolved "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-3.0.6.tgz#addcae1359235941e95f3c96970b7ac8552e1130" + integrity sha512-VL5rA1EBZv7f9toc9x71or7nr4jRmwCH4V9JKB9DFVaTLOLI9+vjWLgQLjMu3xR9iUT80dty86RbCfNaKyrFFg== dependencies: confusing-browser-globals "^1.0.5" @@ -6586,6 +6626,11 @@ immer@1.7.2: resolved "https://registry.yarnpkg.com/immer/-/immer-1.7.2.tgz#a51e9723c50b27e132f6566facbec1c85fc69547" integrity sha512-4Urocwu9+XLDJw4Tc6ZCg7APVjjLInCFvO4TwGsAYV5zT6YYSor14dsZR0+0tHlDIN92cFUOq+i7fC00G5vTxA== +immutable@^3.8.1: + version "3.8.2" + resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3" + integrity sha1-wkOZUUVbs5kT2vKBN28VMOEErfM= + import-cwd@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9" @@ -9937,6 +9982,15 @@ postcss-color-functional-notation@^2.0.1: postcss "^7.0.2" postcss-values-parser "^2.0.0" +postcss-color-gray@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/postcss-color-gray/-/postcss-color-gray-5.0.0.tgz#532a31eb909f8da898ceffe296fdc1f864be8547" + integrity sha512-q6BuRnAGKM/ZRpfDascZlIZPjvwsRye7UDNalqVz3s7GDxMtqPY6+Q871liNxsonUw8oC61OG+PSaysYpl1bnw== + dependencies: + "@csstools/convert-colors" "^1.4.0" + postcss "^7.0.5" + postcss-values-parser "^2.0.0" + postcss-color-hex-alpha@^5.0.2: version "5.0.2" resolved "https://registry.yarnpkg.com/postcss-color-hex-alpha/-/postcss-color-hex-alpha-5.0.2.tgz#e9b1886bb038daed33f6394168c210b40bb4fdb6" @@ -9981,14 +10035,14 @@ postcss-convert-values@^4.0.1: postcss "^7.0.0" postcss-value-parser "^3.0.0" -postcss-custom-media@^7.0.4: +postcss-custom-media@^7.0.7: version "7.0.7" resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-7.0.7.tgz#bbc698ed3089ded61aad0f5bfb1fb48bf6969e73" integrity sha512-bWPCdZKdH60wKOTG4HKEgxWnZVjAIVNOJDvi3lkuTa90xo/K0YHa2ZnlKLC5e2qF8qCcMQXt0yzQITBp8d0OFA== dependencies: postcss "^7.0.5" -postcss-custom-properties@^8.0.5: +postcss-custom-properties@^8.0.9: version "8.0.9" resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-8.0.9.tgz#8943870528a6eae4c8e8d285b6ccc9fd1f97e69c" integrity sha512-/Lbn5GP2JkKhgUO2elMs4NnbUJcvHX4AaF5nuJDaNkd2chYW1KA5qtOGGgdkBEWcXtKSQfHXzT7C6grEVyb13w== @@ -10040,6 +10094,14 @@ postcss-discard-overridden@^4.0.1: dependencies: postcss "^7.0.0" +postcss-double-position-gradients@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-1.0.0.tgz#fc927d52fddc896cb3a2812ebc5df147e110522e" + integrity sha512-G+nV8EnQq25fOI8CH/B6krEohGWnF5+3A6H/+JEpOncu5dCnkS1QQ6+ct3Jkaepw1NGVqqOZH6lqrm244mCftA== + dependencies: + postcss "^7.0.5" + postcss-values-parser "^2.0.0" + postcss-env-function@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/postcss-env-function/-/postcss-env-function-2.0.2.tgz#0f3e3d3c57f094a92c2baf4b6241f0b0da5365d7" @@ -10352,25 +10414,27 @@ postcss-place@^4.0.1: postcss "^7.0.2" postcss-values-parser "^2.0.0" -postcss-preset-env@6.0.6: - version "6.0.6" - resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-6.0.6.tgz#f728b9a43bf01c24eb06efeeff59de0b31ee1105" - integrity sha512-W1Wtqngl7BMe4s9o76odTaVs4HXVLhOHD+L5Ez+7x15yiA+98W/WVO6IPlC1q9BIkgAckRtUFmEDr0sNufXZIQ== +postcss-preset-env@6.3.1: + version "6.3.1" + resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-6.3.1.tgz#bd0f6353c44f41d0be61da278af33a6559e0aa6a" + integrity sha512-erl+OcCTr1+jsfJNQjBweyb8Y1s6KngUBwoqJnRXO197PmEE6u9HxZfnpKkTQqasxZljxNHzXR5hMb7MdD0Zdw== dependencies: - autoprefixer "^9.1.5" - browserslist "^4.1.1" - caniuse-lite "^1.0.30000887" - cssdb "^3.2.1" - postcss "^7.0.2" + autoprefixer "^9.3.1" + browserslist "^4.3.4" + caniuse-lite "^1.0.30000905" + cssdb "^4.1.0" + postcss "^7.0.5" postcss-attribute-case-insensitive "^4.0.0" postcss-color-functional-notation "^2.0.1" + postcss-color-gray "^5.0.0" postcss-color-hex-alpha "^5.0.2" postcss-color-mod-function "^3.0.3" postcss-color-rebeccapurple "^4.0.1" - postcss-custom-media "^7.0.4" - postcss-custom-properties "^8.0.5" + postcss-custom-media "^7.0.7" + postcss-custom-properties "^8.0.9" postcss-custom-selectors "^5.1.2" postcss-dir-pseudo-class "^5.0.0" + postcss-double-position-gradients "^1.0.0" postcss-env-function "^2.0.2" postcss-focus-visible "^4.0.0" postcss-focus-within "^3.0.0" @@ -10913,10 +10977,10 @@ rc@^1.2.7: minimist "^1.2.0" strip-json-comments "~2.0.1" -react-app-polyfill@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/react-app-polyfill/-/react-app-polyfill-0.1.3.tgz#e57bb50f3751dac0e6b3ac27673812c68c679a1d" - integrity sha512-Fl5Pic4F15G05qX7RmUqPZr1MtyFKJKSlRwMhel4kvDLrk/KcQ9QbpvyMTzv/0NN5957XFQ7r1BNHWi7qN59Pw== +react-app-polyfill@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/react-app-polyfill/-/react-app-polyfill-0.2.0.tgz#60eaf037223b2f3a5671f45e5ac3b418f0b48ad2" + integrity sha512-uBfocjRsBNqhTaEywUZ2buzhHbor2jBbnhZY8VUZ7VZ3PXucIPZrPDAAmbclELhvl+x08PbynAGQfMYcBmqZ2w== dependencies: core-js "2.5.7" object-assign "4.1.1" @@ -10924,10 +10988,10 @@ react-app-polyfill@^0.1.3: raf "3.4.0" whatwg-fetch "3.0.0" -react-dev-utils@^6.1.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-6.1.1.tgz#a07e3e8923c4609d9f27e5af5207e3ca20724895" - integrity sha512-ThbJ86coVd6wV/QiTo8klDTvdAJ1WsFCGQN07+UkN+QN9CtCSsl/+YuDJToKGeG8X4j9HMGXNKbk2QhPAZr43w== +react-dev-utils@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-7.0.0.tgz#b99d87aea260294bf7ea087cdbd6b099fac3eb27" + integrity sha512-Rlt+rbsSIrv5h3jr8Z6I0fOIts/UxpPu0nB4wxYlpO48vpdnG9tCshOJGmaYjGfNBSNhaBpisIAGhK6c8X2/kw== dependencies: "@babel/code-frame" "7.0.0" address "1.0.3" @@ -10947,7 +11011,7 @@ react-dev-utils@^6.1.1: loader-utils "1.1.0" opn "5.4.0" pkg-up "2.0.0" - react-error-overlay "^5.1.0" + react-error-overlay "^5.1.1" recursive-readdir "2.2.2" shell-quote "1.6.1" sockjs-client "1.1.5" @@ -10972,10 +11036,10 @@ react-dropzone@8.0.3: attr-accept "^1.1.3" prop-types "^15.6.2" -react-error-overlay@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-5.1.0.tgz#c516995a5652e7bfbed8b497910d5280df74a7e8" - integrity sha512-akMy/BQT5m1J3iJIHkSb4qycq2wzllWsmmolaaFVnb+LPV9cIJ/nTud40ZsiiT0H3P+/wXIdbjx2fzF61OaeOQ== +react-error-overlay@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-5.1.1.tgz#56f0439f001ff3588da0f479a86482ccb1e708cb" + integrity sha512-gJcOyak5ri9mzhpFObSAkCqNNBCVZE8LaR/mX37agULgSL0dobgX11NVSIetvNzhHMkr6CIqV0xiutvvcjBtkw== react-event-listener@^0.6.2: version "0.6.4" @@ -11005,6 +11069,18 @@ react-motion@^0.5.0: prop-types "^15.5.8" raf "^3.1.0" +react-redux@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-6.0.0.tgz#09e86eeed5febb98e9442458ad2970c8f1a173ef" + integrity sha512-EmbC3uLl60pw2VqSSkj6HpZ6jTk12RMrwXMBdYtM6niq0MdEaRq9KYCwpJflkOZj349BLGQm1MI/JO1W96kLWQ== + dependencies: + "@babel/runtime" "^7.2.0" + hoist-non-react-statics "^3.2.1" + invariant "^2.2.4" + loose-envify "^1.4.0" + prop-types "^15.6.2" + react-is "^16.6.3" + react-resize-detector@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/react-resize-detector/-/react-resize-detector-2.3.0.tgz#57bad1ae26a28a62a2ddb678ba6ffdf8fa2b599c" @@ -11047,19 +11123,19 @@ react-router@^4.3.1: prop-types "^15.6.1" warning "^4.0.1" -react-scripts@2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-2.1.1.tgz#c2959a756b0b61d3090adece0d7aedd324dff8a5" - integrity sha512-f6KCUy7opItgeana1Ghwj+lYQp5BTHSaivG/dbfiIqSm5QdOIUV5eiFSBsbaAE6GEKqGYmZDK6Yw5WmbrhxaFg== +react-scripts@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-2.1.2.tgz#cf1686cd9ca3c6148e1428e97aac12995f01b554" + integrity sha512-AmnKID1MgZfiYxuzv0+C6m1c8CFt+IVDQge5cEbNnU4YQ5Are2amHmDexcVF0Ft6W/lAsXxjzWYjC0T3lUurRw== dependencies: - "@babel/core" "7.1.0" + "@babel/core" "7.1.6" "@svgr/webpack" "2.4.1" babel-core "7.0.0-bridge.0" babel-eslint "9.0.0" babel-jest "23.6.0" babel-loader "8.0.4" - babel-plugin-named-asset-import "^0.2.3" - babel-preset-react-app "^6.1.0" + babel-plugin-named-asset-import "^0.3.0" + babel-preset-react-app "^7.0.0" bfj "6.1.1" case-sensitive-paths-webpack-plugin "2.1.2" chalk "2.4.1" @@ -11067,7 +11143,7 @@ react-scripts@2.1.1: dotenv "6.0.0" dotenv-expand "4.2.0" eslint "5.6.0" - eslint-config-react-app "^3.0.5" + eslint-config-react-app "^3.0.6" eslint-loader "2.1.1" eslint-plugin-flowtype "2.50.1" eslint-plugin-import "2.14.0" @@ -11086,10 +11162,10 @@ react-scripts@2.1.1: pnp-webpack-plugin "1.1.0" postcss-flexbugs-fixes "4.1.0" postcss-loader "3.0.0" - postcss-preset-env "6.0.6" + postcss-preset-env "6.3.1" postcss-safe-parser "4.0.1" - react-app-polyfill "^0.1.3" - react-dev-utils "^6.1.1" + react-app-polyfill "^0.2.0" + react-dev-utils "^7.0.0" resolve "1.8.1" sass-loader "7.1.0" style-loader "0.23.0" @@ -11313,12 +11389,12 @@ reduce-function-call@^1.0.1: dependencies: balanced-match "^0.4.2" -redux-saga@^0.16.0: +redux-saga@^0.16.0, redux-saga@^0.16.2: version "0.16.2" resolved "https://registry.yarnpkg.com/redux-saga/-/redux-saga-0.16.2.tgz#993662e86bc945d8509ac2b8daba3a8c615cc971" integrity sha512-iIjKnRThI5sKPEASpUvySemjzwqwI13e3qP7oLub+FycCRDysLSAOwt958niZW6LhxfmS6Qm1BzbU70w/Koc4w== -redux@^4.0.0: +redux@^4.0.0, redux@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.1.tgz#436cae6cc40fbe4727689d7c8fae44808f1bfef5" integrity sha512-R7bAtSkk7nY6O/OYMVR9RiBI+XghjF9rlbl5806HJbQph0LJVHZrU5oaO4q70eUKiqMRqm4y07KLTlMZ2BlVmg== @@ -11863,6 +11939,11 @@ scryptsy@^1.2.1: dependencies: pbkdf2 "^3.0.3" +seamless-immutable@^7.1.3: + version "7.1.4" + resolved "https://registry.yarnpkg.com/seamless-immutable/-/seamless-immutable-7.1.4.tgz#6e9536def083ddc4dea0207d722e0e80d0f372f8" + integrity sha512-XiUO1QP4ki4E2PHegiGAlu6r82o5A+6tRh7IkGGTVg/h+UoeX4nFBeCGPOhb4CYjvkqsfm/TUtvOMYC1xmV30A== + secp256k1@^3.0.1, secp256k1@^3.3.0: version "3.5.2" resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-3.5.2.tgz#f95f952057310722184fe9c914e6b71281f2f2ae" From 28d2695e707395cf935ef79f5b9fbf5c9b1b086d Mon Sep 17 00:00:00 2001 From: Logan Saether Date: Sun, 23 Dec 2018 19:47:49 -0700 Subject: [PATCH 2/2] add ether symbol --- src/components/AppContainer/Topbar/Web3StatusBar.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/AppContainer/Topbar/Web3StatusBar.jsx b/src/components/AppContainer/Topbar/Web3StatusBar.jsx index ab52402..1c8dd34 100644 --- a/src/components/AppContainer/Topbar/Web3StatusBar.jsx +++ b/src/components/AppContainer/Topbar/Web3StatusBar.jsx @@ -27,7 +27,7 @@ const ColorIndicatorIcon = styled(FontAwesomeIcon)` class EthStatus extends React.Component { state = { - enabled: false, + enabled: true, }; // componentDidMount() {