diff --git a/app.js b/app.js index c8c276cc11..d77bd8b15b 100644 --- a/app.js +++ b/app.js @@ -64,6 +64,7 @@ mongoose.connection.on('error', function () { * Express configuration. */ + app.set('port', process.env.PORT || 3000); app.set('views', path.join(__dirname, 'views')); app.set('view engine', 'jade'); @@ -106,6 +107,11 @@ app.disable('x-powered-by'); app.use(helmet.xssFilter()); app.use(helmet.noSniff()); app.use(helmet.xframe()); +app.use(function(req, res, next) { + res.header("Access-Control-Allow-Origin", "*"); + res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept"); + next(); +}); var trusted = [ "'self'", diff --git a/controllers/resources.js b/controllers/resources.js index 23d33d203a..86b74627e1 100644 --- a/controllers/resources.js +++ b/controllers/resources.js @@ -114,26 +114,25 @@ module.exports = { }, trelloCalls: function(req, res) { client.get('https://trello.com/1/boards/BA3xVpz9/cards?key=' + secrets.trello.key, function(trello, res2) { - trello = trello ? (JSON.parse(trello)).length : "Can't connecto to Trello"; + trello = trello ? (JSON.parse(trello)).length : "Can't connect to to Trello"; res.send({"trello": trello}); }); }, bloggerCalls: function(req, res) { client.get('https://www.googleapis.com/blogger/v3/blogs/2421288658305323950/posts?key=' + secrets.blogger.key, function (blog, res5) { var blog = blog.length > 100 ? JSON.parse(blog) : ""; - res.type("application/javascript"); - var blogData = { "blog1Title": blog ? blog["items"][0]["title"] : "Can't connect to Blogger", - "blog1Link": blog ? blog["items"][0]["url"] : "http://blog.freecodecamp.com", - "blog2Title": blog ? blog["items"][1]["title"] : "Can't connect to Blogger", - "blog2Link": blog ? blog["items"][1]["url"] : "http://blog.freecodecamp.com", - "blog3Title": blog ? blog["items"][2]["title"] : "Can't connect to Blogger", - "blog3Link": blog ? blog["items"][2]["url"] : "http://blog.freecodecamp.com", - "blog4Title": blog ? blog["items"][3]["title"] : "Can't connect to Blogger", - "blog4Link": blog ? blog["items"][3]["url"] : "http://blog.freecodecamp.com", - "blog5Title": blog ? blog["items"][4]["title"] : "Can't connect to Blogger", - "blog5Link": blog ? blog["items"][4]["url"] : "http://blog.freecodecamp.com" - }; - res.json(blogData); + res.send({ + blog1Title: blog ? blog["items"][0]["title"] : "Can't connect to Blogger", + blog1Link: blog ? blog["items"][0]["url"] : "http://blog.freecodecamp.com", + blog2Title: blog ? blog["items"][1]["title"] : "Can't connect to Blogger", + blog2Link: blog ? blog["items"][1]["url"] : "http://blog.freecodecamp.com", + blog3Title: blog ? blog["items"][2]["title"] : "Can't connect to Blogger", + blog3Link: blog ? blog["items"][2]["url"] : "http://blog.freecodecamp.com", + blog4Title: blog ? blog["items"][3]["title"] : "Can't connect to Blogger", + blog4Link: blog ? blog["items"][3]["url"] : "http://blog.freecodecamp.com", + blog5Title: blog ? blog["items"][4]["title"] : "Can't connect to Blogger", + blog5Link: blog ? blog["items"][4]["url"] : "http://blog.freecodecamp.com" + }); }); }, diff --git a/views/partials/blogger.jade b/views/partials/blogger.jade index 91a9a6ef86..b77891fbe2 100644 --- a/views/partials/blogger.jade +++ b/views/partials/blogger.jade @@ -2,10 +2,8 @@ script. (function() { $.ajax({ - url: 'http://freecodecamp.com/api/blogger', - type: 'GET', - crossDomain: true, - dataType: 'jsonp' + url: '/api/blogger', + type: 'GET' }).done( function(data) { var props = Object.keys(data); diff --git a/views/partials/github.jade b/views/partials/github.jade index 4cdc36f18f..2b0b77e914 100644 --- a/views/partials/github.jade +++ b/views/partials/github.jade @@ -2,12 +2,11 @@ script. (function() { $.ajax({ - url: 'http://freecodecamp.com/api/github', + url: '/api/github', type: 'GET' }).done( function(data) { var github = document.createElement('div'); - console.log(data); $(github).html('