From b5d7c1664997a0fe3b06d7be150e693fe8dcabb7 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Sat, 21 May 2016 12:49:00 -0700 Subject: [PATCH] fixed setup script --- .../users/users.authentication.server.controller.js | 4 +++- app/routes/users.server.routes.js | 1 - config/init.js | 3 +-- scripts/setup.js | 5 ++++- 4 files changed, 8 insertions(+), 5 deletions(-) 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/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/scripts/setup.js b/scripts/setup.js index c5f582d8..9589696b 100644 --- a/scripts/setup.js +++ b/scripts/setup.js @@ -174,7 +174,7 @@ var questions = [ console.log(chalk.green('\n\nHi, welcome to TellForm Setup')); -console.log(chalk.green('This will only run the first time you run TellForm\n--------------------------------------------------\n\n')); +console.log(chalk.green('You should only run this the first time you setup TellForm\n--------------------------------------------------\n\n')); inquirer.prompt([questions[0]]).then(function (confirmAns) { if(confirmAns['shouldContinue']) { @@ -209,6 +209,9 @@ inquirer.prompt([questions[0]]).then(function (confirmAns) { console.log(chalk.green('Successfully created user')); delete email; delete pass; + + console.log(chalk.green('Have fun using TellForm!')); + process.exit(1); }); }); });