diff --git a/server/boot/news.js b/server/boot/news.js new file mode 100644 index 0000000000..688972c9dc --- /dev/null +++ b/server/boot/news.js @@ -0,0 +1,9 @@ +export default function newsBoot(app) { + const router = app.loopback.Router(); + + router.get('/', (req, res) => { + res.render('layout-news', {title: 'Hello News?'}); + }); + + app.use('/news', router); +} diff --git a/server/boot/story.js b/server/boot/story.js deleted file mode 100755 index 34409fafe7..0000000000 --- a/server/boot/story.js +++ /dev/null @@ -1,12 +0,0 @@ -module.exports = function(app) { - const router = app.loopback.Router(); - - const redirectToReddit = (req, res) => - res.redirect('https://www.reddit.com/r/FreeCodeCamp/'); - - router.get('/news', redirectToReddit); - router.get('/news/:storyName', redirectToReddit); - router.get('/stories/:storyName', redirectToReddit); - - app.use(router); -}; diff --git a/server/middlewares/add-return-to.js b/server/middlewares/add-return-to.js index e117f9d877..73f3b6a694 100644 --- a/server/middlewares/add-return-to.js +++ b/server/middlewares/add-return-to.js @@ -31,7 +31,7 @@ export default function addReturnToUrl() { req.method !== 'GET' || pathsOfNoReturnRegex.test(path) || !whiteListRegex.test(path) || - (/news/i).test(path) && (/hot/i).test(req.path) + (/hot/i).test(req.path) ) { return next(); } diff --git a/server/views/layout-news.jade b/server/views/layout-news.jade new file mode 100644 index 0000000000..92a617e356 --- /dev/null +++ b/server/views/layout-news.jade @@ -0,0 +1,11 @@ +doctype html +html(lang='en') + head + if title + title= title + else + title freeCodeCamp + include partials/react-stylesheets + body + #news-app-mount + script(src=cacheBreaker(rev('/js', 'news-app.js'))) diff --git a/server/views/layout-react.jade b/server/views/layout-react.jade index 1564f3f80b..321048f96d 100644 --- a/server/views/layout-react.jade +++ b/server/views/layout-react.jade @@ -23,4 +23,4 @@ html(lang='en').full-size fccTheme = null; } })(); - script(src=cacheBreaker(rev('/js', 'bundle.js'))) + script(src=cacheBreaker(rev('/js', 'client-app.js')))