diff options
Diffstat (limited to 'ui/app/first-time')
| -rw-r--r-- | ui/app/first-time/create-vault.js | 129 | ||||
| -rw-r--r-- | ui/app/first-time/init-menu.js | 28 |
2 files changed, 15 insertions, 142 deletions
diff --git a/ui/app/first-time/create-vault.js b/ui/app/first-time/create-vault.js deleted file mode 100644 index 33ae62179..000000000 --- a/ui/app/first-time/create-vault.js +++ /dev/null @@ -1,129 +0,0 @@ -const inherits = require('util').inherits - -const Component = require('react').Component -const connect = require('react-redux').connect -const h = require('react-hyperscript') -const actions = require('../actions') - -module.exports = connect(mapStateToProps)(CreateVaultScreen) - -inherits(CreateVaultScreen, Component) -function CreateVaultScreen () { - Component.call(this) -} - -function mapStateToProps (state) { - return { - warning: state.appState.warning, - } -} - -CreateVaultScreen.prototype.render = function () { - var state = this.props - return ( - - h('.initialize-screen.flex-column.flex-center.flex-grow', [ - - h('h3.flex-center.text-transform-uppercase', { - style: { - background: '#EBEBEB', - color: '#AEAEAE', - marginBottom: 24, - width: '100%', - fontSize: '20px', - padding: 6, - }, - }, [ - 'Create Vault', - ]), - - // password - h('input.large-input.letter-spacey', { - type: 'password', - id: 'password-box', - placeholder: 'New Password (min 8 chars)', - style: { - width: 260, - marginTop: 12, - }, - }), - - // confirm password - h('input.large-input.letter-spacey', { - type: 'password', - id: 'password-box-confirm', - placeholder: 'Confirm Password', - onKeyPress: this.createVaultOnEnter.bind(this), - style: { - width: 260, - marginTop: 16, - }, - }), - - h('.flex-row.flex-space-between', { - style: { - marginTop: 30, - width: '50%', - }, - }, [ - - // cancel - h('button.primary', { - onClick: this.showInitializeMenu.bind(this), - }, 'CANCEL'), - - // submit - h('button.primary', { - onClick: this.createNewVault.bind(this), - }, 'OK'), - - ]), - - (!state.inProgress && state.warning) && ( - h('span.in-progress-notification', state.warning) - ), - - state.inProgress && ( - h('span.in-progress-notification', 'Generating Seed...') - ), - ]) - ) -} - -CreateVaultScreen.prototype.componentDidMount = function () { - document.getElementById('password-box').focus() -} - -CreateVaultScreen.prototype.showInitializeMenu = function () { - this.props.dispatch(actions.showInitializeMenu()) -} - -// create vault - -CreateVaultScreen.prototype.createVaultOnEnter = function (event) { - if (event.key === 'Enter') { - event.preventDefault() - this.createNewVault() - } -} - -CreateVaultScreen.prototype.createNewVault = function () { - var passwordBox = document.getElementById('password-box') - var password = passwordBox.value - var passwordConfirmBox = document.getElementById('password-box-confirm') - var passwordConfirm = passwordConfirmBox.value - // var entropy = document.getElementById('entropy-text-entry').value - - if (password.length < 8) { - this.warning = 'password not long enough' - this.props.dispatch(actions.displayWarning(this.warning)) - return - } - if (password !== passwordConfirm) { - this.warning = 'passwords don\'t match' - this.props.dispatch(actions.displayWarning(this.warning)) - return - } - - this.props.dispatch(actions.createNewVault(password, ''/* entropy*/)) -} diff --git a/ui/app/first-time/init-menu.js b/ui/app/first-time/init-menu.js index b1155e2f6..897051818 100644 --- a/ui/app/first-time/init-menu.js +++ b/ui/app/first-time/init-menu.js @@ -50,10 +50,10 @@ InitializeMenuScreen.prototype.renderMenu = function (state) { h('h1', { style: { - fontSize: '1.7em', + fontSize: '1.3em', textTransform: 'uppercase', color: '#7F8082', - marginBottom: 20, + marginBottom: 10, }, }, 'MetaMask'), @@ -82,6 +82,8 @@ InitializeMenuScreen.prototype.renderMenu = function (state) { ]), ]), + h('span.in-progress-notification', state.warning), + // password h('input.large-input.letter-spacey', { type: 'password', @@ -91,7 +93,6 @@ InitializeMenuScreen.prototype.renderMenu = function (state) { style: { width: 260, marginTop: 12, - textAlign: 'center', }, }), @@ -105,25 +106,22 @@ InitializeMenuScreen.prototype.renderMenu = function (state) { style: { width: 260, marginTop: 16, - textAlign: 'center', }, }), h('button.primary', { - onClick: this.createNewVault.bind(this), + onClick: this.createNewVaultAndKeychain.bind(this), style: { margin: 12, }, }, 'Create'), - (!state.inProgress && state.warning) && ( - h('span.in-progress-notification', state.warning) - ), - /* + h('.flex-row.flex-center.flex-grow', [ h('p.pointer', { + onClick: this.showRestoreVault.bind(this), style: { fontSize: '0.8em', color: 'rgb(247, 134, 28)', @@ -131,7 +129,7 @@ InitializeMenuScreen.prototype.renderMenu = function (state) { }, }, 'I already have a DEN that I would like to import'), ]), - */ + ]) ) @@ -140,7 +138,7 @@ InitializeMenuScreen.prototype.renderMenu = function (state) { InitializeMenuScreen.prototype.createVaultOnEnter = function (event) { if (event.key === 'Enter') { event.preventDefault() - this.createNewVault() + this.createNewVaultAndKeychain() } } @@ -148,7 +146,11 @@ InitializeMenuScreen.prototype.componentDidMount = function () { document.getElementById('password-box').focus() } -InitializeMenuScreen.prototype.createNewVault = function () { +InitializeMenuScreen.prototype.showRestoreVault = function () { + this.props.dispatch(actions.showRestoreVault()) +} + +InitializeMenuScreen.prototype.createNewVaultAndKeychain = function () { var passwordBox = document.getElementById('password-box') var password = passwordBox.value var passwordConfirmBox = document.getElementById('password-box-confirm') @@ -166,7 +168,7 @@ InitializeMenuScreen.prototype.createNewVault = function () { return } - this.props.dispatch(actions.createNewVault(password, ''/* entropy*/)) + this.props.dispatch(actions.createNewVaultAndKeychain(password, ''/* entropy*/)) } InitializeMenuScreen.prototype.inputChanged = function (event) { |