Merge remote-tracking branch 'origin/master'

alex
2 parents 9c253d8a 8e33baf9
Showing 4 changed files with 67 additions and 49 deletions Show diff stats
composer.lock
frontend/controllers/BlogController.php
frontend/views/site/index.php
frontend/web/css/style.blue.css
@@ -186,16 +186,16 @@
         },
         {
             "name": "bower-asset/bootstrap-daterangepicker",
-            "version": "v3.0.1",
+            "version": "v3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dangrossman/daterangepicker.git",
-                "reference": "b17e061234bf80df062cd9f83ce2f422b15c3006"
+                "reference": "fba7dc416be6b38a6b2051cf6bdc84920f8cd6f7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dangrossman/daterangepicker/zipball/b17e061234bf80df062cd9f83ce2f422b15c3006",
-                "reference": "b17e061234bf80df062cd9f83ce2f422b15c3006",
+                "url": "https://api.github.com/repos/dangrossman/daterangepicker/zipball/fba7dc416be6b38a6b2051cf6bdc84920f8cd6f7",
+                "reference": "fba7dc416be6b38a6b2051cf6bdc84920f8cd6f7",
                 "shasum": null
             },
             "require": {
@@ -883,16 +883,16 @@
         },
         {
             "name": "google/apiclient-services",
-            "version": "v0.58",
+            "version": "v0.60",
             "source": {
                 "type": "git",
                 "url": "https://github.com/google/google-api-php-client-services.git",
-                "reference": "e21760a34daea7bc29e2866b62f8c8db4e91228d"
+                "reference": "80404044884da8ed7e6fcbd4fa96e2ad7db46e94"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/google/google-api-php-client-services/zipball/e21760a34daea7bc29e2866b62f8c8db4e91228d",
-                "reference": "e21760a34daea7bc29e2866b62f8c8db4e91228d",
+                "url": "https://api.github.com/repos/google/google-api-php-client-services/zipball/80404044884da8ed7e6fcbd4fa96e2ad7db46e94",
+                "reference": "80404044884da8ed7e6fcbd4fa96e2ad7db46e94",
                 "shasum": ""
             },
             "require": {
@@ -916,7 +916,7 @@
             "keywords": [
                 "google"
             ],
-            "time": "2018-05-06T00:22:52+00:00"
+            "time": "2018-05-19T00:23:51+00:00"
         },
         {
             "name": "google/auth",
@@ -2643,16 +2643,16 @@
         },
         {
             "name": "tinymce/tinymce",
-            "version": "4.7.12",
+            "version": "4.7.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/tinymce/tinymce-dist.git",
-                "reference": "914887eeeb9a28034045879defa09defccf7c68a"
+                "reference": "2d2cd37932279723b4a5e4d259bc94123acbe666"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/tinymce/tinymce-dist/zipball/914887eeeb9a28034045879defa09defccf7c68a",
-                "reference": "914887eeeb9a28034045879defa09defccf7c68a",
+                "url": "https://api.github.com/repos/tinymce/tinymce-dist/zipball/2d2cd37932279723b4a5e4d259bc94123acbe666",
+                "reference": "2d2cd37932279723b4a5e4d259bc94123acbe666",
                 "shasum": ""
             },
             "type": "component",
@@ -2685,7 +2685,7 @@
                 "tinymce",
                 "wysiwyg"
             ],
-            "time": "2018-05-03T13:38:00+00:00"
+            "time": "2018-05-16T04:27:27+00:00"
         },
         {
             "name": "tubalmartin/cssmin",
@@ -3576,22 +3576,22 @@
         },
         {
             "name": "codeception/phpunit-wrapper",
-            "version": "7.1.1",
+            "version": "7.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/phpunit-wrapper.git",
-                "reference": "33e8ccf2f7abf5c031eeae9802b821d30ec0f7fc"
+                "reference": "374dd623668a0028e29c95b362e20d03f8c4e65b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/33e8ccf2f7abf5c031eeae9802b821d30ec0f7fc",
-                "reference": "33e8ccf2f7abf5c031eeae9802b821d30ec0f7fc",
+                "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/374dd623668a0028e29c95b362e20d03f8c4e65b",
+                "reference": "374dd623668a0028e29c95b362e20d03f8c4e65b",
                 "shasum": ""
             },
             "require": {
                 "phpunit/php-code-coverage": "^6.0",
                 "phpunit/phpunit": "^7.1",
-                "sebastian/comparator": "^2.0",
+                "sebastian/comparator": "^3.0",
                 "sebastian/diff": "^3.0"
             },
             "require-dev": {
@@ -3615,20 +3615,20 @@
                 }
             ],
             "description": "PHPUnit classes used by Codeception",
-            "time": "2018-04-20T10:17:13+00:00"
+            "time": "2018-05-17T08:30:48+00:00"
         },
         {
             "name": "codeception/stub",
-            "version": "1.0.2",
+            "version": "1.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/Stub.git",
-                "reference": "95fb7a36b81890dd2e5163e7ab31310df6f1bb99"
+                "reference": "681b62348837a5ef07d10d8a226f5bc358cc8805"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Stub/zipball/95fb7a36b81890dd2e5163e7ab31310df6f1bb99",
-                "reference": "95fb7a36b81890dd2e5163e7ab31310df6f1bb99",
+                "url": "https://api.github.com/repos/Codeception/Stub/zipball/681b62348837a5ef07d10d8a226f5bc358cc8805",
+                "reference": "681b62348837a5ef07d10d8a226f5bc358cc8805",
                 "shasum": ""
             },
             "require": {
@@ -3648,7 +3648,7 @@
                 "MIT"
             ],
             "description": "Flexible Stub wrapper for PHPUnit's Mock Builder",
-            "time": "2018-02-18T13:56:56+00:00"
+            "time": "2018-05-17T09:31:08+00:00"
         },
         {
             "name": "codeception/verify",
@@ -4441,16 +4441,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "7.1.4",
+            "version": "7.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "6d51299e307dc510149e0b7cd1931dd11770e1cb"
+                "reference": "ca64dba53b88aba6af32aebc6b388068db95c435"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6d51299e307dc510149e0b7cd1931dd11770e1cb",
-                "reference": "6d51299e307dc510149e0b7cd1931dd11770e1cb",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ca64dba53b88aba6af32aebc6b388068db95c435",
+                "reference": "ca64dba53b88aba6af32aebc6b388068db95c435",
                 "shasum": ""
             },
             "require": {
@@ -4469,7 +4469,7 @@
                 "phpunit/php-text-template": "^1.2.1",
                 "phpunit/php-timer": "^2.0",
                 "phpunit/phpunit-mock-objects": "^6.1.1",
-                "sebastian/comparator": "^2.1 || ^3.0",
+                "sebastian/comparator": "^3.0",
                 "sebastian/diff": "^3.0",
                 "sebastian/environment": "^3.1",
                 "sebastian/exporter": "^3.1",
@@ -4517,7 +4517,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2018-04-18T13:41:53+00:00"
+            "time": "2018-04-29T15:09:19+00:00"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
@@ -4622,30 +4622,30 @@
         },
         {
             "name": "sebastian/comparator",
-            "version": "2.1.3",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9"
+                "reference": "ed5fd2281113729f1ebcc64d101ad66028aeb3d5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/34369daee48eafb2651bea869b4b15d75ccc35f9",
-                "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/ed5fd2281113729f1ebcc64d101ad66028aeb3d5",
+                "reference": "ed5fd2281113729f1ebcc64d101ad66028aeb3d5",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0",
-                "sebastian/diff": "^2.0 || ^3.0",
+                "php": "^7.1",
+                "sebastian/diff": "^3.0",
                 "sebastian/exporter": "^3.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.4"
+                "phpunit/phpunit": "^7.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1.x-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -4682,7 +4682,7 @@
                 "compare",
                 "equality"
             ],
-            "time": "2018-02-01T13:46:46+00:00"
+            "time": "2018-04-18T13:33:00+00:00"
         },
         {
             "name": "sebastian/diff",
@@ -6,6 +6,7 @@
     use common\models\blog\Category;
     use common\models\blog\Tag;
     use yii\data\ActiveDataProvider;
+    use yii\db\ActiveQuery;
     use yii\web\Controller;
     use yii\web\NotFoundHttpException;
@@ -47,7 +48,9 @@
                                            )
                                          ->with(
                                                [
-                                                   'categories.language',
+                                                   'categories' => function (ActiveQuery $query){
+                                                        $query->with('language')->where(['status' => true]);
+                                                   },
                                                ]
                                            )
@@ -123,7 +126,9 @@
                              ->where(['status' => true])
                              ->orderBy([ 'sort' => SORT_ASC ])
                              ->one();
-    
+            if (empty($model)){
+                throw new NotFoundHttpException();
+            }
             $dataProvider = new ActiveDataProvider(
                 [
                     'query'      => $model->getArticles()
@@ -188,9 +193,15 @@
                                           ->with(
                                               [
                                                   'language',
-                                                  'categories.language',
                                               ]
-                                          )
+                                          )->with(
+                            [
+                                'categories' => function (ActiveQuery $query){
+                                    $query->with('language')->where(['status' => true]);
+                                },
+                            ]
+    
+                        )
                         ->where(['blog_article.status' => true])
                                           ->orderBy(
                                               [
@@ -229,10 +240,16 @@
                           ->with(
                                 [
                                     'language',
-                                    'categories.language',
                                     'tags.language',
                                 ]
-                            )
+                            )->with(
+                    [
+                        'categories' => function (ActiveQuery $query){
+                            $query->with('language')->where(['status' => true]);
+                        },
+                    ]
+    
+                )
                           ->andWhere([ 'status' => true ])
                           ->one();
@@ -16,8 +16,9 @@
   <!-- *** HOMEPAGE CAROUSEL ***
 _________________________________________________________ -->
-  <div class="home-carousel" <?=$slides[0]->background !== null ? ' style="background: url('.$slides[0]->background->getUrl().') center center repeat;"' : ''?>>
-    
+<!--  <div class="home-carousel" --><?//=$slides[0]->background !== null ? ' style="background: url('.$slides[0]->background->getUrl().') center center repeat;"' : ''?><!-->
+  <div class="home-carousel">
+
     <div class="dark-mask"></div>
     <div class="container">
@@ -3,4 +3,4 @@
  * http://geedmo.github.com/yamm3
  * 
  * @geedmo - Licensed under the MIT license
- */.yamm .nav,.yamm .collapse,.yamm .dropup.use-yamm,.yamm .dropdown.use-yamm{position:static}.yamm .container{position:relative}.yamm .dropdown-menu{left:auto}.yamm .nav.navbar-right .dropdown-menu{left:auto;right:0}.yamm .yamm-content{padding:20px 30px}.yamm .dropdown.yamm-fw .dropdown-menu{left:15px;right:15px}#back-to-top{background-color:#294d76;}#back-to-top:hover{background-color:#2e6a98;}
 \ No newline at end of file
+ */.yamm .nav,.yamm .collapse,.yamm .dropup.use-yamm,.yamm .dropdown.use-yamm{position:static}.yamm .container{position:relative}.yamm .dropdown-menu{left:auto}.yamm .nav.navbar-right .dropdown-menu{left:auto;right:0}.yamm .yamm-content{padding:20px 30px}.yamm .dropdown.yamm-fw .dropdown-menu{left:15px;right:15px}#back-to-top{background-color:#294d76;}#back-to-top:hover{background-color:#2e6a98;}.home-carousel{background:none !important;}.home-carousel .dark-mask {background:#578bc5;opacity:1;}#top .social a,#top .social {color:#fff}#top {background: #999;}.contact a {font-weight:700;color:#2f5a89;}
 \ No newline at end of file