From 540c5b1501986f7dd37a53c9c1b6af46381d45a8 Mon Sep 17 00:00:00 2001
From: Yuri <zaveryukha@gmail.com>
Date: Wed, 12 Jun 2019 15:52:50 +0300
Subject: [PATCH 1/2] TASK: add last materials

---
 .../Private/Fusion/NodeTypes/PageMain.fusion  | 81 +++++++++++--------
 .../Fusion/NodeTypes/Repository.fusion        |  4 +-
 2 files changed, 48 insertions(+), 37 deletions(-)

diff --git a/DistributionPackages/Sfi.Kateheo/Resources/Private/Fusion/NodeTypes/PageMain.fusion b/DistributionPackages/Sfi.Kateheo/Resources/Private/Fusion/NodeTypes/PageMain.fusion
index b1af2c0..9ac20c1 100755
--- a/DistributionPackages/Sfi.Kateheo/Resources/Private/Fusion/NodeTypes/PageMain.fusion
+++ b/DistributionPackages/Sfi.Kateheo/Resources/Private/Fusion/NodeTypes/PageMain.fusion
@@ -1,3 +1,37 @@
+prototype(Sfi.Kateheo:AbstractList) < prototype(Flowpack.Listable:Collection) {
+	@process.styles = ${'<style>
+		.newsList {
+			display: flex;
+			flex-wrap: wrap;
+			margin: -12px;
+		}
+		.newsList-item {
+			flex-basis: 100%;
+			padding: 12px;
+		}
+		@media screen and (min-width:640px) {
+			.newsList-item {
+				flex-basis: 50%;
+			}
+		}
+		@media screen and (min-width:1024px) {
+			.newsList-item {
+				flex-basis: 33.33%;
+			}
+		}
+		@media screen and (min-width:1024px) {
+			.newsList-item:nth-child(4) {
+				display: none;
+			}
+		}
+	</style>' + value}
+	listClass = 'newsList'
+	itemClass = 'newsList-item'
+	itemRenderer = Flowpack.Listable:ContentCaseShort
+	collection = Neos.Neos:ContentCollection 
+}
+
+
 prototype(Sfi.Kateheo:PageMain) < prototype(Sfi.Kateheo:AbstractDocument) {
 	prototype(Psmb.Carousel:Carousel).@process.wrap = afx`<div class="backgroundColor-kateheo">{value}</div>`
 	body.content = Neos.Fusion:Component {
@@ -9,39 +43,14 @@ prototype(Sfi.Kateheo:PageMain) < prototype(Sfi.Kateheo:AbstractDocument) {
 			mode = 'front'
 		}
 
-		newsList = Flowpack.Listable:Collection {
-			@process.styles = ${'<style>
-				.newsList {
-					display: flex;
-					flex-wrap: wrap;
-					margin: -12px;
-				}
-				.newsList-item {
-					flex-basis: 100%;
-					padding: 12px;
-				}
-				@media screen and (min-width:640px) {
-					.newsList-item {
-						flex-basis: 50%;
-					}
-				}
-				@media screen and (min-width:1024px) {
-					.newsList-item {
-						flex-basis: 33.33%;
-					}
-				}
-				@media screen and (min-width:1024px) {
-					.newsList-item:nth-child(4) {
-						display: none;
-					}
-				}
-			</style>' + value}
-			listClass = 'newsList'
-			itemClass = 'newsList-item'
-			itemRenderer = Flowpack.Listable:ContentCaseShort
+		newsList = Sfi.Kateheo:AbstractList {
 			collection = ${Search.query(site).nodeType("Sfi.Kateheo:News").sortDesc('date').from(0).limit(4).execute().toArray()}
 		}
 
+		lastAdded = Sfi.Kateheo:AbstractList {
+			collection = ${Search.query(site).nodeType("Sfi.Kateheo:Article").sortDesc('date').from(0).limit(6).execute().toArray()}
+		}
+
 		soundCloudPlayer = Sfi.Kateheo:SoundCloudPlayer {
 			soundCloudLink = ${site.properties.soundCloudLink}
 		}
@@ -63,6 +72,13 @@ prototype(Sfi.Kateheo:PageMain) < prototype(Sfi.Kateheo:AbstractDocument) {
 					{props.main}
 				</div>
 				<div class="primarySectionsMain" style="margin-bottom: 48px">{props.primarySections}</div>
+				<h3 class="H2 color-grayLight" style="margin-bottom: 12px">Последние материалы сайта</h3>
+				{props.lastAdded}
+				<h3 class="H2 color-grayLight" style="margin-bottom: 12px">Новости</h3>
+				{props.newsList}
+				<div class="LinkHover ParagraphAlt--Small color-grayLight" style="margin-bottom: 24px">
+					<a href={props.archiveUri}>Архив всех материалов сайта ›</a>
+				</div>
 				<div style="background-color: var(--color-graySoundCloud); padding: 36px 24px; margin-bottom: 48px">
 					<div class="row">
 						<div class="columns medium-4">
@@ -77,11 +93,6 @@ prototype(Sfi.Kateheo:PageMain) < prototype(Sfi.Kateheo:AbstractDocument) {
 						</div>
 					</div>
 				</div>
-				<h3 class="H2 color-grayLight" style="margin-bottom: 12px">Новости</h3>
-				{props.newsList}
-				<div class="LinkHover ParagraphAlt--Small color-grayLight" style="margin-bottom: 24px">
-					<a href={props.archiveUri}>Архив всех материалов сайта ›</a>
-				</div>
 			</div>
 		`
 		style = ${'<style>
diff --git a/DistributionPackages/Sfi.Kateheo/Resources/Private/Fusion/NodeTypes/Repository.fusion b/DistributionPackages/Sfi.Kateheo/Resources/Private/Fusion/NodeTypes/Repository.fusion
index 1dcc5bd..6df083b 100644
--- a/DistributionPackages/Sfi.Kateheo/Resources/Private/Fusion/NodeTypes/Repository.fusion
+++ b/DistributionPackages/Sfi.Kateheo/Resources/Private/Fusion/NodeTypes/Repository.fusion
@@ -52,7 +52,7 @@ prototype(Sfi.Kateheo:ListingByType) < prototype(Flowpack.Listable:PaginatedColl
 		type = ${facetConfig.type}
 	}
 	prototype(Flowpack.Listable:Collection) {
-		listClass = ${facetConfig.type == 'Sfi.Kateheo:News' && 'medium-block-grid-2'}
+		listClass = ${(facetConfig.type == 'Sfi.Kateheo:News' || facetConfig.type == 'Sfi.Kateheo:Article') && 'medium-block-grid-2'}
 	}
 	@cache {
 		entryDiscriminator = Neos.Fusion:Array {
@@ -98,7 +98,7 @@ prototype(Sfi.Kateheo:ListingOverview) < prototype(Neos.Fusion:Collection) {
 		@process.wrap = Sfi.Kateheo:FacetWrapper {
 			label = ${facetConfig.label}
 		}
-		listClass = ${facetConfig.type == 'Sfi.Kateheo:News' && 'medium-block-grid-2'}
+		listClass = ${(facetConfig.type == 'Sfi.Kateheo:News' || facetConfig.type == 'Sfi.Kateheo:Article') && 'medium-block-grid-2'}
 		@context.query = Sfi.Kateheo:Query {
 			type = ${facetConfig.type}
 			value.@process.paginate = ${displayAll ? value.from(0).limit(1000) : value.from(0).limit(4)}

From 61564ddc594a8575b9eec20634ce6c5e9e7ddc74 Mon Sep 17 00:00:00 2001
From: Yuri <zaveryukha@gmail.com>
Date: Thu, 19 Mar 2020 12:39:00 +0300
Subject: [PATCH 2/2] TASK: small changes in main page

---
 .../Resources/Private/Fusion/NodeTypes/PageMain.fusion         | 2 +-
 .../Sfi.Kateheo/Resources/Private/Fusion/Objects/Footer.fusion | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/DistributionPackages/Sfi.Kateheo/Resources/Private/Fusion/NodeTypes/PageMain.fusion b/DistributionPackages/Sfi.Kateheo/Resources/Private/Fusion/NodeTypes/PageMain.fusion
index 9ac20c1..d74e5ec 100755
--- a/DistributionPackages/Sfi.Kateheo/Resources/Private/Fusion/NodeTypes/PageMain.fusion
+++ b/DistributionPackages/Sfi.Kateheo/Resources/Private/Fusion/NodeTypes/PageMain.fusion
@@ -74,7 +74,7 @@ prototype(Sfi.Kateheo:PageMain) < prototype(Sfi.Kateheo:AbstractDocument) {
 				<div class="primarySectionsMain" style="margin-bottom: 48px">{props.primarySections}</div>
 				<h3 class="H2 color-grayLight" style="margin-bottom: 12px">Последние материалы сайта</h3>
 				{props.lastAdded}
-				<h3 class="H2 color-grayLight" style="margin-bottom: 12px">Новости</h3>
+				<h3 class="H2 color-grayLight" style="margin-bottom: 12px">События</h3>
 				{props.newsList}
 				<div class="LinkHover ParagraphAlt--Small color-grayLight" style="margin-bottom: 24px">
 					<a href={props.archiveUri}>Архив всех материалов сайта ›</a>
diff --git a/DistributionPackages/Sfi.Kateheo/Resources/Private/Fusion/Objects/Footer.fusion b/DistributionPackages/Sfi.Kateheo/Resources/Private/Fusion/Objects/Footer.fusion
index 1cb01c7..c9edb19 100644
--- a/DistributionPackages/Sfi.Kateheo/Resources/Private/Fusion/Objects/Footer.fusion
+++ b/DistributionPackages/Sfi.Kateheo/Resources/Private/Fusion/Objects/Footer.fusion
@@ -38,8 +38,7 @@ prototype(Sfi.Kateheo:Footer) < prototype(Neos.Fusion:Component) {
                         <p class="ParagraphAlt--Small">
                             По вопросам работы портала<br/>
                             kateheo.ru обращайтесь:<br/>
-                            редактор портала С.М. Бурлака<br/>
-                            E-mail: <a style="text-decoration: underline" href="mailto:burlakas@sfi.ru">burlakas@sfi.ru</a>
+                            редактор портала Н.А. Адаменко<br/>
                         </p>
                     </div>
                     <div class="large-3 medium-4 columns">