From bc06d59785707bf1c209d1a013ce001c2f675339 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 20 Jul 2017 17:33:21 -0700 Subject: [PATCH 01/11] Delete design.html --- .../forms/admin/views/adminTabs/design.html | 71 ------------------- 1 file changed, 71 deletions(-) delete mode 100644 public/modules/forms/admin/views/adminTabs/design.html diff --git a/public/modules/forms/admin/views/adminTabs/design.html b/public/modules/forms/admin/views/adminTabs/design.html deleted file mode 100644 index eb042deb..00000000 --- a/public/modules/forms/admin/views/adminTabs/design.html +++ /dev/null @@ -1,71 +0,0 @@ -
-
-
-
-
-
{{ 'BACKGROUND_COLOR' | translate }}
-
-
- -
-
- -
-
-
{{ 'QUESTION_TEXT_COLOR' | translate }}
-
- -
- -
-
- -
-
-
{{ 'ANSWER_TEXT_COLOR' | translate }}
-
- -
- -
-
- -
-
-
{{ 'BTN_BACKGROUND_COLOR' | translate }}
-
- -
- -
-
-
-
-
{{ 'BTN_TEXT_COLOR' | translate }}
-
- -
- -
-
-
-
- -
-
- -
-
- -
-
- -
-
-
From e4fbc06448e3a2dec3a87bcf7999bc0b4ffe520e Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 20 Jul 2017 17:38:18 -0700 Subject: [PATCH 02/11] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5f10a98f..f35990f7 100755 --- a/README.md +++ b/README.md @@ -113,7 +113,7 @@ Then run these commands ``` $ docker run -p 27017:27017 -d --name some-mongo mongo $ docker run -p 127.0.0.1:6379:6379 -d --name some-redis redis -$ docker run --rm -p 3000:3000 --link some-redis:redis-db --link some-mongo:db tellform/development -e MAILER_EMAIL_ID='mailer_username' -p 80:80 +$ docker run --rm -p 3000:3000 --link some-redis:redis-db --link some-mongo:db -e MAILER_EMAIL_ID='mailer_username' -p 80:80 tellform/development ``` From ccabf31c42e663e4c440f2d9992c097fb8663254 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 20 Jul 2017 17:47:38 -0700 Subject: [PATCH 03/11] Update package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index d00e3819..3bb05be5 100644 --- a/package.json +++ b/package.json @@ -13,8 +13,8 @@ "url": "https://github.com/whitef0x0/tellform.git" }, "engines": { - "node": ">=5.0.0", - "npm": ">=2.11.2" + "node": "5.0.0", + "npm": "2.11.2" }, "scripts": { "addcontrib": "all-contributors add", From 8441874fffdd733c9c979804510288e5e8ded7b2 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 20 Jul 2017 17:56:45 -0700 Subject: [PATCH 04/11] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f35990f7..90805a57 100755 --- a/README.md +++ b/README.md @@ -113,7 +113,7 @@ Then run these commands ``` $ docker run -p 27017:27017 -d --name some-mongo mongo $ docker run -p 127.0.0.1:6379:6379 -d --name some-redis redis -$ docker run --rm -p 3000:3000 --link some-redis:redis-db --link some-mongo:db -e MAILER_EMAIL_ID='mailer_username' -p 80:80 tellform/development +$ docker run --rm -p 3000:3000 --link some-redis:redis-db --link some-mongo:db -e "MAILER_EMAIL_ID=" -e "MAILER_FROM=" -e "MAILER_SERVICE_PROVIDER=" -e "MAILER_PASSWORD=" -e "BASE_URL=localhost" -p 80:80 tellform/development ``` From 1d8b42a3e1150765ecbb42ab154300760c1ca3ec Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 20 Jul 2017 18:02:26 -0700 Subject: [PATCH 05/11] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 90805a57..719eef1f 100755 --- a/README.md +++ b/README.md @@ -84,9 +84,9 @@ PRERENDER_TOKEN=yourPrerender.ioToken COVERALLS_REPO_TOKEN=yourCoveralls.ioToken MAILER_EMAIL_ID=SMTP_Injection MAILER_FROM=noreply@yourdomain.com -MAILER_PASSWORD=your_sparkpost_apikey -MAILER_SERVICE_PROVIDER=SparkPost -BASE_URL=yourdomain.com +MAILER_PASSWORD=your_sendgrid_apikey +MAILER_SERVICE_PROVIDER=SendGrid +BASE_URL=localhost DSN_KEY=yourPrivateRavenKey ``` From 8e0035d29c106d30c8b8c9806d2131b1954ca7c6 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 20 Jul 2017 18:03:37 -0700 Subject: [PATCH 06/11] Fixed npm engine version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3bb05be5..baf5287b 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ }, "engines": { "node": "5.0.0", - "npm": "2.11.2" + "npm": "3.3.6" }, "scripts": { "addcontrib": "all-contributors add", From 921c3726c90151043fad82cbbc5306454014bc19 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 20 Jul 2017 21:21:20 -0700 Subject: [PATCH 07/11] Changed _.pluck to _.map --- app/tests/form_submission.routes.test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/tests/form_submission.routes.test.js b/app/tests/form_submission.routes.test.js index bf1e5e99..9cde8744 100644 --- a/app/tests/form_submission.routes.test.js +++ b/app/tests/form_submission.routes.test.js @@ -144,7 +144,7 @@ describe('Form Submission Routes Unit tests', function() { // Handle signin error should.not.exist(signinErr); - var submission_ids = _.pluck([submission], '_id'); + var submission_ids = _.map([submission], '_id'); //Delete form submissions submissionSession.delete('/forms/' + FormObj._id + '/submissions') @@ -182,7 +182,7 @@ describe('Form Submission Routes Unit tests', function() { SubmissionObj.save(function (err, submission) { should.not.exist(err); - var submission_ids = _.pluck([submission], '_id'); + var submission_ids = _.map([submission], '_id'); // Attempt to delete form submissions submissionSession.delete('/forms/' + FormObj._id + '/submissions') From c8d548b30edd1bd1bdb279c2e41df7acaf73e97a Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 20 Jul 2017 21:56:29 -0700 Subject: [PATCH 08/11] Update package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index baf5287b..64967ac2 100644 --- a/package.json +++ b/package.json @@ -13,8 +13,8 @@ "url": "https://github.com/whitef0x0/tellform.git" }, "engines": { - "node": "5.0.0", - "npm": "3.3.6" + "node": ">=5.0.0", + "npm": ">=3.3.6" }, "scripts": { "addcontrib": "all-contributors add", From d25cca9b3991e71274e487780461faf1fa9779ef Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 20 Jul 2017 22:02:56 -0700 Subject: [PATCH 09/11] Updated 6.0.0 to 6.11.1 in travis config --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 70cfdb4f..6f32b723 100755 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ dist: trusty sudo: false node_js: - "5.0.0" - - "6.0.0" + - "6.11.1" env: - NODE_ENV=travis TRAVIS=travis CXX=g++-4.8 services: From fbc1bc0a86515c9c0df88a465ba263dcbcd453e4 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Fri, 21 Jul 2017 16:51:10 -0700 Subject: [PATCH 10/11] Remove console.log statements for authentication controller --- .../controllers/authentication.client.controller.js | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/public/modules/users/controllers/authentication.client.controller.js b/public/modules/users/controllers/authentication.client.controller.js index f075f817..8e0c6943 100755 --- a/public/modules/users/controllers/authentication.client.controller.js +++ b/public/modules/users/controllers/authentication.client.controller.js @@ -30,20 +30,17 @@ angular.module('users').controller('AuthenticationController', ['$scope', '$loca }; $scope.signup = function() { - console.log($scope.credentials); User.signup($scope.credentials).then( function(response) { - console.log('signup-success'); $state.go('signup-success'); }, function(error) { - console.log('Error: '); - console.log(error); + console.error(error); if(error) { $scope.error = error; - console.log(error); - }else { - console.log('No response received'); + console.error(error); + } else { + console.error('No response received'); } } ); From 1da24240fc60bbeeb8833f808660a2302796795a Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Fri, 21 Jul 2017 16:51:19 -0700 Subject: [PATCH 11/11] Update authentication.client.controller.js --- .../users/controllers/authentication.client.controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/modules/users/controllers/authentication.client.controller.js b/public/modules/users/controllers/authentication.client.controller.js index 8e0c6943..7bc9c342 100755 --- a/public/modules/users/controllers/authentication.client.controller.js +++ b/public/modules/users/controllers/authentication.client.controller.js @@ -24,7 +24,7 @@ angular.module('users').controller('AuthenticationController', ['$scope', '$loca $scope.user = $rootScope.user; $scope.error = error; - console.log('loginError: '+error); + console.error('loginError: '+error); } ); };