diff --git a/.gitignore b/.gitignore index d3a18838..3e0cd43e 100755 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,4 @@ -<<<<<<< HEAD -ecosystem.js -======= -dist/ npm-debug.* ->>>>>>> 08a672a87432ca61efb3613b22e5a8b16698f722 docs/Oscar_Credentials.md scripts/test_oscarhost.js scripts/oscarhost/private/ @@ -20,7 +15,6 @@ Oscar_Credentials.* # Node and related ecosystem # ========================== -ecosystem.json .nodemonignore .sass-cache/ npm-debug.log @@ -34,7 +28,6 @@ app/tests/coverage/ # ====================== config/sslcerts/*.pem access.log -public/dist/ public/dist/populate_template_cache.js uploads/ # API keys file diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 00000000..dd58e58a --- /dev/null +++ b/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,6 @@ +Include the following information with your issue: + +1) Nodemailer version you are having problems with (eg. v1.3.0) +2) Node.js version you are using (run node -v to see it, eg v5.5.0) +3) Your operating system (eg. Windows 10, Ubuntu 14.04 etc.) +4) If possible, include a minimal test case that can be used to verify your issue (link to a gist would be great!) diff --git a/README.md b/README.md index f727196f..dd45187b 100755 --- a/README.md +++ b/README.md @@ -17,6 +17,8 @@ TellForm is an *opensource alternative to TypeForm* built ontop of nodejs that c [Contact Form Example](https://stage.tellform.com/#!/forms/57196d592601ed12074eecc0) +[Patient Registration Example](https://stage.tellform.com/#!/forms/573f8329d18419854559c29c) + ##Screenshots  @@ -147,9 +149,17 @@ $ sh ./scripts/generate-ssl-certs.sh Windows users can follow instructions found [here](http://www.websense.com/support/article/kbarticle/How-to-use-OpenSSL-and-Microsoft-Certification-Authority). After you've generated the key and certificate, place them in the *config/sslcerts* folder. +## Where to get help -## Credits -Inspired/built off the great work of the [MeanJS team](https://github.com/mean/). +[Gitter Chat](https://gitter.im/whitef0x0/tellform) + +[Official Twitter](https://twitter.com/tellform_real) + +## Contributor list + +[David Baldwynn](https://github.com/whitef0x0/) + +[Samuel Laulhau](https://github.com/lalop) ## Mentions on the Web @@ -163,4 +173,6 @@ Inspired/built off the great work of the [MeanJS team](https://github.com/mean/) [Reddit Posts](https://www.reddit.com/domain/tellform.com/) +## Credits +Inspired/built off the great work of the [MeanJS team](https://github.com/mean/) and [Typeform](http://typeform.com) diff --git a/app/controllers/users/users.authentication.server.controller.js b/app/controllers/users/users.authentication.server.controller.js index 71050860..3098623b 100755 --- a/app/controllers/users/users.authentication.server.controller.js +++ b/app/controllers/users/users.authentication.server.controller.js @@ -49,8 +49,10 @@ var config_nev = function () { } } + }, function(err, options){ + if(err) throw err; + nev.generateTempUserModel(User); }); - nev.generateTempUserModel(User); }; config_nev(); diff --git a/app/routes/users.server.routes.js b/app/routes/users.server.routes.js index 631f75c8..b8b0eed2 100755 --- a/app/routes/users.server.routes.js +++ b/app/routes/users.server.routes.js @@ -27,7 +27,6 @@ module.exports = function(app) { // Setting up the users authentication api if(!config.signupDisabled) { - console.log('signupDisabled'); app.route('/auth/signup').post(users.signup); } app.route('/auth/signin').post(users.signin); diff --git a/config/env/production.js b/config/env/production.js index e63e943d..c60edf43 100755 --- a/config/env/production.js +++ b/config/env/production.js @@ -55,7 +55,10 @@ module.exports = { from: process.env.MAILER_FROM || 'no-reply@tellform.com', options: { service: process.env.MAILER_SERVICE_PROVIDER || '', - ssl: true, + ssl: false, + host: 'smtp.sparkpostmail.com', + port: 587, + secure: false, auth: { user: process.env.MAILER_EMAIL_ID || '', pass: process.env.MAILER_PASSWORD || '' diff --git a/config/init.js b/config/init.js index 13e78275..8f6aca53 100755 --- a/config/init.js +++ b/config/init.js @@ -15,8 +15,7 @@ module.exports = function() { * We'll Look for a valid NODE_ENV variable and if one cannot be found load the development NODE_ENV */ var environmentFiles = glob.sync('./config/env/' + process.env.NODE_ENV + '.js'); - console.log('process.env.MAILER_EMAIL_ID: '+process.env.MAILER_EMAIL_ID ); - + if (!environmentFiles.length) { if (process.env.NODE_ENV) { console.error(chalk.red('No configuration file found for "' + process.env.NODE_ENV + '" environment using development instead')); diff --git a/design/screenshots/tellform_screenshot1.png b/design/screenshots/tellform_screenshot1.png index 17584590..cec6b75e 100644 Binary files a/design/screenshots/tellform_screenshot1.png and b/design/screenshots/tellform_screenshot1.png differ diff --git a/ecosystem.json b/ecosystem.json index efa6ff85..0970d393 100644 --- a/ecosystem.json +++ b/ecosystem.json @@ -1,16 +1,19 @@ { "apps" : [{ - "name" : "tellform", - "script" : "/usr/local/bin/grunt", - }], + "name" : "tellform", + "script" : "server.js", + "instances": "max", + "exec_mode": "cluster", + "max_memory_restart" : "200M" + }], "deploy" : { "stage" : { "user" : "polydaic", "host" : "159.203.42.158", - "ref" : "origin/master", + "ref" : "origin/stage", "repo" : "git@github.com:whitef0x0/tellform.git", "path" : "/opt/deploy", - "post-deploy" : "npm install && bower install && pm2 startOrRestart ecosystem.json --env production", + "post-deploy" : "npm install && pm2 startOrGracefulReload ecosystem.json --env production", "env" : { "NODE_ENV": "production", "BASE_URL": "stage.tellform.com" @@ -22,7 +25,7 @@ "ref" : "origin/master", "repo" : "git@github.com:whitef0x0/tellform.git", "path" : "/opt/deploy", - "post-deploy" : "npm install && bower install && pm2 startOrRestart ecosystem.json --env production", + "post-deploy" : "npm install && pm2 startOrGracefulReload ecosystem.json --env production", "env" : { "NODE_ENV": "production", "BASE_URL": "admin.tellform.com" diff --git a/package.json b/package.json index 35e74bb5..6850f273 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ "connect-mongo": "~0.8.2", "consolidate": "~0.13.1", "cookie-parser": "~1.4.0", + "dotenv": "^2.0.0", "email-verification": "whitef0x0/node-email-verification", "envfile": "^2.0.1", "express": "~4.13.3", diff --git a/public/dist/.placeholder b/public/dist/.placeholder new file mode 100644 index 00000000..e69de29b diff --git a/public/dist/application.js b/public/dist/application.js index 17a34b74..72ef30d2 100644 --- a/public/dist/application.js +++ b/public/dist/application.js @@ -25,11 +25,11 @@ angular.module('NodeForm.templates', []).run(['$templateCache', function($templa " \n" + - "
{{field.description}}