finish moving away from connectAssets

This commit is contained in:
Quincy Larson
2015-05-03 16:45:34 -07:00
parent 14b99b7b67
commit 961096cf49
23 changed files with 6 additions and 33807 deletions

25
app.js
View File

@@ -30,9 +30,9 @@ var express = require('express'),
mongoose = require('mongoose'),
passport = require('passport'),
expressValidator = require('express-validator'),
connectAssets = require('connect-assets'),
request = require('request'),
forceDomain = require('forcedomain'),
lessMiddleware = require('less-middleware'),
/**
* Controllers (route handlers).
@@ -88,21 +88,9 @@ if (process.env.NODE_ENV === 'production') {
}
app.use(compress());
var oneYear = 31557600000;
// todo
// another app.use(express.static...) call
app.use(express.static(__dirname + '/public', {maxAge: oneYear}));
app.use(lessMiddleware(__dirname + '/public'));
app.use(express.static(__dirname + '/public', {maxAge: 86400000 }));
app.use("/template", express.static(__dirname + "/public/bower_components/angular-ui-bootstrap/template"));
app.use(connectAssets({
paths: [
path.join(__dirname, 'public/css'),
path.join(__dirname, 'public/js'),
path.join(__dirname, '/bower_components')
],
build: false,
buildDir: false,
helperContext: app.locals
}));
app.use(logger('dev'));
app.use(bodyParser.json());
app.use(bodyParser.urlencoded({extended: true}));
@@ -243,13 +231,6 @@ app.use(function (req, res, next) {
next();
});
app.use(
express.static(path.join(__dirname, 'public'), {maxAge: 31557600000})
);
// todo
// why are there two express.static declarations?
app.use(express.static(__dirname + '/public', { maxAge: 86400000 }));
/**
* Main routes.
*/