From 3dc51d9d2c29b2edc80cf76deb5d63b7a345e8ae Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Sun, 5 Nov 2017 19:23:01 -0500 Subject: [PATCH 1/9] fixed bug in core.routes.js --- public/modules/core/config/core.client.routes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/modules/core/config/core.client.routes.js b/public/modules/core/config/core.client.routes.js index 9616c61a..b7d49fa7 100755 --- a/public/modules/core/config/core.client.routes.js +++ b/public/modules/core/config/core.client.routes.js @@ -2,7 +2,7 @@ // Setting up route angular.module('core').config(['$stateProvider', '$urlRouterProvider', - function($stateProvider, $urlRouterProvider, Authorization) { + function($stateProvider, $urlRouterProvider) { // Redirect to home view when route not found $urlRouterProvider.otherwise('/forms'); } From b29d5bad364ff674e7d6f8d17fda7ca49e204833 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Mon, 6 Nov 2017 13:44:29 -0800 Subject: [PATCH 2/9] fixed admin setup script --- app/models/user.server.model.js | 14 +-- package-lock.json | 195 ++++++-------------------------- package.json | 3 +- scripts/setup.js | 2 +- server.js | 13 ++- 5 files changed, 51 insertions(+), 176 deletions(-) diff --git a/app/models/user.server.model.js b/app/models/user.server.model.js index f8b16236..9c284aee 100755 --- a/app/models/user.server.model.js +++ b/app/models/user.server.model.js @@ -9,19 +9,7 @@ var mongoose = require('mongoose'), config = require('../../config/config'), timeStampPlugin = require('../libs/timestamp.server.plugin'), path = require('path'), - querystring = require('querystring'), - nodemailer = require('nodemailer'); - -var smtpTransport = nodemailer.createTransport(config.mailer.options); - -// verify connection configuration on startup -smtpTransport.verify(function(error, success) { - if (error) { - console.log('Your mail configuration is incorrect', error); - } else { - console.log('Mail server is ready to take our messages'); - } -}); + querystring = require('querystring'); /** * A Validation function for local strategy properties diff --git a/package-lock.json b/package-lock.json index ad6d9b12..413892bd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -442,22 +442,6 @@ "integrity": "sha1-PzQU84AyF0O/wQQvmoP/HVgk1GQ=", "dev": true }, - "bcrypt": { - "version": "0.8.7", - "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-0.8.7.tgz", - "integrity": "sha1-vDh1qa/Qp7LNIxpqfyGKXOFWsJM=", - "requires": { - "bindings": "1.2.1", - "nan": "2.3.5" - }, - "dependencies": { - "nan": { - "version": "2.3.5", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz", - "integrity": "sha1-gioNwmYpDOTNOhIoLKPn42Rmigg=" - } - } - }, "bcrypt-pbkdf": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", @@ -485,11 +469,6 @@ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.10.0.tgz", "integrity": "sha1-muuabF6IY4qtFx4Wf1kAq+JINdA=" }, - "bindings": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz", - "integrity": "sha1-FK1hE4EtLTfXLme0ystLtyZQXxE=" - }, "bl": { "version": "0.9.5", "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz", @@ -2736,11 +2715,6 @@ "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=" }, - "byt": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/byt/-/byt-0.1.0.tgz", - "integrity": "sha1-tyVTl3uMTciQ0mL9XiDzMAOdFUs=" - }, "bytes": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.2.0.tgz", @@ -3150,13 +3124,10 @@ } }, "connect-mongo": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/connect-mongo/-/connect-mongo-0.8.2.tgz", - "integrity": "sha1-ySh47sDFpaZiW3mgwhTzf4YfxuA=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/connect-mongo/-/connect-mongo-2.0.0.tgz", + "integrity": "sha512-2Nj5d4XO55AXSy1GOXDZteSEEUObGm/kvJaXyEQCa8cCHsCiZH+V/+sjk3b+khc4V8oyVi34rCtUxor4TfETLA==", "requires": { - "debug": "3.1.0", - "depd": "1.1.1", - "lodash": "4.17.4", "mongodb": "2.0.55" } }, @@ -4086,6 +4057,36 @@ "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz", "integrity": "sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY=" }, + "envfile": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/envfile/-/envfile-2.1.1.tgz", + "integrity": "sha1-jlrmacHyRZ5YkJWdn4obHAXmj50=", + "requires": { + "ambi": "2.5.0", + "eachr": "3.2.0", + "editions": "1.3.3", + "typechecker": "4.4.1" + }, + "dependencies": { + "eachr": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/eachr/-/eachr-3.2.0.tgz", + "integrity": "sha1-LDXkPqCGUW95l8+At6pk1VpKRIQ=", + "requires": { + "editions": "1.3.3", + "typechecker": "4.4.1" + } + }, + "typechecker": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/typechecker/-/typechecker-4.4.1.tgz", + "integrity": "sha1-+XuV9RsDhBchLWd9RaNz7nvO1+Y=", + "requires": { + "editions": "1.3.3" + } + } + } + }, "error-ex": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", @@ -6260,14 +6261,6 @@ "jade": "1.11.0" } }, - "grunt-i18nlint": { - "version": "github:jwarby/grunt-i18nlint#6b398f775c8ca881a16f45a3cb94c5b79ee11e20", - "dev": true, - "requires": { - "chalk": "1.1.3", - "i18n-lint": "git://github.com/jwarby/i18n-lint.git#0a06373c0d880047ad680239c103d60ed414efc1" - } - }, "grunt-karma": { "version": "0.12.2", "resolved": "https://registry.npmjs.org/grunt-karma/-/grunt-karma-0.12.2.tgz", @@ -6888,48 +6881,6 @@ "sprintf-js": "1.1.1" } }, - "i18n-lint": { - "version": "git://github.com/jwarby/i18n-lint.git#0a06373c0d880047ad680239c103d60ed414efc1", - "dev": true, - "requires": { - "chalk": "1.1.3", - "commander": "2.8.1", - "glob": "5.0.15", - "htmlparser2": "3.8.3", - "lodash": "3.10.1", - "node.extend": "1.1.6" - }, - "dependencies": { - "glob": { - "version": "5.0.15", - "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", - "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", - "dev": true, - "requires": { - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "lodash": { - "version": "3.10.1", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", - "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=", - "dev": true - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dev": true, - "requires": { - "brace-expansion": "1.1.8" - } - } - } - }, "iconv-lite": { "version": "0.2.11", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz", @@ -7114,12 +7065,6 @@ "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.5.tgz", "integrity": "sha1-X6eM8wG4JceKvDBC2BJyMEnqI8c=" }, - "is": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz", - "integrity": "sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU=", - "dev": true - }, "is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", @@ -7662,6 +7607,7 @@ "version": "2.4.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", + "dev": true, "requires": { "graceful-fs": "4.1.11" }, @@ -7670,6 +7616,7 @@ "version": "4.1.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", + "dev": true, "optional": true } } @@ -8268,11 +8215,6 @@ "integrity": "sha1-euTsJXMC/XkNVXyxDJcQDYV7AFY=", "dev": true }, - "log-rotate": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/log-rotate/-/log-rotate-0.2.7.tgz", - "integrity": "sha1-qttkJZ7qSeVmiEI0LIZNCxQujC0=" - }, "log4js": { "version": "0.6.38", "resolved": "https://registry.npmjs.org/log4js/-/log4js-0.6.38.tgz", @@ -8315,27 +8257,6 @@ } } }, - "logrotate-stream": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/logrotate-stream/-/logrotate-stream-0.2.5.tgz", - "integrity": "sha1-/dQueYKn7i64a1X18j3L/8ZuaZA=", - "requires": { - "byt": "0.1.0", - "log-rotate": "0.2.7", - "optimist": "0.6.1" - }, - "dependencies": { - "optimist": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", - "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", - "requires": { - "minimist": "0.0.8", - "wordwrap": "0.0.2" - } - } - } - }, "longest": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", @@ -9253,15 +9174,6 @@ "resolved": "https://registry.npmjs.org/nocache/-/nocache-2.0.0.tgz", "integrity": "sha1-ICtIAhoMTL3i34DeFaF0Q8i0OYA=" }, - "node.extend": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/node.extend/-/node.extend-1.1.6.tgz", - "integrity": "sha1-p7iCyC1sk6SGOlUEvV3o7IYli5Y=", - "dev": true, - "requires": { - "is": "3.2.1" - } - }, "nodemailer": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-4.0.1.tgz", @@ -12566,9 +12478,6 @@ "string-width": "1.0.2" } }, - "wildcard-subdomains": { - "version": "github:tellform/wildcard-subdomains#af33bb3e040da9f11387f920f3801c4d080c0423" - }, "window-size": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", @@ -12599,40 +12508,6 @@ } } }, - "winston-logrotate": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/winston-logrotate/-/winston-logrotate-1.3.0.tgz", - "integrity": "sha1-Sy9cLqrvSS9bdcccpzd48wXI/4A=", - "requires": { - "bluebird": "2.9.30", - "fs-extra": "0.24.0", - "logrotate-stream": "0.2.5", - "winston": "2.4.0" - }, - "dependencies": { - "bluebird": { - "version": "2.9.30", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.30.tgz", - "integrity": "sha1-7dqHXsmq0fKc8fVtboL7qysN9VY=" - }, - "fs-extra": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.24.0.tgz", - "integrity": "sha1-1OQ0KpZnXLeEZjOmCZJJMytTmVI=", - "requires": { - "graceful-fs": "4.1.11", - "jsonfile": "2.4.0", - "path-is-absolute": "1.0.1", - "rimraf": "2.2.8" - } - }, - "graceful-fs": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", - "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=" - } - } - }, "wiredep": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/wiredep/-/wiredep-4.0.0.tgz", diff --git a/package.json b/package.json index 1cb7e1f1..611abcad 100644 --- a/package.json +++ b/package.json @@ -31,12 +31,13 @@ "chalk": "^1.1.3", "compression": "~1.6.0", "connect": "^3.4.1", - "connect-mongo": "~0.8.2", + "connect-mongo": "^2.0.0", "consolidate": "~0.14.5", "cookie-parser": "~1.4.0", "deep-diff": "^0.3.4", "dotenv": "^2.0.0", "email-verification": "github:tellform/node-email-verification", + "envfile": "^2.1.1", "express": "~4.13.3", "express-session": "~1.12.1", "glob": "^7.0.3", diff --git a/scripts/setup.js b/scripts/setup.js index 551dc026..d8e5350c 100644 --- a/scripts/setup.js +++ b/scripts/setup.js @@ -5,7 +5,7 @@ */ process.env.NODE_ENV = 'production'; -var config = require('../config/config'), +var config = require('../config/config'), mongoose = require('mongoose'), inquirer = require('inquirer'), envfile = require('envfile'), diff --git a/server.js b/server.js index 4f516183..78aeefa6 100755 --- a/server.js +++ b/server.js @@ -14,7 +14,8 @@ require('events').EventEmitter.prototype._maxListeners = 0; var config = require('./config/config'), mongoose = require('mongoose'), - chalk = require('chalk'); + chalk = require('chalk'), + nodemailer = require('nodemailer'); /** * Main application entry file. @@ -33,6 +34,16 @@ mongoose.connection.on('error', function (err) { process.exit(-1); }); +const smtpTransport = nodemailer.createTransport(config.mailer.options); + +// verify connection configuration on startup +smtpTransport.verify(function(error, success) { + if (error) { + console.error(chalk.red('Your mail configuration is incorrect: ' + error)); + process.exit(-1); + } +}); + // Init the express application var app = require('./config/express')(db); From 147effe0285ad968916a14faab4f3b0e65b0b4ba Mon Sep 17 00:00:00 2001 From: David Baldwynn <1160417+whitef0x0@users.noreply.github.com> Date: Mon, 6 Nov 2017 13:57:13 -0800 Subject: [PATCH 3/9] Added buildpack for Heroku Deploy Button --- app.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app.json b/app.json index e76cd024..36ae03d7 100644 --- a/app.json +++ b/app.json @@ -28,5 +28,10 @@ "description": "Which mail service/API you will be using (i.e. SparkPost, Mandrill, etc)", "value": "SendGrid" } - } + }, + "buildpacks": [ + { + "url": "https://github.com/heroku/heroku-buildpack-nodejs#v111" + } + ] } From 5b847b33ec781fcd27991b1affa9d896d3218f4a Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Mon, 6 Nov 2017 14:05:59 -0800 Subject: [PATCH 4/9] moved grunt to dev dependencies --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 611abcad..63c6aa5a 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "generate": "all-contributors generate", "start": "grunt", "test": "grunt test", - "postinstall": "bower install --config.interactive=false; grunt build;", + "postinstall": "bower install --config.interactive=false", "init": "node scripts/setup.js" }, "dependencies": { From 552f4d8396289ffd73ad2e4a08ac4e29a8146d21 Mon Sep 17 00:00:00 2001 From: David Baldwynn <1160417+whitef0x0@users.noreply.github.com> Date: Mon, 6 Nov 2017 14:29:43 -0800 Subject: [PATCH 5/9] Update gitter.im links --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ce50b078..8039a69f 100755 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ TellForm 2.1.0 [![Build Status](https://travis-ci.org/tellform/tellform.svg?branch=master)](https://travis-ci.org/tellform/tellform) ![Project Status](https://img.shields.io/badge/status-2.1.0-green.svg) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/3491e86eb7194308b8fc80711d736ede)](https://www.codacy.com/app/david-baldwin/tellform?utm_source=github.com&utm_medium=referral&utm_content=tellform/tellform&utm_campaign=Badge_Grade) -[![Gitter](https://badges.gitter.im/tellform/tellform.svg)](https://gitter.im/tellform/tellform?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) +[![Gitter](https://badges.gitter.im/tellform/Lobby.svg)](https://gitter.im/tellform/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) > An *opensource alternative to TypeForm* that can create [stunning mobile-ready forms](https://tellform.com/examples) , surveys and questionnaires. @@ -201,7 +201,7 @@ TellForm's configuration is done with environment variables. To set an option fo ## Where to get help -[Gitter Chat](https://gitter.im/tellform/tellform) +[Gitter Chat](https://gitter.im/tellform/Lobby) [Official Twitter](https://twitter.com/tellform_real) From ed815f68e56efbd93be6febab2d720ecb374f8cd Mon Sep 17 00:00:00 2001 From: David Baldwynn <1160417+whitef0x0@users.noreply.github.com> Date: Mon, 6 Nov 2017 14:35:29 -0800 Subject: [PATCH 6/9] Update README.md --- README.md | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/README.md b/README.md index 8039a69f..4f5a35ce 100755 --- a/README.md +++ b/README.md @@ -119,14 +119,7 @@ Your application should run on port 3000 or the port you specified in your .env To deploy with docker, first install docker [here](https://docs.docker.com/engine/installation/). -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 "SUBDOMAINS_DISABLED=TRUE" -e "DISABLE_CLUSTER_MODE=TRUE" -e "MAILER_EMAIL_ID=" -e "MAILER_FROM=" -e "MAILER_SERVICE_PROVIDER=" -e "MAILER_PASSWORD=" -e "BASE_URL=localhost" -p 80:80 tellform/development -``` - +Then see this page [here](https://tellform.com/install_docker) for commands on how to deploy your own local TellForm instance. ## Testing Your Application You can run the full test suite included with TellForm with the test task: From 15398461219569091b8b84f0ac2eedda95a123eb Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Mon, 6 Nov 2017 17:55:43 -0500 Subject: [PATCH 7/9] fixed google analytics --- app/views/layout.server.view.pug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layout.server.view.pug b/app/views/layout.server.view.pug index 39ba97d5..44bf1b9d 100644 --- a/app/views/layout.server.view.pug +++ b/app/views/layout.server.view.pug @@ -52,7 +52,7 @@ html(lang='en', xmlns='http://www.w3.org/1999/xhtml') block content - script window.ga=function(){ga.q.push(arguments)};ga.q=[];ga.l=+new Date;ga('create','{{google_analytics_id}}','auto');ga('send','pageview') + script window.ga=function(){ga.q.push(arguments)};ga.q=[];ga.l=+new Date;ga('create','#{google_analytics_id}','auto');ga('send','pageview') script(src='https://www.google-analytics.com/analytics.js', async='', defer='') From 24cffeee3793cd36cf11bf93d821683aec6035be Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Wed, 8 Nov 2017 11:31:46 -0800 Subject: [PATCH 8/9] fixed problem with production assets --- config/env/production.js | 8 ++--- package-lock.json | 65 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 4 deletions(-) diff --git a/config/env/production.js b/config/env/production.js index 6519fd73..1091e91e 100755 --- a/config/env/production.js +++ b/config/env/production.js @@ -28,9 +28,9 @@ module.exports = { domain: process.env.BASE_URL || '.tellform.com' }, assets: { - bower_js: 'public/dist/vendor.min.js', - css: 'public/dist/application.min.css', - js: 'public/dist/application.min.js', - form_js: 'public/dist/form-application.min.js' + bower_js: ['public/dist/vendor.min.js'], + css: ['public/dist/application.min.css'], + js: ['public/dist/application.min.js', 'public/dist/populate_template_cache.js'], + form_js: ['public/dist/form-application.min.js', 'public/dist/form_populate_template_cache.js'] } }; diff --git a/package-lock.json b/package-lock.json index 413892bd..fcb91c18 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6261,6 +6261,14 @@ "jade": "1.11.0" } }, + "grunt-i18nlint": { + "version": "github:jwarby/grunt-i18nlint#6b398f775c8ca881a16f45a3cb94c5b79ee11e20", + "dev": true, + "requires": { + "chalk": "1.1.3", + "i18n-lint": "git://github.com/jwarby/i18n-lint.git#0a06373c0d880047ad680239c103d60ed414efc1" + } + }, "grunt-karma": { "version": "0.12.2", "resolved": "https://registry.npmjs.org/grunt-karma/-/grunt-karma-0.12.2.tgz", @@ -6881,6 +6889,48 @@ "sprintf-js": "1.1.1" } }, + "i18n-lint": { + "version": "git://github.com/jwarby/i18n-lint.git#0a06373c0d880047ad680239c103d60ed414efc1", + "dev": true, + "requires": { + "chalk": "1.1.3", + "commander": "2.8.1", + "glob": "5.0.15", + "htmlparser2": "3.8.3", + "lodash": "3.10.1", + "node.extend": "1.1.6" + }, + "dependencies": { + "glob": { + "version": "5.0.15", + "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", + "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", + "dev": true, + "requires": { + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "lodash": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", + "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=", + "dev": true + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dev": true, + "requires": { + "brace-expansion": "1.1.8" + } + } + } + }, "iconv-lite": { "version": "0.2.11", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz", @@ -7065,6 +7115,12 @@ "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.5.tgz", "integrity": "sha1-X6eM8wG4JceKvDBC2BJyMEnqI8c=" }, + "is": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz", + "integrity": "sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU=", + "dev": true + }, "is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", @@ -9174,6 +9230,15 @@ "resolved": "https://registry.npmjs.org/nocache/-/nocache-2.0.0.tgz", "integrity": "sha1-ICtIAhoMTL3i34DeFaF0Q8i0OYA=" }, + "node.extend": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/node.extend/-/node.extend-1.1.6.tgz", + "integrity": "sha1-p7iCyC1sk6SGOlUEvV3o7IYli5Y=", + "dev": true, + "requires": { + "is": "3.2.1" + } + }, "nodemailer": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-4.0.1.tgz", From 084a8005fd038ea537402ae917541068541454fb Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Sat, 11 Nov 2017 19:56:41 -0800 Subject: [PATCH 9/9] fixed form vendor files --- .gitignore | 5 +---- config/env/production.js | 3 +-- gruntfile.js | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 32e21df3..01fc19d8 100755 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,10 @@ dist .vagrant npm-debug.* -docs/Oscar_Credentials.md scripts/test_oscarhost.js -scripts/oscarhost/private/ coverage/ e2e_coverage/ -uploads/ app/e2e_tests/screeshots/* -tmp # iOS / Apple # =========== @@ -25,6 +21,7 @@ Oscar_Credentials.* npm-debug.log node_modules/ public/lib/ +public/dist app/tests/coverage/ .bower-*/ .idea/ diff --git a/config/env/production.js b/config/env/production.js index 1091e91e..0f8a72a5 100755 --- a/config/env/production.js +++ b/config/env/production.js @@ -28,9 +28,8 @@ module.exports = { domain: process.env.BASE_URL || '.tellform.com' }, assets: { - bower_js: ['public/dist/vendor.min.js'], css: ['public/dist/application.min.css'], js: ['public/dist/application.min.js', 'public/dist/populate_template_cache.js'], - form_js: ['public/dist/form-application.min.js', 'public/dist/form_populate_template_cache.js'] + form_js: ['public/dist/form-application.min.js', 'public/dist/form_populate_template_cache.js', 'public/dist/form-vendor.min.js'] } }; diff --git a/gruntfile.js b/gruntfile.js index 5fc30add..82f510f9 100755 --- a/gruntfile.js +++ b/gruntfile.js @@ -123,7 +123,7 @@ module.exports = function(grunt) { compress: true }, files: { - 'public/dist/vendor.min.js': bowerArray + 'public/dist/form-vendor.min.js': bowerArray } } },