From c27e5bf6c425992b2f0afc64aa2efe8e20c2c83d Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Mon, 5 Oct 2015 21:57:15 -0700 Subject: [PATCH] start adding clementine challenge --- client/commonFramework.js | 8 +- seed/challenges/basejumps.json | 130 ++++++++++++++++++ .../front-end-development-certificate.json | 2 +- .../full-stack-development-certificate.json | 2 +- seed/challenges/getting-started.json | 42 +----- server/views/coursewares/showStep.jade | 5 +- 6 files changed, 140 insertions(+), 49 deletions(-) diff --git a/client/commonFramework.js b/client/commonFramework.js index fcb1ccc58d..01b81c7e98 100644 --- a/client/commonFramework.js +++ b/client/commonFramework.js @@ -849,15 +849,15 @@ common.init.push((function() { var nextStep = getNextStep($(stepClass)); $(this) .parent() - .addClass('animated fadeOutLeft') - .delay(700) + .addClass('animated fadeOutLeft fast-animation') + .delay(250) .queue(function(next) { $(this).addClass('hidden'); if (nextStep) { $(nextStep) .removeClass('hidden') - .addClass('animated slideInRight') - .delay(1000) + .addClass('animated slideInRight fast-animation') + .delay(500) .queue(function(next) { $(this).removeClass('slideInRight'); next(); diff --git a/seed/challenges/basejumps.json b/seed/challenges/basejumps.json index c0dc0a0ba3..d003b1b5bd 100644 --- a/seed/challenges/basejumps.json +++ b/seed/challenges/basejumps.json @@ -2,6 +2,136 @@ "name": "Full Stack JavaScript Projects", "order": 20, "challenges": [ + { + "id": "560add65cb82ac38a17513c1", + "title": "", + "challengeSeed": [], + "description": [ + [ + "", + "", + "", + "" + ], + [ + "", + "", + "Create an app from this github url: https://github.com/johnstonbl01/clementinejs-fcc.git", + "" + ], + [ + "", + "", + "Create a new GitHub app.", + "https://github.com/settings/applications/new" + ], + [ + "", + "", + "Return to c9.io, click the gear and click \"Show Hidden Files\"", + "" + ], + [ + "", + "", + "", + "" + ], + [ + "", + "", + "", + "" + ], + [ + "", + "", + "", + "" + ], + [ + "", + "", + "", + "" + ], + [ + "", + "", + "", + "" + ], + [ + "", + "", + "", + "" + ], + [ + "", + "", + "", + "" + ], + [ + "", + "", + "", + "" + ], + [ + "", + "", + "", + "" + ], + [ + "", + "", + "", + "" + ], + [ + "", + "", + "", + "" + ], + [ + "", + "", + "", + "" + ], + [ + "", + "", + "", + "" + ], + [ + "", + "", + "", + "" + ] + ], + "type": "Waypoint", + "challengeType": 7, + "tests": [], + "nameCn": "", + "descriptionCn": [], + "nameFr": "", + "descriptionFr": [], + "nameRu": "", + "descriptionRu": [], + "nameEs": "", + "descriptionEs": [], + "namePt": "", + "descriptionPt": [] + }, + + { "id": "bd7158d8c443eddfaeb5bcef", "title": "Get Set for Basejumps", diff --git a/seed/challenges/front-end-development-certificate.json b/seed/challenges/front-end-development-certificate.json index 351809e702..65b98018c6 100644 --- a/seed/challenges/front-end-development-certificate.json +++ b/seed/challenges/front-end-development-certificate.json @@ -14,7 +14,7 @@ ], "description": [ [ - "http://i.imgur.com/luMkKst.jpg", + "http://i.imgur.com/syJxavV.jpg", "An image of our Front End Development Certificate", "This challenge will give you your verified Front End Development Certificate. Before we issue your certificate, we must verify that you have completed all of our basic and intermediate Bonfires, and all our basic and intermediate Ziplines. You must also accept our Academic Honesty Pledge. Click the button below to start this process.", "" diff --git a/seed/challenges/full-stack-development-certificate.json b/seed/challenges/full-stack-development-certificate.json index 7ae95c94e7..d383fc5a0f 100644 --- a/seed/challenges/full-stack-development-certificate.json +++ b/seed/challenges/full-stack-development-certificate.json @@ -15,7 +15,7 @@ ], "description": [ [ - "http://i.imgur.com/qXublEe.jpg", + "http://i.imgur.com/sKYQhdG.jpg", "An image of our Full Stack Development Certificate", "This challenge will give you your verified Full Stack Development Certificate. Before we issue your certificate, we must verify that you have completed all of Bonfires, Ziplines and Basejumps. You must also accept our Academic Honesty Pledge. Click the button below to start this process.", "" diff --git a/seed/challenges/getting-started.json b/seed/challenges/getting-started.json index c35c3541f8..bd4a752c84 100644 --- a/seed/challenges/getting-started.json +++ b/seed/challenges/getting-started.json @@ -32,7 +32,7 @@ "" ], [ - "http://i.imgur.com/q4IjuCL.jpg", + "http://i.imgur.com/sKYQhdG.jpg", "a screenshot of our Front End Development Certificate", "About half way through our curriculum, you'll earn a verified Front End Development Certificate. If you can finish our entire curriculum, you'll earn a verified Full Stack Development Certificate.", "" @@ -164,38 +164,6 @@ "namePt": "", "descriptionPt": [] }, - { - "id": "560add65cb82ac38a17513c1", - "title": "Try our Wiki and Camper News", - "challengeSeed": [], - "description": [ - [ - "http://i.imgur.com/DoOqkNW.gif", - "A gif showing how you can click the \"Wiki\" button in your upper-right corner to access the wiki.", - "Try this: Click the \"Wiki\" button in your upper right hand corner. Our community has contributed lots of useful information to this searchable wiki.", - "" - ], - [ - "http://i.imgur.com/nmSiMy1.gif", - "A gif showing how you can access our Camper News page and click the \"upvote\" button to upvote a story.", - "Click the \"News\" button in your upper right hand corner. You can browse links on Camper News and upvote ones that you enjoy.", - "" - ] - ], - "type": "Waypoint", - "challengeType": 7, - "tests": [], - "nameCn": "", - "descriptionCn": [], - "nameFr": "", - "descriptionFr": [], - "nameRu": "", - "descriptionRu": [], - "nameEs": "", - "descriptionEs": [], - "namePt": "", - "descriptionPt": [] - }, { "id": "560add71cb82ac38a17513c2", "title": "Join a Campsite in Your City", @@ -230,7 +198,7 @@ }, { "id": "560add8ccb82ac38a17513c3", - "title": "Join our Alumni Network and Commit to Your Goal", + "title": "Join our Alumni Network on LinkedIn", "challengeSeed": [], "description": [ [ @@ -238,12 +206,6 @@ "A gif showing how you can click the link below and fill in the necessary fields to add your Free Code Camp studies to your LinkedIn profile.", "You can add Free Code Camp to your LinkedIn education background. Set your graduation date as next year. For \"Degree\", type \"Full Stack Web Development\". For \"Field of study\", type \"Computer Software Engineering\". Then click \"Save Changes\".", "https://www.linkedin.com/profile/edit-education?school=Free+Code+Camp" - ], - [ - "", - "", - "Free Code Camp will always be free. If you want to feel more motivated to earn our certificates faster, we encourage you to instead donate each month to a nonprofit.", - "" ] ], "type": "Waypoint", diff --git a/server/views/coursewares/showStep.jade b/server/views/coursewares/showStep.jade index fa8f11431a..fb375a83d3 100644 --- a/server/views/coursewares/showStep.jade +++ b/server/views/coursewares/showStep.jade @@ -2,14 +2,13 @@ extends ../layout-wide block content .row .col-md-8.col-md-offset-2 - .jumbotron for step, index in description .thumbnail.challenge-step(class=index !== 0 ? 'hidden': '') img.gif-block.img-center.img-responsive.thumbnail(src='#{step[0]}' alt='#{step[1]}') .caption p.large-p= step[2] if step[3] - a.btn.btn-block.btn-primary.challenge-step-btn-action(id='#{index}' href='#{step[3]}' target='_blank') Go To Link + a.btn.btn-block.btn-primary.challenge-step-btn-action(id='#{index}' href='#{step[3]}' target='_blank') Open link in new tab if index + 1 === description.length .btn.btn-block.btn-primary.challenge-step-btn-finish(id='last' class=step[3] ? 'disabled' : '') Finish challenge else @@ -27,7 +26,7 @@ block content .spacer .row if (user) - #challenge-step-btn-submit.animated.fadeIn.btn.btn-lg.btn-primary.btn-block Submit and go to my next challenge (ctrl + enter) + #challenge-step-btn-submit.animated.fadeIn.btn.btn-lg.btn-primary.btn-block Submit and go to my next challenge else a.btn.btn-lg.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge script(src=rev('/js', 'commonFramework.js'))