From bdaf94059363bb7319534cb152570b43ad3ef97b Mon Sep 17 00:00:00 2001 From: Frankie Date: Wed, 26 Oct 2016 13:42:56 -0700 Subject: [PATCH 1/3] Add more info about first use --- library/README.md | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/library/README.md b/library/README.md index 7dc291564..b6b944051 100644 --- a/library/README.md +++ b/library/README.md @@ -3,4 +3,22 @@ start the dual servers (dapp + mascara) node server.js ``` -open the example dapp at `http://localhost:9002/` \ No newline at end of file +open the example dapp at `http://localhost:9002/` + +*You will need to build MetaMask in order for this to work* +``` +gulp dev +``` +to build MetaMask and have it live reload if you make changes + + +## First time use: + +- navigate to: http://127.0.0.1:9001/popup/popup.html +- Create an Account +- go back too http://localhost:9002/ +- open devTools +- click Sync Tx + +### Todos +- Look into using [Service Workers](https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API) From 5ae45fe17f4e897b67852f18fd8d2153f23d09eb Mon Sep 17 00:00:00 2001 From: Frankie Date: Wed, 26 Oct 2016 13:43:26 -0700 Subject: [PATCH 2/3] Fix the size of the pop-up --- library/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/library/index.js b/library/index.js index ab341f1f8..e4654128a 100644 --- a/library/index.js +++ b/library/index.js @@ -4,7 +4,7 @@ const setupProvider = require('./lib/setup-provider.js') // // setup web3 // - +console.log('hello world im here') var provider = setupProvider() hijackProvider(provider) var web3 = new Web3(provider) @@ -27,7 +27,7 @@ var shouldPop = false window.addEventListener('click', function(){ if (!shouldPop) return shouldPop = false - window.open('http://127.0.0.1:9001/popup/popup.html', '', 'width=1000') + window.open('http://127.0.0.1:9001/popup/popup.html', '', 'width=360 height=500') console.log('opening window...') }) @@ -41,4 +41,4 @@ function hijackProvider(provider){ } _super(payload, cb) } -} \ No newline at end of file +} From a75edcdc187a3d0fcda6f4e63d3647b7253f0e38 Mon Sep 17 00:00:00 2001 From: Frankie Date: Wed, 26 Oct 2016 13:57:15 -0700 Subject: [PATCH 3/3] Fix typos and clean up --- library/README.md | 2 +- library/index.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/library/README.md b/library/README.md index b6b944051..6a6574dbd 100644 --- a/library/README.md +++ b/library/README.md @@ -16,7 +16,7 @@ to build MetaMask and have it live reload if you make changes - navigate to: http://127.0.0.1:9001/popup/popup.html - Create an Account -- go back too http://localhost:9002/ +- go back to http://localhost:9002/ - open devTools - click Sync Tx diff --git a/library/index.js b/library/index.js index e4654128a..b5f4f6637 100644 --- a/library/index.js +++ b/library/index.js @@ -4,7 +4,6 @@ const setupProvider = require('./lib/setup-provider.js') // // setup web3 // -console.log('hello world im here') var provider = setupProvider() hijackProvider(provider) var web3 = new Web3(provider)