From e888b18cc07facb0af2bb3262fb9be780f57dfa0 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Mon, 16 May 2016 12:51:13 -0700 Subject: [PATCH 1/4] remove labs view --- server/views/resources/labs.jade | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 server/views/resources/labs.jade diff --git a/server/views/resources/labs.jade b/server/views/resources/labs.jade deleted file mode 100644 index b449bf3101..0000000000 --- a/server/views/resources/labs.jade +++ /dev/null @@ -1,17 +0,0 @@ -extends ../layout -block content - h2.text-center Projects Created by Free Code Camp Campers - hr - .row - .col-xs-12.col-sm-10.col-sm-offset-1 - for project in projects - .spacer - .row - .col-xs-12.col-sm-3 - img.img-responsive(src=project.image) - .col-xs-12.col-sm-9.negative-15 - h3 - a(href=project.url) #{project.name} - h4 by  - a(href='/' + project.camper) #{project.camper} - p= project.description \ No newline at end of file From 24751c307c21f22dbbbbc6be2b2b212a0db28b56 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Mon, 16 May 2016 12:52:04 -0700 Subject: [PATCH 2/4] update copy of projects to recommend sharing them on Facebook instead of on Twitter --- .../advanced-ziplines.json | 8 ++++---- .../basic-ziplines.json | 4 ++-- .../intermediate-ziplines.json | 8 ++++---- .../data-visualization-projects.json | 10 +++++----- .../react-projects.json | 10 +++++----- .../api-projects.json | 10 +++++----- .../dynamic-web-applications.json | 10 +++++----- server/views/challenges/showBonfire.jade | 3 --- 8 files changed, 30 insertions(+), 33 deletions(-) diff --git a/seed/challenges/01-front-end-development-certification/advanced-ziplines.json b/seed/challenges/01-front-end-development-certification/advanced-ziplines.json index 90e3e27fb3..b9ad0dccef 100644 --- a/seed/challenges/01-front-end-development-certification/advanced-ziplines.json +++ b/seed/challenges/01-front-end-development-certification/advanced-ziplines.json @@ -16,7 +16,7 @@ "User Story: I can keep chaining mathematical operations together until I hit the equal button, and the calculator will tell me the correct output.", "Remember to use Read-Search-Ask if you get stuck.", "When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen. ", - "You can get feedback on your project from fellow campers by sharing it in our Code Review Chatroom. You can also share it on Twitter and your city's Campsite (on Facebook)." + "You can get feedback on your project by sharing it with your friends on Facebook." ], "challengeSeed": [ "Drnp29SJY8w" @@ -50,7 +50,7 @@ "User Story: I can customize the length of each pomodoro.", "Remember to use Read-Search-Ask if you get stuck.", "When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen. ", - "You can get feedback on your project from fellow campers by sharing it in our Code Review Chatroom. You can also share it on Twitter and your city's Campsite (on Facebook)." + "You can get feedback on your project by sharing it with your friends on Facebook." ], "challengeSeed": [ "lgj3nfzV0xM" @@ -98,7 +98,7 @@ "User Story: I can choose whether I want to play as X or O.", "Remember to use Read-Search-Ask if you get stuck.", "When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen.", - "You can get feedback on your project from fellow campers by sharing it in our Code Review Chatroom. You can also share it on Twitter and your city's Campsite (on Facebook)." + "You can get feedback on your project by sharing it with your friends on Facebook." ], "challengeSeed": [ "Ia69O1ZNGEg" @@ -138,7 +138,7 @@ "Hint: Here are mp3s you can use for each button: https://s3.amazonaws.com/freecodecamp/simonSound1.mp3, https://s3.amazonaws.com/freecodecamp/simonSound2.mp3, https://s3.amazonaws.com/freecodecamp/simonSound3.mp3, https://s3.amazonaws.com/freecodecamp/simonSound4.mp3.", "Remember to use Read-Search-Ask if you get stuck.", "When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen.", - "You can get feedback on your project from fellow campers by sharing it in our Code Review Chatroom. You can also share it on Twitter and your city's Campsite (on Facebook)." + "You can get feedback on your project by sharing it with your friends on Facebook." ], "challengeSeed": [ "tAPut8a47bA" diff --git a/seed/challenges/01-front-end-development-certification/basic-ziplines.json b/seed/challenges/01-front-end-development-certification/basic-ziplines.json index 05d03fb5a8..1e141c0d41 100644 --- a/seed/challenges/01-front-end-development-certification/basic-ziplines.json +++ b/seed/challenges/01-front-end-development-certification/basic-ziplines.json @@ -146,7 +146,7 @@ "User Story: I can click on a link that will take me to an external website with further information on the topic.", "Remember to use Read-Search-Ask if you get stuck.", "When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen.", - "You can get feedback on your project from fellow campers by sharing it in our Code Review Chatroom. You can also share it on Twitter and your city's Campsite (on Facebook)." + "You can get feedback on your project by sharing it with your friends on Facebook." ], "releasedOn": "January 1, 2016", "challengeSeed": [ @@ -196,7 +196,7 @@ "Note that CodePen.io overrides the Window.open() function, so if you want to open windows using jQuery, you will need to target invisible anchor elements like this one: <a target='_blank'>.", "Remember to use Read-Search-Ask if you get stuck.", "When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen. ", - "You can get feedback on your project from fellow campers by sharing it in our Code Review Chatroom. You can also share it on Twitter and your city's Campsite (on Facebook)." + "You can get feedback on your project by sharing it with your friends on Facebook." ], "challengeSeed": [ "V72o34gY4Lw" diff --git a/seed/challenges/01-front-end-development-certification/intermediate-ziplines.json b/seed/challenges/01-front-end-development-certification/intermediate-ziplines.json index 9cfd152dd4..08d700480f 100644 --- a/seed/challenges/01-front-end-development-certification/intermediate-ziplines.json +++ b/seed/challenges/01-front-end-development-certification/intermediate-ziplines.json @@ -15,7 +15,7 @@ "User Story: I can press a button to tweet out a quote.", "Remember to use Read-Search-Ask if you get stuck.", "When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen. ", - "You can get feedback on your project from fellow campers by sharing it in our Code Review Chatroom. You can also share it on Twitter and your city's Campsite (on Facebook)." + "You can get feedback on your project by sharing it with your friends on Facebook." ], "challengeSeed": [ "a5RknIzoDrs" @@ -63,7 +63,7 @@ "We recommend using the Open Weather API. This will require creating a free API key. Normally you want to avoid exposing API keys on CodePen, but we haven't been able to find a keyless API for weather.", "Remember to use Read-Search-Ask if you get stuck.", "When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen.", - "You can get feedback on your project from fellow campers by sharing it in our Code Review Chatroom. You can also share it on Twitter and your city's Campsite (on Facebook)." + "You can get feedback on your project by sharing it with your friends on Facebook." ], "challengeSeed": [ "GCLiJU-vvVc" @@ -115,7 +115,7 @@ "Hint #3: Use this link to experiment with Wikipedia's API.", "Remember to use Read-Search-Ask if you get stuck.", "When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen.", - "You can get feedback on your project from fellow campers by sharing it in our Code Review Chatroom. You can also share it on Twitter and your city's Campsite (on Facebook)." + "You can get feedback on your project by sharing it with your friends on Facebook." ], "challengeSeed": [ "wJhcPwVYA1g" @@ -158,7 +158,7 @@ "Hint: Here's an array of the Twitch.tv usernames of people who regularly stream coding: [\"freecodecamp\", \"storbeck\", \"terakilobyte\", \"habathcx\",\"RobotCaleb\",\"thomasballinger\",\"noobs2ninjas\",\"beohoff\"]", "Remember to use Read-Search-Ask if you get stuck.", "When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen.", - "You can get feedback on your project from fellow campers by sharing it in our Code Review Chatroom. You can also share it on Twitter and your city's Campsite (on Facebook)." + "You can get feedback on your project by sharing it with your friends on Facebook." ], "challengeSeed": [ "6WrbY1d-IHI" diff --git a/seed/challenges/02-data-visualization-certification/data-visualization-projects.json b/seed/challenges/02-data-visualization-certification/data-visualization-projects.json index e0aea41650..5b6055f77e 100644 --- a/seed/challenges/02-data-visualization-certification/data-visualization-projects.json +++ b/seed/challenges/02-data-visualization-certification/data-visualization-projects.json @@ -17,7 +17,7 @@ "Hint: Here's a dataset you can use to build this: https://raw.githubusercontent.com/FreeCodeCamp/ProjectReferenceData/master/GDP-data.json", "Remember to use Read-Search-Ask if you get stuck.", "When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen. ", - "You can get feedback on your project from fellow campers by sharing it in our Code Review Chatroom. You can also share it on Twitter and your city's Campsite (on Facebook)." + "You can get feedback on your project by sharing it with your friends on Facebook." ], "challengeSeed": [ "nss_5sZpjIE" @@ -54,7 +54,7 @@ "Hint: Here's a dataset you can use to build this: https://raw.githubusercontent.com/FreeCodeCamp/ProjectReferenceData/master/cyclist-data.json", "Remember to use Read-Search-Ask if you get stuck.", "When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen. ", - "You can get feedback on your project from fellow campers by sharing it in our Code Review Chatroom. You can also share it on Twitter and your city's Campsite (on Facebook)." + "You can get feedback on your project by sharing it with your friends on Facebook." ], "challengeSeed": [ "barVgJDnTMk" @@ -92,7 +92,7 @@ "Hint: Here's a dataset you can use to build this: https://raw.githubusercontent.com/FreeCodeCamp/ProjectReferenceData/master/global-temperature.json", "Remember to use Read-Search-Ask if you get stuck.", "When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen. ", - "You can get feedback on your project from fellow campers by sharing it in our Code Review Chatroom. You can also share it on Twitter and your city's Campsite (on Facebook)." + "You can get feedback on your project by sharing it with your friends on Facebook." ], "challengeSeed": [ "TVJr7ndWAYo" @@ -133,7 +133,7 @@ "Hint: Here's the Camper News Hot Stories API endpoint: https://www.freecodecamp.com/news/hot.", "Remember to use Read-Search-Ask if you get stuck.", "When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen. ", - "You can get feedback on your project from fellow campers by sharing it in our Code Review Chatroom. You can also share it on Twitter and your city's Campsite (on Facebook)." + "You can get feedback on your project by sharing it with your friends on Facebook." ], "challengeSeed": [ "etBaP3IdlIE" @@ -174,7 +174,7 @@ "Hint: Here's a dataset you can use to build this: https://raw.githubusercontent.com/FreeCodeCamp/ProjectReferenceData/master/meteorite-strike-data.json", "Remember to use Read-Search-Ask if you get stuck.", "When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen. ", - "You can get feedback on your project from fellow campers by sharing it in our Code Review Chatroom. You can also share it on Twitter and your city's Campsite (on Facebook)." + "You can get feedback on your project by sharing it with your friends on Facebook." ], "challengeSeed": [ "kSAqct10gA0" diff --git a/seed/challenges/02-data-visualization-certification/react-projects.json b/seed/challenges/02-data-visualization-certification/react-projects.json index f01505ca48..184c96e289 100644 --- a/seed/challenges/02-data-visualization-certification/react-projects.json +++ b/seed/challenges/02-data-visualization-certification/react-projects.json @@ -18,7 +18,7 @@ "Note: If you want to use the React JSX syntax, you need to enable 'Babel' as a preprocessor", "Remember to use Read-Search-Ask if you get stuck.", "When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen. ", - "You can get feedback on your project from fellow campers by sharing it in our Code Review Chatroom. You can also share it on Twitter and your city's Campsite (on Facebook)." + "You can get feedback on your project by sharing it with your friends on Facebook." ], "releasedOn": "January 1, 2016", "challengeSeed": [ @@ -72,7 +72,7 @@ "Hint: To get the top 100 campers of all time: https://fcctop100.herokuapp.com/api/fccusers/top/alltime.", "Remember to use Read-Search-Ask if you get stuck.", "When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen. ", - "You can get feedback on your project from fellow campers by sharing it in our Code Review Chatroom. You can also share it on Twitter and your city's Campsite (on Facebook)." + "You can get feedback on your project by sharing it with your friends on Facebook." ], "releasedOn": "January 1, 2016", "challengeSeed": [ @@ -130,7 +130,7 @@ "Hint: You should prefix your local storage keys on CodePen, i.e. _username_recipes", "Remember to use Read-Search-Ask if you get stuck.", "When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen.", - "You can get feedback on your project from fellow campers by sharing it in our Code Review Chatroom. You can also share it on Twitter and your city's Campsite (on Facebook)." + "You can get feedback on your project by sharing it with your friends on Facebook." ], "releasedOn": "January 1, 2016", "challengeSeed": [ @@ -191,7 +191,7 @@ "Hint: Here's an overview of Conway's Game of Life with rules for your reference: https://en.wikipedia.org/wiki/Conway%27s_Game_of_Life", "Remember to use Read-Search-Ask if you get stuck.", "When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen. ", - "You can get feedback on your project from fellow campers by sharing it in our Code Review Chatroom. You can also share it on Twitter and your city's Campsite (on Facebook)." + "You can get feedback on your project by sharing it with your friends on Facebook." ], "releasedOn": "January 1, 2016", "challengeSeed": [ @@ -257,7 +257,7 @@ "User Story: The game should be challenging, but theoretically winnable.", "Remember to use Read-Search-Ask if you get stuck.", "When you are finished, click the \"I've completed this challenge\" button and include a link to your CodePen. ", - "You can get feedback on your project from fellow campers by sharing it in our Code Review Chatroom. You can also share it on Twitter and your city's Campsite (on Facebook)." + "You can get feedback on your project by sharing it with your friends on Facebook." ], "releasedOn": "January 1, 2016", "challengeSeed": [ diff --git a/seed/challenges/03-back-end-development-certification/api-projects.json b/seed/challenges/03-back-end-development-certification/api-projects.json index d945d86e89..deedb1f931 100644 --- a/seed/challenges/03-back-end-development-certification/api-projects.json +++ b/seed/challenges/03-back-end-development-certification/api-projects.json @@ -197,7 +197,7 @@ "User Story: If it does, it returns both the Unix timestamp and the natural language form of that date.", "User Story: If it does not contain a date or Unix timestamp, it returns null for those properties.", "Once you've finished implementing these user stories, click the \"I've completed this challenge\" button and enter the URLs for both your GitHub repository and your live app running on Heroku.", - "You can get feedback on your project from fellow campers by sharing it in our Code Review Chatroom. You can also share it on Twitter and your city's Campsite (on Facebook)." + "You can get feedback on your project by sharing it with your friends on Facebook." ], "challengeSeed": [ "gj4eL6satjI" @@ -228,7 +228,7 @@ "Here's the specific user story you should implement for this project:", "User Story: I can get the IP address, language and operating system for my browser.", "Once you've finished implementing these user stories, click the \"I've completed this challenge\" button and enter the URLs for both your GitHub repository and your live app running on Heroku.", - "You can get feedback on your project from fellow campers by sharing it in our Code Review Chatroom. You can also share it on Twitter and your city's Campsite (on Facebook)." + "You can get feedback on your project by sharing it with your friends on Facebook." ], "challengeSeed": [ "0oqjSkGoHg" @@ -260,7 +260,7 @@ "User Story: When I visit that shortened URL, it will redirect me to my original link.", "Pro Tip: Checkout this wiki article for tips on integrating MongoDB on Heroku.", "Once you've finished implementing these user stories, click the \"I've completed this challenge\" button and enter the URLs for both your GitHub repository and your live app running on Heroku.", - "You can get feedback on your project from fellow campers by sharing it in our Code Review Chatroom. You can also share it on Twitter and your city's Campsite (on Facebook)." + "You can get feedback on your project by sharing it with your friends on Facebook." ], "challengeSeed": [ "B-gY9nAtPIw" @@ -293,7 +293,7 @@ "User Story: I can paginate through the responses by adding a ?offset=2 parameter to the URL.", "User Story: I can get a list of the most recently submitted search strings.", "Once you've finished implementing these user stories, click the \"I've completed this challenge\" button and enter the URLs for both your GitHub repository and your live app running on Heroku.", - "You can get feedback on your project from fellow campers by sharing it in our Code Review Chatroom. You can also share it on Twitter and your city's Campsite (on Facebook)." + "You can get feedback on your project by sharing it with your friends on Facebook." ], "challengeSeed": [ "QIpA1oP8EGQ" @@ -326,7 +326,7 @@ "User Story: When I submit something, I will receive the file size in bytes within the JSON response", "Hint: You may want to use this package: https://www.npmjs.com/package/multer", "Once you've finished implementing these user stories, click the \"I've completed this challenge\" button and enter the URLs for both your GitHub repository and your live app running on Heroku.", - "You can get feedback on your project from fellow campers by sharing it in our Code Review Chatroom. You can also share it on Twitter and your city's Campsite (on Facebook)." + "You can get feedback on your project by sharing it with your friends on Facebook." ], "challengeSeed": [ "w_W2-VOgy9g" diff --git a/seed/challenges/03-back-end-development-certification/dynamic-web-applications.json b/seed/challenges/03-back-end-development-certification/dynamic-web-applications.json index 033e7d6692..c930279da6 100644 --- a/seed/challenges/03-back-end-development-certification/dynamic-web-applications.json +++ b/seed/challenges/03-back-end-development-certification/dynamic-web-applications.json @@ -20,7 +20,7 @@ "User Story: As an unauthenticated or authenticated user, I can see the results of polls in chart form. (This could be implemented using Chart.js or Google Charts.)", "User Story: As an authenticated user, if I don't like the options on a poll, I can create a new option.", "Once you've finished implementing these user stories, click the \"I've completed this challenge\" button and enter the URLs for both your GitHub repository and your live app running on Heroku.", - "You can get feedback on your project from fellow campers by sharing it in our Code Review Chatroom. You can also share it on Twitter and your city's Campsite (on Facebook)." + "You can get feedback on your project by sharing it with your friends on Facebook." ], "challengeSeed": [ "JBKnbY_fdg4" @@ -59,7 +59,7 @@ "User Story: As an unauthenticated user, when I login I should not have to search again.", "Hint: Try using the Yelp API to find venues in the cities your users search for. If you use Yelp's API, be sure to mention so in your app.", "Once you've finished implementing these user stories, click the \"I've completed this challenge\" button and enter the URLs for both your GitHub repository and your live app running on Heroku.", - "You can get feedback on your project from fellow campers by sharing it in our Code Review Chatroom. You can also share it on Twitter and your city's Campsite (on Facebook)." + "You can get feedback on your project by sharing it with your friends on Facebook." ], "challengeSeed": [ "Gei7QfPmcMw" @@ -94,7 +94,7 @@ "User Story: I can remove stocks.", "User Story: I can see changes in real-time when any other user adds or removes a stock. For this you will need to use Web Sockets.", "Once you've finished implementing these user stories, click the \"I've completed this challenge\" button and enter the URLs for both your GitHub repository and your live app running on Heroku.", - "You can get feedback on your project from fellow campers by sharing it in our Code Review Chatroom. You can also share it on Twitter and your city's Campsite (on Facebook)." + "You can get feedback on your project by sharing it with your friends on Facebook." ], "challengeSeed": [ "CENs50cnRgM" @@ -128,7 +128,7 @@ "User Story: I can update my settings to store my full name, city, and state.", "User Story: I can propose a trade and wait for the other user to accept the trade.", "Once you've finished implementing these user stories, click the \"I've completed this challenge\" button and enter the URLs for both your GitHub repository and your live app running on Heroku.", - "You can get feedback on your project from fellow campers by sharing it in our Code Review Chatroom. You can also share it on Twitter and your city's Campsite (on Facebook)." + "You can get feedback on your project by sharing it with your friends on Facebook." ], "challengeSeed": [ "mzElFmbGqQI" @@ -165,7 +165,7 @@ "User Story: As an authenticated user, if I upload an image that is broken, it will be replaced by a placeholder image. (can use jQuery broken image detection)", "Hint: Masonry.js is a library that allows for Pinterest-style image grids.", "Once you've finished implementing these user stories, click the \"I've completed this challenge\" button and enter the URLs for both your GitHub repository and your live app running on Heroku.", - "You can get feedback on your project from fellow campers by sharing it in our Code Review Chatroom. You can also share it on Twitter and your city's Campsite (on Facebook)." + "You can get feedback on your project by sharing it with your friends on Facebook." ], "challengeSeed": [ "adrOtJCVP04" diff --git a/server/views/challenges/showBonfire.jade b/server/views/challenges/showBonfire.jade index 6bb918d579..bb7bc6b33e 100644 --- a/server/views/challenges/showBonfire.jade +++ b/server/views/challenges/showBonfire.jade @@ -75,9 +75,6 @@ block content .row if (user) #submit-challenge.animated.fadeIn.btn.btn-lg.btn-primary.btn-block Submit and go to my next challenge (ctrl + enter) - a.btn.btn-lg.btn-block.btn-twitter(target="_blank", href="https://twitter.com/intent/tweet?text=I%20just%20#{verb}%20%40FreeCodeCamp%20#{name}&url=http%3A%2F%2Ffreecodecamp.com/challenges/#{dashedName}&hashtags=LearnToCode, JavaScript", onclick="ga('send', 'event', 'twitter', 'share', 'challenge completion share');") - i.fa.fa-twitter   - = phrase else a#next-challenge.btn.btn-lg.btn-primary.btn-block(href="/challenges/next-challenge?id="+id) Go to my next challenge (ctrl + enter) include ../partials/challenge-modals From 42c97988a2e64883b6313bcf15cb4001eaa43a18 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Mon, 16 May 2016 13:08:24 -0700 Subject: [PATCH 3/4] Minor fixes to shop and about page, remove vestigial links view --- server/views/resources/about.jade | 10 +++--- server/views/resources/links.jade | 54 ------------------------------- server/views/resources/shop.jade | 22 ------------- 3 files changed, 5 insertions(+), 81 deletions(-) delete mode 100644 server/views/resources/links.jade diff --git a/server/views/resources/about.jade b/server/views/resources/about.jade index 200db54604..6f23f9b1ed 100644 --- a/server/views/resources/about.jade +++ b/server/views/resources/about.jade @@ -58,11 +58,6 @@ block content i.fa.fa-youtube td a(href="//youtube.com/freecodecamp", target='_blank') Our YouTube channel - tr - td.text-center - i.fa.fa-reddit - td - a(href="//www.reddit.com/r/freecodecamp", target='_blank') Our Subreddit tr td.text-center i.fa.fa-github @@ -83,6 +78,11 @@ block content i.fa.fa-facebook td a(href="//facebook.com/freecodecamp") Our Facebook page + tr + td.text-center + i.fa.fa-reddit + td + a(href="//www.reddit.com/r/freecodecamp", target='_blank') Our Subreddit tr td.text-center i.fa.fa-lock diff --git a/server/views/resources/links.jade b/server/views/resources/links.jade deleted file mode 100644 index 269382fab2..0000000000 --- a/server/views/resources/links.jade +++ /dev/null @@ -1,54 +0,0 @@ -extends ../layout -block content - table.table.link-table - tr - td.text-right - .ion-erlenmeyer-flask - td - a(href="/labs") Cool Apps Built by Campers - tr - td.text-right - .ion-chatbox - td - a(href="/stories") Stories from Campers - tr - td.text-right - .ion-speakerphone - td - a(href='//medium.freecodecamp.com', target='_blank') Medium Publication - tr - td.text-right - .ion-social-github - td - a(href="//github.com/freecodecamp", target='_blank') GitHub Repository - tr - td.text-right - .ion-social-reddit - td - a(href="//www.reddit.com/r/freecodecamp", target='_blank') Subreddit - tr - td.text-right - .ion-social-linkedin - td - a(href="//www.linkedin.com/edu/school?id=166029", target='_blank') LinkedIn University Page - tr - td.text-right - .ion-social-twitter - td - a(href="//twitter.com/freecodecamp", target='_blank') Twitter Feed - tr - td.text-right - .ion-social-facebook - td - a(href="//facebook.com/freecodecamp") Facebook Page - tr - td.text-right - .ion-social-twitch-outline - td - a(href="//twitch.tv/freecodecamp", target='_blank') Twitch.tv Channel - tr - td.text-right - .ion-locked - td - a(href="//github.com/FreeCodeCamp/freecodecamp/wiki/Free-Code-Camp's-Privacy-Policy") Privacy Policy - .spacer diff --git a/server/views/resources/shop.jade b/server/views/resources/shop.jade index 7529ad0f14..86a2bf9643 100644 --- a/server/views/resources/shop.jade +++ b/server/views/resources/shop.jade @@ -2,28 +2,6 @@ extends ../layout block content h1.text-center Shop hr - .row - .col-xs-12.col-sm-8.col-sm-offset-2.col-md-6.col-md-offset-3.text-center - img.img-responsive.img-center(src='//i.imgur.com/GzpUBR5.jpg') - h3 Women's fitted black t-shirt - h4 Only $19.99! - p This high-quality American Apparel t-shirt will help you look like the fantastic developer you are. - .spacer - a.btn.btn-lg.signup-btn.btn-block(href='//teespring.com/free-code-camp-tshirt-black#pid=70&cid=2343&sid=front' target='_blank') Get this awesome shirt - .button-spacer - a.btn.btn-primary.btn-lg.btn-block(href='//teespring.com/black-free-code-camp-tshirt-eu#pid=375&cid=100052&sid=front' target='_blank') Get it here if you live in Europe - hr - .row - .col-xs-12.col-sm-8.col-sm-offset-2.col-md-6.col-md-offset-3.text-center - img.img-responsive.img-center(src='//i.imgur.com/ENPVayN.jpg') - h3 Men's black t-shirt - h4 Only $19.99! - p Features Free Code Camp's classy "function call" logo. You can't have too many awesome black t-shirts! - .spacer - a.btn.btn-lg.signup-btn.btn-block(href='//teespring.com/free-code-camp-tshirt-black' target='_blank') Get this awesome shirt - .button-spacer - a.btn.btn-primary.btn-lg.btn-block(href='//teespring.com/black-free-code-camp-tshirt-eu' target='_blank') Get it here if you live in Europe - hr .row .col-xs-12.col-sm-8.col-sm-offset-2.col-md-6.col-md-offset-3.text-center img.img-responsive.img-center(src='//i.imgur.com/MH1CvwY.jpg') From e0867ec556647f4fa4a505f6d1a548b7079fcd73 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Mon, 16 May 2016 16:10:52 -0700 Subject: [PATCH 4/4] remove additional vestiges of labs and twitter sharing --- server/boot/randomAPIs.js | 9 --- server/resources/labs.json | 65 ------------------- .../challenges/showZiplineOrBasejump.jade | 3 - 3 files changed, 77 deletions(-) delete mode 100644 server/resources/labs.json diff --git a/server/boot/randomAPIs.js b/server/boot/randomAPIs.js index 8de1503c69..18ce25a487 100644 --- a/server/boot/randomAPIs.js +++ b/server/boot/randomAPIs.js @@ -1,6 +1,5 @@ import request from 'request'; import constantStrings from '../utils/constantStrings.json'; -import labs from '../resources/labs.json'; import testimonials from '../resources/testimonials.json'; import secrets from '../../config/secrets'; @@ -23,7 +22,6 @@ module.exports = function(app) { router.get('/unsubscribed', unsubscribed); router.get('/get-started', getStarted); router.get('/submit-cat-photo', submitCatPhoto); - router.get('/labs', showLabs); router.get('/stories', showTestimonials); router.get('/shop', showShop); router.get('/shop/cancel-stickers', cancelStickers); @@ -45,13 +43,6 @@ module.exports = function(app) { res.redirect('https://gitter.im/FreeCodeCamp/FreeCodeCamp'); } - function showLabs(req, res) { - res.render('resources/labs', { - title: 'Projects Built by Free Code Camp Software Engineers', - projects: labs - }); - } - function terms(req, res) { res.render('resources/terms-of-service', { title: 'Terms of Service' diff --git a/server/resources/labs.json b/server/resources/labs.json deleted file mode 100644 index f37dff5aac..0000000000 --- a/server/resources/labs.json +++ /dev/null @@ -1,65 +0,0 @@ -[ - { - "camper": "johnstonbl01", - "name": "Clementine.js", - "url": "http://johnstonbl01.github.io/clementinejs/", - "description": "The elegant and lightweight boilerplate for full stack JavaScript.", - "image": "//i.imgur.com/ib1wOho.png" - }, - { - "camper": "adventurebear", - "name": "Coding Bootcamp Cost Calculator", - "url": "http://www.freecodecamp.com/coding-bootcamp-cost-calculator", - "description": "This d3.js-powered coding bootcamp cost calculator takes into account tuition, financing, lost wages and cost of living.", - "image": "https://qph.is.quoracdn.net/main-qimg-670d6a0c5b01f74138e777732994240f?convert_to_webp=true" - }, - { - "camper": "martoncsikos", - "name": "Skill.bar", - "url": "http://www.skill.bar", - "description": "Learn. Gain points. Visualize your skills.", - "image": "//i.imgur.com/URkqqb5.png" - }, - { - "camper": "ericdouglas", - "name": "Open Source Society", - "url": "https://github.com/open-source-society/computer-science", - "description": "A path to a free education in Computer Science.", - "image": "https://camo.githubusercontent.com/c42438055d3fee26b29e6d046fd8d06ebff3db20/687474703a2f2f692e696d6775722e636f6d2f6838786a72726a2e706e67" - }, - { - "camper": "akiralaine", - "name": "Musare", - "url": "http://musare.com/", - "description": "Musare is a modern, collaborative, open-source Music App.", - "image": "//i.imgur.com/Y4D4MPL.png" - }, - { - "camper": "bighitbiker3", - "name": "Queue That", - "url": "http://queuethat.com/", - "description": "An app that uses the SoundCloud API in order to make temporary, running playlists.", - "image": "https://www.evernote.com/l/AqSy_bYAZ0dOiJnn4CfNgo09DOSTUX1IADIB/image.png" - }, - { - "camper": "storbeck", - "name": "Free Code Camp Event Zipline: Recipe Box", - "url": "http://codepen.io/GeoffStorbeck/full/bVKyzd/", - "description": "Try to reverse engineer this Recipe Box as an optional Zipline challenge.", - "image": "//i.imgur.com/5o0bwVQ.png" - }, - { - "camper": "akiralaine", - "name": "Camper News Bot", - "url": "https://twitter.com/campernewsbot", - "description": "This twitter bot tweets out Camper News stories once they hit 5 upvotes.", - "image": "https://pbs.twimg.com/media/CLXOFLPWIAEHYPJ.png" - }, - { - "camper": "roelver", - "name": "Free Code Camp Top 100 Campers", - "url": "http://fcctop100.herokuapp.com/", - "description": "This leaderboard tracks the campers who have been most active (completing challenges, helping other campers) in the past 30 days.", - "image": "//i.imgur.com/4CrQfFi.png" - } -] \ No newline at end of file diff --git a/server/views/challenges/showZiplineOrBasejump.jade b/server/views/challenges/showZiplineOrBasejump.jade index 04dd8d01d7..605d0a9fa4 100644 --- a/server/views/challenges/showZiplineOrBasejump.jade +++ b/server/views/challenges/showZiplineOrBasejump.jade @@ -60,9 +60,6 @@ block content if (user) a.btn.btn-lg.btn-primary.btn-block#next-courseware-button(name='_csrf', value=_csrf) Submit and go to my next challenge - .button-spacer - a.btn.btn-lg.btn-block.btn-twitter(target="_blank", href="https://twitter.com/intent/tweet?text=Check%20out%20the%20project%20I%20just%20built%20with%20%40FreeCodeCamp:%20PASTE_YOUR_CODEPEN_URL_HERE_USING_FULL_INSTEAD_OF_PEN%20%0A%20%23LearnToCode%20%23JavaScript", onclick="ga('send', 'event', 'twitter', 'share', 'challenge completion share');") - i.fa.fa-twitter  Tweet this project else a.btn.btn-lg.btn-primary.btn-block(href='/challenges/next-challenge?id=' + id) Go to my next challenge