From ab77cc012eb3212bec7031109a049087ec086b67 Mon Sep 17 00:00:00 2001 From: Jonathan Rainville Date: Fri, 19 Oct 2018 11:19:15 -0400 Subject: [PATCH] conflict in index.css --- embark-ui/package-lock.json | 21 -------------------- embark-ui/package.json | 1 - embark-ui/src/components/Console.js | 6 +++--- embark-ui/src/components/ContractOverview.js | 7 +++---- embark-ui/src/components/CopyButton.css | 1 + embark-ui/src/components/CopyButton.js | 5 ++++- embark-ui/src/components/Logs.css | 4 ++-- embark-ui/src/components/Logs.js | 5 +++++ embark-ui/src/index.css | 5 +++++ 9 files changed, 23 insertions(+), 32 deletions(-) diff --git a/embark-ui/package-lock.json b/embark-ui/package-lock.json index 5228c0c9c..6d2ebf9ac 100644 --- a/embark-ui/package-lock.json +++ b/embark-ui/package-lock.json @@ -10132,17 +10132,6 @@ "prop-types": "^15.6.0" } }, - "react-base16-styling": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/react-base16-styling/-/react-base16-styling-0.5.3.tgz", - "integrity": "sha1-OFjyTpxN2MvT9wLz901YHKKRcmk=", - "requires": { - "base16": "^1.0.0", - "lodash.curry": "^4.0.1", - "lodash.flow": "^3.3.0", - "pure-color": "^1.2.0" - } - }, "react-blockies": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/react-blockies/-/react-blockies-1.4.0.tgz", @@ -10231,16 +10220,6 @@ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.5.2.tgz", "integrity": "sha512-hSl7E6l25GTjNEZATqZIuWOgSnpXb3kD0DVCujmg46K5zLxsbiKaaT6VO9slkSBDPZfYs30lwfJwbOFOnoEnKQ==" }, - "react-json-tree": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/react-json-tree/-/react-json-tree-0.11.0.tgz", - "integrity": "sha1-9bF+gzKanHauOL5cBP2jp/1oSjU=", - "requires": { - "babel-runtime": "^6.6.1", - "prop-types": "^15.5.8", - "react-base16-styling": "^0.5.1" - } - }, "react-json-view": { "version": "1.19.1", "resolved": "https://registry.npmjs.org/react-json-view/-/react-json-view-1.19.1.tgz", diff --git a/embark-ui/package.json b/embark-ui/package.json index 4eb406c90..ea8d28015 100644 --- a/embark-ui/package.json +++ b/embark-ui/package.json @@ -57,7 +57,6 @@ "react-dev-utils": "^5.0.1", "react-dom": "^16.4.1", "react-fontawesome": "^1.6.1", - "react-json-tree": "^0.11.0", "react-json-view": "^1.19.1", "react-redux": "^5.0.7", "react-router-dom": "^4.3.1", diff --git a/embark-ui/src/components/Console.js b/embark-ui/src/components/Console.js index 0119697a0..81d746e36 100644 --- a/embark-ui/src/components/Console.js +++ b/embark-ui/src/components/Console.js @@ -60,7 +60,7 @@ class Console extends Component { isJsonObject(item) { if (!item.result) return false; try { - return typeof(JSON.parse(item.result)) === 'object' + return typeof (JSON.parse(item.result)) === 'object'; } catch(_err) { return false; } @@ -93,12 +93,12 @@ class Console extends Component {

- ) + ); } return (

- ) + ); }) } diff --git a/embark-ui/src/components/ContractOverview.js b/embark-ui/src/components/ContractOverview.js index 23afaa7b2..2649ca79b 100644 --- a/embark-ui/src/components/ContractOverview.js +++ b/embark-ui/src/components/ContractOverview.js @@ -1,7 +1,7 @@ import PropTypes from "prop-types"; import React from 'react'; +import ReactJson from "react-json-view"; import {Row, Col, Table} from "reactstrap"; -import JSONTree from 'react-json-tree'; import GasStationContainer from "../containers/GasStationContainer"; import {formatContractForDisplay} from '../utils/presentation'; import CopyButton from './CopyButton'; @@ -32,9 +32,9 @@ const Contract = ({contract}) => {

ABI

- - {contract.abiDefinition && } + {contract.abiDefinition && }

Bytecode

@@ -42,7 +42,6 @@ const Contract = ({contract}) => { title="Copy bytecode to clipboard"/> {contract.runtimeBytecode}
- ); diff --git a/embark-ui/src/components/CopyButton.css b/embark-ui/src/components/CopyButton.css index d32b1fad5..b33438afd 100644 --- a/embark-ui/src/components/CopyButton.css +++ b/embark-ui/src/components/CopyButton.css @@ -5,4 +5,5 @@ border-top-left-radius: 0; border-bottom-right-radius: 0; cursor: pointer; + z-index: 100; } diff --git a/embark-ui/src/components/CopyButton.js b/embark-ui/src/components/CopyButton.js index a29fa6996..5e0fd8bdf 100644 --- a/embark-ui/src/components/CopyButton.js +++ b/embark-ui/src/components/CopyButton.js @@ -16,7 +16,10 @@ const CopyButton = ({text, onCopy, title, size}) => ( ); CopyButton.propTypes = { - text: PropTypes.string.isRequired, + text: PropTypes.oneOfType([ + PropTypes.string, + PropTypes.number + ]).isRequired, onCopy: PropTypes.func, title: PropTypes.string, size: PropTypes.number diff --git a/embark-ui/src/components/Logs.css b/embark-ui/src/components/Logs.css index 57c1333db..0744a905d 100644 --- a/embark-ui/src/components/Logs.css +++ b/embark-ui/src/components/Logs.css @@ -5,7 +5,7 @@ font-size: 14px; color: white; padding: 10px; - border-radius: 8px; + border-radius: .25rem; max-height: 350px; overflow: auto; -} \ No newline at end of file +} diff --git a/embark-ui/src/components/Logs.js b/embark-ui/src/components/Logs.js index 9767bf856..51bc71bb0 100644 --- a/embark-ui/src/components/Logs.js +++ b/embark-ui/src/components/Logs.js @@ -1,3 +1,4 @@ +import PropTypes from "prop-types"; import React from 'react'; import autoscroll from 'autoscroll-react'; @@ -13,4 +14,8 @@ class Logs extends React.Component { } } +Logs.propTypes = { + children: PropTypes.object +}; + export default autoscroll(Logs); diff --git a/embark-ui/src/index.css b/embark-ui/src/index.css index d7e12ede1..6f5d86c41 100644 --- a/embark-ui/src/index.css +++ b/embark-ui/src/index.css @@ -24,3 +24,8 @@ .hidden { display: none; } + + +.react-json-view { + border-radius: .25rem; +}