greatbody
/
freeCodeCamp
mirror of https://github.com/freeCodeCamp/freeCodeCamp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

improve github linking copy and error message

pull/12229/head
Quincy Larson 2016-12-26 01:30:38 -06:00
parent 27d9e0cfca
commit 9142aec8ad
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/boot/a-extendUserIdent.js
View File

@ -53,10 +53,9 @@ export default function({ models }) {
return Observable.throw(
new Error(
dedent`
Your GitHub is already associated with another account.
You may have accidentally created a duplicate account.
No worries, though. We can fix this real quick.
Please email us with your GitHub username: team@freecodecamp.com.
Your GitHub account is already linked to another Free Code Camp
account. To access it, <a href='/signout'>Sign out</a> of Free Code Camp,
then sign in again using the "Sign in with GitHub" button.
`.split('/n').join(' ')
)
);

5
server/boot/user.js
View File

@ -227,7 +227,10 @@ module.exports = function(app) {
function signout(req, res) {
req.logout();
res.redirect('/');
req.flash('success', {
msg: `You have successfully signed out.`
});
res.redirect('/signin');
}

2
server/views/account/settings.jade
View File

@ -11,7 +11,7 @@ block content
if (!user.isGithubCool)
a.btn.btn-lg.btn-block.btn-github.btn-link-social(href='/link/github')
i.fa.fa-github
| Link my GitHub to unlock my portfolio
| Link my GitHub to enable my public profile
else
a.btn.btn-lg.btn-block.btn-github.btn-link-social(href='/link/github')
i.fa.fa-github

4
server/views/account/show.jade
View File

@ -9,10 +9,10 @@ block content
if (!user.isGithubCool)
a.btn.btn-lg.btn-block.btn-github.btn-link-social(href='/link/github')
i.fa.fa-github
| Link my GitHub to unlock my portfolio
| Link my GitHub to enable my public profile
.col-xs-12
a.btn.btn-lg.btn-block.btn-primary.btn-link-social(href='/settings')
| Update your settings
| Update my settings
.col-xs-12
a.btn.btn-lg.btn-block.btn-primary.btn-link-social(href='/signout')
| Sign me out of Free Code Camp