build overhaul + basic structure

6 files changed, 66 insertions, 25 deletions

diff --git a/app/scripts/background.js b/app/scripts/background.js
index 87a27d0db..1557814b4 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -1,9 +1,41 @@
-'use strict';
+const web3 = require('web3')
 
-chrome.runtime.onInstalled.addListener(function (details) {
-  console.log('previousVersion', details.previousVersion);
-});
+const identitiesUrl = 'https://alpha.metamask.io/identities/'
+const messagingChannelName = 'metamask'
 
-chrome.browserAction.setBadgeText({text: '2'});
 
-console.log('\'Allo \'Allo! Event Page for Browser Action');
+// setup badge click handler
+chrome.browserAction.onClicked.addListener(function(activeTab) {
+  chrome.tabs.create({ url: identitiesUrl })
+})
+
+// setup page<->plugin messaging
+chrome.runtime.onConnect.addListener(function(port) {
+  console.assert(port.name == messagingChannelName)
+  port.onMessage.addListener(function(msg) {
+    console.log(msg)
+    port.postMessage({answer: 'Madame'})
+  })
+})
+
+// update badge text
+chrome.browserAction.setBadgeText({text: '2'})
+
+// listen to storage changes
+chrome.storage.onChanged.addListener(function(changes, namespace) {
+  for (key in changes) {
+    var storageChange = changes[key]
+    console.log('Storage key "%s" in namespace "%s" changed. ' +
+                'Old value was "%s", new value is "%s".',
+                key,
+                namespace,
+                storageChange.oldValue,
+                storageChange.newValue)
+  }
+})
+
+// Save it using the Chrome extension storage API.
+chrome.storage.sync.set({'zzz': 22}, function() {
+  // Notify that we saved.
+  console.log('Settings saved')
+})
\ No newline at end of file
diff --git a/app/scripts/contentscript.js b/app/scripts/contentscript.js
index 23df227b4..2e50ae3a5 100644
--- a/app/scripts/contentscript.js
+++ b/app/scripts/contentscript.js
@@ -1,5 +1,16 @@
+const web3 = require('web3')
+
+// inject script tag
 var scriptTag = document.createElement('script')
 scriptTag.src = chrome.extension.getURL('scripts/web3.js')
-
 scriptTag.onload = function() { debugger; this.parentNode.removeChild(this) }
-;(document.head||document.documentElement).appendChild(scriptTag)
+var container = document.head || document.documentElement
+container.appendChild(scriptTag)
+
+// listen for messages
+var port = chrome.runtime.connect({name: 'metamask'})
+port.postMessage({joke: 'Knock knock'})
+port.onMessage.addListener(function(msg) {
+	console.log(msg)
+    // port.postMessage({answer: 'Madame'})
+})
\ No newline at end of file
diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js
new file mode 100644
index 000000000..02bf226cb
--- /dev/null
+++ b/app/scripts/inpage.js
@@ -0,0 +1,15 @@
+const web3 = require('web3')
+const MetamaskProvider = require('./lib/metamask-provider.js')
+
+const rpcUrl = 'https://rpc.metamask.io'
+
+
+var provider = new MetamaskProvider(forwardPayload, rpcUrl)
+web3.setProvider(provider)
+
+// injecting web3
+window.web3 = web3
+
+function forwardPayload(){
+  debugger
+}
\ No newline at end of file
diff --git a/app/scripts/metamask-provider.js b/app/scripts/lib/metamask-provider.js
index c52de82b4..c52de82b4 100644
--- a/app/scripts/metamask-provider.js
+++ b/app/scripts/lib/metamask-provider.js
diff --git a/app/scripts/popup.js b/app/scripts/popup.js
deleted file mode 100644
index 815abcb42..000000000
--- a/app/scripts/popup.js
+++ /dev/null
@@ -1,3 +0,0 @@
-'use strict';
-
-console.log('\'Allo \'Allo! Popup');
diff --git a/app/scripts/web3.js b/app/scripts/web3.js
deleted file mode 100644
index f0fec7b06..000000000
--- a/app/scripts/web3.js
+++ /dev/null
@@ -1,14 +0,0 @@
-const web3 = require('web3')
-const MetamaskProvider = require('./metamask-provider.js')
-
-
-var provider = new MetamaskProvider(forwardPayload, 'https://rpc.metamask.io')
-web3.setProvider(provider)
-
-console.log('injecting web3....')
-window.web3 = web3
-
-
-function forwardPayload(){
-  debugger
-}
\ No newline at end of file