From c9513f031afd3c925350fd486acfa1c0c1d46e42 Mon Sep 17 00:00:00 2001
From: Egorka <error-202@mail.ru>
Date: Thu, 5 Jul 2018 16:29:46 +0300
Subject: [PATCH] Dashboard search Search Performance Frontend blog tags
 showing fix

---
 backend/controllers/SiteController.php             | 41 ++++++++++++++++++--
 backend/messages/ru/main.php                       |  1 +
 backend/views/layouts/left.php                     | 45 +++++++++++++++++-----
 backend/views/site/search.php                      | 41 ++++++++++++++++++++
 common/bootstrap/SetUp.php                         |  5 +++
 common/modules/blog/BlogModule.php                 |  7 ++++
 common/modules/blog/urls/BlogTagUrlRule.php        |  4 +-
 common/modules/blog/views/post/post.php            |  1 -
 console/controllers/SearchInitController.php       | 20 ++++++++++
 core/components/SearchPerformance.php              | 19 +++++++++
 core/entities/Search.php                           | 26 +++++++++++++
 core/forms/SearchForm.php                          | 21 ++++++++++
 .../themes/start/modules/blog/views/post/post.php  |  2 +-
 13 files changed, 216 insertions(+), 17 deletions(-)
 create mode 100644 backend/views/site/search.php
 create mode 100644 console/controllers/SearchInitController.php
 create mode 100644 core/components/SearchPerformance.php
 create mode 100644 core/entities/Search.php
 create mode 100644 core/forms/SearchForm.php

diff --git a/backend/controllers/SiteController.php b/backend/controllers/SiteController.php
index cac991f..1c4d5e1 100644
--- a/backend/controllers/SiteController.php
+++ b/backend/controllers/SiteController.php
@@ -1,7 +1,10 @@
 <?php
 namespace backend\controllers;
 
+use core\entities\Search;
+use core\forms\SearchForm;
 use Yii;
+use yii\data\ActiveDataProvider;
 use yii\web\Controller;
 use yii\filters\VerbFilter;
 use yii\filters\AccessControl;
@@ -19,14 +22,14 @@ class SiteController extends Controller
     {
         return [
             'access' => [
-                'class' => AccessControl::className(),
+                'class' => AccessControl::class,
                 'rules' => [
                     [
                         'actions' => ['error'],
                         'allow' => true,
                     ],
                     [
-                        'actions' => ['index'],
+                        'actions' => ['index', 'search'],
                         'allow' => true,
                         'roles' => ['Dashboard'],
                     ],
@@ -37,7 +40,7 @@ class SiteController extends Controller
                 ],
             ],
             'verbs' => [
-                'class' => VerbFilter::className(),
+                'class' => VerbFilter::class,
                 'actions' => [
                     'logout' => ['post'],
                 ],
@@ -67,6 +70,38 @@ class SiteController extends Controller
         return $this->render('index');
     }
 
+    public function actionSearch()
+    {
+		$form = new SearchForm();
+
+	    if ($form->load(Yii::$app->request->post()) && $form->validate()) {
+		    try {
+			    $query = Search::find()
+			                   ->andWhere(['LIKE', 'title', $form->query])
+			                   ->orWhere(['LIKE', 'content', $form->query]);
+
+			    $provider = new ActiveDataProvider([
+				    'query' => $query,
+				    'pagination' => [
+					    'pageSize' => 10,
+				    ],
+				    'sort' => [],
+			    ]);
+
+			    return $this->render('search', [
+			    	'provider' => $provider,
+				    'form' => $form
+			    ]);
+
+			    //$page = $this->service->create($form);
+			    //return $this->redirect(['view', 'id' => $page->id]);
+		    } catch (\DomainException $e) {
+			    //Yii::$app->errorHandler->logException($e);
+			    //Yii::$app->session->setFlash('error', $e->getMessage());
+		    }
+	    }
+    }
+
 	public function beforeAction($action)
 	{
 		if ($action->id === 'error') {
diff --git a/backend/messages/ru/main.php b/backend/messages/ru/main.php
index bf7bb3a..cfe0f46 100644
--- a/backend/messages/ru/main.php
+++ b/backend/messages/ru/main.php
@@ -25,4 +25,5 @@ return [
 	'Editing' => 'Редактирование',
 	'Change at your own risk' => 'Редактируйте на свой страх и риск',
 	'Online' => 'В сети',
+	'Search results' => 'Поиск',
 ];
\ No newline at end of file
diff --git a/backend/views/layouts/left.php b/backend/views/layouts/left.php
index 0211685..2a11b15 100644
--- a/backend/views/layouts/left.php
+++ b/backend/views/layouts/left.php
@@ -1,3 +1,13 @@
+<?php
+
+//use yii\widgets\ActiveForm;
+use kartik\form\ActiveForm;
+use core\forms\SearchForm;
+use yii\helpers\Html;
+
+$model = new SearchForm();
+?>
+
 <aside class="main-sidebar">
 
     <section class="sidebar">
@@ -14,16 +24,31 @@
             </div>
         </div>
 
-        <!-- search form -->
-        <form action="#" method="get" class="sidebar-form">
-            <div class="input-group">
-                <input type="text" name="q" class="form-control" placeholder="Search..."/>
-              <span class="input-group-btn">
-                <button type='submit' name='search' id='search-btn' class="btn btn-flat"><i class="fa fa-search"></i>
-                </button>
-              </span>
-            </div>
-        </form>
+	    <!-- search form -->
+	    <?php $form = ActiveForm::begin([
+	    	'action' => \yii\helpers\Url::to(['/site/search']),
+	    	'options' => [
+	    		'class' => 'sidebar-form'
+		    ],
+		    'enableClientValidation' => false,
+		    'fieldConfig' => [
+			    'options' => [
+				    'tag' => false,
+			    ],
+		    ],
+	    ]); ?>
+
+	    <?= $form->field($model, 'query', [
+		    'addon' => [
+			    'append' => [
+				    'content' => Html::button('<i class="fa fa-search"></i>', ['class'=>'btn btn-flat', 'id' => 'search-btn']),
+				    'asButton' => true
+			    ]
+		    ],
+		    'template' => "{input}",
+	    ])->textInput(['placeholder' => 'Search...'])->label(false)->hint(false); ?>
+
+	    <?php ActiveForm::end(); ?>
         <!-- /.search form -->
 
         <?= dmstr\widgets\Menu::widget(
diff --git a/backend/views/site/search.php b/backend/views/site/search.php
new file mode 100644
index 0000000..33151f2
--- /dev/null
+++ b/backend/views/site/search.php
@@ -0,0 +1,41 @@
+<?php
+
+use core\entities\Search;
+use yii\helpers\Html;
+use yii\grid\GridView;
+use yii\helpers\StringHelper;
+
+/* @var $this yii\web\View */
+/* @var $provider yii\data\ActiveDataProvider */
+/* @var $form \core\forms\SearchForm */
+
+$title = Yii::t('main', 'Search results');
+$this->title = $title . ' > ' . Html::encode($form->query);
+$this->params['breadcrumbs'][] = $title;
+?>
+<div class="blog-post-index">
+
+    <div class="box">
+        <div class="box-body">
+            <?= GridView::widget([
+                'dataProvider' => $provider,
+                'showHeader' => false,
+                'options' => [
+                	'style' => 'word-wrap:break-word;',
+                ],
+                'tableOptions' => [
+					'class' => 'table',
+				],
+                'columns' => [
+                    [
+                        'attribute' => 'title',
+                        'value' => function (Search $model) {
+                            return Html::a(Html::tag('h3', $model->title), [$model->url]) . StringHelper::truncateWords(strip_tags($model->content), 60, '...');
+                        },
+                        'format' => 'raw',
+                    ],
+                ],
+            ]); ?>
+        </div>
+    </div>
+</div>
diff --git a/common/bootstrap/SetUp.php b/common/bootstrap/SetUp.php
index 9ebe7dc..7a6d0aa 100644
--- a/common/bootstrap/SetUp.php
+++ b/common/bootstrap/SetUp.php
@@ -146,5 +146,10 @@ class SetUp implements BootstrapInterface
 			    Yii::$app->getModule($module->name)->bootstrap(Yii::$app);
 		    }
 	    }
+
+	    // todo move that to pages module
+	    // pages search
+	    $app->params['search_rules'][] = "SELECT title, content, CONCAT('/page/', id) AS url  FROM {{pages}}";
+
     }
 }
\ No newline at end of file
diff --git a/common/modules/blog/BlogModule.php b/common/modules/blog/BlogModule.php
index 773b7b4..83eaa23 100644
--- a/common/modules/blog/BlogModule.php
+++ b/common/modules/blog/BlogModule.php
@@ -27,6 +27,9 @@ class BlogModule extends \yii\base\Module implements ModuleInterface
 
 	public function bootstrap($app)
 	{
+		// add search rules
+		$app->params['search_rules'][] = "SELECT title, content, CONCAT('/blog/manage/post/view/', id) AS url FROM {{blog_posts}}";
+		
 		// add rules
 		$app->getUrlManager()->addRules([
 			'blog' => 'blog/post/index',
@@ -38,6 +41,10 @@ class BlogModule extends \yii\base\Module implements ModuleInterface
 			['class' => 'common\modules\blog\urls\BlogTagUrlRule'],
 		]);
 
+		$app->getUrlManager()->addRules([
+			'blog/manage/post/view/<id:\d+>' => 'blog/manage/post/view',
+		]);
+
 		// add languages
 		$app->getI18n()->translations = ArrayHelper::merge($app->getI18n()->translations, [
 			'blog' => [
diff --git a/common/modules/blog/urls/BlogTagUrlRule.php b/common/modules/blog/urls/BlogTagUrlRule.php
index 79b1d39..672cc15 100644
--- a/common/modules/blog/urls/BlogTagUrlRule.php
+++ b/common/modules/blog/urls/BlogTagUrlRule.php
@@ -56,7 +56,7 @@ class BlogTagUrlRule extends BaseObject implements UrlRuleInterface
     {
         if ($route == 'blog/post/tag') {
             if (empty($params['id'])) {
-                throw new InvalidParamException('Empty id.');
+                throw new \InvalidArgumentException('Empty id.');
             }
             $id = $params['id'];
 
@@ -69,7 +69,7 @@ class BlogTagUrlRule extends BaseObject implements UrlRuleInterface
             }, null, new TagDependency(['tags' => ['blog']]));
 
             if (!$url) {
-                throw new InvalidParamException('Undefined id.');
+                throw new \InvalidArgumentException('Undefined id.');
             }
 
 	        $url = $this->prefix . '/' . $url;
diff --git a/common/modules/blog/views/post/post.php b/common/modules/blog/views/post/post.php
index c878070..1bd0d9c 100644
--- a/common/modules/blog/views/post/post.php
+++ b/common/modules/blog/views/post/post.php
@@ -104,7 +104,6 @@ $this->registerJs($js, $this::POS_READY);
 	'post' => $post,
 ]) ?>
 
-
 <ul class="list-tags" style="margin-top:20px"><?= implode(', ', $tagLinks) ?></ul>
 
 <?= CommentsWidget::widget([
diff --git a/console/controllers/SearchInitController.php b/console/controllers/SearchInitController.php
new file mode 100644
index 0000000..9cf994f
--- /dev/null
+++ b/console/controllers/SearchInitController.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Created by Error202
+ * Date: 05.07.2018
+ *
+ * Init / Update search mysql performance
+ */
+
+namespace console\controllers;
+
+use core\components\SearchPerformance;
+use yii\console\Controller;
+
+class SearchInitController extends Controller {
+
+	public function actionInit() {
+		SearchPerformance::init();
+		echo "Search performance complete" . PHP_EOL;
+	}
+}
\ No newline at end of file
diff --git a/core/components/SearchPerformance.php b/core/components/SearchPerformance.php
new file mode 100644
index 0000000..57585ba
--- /dev/null
+++ b/core/components/SearchPerformance.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Created by Error202
+ * Date: 05.07.2018
+ */
+
+namespace core\components;
+
+use Yii;
+
+class SearchPerformance {
+	public static function init()
+	{
+		$connection = Yii::$app->getDb();
+		$command = $connection->createCommand("
+		CREATE OR REPLACE VIEW view_search AS " . implode(' UNION ', Yii::$app->params['search_rules']));
+		$command->execute();
+	}
+}
\ No newline at end of file
diff --git a/core/entities/Search.php b/core/entities/Search.php
new file mode 100644
index 0000000..e3b4d78
--- /dev/null
+++ b/core/entities/Search.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Created by Error202
+ * Date: 05.07.2018
+ */
+
+namespace core\entities;
+
+use yii\db\ActiveRecord;
+
+/**
+ * Class Search
+ * @package core\entities
+ *
+ * @property string $title
+ * @property string $content
+ * @property string $url
+ */
+
+class Search extends ActiveRecord
+{
+	public static function tableName(): string
+	{
+		return '{{view_search}}';
+	}
+}
\ No newline at end of file
diff --git a/core/forms/SearchForm.php b/core/forms/SearchForm.php
new file mode 100644
index 0000000..7290c3d
--- /dev/null
+++ b/core/forms/SearchForm.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Created by Error202
+ * Date: 10.02.2018
+ */
+
+namespace core\forms;
+
+use yii\base\Model;
+
+class SearchForm extends Model
+{
+	public $query;
+
+	public function rules() {
+		return [
+			['query', 'required'],
+			['query', 'string'],
+		];
+	}
+}
diff --git a/frontend/web/themes/start/modules/blog/views/post/post.php b/frontend/web/themes/start/modules/blog/views/post/post.php
index 63515d4..48437b3 100644
--- a/frontend/web/themes/start/modules/blog/views/post/post.php
+++ b/frontend/web/themes/start/modules/blog/views/post/post.php
@@ -20,7 +20,7 @@ $this->params['active_category'] = $post->category;
 
 $tagLinks = [];
 foreach ($post->tags as $tag) {
-    $tagLinks[] = '<li>' . Html::a(Html::encode($tag->name), ['tag', 'slug' => $tag->slug]) . '</li>';
+	$tagLinks[] = '<li>' . Html::a(Html::encode($tag->name), ['tag', 'id' => $tag->id]) . '</li>';
 }
 
 $url = Url::to(['/blog/post/post', 'id' =>$post->id]);