Skip to content

Commit 101b80f

Browse files
committed
Switched from JSHint to Semistandard and upgraded dependencies.
1 parent f5c0f0e commit 101b80f

File tree

98 files changed

+677
-772
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+677
-772
lines changed

.jshintignore

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
1-
appengine/bower/public/bower_components/**
2-
appengine/kraken/public/components/**
3-
appengine/parse-server/cloud/main.js
4-
appengine/sails/config/**
5-
appengine/sails/tasks/**
6-
appengine/sails/assets/**
7-
appengine/sails/api/responses/**
8-
appengine/webpack/dist/**
1+
92
functions/**
10-
**/node_modules/**
11-
coverage/
3+
124
logging/fluent.js

appengine/analytics/app.js

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ var app = express();
2424
// but will need to be manually set when running locally. See README.md.
2525
var GA_TRACKING_ID = process.env.GA_TRACKING_ID;
2626

27-
function trackEvent(category, action, label, value, cb) {
27+
function trackEvent (category, action, label, value, cb) {
2828
var data = {
2929
v: '1', // API Version.
3030
tid: GA_TRACKING_ID, // Tracking ID / Property ID.
@@ -35,14 +35,14 @@ function trackEvent(category, action, label, value, cb) {
3535
ec: category, // Event category.
3636
ea: action, // Event action.
3737
el: label, // Event label.
38-
ev: value, // Event value.
38+
ev: value // Event value.
3939
};
4040

4141
request.post(
4242
'http://www.google-analytics.com/collect', {
4343
form: data
4444
},
45-
function(err, response) {
45+
function (err, response) {
4646
if (err) { return cb(err); }
4747
if (response.statusCode !== 200) {
4848
return cb(new Error('Tracking failed'));
@@ -52,13 +52,13 @@ function trackEvent(category, action, label, value, cb) {
5252
);
5353
}
5454

55-
app.get('/', function(req, res, next) {
55+
app.get('/', function (req, res, next) {
5656
trackEvent(
5757
'Example category',
5858
'Example action',
5959
'Example label',
6060
'100', // Event value must be numeric.
61-
function(err) {
61+
function (err) {
6262
// This sample treats an event tracking error as a fatal error. Depending
6363
// on your application's needs, failing to track an event may not be
6464
// considered an error.
@@ -68,9 +68,8 @@ app.get('/', function(req, res, next) {
6868
});
6969

7070
// Start the server
71-
var server = app.listen(process.env.PORT || 8080, '0.0.0.0', function() {
72-
console.log('App listening at http://%s:%s', server.address().address,
73-
server.address().port);
71+
var server = app.listen(process.env.PORT || 8080, function () {
72+
console.log('App listening on port %s', server.address().port);
7473
console.log('Press Ctrl+C to quit.');
7574
});
7675
// [END app]

appengine/bower/server.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,16 @@
1414
'use strict';
1515

1616
var express = require('express');
17+
var path = require('path');
1718

1819
var app = express();
1920

2021
// Setup view engine
2122
app.set('view engine', 'jade');
2223

23-
app.use(express.static(__dirname + '/public'));
24+
app.use(express.static(path.join(__dirname, '/public')));
2425

25-
app.get('/', function(req, res) {
26+
app.get('/', function (req, res) {
2627
res.render('index');
2728
});
2829

appengine/cloudsql/app.js

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ var connection = mysql.createConnection({
3333
database: process.env.MYSQL_DATABASE
3434
});
3535

36-
app.get('/', function(req, res, next) {
36+
app.get('/', function (req, res, next) {
3737
var hash = crypto.createHash('sha256');
3838

3939
// Add this visit to the database
@@ -43,17 +43,21 @@ app.get('/', function(req, res, next) {
4343
userIp: hash.update(req.ip).digest('hex').substr(0, 7)
4444
};
4545

46-
connection.query('INSERT INTO `visits` SET ?', visit, function(err) {
47-
if (err) { return next(err); }
46+
connection.query('INSERT INTO `visits` SET ?', visit, function (err) {
47+
if (err) {
48+
return next(err);
49+
}
4850

4951
// Query the last 10 visits from the database.
5052
connection.query(
5153
'SELECT `timestamp`, `userIp` FROM `visits` ORDER BY `timestamp` DESC ' +
5254
'LIMIT 10',
53-
function(err, results) {
54-
if (err) { return next(err); }
55+
function (err, results) {
56+
if (err) {
57+
return next(err);
58+
}
5559

56-
var visits = results.map(function(visit) {
60+
var visits = results.map(function (visit) {
5761
return format(
5862
'Time: %s, AddrHash: %s',
5963
visit.timestamp,
@@ -68,9 +72,8 @@ app.get('/', function(req, res, next) {
6872
});
6973
});
7074

71-
var server = app.listen(process.env.PORT || 8080, '0.0.0.0', function() {
72-
console.log('App listening at http://%s:%s', server.address().address,
73-
server.address().port);
75+
var server = app.listen(process.env.PORT || 8080, function () {
76+
console.log('App listening on port %s', server.address().port);
7477
console.log('Press Ctrl+C to quit.');
7578
});
7679
// [END app]

appengine/cloudsql/create_tables.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ var prompt = require('prompt');
2020

2121
prompt.start();
2222

23-
prompt.get(['host', 'user', 'password', 'database'], function(err, config) {
23+
prompt.get(['host', 'user', 'password', 'database'], function (err, config) {
2424
if (err) { return; }
2525

2626
config.multipleStatements = true;
@@ -33,8 +33,10 @@ prompt.get(['host', 'user', 'password', 'database'], function(err, config) {
3333
' `timestamp` DATETIME NULL,' +
3434
' `userIp` VARCHAR(46) NULL,' +
3535
' PRIMARY KEY (`id`));',
36-
function(err) {
37-
if (err) { throw err; }
36+
function (err) {
37+
if (err) {
38+
throw err;
39+
}
3840
console.log('Done!');
3941
connection.end();
4042
}

appengine/datastore/app.js

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ var dataset = gcloud.datastore({
2929
projectId: process.env.GCLOUD_PROJECT
3030
});
3131

32-
app.get('/', function(req, res, next) {
32+
app.get('/', function (req, res, next) {
3333
var hash = crypto.createHash('sha256');
3434

3535
// Add this visit to the datastore
@@ -40,18 +40,22 @@ app.get('/', function(req, res, next) {
4040
// Store a hash of the ip address
4141
userIp: hash.update(req.ip).digest('hex').substr(0, 7)
4242
}
43-
}, function(err) {
44-
if (err) { return next(err); }
43+
}, function (err) {
44+
if (err) {
45+
return next(err);
46+
}
4547

4648
// Query the last 10 visits from the datastore.
4749
var query = dataset.createQuery('visit')
4850
.order('-timestamp')
4951
.limit(10);
5052

51-
dataset.runQuery(query, function(err, entities) {
52-
if (err) { return next(err); }
53+
dataset.runQuery(query, function (err, entities) {
54+
if (err) {
55+
return next(err);
56+
}
5357

54-
var visits = entities.map(function(entity) {
58+
var visits = entities.map(function (entity) {
5559
return format(
5660
'Time: %s, AddrHash: %s',
5761
entity.data.timestamp,
@@ -67,9 +71,8 @@ app.get('/', function(req, res, next) {
6771
});
6872

6973
/* Start the server */
70-
var server = app.listen(process.env.PORT || 8080, '0.0.0.0', function() {
71-
console.log('App listening at http://%s:%s', server.address().address,
72-
server.address().port);
74+
var server = app.listen(process.env.PORT || 8080, function () {
75+
console.log('App listening on port %s', server.address().port);
7376
console.log('Press Ctrl+C to quit.');
7477
});
7578
// [END app]

appengine/disk/app.js

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,22 @@ var crypto = require('crypto');
2323
var app = express();
2424
app.enable('trust proxy');
2525

26-
app.get('/', function(req, res, next) {
26+
app.get('/', function (req, res, next) {
2727
var instanceId = process.env.GAE_MODULE_INSTANCE || '1';
2828
var hash = crypto.createHash('sha256');
2929
// Only store a hash of the ip address
3030
var ip = hash.update(req.ip).digest('hex').substr(0, 7);
3131
var userIp = util.format('%s\n', ip);
3232

33-
fs.appendFile('/tmp/seen.txt', userIp, function(err) {
34-
if (err) { return next(err); }
33+
fs.appendFile('/tmp/seen.txt', userIp, function (err) {
34+
if (err) {
35+
return next(err);
36+
}
3537

36-
fs.readFile('/tmp/seen.txt', function(err, data) {
37-
if (err) { return next(err); }
38+
fs.readFile('/tmp/seen.txt', function (err, data) {
39+
if (err) {
40+
return next(err);
41+
}
3842

3943
res.set('Content-Type', 'text/plain');
4044
res.status(200).send(util.format(
@@ -44,9 +48,8 @@ app.get('/', function(req, res, next) {
4448
});
4549
});
4650

47-
var server = app.listen(process.env.PORT || 8080, '0.0.0.0', function() {
48-
console.log('App listening at http://%s:%s', server.address().address,
49-
server.address().port);
51+
var server = app.listen(process.env.PORT || 8080, function () {
52+
console.log('App listening on port %s', server.address().port);
5053
console.log('Press Ctrl+C to quit.');
5154
});
5255
// [END app]

appengine/endpoints/app.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ var bodyParser = require('body-parser');
2020
var app = express();
2121
app.use(bodyParser.json());
2222

23-
app.post('/echo', function(req, res) {
23+
app.post('/echo', function (req, res) {
2424
res.status(200).json({message: req.body.message});
2525
});
2626

27-
function authInfoHandler(req, res) {
27+
function authInfoHandler (req, res) {
2828
var authUser = {id: 'anonymous'};
2929
var encodedInfo = req.get('X-Endpoint-API-UserInfo');
3030
if (encodedInfo) {
@@ -37,8 +37,7 @@ app.get('/auth/info/googlejwt', authInfoHandler);
3737
app.get('/auth/info/googleidtoken', authInfoHandler);
3838

3939
// Start the server
40-
var server = app.listen(process.env.PORT || '8080', '0.0.0.0', function() {
41-
console.log('App listening at http://%s:%s', server.address().address,
42-
server.address().port);
40+
var server = app.listen(process.env.PORT || '8080', function () {
41+
console.log('App listening on port %s', server.address().port);
4342
console.log('Press Ctrl+C to quit.');
4443
});

appengine/errorreporting/app.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/*jshint unused:false*/
21
// Copyright 2015-2016, Google, Inc.
32
//
43
// Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,10 +25,10 @@ winston.add(winston.transports.File, {
2625
filename: logFile
2726
});
2827

29-
function report(err, req) {
28+
function report (err, req) {
3029
var payload = {
3130
serviceContext: {
32-
service: 'myapp',
31+
service: 'myapp'
3332
},
3433
message: err.stack,
3534
context: {
@@ -39,7 +38,7 @@ function report(err, req) {
3938
referrer: req.header('Referer'),
4039
userAgent: req.header('User-Agent'),
4140
remoteIp: req.ip,
42-
responseStatusCode: 500,
41+
responseStatusCode: 500
4342
}
4443
}
4544
};

appengine/express-memcached-session/server.js

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,17 @@ app.use(session({
3232
})
3333
}));
3434

35-
app.get('/', function(req, res){
35+
app.get('/', function (req, res, next) {
3636
publicIp.v4(function (err, ip) {
37+
if (err) {
38+
return next(err);
39+
}
3740
var hash = crypto.createHash('sha256');
3841

39-
// This shows the hashed IP for each
42+
// This shows the hashed IP for each
4043
res.write('<div>' + hash.update(ip).digest('hex').substr(0, 7) + '</div>');
4144

42-
if(req.session.views) {
45+
if (req.session.views) {
4346
++req.session.views;
4447
} else {
4548
req.session.views = 1;
@@ -49,9 +52,10 @@ app.get('/', function(req, res){
4952
});
5053

5154
if (module === require.main) {
52-
app.listen(process.env.PORT || 8080, function() {
53-
console.log('Listening on %d', this.address().port);
54-
});
55+
var server = app.listen(process.env.PORT || 8080, function () {
56+
console.log('App listening on port %d', server.address().port);
57+
});
58+
console.log('Press Ctrl+C to quit.');
5559
}
5660

5761
module.exports = app;

0 commit comments

Comments
 (0)