From d47c6db713d00dc80e623d3a2d14fe78d0879b91 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Wed, 2 Nov 2016 11:28:23 +0100 Subject: [PATCH] Allow owner to update content url (#3083) --- .../githubhint/Application/application.css | 17 +++++---- .../githubhint/Application/application.js | 35 +++++++++++++------ 2 files changed, 35 insertions(+), 17 deletions(-) diff --git a/js/src/dapps/githubhint/Application/application.css b/js/src/dapps/githubhint/Application/application.css index aa4a68dc6..d149d883d 100644 --- a/js/src/dapps/githubhint/Application/application.css +++ b/js/src/dapps/githubhint/Application/application.css @@ -108,14 +108,19 @@ background: #fcc; } -.hashError { +.hashError, .hashWarning, .hashOk { padding-top: 0.5em; - color: #f66; text-align: center; } -.hashOk { - padding-top: 0.5em; - opacity: 0.5; - text-align: center; +.hashError { + color: #f66; +} + +.hashWarning { + color: #f80; +} + +.hashOk { + opacity: 0.5; } diff --git a/js/src/dapps/githubhint/Application/application.js b/js/src/dapps/githubhint/Application/application.js index 8eb3902d3..3c4ecfda8 100644 --- a/js/src/dapps/githubhint/Application/application.js +++ b/js/src/dapps/githubhint/Application/application.js @@ -29,11 +29,13 @@ const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'; export default class Application extends Component { state = { + fromAddress: null, loading: true, url: '', urlError: null, contentHash: '', contentHashError: null, + contentHashOwner: null, registerBusy: false, registerError: null, registerState: '' @@ -63,7 +65,14 @@ export default class Application extends Component { } renderPage () { - const { registerBusy, url, urlError, contentHash, contentHashError } = this.state; + const { fromAddress, registerBusy, url, urlError, contentHash, contentHashError, contentHashOwner } = this.state; + + let hashClass = null; + if (contentHashError) { + hashClass = contentHashOwner !== fromAddress ? styles.hashError : styles.hashWarning; + } else { + hashClass = styles.hashOk; + } return (
@@ -81,7 +90,7 @@ export default class Application extends Component { className={ urlError ? styles.error : null } onChange={ this.onChangeUrl } />
-
+
{ contentHashError || contentHash }
{ registerBusy ? this.renderProgress() : this.renderButtons() } @@ -92,7 +101,7 @@ export default class Application extends Component { } renderButtons () { - const { accounts, fromAddress, url, urlError, contentHashError } = this.state; + const { accounts, fromAddress, url, urlError, contentHashError, contentHashOwner } = this.state; const account = accounts[fromAddress]; return ( @@ -105,7 +114,7 @@ export default class Application extends Component {
+ disabled={ (!!contentHashError && contentHashOwner !== fromAddress) || !!urlError || url.length === 0 }>register url ); } @@ -163,9 +172,9 @@ export default class Application extends Component { } onClickRegister = () => { - const { url, urlError, contentHash, contentHashError, fromAddress, instance } = this.state; + const { url, urlError, contentHash, contentHashError, contentHashOwner, fromAddress, instance } = this.state; - if (!!contentHashError || !!urlError || url.length === 0) { + if ((!!contentHashError && contentHashOwner !== fromAddress) || !!urlError || url.length === 0) { return; } @@ -243,13 +252,17 @@ export default class Application extends Component { instance.entries .call({}, [contentHash]) - .then(([accountSlashRepo, commit, owner]) => { - console.log('lookupHash', accountSlashRepo, api.util.bytesToHex(commit), owner); + .then(([accountSlashRepo, commit, contentHashOwner]) => { + console.log('lookupHash', accountSlashRepo, api.util.bytesToHex(commit), contentHashOwner); - if (owner !== ZERO_ADDRESS) { - this.setState({ contentHashError: contentHash, contentHash: null }); + if (contentHashOwner !== ZERO_ADDRESS) { + this.setState({ + contentHashError: contentHash, + contentHashOwner, + contentHash + }); } else { - this.setState({ contentHashError: null, contentHash }); + this.setState({ contentHashError: null, contentHashOwner, contentHash }); } }); })