This repository has been archived by the owner on Nov 6, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Additional building-block UI components #4239
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
d421b20
Currency WIP
jacogr 837b0e8
Expand tests
jacogr c6f1312
Pass className
jacogr e682db2
Add QrCode
jacogr ac5a23c
Export new components in ~/ui
jacogr a5e3dab
s/this.props.netSymbol/netSymbol/
jacogr 31b7da5
Fix import case
jacogr File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
// Copyright 2015, 2016 Parity Technologies (UK) Ltd. | ||
// This file is part of Parity. | ||
|
||
// Parity is free software: you can redistribute it and/or modify | ||
// it under the terms of the GNU General Public License as published by | ||
// the Free Software Foundation, either version 3 of the License, or | ||
// (at your option) any later version. | ||
|
||
// Parity is distributed in the hope that it will be useful, | ||
// but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
// GNU General Public License for more details. | ||
|
||
// You should have received a copy of the GNU General Public License | ||
// along with Parity. If not, see <http://www.gnu.org/licenses/>. | ||
|
||
import React, { Component, PropTypes } from 'react'; | ||
import { connect } from 'react-redux'; | ||
|
||
const SYMBOL_ETC = 'ETC'; | ||
const SYMBOL_ETH = 'ETH'; | ||
const SYMBOL_EXP = 'EXP'; | ||
|
||
class CurrencySymbol extends Component { | ||
static propTypes = { | ||
className: PropTypes.string, | ||
netChain: PropTypes.string.isRequired, | ||
netSymbol: PropTypes.string.isRequired | ||
} | ||
|
||
render () { | ||
const { className, netSymbol } = this.props; | ||
|
||
return ( | ||
<span className={ className }>{ netSymbol }</span> | ||
); | ||
} | ||
} | ||
|
||
function mapStateToProps (state) { | ||
const { netChain } = state.nodeStatus; | ||
let netSymbol; | ||
|
||
switch (netChain) { | ||
case 'classic': | ||
netSymbol = SYMBOL_ETC; | ||
break; | ||
|
||
case 'expanse': | ||
netSymbol = SYMBOL_EXP; | ||
break; | ||
|
||
default: | ||
netSymbol = SYMBOL_ETH; | ||
break; | ||
} | ||
|
||
return { | ||
netChain, | ||
netSymbol | ||
}; | ||
} | ||
|
||
export default connect( | ||
mapStateToProps, | ||
null | ||
)(CurrencySymbol); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,81 @@ | ||
// Copyright 2015, 2016 Parity Technologies (UK) Ltd. | ||
// This file is part of Parity. | ||
|
||
// Parity is free software: you can redistribute it and/or modify | ||
// it under the terms of the GNU General Public License as published by | ||
// the Free Software Foundation, either version 3 of the License, or | ||
// (at your option) any later version. | ||
|
||
// Parity is distributed in the hope that it will be useful, | ||
// but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
// GNU General Public License for more details. | ||
|
||
// You should have received a copy of the GNU General Public License | ||
// along with Parity. If not, see <http://www.gnu.org/licenses/>. | ||
|
||
import { shallow } from 'enzyme'; | ||
import React from 'react'; | ||
import sinon from 'sinon'; | ||
|
||
import CurrencySymbol from './'; | ||
|
||
let component; | ||
let store; | ||
|
||
function createRedux (netChain = 'ropsten') { | ||
store = { | ||
dispatch: sinon.stub(), | ||
subscribe: sinon.stub(), | ||
getState: () => { | ||
return { | ||
nodeStatus: { | ||
netChain | ||
} | ||
}; | ||
} | ||
}; | ||
|
||
return store; | ||
} | ||
|
||
function render (netChain, props = {}) { | ||
component = shallow( | ||
<CurrencySymbol { ...props } />, | ||
{ | ||
context: { | ||
store: createRedux(netChain) | ||
} | ||
} | ||
).find('CurrencySymbol').shallow(); | ||
|
||
return component; | ||
} | ||
|
||
describe('ui/CurrencySymbol', () => { | ||
it('renders defaults', () => { | ||
expect(render()).to.be.ok; | ||
}); | ||
|
||
it('passes the className as provided', () => { | ||
expect(render('ropsten', { className: 'test' }).find('span').hasClass('test')).to.be.true; | ||
}); | ||
|
||
describe('currencies', () => { | ||
it('renders ETH as default', () => { | ||
expect(render().text()).equal('ETH'); | ||
}); | ||
|
||
it('renders ETC for classic', () => { | ||
expect(render('classic').text()).equal('ETC'); | ||
}); | ||
|
||
it('renders EXP for expanse', () => { | ||
expect(render('expanse').text()).equal('EXP'); | ||
}); | ||
|
||
it('renders ETH as default', () => { | ||
expect(render('somethingElse').text()).equal('ETH'); | ||
}); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
// Copyright 2015, 2016 Parity Technologies (UK) Ltd. | ||
// This file is part of Parity. | ||
|
||
// Parity is free software: you can redistribute it and/or modify | ||
// it under the terms of the GNU General Public License as published by | ||
// the Free Software Foundation, either version 3 of the License, or | ||
// (at your option) any later version. | ||
|
||
// Parity is distributed in the hope that it will be useful, | ||
// but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
// GNU General Public License for more details. | ||
|
||
// You should have received a copy of the GNU General Public License | ||
// along with Parity. If not, see <http://www.gnu.org/licenses/>. | ||
|
||
export default from './currencySymbol'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
// Copyright 2015, 2016 Parity Technologies (UK) Ltd. | ||
// This file is part of Parity. | ||
|
||
// Parity is free software: you can redistribute it and/or modify | ||
// it under the terms of the GNU General Public License as published by | ||
// the Free Software Foundation, either version 3 of the License, or | ||
// (at your option) any later version. | ||
|
||
// Parity is distributed in the hope that it will be useful, | ||
// but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
// GNU General Public License for more details. | ||
|
||
// You should have received a copy of the GNU General Public License | ||
// along with Parity. If not, see <http://www.gnu.org/licenses/>. | ||
|
||
export default from './qrCode'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,83 @@ | ||
// Copyright 2015, 2016 Parity Technologies (UK) Ltd. | ||
// This file is part of Parity. | ||
|
||
// Parity is free software: you can redistribute it and/or modify | ||
// it under the terms of the GNU General Public License as published by | ||
// the Free Software Foundation, either version 3 of the License, or | ||
// (at your option) any later version. | ||
|
||
// Parity is distributed in the hope that it will be useful, | ||
// but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
// GNU General Public License for more details. | ||
|
||
// You should have received a copy of the GNU General Public License | ||
// along with Parity. If not, see <http://www.gnu.org/licenses/>. | ||
|
||
// https://github.com/cmanzana/qrcode-npm packaging the standard | ||
// https://github.com/kazuhikoarase/qrcode-generator | ||
import { qrcode } from 'qrcode-npm'; | ||
import React, { Component, PropTypes } from 'react'; | ||
|
||
const QROPTS = { | ||
CODE_TYPE: 4, | ||
ERROR_LEVEL: 'M' | ||
}; | ||
|
||
export default class QrCode extends Component { | ||
static propTypes = { | ||
className: PropTypes.string, | ||
margin: PropTypes.number, | ||
size: PropTypes.number, | ||
value: PropTypes.string.isRequired | ||
}; | ||
|
||
static defaultProps = { | ||
margin: 2, | ||
size: 5 | ||
}; | ||
|
||
state = { | ||
image: null | ||
}; | ||
|
||
componentWillMount () { | ||
this.generateCode(this.props); | ||
} | ||
|
||
componentWillReceiveProps (nextProps) { | ||
const hasChanged = nextProps.value !== this.props.value || | ||
nextProps.size !== this.props.size || | ||
nextProps.margin !== this.props.margin; | ||
|
||
if (hasChanged) { | ||
this.generateCode(nextProps); | ||
} | ||
} | ||
|
||
render () { | ||
const { className } = this.props; | ||
const { image } = this.state; | ||
|
||
return ( | ||
<div | ||
className={ className } | ||
dangerouslySetInnerHTML={ { | ||
__html: image | ||
} } | ||
/> | ||
); | ||
} | ||
|
||
generateCode (props) { | ||
const { margin, size, value } = props; | ||
const qr = qrcode(QROPTS.CODE_TYPE, QROPTS.ERROR_LEVEL); | ||
|
||
qr.addData(value); | ||
qr.make(); | ||
|
||
this.setState({ | ||
image: qr.createImgTag(size, margin) | ||
}); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,108 @@ | ||
// Copyright 2015, 2016 Parity Technologies (UK) Ltd. | ||
// This file is part of Parity. | ||
|
||
// Parity is free software: you can redistribute it and/or modify | ||
// it under the terms of the GNU General Public License as published by | ||
// the Free Software Foundation, either version 3 of the License, or | ||
// (at your option) any later version. | ||
|
||
// Parity is distributed in the hope that it will be useful, | ||
// but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
// GNU General Public License for more details. | ||
|
||
// You should have received a copy of the GNU General Public License | ||
// along with Parity. If not, see <http://www.gnu.org/licenses/>. | ||
|
||
import { shallow } from 'enzyme'; | ||
import React from 'react'; | ||
import sinon from 'sinon'; | ||
|
||
import QrCode from './'; | ||
|
||
const DEFAULT_PROPS = { | ||
margin: 1, | ||
size: 4, | ||
value: 'someTestValue' | ||
}; | ||
|
||
let component; | ||
let instance; | ||
|
||
function render (props = {}) { | ||
component = shallow( | ||
<QrCode | ||
{ ...DEFAULT_PROPS } | ||
{ ...props } | ||
/> | ||
); | ||
instance = component.instance(); | ||
|
||
return component; | ||
} | ||
|
||
describe('ui/QrCode', () => { | ||
beforeEach(() => { | ||
render(); | ||
sinon.spy(instance, 'generateCode'); | ||
}); | ||
|
||
afterEach(() => { | ||
instance.generateCode.restore(); | ||
}); | ||
|
||
it('renders defaults', () => { | ||
expect(component).to.be.ok; | ||
}); | ||
|
||
describe('lifecycle', () => { | ||
describe('componentWillMount', () => { | ||
it('generates the image on mount', () => { | ||
instance.componentWillMount(); | ||
expect(instance.generateCode).to.have.been.calledWith(DEFAULT_PROPS); | ||
}); | ||
}); | ||
|
||
describe('componentWillReceiveProps', () => { | ||
it('does not re-generate when no props changed', () => { | ||
instance.componentWillReceiveProps(DEFAULT_PROPS); | ||
expect(instance.generateCode).not.to.have.been.called; | ||
}); | ||
|
||
it('does not re-generate when className changed', () => { | ||
const nextProps = Object.assign({}, DEFAULT_PROPS, { className: 'test' }); | ||
|
||
instance.componentWillReceiveProps(nextProps); | ||
expect(instance.generateCode).not.to.have.been.called; | ||
}); | ||
|
||
it('does not re-generate when additional property changed', () => { | ||
const nextProps = Object.assign({}, DEFAULT_PROPS, { something: 'test' }); | ||
|
||
instance.componentWillReceiveProps(nextProps); | ||
expect(instance.generateCode).not.to.have.been.called; | ||
}); | ||
|
||
it('does re-generate when value changed', () => { | ||
const nextProps = Object.assign({}, DEFAULT_PROPS, { value: 'somethingElse' }); | ||
|
||
instance.componentWillReceiveProps(nextProps); | ||
expect(instance.generateCode).to.have.been.calledWith(nextProps); | ||
}); | ||
|
||
it('does re-generate when size changed', () => { | ||
const nextProps = Object.assign({}, DEFAULT_PROPS, { size: 10 }); | ||
|
||
instance.componentWillReceiveProps(nextProps); | ||
expect(instance.generateCode).to.have.been.calledWith(nextProps); | ||
}); | ||
|
||
it('does re-generate when margin changed', () => { | ||
const nextProps = Object.assign({}, DEFAULT_PROPS, { margin: 10 }); | ||
|
||
instance.componentWillReceiveProps(nextProps); | ||
expect(instance.generateCode).to.have.been.calledWith(nextProps); | ||
}); | ||
}); | ||
}); | ||
}); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Couldn't this be taken out of the function?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can test when in used to see if we can further optimise it, however should be more than ok as-is since it is not going to crazy generating, only does so when props change.
(Don't want to go down the route and assume too much in the actual library atm. Small enough to read fully, but rather verify properly since I had the same concern, but since we add data and generate it may not clear the state between uses.)
As for testing, there is the features PR that can allow for playground.