From f74df0dd1eb8ac90dd85c18ce2f7356ea7d0df7c Mon Sep 17 00:00:00 2001 From: LianaHus Date: Wed, 13 Apr 2016 13:54:20 +0200 Subject: [PATCH 1/4] modify placeholder text --- src/txBrowser.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/txBrowser.js b/src/txBrowser.js index a46695b647..0bf7706044 100644 --- a/src/txBrowser.js +++ b/src/txBrowser.js @@ -24,8 +24,8 @@ module.exports = React.createClass({ return (

Transaction details

- - + +
); From 7154a5062ac620df0d61534b5e77a6c4abde20a5 Mon Sep 17 00:00:00 2001 From: LianaHus Date: Wed, 13 Apr 2016 17:45:59 +0200 Subject: [PATCH 2/4] some usefull scripts added to package.json --- package.json | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 4686902908..4cb70d2a6a 100644 --- a/package.json +++ b/package.json @@ -2,17 +2,31 @@ "name": "remix", "version": "0.0.1", "description": "Ethereum IDE and tools for the web", + "contributors": [ + { + "name": "Yann Levreau", + "email": "yann@ethdev.com" + }, + { + "name": "Liana Husikyan", + "email": "liana@ethdev.com" + } + ], "main": "index.js", "dependencies": { "babel-preset-react": "^6.5.0", "babelify": "^7.2.0", "react": "^15.0.1", - "react-dom": "^15.0.1" + "react-dom": "^15.0.1", + "web3": "^0.15.3" + }, + "devDependencies": { + "web3": "^0.15.3" }, - "devDependencies": {}, "scripts": { - "test": "echo \"Error: no test specified\" && exit 1", - "build": "browserify -t [ babelify --presets [ react ] ] src/index.js -o build/app.js" + "install": "npm install --save react react-dom; npm install -g browserify; npm install --save babelify babel-preset-react; npm install web3", + "start_node": "cd ../webthree/eth; ./eth --rpccorsdomain \"*\" -j --admin-via-http -v 0", + "build": "mkdir -p build; browserify -t [ babelify --presets [ react ] ] src/index.js -o build/app.js" }, "repository": { "type": "git", From 8c0a82d5a81ff35a5e71a4d870bd9644fb2f3db5 Mon Sep 17 00:00:00 2001 From: LianaHus Date: Wed, 13 Apr 2016 17:56:46 +0200 Subject: [PATCH 3/4] fix run node --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4cb70d2a6a..e843ce8b9c 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ }, "scripts": { "install": "npm install --save react react-dom; npm install -g browserify; npm install --save babelify babel-preset-react; npm install web3", - "start_node": "cd ../webthree/eth; ./eth --rpccorsdomain \"*\" -j --admin-via-http -v 0", + "start_node": "../../build/webthree/eth/./eth --rpccorsdomain "*" -j --admin-via-http -v 0", "build": "mkdir -p build; browserify -t [ babelify --presets [ react ] ] src/index.js -o build/app.js" }, "repository": { From 3c9fc69d8a84a6b381ac3287fd8aeb53cfa98af7 Mon Sep 17 00:00:00 2001 From: LianaHus Date: Wed, 13 Apr 2016 18:03:07 +0200 Subject: [PATCH 4/4] fix --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e843ce8b9c..aa46df8cce 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ }, "scripts": { "install": "npm install --save react react-dom; npm install -g browserify; npm install --save babelify babel-preset-react; npm install web3", - "start_node": "../../build/webthree/eth/./eth --rpccorsdomain "*" -j --admin-via-http -v 0", + "start_node": "../../build/webthree/eth/./eth --rpccorsdomain \"*\" -j --admin-via-http -v 0", "build": "mkdir -p build; browserify -t [ babelify --presets [ react ] ] src/index.js -o build/app.js" }, "repository": {