[beta] UI updates for 1.5.1 (#4429)
* s/Delete Contract/Forget Contract/ (#4237) * Adjust the location of the signer snippet (#4155) * Additional building-block UI components (#4239) * Currency WIP * Expand tests * Pass className * Add QrCode * Export new components in ~/ui * s/this.props.netSymbol/netSymbol/ * Fix import case * ui/SectionList component (#4292) * array chunking utility * add SectionList component * Add TODOs to indicate possible future work * Add missing overlay style (as used in dapps at present) * Add a Playground for the UI Components (#4301) * Playground // WIP * Linting * Add Examples with code * CSS Linting * Linting * Add Connected Currency Symbol * 2015-2017 * 2015-2017 * 2015-2017 * 2015-2017 * 2015-2017 * 2015-2017 * 2015-2017 * Added `renderSymbol` tests * PR grumbles * Add Eth and Btc QRCode examples * 2015-2017 * Add tests for playground * Fixing tests * Split Dapp icon into ui/DappIcon (#4308) * Add QrCode & Copy to ShapeShift (#4322) * Extract CopyIcon to ~/ui/Icons * Add copy & QrCode address * Default size 4 * Add bitcoin: link * use protocol links applicable to coin exchanged * Remove .only * Display QrCode for accounts, addresses & contracts (#4329) * Allow Portal to be used as top-level modal (#4338) * Portal * Allow Portal to be used in as both top-level and popover * modal/popover variable naming * export Portal in ~/ui * Properly handle optional onKeyDown * Add simple Playground Example * Add proper event listener to Portal (#4359) * Display AccountCard name via IdentityName (#4235) * Fix signing (#4363) * Dapp Account Selection & Defaults (#4355) * Add parity_defaultAccount RPC (with subscription) (#4383) * Default Account selector in Signer overlay (#4375) * Typo, fixes #4271 (#4391) * Fix ParityBar account selection overflows (#4405) * Available Dapp selection alignment with Permissions (Portal) (#4374) * registry dapp: make lookup use lower case (#4409) * Dapps use defaultAccount instead of own selectors (#4386) * Poll for defaultAccount to update dapp & overlay subscriptions (#4417) * Poll for defaultAccount (Fixes #4413) * Fix nextTimeout on catch * Store timers * Re-enable default updates on change detection * Add block & timestamp conditions to Signer (#4411) * Extension installation overlay (#4423) * Extension installation overlay * Pr gumbles * Spelling * Update Chrome URL * Fix for non-included jsonrpc * Extend Portal component (as per Modal) #4392
This commit is contained in:
Jaco Greeff
Gav Wood
17
js/src/ui/QrCode/index.js
Normal file
17
js/src/ui/QrCode/index.js
Normal file
@@ -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';
|
||||
63
js/src/ui/QrCode/qrCode.example.js
Normal file
63
js/src/ui/QrCode/qrCode.example.js
Normal file
@@ -0,0 +1,63 @@
|
||||
// Copyright 2015-2017 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 } from 'react';
|
||||
|
||||
import PlaygroundExample from '~/playground/playgroundExample';
|
||||
|
||||
import QrCode from './';
|
||||
|
||||
export default class QrCodeExample extends Component {
|
||||
render () {
|
||||
return (
|
||||
<div>
|
||||
<PlaygroundExample name='Simple QRCode'>
|
||||
<QrCode
|
||||
value='this is a test'
|
||||
/>
|
||||
</PlaygroundExample>
|
||||
|
||||
<PlaygroundExample name='Simple QRCode with margin'>
|
||||
<QrCode
|
||||
margin={ 10 }
|
||||
value='this is a test'
|
||||
/>
|
||||
</PlaygroundExample>
|
||||
|
||||
<PlaygroundExample name='Ethereum Address QRCode'>
|
||||
<QrCode
|
||||
margin={ 10 }
|
||||
value='0x8c30393085C8C3fb4C1fB16165d9fBac5D86E1D9'
|
||||
/>
|
||||
</PlaygroundExample>
|
||||
|
||||
<PlaygroundExample name='Bitcoin Address QRCode'>
|
||||
<QrCode
|
||||
margin={ 10 }
|
||||
value='3J98t1WpEZ73CNmQviecrnyiWrnqRhWNLy'
|
||||
/>
|
||||
</PlaygroundExample>
|
||||
|
||||
<PlaygroundExample name='Big QRCode'>
|
||||
<QrCode
|
||||
size={ 10 }
|
||||
value='this is a test'
|
||||
/>
|
||||
</PlaygroundExample>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
}
|
||||
83
js/src/ui/QrCode/qrCode.js
Normal file
83
js/src/ui/QrCode/qrCode.js
Normal file
@@ -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: 4
|
||||
};
|
||||
|
||||
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)
|
||||
});
|
||||
}
|
||||
}
|
||||
108
js/src/ui/QrCode/qrCode.spec.js
Normal file
108
js/src/ui/QrCode/qrCode.spec.js
Normal file
@@ -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);
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user