beenull/tellform
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

updated npm dependencies

Browse source
This commit is contained in:
David Baldwynn 2015-11-06 11:22:46 -08:00
parent c499652158
commit b7bdd067b6
3 changed files with 22 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
app/routes/forms.server.routes.js
View file

@ -9,25 +9,25 @@ var users = require('../../app/controllers/users.server.controller'),
config = require('../../config/config');
// Setting the pdf upload route and folder
// var upload = multer({ dest: config.tmpUploadPath,
// rename: function (fieldname, filename) {
// return Date.now();
// },
// onFileUploadStart: function (file) {
// //Check to make sure we can only upload images and pdfs
// console.log(file.originalname + ' is starting ...');
// },
// onFileUploadComplete: function (file, req, res) {
// console.log(file.originalname + ' uploaded to ' + file.path);
// // console.log('\n\nheadersSent in onFileUploadComplete: ', res.headersSent);
// // res.status(200).send(file);
// }
// });
var upload = multer({ dest: config.tmpUploadPath,
rename: function (fieldname, filename) {
return Date.now();
},
onFileUploadStart: function (file) {
//Check to make sure we can only upload images and pdfs
console.log(file.originalname + ' is starting ...');
},
onFileUploadComplete: function (file, req, res) {
console.log(file.originalname + ' uploaded to ' + file.path);
// console.log('\n\nheadersSent in onFileUploadComplete: ', res.headersSent);
// res.status(200).send(file);
}
});
module.exports = function(app) {
// Form Routes
app.route('/upload/pdf')
.post(users.requiresLogin, forms.uploadPDF);
.post(users.requiresLogin, upload.single('file'), forms.uploadPDF);
app.route('/forms')
.get(users.requiresLogin, forms.list)

17
config/config.js
View file

@ -50,17 +50,14 @@ module.exports.getGlobbedFiles = function(globPatterns, removeRoot) {
if (urlRegex.test(globPatterns)) {
output.push(globPatterns);
} else {
glob(globPatterns, {
sync: true
}, function(err, files) {
if (removeRoot) {
files = files.map(function(file) {
return file.replace(removeRoot, '');
});
}
var files = glob.sync(globPatterns)
if (removeRoot) {
files = files.map(function(file) {
return file.replace(removeRoot, '');
});
}
output = _.union(output, files);
});
output = _.union(output, files);
}
}

16
config/express.js
View file

@ -108,22 +108,6 @@ module.exports = function(db) {
app.use('/', express.static(path.resolve('./public')));
app.use('/uploads', express.static(path.resolve('./uploads')));
// Setting the pdf upload route and folder
app.use(multer({ dest: config.tmpUploadPath,
rename: function (fieldname, filename) {
return Date.now();
},
onFileUploadStart: function (file) {
//Check to make sure we can only upload images and pdfs
console.log(file.originalname + ' is starting ...');
},
onFileUploadComplete: function (file, req, res) {
console.log(file.originalname + ' uploaded to ' + file.path);
// console.log('\n\nheadersSent in onFileUploadComplete: ', res.headersSent);
// res.status(200).send(file);
}
}));
// CookieParser should be above session
app.use(cookieParser());