gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9946 from FreeCodeCamp/staging

Browse Source 
Release staging
This commit is contained in:
Berkeley Martinez
2016-07-28 23:02:30 -07:00
committed by GitHub
parent a406d7eb95 ec16357c83
commit 8a25a5f3d3
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -114,7 +114,7 @@
"react-pure-render": "^1.0.2", "react-pure-render": "^1.0.2",
"react-redux": "^4.0.6", "react-redux": "^4.0.6",
"react-router": "^2.0.0", "react-router": "^2.0.0",
"react-router-bootstrap": "~0.20.1", "react-router-bootstrap": "~0.23.1",
"react-router-redux": "^2.1.0", "react-router-redux": "^2.1.0",
"react-toastr": "^2.4.0", "react-toastr": "^2.4.0",
"react-youtube": "^6.1.0", "react-youtube": "^6.1.0",

13
server/boot/t-wiki.js
View File

@ -1,17 +1,12 @@
module.exports = function(app) { module.exports = function(app) {
var router = app.loopback.Router(); var router = app.loopback.Router();
router.get('/wiki/*', showWiki); router.get('/wiki/*', showForum);
router.get('/wiki', (req, res) => res.redirect(301, '/wiki/en/'));
app.use(router); app.use(router);
function showWiki(req, res) { function showForum(req, res) {
res.render( res.redirect(
'wiki/show', 'http://forum.freecodecamp.com/'
{
title: 'Wiki | Free Code Camp',
path: req.path.replace(/^\/wiki/, '')
}
); );
} }
}; };