fix conflicts
This commit is contained in:
parent
02b191e597
commit
011ca9310b
|
@ -3,3 +3,9 @@
|
|||
exports.render = function(req, res) {
|
||||
res.render('index');
|
||||
};
|
||||
|
||||
exports.version = function(req, res) {
|
||||
var pjson = require('../../package.json');
|
||||
res.json({version: pjson.version});
|
||||
};
|
||||
|
||||
|
|
|
@ -41,4 +41,5 @@ script(type='text/javascript', src='/js/controllers/transactions.js')
|
|||
script(type='text/javascript', src='/js/controllers/address.js')
|
||||
script(type='text/javascript', src='/js/controllers/search.js')
|
||||
script(type='text/javascript', src='/js/controllers/status.js')
|
||||
script(type='text/javascript', src='/js/controllers/footer.js')
|
||||
script(type='text/javascript', src='/js/init.js')
|
||||
|
|
|
@ -5,6 +5,7 @@ module.exports = function(app, historicSync) {
|
|||
//Home route
|
||||
var index = require('../app/controllers/index');
|
||||
app.get('/', index.render);
|
||||
app.get('/api/version', index.version);
|
||||
|
||||
//Block routes
|
||||
var blocks = require('../app/controllers/blocks');
|
||||
|
|
|
@ -238,13 +238,17 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
|
|||
background-color: #373D42;
|
||||
border-top: 4px solid #656E76;
|
||||
color: #fff;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
#footer .insight {
|
||||
#footer a.insight {
|
||||
font-size: 20px;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
#footer a.insight small {
|
||||
font-size: 11px;
|
||||
}
|
||||
.line-footer {
|
||||
border-top: 2px dashed #ccc;
|
||||
}
|
||||
|
|
|
@ -0,0 +1,15 @@
|
|||
'use strict';
|
||||
|
||||
angular.module('insight.system').controller('FooterController',
|
||||
function ($scope, get_socket, Version) {
|
||||
|
||||
var getVersion = function() {
|
||||
Version.get({},
|
||||
function(res) {
|
||||
$scope.version = res.version;
|
||||
});
|
||||
};
|
||||
|
||||
$scope.version = getVersion();
|
||||
|
||||
});
|
|
@ -28,7 +28,7 @@ angular.module('insight.system').controller('HeaderController',
|
|||
|
||||
socket.on('block', function(block) {
|
||||
var blockHash = block.hash.toString();
|
||||
console.log('Update Height');
|
||||
console.log('Updated Blocks Height!');
|
||||
getBlock(blockHash);
|
||||
});
|
||||
|
||||
|
|
|
@ -1,7 +1,13 @@
|
|||
'use strict';
|
||||
|
||||
//Global service for global variables
|
||||
angular.module('insight.system').factory('Global',
|
||||
angular.module('insight.system').factory('Global',[
|
||||
function() {
|
||||
}
|
||||
]);
|
||||
|
||||
angular.module('insight.system').factory('Version',
|
||||
function($resource) {
|
||||
return $resource('/api/version');
|
||||
});
|
||||
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
<div class="container">
|
||||
<a class="insight m10v pull-right" href="/"><small>Insight v0.0.1</small></a>
|
||||
<div class="container" data-ng-controller="FooterController">
|
||||
<a class="insight m10v pull-right" href="/">Insight <small>API v{{version}}</small></a>
|
||||
</div>
|
||||
|
|
Loading…
Reference in New Issue