gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove template path, load correct javascript in universal header

Browse Source
This commit is contained in:
terakilobyte
2015-05-06 09:10:15 -04:00
parent c61e3c8ed2
commit adaa3cdece
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app.js
View File

@ -214,6 +214,8 @@ app.use(function (req, res, next) {
next(); next();
}); });
app.use(express.static(__dirname + '/public', {maxAge: 86400000 }));
app.use(function (req, res, next) { app.use(function (req, res, next) {
// Remember original destination before login. // Remember original destination before login.
var path = req.path.split('/')[1]; var path = req.path.split('/')[1];
@ -225,9 +227,6 @@ app.use(function (req, res, next) {
req.session.returnTo = req.path; req.session.returnTo = req.path;
next(); next();
}); });
app.use(express.static(__dirname + '/public', {maxAge: 86400000 }));
app.use('/template', express.static(__dirname +
'/public/bower_components/angular-ui-bootstrap/template'));
/** /**
* Main routes. * Main routes.

2
controllers/user.js
View File

@ -10,8 +10,6 @@ var _ = require('lodash'),
resources = require('./resources'), resources = require('./resources'),
R = require('ramda'); R = require('ramda');
/** /**
* GET /signin * GET /signin
* Siginin page. * Siginin page.

2
views/partials/universal-head.jade
View File

@ -34,6 +34,8 @@ script.
// Leave alone below // Leave alone below
script(src="/js/main.js") script(src="/js/main.js")
script(src="/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js")
link(rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Lato:400|Inconsolata") link(rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Lato:400|Inconsolata")
link(rel="stylesheet" type="text/css" href="/bower_components/cal-heatmap/cal-heatmap.css") link(rel="stylesheet" type="text/css" href="/bower_components/cal-heatmap/cal-heatmap.css")