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

add CTA buttons to anonymous challenge completion modal and selectively hide and show elements on the show view

Browse Source
This commit is contained in:
Michael Q Larson
2014-12-24 14:34:52 -08:00
parent b26ff474fd
commit 986d6020fa
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
controllers/challenges.js
View File

@ -47,6 +47,7 @@ exports.returnChallenge = function(req, res, next) {
steps: c[challengeNumber].steps, steps: c[challengeNumber].steps,
number: challengeNumber, number: challengeNumber,
cc: req.user ? req.user.challengesHash : undefined, cc: req.user ? req.user.challengesHash : undefined,
points: req.user ? req.user.points : undefined,
verb: verbs[Math.floor(Math.random() * verbs.length)], verb: verbs[Math.floor(Math.random() * verbs.length)],
phrase: phrases[Math.floor(Math.random() * phrases.length)], phrase: phrases[Math.floor(Math.random() * phrases.length)],
challenges: c challenges: c

16
views/challenges/show.jade
View File

@ -15,7 +15,7 @@ block content
.btn.btn-primary.btn-big.btn-block.completed-challenge I've completed this challenge .btn.btn-primary.btn-big.btn-block.completed-challenge I've completed this challenge
.ten-pixel-break .ten-pixel-break
.btn.btn-success.btn-large.btn-block.skip-challenge I want to skip this challenge for now .btn.btn-success.btn-large.btn-block.skip-challenge I want to skip this challenge for now
- if (cc && cc[2] > 0) - if (points && points > 2 || !cc)
.panel-footer.text-center .panel-footer.text-center
span Need a break? Check out our:  span Need a break? Check out our: 
a(href="https://gitter.im/FreeCodeCamp/FreeCodeCamp", target="_blank") Chat Room a(href="https://gitter.im/FreeCodeCamp/FreeCodeCamp", target="_blank") Chat Room
@ -33,12 +33,14 @@ block content
h1.animated.zoomInDown Nicely done! h1.animated.zoomInDown Nicely done!
.animated.zoomInUp.delay-1 .animated.zoomInUp.delay-1
span.landing-icon.ion-checkmark-circled.text-primary span.landing-icon.ion-checkmark-circled.text-primary
a.animated.fadeIn.delay-2.btn.btn-lg.btn-primary.btn-block.next-button(name='_csrf', value=_csrf, aria-hidden='true') Take me to my next challenge - if (cc)
if (cc && cc[2] > 0) a.animated.fadeIn.delay-2.btn.btn-lg.btn-primary.btn-block.next-button(name='_csrf', value=_csrf, aria-hidden='true') Take me to my next challenge
a.animated.fadeIn.delay-2.btn-twitter.btn.btn-lg.btn-info.btn-block(href="https://twitter.com/intent/tweet?text=I%20just%20#{verb}%20Free%20Code%20Camp%20Challenge%20%23#{number}:%20#{name}&url=http%3A%2F%2Ffreecodecamp.com/challenges/#{number}&hashtags=learntocode, javascript") - if (points && points > 2)
i.fa.fa-twitter   a.animated.fadeIn.delay-2.btn-twitter.btn.btn-lg.btn-info.btn-block(href="https://twitter.com/intent/tweet?text=I%20just%20#{verb}%20Free%20Code%20Camp%20Challenge%20%23#{number}:%20#{name}&url=http%3A%2F%2Ffreecodecamp.com/challenges/#{number}&hashtags=learntocode, javascript")
= phrase i.fa.fa-twitter  
= phrase
- else
a.animated.fadeIn.delay-2.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress
#skip-dialog.modal #skip-dialog.modal
.modal-dialog.animated.zoomIn.fast-animation .modal-dialog.animated.zoomIn.fast-animation
.modal-content .modal-content

2
views/partials/navbar.jade
View File

@ -12,7 +12,7 @@
.collapse.navbar-collapse .collapse.navbar-collapse
ul.nav.navbar-nav.navbar-right ul.nav.navbar-nav.navbar-right
if !user if !user
a.btn.btn-primary.btn-nav.btn-sm(href='/login') Sign in a.btn.signup-btn.btn-nav.btn-sm(href='/login') Sign in
else else
li.dropdown(class=title=='Account Management'?'active':undefined) li.dropdown(class=title=='Account Management'?'active':undefined)
a.dropdown-toggle.text-center(href='#', data-toggle='dropdown') a.dropdown-toggle.text-center(href='#', data-toggle='dropdown')