Merge remote-tracking branch 'origin/master'

Anastasia
2 parents cb16bae6 5ef6db64
Showing 2 changed files with 74 additions and 5 deletions Show diff stats
frontend/config/main.php
frontend/views/layouts/main.php
@@ -9,10 +9,21 @@
     );
     return [
+        'on beforeRequest' => function () {
+            $pathInfo = Yii::$app->request->pathInfo;
+            $query = Yii::$app->request->queryString;
+            if (!empty($pathInfo) && substr($pathInfo, -1) === '/') {
+                $url = '/' . substr($pathInfo, 0, -1);
+                if ($query) {
+                    $url .= '?' . $query;
+                }
+                Yii::$app->response->redirect($url, 301);
+            }
+        },
         'id'                  => 'app-frontend',
         'homeUrl'             => '/',
         'basePath'            => dirname(__DIR__),
-        'bootstrap'           => [ 'log' ],
+        'bootstrap'           => [ 'log','assetsAutoCompress' ],
         'controllerNamespace' => 'frontend\controllers',
         'container' => [
             'singletons' => [
@@ -362,9 +373,58 @@
                 'baseUrl'         => '/',
                 'enablePrettyUrl' => true,
                 'showScriptName'  => false,
-                'rules'           => [],
+                'rules'           => [
+                   
+                ],
                 'hideDefaultLanguagePrefix' => true,
             ],
+            'assetsAutoCompress' => [
+                'class'   => '\skeeks\yii2\assetsAuto\AssetsAutoCompressComponent',
+                'enabled' => true,
+    
+                'readFileTimeout' => 3,
+                //Time in seconds for reading each asset file
+    
+                'jsCompress'                => true,
+                //Enable minification js in html code
+                'jsCompressFlaggedComments' => true,
+                //Cut comments during processing js
+    
+                'cssCompress' => true,
+                //Enable minification css in html code
+    
+                'cssFileCompile'        => true,
+                //Turning association css files
+                'cssFileRemouteCompile' => false,
+                //Trying to get css files to which the specified path as the remote file, skchat him to her.
+                'cssFileCompress'       => true,
+                //Enable compression and processing before being stored in the css file
+                'cssFileBottom'         => false,
+                //Moving down the page css files
+                'cssFileBottomLoadOnJs' => false,
+                //Transfer css file down the page and uploading them using js
+    
+                'jsFileCompile'                 => true,
+                //Turning association js files
+                'jsFileRemouteCompile'          => false,
+                //Trying to get a js files to which the specified path as the remote file, skchat him to her.
+                'jsFileCompress'                => true,
+                //Enable compression and processing js before saving a file
+                'jsFileCompressFlaggedComments' => true,
+                //Cut comments during processing js
+    
+                'htmlCompress' => true,
+                //Enable compression html
+                'noIncludeJsFilesOnPjax' => true,
+                //Do not connect the js files when all pjax requests
+                'htmlCompressOptions' =>              //options for compressing output result
+                    [
+                        'extra'       => false,
+                        //use more compact algorithm
+                        'no-comments' => true
+                        //cut all the html comments
+                    ],
+            ],
         ],
         'params'              => $params,
@@ -28,6 +28,7 @@
     use yii\db\ActiveQuery;
     use yii\helpers\Html;
     use yii\web\View;
+    use yii\helpers\Url as DefaultUrl;
     AppAsset::register($this);
     SliderAsset::register($this);
@@ -103,7 +104,14 @@
           <div class="container">
             <div class="row">
               <div class="col-xs-7 col-sm-3 col-md-2 col-lg-2 logo-wrapp">
-                <a href="<?php echo \frontend\helpers\Url::home(); ?>">
+
+                <a
+                    <?php if(DefaultUrl::current()!=='/site/index'): ?>
+                    href= "<?php echo \frontend\helpers\Url::home(); ?>">
+                    <?php else: ?>
+                        >
+                    <?php endif;?>
+
                     <?php
                       if ($settings->logo != null){
                         echo '<img src="/storage/logo/'.$settings->logo.'" alt="">';
@@ -118,6 +126,7 @@
                       }
                     ?>
+
                 </a>
               </div>
@@ -342,8 +351,8 @@
               <div class="col-xs-9 col-sm-2">
                 <ul class="footer-menu">
                   <li><a href="<?=Url::to(['site/about'])?>"><?=\Yii::t('app','About us')?></a></li>
-                  <li><a href="#" class="new"><span><?=\Yii::t('app','Contacts');?></span></a></li>
-                  <li><a href="<?=Url::to(['site/questions'])?>"><?=\Yii::t('app','Second thing');?></a></li>
+                  <li><a href="#" ><?=\Yii::t('app','Contacts');?></a></li>
+                  <li><a href="<?=Url::to(['site/questions'])?>" class="new"><span><?=\Yii::t('app','Second thing');?></span></a></li>
                   <li><a href="<?=Url::to(['site/comments'])?>"><?=\Yii::t('app','Quest/Answer');?></a></li>
                   <li><a href="<?=Url::to(['site/comments'])?>"><?=\Yii::t('app','Callbacks');?></a></li>
                 </ul>