From 892e270c99d2286c216671d6a029c4ea48a9ad49 Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Sat, 14 Oct 2017 11:47:49 +0300 Subject: [PATCH] [www] home page rendering refactoring --- src/render/home.js | 28 ++++++++++++++++++++++++++++ src/routes/home.js | 26 ++------------------------ 2 files changed, 30 insertions(+), 24 deletions(-) create mode 100644 src/render/home.js diff --git a/src/render/home.js b/src/render/home.js new file mode 100644 index 00000000..edcca347 --- /dev/null +++ b/src/render/home.js @@ -0,0 +1,28 @@ +const React = require('react') +const getArticleListComponent = require('../routes/articles').getArticleListComponent +const {render} = require('../lib/render') + +function getMeta(article) { + return { + title: article.title, + } +} + +async function renderHome(path, page, pageSize) { + const articles = await getArticleListComponent(path, 1, pageSize) + + const Component = ( +
+
+

МБУДО

+

Шлиссельбургская детская художественная школа

+
+ + {articles} +
+ ) + + return render(path, Component, getMeta({title: 'Шлиссельбургская ДХШ'}), {showAuthor: true}) +} + +exports.renderHome = renderHome diff --git a/src/routes/home.js b/src/routes/home.js index 34398f18..3fe335c1 100644 --- a/src/routes/home.js +++ b/src/routes/home.js @@ -1,33 +1,11 @@ -const React = require('react') -const Article = require('../components/Article') const {get} = require('koa-route') -const getArticleListComponent = require('./articles').getArticleListComponent -const {render} = require('../lib/render') +const {renderHome} = require('../render/home') const getPathWithNoTrailingSlash = require('../lib/url').getPathWithNoTrailingSlash -function getMeta(article) { - return { - title: article.title, - } -} - function getHome(pageSize) { return get('/', async ctx => { const path = getPathWithNoTrailingSlash(ctx.path) - const articles = await getArticleListComponent(path, 1, pageSize) - - const Component = ( -
-
-

МБУДО

-

Шлиссельбургская детская художественная школа

-
- - {articles} -
- ) - - ctx.body = await render(path, Component, getMeta({title: 'Шлиссельбургская ДХШ'}), {showAuthor: true}) + ctx.body = await renderHome(path, 1, pageSize) }) }