diff --git a/Dockerfile b/Dockerfile index de61a992..635adae4 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM dockerfile/nodejs +FROM node:0.10 MAINTAINER Matthias Luebken, matthias@catalyst-zero.com diff --git a/app/controllers/users/users.authentication.server.controller.js b/app/controllers/users/users.authentication.server.controller.js index 0718d3f0..6daa5fc9 100755 --- a/app/controllers/users/users.authentication.server.controller.js +++ b/app/controllers/users/users.authentication.server.controller.js @@ -39,7 +39,7 @@ exports.signup = function(req, res) { if (err) { res.status(400).send(err); } else { - res.json(user); + res.status(200).send('user successfully loggedin'); } }); } diff --git a/public/modules/forms/controllers/view-form.client.controller.js b/public/modules/forms/controllers/view-form.client.controller.js index cc53587f..8f402c58 100644 --- a/public/modules/forms/controllers/view-form.client.controller.js +++ b/public/modules/forms/controllers/view-form.client.controller.js @@ -4,6 +4,7 @@ angular.module('forms').controller('ViewFormController', ['$rootScope', '$scope', '$stateParams', '$state', 'Forms', 'CurrentForm','$http', function($rootScope, $scope, $stateParams, $state, Forms, CurrentForm, $http) { + $scope.myform = CurrentForm.getForm(); $scope.submissions = undefined; $scope.viewSubmissions = false; @@ -147,9 +148,7 @@ angular.module('forms').controller('ViewFormController', ['$rootScope', '$scope' }else { form._id = form_id; } - - $http.delete('/forms/'+form._id) .success(function(data, status, headers){ console.log('form deleted successfully'); diff --git a/public/modules/forms/directives/auto-save.client.directive.js b/public/modules/forms/directives/auto-save.client.directive.js index dc41ee0f..5491cf8a 100644 --- a/public/modules/forms/directives/auto-save.client.directive.js +++ b/public/modules/forms/directives/auto-save.client.directive.js @@ -31,11 +31,15 @@ angular.module('forms').directive('autoSaveForm', ['$rootScope', '$timeout', fun $scope.finishedRender = true; }); - $scope.$watch('form', function(newValue, oldValue) { + $scope.$watch('myform.form_fields', function(newValue, oldValue) { // console.log('auto saving'); - // console.log(oldValue); - // console.log(newValue); - if(difference(oldValue.form_fields,newValue.form_fields).length !== 0 && !$formCtrl.$dirty) { + console.log(oldValue); + console.log(newValue); + if(difference(oldValue,newValue).length === 0 || oldValue === undefined){ + console.log('returning'); + return; + } + if(difference(oldValue,newValue).length !== 0 && !$formCtrl.$dirty) { $formCtrl.$setDirty(); } // else if(difference(oldValue.form_fields,newValue.form_fields).length === 0 ){ @@ -43,13 +47,13 @@ angular.module('forms').directive('autoSaveForm', ['$rootScope', '$timeout', fun // } // console.log('\n\n-------\n$pristine: '+( $formCtrl.$pristine ) ); // console.log('$dirty: '+( $formCtrl.$dirty ) ); - console.log('form_fields changed: '+difference(oldValue.form_fields,newValue.form_fields).length ); - console.log('$valid: '+$formCtrl.$valid); - console.log('finishedRender: '+$scope.finishedRender); - console.log('saveInProgress: '+$scope.saveInProgress); + // console.log('form_fields changed: '+difference(oldValue.form_fields,newValue.form_fields).length ); + // console.log('$valid: '+$formCtrl.$valid); + // console.log('finishedRender: '+$scope.finishedRender); + // console.log('saveInProgress: '+$scope.saveInProgress); - if($scope.finishedRender && ($formCtrl.$dirty || difference(oldValue.form_fields,newValue.form_fields).length !== 0)) { - console.log('auto saving'); + if($scope.finishedRender && ($formCtrl.$dirty || difference(oldValue,newValue).length !== 0)) { + // console.log('auto saving'); if(savePromise) { $timeout.cancel(savePromise); @@ -63,7 +67,7 @@ angular.module('forms').directive('autoSaveForm', ['$rootScope', '$timeout', fun // console.log('inside'); if($scope.$eval(expression) !== false) { - console.log('Form data persisted -- setting pristine flag'); + // console.log('Form data persisted -- setting pristine flag'); $formCtrl.$setPristine(); // $scope.finishedRender = false; } diff --git a/public/modules/forms/directives/configure-form.client.directive.js b/public/modules/forms/directives/configure-form.client.directive.js index a834f01f..98920956 100644 --- a/public/modules/forms/directives/configure-form.client.directive.js +++ b/public/modules/forms/directives/configure-form.client.directive.js @@ -6,6 +6,7 @@ angular.module('forms').directive('configureFormDirective', ['$rootScope','$http controller: function($scope){ $scope.log = ''; $scope.pdfLoading = false; + $scope.languages = $rootScope.languages; var _current_upload = null; $scope.createOrUpdate = $rootScope.createOrUpdate; $scope.resetForm = $rootScope.resetForm; @@ -25,11 +26,11 @@ angular.module('forms').directive('configureFormDirective', ['$rootScope','$http }; $scope.removePDF = function(){ - $scope.form.pdf = null; - $scope.form.isGenerated = false; - $scope.form.autofillPDFs = false; + $scope.myform.pdf = null; + $scope.myform.isGenerated = false; + $scope.myform.autofillPDFs = false; - console.log('form.pdf: '+$scope.form.pdf+' REMOVED'); + console.log('form.pdf: '+$scope.myform.pdf+' REMOVED'); }; $scope.uploadPDF = function(files) { @@ -41,7 +42,7 @@ angular.module('forms').directive('configureFormDirective', ['$rootScope','$http url: '/upload/pdf', fields: { 'user': $scope.user, - 'form': $scope.form + 'form': $scope.myform }, file: file }).progress(function (evt) { @@ -51,12 +52,12 @@ angular.module('forms').directive('configureFormDirective', ['$rootScope','$http $scope.pdfLoading = true; }).success(function (data, status, headers, config) { $scope.log = 'file ' + data.originalname + ' uploaded as '+ data.name +'. JSON: ' + JSON.stringify(data) + '\n' + $scope.log; - console.log($scope.form.pdf); - $scope.form.pdf = angular.fromJson(angular.toJson(data)); + console.log($scope.myform.pdf); + $scope.myform.pdf = angular.fromJson(angular.toJson(data)); $scope.pdfLoading = false; console.log($scope.log); - console.log('$scope.pdf: '+$scope.form.pdf.name); + console.log('$scope.pdf: '+$scope.myform.pdf.name); if(!$scope.$$phase){ $scope.$apply(); } @@ -73,7 +74,7 @@ angular.module('forms').directive('configureFormDirective', ['$rootScope','$http templateUrl: './modules/forms/views/directiveViews/form/configure-form.html', restrict: 'E', scope: { - form:'=', + myform:'=', user:'=', pdfFields:'@', formFields:'@' diff --git a/public/modules/forms/directives/edit-form.client.directive.js b/public/modules/forms/directives/edit-form.client.directive.js index 23958a41..9bc3a266 100644 --- a/public/modules/forms/directives/edit-form.client.directive.js +++ b/public/modules/forms/directives/edit-form.client.directive.js @@ -9,7 +9,7 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', '$q', '$ht templateUrl: './modules/forms/views/directiveViews/form/edit-form.html', restrict: 'E', scope: { - form:'=', + myform:'=', user:'=' }, controller: function($scope){ @@ -53,25 +53,25 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', '$q', '$ht }; // put newField into fields array - $scope.form.form_fields.unshift(newField); + $scope.myform.form_fields.unshift(newField); + console.log($scope.myform.form_fields.length); }; // deletes particular field on button click $scope.deleteField = function (hashKey){ - console.log($scope.form.form_fields); - for(var i = 0; i < $scope.form.form_fields.length; i++){ - console.log($scope.form.form_fields[i].$$hashKey === hashKey); - if($scope.form.form_fields[i].$$hashKey === hashKey){ - $scope.form.form_fields.splice(i, 1); + console.log($scope.myform.form_fields); + for(var i = 0; i < $scope.myform.form_fields.length; i++){ + console.log($scope.myform.form_fields[i].$$hashKey === hashKey); + if($scope.myform.form_fields[i].$$hashKey === hashKey){ + $scope.myform.form_fields.splice(i, 1); break; } } }; $scope.duplicateField = function (field, field_index){ - for(var i = 0; i < $scope.form.form_fields.length; i++){ - if($scope.form.form_fields[i].field_id === field.field_id){ - // $scope.form.form_fields.splice(field_index+1, 0, field); - $scope.addNewField($scope.form.form_fields[i].fieldType); + for(var i = 0; i < $scope.myform.form_fields.length; i++){ + if($scope.myform.form_fields[i].field_id === field.field_id){ + $scope.addNewField($scope.myform.form_fields[i].fieldType); break; } } diff --git a/public/modules/forms/views/directiveViews/form/configure-form.html b/public/modules/forms/views/directiveViews/form/configure-form.html index 74c353ec..a4d03062 100644 --- a/public/modules/forms/views/directiveViews/form/configure-form.html +++ b/public/modules/forms/views/directiveViews/form/configure-form.html @@ -15,12 +15,12 @@
@@ -29,7 +29,7 @@
-
+
Save Submissions as PDFs?
@@ -37,12 +37,12 @@
@@ -51,20 +51,20 @@
-
+
Upload Your PDF Template
- … -
- {{form.pdf.originalname}} + … +
+ {{myform.pdf.originalname}}
- @@ -74,7 +74,7 @@ Cancel -
+
Upload your PDF
@@ -84,19 +84,19 @@
-
+
Autogenerate Form?
@@ -105,7 +105,7 @@ - - +
-
+
View Live Preview Form @@ -30,19 +27,19 @@ Edit Form Fields - + Edit Design - + Configure - + diff --git a/public/modules/users/controllers/authentication.client.controller.js b/public/modules/users/controllers/authentication.client.controller.js index 36c9a292..f55f15c1 100755 --- a/public/modules/users/controllers/authentication.client.controller.js +++ b/public/modules/users/controllers/authentication.client.controller.js @@ -5,6 +5,7 @@ angular.module('users').controller('AuthenticationController', ['$scope', '$loca $scope = $rootScope; $scope.credentials = {}; + $scope.error = null; // If user is signed in then redirect back home if ($scope.authentication.isAuthenticated()) $state.go('home'); @@ -14,9 +15,8 @@ angular.module('users').controller('AuthenticationController', ['$scope', '$loca // console.log($scope.credentials); Auth.currentUser = User.login($scope.credentials).then( function(response) { - Auth.login(); - $rootScope.user = Auth.ensureHasCurrentUser(User); - $scope = $rootScope; + Auth.login(response); + $scope.user = $rootScope.user = Auth.ensureHasCurrentUser(User); console.log('$state.previous: \n'); console.log($state.previous); @@ -29,7 +29,7 @@ angular.module('users').controller('AuthenticationController', ['$scope', '$loca }, function(error) { $rootScope.user = Auth.ensureHasCurrentUser(User); - $scope = $rootScope; + $scope.user = $rootScope.user; $scope.error = error; console.log('loginError: '+error); @@ -38,7 +38,7 @@ angular.module('users').controller('AuthenticationController', ['$scope', '$loca }; $scope.signup = function() { - $scope.user = User.save($scope.registration, + User.save($scope.registration, function() { $state.go('signup-success'); }, diff --git a/public/modules/users/services/auth.js b/public/modules/users/services/auth.js index a60aa595..581909b2 100644 --- a/public/modules/users/services/auth.js +++ b/public/modules/users/services/auth.js @@ -52,8 +52,9 @@ angular.module('users') return userState; }, - login: function() { + login: function(new_user) { userState.isLoggedIn = true; + service.currentUser = new_user; }, logout: function() { diff --git a/public/modules/users/services/user.js b/public/modules/users/services/user.js index 95c83b0c..965ee734 100644 --- a/public/modules/users/services/user.js +++ b/public/modules/users/services/user.js @@ -22,7 +22,6 @@ angular.module('users').factory('User', ['$window', '$q', '$timeout', '$http', ' var deferred = $q.defer(); $http.post('/auth/signin', credentials).success(function(response) { - // console.log(response); deferred.resolve(response); }).error(function(error) {