Merge pull request #6879 from FreeCodeCamp/feature/wiki-sidebar

Add Wiki Sidebar, Use Gatsby Generated Wiki

server/boot/redirects.js

@@ -13,10 +13,6 @@ module.exports = function(app) {
     res.redirect(301, '/pmi-acp-agile-project-managers');
   });
 
-  router.get('/wiki', function(req, res) {
-    res.redirect(301, '//github.com/freecodecamp/freecodecamp/wiki');
-  });
-
   router.get('/privacy', function(req, res) {
     res.redirect(
       301,
@@ -30,7 +26,7 @@ module.exports = function(app) {
   });
 
   router.get('/field-guide/*', function(req, res) {
-    res.redirect(302, '//github.com/freecodecamp/freecodecamp/wiki');
+    res.redirect(302, '/wiki');
   });
 
   router.get('/about', function(req, res) {

server/boot/t-wiki.js

@@ -0,0 +1,11 @@
+module.exports = function(app) {
+  var router = app.loopback.Router();
+  router.get('/wiki/*', showWiki);
+  router.get('/wiki', showWiki);
+
+  app.use(router);
+
+  function showWiki(req, res) {
+    res.render('wiki/show', { title: 'Wiki | Free Code Camp' });
+  }
+};

server/middlewares/csp.js

@@ -65,7 +65,8 @@ export default function csp() {
         '*.vimeo.com',
         '*.twitter.com',
         '*.ghbtns.com',
-        '*.freecatphotoapp.com'
+        '*.freecatphotoapp.com',
+        'freecodecamp.github.io'        
       ].concat(trusted)
     },
     // set to true if you only want to report errors

server/views/partials/footer.jade

@@ -2,5 +2,9 @@
 script(src="https://sidecar.gitter.im/dist/sidecar.v1.js" async defer)
 aside.map-aside.is-collapsed
   .map-aside-action-bar
-      a.map-aside-action-item.map-aside-action-pop-out(href='/map' target='_blank' aria-label='open map in new tap')
+      a.map-aside-action-item.map-aside-action-pop-out(href='/map' target='_blank' aria-label='open map in new tab')
       button.map-aside-action-item.map-aside-action-collapse(aria-label='close map aside')
+aside.wiki-aside.is-collapsed
+    .wiki-aside-action-bar
+        a.wiki-aside-action-item.wiki-aside-action-pop-out(href='/wiki' target='_blank' aria-label='open wiki in new tab')
+        button.wiki-aside-action-item.wiki-aside-action-collapse(aria-label='close wiki aside')

server/views/partials/navbar.jade

@@ -17,8 +17,10 @@ nav.navbar.navbar-default.navbar-fixed-top.nav-height
                 a(href="//gitter.im/freecodecamp/freecodecamp" target="_blank") Chat
             li
                 a(href='/news', target='_blank') News
-            li
-                a(href='//github.com/FreeCodeCamp/freecodecamp/wiki/Home', target='_blank') Wiki
+            li.hidden-xs
+                a#nav-wiki-btn(href='#' onclick='return false') Wiki
+            li.visible-xs
+                a(href='/wiki', target='_blank') Wiki
             li
                 a(href='/jobs') Jobs
             li
@@ -32,5 +34,5 @@ nav.navbar.navbar-default.navbar-fixed-top.nav-height
                 li.brownie-points-nav
                   a(href='/' + user.username) [ #{user.progressTimestamps.length} ]
                 li.hidden-xs.hidden-sm.avatar
-                  a(href='/' + user.username) 
+                  a(href='/' + user.username)
                         img.profile-picture.float-right(src='#{user.picture}')

server/views/wiki/show.jade

@@ -0,0 +1,7 @@
+extends ../layout-wide
+block content
+    iframe#wikiFrame(frameborder='no')
+    script.
+        var lang = window.location.toString().match(/\/\w{2}\//);
+        lang = (lang) ? lang[0] : '/en/';
+        $('#wikiFrame').attr('src','http://freecodecamp.github.io/wiki' + lang);