diff --git a/app/views/index.jade b/app/views/index.jade index 9e80548..310005d 100755 --- a/app/views/index.jade +++ b/app/views/index.jade @@ -3,9 +3,3 @@ extends layouts/default block content section.container(data-ng-view) - div.row - div.span4 - Test - div.span4 - Test2 - diff --git a/app/views/sockets/main.js b/app/views/sockets/main.js index 5ac73e5..b6d9db4 100644 --- a/app/views/sockets/main.js +++ b/app/views/sockets/main.js @@ -5,9 +5,8 @@ var Transaction = require('../../models/Transaction'); module.exports = function(app, io) { io.set('log level', 1); // reduce logging io.sockets.on('connection', function(socket) { - socket.emit('tx', Transaction.findOne()); - socket.on('my other event', function(data) { - console.log(data); + Transaction.findOne(function(err, tx) { + socket.emit('tx', tx); }); }); }; diff --git a/public/js/controllers/index.js b/public/js/controllers/index.js index 2cdf594..3681101 100755 --- a/public/js/controllers/index.js +++ b/public/js/controllers/index.js @@ -8,7 +8,8 @@ angular.module('mystery.system').controller('IndexController', ['$scope', 'Globa $(document).ready(function() { var socket = io.connect('http://localhost'); socket.on('tx', function(data) { - console.log(data); + var tx = data; + console.log('Transaction received! '+tx.txid); }); });