From 89b00f32109b3edd09f6aa707b72349b278e4cca Mon Sep 17 00:00:00 2001
From: root <merdan.m@gmail.com>
Date: Fri, 18 Jun 2021 12:46:03 +0000
Subject: [PATCH] server

---
 .../suresoftware/powerseo/components/CmsPage.php  | 15 +++++++++------
 themes/modern2/pages/index.htm                    |  2 ++
 themes/modern2/partials/latest_news.htm           |  4 ++--
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/plugins/suresoftware/powerseo/components/CmsPage.php b/plugins/suresoftware/powerseo/components/CmsPage.php
index 3051302c9..2a393f5e0 100644
--- a/plugins/suresoftware/powerseo/components/CmsPage.php
+++ b/plugins/suresoftware/powerseo/components/CmsPage.php
@@ -41,11 +41,17 @@ class CmsPage extends ComponentBase
         return [];
     }
 
-    public function onRun()
+    public function onRender()
     {
         $this->page["hasBlog"] = false;
 
-        if (!$this->page->page->hasComponent("SeoBlogPost")) {
+            if($this->page->page->hasComponent("blogPosts")){
+                $category = $this->page->page->components['blogPosts']->category;
+                $this->seo_title = $this->page["seo_title"] = $category ? $category->name : $this->page->meta_title;
+                $this->seo_description = $this->page["seo_description"] = $category ? $category->description : $this->page->meta_description;
+                $this->seo_keywords = $this->page["seo_keywords"] = $category ? $category->name :$this->page->seo_keywords;
+            }
+        else if (!$this->page->page->hasComponent("SeoBlogPost")) {
             $this->seo_title = $this->page["seo_title"] = empty($this->page->meta_title) ? $this->page->title : $this->page->meta_title;
             $this->seo_description = $this->page["seo_description"] = $this->page->meta_description;
             $this->seo_keywords = $this->page["seo_keywords"] = $this->page->seo_keywords;
@@ -67,10 +73,7 @@ class CmsPage extends ComponentBase
         } else { //todo els if has category component
             $this->hasBlog = $this->page["hasBlog"] = true;
 
-            if($this->page->page->hasComponent("blogPosts")){
-                $this->seo_title = $this->page["seo_title"] = empty($this->page->meta_title) ? $this->page->title : $this->page->meta_title;
-                dd($this->page->page);
-            }
+
         }
     }
 
diff --git a/themes/modern2/pages/index.htm b/themes/modern2/pages/index.htm
index 846169842..d8403fb40 100644
--- a/themes/modern2/pages/index.htm
+++ b/themes/modern2/pages/index.htm
@@ -11,6 +11,8 @@ robot_follow = "follow"
 
 [viewBag]
 localeTitle[en] = "Home"
+localeMeta_title[en] = "All main news of Turkmenistan today. Latest news of the region."
+localeMeta_description[en] = "Events. The main and latest news of politics for today. Latest political news of Turkmenistan"
 
 [blogCategories]
 slug = "{{ :slug }}"
diff --git a/themes/modern2/partials/latest_news.htm b/themes/modern2/partials/latest_news.htm
index c98f4ac05..35ffd428f 100644
--- a/themes/modern2/partials/latest_news.htm
+++ b/themes/modern2/partials/latest_news.htm
@@ -2,7 +2,7 @@
 
 [blogPosts]
 pageNumber = "{{ :page }}"
-postsPerPage = 6
+postsPerPage = 10
 noPostsMessage = "No posts found"
 sortOrder = "published_at desc"
 categoryPage = "category"
@@ -40,4 +40,4 @@ exceptPost = "{{ :id }}"
         {{post.title}}
     </a>
 </div>
-{% endfor %}
+{% endfor %}
\ No newline at end of file