From fcebd37a01902a425ffb7d11bf727953754dd867 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Wed, 6 Apr 2016 13:49:39 -0700 Subject: [PATCH 1/2] intercept /news with a notice --- server/boot/randomAPIs.js | 7 +++++++ server/boot/story.js | 1 - server/views/resources/camper-news-deprecated.jade | 7 +++++++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 server/views/resources/camper-news-deprecated.jade diff --git a/server/boot/randomAPIs.js b/server/boot/randomAPIs.js index 2995082fb2..f12a270843 100644 --- a/server/boot/randomAPIs.js +++ b/server/boot/randomAPIs.js @@ -43,6 +43,7 @@ module.exports = function(app) { router.get('/how-nonprofit-projects-work', howNonprofitProjectsWork); router.get('/code-of-conduct', codeOfConduct); router.get('/academic-honesty', academicHonesty); + router.get('/news', news); router.get( '/the-fastest-web-page-on-the-internet', @@ -284,6 +285,12 @@ module.exports = function(app) { }); } + function news(req, res) { + res.render('resources/camper-news-deprecated', { + title: 'Camper News' + }); + } + function twitch(req, res) { res.redirect('https://twitch.tv/freecodecamp'); } diff --git a/server/boot/story.js b/server/boot/story.js index 2fba520ed6..af4c3e21a3 100755 --- a/server/boot/story.js +++ b/server/boot/story.js @@ -78,7 +78,6 @@ module.exports = function(app) { ); router.post('/stories/preliminary', ifNoUser401, newStory); router.post('/stories/', ifNoUser401, storySubmission); - router.get('/news/', hot); router.post('/stories/search', getStories); router.get('/news/:storyName', returnIndividualStory); router.post('/stories/upvote/', ifNoUser401, upvote); diff --git a/server/views/resources/camper-news-deprecated.jade b/server/views/resources/camper-news-deprecated.jade new file mode 100644 index 0000000000..22dca20125 --- /dev/null +++ b/server/views/resources/camper-news-deprecated.jade @@ -0,0 +1,7 @@ +extends ../layout +block content + h1.text-center We have discontinued Camper News. + h2.text-center We are now using our subreddit instead. + h3.text-center Here is a  + a(href='https://www.reddit.com/r/FreeCodeCamp/search?sort=top&q=flair%3AArticle&restrict_sr=on&t=week' target='_blank') Camper News-like way to use our subreddit + | . From b322d6610f1edfdaf310b43e1a8d99fde51a451a Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Wed, 6 Apr 2016 14:10:24 -0700 Subject: [PATCH 2/2] fix failing test --- server/boot/story.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/server/boot/story.js b/server/boot/story.js index af4c3e21a3..4d1ca77660 100755 --- a/server/boot/story.js +++ b/server/boot/story.js @@ -126,13 +126,6 @@ module.exports = function(app) { ); } - function hot(req, res) { - return res.render('stories/index', { - title: 'Top Stories on Camper News', - page: 'hot' - }); - } - function submitNew(req, res) { if (!req.user.isGithubCool) { req.flash('errors', {