improve github linking copy and error message
parent
27d9e0cfca
commit
9142aec8ad
|
@ -53,10 +53,9 @@ export default function({ models }) {
|
||||||
return Observable.throw(
|
return Observable.throw(
|
||||||
new Error(
|
new Error(
|
||||||
dedent`
|
dedent`
|
||||||
Your GitHub is already associated with another account.
|
Your GitHub account is already linked to another Free Code Camp
|
||||||
You may have accidentally created a duplicate account.
|
account. To access it, <a href='/signout'>Sign out</a> of Free Code Camp,
|
||||||
No worries, though. We can fix this real quick.
|
then sign in again using the "Sign in with GitHub" button.
|
||||||
Please email us with your GitHub username: team@freecodecamp.com.
|
|
||||||
`.split('/n').join(' ')
|
`.split('/n').join(' ')
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
|
@ -227,7 +227,10 @@ module.exports = function(app) {
|
||||||
|
|
||||||
function signout(req, res) {
|
function signout(req, res) {
|
||||||
req.logout();
|
req.logout();
|
||||||
res.redirect('/');
|
req.flash('success', {
|
||||||
|
msg: `You have successfully signed out.`
|
||||||
|
});
|
||||||
|
res.redirect('/signin');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ block content
|
||||||
if (!user.isGithubCool)
|
if (!user.isGithubCool)
|
||||||
a.btn.btn-lg.btn-block.btn-github.btn-link-social(href='/link/github')
|
a.btn.btn-lg.btn-block.btn-github.btn-link-social(href='/link/github')
|
||||||
i.fa.fa-github
|
i.fa.fa-github
|
||||||
| Link my GitHub to unlock my portfolio
|
| Link my GitHub to enable my public profile
|
||||||
else
|
else
|
||||||
a.btn.btn-lg.btn-block.btn-github.btn-link-social(href='/link/github')
|
a.btn.btn-lg.btn-block.btn-github.btn-link-social(href='/link/github')
|
||||||
i.fa.fa-github
|
i.fa.fa-github
|
||||||
|
|
|
@ -9,10 +9,10 @@ block content
|
||||||
if (!user.isGithubCool)
|
if (!user.isGithubCool)
|
||||||
a.btn.btn-lg.btn-block.btn-github.btn-link-social(href='/link/github')
|
a.btn.btn-lg.btn-block.btn-github.btn-link-social(href='/link/github')
|
||||||
i.fa.fa-github
|
i.fa.fa-github
|
||||||
| Link my GitHub to unlock my portfolio
|
| Link my GitHub to enable my public profile
|
||||||
.col-xs-12
|
.col-xs-12
|
||||||
a.btn.btn-lg.btn-block.btn-primary.btn-link-social(href='/settings')
|
a.btn.btn-lg.btn-block.btn-primary.btn-link-social(href='/settings')
|
||||||
| Update your settings
|
| Update my settings
|
||||||
.col-xs-12
|
.col-xs-12
|
||||||
a.btn.btn-lg.btn-block.btn-primary.btn-link-social(href='/signout')
|
a.btn.btn-lg.btn-block.btn-primary.btn-link-social(href='/signout')
|
||||||
| Sign me out of Free Code Camp
|
| Sign me out of Free Code Camp
|
||||||
|
|
Loading…
Reference in New Issue