From 5cf756969ee90abee1c47c8aa92c4a01456ef724 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Wed, 9 Jul 2014 19:49:39 +0100 Subject: [PATCH] blog wip --- .../coffee/Features/Blog/BlogController.coffee | 17 +++++++++++++++++ services/web/app/coffee/router.coffee | 3 +++ services/web/app/views/blog/post.jade | 3 +++ 3 files changed, 23 insertions(+) create mode 100644 services/web/app/coffee/Features/Blog/BlogController.coffee create mode 100644 services/web/app/views/blog/post.jade diff --git a/services/web/app/coffee/Features/Blog/BlogController.coffee b/services/web/app/coffee/Features/Blog/BlogController.coffee new file mode 100644 index 0000000000..f339b771d7 --- /dev/null +++ b/services/web/app/coffee/Features/Blog/BlogController.coffee @@ -0,0 +1,17 @@ +request = require("request") +settings = require("settings-sharelatex") +logger = require("logger-sharelatex") + +module.exports = + + getPage: (req, res)-> + url = req.url + logger.log url:url, "proxying request to blog api" + request.get "#{settings.apis.blog.url}#{url}", (err, r, data)-> + console.log data + try + data = JSON.parse(data) + catch err + logger.err err:err, data:data, "error parsing data from data" + res.render "blog/#{data.layout}", data + diff --git a/services/web/app/coffee/router.coffee b/services/web/app/coffee/router.coffee index 643dc3e6b5..e5c03a15cc 100644 --- a/services/web/app/coffee/router.coffee +++ b/services/web/app/coffee/router.coffee @@ -36,6 +36,7 @@ DropboxUserController = require("./Features/Dropbox/DropboxUserController") PasswordResetRouter = require("./Features/PasswordReset/PasswordResetRouter") StaticPagesRouter = require("./Features/StaticPages/StaticPagesRouter") ChatController = require("./Features/Chat/ChatController") +BlogController = require("./Features/Blog/BlogController") logger = require("logger-sharelatex") _ = require("underscore") @@ -64,6 +65,8 @@ module.exports = class Router StaticPagesRouter.apply(app) TemplatesRouter.apply(app) + app.get '/blog/*', BlogController.getPage + if Settings.enableSubscriptions app.get '/user/bonus', AuthenticationController.requireLogin(), ReferalMiddleware.getUserReferalId, ReferalController.bonus diff --git a/services/web/app/views/blog/post.jade b/services/web/app/views/blog/post.jade new file mode 100644 index 0000000000..a350ea5871 --- /dev/null +++ b/services/web/app/views/blog/post.jade @@ -0,0 +1,3 @@ +div #{title} +div #{author} +div !{content}