From 0a67ee55141f6eb77be30a0762faf3a5645cf18e Mon Sep 17 00:00:00 2001 From: epiqueras Date: Thu, 2 Aug 2018 09:47:44 -0500 Subject: [PATCH 1/6] feat(app): add link to guide Closes #106 --- src/bootstrap/app.js | 8 ++++++- src/components/nav-bar/index.js | 38 ++++++++++++++++++++++----------- 2 files changed, 33 insertions(+), 13 deletions(-) diff --git a/src/bootstrap/app.js b/src/bootstrap/app.js index 581a02e..f512710 100644 --- a/src/bootstrap/app.js +++ b/src/bootstrap/app.js @@ -25,7 +25,13 @@ const ConnectedNavBar = connect(state => ({ accounts: state.wallet.accounts }))( routes={[ { name: 'Home', to: '/' }, { name: 'Cases', to: '/cases' }, - { name: 'Tokens', to: '/tokens' } + { name: 'Tokens', to: '/tokens' }, + { + name: 'Guide', + to: + 'https://medium.com/kleros/doges-on-trial-pilot-explainer-911492c3a7d8', + isExternal: true + } ]} /> ) diff --git a/src/components/nav-bar/index.js b/src/components/nav-bar/index.js index c96f039..d1a0ad5 100644 --- a/src/components/nav-bar/index.js +++ b/src/components/nav-bar/index.js @@ -16,17 +16,30 @@ const NavBar = ({ accounts, routes }) => ( Kleros Logo
- {routes.map(r => ( - - {r.name} - - ))} + {routes.map( + r => + r.isExternal ? ( + + {r.name} + + ) : ( + + {r.name} + + ) + )}
@@ -52,7 +65,8 @@ NavBar.propTypes = { routes: PropTypes.arrayOf( PropTypes.shape({ name: PropTypes.string.isRequired, - to: PropTypes.string.isRequired + to: PropTypes.string.isRequired, + isExternal: PropTypes.bool }).isRequired ).isRequired } From ebc0b93110777b2e51ca8d343e82cc5fc2055091 Mon Sep 17 00:00:00 2001 From: Sam Vitello Date: Thu, 2 Aug 2018 11:02:25 -0600 Subject: [PATCH 2/6] feat: add link to doges iframe (#108) --- .../doges-on-trial-evidence/doges-on-trial-evidence.scss | 9 ++++++++- src/components/iframes/doges-on-trial-evidence/index.js | 8 +++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/components/iframes/doges-on-trial-evidence/doges-on-trial-evidence.scss b/src/components/iframes/doges-on-trial-evidence/doges-on-trial-evidence.scss index d579b57..a26bc59 100644 --- a/src/components/iframes/doges-on-trial-evidence/doges-on-trial-evidence.scss +++ b/src/components/iframes/doges-on-trial-evidence/doges-on-trial-evidence.scss @@ -1,8 +1,15 @@ /* @define DogesOnTrialEvidence */ .DogesOnTrialEvidence { margin-top: -70px; + overflow: hidden; &-picture { - height: 230px; + &-link { + height: 230px; + } } } + +#crisp-chatbox { + display: none !important; +} diff --git a/src/components/iframes/doges-on-trial-evidence/index.js b/src/components/iframes/doges-on-trial-evidence/index.js index fd736bb..33ac94f 100644 --- a/src/components/iframes/doges-on-trial-evidence/index.js +++ b/src/components/iframes/doges-on-trial-evidence/index.js @@ -54,7 +54,13 @@ class DogesOnTrialEvidence extends Component {

The Doge in Question:

- + + +
) From 625fbc88b36b504b6a1714cb0a4f2634201f169c Mon Sep 17 00:00:00 2001 From: Sam Vitello Date: Sun, 5 Aug 2018 19:19:02 -0600 Subject: [PATCH 3/6] fix: pass meta_evidence_to_appeal --- src/containers/dispute/index.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/containers/dispute/index.js b/src/containers/dispute/index.js index 896af7f..4950a5e 100644 --- a/src/containers/dispute/index.js +++ b/src/containers/dispute/index.js @@ -128,14 +128,13 @@ class Dispute extends PureComponent {
) } From f6efb6aed9b03dd2a7b9761879dbfaff871c6746 Mon Sep 17 00:00:00 2001 From: Sam Vitello Date: Tue, 7 Aug 2018 11:51:08 -0600 Subject: [PATCH 4/6] refactor: clean up doge external evidence interface --- .../iframes/doges-on-trial-evidence/index.js | 23 ++++++++----------- .../dispute/components/details/index.js | 13 +++++++++-- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/components/iframes/doges-on-trial-evidence/index.js b/src/components/iframes/doges-on-trial-evidence/index.js index 33ac94f..b402618 100644 --- a/src/components/iframes/doges-on-trial-evidence/index.js +++ b/src/components/iframes/doges-on-trial-evidence/index.js @@ -22,21 +22,21 @@ class DogesOnTrialEvidence extends Component { ) } - async receiveEvidence(evidence) { - if (evidence.data && evidence.data.target === 'evidence') { + async receiveEvidence(message) { + if (message.data && message.data.target === 'evidence') { const arbitrablePermissionList = new ArbitrablePermissionList( eth.currentProvider, - evidence.data.data.arbitrableContractAddress + message.data.arbitrableContractAddress ) const itemHash = await arbitrablePermissionList.getItemByDisputeId( - evidence.data.data.disputeID + message.data.disputeID ) - evidence.data.data.metaEvidence.fileURI = + message.data.metaEvidence.fileURI = process.env.REACT_APP_DEV_DOGE_IMAGES_BASE_URL + itemHash this.setState({ - evidence: evidence.data.data + evidence: message.data }) } } @@ -44,11 +44,8 @@ class DogesOnTrialEvidence extends Component { render() { const { evidence } = this.state if (!evidence) return null - let uri - // it is metaEvidence if there is a disputeID. We have to fetch the image - if (evidence.disputeID !== null && evidence.disputeID !== undefined) { - uri = evidence.metaEvidence.fileURI - } else uri = evidence.URI + + const uri = evidence.metaEvidence.fileURI return (
@@ -56,10 +53,10 @@ class DogesOnTrialEvidence extends Component {
diff --git a/src/containers/dispute/components/details/index.js b/src/containers/dispute/components/details/index.js index a8abdc6..ea86472 100644 --- a/src/containers/dispute/components/details/index.js +++ b/src/containers/dispute/components/details/index.js @@ -17,13 +17,20 @@ class Details extends Component { } handleFrameMessage = message => { - if (message.data && message.data.target === 'evidence') { + if ( + message.data && + message.data.target === 'evidence' && + message.data.loaded + ) { const { metaEvidence, disputeID, arbitrableContractAddress } = this.props message.source.postMessage( { target: 'evidence', - data: { metaEvidence, disputeID, arbitrableContractAddress } + metaEvidence, + evidence: {}, + arbitrableContractAddress, + disputeID }, '*' ) @@ -40,6 +47,7 @@ class Details extends Component { metaEvidence } = this.props + // Default display of primary document file. let fileDisplay = (

File

@@ -47,6 +55,7 @@ class Details extends Component {
) + // Use external interface to display primary document file. if (metaEvidence.evidenceDisplayInterfaceURL) { fileDisplay = (