From 666953d12739e64a41b6d49f7c9cfbf624895c0e Mon Sep 17 00:00:00 2001 From: Michael Q Larson Date: Sun, 14 Dec 2014 22:24:54 -0800 Subject: [PATCH 1/2] add the livecode and inbox.js routes and stand in text --- app.js | 2 ++ controllers/resources.js | 12 ++++++++++++ views/javascript-in-your-inbox.jade | 12 ++++++++++++ views/live-pair-programming.jade | 18 ++++++++++++++++++ 4 files changed, 44 insertions(+) create mode 100644 views/javascript-in-your-inbox.jade create mode 100644 views/live-pair-programming.jade diff --git a/app.js b/app.js index 337ff4769f..5cfa40e553 100644 --- a/app.js +++ b/app.js @@ -127,6 +127,8 @@ app.get( app.get('/learn-to-code', resourcesController.learnToCode); app.get('/privacy', resourcesController.privacy); app.get('/jquery-exercises', resourcesController.jqueryExercises); +app.get('/live-pair-programming', resourcesController.livePairProgramming); +app.get('/javascript-in-your-inbox', resourcesController.javaScriptInYourInbox); app.get('/text-based-adventure-tutorial-app', resourcesController.textBasedAdventureTutorial); app.get('/chromebook', resourcesController.chromebook); app.get('/programmer-interview-questions-app', resourcesController.programmerInterviewQuestionsApp); diff --git a/controllers/resources.js b/controllers/resources.js index d4844a83f4..96a748b19c 100644 --- a/controllers/resources.js +++ b/controllers/resources.js @@ -27,6 +27,18 @@ exports.jqueryExercises = function(req, res) { }); } +exports.livePairProgramming = function(req, res) { + res.render('live-pair-programming', { + title: 'Live Pair Programming' + }); +} + +exports.javaScriptInYourInbox = function(req, res) { + res.render('javascript-in-your-inbox', { + title: 'JavaScript in your Inbox' + }); +} + exports.programmerInterviewQuestionsApp = function(req, res) { res.render('programmer-interview-questions-app', { title: 'programmer-interview-questions-app' diff --git a/views/javascript-in-your-inbox.jade b/views/javascript-in-your-inbox.jade new file mode 100644 index 0000000000..fdd64ba8a3 --- /dev/null +++ b/views/javascript-in-your-inbox.jade @@ -0,0 +1,12 @@ +extends layout +block content + .jumbotron.negative-15.text-center + h1.hug-top Win a Chromebook + h2 Sign up for Inbox.js - JavaScript challenges in your inbox - and enter to win a Chromebook! + img.image-responsive(src="https://s3.amazonaws.com/freecodecamp/chromebook.jpg" alt="HP Chromebook 11") + script(src='//widget-prime.rafflecopter.com/launch.js') + a#rcwidget_a7khonhd.rcptr(href='http://www.rafflecopter.com/rafl/display/d70901b10/', rel='nofollow', data-raflid='d70901b10', data-theme='classic', data-template='') a Rafflecopter giveaway + .animated.zoomInDown.delay-10 + p Finished signing up for the giveaway? + a.btn.btn-cta.signup-btn.btn-primary(href="/login") Start learning to code (it's free) + br diff --git a/views/live-pair-programming.jade b/views/live-pair-programming.jade new file mode 100644 index 0000000000..6d236b36a0 --- /dev/null +++ b/views/live-pair-programming.jade @@ -0,0 +1,18 @@ +extends layout +block content + .jumbotron.negative-15.text-center + h1.hug-top Live Pair Programming + h2 Watch Quincy Larson and Berkeley True pair program on CoderByte challenges live Tuesday, December 16 at 6 p.m. Pacific Standard Time. + h3 Check back here for details. And follow   + a(href='http://twitter.com/intent/user?screen_name=FreeCodeCamp' target='_blank') @FreeCodeCamp + | ,   + a(href='http://twitter.com/intent/user?screen_name=ossia' target='_blank') @ossia + |   and   + a(href='http://twitter.com/intent/user?screen_name=BerkeleyTrue' target='_blank') @BerkeleyTrue + |   on Twitter. + p Got 3 minutes? Watch this funny video about pair programming, then start learning to code with us! + .embed-responsive.embed-responsive-16by9 + iframe.embed-responsive-item(width='560', height='315', src='//www.youtube.com/embed/dYBjVTMUQY0', frameborder='0', allowfullscreen='') + br + a.btn.btn-cta.signup-btn.btn-primary(href="/login") Start learning to code (it's free) + br \ No newline at end of file From b4914fa4971248b727b61a287dc16afc14e8f1d5 Mon Sep 17 00:00:00 2001 From: Michael Q Larson Date: Sun, 14 Dec 2014 22:26:29 -0800 Subject: [PATCH 2/2] small copy update to pair programming page --- views/live-pair-programming.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/live-pair-programming.jade b/views/live-pair-programming.jade index 6d236b36a0..3f7c086070 100644 --- a/views/live-pair-programming.jade +++ b/views/live-pair-programming.jade @@ -2,7 +2,7 @@ extends layout block content .jumbotron.negative-15.text-center h1.hug-top Live Pair Programming - h2 Watch Quincy Larson and Berkeley True pair program on CoderByte challenges live Tuesday, December 16 at 6 p.m. Pacific Standard Time. + h2 Watch Quincy Larson and Berkeley Martinez pair program on CoderByte challenges live Tuesday, December 16 from 6 p.m. to 7 p.m., Pacific Standard Time. h3 Check back here for details. And follow   a(href='http://twitter.com/intent/user?screen_name=FreeCodeCamp' target='_blank') @FreeCodeCamp | ,