Skip to content

Commit 5e844ac

Browse files
committed
style(server): fix some style inconsistency
1 parent 8b125a3 commit 5e844ac

File tree

8 files changed

+18
-22
lines changed

8 files changed

+18
-22
lines changed

app/templates/server/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ server.listen(config.port, config.ip, function () {
3434
});
3535

3636
// Expose app
37-
exports = module.exports = app;
37+
exports = module.exports = app;

app/templates/server/auth(auth)/facebook(facebookAuth)/index.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@ var auth = require('../auth.service');
66

77
var router = express.Router();
88

9-
109
// available scopes:
1110
// https://developers.facebook.com/docs/facebook-login/permissions/v2.0#reference
1211
var SCOPE = ['email', 'user_about_me'];
1312

14-
1513
router
1614
.get('/', passport.authenticate('facebook', {
1715
scope: SCOPE,

app/templates/server/auth(auth)/facebook(facebookAuth)/passport.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

3-
var passport = require('passport');
4-
var FacebookStrategy= require('passport-facebook').Strategy;
3+
var passport = require('passport');
4+
var FacebookStrategy = require('passport-facebook').Strategy;
55

66
exports.setup = function (User, config) {
77
passport.use(new FacebookStrategy(config.facebook,

app/templates/server/auth(auth)/google(googleAuth)/index.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@ var auth = require('../auth.service');
66

77
var router = express.Router();
88

9-
109
// available scopes:
1110
// https://developers.google.com/+/api/oauth
1211
var SCOPE = [ 'profile', 'email' ];
1312

14-
1513
router
1614
.get('/', passport.authenticate('google', {
1715
scope: SCOPE,

app/templates/server/auth(auth)/google(googleAuth)/passport.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var passport = require('passport');
3+
var passport = require('passport');
44
var GoogleStrategy = require('passport-google-oauth').OAuth2Strategy;
55

66
exports.setup = function (User, config) {

app/templates/server/config/_local.env.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
'use strict';
22

3-
// Environment variables that grunt will set when the server starts locally. Use for your api keys, secrets, etc.
4-
// You will need to set these on the server you deploy to.
3+
// Use local.env.js for environment variables that grunt will set when the server starts locally.
4+
// Use for your api keys, secrets, etc. This file should not be tracked by git.
55
//
6-
// This file should not be tracked by git.
6+
// You will need to set these on the server you deploy to.
77

88
module.exports = {
99
DOMAIN: 'http://localhost:9000',
10-
SESSION_SECRET: "<%= _.slugify(appname) + '-secret' %>",<% if (filters.facebookAuth) { %>
10+
SESSION_SECRET: '<%= _.slugify(appname) + "-secret" %>',<% if (filters.facebookAuth) { %>
1111

1212
FACEBOOK_ID: 'app-id',
1313
FACEBOOK_SECRET: 'secret',<% } if (filters.twitterAuth) { %>

app/templates/server/config/_local.env.sample.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
// You will need to set these on the server you deploy to.
77

88
module.exports = {
9-
DOMAIN: 'http://localhost:9000',
10-
SESSION_SECRET: "<%= _.slugify(appname) + '-secret' %>",<% if (filters.facebookAuth) { %>
9+
DOMAIN: 'http://localhost:9000',
10+
SESSION_SECRET: '<%= _.slugify(appname) + "-secret" %>',<% if (filters.facebookAuth) { %>
1111

12-
FACEBOOK_ID: 'app-id',
13-
FACEBOOK_SECRET: 'secret',<% } if (filters.twitterAuth) { %>
12+
FACEBOOK_ID: 'app-id',
13+
FACEBOOK_SECRET: 'secret',<% } if (filters.twitterAuth) { %>
1414

15-
TWITTER_ID: 'app-id',
16-
TWITTER_SECRET: 'secret',<% } if (filters.googleAuth) { %>
15+
TWITTER_ID: 'app-id',
16+
TWITTER_SECRET: 'secret',<% } if (filters.googleAuth) { %>
17+
18+
GOOGLE_ID: 'app-id',
19+
GOOGLE_SECRET: 'secret',<% } %>
1720

18-
GOOGLE_ID: 'app-id',
19-
GOOGLE_SECRET: 'secret',
20-
<% } %>
2121
// Control debug level for modules using visionmedia/debug
2222
DEBUG: ''
2323
};

app/templates/server/config/environment/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ var all = {
2626

2727
// Secret for session, you will want to change this and make it an environment variable
2828
secrets: {
29-
session: '<%= _.slugify(_.humanize(appname)) + '-secret' %>'
29+
session: '<%= _.slugify(_.humanize(appname)) + "-secret" %>'
3030
},
3131

3232
// List of user roles

0 commit comments

Comments
 (0)