From 1efd23c4035c371aa6820b688fe3da03ce390fbf Mon Sep 17 00:00:00 2001
From: Roman Timashev <tmshv@yandex-team.ru>
Date: Tue, 24 Oct 2017 17:27:46 +0300
Subject: [PATCH] [www] update

---
 src/core/Image.js             |  2 +-
 src/core/ImageArtifactType.js |  1 +
 src/render/persons.js         | 27 +++++++++++++++++----------
 src/routes/albums.js          |  2 +-
 src/routes/gallery.js         |  2 +-
 5 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/core/Image.js b/src/core/Image.js
index dc096a3f..23182e8e 100644
--- a/src/core/Image.js
+++ b/src/core/Image.js
@@ -48,7 +48,7 @@ class Image {
 		const a = this.getArtifact(size)
 		const a2 = this.getArtifact(retinaSize)
 		const srcset = !a2
-			? null
+			? []
 			: [{
 				url: a2.url,
 				density: ImageArtifactType.RETINA_DENSITY,
diff --git a/src/core/ImageArtifactType.js b/src/core/ImageArtifactType.js
index 9c85b01f..360cf5d8 100644
--- a/src/core/ImageArtifactType.js
+++ b/src/core/ImageArtifactType.js
@@ -7,6 +7,7 @@ class ImageArtifactType {
 ImageArtifactType.SMALL = 'small'
 ImageArtifactType.MEDIUM = 'medium'
 ImageArtifactType.BIG = 'big'
+ImageArtifactType.LARGE = 'large'
 ImageArtifactType.ORIGIN = 'original'
 ImageArtifactType.ORIGINAL = 'original'
 
diff --git a/src/render/persons.js b/src/render/persons.js
index 52ee7f01..d658f7dc 100644
--- a/src/render/persons.js
+++ b/src/render/persons.js
@@ -2,7 +2,7 @@ const React = require('react')
 const Picture = require('../components/Image')
 const CollectiveImage = require('../components/CollectiveImage')
 const Page = require('../components/Page')
-const TeacherCard = require('../components/TeacherCard')
+const PersonCard = require('../components/PersonCard')
 const {render} = require('../lib/render')
 const timestamp = require('../lib/date').timestamp
 const ImageArtifactType = require('../core/ImageArtifactType')
@@ -71,24 +71,31 @@ async function renderCollective(path, order) {
 	const config = await Config.findConfig()
 	if (!config) return null
 
-	const preview = await Image.findByFile(config.collectiveImage)
-	if (!preview) return null
+	const collectiveImage = await Image.findByFile(config.collectiveImage)
+	if (!collectiveImage) return null
 
-	let teachers = await Teacher.find({})
+	let teachers = await Teacher.find({hidden: false})
 	if (!teachers) return null
 
 	const teachersSorted = prioritySort.bind(null, [...order], t => t.id)
 	teachers = teachersSorted(teachers)
 
-	const image = preview.getPicture(ImageArtifactType.ORIGINAL)
+	console.log(collectiveImage)
+	const image = collectiveImage.getPicture(ImageArtifactType.LARGE)
+
+	const PersonCardList = ({children}) => (
+		<div className="PersonCardList">
+			{children}
+		</div>
+	)
 
 	const Component = (
-		<div className="page-collective content content_full">
+		<div className="content content_semi-wide">
 			<CollectiveImage data={image}/>
 
-			<div className="content content_semi-wide">
+			<PersonCardList>
 				{teachers.map((teacher, index) => (
-					<TeacherCard
+					<PersonCard
 						key={index}
 						profile={teacher}
 						picture={profilePicture(teacher)}
@@ -96,11 +103,11 @@ async function renderCollective(path, order) {
 						name={teacher.splitName()}
 					/>
 				))}
-			</div>
+			</PersonCardList>
 		</div>
 	)
 
-	return render(path, Component, getCollectiveMeta())
+	return render(path, Component, getCollectiveMeta(), {menuPadding: true})
 }
 
 exports.renderPerson = renderPerson
diff --git a/src/routes/albums.js b/src/routes/albums.js
index 5fc8542b..bac44308 100644
--- a/src/routes/albums.js
+++ b/src/routes/albums.js
@@ -30,7 +30,7 @@ function getAlbum() {
 			)
 
 			ctx.type = 'text/html'
-			ctx.body = await render(path, Component, getMeta(album), {commentsEnabled: true})
+			ctx.body = await render(path, Component, getMeta(album), {commentsEnabled: true, menuPadding: true})
 		} else {
 			ctx.status = 404
 		}
diff --git a/src/routes/gallery.js b/src/routes/gallery.js
index 204b8861..fed8aa6c 100644
--- a/src/routes/gallery.js
+++ b/src/routes/gallery.js
@@ -29,7 +29,7 @@ const AlbumImage = ({data, alt}) => (
 			src={data.src}
 			width={data.width * m}
 			height={data.height * m}
-			srcSet={data.set.map(({url, density}) => `${url} ${density}x`)}
+			srcSet={(data.set || []).map(({url, density}) => `${url} ${density}x`)}
 		/>
 	</picture>
 )