update gulp-eslint and de-lint fsg

glebec · glebec · commit 4a1d24992cae · 2016-08-27T21:38:08.000-04:00
diff --git a/generated/.eslintrc.json b/generated/.eslintrc.json
@@ -2,6 +2,8 @@
 {
   "extends": "fullstack", // from the `eslint-config-fullstack` npm module
   "rules": {
-    // add rules here to override the fullstack config
+    "global-require": 0, // 0 = off, 1 = warn (yellow), 2 = error (red)
+    "camelcase": 0
+    // add more rules here to override the fullstack config
   }
 }
diff --git a/generated/browser/js/about/about.js b/generated/browser/js/about/about.js
@@ -1,3 +1,4 @@
+/* global app _ */
 app.config(function ($stateProvider) {
 
     // Register our *about* state.
@@ -14,4 +15,4 @@ app.controller('AboutController', function ($scope, FullstackPics) {
     // Images of beautiful Fullstack people.
     $scope.images = _.shuffle(FullstackPics);
 
-});
+});
diff --git a/generated/browser/js/app.js b/generated/browser/js/app.js
@@ -1,3 +1,4 @@
+/* global app */
 'use strict';
 window.app = angular.module('FullstackGeneratedApp', ['fsaPreBuilt', 'ui.router', 'ui.bootstrap', 'ngAnimate']);
 
diff --git a/generated/browser/js/common/directives/fullstack-logo/fullstack-logo.js b/generated/browser/js/common/directives/fullstack-logo/fullstack-logo.js
@@ -1,6 +1,7 @@
+/* global app */
 app.directive('fullstackLogo', function () {
     return {
         restrict: 'E',
         templateUrl: 'js/common/directives/fullstack-logo/fullstack-logo.html'
     };
-});
+});
diff --git a/generated/browser/js/common/directives/navbar/navbar.js b/generated/browser/js/common/directives/navbar/navbar.js
@@ -1,3 +1,4 @@
+/* global app */
 app.directive('navbar', function ($rootScope, AuthService, AUTH_EVENTS, $state) {
 
     return {
diff --git a/generated/browser/js/common/directives/rando-greeting/rando-greeting.js b/generated/browser/js/common/directives/rando-greeting/rando-greeting.js
@@ -1,3 +1,4 @@
+/* global app */
 app.directive('randoGreeting', function (RandomGreetings) {
 
     return {
@@ -8,4 +9,4 @@ app.directive('randoGreeting', function (RandomGreetings) {
         }
     };
 
-});
+});
diff --git a/generated/browser/js/common/factories/FullstackPics.js b/generated/browser/js/common/factories/FullstackPics.js
@@ -1,3 +1,4 @@
+/* global app */
 app.factory('FullstackPics', function () {
     return [
         'https://pbs.twimg.com/media/B7gBXulCAAAXQcE.jpg:large',
diff --git a/generated/browser/js/common/factories/RandomGreetings.js b/generated/browser/js/common/factories/RandomGreetings.js
@@ -1,3 +1,4 @@
+/* global app */
 app.factory('RandomGreetings', function () {
 
     var getRandomFromArray = function (arr) {
diff --git a/generated/browser/js/docs/docs.js b/generated/browser/js/docs/docs.js
@@ -1,3 +1,4 @@
+/* global app */
 app.config(function ($stateProvider) {
     $stateProvider.state('docs', {
         url: '/docs',
diff --git a/generated/browser/js/fsa/fsa-pre-built.js b/generated/browser/js/fsa/fsa-pre-built.js
@@ -127,4 +127,4 @@
 
     });
 
-})();
+}());
diff --git a/generated/browser/js/home/home.js b/generated/browser/js/home/home.js
@@ -1,6 +1,7 @@
+/* global app */
 app.config(function ($stateProvider) {
     $stateProvider.state('home', {
         url: '/',
         templateUrl: 'js/home/home.html'
     });
-});
+});
diff --git a/generated/browser/js/login/login.js b/generated/browser/js/login/login.js
@@ -1,3 +1,4 @@
+/* global app */
 app.config(function ($stateProvider) {
 
     $stateProvider.state('login', {
@@ -25,4 +26,4 @@ app.controller('LoginCtrl', function ($scope, AuthService, $state) {
 
     };
 
-});
+});
diff --git a/generated/browser/js/members-only/members-only.js b/generated/browser/js/members-only/members-only.js
@@ -1,3 +1,4 @@
+/* global app */
 app.config(function ($stateProvider) {
 
     $stateProvider.state('membersOnly', {
@@ -29,4 +30,4 @@ app.factory('SecretStash', function ($http) {
         getStash: getStash
     };
 
-});
+});
diff --git a/generated/package.json b/generated/package.json
@@ -31,7 +31,7 @@
     "gulp": "^3.8.11",
     "gulp-babel": "^6.1.2",
     "gulp-concat": "^2.5.2",
-    "gulp-eslint": "^0.14.0",
+    "gulp-eslint": "^3.0.1",
     "gulp-istanbul": "^0.9.0",
     "gulp-livereload": "^3.7.0",
     "gulp-minify-css": "^0.4.6",
diff --git a/generated/server/app/configure/authentication/twitter.js b/generated/server/app/configure/authentication/twitter.js
@@ -23,7 +23,7 @@ module.exports = function (app, db) {
 
     var verifyCallback = function (token, tokenSecret, profile, done) {
 
-        UserModel.findOne({
+        User.findOne({
             where: {
                 twitter_id: profile.id
             }
diff --git a/generated/server/app/configure/parsing-middleware.js b/generated/server/app/configure/parsing-middleware.js
@@ -13,4 +13,4 @@ module.exports = function (app) {
     app.use(bodyParser.json());
     app.use(bodyParser.urlencoded({ extended: true }));
 
-};
+};
diff --git a/generated/server/app/configure/static-middleware.js b/generated/server/app/configure/static-middleware.js
@@ -1,4 +1,4 @@
-"use strict";
+'use strict';
 var path = require('path');
 var express = require('express');
 var favicon = require('serve-favicon');
diff --git a/generated/server/app/routes/index.js b/generated/server/app/routes/index.js
@@ -1,5 +1,5 @@
 'use strict';
-var router = require('express').Router();
+var router = require('express').Router(); // eslint-disable-line new-cap
 module.exports = router;
 
 router.use('/members', require('./members'));
diff --git a/generated/server/app/routes/members/index.js b/generated/server/app/routes/members/index.js
@@ -1,5 +1,5 @@
 'use strict';
-var router = require('express').Router();
+var router = require('express').Router(); // eslint-disable-line new-cap
 module.exports = router;
 var _ = require('lodash');
 
diff --git a/generated/server/db/index.js b/generated/server/db/index.js
@@ -2,5 +2,8 @@
 var db = require('./_db');
 module.exports = db;
 
+// eslint-disable-next-line no-unused-vars
 var User = require('./models/user');
 
+// if we had more models, we could associate them in this file
+// e.g. User.hasMany(Reports)
diff --git a/generated/server/env/development.js b/generated/server/env/development.js
@@ -1,21 +1,21 @@
 module.exports = {
-  "DATABASE_URI": "postgres://localhost:5432/fsg",
-  "SESSION_SECRET": "Optimus Prime is my real dad",
-  "TWITTER": {
-    "consumerKey": "INSERT_TWITTER_CONSUMER_KEY_HERE",
-    "consumerSecret": "INSERT_TWITTER_CONSUMER_SECRET_HERE",
-    "callbackUrl": "INSERT_TWITTER_CALLBACK_HERE"
+  DATABASE_URI: 'postgres://localhost:5432/fsg',
+  SESSION_SECRET: 'Optimus Prime is my real dad',
+  TWITTER: {
+    consumerKey: 'INSERT_TWITTER_CONSUMER_KEY_HERE',
+    consumerSecret: 'INSERT_TWITTER_CONSUMER_SECRET_HERE',
+    callbackUrl: 'INSERT_TWITTER_CALLBACK_HERE'
   },
-  "FACEBOOK": {
-    "clientID": "INSERT_FACEBOOK_CLIENTID_HERE",
-    "clientSecret": "INSERT_FACEBOOK_CLIENT_SECRET_HERE",
-    "callbackURL": "INSERT_FACEBOOK_CALLBACK_HERE"
+  FACEBOOK: {
+    clientID: 'INSERT_FACEBOOK_CLIENTID_HERE',
+    clientSecret: 'INSERT_FACEBOOK_CLIENT_SECRET_HERE',
+    callbackURL: 'INSERT_FACEBOOK_CALLBACK_HERE'
   },
-  "GOOGLE": {
-    "clientID": "INSERT_GOOGLE_CLIENTID_HERE",
-    "clientSecret": "INSERT_GOOGLE_CLIENT_SECRET_HERE",
-    "callbackURL": "INSERT_GOOGLE_CALLBACK_HERE"
+  GOOGLE: {
+    clientID: 'INSERT_GOOGLE_CLIENTID_HERE',
+    clientSecret: 'INSERT_GOOGLE_CLIENT_SECRET_HERE',
+    callbackURL: 'INSERT_GOOGLE_CALLBACK_HERE'
   },
-  "LOGGING": true,
-  "NATIVE": true
+  LOGGING: true,
+  NATIVE: true
 };
diff --git a/generated/server/env/index.js b/generated/server/env/index.js
@@ -6,7 +6,7 @@ var testConfigPath = path.join(__dirname, './testing.js');
 if (process.env.NODE_ENV === 'production') {
     module.exports = require(productionConfigPath);
 } else if (process.env.NODE_ENV === 'testing') {
-    module.exports = require(testConfigPath);	
+    module.exports = require(testConfigPath);
 } else {
     module.exports = require(devConfigPath);
-}
+}
diff --git a/generated/server/env/production.js b/generated/server/env/production.js
@@ -7,23 +7,23 @@
  */
 
 module.exports = {
-    "DATABASE_URI": process.env.DATABASE_URI,
-    "SESSION_SECRET": process.env.SESSION_SECRET,
-    "TWITTER": {
-        "consumerKey": process.env.TWITTER_CONSUMER_KEY,
-        "consumerSecret": process.env.TWITTER_CONSUMER_SECRET,
-        "callbackUrl": process.env.TWITTER_CALLBACK
+    DATABASE_URI: process.env.DATABASE_URI,
+    SESSION_SECRET: process.env.SESSION_SECRET,
+    TWITTER: {
+        consumerKey: process.env.TWITTER_CONSUMER_KEY,
+        consumerSecret: process.env.TWITTER_CONSUMER_SECRET,
+        callbackUrl: process.env.TWITTER_CALLBACK
     },
-    "FACEBOOK": {
-        "clientID": process.env.FACEBOOK_APP_ID,
-        "clientSecret": process.env.FACEBOOK_CLIENT_SECRET,
-        "callbackURL": process.env.FACEBOOK_CALLBACK_URL
+    FACEBOOK: {
+        clientID: process.env.FACEBOOK_APP_ID,
+        clientSecret: process.env.FACEBOOK_CLIENT_SECRET,
+        callbackURL: process.env.FACEBOOK_CALLBACK_URL
     },
-    "GOOGLE": {
-        "clientID": process.env.GOOGLE_CLIENT_ID,
-        "clientSecret": process.env.GOOGLE_CLIENT_SECRET,
-        "callbackURL": process.env.GOOGLE_CALLBACK_URL
+    GOOGLE: {
+        clientID: process.env.GOOGLE_CLIENT_ID,
+        clientSecret: process.env.GOOGLE_CLIENT_SECRET,
+        callbackURL: process.env.GOOGLE_CALLBACK_URL
     },
-    "LOGGING": true,
-    "NATIVE": true
+    LOGGING: true,
+    NATIVE: true
 };
diff --git a/generated/server/env/testing.js b/generated/server/env/testing.js
@@ -1,21 +1,21 @@
 module.exports = {
-  "DATABASE_URI": "postgres://localhost:5432/testing-fsg",
-  "SESSION_SECRET": "Optimus Prime is my real dad",
-  "TWITTER": {
-    "consumerKey": "INSERT_TWITTER_CONSUMER_KEY_HERE",
-    "consumerSecret": "INSERT_TWITTER_CONSUMER_SECRET_HERE",
-    "callbackUrl": "INSERT_TWITTER_CALLBACK_HERE"
+  DATABASE_URI: 'postgres://localhost:5432/testing-fsg',
+  SESSION_SECRET: 'Optimus Prime is my real dad',
+  TWITTER: {
+    consumerKey: 'INSERT_TWITTER_CONSUMER_KEY_HERE',
+    consumerSecret: 'INSERT_TWITTER_CONSUMER_SECRET_HERE',
+    callbackUrl: 'INSERT_TWITTER_CALLBACK_HERE'
   },
-  "FACEBOOK": {
-    "clientID": "INSERT_FACEBOOK_CLIENTID_HERE",
-    "clientSecret": "INSERT_FACEBOOK_CLIENT_SECRET_HERE",
-    "callbackURL": "INSERT_FACEBOOK_CALLBACK_HERE"
+  FACEBOOK: {
+    clientID: 'INSERT_FACEBOOK_CLIENTID_HERE',
+    clientSecret: 'INSERT_FACEBOOK_CLIENT_SECRET_HERE',
+    callbackURL: 'INSERT_FACEBOOK_CALLBACK_HERE'
   },
-  "GOOGLE": {
-    "clientID": "INSERT_GOOGLE_CLIENTID_HERE",
-    "clientSecret": "INSERT_GOOGLE_CLIENT_SECRET_HERE",
-    "callbackURL": "INSERT_GOOGLE_CALLBACK_HERE"
+  GOOGLE: {
+    clientID: 'INSERT_GOOGLE_CLIENTID_HERE',
+    clientSecret: 'INSERT_GOOGLE_CLIENT_SECRET_HERE',
+    callbackURL: 'INSERT_GOOGLE_CALLBACK_HERE'
   },
-  "LOGGING": false,
-  "NATIVE": true
+  LOGGING: false,
+  NATIVE: true
 };
diff --git a/generated/server/io/index.js b/generated/server/io/index.js
@@ -11,7 +11,7 @@ module.exports = function (server) {
     io.on('connection', function () {
         // Now have access to socket, wowzers!
     });
-    
+
     return io;
 
 };
diff --git a/generated/server/main.js b/generated/server/main.js
@@ -21,6 +21,9 @@ var startServer = function () {
 
 };
 
-db.sync().then(createApplication).then(startServer).catch(function (err) {
+db.sync()
+.then(createApplication)
+.then(startServer)
+.catch(function (err) {
     console.error(chalk.red(err.stack));
 });

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@`
`2`	`2`	`{`
`3`	`3`	"extends": "fullstack", // from the `eslint-config-fullstack` npm module
`4`	`4`	`"rules": {`
`5`		`- // add rules here to override the fullstack config`
	`5`	`+ "global-require": 0, // 0 = off, 1 = warn (yellow), 2 = error (red)`
	`6`	`+ "camelcase": 0`
	`7`	`+ // add more rules here to override the fullstack config`
`6`	`8`	`}`
`7`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+/* global app */`
`1`	`2`	`'use strict';`
`2`	`3`	`window.app = angular.module('FullstackGeneratedApp', ['fsaPreBuilt', 'ui.router', 'ui.bootstrap', 'ngAnimate']);`
`3`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+/* global app */`
`1`	`2`	`app.directive('navbar', function ($rootScope, AuthService, AUTH_EVENTS, $state) {`
`2`	`3`
`3`	`4`	`return {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+/* global app */`
`1`	`2`	`app.directive('randoGreeting', function (RandomGreetings) {`
`2`	`3`
`3`	`4`	`return {`
`@@ -8,4 +9,4 @@ app.directive('randoGreeting', function (RandomGreetings) {`
`8`	`9`	`}`
`9`	`10`	`};`
`10`	`11`
`11`		`-});`
	`12`	`+});`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+/* global app */`
`1`	`2`	`app.factory('FullstackPics', function () {`
`2`	`3`	`return [`
`3`	`4`	`'https://pbs.twimg.com/media/B7gBXulCAAAXQcE.jpg:large',`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+/* global app */`
`1`	`2`	`app.factory('RandomGreetings', function () {`
`2`	`3`
`3`	`4`	`var getRandomFromArray = function (arr) {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+/* global app */`
`1`	`2`	`app.config(function ($stateProvider) {`
`2`	`3`	`$stateProvider.state('docs', {`
`3`	`4`	`url: '/docs',`
Original file line number	Diff line number	Diff line change
`@@ -127,4 +127,4 @@`
`127`	`127`
`128`	`128`	`});`
`129`	`129`
`130`		`-})();`
	`130`	`+}());`