grassrootseconomics/openethereum
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

UI fixes backporting (#3234)

Browse Source 
* Fix /parity-utils/{web3,parity}.js webpack errors (#3221)

* Don't override library builds

* Don't override libraries on build

* Enhance working blockNumber display

* Don't push empty tags to input (#3222)


Former-commit-id: d3e51d21c8fc1b7cf9105e28c4719bf3ecba14e0
This commit is contained in:
Arkadiy Paronyan 2016-11-07 17:41:55 +01:00 committed by Gav Wood
parent b88823b51f
commit 2e9cde38e4
5 changed files with 54 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/package.json
View File

@ -23,16 +23,16 @@
"Promise" "Promise"
], ],
"scripts": { "scripts": {
"build": "npm run build:dll && npm run build:app && npm run build:lib", "build": "npm run build:lib && npm run build:dll && npm run build:app",
"build:app": "webpack --progress", "build:app": "webpack --progress",
"build:lib": "webpack --config webpack.libraries --progress", "build:lib": "webpack --config webpack.libraries --progress",
"build:dll": "webpack --config webpack.vendor --progress", "build:dll": "webpack --config webpack.vendor --progress",
"ci:build": "npm run ci:build:dll && npm run ci:build:app && npm run ci:build:lib", "ci:build": "npm run ci:build:lib && npm run ci:build:dll && npm run ci:build:app",
"ci:build:app": "NODE_ENV=production webpack", "ci:build:app": "NODE_ENV=production webpack",
"ci:build:lib": "NODE_ENV=production webpack --config webpack.libraries", "ci:build:lib": "NODE_ENV=production webpack --config webpack.libraries",
"ci:build:dll": "NODE_ENV=production webpack --config webpack.vendor", "ci:build:dll": "NODE_ENV=production webpack --config webpack.vendor",
"ci:build:npm": "NODE_ENV=production webpack --config webpack.npm", "ci:build:npm": "NODE_ENV=production webpack --config webpack.npm",
"start": "npm install && npm run build:dll && npm run start:app", "start": "npm install && npm run build:lib && npm run build:dll && npm run start:app",
"start:app": "webpack-dev-server -d --history-api-fallback --open --hot --inline --progress --colors --port 3000", "start:app": "webpack-dev-server -d --history-api-fallback --open --hot --inline --progress --colors --port 3000",
"clean": "rm -rf ./build ./coverage", "clean": "rm -rf ./build ./coverage",
"coveralls": "npm run testCoverage && coveralls < coverage/lcov.info", "coveralls": "npm run testCoverage && coveralls < coverage/lcov.info",

25
js/src/dev.parity.html
View File

@ -6,8 +6,31 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<link rel="icon" href="/parity-logo-black-no-text.png" type="image/png"> <link rel="icon" href="/parity-logo-black-no-text.png" type="image/png">
<title>dev::Parity.js</title> <title>dev::Parity.js</title>
<script src="/parity-utils/parity.js"></script>
<style>
.box {
font-size: 1.5em;
text-align: center;
border-radius: 0.5em;
background: #eee;
padding: 1em;
margin: 1em;
}
</style>
</head> </head>
<body> <body>
<script src="/parity-utils/parity.js"></script> <div class="box">
best block #<span id="blockNumber">unknown</span>
</div>
<script>
window.parity.api.subscribe('eth_blockNumber', function (error, blockNumber) {
if (error) {
console.log('error', error);
return;
}
document.getElementById('blockNumber').innerHTML = blockNumber.toFormat(0);
});
</script>
</body> </body>
</html> </html>

27
js/src/dev.web3.html
View File

@ -6,8 +6,33 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<link rel="icon" href="/parity-logo-black-no-text.png" type="image/png"> <link rel="icon" href="/parity-logo-black-no-text.png" type="image/png">
<title>dev::Web3</title> <title>dev::Web3</title>
<script src="/parity-utils/web3.js"></script>
<style>
.box {
font-size: 1.5em;
text-align: center;
border-radius: 0.5em;
background: #eee;
padding: 1em;
margin: 1em;
}
</style>
</head> </head>
<body> <body>
<script src="/parity-utils/web3.js"></script> <div class="box">
best block #<span id="blockNumber">unknown</span>
</div>
<script>
window.setInterval(function () {
window.web3.eth.getBlockNumber(function (error, blockNumber) {
if (error) {
console.error('error', error);
return;
}
document.getElementById('blockNumber').innerHTML = blockNumber;
});
}, 1000);
</script>
</body> </body>
</html> </html>

3
js/src/modals/EditMeta/editMeta.js
View File

@ -99,11 +99,10 @@ export default class EditMeta extends Component {
renderTags () { renderTags () {
const { meta } = this.state; const { meta } = this.state;
const { tags } = meta || [];
return ( return (
<InputChip <InputChip
tokens={ tags } tokens={ meta.tags || [] }
onTokensChange={ this.onTagsChange } onTokensChange={ this.onTagsChange }
label='(optional) tags' label='(optional) tags'
hint='press <Enter> to add a tag' hint='press <Enter> to add a tag'

4
js/webpack.config.js
View File

@ -41,10 +41,6 @@ module.exports = {
'registry': ['./dapps/registry.js'], 'registry': ['./dapps/registry.js'],
'signaturereg': ['./dapps/signaturereg.js'], 'signaturereg': ['./dapps/signaturereg.js'],
'tokenreg': ['./dapps/tokenreg.js'], 'tokenreg': ['./dapps/tokenreg.js'],
// library
'inject': ['./web3.js'],
'web3': ['./web3.js'],
'parity': ['./parity.js'],
// app // app
'index': ['./index.js'] 'index': ['./index.js']
}, },