Fix linting issue
This commit is contained in:
@ -1,6 +1,8 @@
|
|||||||
|
/*
|
||||||
export default {
|
export default {
|
||||||
path: 'bonfires/(:bonfireName)',
|
path: 'bonfires/(:bonfireName)'
|
||||||
getComponents(cb) {
|
getComponents(cb) {
|
||||||
// TODO(berks): add bonfire component
|
// TODO(berks): add bonfire component
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
*/
|
||||||
|
@ -1,7 +1,9 @@
|
|||||||
import{ Observable } from 'rx';
|
import{ Observable } from 'rx';
|
||||||
|
import debugFactory from 'debug';
|
||||||
|
import dedent from 'dedent';
|
||||||
|
|
||||||
import { observeMethod, observeQuery } from '../utils/rx';
|
import { observeMethod, observeQuery } from '../utils/rx';
|
||||||
import { getSocialProvider } from '../utils/auth';
|
import { getSocialProvider } from '../utils/auth';
|
||||||
import debugFactory from 'debug';
|
|
||||||
|
|
||||||
const debug = debugFactory('fcc:userIdent');
|
const debug = debugFactory('fcc:userIdent');
|
||||||
|
|
||||||
@ -49,7 +51,15 @@ export default function({ models }) {
|
|||||||
}
|
}
|
||||||
if (identity.userId.toString() !== userId.toString()) {
|
if (identity.userId.toString() !== userId.toString()) {
|
||||||
return Observable.throw(
|
return Observable.throw(
|
||||||
new Error("It looks like you already have an account associated with that sign in method. Here's what you can do: 1) Sign out of this account. 2) Use that sign in method to sign into your other account. 3) Delete that account. 4) Then sign back into this account and you'll be able to link it here. If you need help, send us an email at team@freecodecamp.com.")
|
new Error(
|
||||||
|
dedent`
|
||||||
|
It looks like you already have an account associated with that sign in method.
|
||||||
|
Here's what you can do: 1) Sign out of this account. 2) Use that sign in
|
||||||
|
method to sign into your other account. 3) Delete that account.
|
||||||
|
4) Then sign back into this account and you'll be able to link it here.
|
||||||
|
If you need help, send us an email at team@freecodecamp.com.
|
||||||
|
`.split('/n').join(' ')
|
||||||
|
)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
identity.credentials = credentials;
|
identity.credentials = credentials;
|
||||||
|
@ -591,7 +591,7 @@ module.exports = function(app) {
|
|||||||
),
|
),
|
||||||
camperCount,
|
camperCount,
|
||||||
lastCompleted,
|
lastCompleted,
|
||||||
title: "A Map to Learn to Code and Become a Software Engineer"
|
title: 'A Map to Learn to Code and Become a Software Engineer'
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
next
|
next
|
||||||
|
@ -5,7 +5,7 @@ module.exports = function mountLoopBackExplorer(app) {
|
|||||||
var explorer;
|
var explorer;
|
||||||
try {
|
try {
|
||||||
explorer = require('loopback-explorer');
|
explorer = require('loopback-explorer');
|
||||||
} catch(err) {
|
} catch (err) {
|
||||||
// Print the message only when the app was started via `app.listen()`.
|
// Print the message only when the app was started via `app.listen()`.
|
||||||
// Do not print any message when the project is used as a component.
|
// Do not print any message when the project is used as a component.
|
||||||
app.once('started', function() {
|
app.once('started', function() {
|
||||||
|
@ -192,7 +192,8 @@ module.exports = function(app) {
|
|||||||
|
|
||||||
function showTestimonials(req, res) {
|
function showTestimonials(req, res) {
|
||||||
res.render('resources/stories', {
|
res.render('resources/stories', {
|
||||||
title: 'Testimonials from Happy Free Code Camp Students who got Software Engineer Jobs',
|
title: 'Testimonials from Happy Free Code Camp Students ' +
|
||||||
|
'who got Software Engineer Jobs',
|
||||||
stories: testimonials.slice(0, 72),
|
stories: testimonials.slice(0, 72),
|
||||||
moreStories: true
|
moreStories: true
|
||||||
});
|
});
|
||||||
@ -200,7 +201,8 @@ module.exports = function(app) {
|
|||||||
|
|
||||||
function showAllTestimonials(req, res) {
|
function showAllTestimonials(req, res) {
|
||||||
res.render('resources/stories', {
|
res.render('resources/stories', {
|
||||||
title: 'Testimonials from Happy Free Code Camp Students who got Software Engineer Jobs',
|
title: 'Testimonials from Happy Free Code Camp Students ' +
|
||||||
|
'who got Software Engineer Jobs',
|
||||||
stories: testimonials,
|
stories: testimonials,
|
||||||
moreStories: false
|
moreStories: false
|
||||||
});
|
});
|
||||||
|
@ -4,7 +4,8 @@ module.exports = function(app) {
|
|||||||
router.get('/nonprofit-project-instructions', function(req, res) {
|
router.get('/nonprofit-project-instructions', function(req, res) {
|
||||||
res.redirect(
|
res.redirect(
|
||||||
301,
|
301,
|
||||||
"//github.com/FreeCodeCamp/freecodecamp/wiki/How-Free-Code-Camp's-Nonprofit-Projects-work"
|
'//github.com/FreeCodeCamp/freecodecamp/wiki/' +
|
||||||
|
"How-Free-Code-Camp's-Nonprofit-Projects-work"
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -18,7 +19,9 @@ module.exports = function(app) {
|
|||||||
|
|
||||||
router.get('/privacy', function(req, res) {
|
router.get('/privacy', function(req, res) {
|
||||||
res.redirect(
|
res.redirect(
|
||||||
301, "//github.com/FreeCodeCamp/freecodecamp/wiki/Free-Code-Camp's-Privacy-Policy"
|
301,
|
||||||
|
'//github.com/FreeCodeCamp/freecodecamp/wiki/' +
|
||||||
|
"Free-Code-Camp's-Privacy-Policy"
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -27,7 +30,7 @@ module.exports = function(app) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
router.get('/field-guide/*', function(req, res) {
|
router.get('/field-guide/*', function(req, res) {
|
||||||
res.redirect(302, '//github.com/freecodecamp/freecodecamp/wiki')
|
res.redirect(302, '//github.com/freecodecamp/freecodecamp/wiki');
|
||||||
});
|
});
|
||||||
|
|
||||||
router.get('/about', function(req, res) {
|
router.get('/about', function(req, res) {
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
module.exports = {
|
module.exports = {
|
||||||
host: process.env.HOST || 'localhost'
|
host: process.env.HOST || 'localhost'
|
||||||
};
|
};
|
||||||
|
Reference in New Issue
Block a user