From 7bc34f97102bdf2e987c7a75d8ff9c6f08f2af21 Mon Sep 17 00:00:00 2001
From: Roman Timashev <roman@tmshv.ru>
Date: Mon, 22 May 2017 12:55:52 +0300
Subject: [PATCH] Flexibility changes with App, main.hbs

---
 src/components/App.js  | 14 +++++++++++---
 src/lib/component.js   |  4 ++--
 src/lib/render.js      | 11 +++++++++--
 src/routes/articles.js |  2 +-
 src/routes/home.js     |  2 +-
 src/views/main.hbs     |  2 +-
 6 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/components/App.js b/src/components/App.js
index c649f54b..113b773b 100644
--- a/src/components/App.js
+++ b/src/components/App.js
@@ -2,7 +2,13 @@ const React = require('react')
 const Menu = require('./Menu')
 const Footer = require('./Footer')
 
-const App = ({children, menu}) => (
+const Comments = () => (
+	<div className="content content_semi-wide">
+		<div id="disqus_thread"></div>
+	</div>
+)
+
+const App = ({children, menu, showAuthor}) => (
 	<div className="body-wrapper theme-default">
 		<header>
 			<div className="navigation">
@@ -16,10 +22,12 @@ const App = ({children, menu}) => (
 			<section className="content content_full content--padding-top--menu">
 				{children}
 			</section>
+
+			<Comments/>
 		</main>
 
-		<Footer showAuthor={false}
-				address="г. Шлиссельбург ул. 18 января д. 3"
+		<Footer showAuthor={showAuthor}
+				address=" г. Шлиссельбург ул. 18 января д. 3"
 				telephone="+7 (81362) 76-312"
 				email="hudozka@gmail.com"
 		/>
diff --git a/src/lib/component.js b/src/lib/component.js
index 54ba3de1..f8c6eaff 100644
--- a/src/lib/component.js
+++ b/src/lib/component.js
@@ -3,9 +3,9 @@ import {renderToStaticMarkup} from 'react-dom/server'
 
 const App = require('../components/App')
 
-function renderApp({menu, component}) {
+function renderApp({component, ...options}) {
 	const app = (
-		<App menu={menu}>
+		<App {...options}>
 			{component}
 		</App>
 	)
diff --git a/src/lib/render.js b/src/lib/render.js
index 95d42f97..c4bb80bc 100644
--- a/src/lib/render.js
+++ b/src/lib/render.js
@@ -13,6 +13,11 @@ const {compose, any} = require('../lib/common')
 const menuModel = require('../models/menu').default
 const config = require('../config')
 
+const defaultOptions = {
+	commentsEnabled: false,
+	showAuthor: false,
+}
+
 function isActive(path, menuItem) {
 	return isEqualPate(path, menuItem.url, true)
 }
@@ -63,17 +68,18 @@ const getTitle = meta => 'title' in meta
 
 const isHtml = data => typeof data === 'string'
 
-async function render(path, data, meta) {
+async function render(path, data, meta, options = {}) {
 	const component = isHtml(data)
 		? getHtml(data)
 		: data
 
 	const menu = buildMenu(path, menuModel)
-	const content = renderApp({menu, component})
+	const content = renderApp({...options, menu, component})
 
 	const source = await readFile(config.viewMain, 'utf-8')
 	const template = handlebars.compile(source)
 
+	const renderOptions = {...defaultOptions, ...options}
 	const metaData = {
 		...meta,
 		description: 'Сайт Шлиссельбургской художественной школы',
@@ -83,6 +89,7 @@ async function render(path, data, meta) {
 
 	return template({
 		content,
+		options: renderOptions,
 		title: getTitle(meta),
 		meta: metaData,
 	})
diff --git a/src/routes/articles.js b/src/routes/articles.js
index d09f5e41..9d267707 100644
--- a/src/routes/articles.js
+++ b/src/routes/articles.js
@@ -115,7 +115,7 @@ function getArticle() {
 				)
 
 				ctx.type = 'text/html'
-				ctx.body = await render(path, Component, getMeta(article))
+				ctx.body = await render(path, Component, getMeta(article), {commentsEnabled: true})
 			} else {
 				ctx.status = 404
 			}
diff --git a/src/routes/home.js b/src/routes/home.js
index b907080d..910beb8e 100644
--- a/src/routes/home.js
+++ b/src/routes/home.js
@@ -81,7 +81,7 @@ function getHome(pageSize) {
 				</div>
 		)
 
-		ctx.body = await render(path, Component, getMeta({title: 'Шлиссельбургская ДХШ'}))
+		ctx.body = await render(path, Component, getMeta({title: 'Шлиссельбургская ДХШ'}), {showAuthor: true})
 	})
 }
 
diff --git a/src/views/main.hbs b/src/views/main.hbs
index 8a833eaa..293caa2d 100644
--- a/src/views/main.hbs
+++ b/src/views/main.hbs
@@ -87,7 +87,7 @@
         script.setAttribute('data-timestamp', Date.now());
         (document.head || document.body).appendChild(script);
     }
-    const doInitDisqus = false
+    const doInitDisqus = {{options.commentsEnabled}}
     if (doInitDisqus) initDisqus()
 </script>
 </body>