Merge pull request #15 from Firescar96/master

Fix bad merge (#14), remove process.env call
etherparty · Aug 2, 2016 · d3e780d · d3e780d
2 parents 0bc1cd9 + 57f0bda
commit d3e780d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/app/app.js b/app/app.js
@@ -18,16 +18,16 @@ angular.module('ethExplorer', ['ngRoute','ui.bootstrap'])
                 controller: 'transactionInfosCtrl'
             }).
             when('/address/:addressId', {
-                templateUrl: 'views/addressInfos.html',
-                controller: 'addressInfosCtrl'
+                templateUrl: 'views/addressInfo.html',
+                controller: 'addressInfoCtrl'
             }).
             otherwise({
                 redirectTo: '/'
             });
     }])
     .run(function($rootScope) {
         var web3 = require('web3');
-        var eth_node_url = process.env["ETHEREUM_URL"] || "http://localhost:8545";
+        var eth_node_url = 'http://localhost:8545';
         web3.setProvider(new web3.providers.HttpProvider(eth_node_url));
         $rootScope.web3=web3;
         function sleepFor( sleepDuration ){

diff --git a/app/index.html b/app/index.html
@@ -49,7 +49,7 @@
 
 <!--Controllers-->
   <script src="scripts/controllers/mainController.js"></script>
-  <script src="scripts/controllers/addressInfosController.js"></script>
+  <script src="scripts/controllers/addressInfoController.js"></script>
   <script src="scripts/controllers/blockInfosController.js"></script>
   <script src="scripts/controllers/transactionInfosController.js"></script>
 

diff --git a/...pts/controllers/addressInfosController.js → ...ipts/controllers/addressInfoController.js b/...pts/controllers/addressInfosController.js → ...ipts/controllers/addressInfoController.js
@@ -1,5 +1,5 @@
 angular.module('ethExplorer')
-    .controller('addressInfosCtrl', function ($rootScope, $scope, $location, $routeParams, $q) {
+    .controller('addressInfoCtrl', function ($rootScope, $scope, $location, $routeParams, $q) {
 
       $scope.init=function(){
 
@@ -34,4 +34,4 @@ angular.module('ethExplorer')
 
       $scope.init();
 
-    });
+    });
diff --git a/app/views/addressInfos.html b/app/views/addressInfos.html