removed file upload functionality
This commit is contained in:
parent
87ef21ecae
commit
e292c03050
|
@ -5,30 +5,8 @@
|
||||||
*/
|
*/
|
||||||
var users = require('../../app/controllers/users.server.controller'),
|
var users = require('../../app/controllers/users.server.controller'),
|
||||||
forms = require('../../app/controllers/forms.server.controller'),
|
forms = require('../../app/controllers/forms.server.controller'),
|
||||||
multer = require('multer'),
|
|
||||||
config = require('../../config/config'),
|
config = require('../../config/config'),
|
||||||
auth = require('../../config/passport_helpers'),
|
auth = require('../../config/passport_helpers');
|
||||||
multerS3 = require('multer-s3'),
|
|
||||||
aws = require('aws-sdk');
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Amazon S3 Uploads
|
|
||||||
aws.config.update({region: 'us-west-2'});
|
|
||||||
var s3 = new aws.S3();
|
|
||||||
|
|
||||||
var upload = multer({
|
|
||||||
storage: multerS3({
|
|
||||||
s3: s3,
|
|
||||||
bucket: 'tellform-test',
|
|
||||||
metadata: function (req, file, cb) {
|
|
||||||
cb(null, {fieldName: file.fieldname});
|
|
||||||
},
|
|
||||||
key: function (req, file, cb) {
|
|
||||||
cb(null, Date.now().toString())
|
|
||||||
}
|
|
||||||
})
|
|
||||||
});
|
|
||||||
|
|
||||||
module.exports = function(app) {
|
module.exports = function(app) {
|
||||||
// Form Routes
|
// Form Routes
|
||||||
|
@ -46,9 +24,6 @@ module.exports = function(app) {
|
||||||
.get(auth.isAuthenticatedOrApiKey, forms.hasAuthorization, forms.listSubmissions)
|
.get(auth.isAuthenticatedOrApiKey, forms.hasAuthorization, forms.listSubmissions)
|
||||||
.delete(auth.isAuthenticatedOrApiKey, forms.hasAuthorization, forms.deleteSubmissions);
|
.delete(auth.isAuthenticatedOrApiKey, forms.hasAuthorization, forms.deleteSubmissions);
|
||||||
|
|
||||||
app.route('/forms/:formId([a-zA-Z0-9]+)/submissions/upload')
|
|
||||||
.post(upload.single('file'), forms.uploadTemp);
|
|
||||||
|
|
||||||
// Finish by binding the form middleware
|
// Finish by binding the form middleware
|
||||||
app.param('formId', forms.formByID);
|
app.param('formId', forms.formByID);
|
||||||
};
|
};
|
||||||
|
|
|
@ -25,7 +25,6 @@
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"async": "^1.4.2",
|
"async": "^1.4.2",
|
||||||
"async-boolean-expression-evaluator": "^1.1.1",
|
"async-boolean-expression-evaluator": "^1.1.1",
|
||||||
"aws-sdk": "^2.26.0",
|
|
||||||
"bcrypt": "^0.8.7",
|
"bcrypt": "^0.8.7",
|
||||||
"bcrypt-nodejs": "0.0.3",
|
"bcrypt-nodejs": "0.0.3",
|
||||||
"body-parser": "~1.14.1",
|
"body-parser": "~1.14.1",
|
||||||
|
@ -73,8 +72,6 @@
|
||||||
"mongoose": "~4.4.19",
|
"mongoose": "~4.4.19",
|
||||||
"mongoose-utilities": "~0.1.1",
|
"mongoose-utilities": "~0.1.1",
|
||||||
"morgan": "~1.6.1",
|
"morgan": "~1.6.1",
|
||||||
"multer": "~1.1.0",
|
|
||||||
"multer-s3": "^2.5.0",
|
|
||||||
"nodemailer": "~1.10.0",
|
"nodemailer": "~1.10.0",
|
||||||
"nodemailer-sendgrid-transport": "^0.2.0",
|
"nodemailer-sendgrid-transport": "^0.2.0",
|
||||||
"nodemailer-sparkpost-transport": "^1.0.0",
|
"nodemailer-sparkpost-transport": "^1.0.0",
|
||||||
|
|
10
public/dist/application.js
vendored
10
public/dist/application.js
vendored
|
@ -2431,8 +2431,15 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormField
|
||||||
//Setup UI-Sortable
|
//Setup UI-Sortable
|
||||||
$scope.sortableOptions = {
|
$scope.sortableOptions = {
|
||||||
appendTo: '.dropzone',
|
appendTo: '.dropzone',
|
||||||
|
helper: 'clone',
|
||||||
|
forceHelperSize: true,
|
||||||
|
forcePlaceholderSize: true,
|
||||||
update: function(e, ui) {
|
update: function(e, ui) {
|
||||||
$scope.update(false, $scope.myform, false, true, null);
|
$scope.update(false, $scope.myform, false, false, null);
|
||||||
|
},
|
||||||
|
start: function(e, ui) {
|
||||||
|
console.log(ui.item);
|
||||||
|
console.log(ui.placeholder);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -3405,7 +3412,6 @@ angular.module('forms').directive('submitFormDirective', ['$http', 'TimeCounter'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
SendVisitorData.send($scope.myform, getActiveField(), TimeCounter.getTimeElapsed());
|
|
||||||
};
|
};
|
||||||
|
|
||||||
$rootScope.nextField = $scope.nextField = function(){
|
$rootScope.nextField = $scope.nextField = function(){
|
||||||
|
|
2
public/dist/application.min.css
vendored
2
public/dist/application.min.css
vendored
File diff suppressed because one or more lines are too long
4
public/dist/application.min.js
vendored
4
public/dist/application.min.js
vendored
File diff suppressed because one or more lines are too long
|
@ -40,10 +40,10 @@ angular.module('forms').service('FormFields', [
|
||||||
// name : 'sig',
|
// name : 'sig',
|
||||||
// value : 'Signature'
|
// value : 'Signature'
|
||||||
// },
|
// },
|
||||||
{
|
// {
|
||||||
name : 'file',
|
// name : 'file',
|
||||||
value : 'File Upload'
|
// value : 'File Upload'
|
||||||
},
|
// },
|
||||||
{
|
{
|
||||||
name : 'rating',
|
name : 'rating',
|
||||||
value : 'Rating'
|
value : 'Rating'
|
||||||
|
|
Loading…
Reference in a new issue