From 70801dfd968936c056b5289e027a0a9aefcf517d Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Tue, 14 Nov 2017 02:45:08 -0500 Subject: [PATCH 01/93] got working for server --- app/controllers/forms.server.controller.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app/controllers/forms.server.controller.js b/app/controllers/forms.server.controller.js index 28d2c3f4..3ba7a214 100644 --- a/app/controllers/forms.server.controller.js +++ b/app/controllers/forms.server.controller.js @@ -463,15 +463,20 @@ exports.list = function(req, res) { }); } - const result_ids = results.map(function(result){ return result._id.id }); + const result_ids = results.map(function(result){ return ''+result._id }); var currIndex = -1; for(var i=0; i -1){ + currIndex = result_ids.indexOf(forms[i]._id+'') + console.log("forms[i]: ") + console.log(forms[i]); + + console.log(result_ids); + + console.log("currIndex: "+currIndex); + if(currIndex > -1){ forms[i].submissionNum = results[currIndex].responses; } else { forms[i].submissionNum = 0; From 758eb5a7869ba61376521e92200c2f0e9d9240e1 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Tue, 14 Nov 2017 23:26:47 -0800 Subject: [PATCH 02/93] got textAngular to semi-work with template variables --- app/libs/constants.js | 4 +-- app/libs/send-email-notifications.js | 2 -- app/views/index.server.view.pug | 2 ++ bower.json | 3 +- .../modules/core/config/core.client.routes.js | 2 +- .../controllers/header.client.controller.js | 19 ++++++++++ .../forms/admin/css/edit-form-configure.css | 31 ---------------- public/modules/forms/admin/css/ta-theme.css | 36 +++++++++++++++++++ .../configure-form.client.directive.js | 24 ------------- .../adminTabs/configureTabs/general.html | 6 ++-- .../respondent-notifications.html | 5 +-- .../configureTabs/self-notifications.html | 12 +++++-- .../form/configure-form.client.view.html | 1 - .../forms/config/forms.client.config.js | 19 ++++++---- .../controllers/password.client.controller.js | 1 - .../settings/edit-profile.client.view.html | 32 +++++++++-------- .../settings/social-accounts.client.view.html | 31 ---------------- 17 files changed, 108 insertions(+), 122 deletions(-) create mode 100644 public/modules/forms/admin/css/ta-theme.css delete mode 100755 public/modules/users/views/settings/social-accounts.client.view.html diff --git a/app/libs/constants.js b/app/libs/constants.js index 96b6610c..96a05966 100644 --- a/app/libs/constants.js +++ b/app/libs/constants.js @@ -74,8 +74,6 @@ module.exports = { url: /((([A-Za-z]{3,9}:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+|(?:www.|[-;:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\+=&;%@.\w_]*)#?(?:[\w]*))?)/, hexCode: /^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/, email: /^(([^<>()\[\]\\.,;:\s@']+(\.[^<>()\[\]\\.,;:\s@']+)*)|('.+'))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/, - templateVariable: /(.|\n)*?<\/var>/g }, - - varFormat: [']+)id=["\']{1}field:', '["\']{1}>([^<>]+)*?<\/var>'], + varFormat: [']+)class=["\']{1}.*field-', '["\']{1}.*>([^<>]+)*?<\/var>'], }; \ No newline at end of file diff --git a/app/libs/send-email-notifications.js b/app/libs/send-email-notifications.js index 30af3aad..0cf9590a 100644 --- a/app/libs/send-email-notifications.js +++ b/app/libs/send-email-notifications.js @@ -12,9 +12,7 @@ module.exports = { html: parsedTemplate }; - console.log('HERE'); smtpTransport.sendMail(mailOptions, function(){ - console.log('THERE'); cb(); }); }, diff --git a/app/views/index.server.view.pug b/app/views/index.server.view.pug index 0d0c17fc..38052644 100644 --- a/app/views/index.server.view.pug +++ b/app/views/index.server.view.pug @@ -44,6 +44,8 @@ block content script(type='text/javascript', src='https://cdnjs.cloudflare.com/ajax/libs/angular-strap/2.3.8/angular-strap.min.js') + //script(src='http://textangular.com/dist/textAngular.min.js') + //Application JavaScript Files each jsFile in jsFiles script(type='text/javascript', src=jsFile) diff --git a/bower.json b/bower.json index 4336c3ac..5d191560 100755 --- a/bower.json +++ b/bower.json @@ -44,7 +44,8 @@ "textAngular": "^1.5.16", "angular-ui-select": "^0.19.8", "angular-bootstrap-switch": "^0.5.2", - "jquery": "^3.2.1" + "jquery": "^3.2.1", + "ng-quill": "https://github.com/KillerCodeMonkey/ng-quill" }, "resolutions": { "angular-bootstrap": "^0.14.0", diff --git a/public/modules/core/config/core.client.routes.js b/public/modules/core/config/core.client.routes.js index 01930695..4133bf0d 100755 --- a/public/modules/core/config/core.client.routes.js +++ b/public/modules/core/config/core.client.routes.js @@ -35,7 +35,6 @@ angular.module(ApplicationConfiguration.applicationModuleName).run(['$rootScope' event.preventDefault(); // stop current execution $state.go('listForms'); // go to listForms page } - }); } @@ -45,6 +44,7 @@ angular.module(ApplicationConfiguration.applicationModuleName).run(['$rootScope' angular.module(ApplicationConfiguration.applicationModuleName).run(['$rootScope', 'Auth', 'User', 'Authorizer', '$state', '$stateParams', function($rootScope, Auth, User, Authorizer, $state, $stateParams) { $rootScope.$on('$stateChangeStart', function(event, next) { + console.log('$stateChangeStart'); var authenticator, permissions, user; permissions = next && next.data && next.data.permissions ? next.data.permissions : null; diff --git a/public/modules/core/controllers/header.client.controller.js b/public/modules/core/controllers/header.client.controller.js index a0c9054d..0281bd74 100755 --- a/public/modules/core/controllers/header.client.controller.js +++ b/public/modules/core/controllers/header.client.controller.js @@ -19,6 +19,25 @@ angular.module('core').controller('HeaderController', ['$rootScope', '$scope', ' $rootScope.hideNav = false; $scope.menu = Menus.getMenu('topbar'); + $rootScope.languages = ['en', 'fr', 'es', 'it', 'de']; + + $rootScope.langCodeToWord = { + 'en': 'English', + 'fr': 'Français', + 'es': 'Español', + 'it': 'Italiàno', + 'de': 'Deutsch' + }; + + $rootScope.wordToLangCode = { + 'English': 'en', + 'Français': 'fr', + 'Español': 'es', + 'Italiàno': 'it', + 'Deutsch': 'de' + }; + + $scope.signout = function() { var promise = User.logout(); promise.then(function() { diff --git a/public/modules/forms/admin/css/edit-form-configure.css b/public/modules/forms/admin/css/edit-form-configure.css index afe5b2b2..6e16af14 100644 --- a/public/modules/forms/admin/css/edit-form-configure.css +++ b/public/modules/forms/admin/css/edit-form-configure.css @@ -1,34 +1,3 @@ -.tag { - background-color: #999; - border-radius: 3px 3px 3px 3px; - border: 0; - color: #FFFFFF; - font-style: inherit; - font-size: 11px; - padding: 4px 5px; - margin: 0 2px 2px 2px; - font-family: inherit; - white-space: nowrap; - vertical-align: middle; - cursor: pointer !important; - pointer-events: none; -} - -.email-subject.ta-root .ta-editor.ta-html, .email-subject .ta-scroll-window.form-control { - min-height: 0; - overflow: hidden; - height: auto; - border-radius: 4px; - box-shadow: none; - font-size: 18px; - padding-top: 10px; -} - -.email-subject.ta-root .ta-scroll-window > .ta-bind { - min-height: 0; - outline: 0; -} - .ui-select input.form-control { height: 34px; padding: 6px; diff --git a/public/modules/forms/admin/css/ta-theme.css b/public/modules/forms/admin/css/ta-theme.css new file mode 100644 index 00000000..def3a72c --- /dev/null +++ b/public/modules/forms/admin/css/ta-theme.css @@ -0,0 +1,36 @@ +.ta-editor > div.ta-bind p { + display: inline-block; + min-width: 1px; +} + +.tag { + background-color: #999; + border-radius: 3px 3px 3px 3px; + border: 0; + color: #FFFFFF; + font-style: inherit; + font-size: 11px; + padding: 4px 5px; + margin: 0 2px 2px 2px; + font-family: inherit; + white-space: nowrap; + vertical-align: middle; + cursor: pointer !important; + display: inline!important; + width: 100%; +} + +.email-subject.ta-root .ta-editor.ta-html, .email-subject .ta-scroll-window.form-control { + min-height: 0; + overflow: hidden; + height: auto; + border-radius: 4px; + box-shadow: none; + font-size: 18px; + padding-top: 10px; +} + +.email-subject.ta-root .ta-scroll-window > .ta-bind { + min-height: 0; + outline: 0; +} \ No newline at end of file diff --git a/public/modules/forms/admin/directives/configure-form.client.directive.js b/public/modules/forms/admin/directives/configure-form.client.directive.js index 0d206f3c..d04f6293 100644 --- a/public/modules/forms/admin/directives/configure-form.client.directive.js +++ b/public/modules/forms/admin/directives/configure-form.client.directive.js @@ -14,30 +14,6 @@ angular.module('forms').directive('configureFormDirective', ['$rootScope', '$fil $scope.resetForm = $rootScope.resetForm; $scope.update = $rootScope.update; - console.log($scope.myform); - - $scope.$evalAsync(function() { - angular.element('.tag') - }); - - $scope.languages = ['en', 'fr', 'es', 'it', 'de']; - - $scope.langCodeToWord = { - 'en': 'English', - 'fr': 'Français', - 'es': 'Español', - 'it': 'Italiàno', - 'de': 'Deutsch' - }; - - $scope.wordToLangCode = { - 'English': 'en', - 'Français': 'fr', - 'Español': 'es', - 'Italiàno': 'it', - 'Deutsch': 'de' - }; - $scope.configureTabs = [ { heading: $filter('translate')('GENERAL_TAB'), diff --git a/public/modules/forms/admin/views/adminTabs/configureTabs/general.html b/public/modules/forms/admin/views/adminTabs/configureTabs/general.html index bc228506..acbf3298 100644 --- a/public/modules/forms/admin/views/adminTabs/configureTabs/general.html +++ b/public/modules/forms/admin/views/adminTabs/configureTabs/general.html @@ -22,10 +22,10 @@
- {{ langCodeToWord[$select.selected] }} + {{ $root.langCodeToWord[$select.selected] }} - - + + diff --git a/public/modules/forms/admin/views/adminTabs/configureTabs/respondent-notifications.html b/public/modules/forms/admin/views/adminTabs/configureTabs/respondent-notifications.html index 545532af..09b0915c 100644 --- a/public/modules/forms/admin/views/adminTabs/configureTabs/respondent-notifications.html +++ b/public/modules/forms/admin/views/adminTabs/configureTabs/respondent-notifications.html @@ -74,9 +74,10 @@
-
diff --git a/public/modules/forms/admin/views/adminTabs/configureTabs/self-notifications.html b/public/modules/forms/admin/views/adminTabs/configureTabs/self-notifications.html index adc03dbd..1ca61f0d 100644 --- a/public/modules/forms/admin/views/adminTabs/configureTabs/self-notifications.html +++ b/public/modules/forms/admin/views/adminTabs/configureTabs/self-notifications.html @@ -56,8 +56,11 @@
- + -->
@@ -67,8 +70,13 @@
- + +
+ +
\ No newline at end of file diff --git a/public/modules/forms/admin/views/directiveViews/form/configure-form.client.view.html b/public/modules/forms/admin/views/directiveViews/form/configure-form.client.view.html index 1120e475..685045e4 100644 --- a/public/modules/forms/admin/views/directiveViews/form/configure-form.client.view.html +++ b/public/modules/forms/admin/views/directiveViews/form/configure-form.client.view.html @@ -1,5 +1,4 @@
-
diff --git a/public/modules/forms/config/forms.client.config.js b/public/modules/forms/config/forms.client.config.js index bbf01063..52b790fa 100644 --- a/public/modules/forms/config/forms.client.config.js +++ b/public/modules/forms/config/forms.client.config.js @@ -56,21 +56,28 @@ angular.module('forms').run(['Menus', return $delegate; }); }]).config(['$provide', function ($provide){ - $provide.decorator('taOptions', ['$delegate', 'taRegisterTool', '$translate', '$window', function(taOptions, taRegisterTool, $translate, $window) { + $provide.decorator('taOptions', ['$delegate', 'taRegisterTool', '$translate', '$window', 'taSelection', function(taOptions, taRegisterTool, $translate, $window, taSelection) { taRegisterTool('insertField', { - display: '
\ -
\ + display: '
\ +
\ {{ "ADD_VARIABLE_BUTTON" | translate }}\ \
\ -
', + class: 'btn-group', onClickField: function(field_id, field_name){ - this.$editor().wrapSelection('insertHTML', '' + field_name + '', false); + if (taSelection.getSelectionElement().tagName && (taSelection.getSelectionElement().tagName.toLowerCase() === 'var' || taSelection.getSelectionElement().tagName.toLowerCase() === 'a')) { + // due to differences in implementation between FireFox and Chrome, we must move the + // insertion point past the element, otherwise FireFox inserts inside the + // With this change, both FireFox and Chrome behave the same way! + taSelection.setSelectionAfterElement(taSelection.getSelectionElement()); + } + this.$editor().wrapSelection('insertHTML', ' ' + field_name + ' ', true); }, action: function(){ } diff --git a/public/modules/users/controllers/password.client.controller.js b/public/modules/users/controllers/password.client.controller.js index 2744bdc3..61341a1f 100755 --- a/public/modules/users/controllers/password.client.controller.js +++ b/public/modules/users/controllers/password.client.controller.js @@ -2,7 +2,6 @@ angular.module('users').controller('PasswordController', ['$scope', '$stateParams', '$state', 'User', '$translate', '$window', function($scope, $stateParams, $state, User, $translate, $window) { - $translate.use($window.locale); $scope.error = ''; $scope.forms = {}; diff --git a/public/modules/users/views/settings/edit-profile.client.view.html b/public/modules/users/views/settings/edit-profile.client.view.html index cf157b71..35b69178 100755 --- a/public/modules/users/views/settings/edit-profile.client.view.html +++ b/public/modules/users/views/settings/edit-profile.client.view.html @@ -1,4 +1,5 @@
+

{{ 'EDIT_PROFILE' | translate }}

@@ -32,20 +33,23 @@
-
-
- {{ 'LANGUAGE_LABEL' | translate }} -
-
- -
-
+
+
+

{{ 'LANGUAGE' | translate }}

+
+
+ + + {{ $root.langCodeToWord[$select.selected] }} + + + + + + + * {{ 'REQUIRED_FIELD' | translate }} +
+
diff --git a/public/modules/users/views/settings/social-accounts.client.view.html b/public/modules/users/views/settings/social-accounts.client.view.html deleted file mode 100755 index 9588947a..00000000 --- a/public/modules/users/views/settings/social-accounts.client.view.html +++ /dev/null @@ -1,31 +0,0 @@ -
- -
-

{{ 'CONNECTED_SOCIAL_ACCOUNTS' | translate }}:

-
- -
-

{{ 'CONNECT_OTHER_SOCIAL_ACCOUNTS' | translate }}

-
- - - - - - - - - - - - - - - -
-
From f3638a1d421ac4780e05572011e3d4c8522218dd Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Wed, 15 Nov 2017 00:29:45 -0800 Subject: [PATCH 03/93] fixed small ux bugs --- app/views/index.server.view.pug | 2 +- bower.json | 12 ++--- .../submit-form.client.directive.js | 5 +- .../modules/core/config/core.client.routes.js | 40 ++++++++------ .../controllers/header.client.controller.js | 3 -- .../list-forms.client.controller.js | 12 ++--- .../edit-submissions-form.client.directive.js | 5 +- .../services/form-fields.client.service.js | 2 +- .../respondent-notifications.html | 12 +++++ public/modules/forms/forms.client.module.js | 2 +- .../users/config/users.client.routes.js | 54 ++++++++++--------- .../controllers/settings.client.controller.js | 14 ++--- .../users/services/auth.client.service.js | 16 +++--- .../users/services/user.client.service.js | 15 ++---- .../settings/change-password.client.view.html | 2 +- .../settings/edit-profile.client.view.html | 2 +- 16 files changed, 104 insertions(+), 94 deletions(-) diff --git a/app/views/index.server.view.pug b/app/views/index.server.view.pug index 38052644..ba5f5d34 100644 --- a/app/views/index.server.view.pug +++ b/app/views/index.server.view.pug @@ -44,7 +44,7 @@ block content script(type='text/javascript', src='https://cdnjs.cloudflare.com/ajax/libs/angular-strap/2.3.8/angular-strap.min.js') - //script(src='http://textangular.com/dist/textAngular.min.js') + script(src='https://cdnjs.cloudflare.com/ajax/libs/ng-quill/3.5.1/ng-quill.min.js') //Application JavaScript Files each jsFile in jsFiles diff --git a/bower.json b/bower.json index 5d191560..c12eb2e5 100755 --- a/bower.json +++ b/bower.json @@ -16,13 +16,11 @@ "angular-mocks": "~1.4.7", "angular-bootstrap": "~0.14.3", "angular-ui-utils": "~3.0.0", - "angular-ui-router": "~0.2.11", "ng-file-upload": "^12.0.4", "angular-raven": "~0.5.11", "angular-ui-date": "~0.0.11", "lodash": "~3.10.0", "angular-ui-sortable": "~0.13.4", - "angular-permission": "~1.1.1", "file-saver.js": "~1.20150507.2", "angular-bootstrap-colorpicker": "~3.0.19", "angular-scroll": "^1.0.0", @@ -45,18 +43,20 @@ "angular-ui-select": "^0.19.8", "angular-bootstrap-switch": "^0.5.2", "jquery": "^3.2.1", - "ng-quill": "https://github.com/KillerCodeMonkey/ng-quill" + "ng-quill": "https://github.com/KillerCodeMonkey/ng-quill", + "angular-ui-router": "^1.0.11", + "angular-permission": "^5.3.2" }, "resolutions": { "angular-bootstrap": "^0.14.0", - "angular": "1.4.14", - "jspdf": "~1.0.178", "angular-sanitize": "1.4.14", "angular-ui-sortable": "^0.17.1", "angular-ui-date": "~0.0.11", "angular-input-stars-directive": "master", "angular-ui-select": "^0.19.8", - "jquery": "^3.2.1" + "jquery": "^3.2.1", + "angular-ui-router": "^1.0.11", + "angular-permission": "^5.3.2" }, "overrides": { "BOWER-PACKAGE": { diff --git a/public/form_modules/forms/base/directives/submit-form.client.directive.js b/public/form_modules/forms/base/directives/submit-form.client.directive.js index 4e9b2b1d..b026d5c7 100644 --- a/public/form_modules/forms/base/directives/submit-form.client.directive.js +++ b/public/form_modules/forms/base/directives/submit-form.client.directive.js @@ -320,12 +320,11 @@ angular.module('view-form').directive('submitFormDirective', ['$http', 'TimeCoun setTimeout(function () { $scope.submitPromise = $http.post('/forms/' + $scope.myform._id, form) - .success(function (data, status) { + .then(function (data, status) { $scope.myform.submitted = true; $scope.loading = false; SendVisitorData.send(form, getActiveField(), _timeElapsed); - }) - .error(function (error) { + }, function (error) { $scope.loading = false; console.error(error); $scope.error = error.message; diff --git a/public/modules/core/config/core.client.routes.js b/public/modules/core/config/core.client.routes.js index 4133bf0d..79c9dbc5 100755 --- a/public/modules/core/config/core.client.routes.js +++ b/public/modules/core/config/core.client.routes.js @@ -8,6 +8,9 @@ angular.module('core').config(['$stateProvider', '$urlRouterProvider', } ]); +var statesWithoutAuth = ['signin', 'resendVerifyEmail', 'verify', 'signup', 'signup-success', 'forgot', 'reset-invalid', 'reset', 'reset-success']; +var statesToIgnore = statesWithoutAuth.concat(['', 'home']); + angular.module(ApplicationConfiguration.applicationModuleName).run(['$rootScope', 'Auth', '$state', '$stateParams', function($rootScope, Auth, $state, $stateParams) { @@ -21,10 +24,8 @@ angular.module(ApplicationConfiguration.applicationModuleName).run(['$rootScope' params: fromParams } - var statesToIgnore = ['', 'home', 'signin', 'resendVerifyEmail', 'verify', 'signup', 'signup-success', 'forgot', 'reset-invalid', 'reset', 'reset-success']; - //Redirect to listForms if user is authenticated - if(statesToIgnore.indexOf(toState.name) > 0){ + if(statesToIgnore.indexOf(toState.name) > -1){ if(Auth.isAuthenticated()){ event.preventDefault(); // stop current execution $state.go('listForms'); // go to listForms page @@ -43,23 +44,28 @@ angular.module(ApplicationConfiguration.applicationModuleName).run(['$rootScope' //Page access/authorization logic angular.module(ApplicationConfiguration.applicationModuleName).run(['$rootScope', 'Auth', 'User', 'Authorizer', '$state', '$stateParams', function($rootScope, Auth, User, Authorizer, $state, $stateParams) { - $rootScope.$on('$stateChangeStart', function(event, next) { - console.log('$stateChangeStart'); - var authenticator, permissions, user; - permissions = next && next.data && next.data.permissions ? next.data.permissions : null; + $rootScope.$on('$stateChangeStart', function(event, toState, toParams, fromState, fromParams) { + if(statesWithoutAuth.indexOf(toState.name) === -1){ + Auth.ensureHasCurrentUser(User).then( + function onSuccess(currentUser){ + if(currentUser){ + var authenticator = new Authorizer(user); + var permissions = toState && toState.data && toState.data.permissions ? toState.data.permissions : null; - Auth.ensureHasCurrentUser(User); - user = Auth.currentUser; - - if(user){ - authenticator = new Authorizer(user); - - if( (permissions !== null) ){ - if( !authenticator.canAccess(permissions) ){ + if( permissions !== null && !authenticator.canAccess(permissions) ){ + event.preventDefault(); + $state.go('access_denied'); + } + } + }, + function onError(error){ event.preventDefault(); $state.go('access_denied'); } - } + ); + } else { + event.preventDefault(); + $state.go('access_denied'); } }); - }]); + }]); \ No newline at end of file diff --git a/public/modules/core/controllers/header.client.controller.js b/public/modules/core/controllers/header.client.controller.js index 0281bd74..4e49a3d2 100755 --- a/public/modules/core/controllers/header.client.controller.js +++ b/public/modules/core/controllers/header.client.controller.js @@ -6,11 +6,8 @@ angular.module('core').controller('HeaderController', ['$rootScope', '$scope', ' $rootScope.signupDisabled = $window.signupDisabled; $scope.user = $rootScope.user = Auth.ensureHasCurrentUser(User); - $scope.authentication = $rootScope.authentication = Auth; - $rootScope.languages = $scope.languages = ['en', 'fr', 'es', 'it', 'de']; - //Set global app language $rootScope.language = $scope.user.language; $translate.use($scope.user.language); diff --git a/public/modules/forms/admin/controllers/list-forms.client.controller.js b/public/modules/forms/admin/controllers/list-forms.client.controller.js index 476a9a2a..b1ad8ac8 100644 --- a/public/modules/forms/admin/controllers/list-forms.client.controller.js +++ b/public/modules/forms/admin/controllers/list-forms.client.controller.js @@ -74,9 +74,9 @@ angular.module('forms').controller('ListFormsController', ['$rootScope', '$scope delete form._id; $http.post('/forms', {form: form}) - .success(function(data, status, headers){ + .then(function(data, status, headers){ $scope.myforms.splice(form_index+1, 0, data); - }).error(function(errorResponse){ + }, function(errorResponse){ console.error(errorResponse); if(errorResponse === null){ $scope.error = errorResponse.data.message; @@ -93,10 +93,10 @@ angular.module('forms').controller('ListFormsController', ['$rootScope', '$scope if($scope.forms.createForm.$valid && $scope.forms.createForm.$dirty){ $http.post('/forms', {form: form}) - .success(function(data, status, headers){ + .then(function(data, status, headers){ // Redirect after save $scope.goToWithId('viewForm.create', data._id+''); - }).error(function(errorResponse){ + }, function(errorResponse){ console.error(errorResponse); $scope.error = errorResponse.data.message; }); @@ -109,10 +109,10 @@ angular.module('forms').controller('ListFormsController', ['$rootScope', '$scope } $http.delete('/forms/'+$scope.myforms[form_index]._id) - .success(function(data, status, headers){ + .then(function(data, status, headers){ $scope.myforms.splice(form_index, 1); $scope.cancelDeleteModal(); - }).error(function(error){ + }, function(error){ console.error(error); }); }; diff --git a/public/modules/forms/admin/directives/edit-submissions-form.client.directive.js b/public/modules/forms/admin/directives/edit-submissions-form.client.directive.js index 314a2a77..63984893 100644 --- a/public/modules/forms/admin/directives/edit-submissions-form.client.directive.js +++ b/public/modules/forms/admin/directives/edit-submissions-form.client.directive.js @@ -172,14 +172,13 @@ angular.module('forms').directive('editSubmissionsFormDirective', ['$rootScope', method: 'DELETE', data: {deleted_submissions: delete_ids}, headers: {'Content-Type': 'application/json;charset=utf-8'} - }).success(function(data, status){ + }).then(function(data, status){ $scope.deletionInProgress = true; //Remove deleted ids from table $scope.table.rows = $scope.table.rows.filter(function(field){ return !field.selected; }); - }) - .error(function(err){ + }, function(err){ $scope.deletionInProgress = true; console.error(err); }); diff --git a/public/modules/forms/admin/services/form-fields.client.service.js b/public/modules/forms/admin/services/form-fields.client.service.js index 302603ae..5f86b2e5 100644 --- a/public/modules/forms/admin/services/form-fields.client.service.js +++ b/public/modules/forms/admin/services/form-fields.client.service.js @@ -4,7 +4,7 @@ angular.module('forms').service('FormFields', [ '$rootScope', '$translate', 'Auth', function($rootScope, $translate, Auth) { - var language = Auth.ensureHasCurrentUser().language; + var language = $rootScope.language; $translate.use(language); this.types = [ diff --git a/public/modules/forms/admin/views/adminTabs/configureTabs/respondent-notifications.html b/public/modules/forms/admin/views/adminTabs/configureTabs/respondent-notifications.html index 09b0915c..79eca037 100644 --- a/public/modules/forms/admin/views/adminTabs/configureTabs/respondent-notifications.html +++ b/public/modules/forms/admin/views/adminTabs/configureTabs/respondent-notifications.html @@ -74,11 +74,23 @@
+ + + +
+ + + + +
+ +
diff --git a/public/modules/forms/forms.client.module.js b/public/modules/forms/forms.client.module.js index d291bd6c..592fe2c9 100644 --- a/public/modules/forms/forms.client.module.js +++ b/public/modules/forms/forms.client.module.js @@ -4,5 +4,5 @@ ApplicationConfiguration.registerModule('forms', [ 'ngFileUpload', 'ui.date', 'ui.sortable', 'angular-input-stars', 'users', 'ngclipboard', 'textAngular', - 'frapontillo.bootstrap-switch' + 'frapontillo.bootstrap-switch', 'ngQuill' ]);//, 'colorpicker.module' @TODO reactivate this module diff --git a/public/modules/users/config/users.client.routes.js b/public/modules/users/config/users.client.routes.js index b51f4771..14ffe6b3 100755 --- a/public/modules/users/config/users.client.routes.js +++ b/public/modules/users/config/users.client.routes.js @@ -4,26 +4,26 @@ angular.module('users').config(['$stateProvider', function($stateProvider) { - var checkLoggedin = function($q, $timeout, $state, User, Auth) { - var deferred = $q.defer(); - - if (Auth.currentUser && Auth.currentUser.email) { - $timeout(deferred.resolve); - } - else { - Auth.currentUser = User.getCurrent( - function() { - Auth.login(); - $timeout(deferred.resolve()); - }, - function() { - Auth.logout(); - $timeout(deferred.reject()); - $state.go('signin', {reload: true}); - }); - } + var checkCurrentUser = function($q, $state, User, Auth) { + var deferred = $q.defer(); + + if (Auth.currentUser && Auth.currentUser.email) { + deferred.resolve(Auth.currentUser); + } else { + User.getCurrent().then( + function(user) { + console.log(user); + Auth.login(); + deferred.resolve(user); + }, + function() { + Auth.logout(); + deferred.reject(); + $state.go('signin', {reload: true}); + }); + } - return deferred.promise; + return deferred.promise; }; var checkSignupDisabled = function($window, $timeout, $q) { @@ -40,22 +40,24 @@ angular.module('users').config(['$stateProvider', $stateProvider. state('profile', { resolve: { - loggedin: checkLoggedin + currentUser: ['$q', '$state', 'User', 'Auth', checkCurrentUser] }, url: '/settings/profile', - templateUrl: 'modules/users/views/settings/edit-profile.client.view.html' + templateUrl: 'modules/users/views/settings/edit-profile.client.view.html', + controller: 'SettingsController' }). state('password', { resolve: { - loggedin: checkLoggedin - }, + currentUser: ['$q', '$state', 'User', 'Auth', checkCurrentUser] + }, url: '/settings/password', - templateUrl: 'modules/users/views/settings/change-password.client.view.html' + templateUrl: 'modules/users/views/settings/change-password.client.view.html', + controller: 'SettingsController' }). state('accounts', { resolve: { - loggedin: checkLoggedin - }, + currentUser: ['$q', '$state', 'User', 'Auth', checkCurrentUser] + }, url: '/settings/accounts', templateUrl: 'modules/users/views/settings/social-accounts.client.view.html' }). diff --git a/public/modules/users/controllers/settings.client.controller.js b/public/modules/users/controllers/settings.client.controller.js index fef50189..140d78bc 100755 --- a/public/modules/users/controllers/settings.client.controller.js +++ b/public/modules/users/controllers/settings.client.controller.js @@ -1,9 +1,9 @@ 'use strict'; -angular.module('users').controller('SettingsController', ['$scope', '$rootScope', '$http', '$state', 'Users', 'Auth', - function($scope, $rootScope, $http, $state, Users, Auth) { +angular.module('users').controller('SettingsController', ['$scope', '$rootScope', '$http', '$state', 'Users', 'Auth', 'currentUser', + function($scope, $rootScope, $http, $state, Users, Auth, currentUser) { - $scope.user = Auth.currentUser; + $scope.user = currentUser; // Check if there are additional accounts $scope.hasConnectedAdditionalSocialAccounts = function(provider) { @@ -30,12 +30,12 @@ angular.module('users').controller('SettingsController', ['$scope', '$rootScope' params: { provider: provider } - }).success(function(response) { + }).then(function(response) { // If successful show success message and clear form $scope.success = true; $scope.error = null; $scope.user = response; - }).error(function(response) { + }, function(response) { $scope.success = null; $scope.error = response.message; }); @@ -64,12 +64,12 @@ angular.module('users').controller('SettingsController', ['$scope', '$rootScope' $scope.changeUserPassword = function() { $scope.success = $scope.error = null; - $http.post('/users/password', $scope.passwordDetails).success(function(response) { + $http.post('/users/password', $scope.passwordDetails).then(function(response) { // If successful show success message and clear form $scope.success = true; $scope.error = null; $scope.passwordDetails = null; - }).error(function(response) { + }, function(response) { $scope.success = null; $scope.error = response.message; }); diff --git a/public/modules/users/services/auth.client.service.js b/public/modules/users/services/auth.client.service.js index 806db08f..1b0d6bf4 100644 --- a/public/modules/users/services/auth.client.service.js +++ b/public/modules/users/services/auth.client.service.js @@ -1,7 +1,7 @@ 'use strict'; -angular.module('users').factory('Auth', ['$window', - function($window) { +angular.module('users').factory('Auth', ['$window', '$q', + function($window, $q) { var userState = { isLoggedIn: false @@ -17,26 +17,30 @@ angular.module('users').factory('Auth', ['$window', // because that would create a circular dependency // Auth <- $http <- $resource <- LoopBackResource <- User <- Auth ensureHasCurrentUser: function(User) { + var deferred = $q.defer(); + if (service._currentUser && service._currentUser.username) { - return service._currentUser; + deferred.resolve(service._currentUser); } else if ($window.user){ service._currentUser = $window.user; - return service._currentUser; + deferred.resolve(service._currentUser) } else { User.getCurrent().then(function(user) { // success service._currentUser = user; userState.isLoggedIn = true; $window.user = service._currentUser; - return service._currentUser; + deferred.resolve(service._currentUser); }, function(response) { userState.isLoggedIn = false; service._currentUser = null; $window.user = null; - return null; + deferred.reject('User data could not be fetched from server'); }); } + + return deferred.promise; }, isAuthenticated: function() { diff --git a/public/modules/users/services/user.client.service.js b/public/modules/users/services/user.client.service.js index cf745fa7..2bec0664 100644 --- a/public/modules/users/services/user.client.service.js +++ b/public/modules/users/services/user.client.service.js @@ -6,19 +6,16 @@ angular.module('users').factory('User', ['$window', '$q', '$timeout', '$http', ' var userService = { getCurrent: function() { var deferred = $q.defer(); - $http.get('/users/me') - .success(function(response) { - deferred.resolve(response); - }) - .error(function() { + .then(function(response) { + deferred.resolve(response.data); + }, function() { deferred.reject('User\'s session has expired'); }); return deferred.promise; }, login: function(credentials) { - var deferred = $q.defer(); $http.post('/auth/signin', credentials).then(function(response) { deferred.resolve(response.data); @@ -29,7 +26,6 @@ angular.module('users').factory('User', ['$window', '$q', '$timeout', '$http', ' return deferred.promise; }, logout: function() { - var deferred = $q.defer(); $http.get('/auth/signout').then(function(response) { deferred.resolve(null); @@ -40,7 +36,6 @@ angular.module('users').factory('User', ['$window', '$q', '$timeout', '$http', ' return deferred.promise; }, signup: function(credentials) { - var deferred = $q.defer(); $http.post('/auth/signup', credentials).then(function(response) { // If successful we assign the response to the global user model @@ -53,7 +48,6 @@ angular.module('users').factory('User', ['$window', '$q', '$timeout', '$http', ' }, resendVerifyEmail: function(_email) { - var deferred = $q.defer(); $http.post('/auth/verify', {email: _email}).then(function(response) { deferred.resolve(response.data); @@ -65,7 +59,6 @@ angular.module('users').factory('User', ['$window', '$q', '$timeout', '$http', ' }, validateVerifyToken: function(token) { - //DAVID: TODO: The valid length of a token should somehow be linked to server config values //DAVID: TODO: SEMI-URGENT: Should we even be doing this? var validTokenRe = /^([A-Za-z0-9]{48})$/g; @@ -82,7 +75,6 @@ angular.module('users').factory('User', ['$window', '$q', '$timeout', '$http', ' }, resetPassword: function(passwordDetails, token) { - var deferred = $q.defer(); $http.post('/auth/reset/'+token, passwordDetails).then(function(response) { deferred.resolve(response); @@ -95,7 +87,6 @@ angular.module('users').factory('User', ['$window', '$q', '$timeout', '$http', ' // Submit forgotten password account id askForPasswordReset: function(credentials) { - var deferred = $q.defer(); $http.post('/auth/forgot', credentials).then(function(response) { // Show user success message and clear form diff --git a/public/modules/users/views/settings/change-password.client.view.html b/public/modules/users/views/settings/change-password.client.view.html index 3a8565fa..8d622f21 100755 --- a/public/modules/users/views/settings/change-password.client.view.html +++ b/public/modules/users/views/settings/change-password.client.view.html @@ -1,6 +1,6 @@
-
+

{{ 'CHANGE_PASSWORD' | translate }}