Merge pull request #2 from andela/bg-resolve-nodemon-heroku-issues-15…

…8749495

#158749495 Resolve Heroku and Nodemon Issues

config/config.js

@@ -1,7 +1,9 @@
-let _ = require('underscore');
+/* eslint import/no-dynamic-require: 0 */ // --> OFF
+
+const _ = require('underscore');
 
 // Load app configuration
 module.exports = _.extend(
-  require(`${__dirname  }/../config/env/all.js`),
-  require(`${__dirname  }/../config/env/${  process.env.NODE_ENV  }.js`) || {}
+  require(`${__dirname}/../config/env/all.js`),
+  require(`${__dirname}/../config/env/${process.env.NODE_ENV}.js`),
 );

config/env/development.js

@@ -1,27 +1,27 @@
 module.exports = {
-    "app": {
-        "name": "Cards for Humanity - Development"
-    },
-    "port": 5000,
-    "MONGOHQ_URL": process.env.MONGOHQ_URL_DEV,
-    "facebook": {
-        "clientID": "APP_ID",
-        "clientSecret": "APP_SECRET",
-        "callbackURL": "http://cardsforhumanity.com:3000/auth/facebook/callback"
-    },
-    "twitter": {
-        "clientID": "CONSUMER_KEY",
-        "clientSecret": "CONSUMER_SECRET",
-        "callbackURL": "http://cardsforhumanity.com:3000/auth/twitter/callback"
-    },
-    "github": {
-        "clientID": "APP_ID",
-        "clientSecret": "APP_SECRET",
-        "callbackURL": "http://cardsforhumanity.com:3000/auth/github/callback"
-    },
-    "google": {
-        "clientID": "APP_ID",
-        "clientSecret": "APP_SECRET",
-        "callbackURL": "http://cardsforhumanity.com:3000/auth/google/callback"
-    }
+  app: {
+    name: 'Cards for Humanity - Development'
+  },
+  port: process.env.PORT,
+  MONGOHQ_URL: process.env.MONGOHQ_URL_DEV,
+  facebook: {
+    clientID: 'APP_ID',
+    clientSecret: 'APP_SECRET',
+    callbackURL: 'http://cardsforhumanity.com:3000/auth/facebook/callback'
+  },
+  twitter: {
+    clientID: 'CONSUMER_KEY',
+    clientSecret: 'CONSUMER_SECRET',
+    callbackURL: 'http://cardsforhumanity.com:3000/auth/twitter/callback'
+  },
+  github: {
+    clientID: 'APP_ID',
+    clientSecret: 'APP_SECRET',
+    callbackURL: 'http://cardsforhumanity.com:3000/auth/github/callback'
+  },
+  google: {
+    clientID: 'APP_ID',
+    clientSecret: 'APP_SECRET',
+    callbackURL: 'http://cardsforhumanity.com:3000/auth/google/callback'
+  }
 };

config/env/production.js

@@ -1,25 +1,26 @@
 module.exports = {
-    "app": {
-        "name": "Cards for Humanity"
-    },
-    "facebook": {
-        "clientID": "APP_ID",
-        "clientSecret": "APP_SECRET",
-        "callbackURL": "http://cfh.io/auth/facebook/callback"
-    },
-    "twitter": {
-        "clientID": "CONSUMER_KEY",
-        "clientSecret": "CONSUMER_SECRET",
-        "callbackURL": "http://cfh.io/auth/twitter/callback"
-    },
-    "github": {
-        "clientID": "APP_ID",
-        "clientSecret": "APP_SECRET",
-        "callbackURL": "http://cfh.io/auth/github/callback"
-    },
-    "google": {
-        "clientID": "APP_ID",
-        "clientSecret": "APP_SECRET",
-        "callbackURL": "http://cfh.io/auth/google/callback"
-    }
+  app: {
+    name: 'Cards for Humanity'
+  },
+  MONGOHQ_URL: process.env.MONGOHQ_URL,
+  facebook: {
+    clientID: 'APP_ID',
+    clientSecret: 'APP_SECRET',
+    callbackURL: 'http://cfh.io/auth/facebook/callback'
+  },
+  twitter: {
+    clientID: 'CONSUMER_KEY',
+    clientSecret: 'CONSUMER_SECRET',
+    callbackURL: 'http://cfh.io/auth/twitter/callback'
+  },
+  github: {
+    clientID: 'APP_ID',
+    clientSecret: 'APP_SECRET',
+    callbackURL: 'http://cfh.io/auth/github/callback'
+  },
+  google: {
+    clientID: 'APP_ID',
+    clientSecret: 'APP_SECRET',
+    callbackURL: 'http://cfh.io/auth/google/callback'
+  }
 };

gulpfile.babel.js

@@ -21,7 +21,7 @@ gulp.task('nodemon', () => {
   nodemon({
     verbose: true,
     script: 'server.js',
-    ignore: ['README.md', 'node_modules/**', 'public/lib/**', '.DS_Store'],
+    ignore: ['README.md', 'node_modules/', '.DS_Store'],
     ext: 'js html jade scss css',
     watch: ['app', 'config', 'public', 'server.js'],
     delayTime: 1,
@@ -54,7 +54,7 @@ gulp.task('export', () => {
 });
 
 // Default task(s).
-gulp.task('default', ['export', 'nodemon', 'watch']);
+gulp.task('default', ['nodemon', 'watch']);
 
 // Backend Test task.
 gulp.task('test:backend', shell.task([

package.json

@@ -14,8 +14,9 @@
   },
   "scripts": {
     "start": "gulp",
+    "export": "gulp export",
     "test": "export NODE_ENV=test || set NODE_ENV=test && gulp test",
-    "postinstall": "gulp install",
+    "postinstall": "gulp install && gulp export",
     "build": "gulp build"
   },
   "nyc": {

server.js

@@ -15,6 +15,7 @@ const io = require('socket.io');
 
 // Load configurations
 // if test env, load example file
+
 process.env.NODE_ENV = process.env.NODE_ENV || 'development';
 const mongoose = require('mongoose');
 const config = require('./config/config');