Merge branch 'master' of https://github.com/vulcanize/ethersignal

vulcanize · Jul 8, 2016 · dab9bd7 · dab9bd7
2 parents 85a8f3a + e824715
commit dab9bd7
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 25 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
-node_modules/*
+node_modules
 *.swp
diff --git a/README.md b/README.md
@@ -1 +1,4 @@
 # Ether Signal
+
+Contract on Testnet:
+http://testnet.etherscan.io/address/0x851a78f09511bf510ad27036f5ff7c8901fdd2e2#code
diff --git a/ui/README.md b/ui/README.md
@@ -0,0 +1,6 @@
+### Installation
+```
+$ npm install
+```
+
+Load this directory as unpacked chrome extension
diff --git a/ui/chrome-extension.html → ui/browserAction.html b/ui/chrome-extension.html → ui/browserAction.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <script src="node_modules/web3/dist/web3.js"></script>
-    <script src="js/action.js"></script>
+    <script src="js/browserAction.js"></script>
   </head>
   <body>
     <div class="content">

diff --git a/ui/directives/accountSelector.html b/ui/directives/accountSelector.html
@@ -1,11 +1,11 @@
 <div>
-	<div class="menu col-2"> 
+	<div class="menu col-2">
 		<ul>
 			<li><button ng-click="newProposal()"> + New Proposal </button></li>
 		</ul>
 	</div>
 	<div class="col-2 right-align">
-		<img src="lock.png">
+		<img src="img/lock.png">
 		<select ng-model="user.defaultAccount">
 			<option value="coinbase">Select Account</option>
 			<option ng-repeat="account in accounts" value="{{account}}">{{ account }}</option>

diff --git a/ui/js/action.js → ui/js/browserAction.js b/ui/js/action.js → ui/js/browserAction.js
@@ -5,12 +5,12 @@ web3.setProvider(new web3.providers.HttpProvider());
 
 document.addEventListener('DOMContentLoaded', function(){
 	document.getElementById('openPane').addEventListener('click', function(evt) {
-	    chrome.tabs.create({windowId: window.id, url:chrome.extension.getURL('etherSignal.html')});
+	    chrome.tabs.create({url:chrome.extension.getURL('etherSignal.html')});
 	}, false);
 	var latest = web3.eth.filter('latest');
 	latest.watch(function(err,blockHash){
 		web3.eth.getBlock(blockHash, false, function(err, block) {
 			console.log(block);
 		});
-	});	
+	});
 }, false);
diff --git a/ui/js/content_script.js b/ui/js/content_script.js
diff --git a/ui/manifest.json b/ui/manifest.json
@@ -4,14 +4,14 @@
   "name": "Chrome Ethereum",
   "description": "Ethereum for Chrome",
   "version": "0.1",
-  "icons": { "16": "ether16.png",
-           "48": "ether48.png",
-          "128": "ether128.png" },
+  "icons": { "16": "img/ether16.png",
+           "48": "img/ether48.png",
+          "128": "img/ether128.png" },
   "background": {
     "scripts": []
   },
   "browser_action": {
-    "default_popup": "action.html"
+    "default_popup": "browserAction.html"
   },
   "commands" : {
     "_execute_browser_action": {

diff --git a/ui/package.json b/ui/package.json
@@ -21,6 +21,7 @@
   },
   "homepage": "https://github.com/thebalaa/chrome-ethereum#readme",
   "dependencies": {
-    "angular": "^1.5.7"
+    "angular": "^1.5.7",
+    "web3": "^0.17.0-alpha"
   }
 }