adding wiki as detached and integrating into .less folder

This commit is contained in:
Hallaathrad
2016-02-09 23:22:42 -05:00
parent 02662e98e2
commit fe422d2300
6 changed files with 41 additions and 8 deletions

View File

@ -2,6 +2,16 @@
* based off of https://github.com/gitterHQ/sidecar * based off of https://github.com/gitterHQ/sidecar
* license: MIT * license: MIT
*/ */
#wikiFrame {
width: 100%;
height: 100%;
top: 0;
bottom: 0;
position: absolute;
overflow: hidden;
}
.wiki-aside { .wiki-aside {
width:500px; width:500px;
@ -49,6 +59,18 @@
} }
} }
.wiki-aside .wiki-header {
display: none;
}
.wiki-aside .wiki-container {
padding-top: 10px;
}
.wiki-aside .wikiSelector {
top: 50px;
}
.wiki-aside-action-bar { .wiki-aside-action-bar {
position: absolute; position: absolute;
top: 0; top: 0;
@ -107,7 +129,7 @@
border-color: darkgreen; border-color: darkgreen;
} }
wiki
.wiki-aside-action-item { .wiki-aside-action-item {
display: flex; display: flex;

View File

@ -383,7 +383,7 @@ $(document).ready(function() {
function showWiki() { function showWiki() {
if (!main.isWikiAsideLoad) { if (!main.isWikiAsideLoad) {
var wikiAside = $('<iframe>'); var wikiAside = $('<iframe>');
wikiAside.attr('src', 'http://beta.freecodecamp.com/wiki'); wikiAside.attr('src', 'http://freecodecamp.github.io/wiki'); /* <----------------------------------------- here */
$('.wiki-aside').append(wikiAside); $('.wiki-aside').append(wikiAside);
main.isWikiAsideLoad = true; main.isWikiAsideLoad = true;
} }

View File

@ -13,10 +13,6 @@ module.exports = function(app) {
res.redirect(301, '/pmi-acp-agile-project-managers'); 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) { router.get('/privacy', function(req, res) {
res.redirect( res.redirect(
301, 301,
@ -30,7 +26,7 @@ module.exports = function(app) {
}); });
router.get('/field-guide/*', function(req, res) { 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) { router.get('/about', function(req, res) {

10
server/boot/t-wiki.js Normal file
View File

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

View File

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

View File

@ -0,0 +1,3 @@
extends ../layout-wide
block content
iframe#wikiFrame(frameborder='no', src='http://freecodecamp.github.io/wiki')