diff options
author | sdtsui <szehungdanieltsui@gmail.com> | 2017-08-03 12:53:40 +0800 |
---|---|---|
committer | sdtsui <szehungdanieltsui@gmail.com> | 2017-08-03 12:53:40 +0800 |
commit | b70a399faa30c478ffffb5607cfe36001745adc7 (patch) | |
tree | d252a02d6acda453ae29baffe9c4051cb4546f01 | |
parent | 41250f9769d3224e0b42821058cd6445fa7efaca (diff) | |
download | tangerine-wallet-browser-b70a399faa30c478ffffb5607cfe36001745adc7.tar tangerine-wallet-browser-b70a399faa30c478ffffb5607cfe36001745adc7.tar.gz tangerine-wallet-browser-b70a399faa30c478ffffb5607cfe36001745adc7.tar.bz2 tangerine-wallet-browser-b70a399faa30c478ffffb5607cfe36001745adc7.tar.lz tangerine-wallet-browser-b70a399faa30c478ffffb5607cfe36001745adc7.tar.xz tangerine-wallet-browser-b70a399faa30c478ffffb5607cfe36001745adc7.tar.zst tangerine-wallet-browser-b70a399faa30c478ffffb5607cfe36001745adc7.zip |
Isolate container component, add refactor notes
-rw-r--r-- | ui/app/account-and-transaction-details.js | 39 | ||||
-rw-r--r-- | ui/app/main-container.js | 37 |
2 files changed, 57 insertions, 19 deletions
diff --git a/ui/app/account-and-transaction-details.js b/ui/app/account-and-transaction-details.js new file mode 100644 index 000000000..9386b2314 --- /dev/null +++ b/ui/app/account-and-transaction-details.js @@ -0,0 +1,39 @@ +const Component = require('react').Component +const h = require('react-hyperscript') +const inherits = require('util').inherits +// Main Views +const TxView = require('./components/tx-view') +const WalletView = require('./components/wallet-view') + +module.exports = AccountAndTransactionDetails + +inherits(AccountAndTransactionDetails, Component) +function AccountAndTransactionDetails () { + Component.call(this) +} + +AccountAndTransactionDetails.prototype.render = function () { + console.log('atdR') + return h('div', { + style: { + display: 'flex', + flex: '1 0 auto', + }, + }, [ + // wallet + h(WalletView, { + style: { + }, + responsiveDisplayClassname: '.lap-visible', + }, [ + ]), + + // transaction + h(TxView, { + style: { + } + }, [ + ]), + ]) +} + diff --git a/ui/app/main-container.js b/ui/app/main-container.js index 62a8bdb7b..5194c2343 100644 --- a/ui/app/main-container.js +++ b/ui/app/main-container.js @@ -4,6 +4,7 @@ const inherits = require('util').inherits const TxView = require('./components/tx-view') const WalletView = require('./components/wallet-view') const SlideoutMenu = require('react-burger-menu').slide +const AccountAndTransactionDetails = require('./account-and-transaction-details') module.exports = MainContainer @@ -14,6 +15,22 @@ function MainContainer () { MainContainer.prototype.render = function () { + // 1. Fixing Mobile View: flush container + // media query for mobile view: + // position: absolute; + // margin-top: 35px; + // width: 100%; + // + // 2. Fix responsive sizing - smaller + // https://puu.sh/x0gDA/5ff3b734eb.png + // + // 3. summarize: + // switch statement goes inside MainContainer, + // or a method in renderPrimary + // - pass resulting h() to MainContainer + // - error checking in separate func + // - router in separate func + return h('div', { style: { position: 'absolute', @@ -27,24 +44,6 @@ MainContainer.prototype.render = function () { alignItems: 'stretch', overflowY: 'scroll', } - }, [ - - h(WalletView, { - style: { - }, - responsiveDisplayClassname: '.lap-visible', - }, [ - ]), - - h(TxView, { - style: { - // flexGrow: 2 - // width: '66.66%', - // height: '82vh', - // background: '#FFFFFF', - } - }, [ - ]), - ]) + }, [h(AccountAndTransactionDetails, {}, [])]) } |