From 4cea5e51b2ac6cf4a7932f598d273e4c7d309707 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 2 Jul 2015 17:54:58 -0700 Subject: [PATCH] merged dev with dev_working --- app/controllers/forms.server.controller.js | 80 +++++++------------ app/models/form.server.model.js | 9 --- app/routes/forms.server.routes.js | 4 - app/routes/users.server.routes.js | 6 -- config/express.js | 6 -- .../modules/core/config/core.client.routes.js | 14 +--- .../create-form.client.controller.js | 60 -------------- .../users/config/users.client.config.js | 21 ----- .../users/config/users.client.routes.js | 6 -- 9 files changed, 28 insertions(+), 178 deletions(-) diff --git a/app/controllers/forms.server.controller.js b/app/controllers/forms.server.controller.js index a3d2c4ff..c7938c3a 100644 --- a/app/controllers/forms.server.controller.js +++ b/app/controllers/forms.server.controller.js @@ -41,64 +41,45 @@ exports.uploadPDF = function(files, user, cb) { console.log(_user.username); console.log(config.tmpUploadPath); -<<<<<<< HEAD - // console.log(pdfFile); - - var form = Form.findById(req.body.form._id); - // console.log(req.files); -======= if(files) { console.log('inside uploadPDF'); console.log(files.file[0]); var pdfFile = files.file[0]; ->>>>>>> dev_working if (pdfFile.size === 0) { throw new Error('Files uploaded are EMPTY'); } - fs.exists(pdfFile.path, function(exists) { -<<<<<<< HEAD - console.log(pdfFile.path); - fs.open(pdfFile.path,'r',function(err,fd){ - if (err && err.code === 'ENOENT') { - return res.status(400).send({ - message: 'Did NOT get your file!' - }); - } - return res.status(200); - }); -======= - //If file exists move to user's tmp directory - if(exists) { + //If file exists move to user's tmp directory + fs.open(pdfFile.path,'r',function(err,fd){ + if (err && err.code === 'ENOENT') { + return res.status(400).send({ + message: 'Did NOT get your file!' + }); + } - var newDestination = path.join(config.tmpUploadPath, _user.username); - var stat = null; - try { - stat = fs.statSync(newDestination); - } catch (err) { - fs.mkdirSync(newDestination); - } - if (stat && !stat.isDirectory()) { - console.log('Directory cannot be created'); - throw new Error('Directory cannot be created because an inode of a different type exists at "' + newDestination + '"'); - } - - fs.move(pdfFile.path, path.join(newDestination, pdfFile.name), function (err) { - if (err) { - throw new Error(err.message); - } - pdfFile.path = path.join(newDestination, pdfFile.name); + var stat = null; + try { + stat = fs.statSync(newDestination); + } catch (err) { + fs.mkdirSync(newDestination); + } + if (stat && !stat.isDirectory()) { + console.log('Directory cannot be created'); + throw new Error('Directory cannot be created because an inode of a different type exists at "' + newDestination + '"'); + } + + fs.move(pdfFile.path, path.join(newDestination, pdfFile.name), function (err) { + if (err) { + throw new Error(err.message); + } + pdfFile.path = path.join(newDestination, pdfFile.name); - return cb(pdfFile); - }); - - } else { - throw new Error('Did NOT get your file!'); - } ->>>>>>> dev_working - }); + return cb(pdfFile); + }); + return res.status(200); + }); }else { throw new Error('File NOT uploaded'); } @@ -220,12 +201,6 @@ exports.delete = function(req, res) { }; /** -<<<<<<< HEAD - * Get List of Forms - */ -exports.list = function(req, res) { - Form.find().sort('-created').populate('admin').exec(function(err, forms) { -======= * Get All of Users' Forms */ exports.list = function(req, res) { @@ -234,7 +209,6 @@ exports.list = function(req, res) { if(req.user.isAdmin()) searchObj = {}; Form.find({}).sort('-created').populate('admin').exec(function(err, forms) { ->>>>>>> dev_working if (err) { res.status(400).send({ message: errorHandler.getErrorMessage(err) diff --git a/app/models/form.server.model.js b/app/models/form.server.model.js index 3099f7af..95261df2 100644 --- a/app/models/form.server.model.js +++ b/app/models/form.server.model.js @@ -73,9 +73,6 @@ var FormSchema = new Schema({ }, }); -<<<<<<< HEAD -//Move PDF to permanent location after new PDF is uploaded -======= //Update lastModified everytime we save FormSchema.pre('save', function (next) { this.lastModified = Date.now(); @@ -83,7 +80,6 @@ FormSchema.pre('save', function (next) { }); //Move PDF to permanent location after new template is uploaded ->>>>>>> dev_working FormSchema.pre('save', function (next) { if(this.pdf && this.isModified('pdf')){ @@ -167,11 +163,6 @@ FormSchema.pre('save', function (next) { field.fieldType = _typeConvMap[ field.fieldType+'' ]; } -<<<<<<< HEAD - //Set field defaults - field.created = Date.now(); -======= ->>>>>>> dev_working field.fieldValue = ''; field.created = Date.now(); field.required = true; diff --git a/app/routes/forms.server.routes.js b/app/routes/forms.server.routes.js index e0e0d2e5..b2176a69 100644 --- a/app/routes/forms.server.routes.js +++ b/app/routes/forms.server.routes.js @@ -22,11 +22,7 @@ module.exports = function(app) { .get(forms.read) .post(forms.createSubmission) .put(users.requiresLogin, forms.hasAuthorization, forms.update) -<<<<<<< HEAD - .delete(users.requiresLogin, forms.hasAuthorization,forms.delete); -======= .delete(users.requiresLogin, forms.hasAuthorization, forms.delete); ->>>>>>> dev_working // Finish by binding the form middleware app.param('formId', forms.formByID); diff --git a/app/routes/users.server.routes.js b/app/routes/users.server.routes.js index 90f47a7a..01925126 100755 --- a/app/routes/users.server.routes.js +++ b/app/routes/users.server.routes.js @@ -10,15 +10,9 @@ module.exports = function(app) { var users = require('../../app/controllers/users.server.controller'); // Setting up the users profile api -<<<<<<< HEAD - app.route('/users/me').get(users.me); - app.route('/users').put(users.requiresLogin, users.update); - app.route('/users/accounts').delete(users.removeOAuthProvider); -======= app.route('/users/me').get(users.requiresLogin, users.me); app.route('/users').put(users.requiresLogin, users.update); app.route('/users/accounts').delete(users.requiresLogin, users.removeOAuthProvider); ->>>>>>> dev_working // Setting up the users password api app.route('/users/password').post(users.requiresLogin, users.changePassword); diff --git a/config/express.js b/config/express.js index 4d6fe4c7..b85d1ae4 100755 --- a/config/express.js +++ b/config/express.js @@ -106,11 +106,6 @@ module.exports = function(db) { //Check to make sure we can only upload images and pdfs console.log(file.originalname + ' is starting ...'); }, -<<<<<<< HEAD - onFileUploadComplete: function (file) { - console.log(file.fieldname + ' has been uploaded to: ' + file.path); - // done=true; -======= onFileUploadComplete: function (file, req, res) { // console.log('\n\nheadersSent in onFileUploadComplete: ', res.headersSent); console.log(req.body.user); @@ -124,7 +119,6 @@ module.exports = function(db) { message: err.message }); } ->>>>>>> dev_working } })); diff --git a/public/modules/core/config/core.client.routes.js b/public/modules/core/config/core.client.routes.js index 29c295f0..5e9c86f8 100755 --- a/public/modules/core/config/core.client.routes.js +++ b/public/modules/core/config/core.client.routes.js @@ -12,24 +12,12 @@ angular.module('core').config(['$stateProvider', '$urlRouterProvider', url: '/', templateUrl: 'modules/core/views/home.client.view.html' }); -<<<<<<< HEAD - // state('restricted', { - // 'abstract': true, - // resolve: { - // authorize: ['Authorization', - // function(Authorization) { - // return Authorization.authorize(); - // } - // ] - // } - // }); -======= + $urlRouterProvider.otherwise( function($injector) { var $state = $injector.get('$state'); $state.go('home'); }); ->>>>>>> dev_working } ]); \ No newline at end of file diff --git a/public/modules/forms/controllers/create-form.client.controller.js b/public/modules/forms/controllers/create-form.client.controller.js index 89c860e3..eeba22ac 100644 --- a/public/modules/forms/controllers/create-form.client.controller.js +++ b/public/modules/forms/controllers/create-form.client.controller.js @@ -74,61 +74,9 @@ angular.module('forms').controller('EditFormController', ['$scope', '$state', '$ } }; -<<<<<<< HEAD - //PDF Functions - - $scope.cancelUpload = function(){ - //TBD - }; - - $scope.removePDF = function(){ - $scope.form.pdf = undefined; - $scope.form.isGenerated = false; - $scope.form.autofillPDFs = false; - }; - - $scope.uploadPDF = function(files) { - - if (files && files.length) { - for (var i = 0; i < files.length; i++) { - var file = files[i]; - Upload.upload({ - url: '/upload/pdf', - fields: { - 'user': $scope.form.admin, - 'form': $scope.form - }, - file: file - }).progress(function (evt) { - var progressPercentage = parseInt(100.0 * evt.loaded / evt.total); - $scope.log = 'progress: ' + progressPercentage + '% ' + - evt.config.file.name + '\n' + $scope.log; - }).success(function (data, status, headers, config) { - $scope.log = 'file ' + data.originalname + 'uploaded as '+ data.name +'. JSON: ' + JSON.stringify(data) + '\n' + $scope.log; - $scope.form.pdf = data; - - if(!$scope.$$phase) { - $scope.$apply(); - } - - console.log($scope.log); - console.log('$scope.pdf: '+$scope.pdf.name); - }); - } - } - }; - - $scope.goToWithId = function(route, id) { - $state.transitionTo(route, { 'formId' : id }, { reload: true }); - }; - - // Create new Form - $scope.createOrUpdate = function() { -======= $scope.goToWithId = function(route, id) { $state.go(route, {'formId': id}, {reload: true}); }; ->>>>>>> dev_working // Create new Form $scope.createOrUpdate = function() { @@ -136,15 +84,7 @@ angular.module('forms').controller('EditFormController', ['$scope', '$state', '$ if($scope.isNewForm){ // Create new Form object var form = new Forms($scope.form); - -<<<<<<< HEAD - form.$save(function(response) { - - console.log('create form'); - // console.log(response.pdf); -======= form.$save(function(response) { ->>>>>>> dev_working console.log('form created'); // console.log(response.pdf); diff --git a/public/modules/users/config/users.client.config.js b/public/modules/users/config/users.client.config.js index d10af237..1a470a4f 100755 --- a/public/modules/users/config/users.client.config.js +++ b/public/modules/users/config/users.client.config.js @@ -1,27 +1,6 @@ 'use strict'; // Config HTTP Error Handling -<<<<<<< HEAD -angular.module('users').config(['$httpProvider', '$state', 'Principal', '$q', - function($httpProvider, $state, Principal, $q) { - // Set the httpProvider "not authorized" interceptor - $httpProvider.interceptors.push(['$q', '$state', 'Principal', - function($q, $state, Principal) { - return { - responseError: function(rejection) { - switch (rejection.status) { - case 401: - // Deauthenticate the global user - // Principal.authenticate(null); - - // Redirect to signin page - $state.go('signin'); - break; - case 403: - // Add unauthorized behaviour - break; - } -======= angular.module('users').config(['$httpProvider', function($httpProvider) { $httpProvider.interceptors.push(function($q, $location) { diff --git a/public/modules/users/config/users.client.routes.js b/public/modules/users/config/users.client.routes.js index a6274851..94dfb137 100755 --- a/public/modules/users/config/users.client.routes.js +++ b/public/modules/users/config/users.client.routes.js @@ -4,11 +4,6 @@ angular.module('users').config(['$stateProvider', function($stateProvider) { -<<<<<<< HEAD - // Users state routing - $stateProvider. -======= - var checkLoggedin = function($q, $timeout, $location, User, Auth) { var deferred = $q.defer(); @@ -34,7 +29,6 @@ angular.module('users').config(['$stateProvider', // Users state routing $stateProvider. ->>>>>>> dev_working state('profile', { // parent: 'restricted', // data: {