Merge branch 'master' of github.com:bitpay/insight into bug/block-reward

README.md

@@ -25,6 +25,8 @@ bitcoind must be running and must have finished downloading the blockchain **bef
 * **NPM** - Node.js package manager, should be automatically installed when you get node.js.
 
 ## Quick Install
+  Check the Prerequisites section above before installing.
+
   To install Insight, clone the main repository:
 
     $ git clone git@github.com:bitpay/insight.git && cd insight

app/views/includes/head.jade

@@ -14,6 +14,9 @@ head
   link(rel='stylesheet', href='//fonts.googleapis.com/css?family=Ubuntu:300,400,500,700,400italic')
   link(rel='stylesheet', href='/lib/bootstrap/dist/css/bootstrap.min.css')
   link(rel='stylesheet', href='/css/main.min.css')
+  
+  if (config.keys.segmentio)
     script(type='text/javascript').
-    window.analytics||(window.analytics=[]),window.analytics.methods=['identify','track','trackLink','trackForm','trackClick','trackSubmit','page','pageview','ab','alias','ready','group','on','once','off'],window.analytics.factory=function(t){return function(){var a=Array.prototype.slice.call(arguments);return a.unshift(t),window.analytics.push(a),window.analytics}};for(var i=0;i<window.analytics.methods.length;i++){var method=window.analytics.methods[i];window.analytics[method]=window.analytics.factory(method)}window.analytics.load=function(t){var a=document.createElement('script');a.type='text/javascript',a.async=!0,a.src=('https:'===document.location.protocol?'https://':'http://')+'d2dq2ahtl5zl1z.cloudfront.net/analytics.js/v1/'+t+'/analytics.min.js';var n=document.getElementsByTagName('script')[0];n.parentNode.insertBefore(a,n)},window.analytics.SNIPPET_VERSION='2.0.8',window.analytics.load('spackxb01g');
+      window.analytics||(window.analytics=[]),window.analytics.methods=['identify','track','trackLink','trackForm','trackClick','trackSubmit','page','pageview','ab','alias','ready','group','on','once','off'],window.analytics.factory=function(t){return function(){var a=Array.prototype.slice.call(arguments);return a.unshift(t),window.analytics.push(a),window.analytics}};for(var i=0;i<window.analytics.methods.length;i++){var method=window.analytics.methods[i];window.analytics[method]=window.analytics.factory(method)}window.analytics.load=function(t){var a=document.createElement('script');a.type='text/javascript',a.async=!0,a.src=('https:'===document.location.protocol?'https://':'http://')+'d2dq2ahtl5zl1z.cloudfront.net/analytics.js/v1/'+t+'/analytics.min.js';var n=document.getElementsByTagName('script')[0];n.parentNode.insertBefore(a,n)},window.analytics.SNIPPET_VERSION='2.0.8',
+      window.analytics.load('#{config.keys.segmentio}');
       window.analytics.page();

config/config.js

@@ -68,4 +68,7 @@ module.exports = {
 
   // Time to refresh the currency rate. In minutes
   currencyRefresh: 10
+  , keys: {
+      segmentio: process.env.INSIGHT_SEGMENTIO_KEY
+    }
 };

config/express.js

@@ -45,6 +45,12 @@ module.exports = function(app, historicSync, peerSync) {
   //dynamic helpers
   app.use(helpers(config.appName));
 
+  // manual helpers
+  app.use(function(req, res, next) {
+    app.locals.config = config;
+    next();
+  });
+
   //routes should be at the last
   app.use(app.router);
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "insight-bitcore",
-  "version": "0.0.1",
+  "version": "0.1.0",
   "author": {
     "name": "Ryan X Charles",
     "email": "ryan@bitpay.com"