gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7906 from QuincyLarson/fix/hide-google-facebook

Browse Source 
Fix/hide google facebook
This commit is contained in:
Berkeley Martinez
2016-04-05 14:35:37 -07:00
parent 4ff2abbae1 b40f9b4880
commit c39880907a
4 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/models/user.json
View File

@ -92,12 +92,6 @@
"twitter": { "twitter": {
"type": "string" "type": "string"
}, },
"facebook": {
"type": "string"
},
"google": {
"type": "string"
},
"currentStreak": { "currentStreak": {
"type": "number", "type": "number",
"default": 0 "default": 0

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

@ -17,18 +17,10 @@ block content
a.btn.btn-lg.btn-block.btn-twitter.btn-link-social(href='/link/twitter') a.btn.btn-lg.btn-block.btn-twitter.btn-link-social(href='/link/twitter')
i.fa.fa-twitter i.fa.fa-twitter
| Add my Twitter to my portfolio | Add my Twitter to my portfolio
if (!user.facebook)
a.btn.btn-lg.btn-block.btn-facebook.btn-link-social(href='/link/facebook')
i.fa.fa-facebook
| Add my Facebook to my portfolio
if (!user.linkedin) if (!user.linkedin)
a.btn.btn-lg.btn-block.btn-linkedin.btn-link-social(href='/link/linkedin') a.btn.btn-lg.btn-block.btn-linkedin.btn-link-social(href='/link/linkedin')
i.fa.fa-linkedin i.fa.fa-linkedin
| Add my LinkedIn to my portfolio | Add my LinkedIn to my portfolio
if (!user.google)
a.btn.btn-lg.btn-block.btn-google.btn-link-social(href='/link/google')
i.fa.fa-google-plus
| Add my Google+ to my portfolio
.spacer .spacer
h2.text-center Account Settings h2.text-center Account Settings
.row .row

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

@ -34,10 +34,6 @@ block content
a.fa.fa-github-square.text-primary(title="@#{username}'s GitHub Profile", href=github, target='_blank') a.fa.fa-github-square.text-primary(title="@#{username}'s GitHub Profile", href=github, target='_blank')
if (linkedin) if (linkedin)
a.fa.fa-linkedin-square.text-primary(title="@#{username}'s LinkedIn Profile", href=linkedin, target='_blank') a.fa.fa-linkedin-square.text-primary(title="@#{username}'s LinkedIn Profile", href=linkedin, target='_blank')
if (facebook)
a.fa.fa-facebook-square.text-primary(title="@#{username}'s Facebook Profile", href='https://facebook.com/' + facebook, target='_blank')
if (google)
a.fa.fa-google-plus-square.text-primary(title="@#{username}'s Google Profile", href='https://plus.google.com/' + google, target='_blank')
h1.flat-top.wrappable= name h1.flat-top.wrappable= name
h1.flat-top.wrappable= location h1.flat-top.wrappable= location
h1.flat-top.text-primary= "[ " + (progressTimestamps.length) + " ]" h1.flat-top.text-primary= "[ " + (progressTimestamps.length) + " ]"

2
server/views/home.jade
View File

@ -9,7 +9,7 @@ block content
.big-break .big-break
.col-xs-12.col-sm-12.col-md-3 .col-xs-12.col-sm-12.col-md-3
img.img-responsive.landing-icon.img-center(src= 'https://s3.amazonaws.com/freecodecamp/landingIcons_connect.svg', alt='Get great references and connections to start your software engineer career') img.img-responsive.landing-icon.img-center(src= 'https://s3.amazonaws.com/freecodecamp/landingIcons_connect.svg', alt='Get great references and connections to start your software engineer career')
p.large-p Join a community of 200,000+ developers. p.large-p Join a community of 300,000+ developers.
.col-xs-12.col-sm-12.col-md-3 .col-xs-12.col-sm-12.col-md-3
img.img-responsive.landing-icon.img-center(src= 'https://s3.amazonaws.com/freecodecamp/landingIcons_learn.svg', alt='Learn to code and learn full stack JavaScript') img.img-responsive.landing-icon.img-center(src= 'https://s3.amazonaws.com/freecodecamp/landingIcons_learn.svg', alt='Learn to code and learn full stack JavaScript')
p.large-p Work on coding challenges together. p.large-p Work on coding challenges together.