Skip to content

Commit

Permalink
Add newlines to ends of files
Browse files Browse the repository at this point in the history
  • Loading branch information
treyhunner committed Mar 3, 2015
1 parent 7e397e9 commit 78f2808
Showing 37 changed files with 45 additions and 45 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -26,4 +26,4 @@ ENV NODE_ENV development
# Port 3000 for server
# Port 35729 for livereload
EXPOSE 3000 35729
CMD ["grunt"]
CMD ["grunt"]
2 changes: 1 addition & 1 deletion app/controllers/articles.server.controller.js
Original file line number Diff line number Diff line change
@@ -117,4 +117,4 @@ exports.hasAuthorization = function(req, res, next) {
});
}
next();
};
};
2 changes: 1 addition & 1 deletion app/controllers/core.server.controller.js
Original file line number Diff line number Diff line change
@@ -8,4 +8,4 @@ exports.index = function(req, res) {
user: req.user || null,
request: req
});
};
};
2 changes: 1 addition & 1 deletion app/controllers/errors.server.controller.js
Original file line number Diff line number Diff line change
@@ -39,4 +39,4 @@ exports.getErrorMessage = function(err) {
}

return message;
};
};
2 changes: 1 addition & 1 deletion app/controllers/users.server.controller.js
Original file line number Diff line number Diff line change
@@ -13,4 +13,4 @@ module.exports = _.extend(
require('./users/users.authorization.server.controller'),
require('./users/users.password.server.controller'),
require('./users/users.profile.server.controller')
);
);
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ exports.signup = function(req, res) {
user.provider = 'local';
user.displayName = user.firstName + ' ' + user.lastName;

// Then save the user
// Then save the user
user.save(function(err) {
if (err) {
return res.status(400).send({
@@ -203,4 +203,4 @@ exports.removeOAuthProvider = function(req, res, next) {
}
});
}
};
};
4 changes: 2 additions & 2 deletions app/controllers/users/users.password.server.controller.js
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ var _ = require('lodash'),
nodemailer = require('nodemailer'),
async = require('async'),
crypto = require('crypto');

var smtpTransport = nodemailer.createTransport(config.mailer.options);

/**
@@ -142,7 +142,7 @@ exports.reset = function(req, res, next) {
if (err) {
res.status(400).send(err);
} else {
// Return authenticated user
// Return authenticated user
res.json(user);

done(err, user);
2 changes: 1 addition & 1 deletion app/controllers/users/users.profile.server.controller.js
Original file line number Diff line number Diff line change
@@ -53,4 +53,4 @@ exports.update = function(req, res) {
*/
exports.me = function(req, res) {
res.json(req.user || null);
};
};
2 changes: 1 addition & 1 deletion app/models/article.server.model.js
Original file line number Diff line number Diff line change
@@ -31,4 +31,4 @@ var ArticleSchema = new Schema({
}
});

mongoose.model('Article', ArticleSchema);
mongoose.model('Article', ArticleSchema);
2 changes: 1 addition & 1 deletion app/models/user.server.model.js
Original file line number Diff line number Diff line change
@@ -143,4 +143,4 @@ UserSchema.statics.findUniqueUsername = function(username, suffix, callback) {
});
};

mongoose.model('User', UserSchema);
mongoose.model('User', UserSchema);
2 changes: 1 addition & 1 deletion app/routes/articles.server.routes.js
Original file line number Diff line number Diff line change
@@ -19,4 +19,4 @@ module.exports = function(app) {

// Finish by binding the article middleware
app.param('articleId', articles.articleByID);
};
};
2 changes: 1 addition & 1 deletion app/routes/core.server.routes.js
Original file line number Diff line number Diff line change
@@ -4,4 +4,4 @@ module.exports = function(app) {
// Root routing
var core = require('../../app/controllers/core.server.controller');
app.route('/').get(core.index);
};
};
2 changes: 1 addition & 1 deletion app/routes/users.server.routes.js
Original file line number Diff line number Diff line change
@@ -54,4 +54,4 @@ module.exports = function(app) {

// Finish by binding the user middleware
app.param('userId', users.userByID);
};
};
2 changes: 1 addition & 1 deletion app/tests/article.server.model.test.js
Original file line number Diff line number Diff line change
@@ -61,4 +61,4 @@ describe('Article Model Unit Tests:', function() {
User.remove().exec();
done();
});
});
});
6 changes: 3 additions & 3 deletions app/tests/article.server.routes.test.js
Original file line number Diff line number Diff line change
@@ -116,7 +116,7 @@ describe('Article CRUD tests', function() {
.end(function(articleSaveErr, articleSaveRes) {
// Set message assertion
(articleSaveRes.body.message).should.match('Title cannot be blank');

// Handle article save error
done(articleSaveErr);
});
@@ -250,7 +250,7 @@ describe('Article CRUD tests', function() {
});

it('should not be able to delete an article if not signed in', function(done) {
// Set article user
// Set article user
article.user = user;

// Create new article model instance
@@ -277,4 +277,4 @@ describe('Article CRUD tests', function() {
Article.remove().exec();
done();
});
});
});
2 changes: 1 addition & 1 deletion app/tests/user.server.model.test.js
Original file line number Diff line number Diff line change
@@ -72,4 +72,4 @@ describe('User Model Unit Tests:', function() {
User.remove().exec();
done();
});
});
});
2 changes: 1 addition & 1 deletion app/views/404.server.view.html
Original file line number Diff line number Diff line change
@@ -5,4 +5,4 @@ <h1>Page Not Found</h1>
<pre>
{{url}} is not a valid path.
</pre>
{% endblock %}
{% endblock %}
2 changes: 1 addition & 1 deletion app/views/500.server.view.html
Original file line number Diff line number Diff line change
@@ -5,4 +5,4 @@ <h1>Server Error</h1>
<pre>
{{error}}
</pre>
{% endblock %}
{% endblock %}
2 changes: 1 addition & 1 deletion app/views/layout.server.view.html
Original file line number Diff line number Diff line change
@@ -76,4 +76,4 @@ <h1>Hello there!</h1>
<![endif]-->
</body>

</html>
</html>
Original file line number Diff line number Diff line change
@@ -10,4 +10,4 @@
<br>
<p>The {{appName}} Support Team</p>
</body>
</html>
</html>
2 changes: 1 addition & 1 deletion app/views/templates/reset-password-email.server.view.html
Original file line number Diff line number Diff line change
@@ -15,4 +15,4 @@
<br>
<p>The {{appName}} Support Team</p>
</body>
</html>
</html>
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -11,6 +11,6 @@
"angular-bootstrap": "~0.11.2",
"angular-bootstrap": "~0.12.0",
"angular-ui-utils": "~0.1.1",
"angular-ui-router": "~0.2.11"
"angular-ui-router": "~0.2.11"
}
}
4 changes: 2 additions & 2 deletions config/config.js
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ module.exports.getGlobbedFiles = function(globPatterns, removeRoot) {
// The output array
var output = [];

// If glob pattern is array so we use each pattern in a recursive way, otherwise we use glob
// If glob pattern is array so we use each pattern in a recursive way, otherwise we use glob
if (_.isArray(globPatterns)) {
globPatterns.forEach(function(globPattern) {
output = _.union(output, _this.getGlobbedFiles(globPattern, removeRoot));
@@ -73,4 +73,4 @@ module.exports.getJavaScriptAssets = function(includeTests) {
module.exports.getCSSAssets = function() {
var output = this.getGlobbedFiles(this.assets.lib.css.concat(this.assets.css), 'public/');
return output;
};
};
6 changes: 3 additions & 3 deletions config/env/all.js
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ module.exports = {
// The name of the MongoDB collection to store sessions in
sessionCollection: 'sessions',
// The session cookie settings
sessionCookie: {
sessionCookie: {
path: '/',
httpOnly: true,
// If secure is set to true then it will cause the cookie to be set
@@ -25,7 +25,7 @@ module.exports = {
// Only set the maxAge to null if the cookie shouldn't be expired
// at all. The cookie will expunge when the browser is closed.
maxAge: null,
// To set the cookie in a specific domain uncomment the following
// To set the cookie in a specific domain uncomment the following
// setting:
// domain: 'yourdomain.com'
},
@@ -69,4 +69,4 @@ module.exports = {
'public/modules/*/tests/*.js'
]
}
};
};
2 changes: 1 addition & 1 deletion config/env/secure.js
Original file line number Diff line number Diff line change
@@ -71,4 +71,4 @@ module.exports = {
}
}
}
};
};
2 changes: 1 addition & 1 deletion config/env/test.js
Original file line number Diff line number Diff line change
@@ -56,4 +56,4 @@ module.exports = {
}
}
}
};
};
2 changes: 1 addition & 1 deletion config/init.js
Original file line number Diff line number Diff line change
@@ -28,4 +28,4 @@ module.exports = function() {
}
});

};
};
2 changes: 1 addition & 1 deletion config/logger.js
Original file line number Diff line number Diff line change
@@ -33,4 +33,4 @@ module.exports = {
return options;
}

};
};
4 changes: 2 additions & 2 deletions config/passport.js
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ var passport = require('passport'),
User = require('mongoose').model('User'),
path = require('path'),
config = require('./config');

/**
* Module init function.
*/
@@ -30,4 +30,4 @@ module.exports = function() {
config.getGlobbedFiles('./config/strategies/**/*.js').forEach(function(strategy) {
require(path.resolve(strategy))();
});
};
};
2 changes: 1 addition & 1 deletion config/strategies/facebook.js
Original file line number Diff line number Diff line change
@@ -38,4 +38,4 @@ module.exports = function() {
users.saveOAuthUserProfile(req, providerUserProfile, done);
}
));
};
};
2 changes: 1 addition & 1 deletion config/strategies/github.js
Original file line number Diff line number Diff line change
@@ -43,4 +43,4 @@ module.exports = function() {
users.saveOAuthUserProfile(req, providerUserProfile, done);
}
));
};
};
2 changes: 1 addition & 1 deletion config/strategies/google.js
Original file line number Diff line number Diff line change
@@ -38,4 +38,4 @@ module.exports = function() {
users.saveOAuthUserProfile(req, providerUserProfile, done);
}
));
};
};
2 changes: 1 addition & 1 deletion config/strategies/linkedin.js
Original file line number Diff line number Diff line change
@@ -39,4 +39,4 @@ module.exports = function() {
users.saveOAuthUserProfile(req, providerUserProfile, done);
}
));
};
};
2 changes: 1 addition & 1 deletion config/strategies/local.js
Original file line number Diff line number Diff line change
@@ -35,4 +35,4 @@ module.exports = function() {
});
}
));
};
};
2 changes: 1 addition & 1 deletion config/strategies/twitter.js
Original file line number Diff line number Diff line change
@@ -42,4 +42,4 @@ module.exports = function() {
users.saveOAuthUserProfile(req, providerUserProfile, done);
}
));
};
};
2 changes: 1 addition & 1 deletion fig.yml
Original file line number Diff line number Diff line change
@@ -9,4 +9,4 @@ web:
db:
image: mongo
ports:
- "27017:27017"
- "27017:27017"
2 changes: 1 addition & 1 deletion server.js
Original file line number Diff line number Diff line change
@@ -46,4 +46,4 @@ console.log(chalk.green('Database:\t\t\t' + config.db.uri));
if (process.env.NODE_ENV === 'secure') {
console.log(chalk.green('HTTPs:\t\t\t\ton'));
}
console.log('--');
console.log('--');

0 comments on commit 78f2808

Please sign in to comment.