Update cms

skeeks-cms · Sep 11, 2017 · 372dc36 · 372dc36
1 parent 32a2f60
commit 372dc36
Show file tree

Hide file tree

Showing 10 changed files with 1,798 additions and 796 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,11 @@
 CHANGELOG
 ==============
 
-1.2.0.2.pre
+2.0.0
+-----------------
+  * Update cms
+
+1.2.0.2
 -----------------
   * .gitignore update
   * Composer.json update

diff --git a/README.md b/README.md
@@ -3,6 +3,11 @@ Shop on SkeekS CMS (Yii2)
 
 [![skeeks!](https://en.cms.skeeks.com/uploads/all/35/fd/33/35fd33aa306823dbaf53a0142d43b3fa.png)](https://en.cms.skeeks.com)  
 
+[![Latest Stable Version](https://poser.pugx.org/skeeks/app-shop-smarty/v/stable.png)](https://packagist.org/skeeks/app-shop-smarty/app-v3-shop)
+[![Total Downloads](https://poser.pugx.org/skeeks/app-shop-smarty/downloads.png)](https://packagist.org/packages/skeeks/app-shop-smarty)
+[![Dependency Status](https://www.versioneye.com/php/skeeks:app-shop-smarty/dev-master/badge.png)](https://www.versioneye.com/php/skeeks:app-shop-smarty/dev-master)
+
+
 ##Links
 * [Web site (SkeekS CMS)](https://cms.skeeks.com)
 * [Marketplace (SkeekS CMS)](https://cms.skeeks.com/marketplace/websites/clothing/257-internet-magazin-odejdyi)
@@ -16,25 +21,16 @@ Shop on SkeekS CMS (Yii2)
 # Download latest version of composer
 curl -sS https://getcomposer.org/installer | COMPOSER_HOME=.composer php
 # Installing the base project SkeekS CMS
-COMPOSER_HOME=.composer php composer.phar create-project --no-install --prefer-dist skeeks/app-shop-smarty demo.ru
+COMPOSER_HOME=.composer php composer.phar create-project --prefer-dist --stability=dev skeeks/app-shop-smarty demo.ru
 # Going into the project folder
 cd demo.ru
-# Download latest version of composer in project
-curl -sS https://getcomposer.org/installer | COMPOSER_HOME=.composer php
-# Extra plug-ins
-COMPOSER_HOME=.composer php composer.phar global require fxp/composer-asset-plugin --no-plugins
-# Download dependency
-COMPOSER_HOME=.composer php composer.phar install -o
-# Run the command to initialize the project, the installer executable file and the necessary rights to the directory
-php yii cms/init
 
 #Edit the file to access the database, it is located at common/config/db.php
 
 #Installation of ready-dump
 php yii dbDumper/mysql/restore
 ```
 
-
 ##Screenshots
 [![skeeks!](https://cms.skeeks.com/uploads/all/3f/6d/14/3f6d14293f59d2553f867c324ca1959e.png)](https://cms.skeeks.com)
 [![skeeks!](https://cms.skeeks.com/uploads/all/2d/27/d4/2d27d4cdeeaceb28c54184f3b1886f36.png)](https://cms.skeeks.com)

diff --git a/backup/db/db__2017-02-28_17-14-26.sql → backup/db/db__2017-09-11_15-32-42.sql b/backup/db/db__2017-02-28_17-14-26.sql → backup/db/db__2017-09-11_15-32-42.sql
diff --git a/common/messages/ru/app.php b/common/messages/ru/app.php
@@ -1,12 +1,9 @@
 <?php
 /**
- * app
- *
  * @author Semenov Alexander <semenov@skeeks.com>
- * @link http://skeeks.com/
- * @copyright 2010-2014 SkeekS (Sx)
- * @date 17.10.2014
- * @since 1.0.0
+ * @link https://skeeks.com/
+ * @copyright (c) 2010 SkeekS
+ * @date 11.09.2017
  */
 return array_merge(
     (array)include_once \Yii::getAlias("@skeeks/cms/messages/ru/main.php"),

diff --git a/composer.json b/composer.json
@@ -17,65 +17,85 @@
         }
     ],
     "require": {
-        "skeeks/cms": "*",
-        "skeeks/cms-agent": "*",
-        "skeeks/cms-mailer": "*",
-        "skeeks/cms-seo": "*",
-        "skeeks/cms-search": "*",
-        "skeeks/cms-authclient": "*",
-        "skeeks/cms-db-dumper": "*",
-        "skeeks/cms-module-form2": "*",
-        "skeeks/cms-module-reviews2": "*",
-        "skeeks/cms-ssh-console": "*",
-        "skeeks/cms-vk-comments": "*",
-        "skeeks/cms-ya-share": "*",
-        "skeeks/cms-vk-community": "*",
-        "skeeks/cms-assets-auto-compress": "*",
-        "skeeks/yii2-template-smarty-asset": "*",
-        "skeeks/cms-shop": "*",
-        "skeeks/cms-external-links": "*",
-        "skeeks/cms-log-db-target": "*",
-        "kartik-v/yii2-widget-rating": "*",
-	    "skeeks/yii2-http-basic-auth": "*",
+        "skeeks/cms": "^4.0",
+        "skeeks/cms-shop": "^2",
+        "skeeks/cms-agent": "^1.1",
+        "skeeks/cms-mailer": "^2",
+        "skeeks/cms-seo": "^2",
+        "skeeks/cms-search": "^2",
+        "skeeks/cms-db-dumper": "^1",
+        "skeeks/cms-module-form2": "^2",
+        "skeeks/cms-module-reviews2": "^2",
+        "skeeks/cms-vk-comments": "^1",
+        "skeeks/cms-ya-share": "^1",
+        "skeeks/cms-vk-community": "^1",
+        "skeeks/cms-assets-auto-compress": "^1.4",
+        "skeeks/yii2-template-smarty-asset": "1.1.5",
+        "skeeks/cms-external-links": "^1",
+        "skeeks/cms-log-db-target": "^1",
+        "kartik-v/yii2-widget-rating": "^1",
         "yiisoft/yii2-debug": "*",
-        "skeeks/cms-instagram-widget": "*",
-        "skeeks/cms-related-handler-extra": "*",
-        "skeeks/cms-shop-cart-steps-widget": "*",
-        "skeeks/cms-shop-cart-items-widget": "*",
-        "skeeks/cms-shop-checkout-widget": "*",
-        "skeeks/cms-shop-discount-coupon-widget": "*",
-        "skeeks/cms-rp-view-widget": "*"
+        "skeeks/cms-instagram-widget": "^1",
+        "skeeks/cms-shop-cart-steps-widget": "^1",
+        "skeeks/cms-shop-cart-items-widget": "^1",
+        "skeeks/cms-shop-checkout-widget": "^1",
+        "skeeks/cms-shop-discount-coupon-widget": "^1",
+        "skeeks/cms-related-handler-extra": "^1",
+        "skeeks/cms-rp-view-widget": "^1",
+        "skeeks/cms-authclient": "^2",
+        "skeeks/cms-ssh-console": "^1"
     },
     "minimum-stability" : "dev",
     "prefer-stable" : true,
-    "extra": {
-        "asset-installer-paths": {
-            "npm-asset-library": "vendor/npm",
-            "bower-asset-library": "vendor/bower"
-        },
-        "writable": [
-            "console/runtime",
-            "common/runtime",
-            "frontend/runtime",
-            "frontend/web/assets"
-        ],
-        "executable": [
-            "yii"
-        ]
-    },
     "scripts": {
+        "post-create-project-cmd": [
+            "yii\\composer\\Installer::postCreateProject",
+            "yii\\composer\\Installer::postInstall"
+        ],
         "post-install-cmd": [
-            "skeeks\\cms\\console\\Composer::postInstall"
+            "yii\\composer\\Installer::postInstall",
+            "skeeks\\cms\\composer\\Installer::postInstall"
         ],
         "post-update-cmd": [
-            "skeeks\\cms\\console\\Composer::postUpdate",
-            "php yii cms/cache/flush-all",
+            "skeeks\\cms\\composer\\Installer::postUpdate",
+            "skeeks\\cms\\composer\\Installer::clearDirs",
             "php yii cms/migrate --interactive=0",
+            "skeeks\\cms\\composer\\Installer::clearDirs",
             "php yii rbac/init",
-            "php yii cmsAgent/init",
-            "php yii cms/cache/flush-all"
+            "php yii cmsAgent/init"
         ]
     },
+    "extra": {
+        "yii\\composer\\Installer::postCreateProject": {
+            "setPermission": [
+                {
+                    "console/runtime": "0777",
+                    "common/runtime": "0777",
+                    "frontend/runtime": "0777",
+                    "frontend/web/assets": "0777",
+                    "yii": "0755"
+                }
+            ]
+        },
+        "yii\\composer\\Installer::postInstall": {
+            "generateCookieValidationKey": [
+                "frontend/config/main.php"
+            ]
+        },
+        "skeeks\\cms\\composer\\Installer::clearDirs": {
+            "dirs": [
+                "console/runtime/cache",
+                "frontend/runtime/cache",
+                "frontend/web/assets"
+            ]
+        }
+    },
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://asset-packagist.org"
+        }
+    ],
     "config": {
         "process-timeout": 1800,
         "discard-changes": true