diff --git a/app.js b/app.js index 2710ca1656..cc0d3ea894 100644 --- a/app.js +++ b/app.js @@ -389,8 +389,6 @@ app.get('/account/api', userController.getAccountAngular); */ app.get('/api/github', resourcesController.githubCalls); -app.get('/api/blogger', resourcesController.bloggerCalls); -app.get('/api/trello', resourcesController.trelloCalls); /** * Bonfire related routes diff --git a/controllers/resources.js b/controllers/resources.js index 51a2a6201b..0655163784 100644 --- a/controllers/resources.js +++ b/controllers/resources.js @@ -161,34 +161,6 @@ module.exports = { }); }, - - - trelloCalls: function(req, res, next) { - request('https://trello.com/1/boards/BA3xVpz9/cards?key=' + secrets.trello.key, function(err, status, trello) { - if (err) { return next(err); } - trello = (status && status.statusCode == 200) ? (JSON.parse(trello)).length : "Can't connect to to Trello"; - res.send({"trello": trello}); - }); - }, - bloggerCalls: function(req, res, next) { - request('https://www.googleapis.com/blogger/v3/blogs/2421288658305323950/posts?key=' + secrets.blogger.key, function (err, status, blog) { - if (err) { return next(err); } - blog = (status && status.statusCode == 200) ? JSON.parse(blog) : ''; - res.send({ - blog1Title: blog ? blog["items"][0]["title"] : "Can't connect to Blogger", - blog1Link: blog ? blog["items"][0]["url"] : "http://blog.freecodecamp.com", - blog2Title: blog ? blog["items"][1]["title"] : "Can't connect to Blogger", - blog2Link: blog ? blog["items"][1]["url"] : "http://blog.freecodecamp.com", - blog3Title: blog ? blog["items"][2]["title"] : "Can't connect to Blogger", - blog3Link: blog ? blog["items"][2]["url"] : "http://blog.freecodecamp.com", - blog4Title: blog ? blog["items"][3]["title"] : "Can't connect to Blogger", - blog4Link: blog ? blog["items"][3]["url"] : "http://blog.freecodecamp.com", - blog5Title: blog ? blog["items"][4]["title"] : "Can't connect to Blogger", - blog5Link: blog ? blog["items"][4]["url"] : "http://blog.freecodecamp.com" - }); - }); - }, - about: function(req, res, next) { if (req.user) { if (!req.user.profile.picture || req.user.profile.picture === "https://s3.amazonaws.com/freecodecamp/favicons/apple-touch-icon-180x180.png") { diff --git a/controllers/resources.json b/controllers/resources.json index 3237d77c37..47eb9fff75 100644 --- a/controllers/resources.json +++ b/controllers/resources.json @@ -1,8 +1,8 @@ { "announcements": [ + ["We'll live-stream our Camp-wide Meeting Saturday, March 27 at Noon EST. We'll show some of Free Code Camp's new features, and campers will show what they're building.", "http://twitch.tv/freecodecamp"], ["Some of Code School's courses are no longer free. We're switching to NodeSchool.io for our Node.js and Express.js challenges.", "http://freecodecamp.com/nodeschool-challenges"], - ["Screen Hero is now free on Windows and Mac! Follow these special instructions to install it.", "http://freecodecamp.com/install-screenhero"], - ["Once you finish all the challenges, we welcome you to attend our Nonprofit Project Office Hours every Monday and Thursday Night at 9 pm EST.", "https://gitter.im/FreeCodeCamp/NonprofitProjects"] + ["Screen Hero is now free on Windows and Mac! Follow these special instructions to install it.", "http://freecodecamp.com/install-screenhero"] ], "questions": [{ "question": "Time Complexity of Accessing Array Index (int a = ARR[5];)", diff --git a/views/partials/about.jade b/views/partials/about.jade deleted file mode 100644 index 0e983545cf..0000000000 --- a/views/partials/about.jade +++ /dev/null @@ -1,140 +0,0 @@ -.panel.panel-info - .panel-heading.landing-panel-heading.text-center Our Team of Volunteer Camp Counselors - .panel-body - .landing-panel-body.text-center - .col-xs-12 - script. - $(function () { - var parent = $("#shuffle"); - var divs = parent.children(); - while (divs.length) { - parent.append(divs.splice(Math.floor(Math.random() * divs.length), 1)[0]); - } - }); - #shuffle - .col-xs-12.col-sm-12.col-md-12.col-lg-6.team-member - h3.negative-10.text-nowrap Angelica Ferdinand - h4.negative-10.text-nowrap Community Builder - img.profile-image(src='https://s3.amazonaws.com/freecodecamp/angelica-ferdinand.jpg' alt="Angelica Ferdinand's picture") - h4.text-nowrap Oakland, California - p.negative-10 "Computers have always lit my fire. I took a detour, but it's never too late to realize your dreams. If you love it, live it!" - .col-xs-12.col-sm-12.col-md-12.col-lg-6.team-member - h3.negative-10.text-nowrap Ammar Shah - h4.negative-10.text-nowrap Community Builder - img.profile-image(src='https://s3.amazonaws.com/freecodecamp/ammar-shah.jpg' alt="Ammar Shah's picture") - h4.text-nowrap Karachi, Pakistan - p.negative-10 "I code whenever I'm not sleeping or in school. Making computers obey me is a dream come true." - .col-xs-12.col-sm-12.col-md-12.col-lg-6.team-member - h3.negative-10.text-nowrap Branden Byers - h4.negative-10.text-nowrap Instructional Designer - img.profile-image(src='https://s3.amazonaws.com/freecodecamp/branden-byers.jpg' alt="Branden Byers picture") - h4.text-nowrap Madison, Wisconsin - p.negative-10 "Cookbook author and stay-at-home-dad. Started coding as a kid, got distracted, but now I'm back in full JavaScript force!" - .col-xs-12.col-sm-12.col-md-12.col-lg-6.team-member - h3.negative-10.text-nowrap Michael Johnson - h4.negative-10.text-nowrap Nonprofit Coordinator - img.profile-image(src='https://s3.amazonaws.com/freecodecamp/michael-johnson.jpeg' alt="Michael Johnson's picture") - h4.text-nowrap Washington, D.C. - p.negative-10 "I’m a recent Harvard University graduate who took a pass on Wall Street to code for a cause, and help others do the same." - .col-xs-12.col-sm-12.col-md-12.col-lg-6.team-member - h3.negative-10.text-nowrap Berkeley Martinez - h4.negative-10.text-nowrap JavaScript Engineer - img.profile-image(src='https://s3.amazonaws.com/freecodecamp/berkeley-martinez.jpg' alt="Berkeley Martinez's picture") - h4.text-nowrap San Francisco, California - p.negative-10 "Former mechanical engineer. Coding is pure creation. I can fly, but only once." - .col-xs-12.col-sm-12.col-md-12.col-lg-6.team-member - h3.negative-10.text-nowrap Mychael Zuniga - h4.negative-10.text-nowrap JavaScript Engineer - img.profile-image(src='https://s3.amazonaws.com/freecodecamp/mychael-zuniga.jpg' alt="Mychael Zuniga's picture") - h4.text-nowrap San Diego, California - p.negative-10 "I'm a college student who turned to code as an avenue for creative expression. I love political science and economics." - .col-xs-12.col-sm-12.col-md-12.col-lg-6.team-member - h3.negative-10.text-nowrap Jeanette Casteñeta - h4.negative-10.text-nowrap Product Manager - img.profile-image(src='https://s3.amazonaws.com/freecodecamp/jeanette-casteneta.jpg' alt="Jeanette Casteñeta's picture") - h4.text-nowrap San Francisco, California - p.negative-10 "Home-ec diva. I can envision a dress, then stitch it together. Now I'm learning how to do the same thing with code." - .col-xs-12.col-sm-12.col-md-12.col-lg-6.team-member - h3.negative-10.text-nowrap Darryl Dixon - h4.negative-10.text-nowrap Community Builder - img.profile-image(src='https://s3.amazonaws.com/freecodecamp/darryl-dixon.jpg' alt="Darryl Dixon's picture") - h4.text-nowrap Newport News, Virginia - p.negative-10 "I'm a self-taught graphic designer. I'm learning web development here and want you to learn with me." - .col-xs-12.col-sm-12.col-md-12.col-lg-6.team-member - h3.negative-10.text-nowrap Kathy O'Driscoll - h4.negative-10.text-nowrap Community Builder - img.profile-image(src='https://s3.amazonaws.com/freecodecamp/kathy-odriscoll.jpg' alt="Kathy O'Driscoll's picture") - h4.text-nowrap Los Angeles, California - p.negative-10 "Mother and grandmother. All my life I've dabbled in getting machines to do my bidding. Now it's becoming my career." - .col-xs-12.col-sm-12.col-md-12.col-lg-6.team-member - h3.negative-10.text-nowrap Ryan Malm - h4.negative-10.text-nowrap Visual Designer - img.profile-image(src='https://s3.amazonaws.com/freecodecamp/ryan-malm.jpg' alt="Ryan Malm's picture") - h4.text-nowrap Omaha, Nebraska - p.negative-10 "I love origami, piano, and playing minecraft with my kids. My JavaScript grows stronger every day." - .col-xs-12.col-sm-12.col-md-12.col-lg-6.team-member - h3.negative-10.text-nowrap Charles Watson - h4.negative-10.text-nowrap JavaScript Engineer - img.profile-image(src='https://s3.amazonaws.com/freecodecamp/charles-watson.jpg' alt="Charles Watson's picture") - h4.text-nowrap Minneapolis, Minnesota - p.negative-10 "I skipped college. I build iOS apps. I love the obstacles and puzzles that coding presents me." - .col-xs-12.col-sm-12.col-md-12.col-lg-6.team-member - h3.negative-10.text-nowrap Quincy Larson - h4.negative-10.text-nowrap Instructional Designer - img.profile-image(src='https://s3.amazonaws.com/freecodecamp/quincy-larson.jpg' alt="Quincy Larson's picture") - h4.text-nowrap San Francisco, California - p.negative-10 "I worked as a school director in China before learning to code. It's clear that everyone can - and should - learn to code." - .col-xs-12.col-sm-12.col-md-12.col-lg-6.team-member - h3.negative-10.text-nowrap Mark Howard - h4.negative-10.text-nowrap Digital Marketer - img.profile-image(src='https://s3.amazonaws.com/freecodecamp/mark-howard.jpg' alt="Mark Howard's picture") - h4.text-nowrap San Diego, California - p.negative-10 "I enjoy helping people, at scale. Code is the best way to do that." - .col-xs-12.col-sm-12.col-md-12.col-lg-6.team-member - h3.negative-10.text-nowrap Nathan Leniz - h4.negative-10.text-nowrap JavaScript Engineer - img.profile-image(src='https://s3.amazonaws.com/freecodecamp/nathan-leniz.jpg' alt="Nathan Leniz's picture") - h4.text-nowrap Seoul, South Korea - p.negative-10 "I learned to code for the games, and stayed for the algorithms." - .col-xs-12.col-sm-12.col-md-12.col-lg-6.team-member - h3.negative-10.text-nowrap Jason Rueckert - h4.negative-10.text-nowrap Live Content Manager - img.profile-image(src='https://s3.amazonaws.com/freecodecamp/jason-rueckert.jpg' alt="Jason Rueckert's picture") - h4.text-nowrap Seattle, Washington - p.negative-10 "My high school job was testing basketball shoes for Nike. I learned code to work smarter, not harder. I have no thyroid." - .col-xs-12.col-sm-12.col-md-12.col-lg-6.team-member - h3.negative-10.text-nowrap Christopher Nguyen - h4.negative-10.text-nowrap QA Engineer - img.profile-image(src='https://s3.amazonaws.com/freecodecamp/christopher-nguyen.jpg' alt="Christopher Nguyen's picture") - h4.text-nowrap Seattle, Washington - p.negative-10 "Morning Owl. Code is an equalizer. Barriers exist everywhere, but if you can say 'hello world', the world will say hello back." - .col-xs-12.col-sm-12.col-md-12.col-lg-6.team-member - h3.negative-10.text-nowrap Dominic Jones - h4.negative-10.text-nowrap Community Builder - img.profile-image(src='https://s3.amazonaws.com/freecodecamp/dominic-jones.jpg' alt="Dominic Jones's picture") - h4.text-nowrap York, Pennsylvania - p.negative-10 "Born with Sickle Cell Anemia. Professional writer, working on becoming a professional code writer." - .col-xs-12.col-sm-12.col-md-12.col-lg-6.team-member - h3.negative-10.text-nowrap James McShane - h4.negative-10.text-nowrap JavaScript Engineer - img.profile-image(src='https://s3.amazonaws.com/freecodecamp/james-mcshane.jpg' alt="James McShane's picture") - h4.text-nowrap Minneapolis, Minnesota - p.negative-10 "I just bought our first house, ending a 10 year streak of moving each year. I've used code to solve problems since I was a child." - .col-xs-12.col-sm-12.col-md-12.col-lg-6.team-member - h3.negative-10.text-nowrap Ellie Adam - h4.negative-10.text-nowrap Visual Designer - img.profile-image(src='https://s3.amazonaws.com/freecodecamp/ellie-adam.jpg' alt="Eliie Adam's picture") - h4.text-nowrap Seattle, Washington - p.negative-10 "I photograph birds and flowers. I'm a designer who recently decided to learn coding and front end web developement." - .col-xs-12.col-sm-12.col-md-12.col-lg-6.team-member - h3.negative-10.text-nowrap Kamal Sharif - h4.negative-10.text-nowrap JavaScript Engineer - img.profile-image(src='https://s3.amazonaws.com/freecodecamp/kamal-sharif.jpg' alt="Kamal Sharif's picture") - h4.text-nowrap Dhaka, Bangladesh - p.negative-10 "I build applications that help other people improve their own lives." - .col-xs-12.col-sm-12.col-md-12.col-lg-6.team-member - h3.negative-10.text-nowrap Patrick Ly - h4.negative-10.text-nowrap Community Builder - img.profile-image(src='https://s3.amazonaws.com/freecodecamp/patrick-ly.jpg' alt="Patrick Ly's picture") - h4.text-nowrap Los Angeles, California - p.negative-10 "I'm a student and self-taught Hip Hop dancer. Just using the web isn't enough for me. I want to create and maintain web apps, too" \ No newline at end of file diff --git a/views/partials/blogger.jade b/views/partials/blogger.jade deleted file mode 100644 index f2570c95bd..0000000000 --- a/views/partials/blogger.jade +++ /dev/null @@ -1,16 +0,0 @@ -#blog -script. - (function() { - $.ajax({ - url: '/api/blogger', - type: 'GET' - }).done( - function(data) { - var props = Object.keys(data); - for (var i = 0; i < props.length; i+=2) { - var blogger = document.createElement('div'); - $(blogger).html('

' + data[props[i]] + '

').appendTo($('#blog')) - } - } - ); - })(); \ No newline at end of file diff --git a/views/partials/trello.jade b/views/partials/trello.jade deleted file mode 100644 index 1af9348f47..0000000000 --- a/views/partials/trello.jade +++ /dev/null @@ -1,13 +0,0 @@ -#trello -script. - (function() { - $.ajax({ - url: '/api/trello', - type: 'GET' - }).done( - function(data) { - var trello = document.createElement('div'); - $(trello).html('

We help ' + data.trello + ' nonprofits. (view them)

').prependTo($('#trello')) - } - ); - })(); \ No newline at end of file diff --git a/views/resources/learn-to-code.jade b/views/resources/learn-to-code.jade index fb31bd3523..03e2789e52 100644 --- a/views/resources/learn-to-code.jade +++ b/views/resources/learn-to-code.jade @@ -31,7 +31,8 @@ block content .panel-body.text-center img.img-responsive.img-center(src="https://s3.amazonaws.com/freecodecamp/about-trello.jpg" alt="a screen shot of Free Code Camp's nonprofit project Trello board showing several active projects") h3 We launched #{daysRunning} days ago. - include ../partials/trello + h3 We help 20 nonprofits.   + a(href='https://trello.com/b/BA3xVpz9/nonprofit-projects') (view them) br @@ -49,7 +50,6 @@ block content a(href=announcement[1])= announcement[0] else = announcement[0] - include ../partials/blogger a.twitter-timeline(data-dnt='true', href='https://twitter.com/FreeCodeCamp', data-widget-id='560847186548621312') Tweets by @FreeCodeCamp script. !function (d, s, id) { @@ -76,22 +76,23 @@ block content .col-xs-12.github-and-twitter-button-text html. - include ../partials/about .col-xs-12.col-sm-12.col-md-6 include ../partials/faq #announcementModal.modal(tabindex='-1') .modal-dialog .modal-content - .modal-header.challenge-list-header New NodeSchool Challenges + .modal-header.challenge-list-header Camp-wide Meeting on Saturday at Noon EST a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') × .modal-body - h3.text-left Some of Code School's courses are no longer free. We're switching to NodeSchool.io for our Node.js and Express.js challenges. - a.btn.btn-lg.btn-info.btn-block(name='_csrf', value=_csrf, aria-hidden='true', href='/nodeschool-challenges') Take me to these new challenges + h3.text-left We'll live-stream some of Free Code Camp's new features, and campers will show what they're building. Live Saturday, March 28 at Noon EST on our   + a(href='http://twitch.tv/freecodecamp', target='_blank') Twitch.tv channel + | . + a.btn.btn-lg.btn-info.btn-block(name='_csrf', value=_csrf, aria-hidden='true', href='http://twitch.tv/freecodecamp', target='_blank') Take me to Twitch so I can follow Free Code Camp a.btn.btn-lg.btn-primary.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Thanks for the heads-up! script. $(document).ready(function() { - if (!localStorage || !localStorage.nodeSchoolAnnouncement) { + if (!localStorage || !localStorage.campWideMeeting) { $('#announcementModal').modal('show'); - localStorage.nodeSchoolAnnouncement = "true"; + localStorage.campWideMeeting = "true"; } }); \ No newline at end of file