Merge pull request #173 from cmgustavo/bug/01RoutingURL

Important Fix on URL routing (Node.js catch all request first, then thro...
This commit is contained in:
Mario Colque 2014-01-30 13:36:15 -08:00
commit c68fd20b8b
4 changed files with 7 additions and 18 deletions

View File

@ -1,7 +1,5 @@
#footer(data-ng-include="'/views/footer.html'", role='navigation')
//script(type='text/javascript', src='/lib/jquery/jquery.min.js')
//script(type='text/javascript', src='/lib/bootstrap/dist/js/bootstrap.min.js')
script(type='text/javascript', src='/socket.io/socket.io.js')
script(type='text/javascript', src='/lib/momentjs/moment.js')
script(type='text/javascript', src='/lib/qrcode-generator/js/qrcode.js')

View File

@ -49,12 +49,14 @@ module.exports = function(app, historicSync) {
//dynamic helpers
app.use(helpers(config.app.name));
// IMPORTAMT: for html5mode, this line must to be before app.router
app.use(express.static(config.root + '/public'));
//routes should be at the last
app.use(app.router);
//Setting the fav icon and static folder
app.use(express.favicon());
app.use(express.static(config.root + '/public'));
//Assume "not found" in the error msgs is a 404. this is somewhat silly, but valid, you can do whatever you like, set properties, use instanceof etc.
app.use(function(err, req, res, next) {

View File

@ -2,20 +2,6 @@
module.exports = function(app, historicSync) {
//Home route
var index = require('../app/controllers/index');
app.get('/', index.render);
app.get('/blocks', index.render);
app.get('/status', index.render);
app.get('/blocks-date/*', index.render);
app.get('/block-index/*', index.render);
app.get('/block/*', index.render);
app.get('/tx/*', index.render);
app.get('/address/*', index.render);
app.get('/api/version', index.version);
//Block routes
var blocks = require('../app/controllers/blocks');
app.get('/api/blocks', blocks.list);
@ -44,4 +30,8 @@ module.exports = function(app, historicSync) {
app.get('/api/sync', st.sync);
//Home route
var index = require('../app/controllers/index');
app.get('/api/version', index.version);
app.get('*', index.render);
};

View File

@ -50,7 +50,6 @@ angular.module('insight')
scope.$on('$destroy', function() {
client.off('mousedown', onMousedown);
client.unglue(elm);
});
});
}