Merge remote-tracking branch 'origin/master'

Karnovsky A
2 parents fecf4bd1 4495dea0
Showing 8 changed files with 84 additions and 25 deletions Show diff stats
backend/config/main.php
backend/controllers/SiteController.php
backend/views/layouts/header.php
backend/views/seo/_form.php
frontend/views/layouts/main.php
frontend/views/site/index.php
frontend/widgets/BannerWidget.php
frontend/widgets/Seo.php
@@ -13,19 +13,27 @@ return [
     'layout' => 'admin',
     'controllerNamespace' => 'backend\controllers',
     'bootstrap' => ['log'],
-//    'as AccessBehavior' => [
-//        'class' => AccessBehavior::className(),
-//        'rules' =>
-//            ['permit/access' =>
-//                [
-//                    [
-//                        'actions' => ['role', 'permission','add-role', 'update-role','add-permission', 'update-permission' ],
-//                        'allow' => true,
-//                    ]
-//                ]
-//            ],
-//
-//    ],
+    'as AccessBehavior' => [
+        'class' => AccessBehavior::className(),
+        'rules' =>
+            [
+                'permit/access' =>
+                [
+                    [
+                        'actions' => ['role', 'permission','add-role', 'update-role','add-permission', 'update-permission' ],
+                        'allow' => true,
+                    ]
+                ],
+                'site' =>
+                [
+                    [
+                        'actions' => ['login', 'error' ],
+                        'allow' => true,
+                    ]
+
+                ]
+            ]
+    ],
     'modules' => [
         'permit' => [
             'class' => 'developeruz\db_rbac\Yii2DbRbac',
@@ -10,6 +10,7 @@ use common\modules\product\models\ProductVariant;
 use common\modules\product\models\ProductVariantType;
 use Yii;
 use yii\filters\AccessControl;
+use yii\helpers\Url;
 use yii\web\Controller;
 use backend\models\LoginForm;
 use yii\filters\VerbFilter;
@@ -82,7 +83,7 @@ class SiteController extends Controller
         $model = new LoginForm();
         if ($model->load(Yii::$app->request->post()) && $model->login()) {
-            return $this->goBack();
+            return $this->redirect(Url::to('/admin/site/index'));
         } else {
             return $this->render('login', [
                 'model' => $model,
+<?php
+
+/* @var $this \yii\web\View */
+/* @var $content string */
+
+use yii\helpers\Html;
+use yii\bootstrap\Nav;
+use yii\bootstrap\NavBar;
+use yii\widgets\Breadcrumbs;
+use frontend\assets\AppAsset;
+use common\widgets\Alert;
+
+AppAsset::register($this);
+?>
 <header class="main-header">
     <!-- Logo -->
     <a href="index2.html" class="logo">
@@ -14,6 +28,31 @@
         </a>
         <div class="navbar-custom-menu">
+            <?php
+            NavBar::begin([
+                'options' => [
+                    'class' => 'navbar-inverse navbar-fixed-top',
+                ],
+            ]);
+            if (Yii::$app->user->isGuest) {
+                $menuItems[] = ['label' => 'Signup', 'url' => ['/site/signup']];
+                $menuItems[] = ['label' => 'Login', 'url' => ['/site/login']];
+            } else {
+                $menuItems[] = '<li>'
+                    . Html::beginForm(['/site/logout'], 'post')
+                    . Html::submitButton(
+                        'Logout (' . Yii::$app->user->identity->username . ')',
+                        ['class' => 'btn btn-link']
+                    )
+                    . Html::endForm()
+                    . '</li>';
+            }
+            echo Nav::widget([
+                'options' => ['class' => 'navbar-nav navbar-right'],
+                'items' => $menuItems,
+            ]);
+            NavBar::end();
+            ?>
         </div>
     </nav>
 </header>
 \ No newline at end of file
@@ -2,7 +2,8 @@
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
-
+use mihaildev\ckeditor\CKEditor;
+use mihaildev\elfinder\ElFinder;
 /* @var $this yii\web\View */
 /* @var $model common\models\Seo */
 /* @var $form yii\widgets\ActiveForm */
@@ -19,8 +20,15 @@ use yii\widgets\ActiveForm;
     <?= $form->field($model, 'description')->textInput(['maxlength' => true]) ?>
     <?= $form->field($model, 'h1')->textInput(['maxlength' => true]) ?>
-
-    <?= $form->field($model, 'seo_text')->textarea(['rows' => 6]) ?>
+    <?= $form->field($model, 'seo_text')->widget(CKEditor::className(),
+        [
+            'editorOptions' => ElFinder::ckeditorOptions('elfinder',[
+                    'preset' => 'full', //разработанны стандартные настройки basic, standard, full данную возможность не обязательно использовать
+                    'inline' => false, //по умолчанию false]),
+                    'filebrowserUploadUrl'=>Yii::$app->getUrlManager()->createUrl('file/uploader/images-upload')
+                ]
+            )
+        ]) ?>
     <div class="form-group">
         <?= Html::submitButton($model->isNewRecord ? Yii::t('app', 'Create') : Yii::t('app', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
@@ -11,6 +11,7 @@
     use common\models\Subscribe;
     use yii\widgets\ActiveForm;
     use common\modules\product\models\Category;
+    use frontend\widgets\Seo;
     AppAsset::register ($this);
     $this->registerJs ("
@@ -70,7 +71,8 @@
     <head>
         <meta charset="<?= Yii::$app->charset ?>"/>
         <?= Html::csrfMetaTags () ?>
-        <title><?= Html::encode ($this->title) ?></title>
+        <title><?= Seo::widget([ 'row'=>'title'])?></title>
+        <?= Seo::widget([ 'row'=>'description'])?>
         <link rel="shortcut icon" href="<?= Yii::$app->request->baseUrl ?>/img/favicon.ico" type="image/x-icon"/>
         <?= HreflangWidget::widget ([]) ?>
         <?php $this->head () ?>
@@ -4,10 +4,11 @@ use yii\helpers\Html;
 use yii\web\View;
 use frontend\widgets\BannerWidget;
 use yii\helpers\Url;
-
-//    $this->title = $text->meta_title;
-//    $this->registerMetaTag (['name' => 'description', 'content' => $text->meta_description]);
-//    $this->registerMetaTag (['name' => 'keywords', 'content' => $text->meta_keywords]);
+use frontend\widgets\Seo;
+$this->params['seo']['seo_text'] = 'TEST SEO TEXT';
+$this->params['seo']['h1'] = 'TEST H1';
+$this->params['seo']['description'] = 'TEST DESCRIPTION';
+$this->params['seo']['fields']['name'] = 'TEST NAME FROM FIELD';
 $this->registerJsFile (
     Yii::$app->request->baseUrl . '/js/slides.min.jquery.js',
     ['position' => View::POS_HEAD, 'depends' => ['yii\web\JqueryAsset']]);
@@ -65,7 +66,7 @@ echo &#39;&lt;/div&gt;&#39;;
 <?=BannerWidget::widget(['title' => 'HOME_CENTER']);?>
 <div class="seo_text">
-    <!--    --><?//= $text->body ?>
+    <?= Seo::widget(['row'=>'seo_text'])?>
 </div>
@@ -21,7 +21,7 @@ class BannerWidget extends Widget
     public function run ()
     {
         // слайдер
-        $banner = Banner::find()->where([Banner::tableName().'.title'=>$this->title])->one();
+        $banner = Banner::find()->where([Banner::tableName().'.title'=>$this->title, Banner::tableName().'.status' => '1'] )->one();
         if (! empty ($banner))
         {
             // html
@@ -100,7 +100,7 @@ class Seo extends Widget
             }
         }
         $str = str_replace('{project_name}', $this->project_name, $str);
-        return Html::encode($str);
+        return $str;
     }
     protected function findSeoByUrl()