diff --git a/composer.json b/composer.json index 4f5e606..823bb05 100755 --- a/composer.json +++ b/composer.json @@ -36,7 +36,8 @@ "bower-asset/pnotify": "@dev", "kartik-v/yii2-widget-colorinput": "*", "kartik-v/yii2-widget-datepicker": "@dev", - "nodge/yii2-eauth": "~2.0" + "nodge/yii2-eauth": "~2.0", + "skeeks/yii2-assets-auto-compress": "*" }, "require-dev": { "yiisoft/yii2-debug": "~2.0.0", diff --git a/composer.lock b/composer.lock index 8ca1958..7a55d3b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "f43dbc89b0b20b177ad04a1c8c260992", + "content-hash": "05e52a3942b2da7e252a6d47a295317c", "packages": [ { "name": "2amigos/yii2-tinymce-widget", @@ -574,6 +574,37 @@ "time": "2016-09-14T20:40:20+00:00" }, { + "name": "container-interop/container-interop", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/container-interop/container-interop.git", + "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8", + "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8", + "shasum": "" + }, + "require": { + "psr/container": "^1.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Interop\\Container\\": "src/Interop/Container/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Promoting the interoperability of container objects (DIC, SL, etc.)", + "homepage": "https://github.com/container-interop/container-interop", + "time": "2017-02-14T19:40:03+00:00" + }, + { "name": "ezyang/htmlpurifier", "version": "v4.9.3", "source": { @@ -1225,6 +1256,49 @@ "time": "2015-09-19T16:54:05+00:00" }, { + "name": "intervention/httpauth", + "version": "2.0.2", + "source": { + "type": "git", + "url": "https://github.com/Intervention/httpauth.git", + "reference": "407203e29fc5b3f2c4dd2f1849a799a72aa15b1c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Intervention/httpauth/zipball/407203e29fc5b3f2c4dd2f1849a799a72aa15b1c", + "reference": "407203e29fc5b3f2c4dd2f1849a799a72aa15b1c", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Intervention\\Httpauth\\": "src/Intervention/Httpauth" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Oliver Vogel", + "email": "oliver@olivervogel.com", + "homepage": "http://olivervogel.com/" + } + ], + "description": "HTTP authentication (Basic & Digest) including ServiceProviders for easy Laravel integration", + "homepage": "https://github.com/Intervention/httpauth", + "keywords": [ + "Authentication", + "http", + "laravel" + ], + "time": "2017-01-29T12:04:52+00:00" + }, + { "name": "kartik-v/bootstrap-fileinput", "version": "v4.4.1", "source": { @@ -1685,6 +1759,219 @@ "time": "2017-03-13T07:08:03+00:00" }, { + "name": "mrclay/jsmin-php", + "version": "2.3.2", + "source": { + "type": "git", + "url": "https://github.com/mrclay/jsmin-php.git", + "reference": "932c9633c35b390beb2cfdea69a41ea7dbc8d759" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/mrclay/jsmin-php/zipball/932c9633c35b390beb2cfdea69a41ea7dbc8d759", + "reference": "932c9633c35b390beb2cfdea69a41ea7dbc8d759", + "shasum": "" + }, + "require": { + "ext-pcre": "*", + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "4.2" + }, + "type": "library", + "autoload": { + "psr-0": { + "JSMin\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Stephen Clay", + "email": "steve@mrclay.org", + "role": "Developer" + }, + { + "name": "Ryan Grove", + "email": "ryan@wonko.com", + "role": "Developer" + } + ], + "description": "Provides a modified port of Douglas Crockford's jsmin.c, which removes unnecessary whitespace from JavaScript files.", + "homepage": "https://github.com/mrclay/jsmin-php/", + "keywords": [ + "compress", + "jsmin", + "minify" + ], + "time": "2015-03-30T15:04:42+00:00" + }, + { + "name": "mrclay/minify", + "version": "3.0.0", + "source": { + "type": "git", + "url": "https://github.com/mrclay/minify.git", + "reference": "e904f2e1ae5e893f942e07a4860b6c47393844f1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/mrclay/minify/zipball/e904f2e1ae5e893f942e07a4860b6c47393844f1", + "reference": "e904f2e1ae5e893f942e07a4860b6c47393844f1", + "shasum": "" + }, + "require": { + "ext-pcre": "*", + "intervention/httpauth": "~2.0", + "monolog/monolog": "~1.1", + "mrclay/jsmin-php": "~2", + "mrclay/props-dic": "^2.2", + "php": "^5.3.0 || ^7.0", + "tubalmartin/cssmin": "~2.4.8-p5" + }, + "require-dev": { + "firephp/firephp-core": "~0.4.0", + "leafo/lessphp": "~0.4.0", + "leafo/scssphp": "~0.6.6", + "meenie/javascript-packer": "~1.1", + "phpunit/phpunit": "4.8.*", + "tedivm/jshrink": "~1.1.0" + }, + "suggest": { + "firephp/firephp-core": "Use FirePHP for Log messages", + "leafo/lessphp": "LESS support", + "meenie/javascript-packer": "Keep track of the Packer PHP port using Composer" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "lib/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Stephen Clay", + "email": "steve@mrclay.org", + "role": "Developer" + } + ], + "description": "Minify is a PHP5 app that helps you follow several rules for client-side performance. It combines multiple CSS or Javascript files, removes unnecessary whitespace and comments, and serves them with gzip encoding and optimal client-side cache headers", + "homepage": "https://github.com/mrclay/minify", + "time": "2017-04-03T20:50:53+00:00" + }, + { + "name": "mrclay/props-dic", + "version": "2.2.0", + "source": { + "type": "git", + "url": "https://github.com/mrclay/Props.git", + "reference": "9ed6cf3a027f1eab03abdd134ec209467cf9c77e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/mrclay/Props/zipball/9ed6cf3a027f1eab03abdd134ec209467cf9c77e", + "reference": "9ed6cf3a027f1eab03abdd134ec209467cf9c77e", + "shasum": "" + }, + "require": { + "container-interop/container-interop": "^1.1", + "php": ">=5.3.3", + "pimple/pimple": "~3.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.8" + }, + "type": "library", + "autoload": { + "psr-0": { + "Props\\": [ + "src/", + "test/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Steve Clay", + "email": "steve@mrclay.org", + "homepage": "http://www.mrclay.org/" + } + ], + "description": "Props is a simple DI container that allows retrieving values via custom property and method names", + "keywords": [ + "container", + "dependency injection", + "dependency injection container", + "di", + "di container" + ], + "time": "2016-02-10T18:59:20+00:00" + }, + { + "name": "natxet/CssMin", + "version": "v3.0.4", + "source": { + "type": "git", + "url": "https://github.com/natxet/CssMin.git", + "reference": "92de3fe3ccb4f8298d31952490ef7d5395855c39" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/natxet/CssMin/zipball/92de3fe3ccb4f8298d31952490ef7d5395855c39", + "reference": "92de3fe3ccb4f8298d31952490ef7d5395855c39", + "shasum": "" + }, + "require": { + "php": ">=5.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Joe Scylla", + "email": "joe.scylla@gmail.com", + "homepage": "https://profiles.google.com/joe.scylla" + } + ], + "description": "Minifying CSS", + "homepage": "http://code.google.com/p/cssmin/", + "keywords": [ + "css", + "minify" + ], + "time": "2015-09-25T11:13:11+00:00" + }, + { "name": "noam148/yii2-image-manager", "version": "1.2.5", "source": { @@ -2028,6 +2315,52 @@ "time": "2017-06-05T06:31:10+00:00" }, { + "name": "pimple/pimple", + "version": "v3.0.2", + "source": { + "type": "git", + "url": "https://github.com/silexphp/Pimple.git", + "reference": "a30f7d6e57565a2e1a316e1baf2a483f788b258a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/silexphp/Pimple/zipball/a30f7d6e57565a2e1a316e1baf2a483f788b258a", + "reference": "a30f7d6e57565a2e1a316e1baf2a483f788b258a", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0.x-dev" + } + }, + "autoload": { + "psr-0": { + "Pimple": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Pimple, a simple Dependency Injection Container", + "homepage": "http://pimple.sensiolabs.org", + "keywords": [ + "container", + "dependency injection" + ], + "time": "2015-09-11T15:10:35+00:00" + }, + { "name": "psr/cache", "version": "1.0.1", "source": { @@ -2074,6 +2407,55 @@ "time": "2016-08-06T20:24:11+00:00" }, { + "name": "psr/container", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", + "keywords": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], + "time": "2017-02-14T16:28:37+00:00" + }, + { "name": "psr/http-message", "version": "1.0.1", "source": { @@ -2223,6 +2605,57 @@ "time": "2017-01-11T14:05:47+00:00" }, { + "name": "skeeks/yii2-assets-auto-compress", + "version": "1.2.3", + "source": { + "type": "git", + "url": "https://github.com/skeeks-semenov/yii2-assets-auto-compress.git", + "reference": "18d80abd2bbce79e11fa1c0484ab72f08e772cb2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/skeeks-semenov/yii2-assets-auto-compress/zipball/18d80abd2bbce79e11fa1c0484ab72f08e772cb2", + "reference": "18d80abd2bbce79e11fa1c0484ab72f08e772cb2", + "shasum": "" + }, + "require": { + "mrclay/minify": "*", + "natxet/cssmin": "*", + "tedivm/jshrink": "*", + "yiisoft/yii2": "*" + }, + "type": "yii2-extension", + "autoload": { + "psr-4": { + "skeeks\\yii2\\assetsAuto\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Semenov Alexander", + "email": "semenov@skeeks.com" + } + ], + "description": "Automatically compile and merge files js + css", + "homepage": "http://www.skeeks.com/", + "keywords": [ + "JS", + "Sx", + "app", + "assets", + "auto assets", + "css", + "framework", + "skeeks", + "yii" + ], + "time": "2016-11-11T08:29:19+00:00" + }, + { "name": "speixoto/yii2-amcharts", "version": "v0.1.1", "source": { @@ -2319,6 +2752,52 @@ "time": "2017-05-01T15:54:03+00:00" }, { + "name": "tedivm/jshrink", + "version": "v1.2.0", + "source": { + "type": "git", + "url": "https://github.com/tedious/JShrink.git", + "reference": "667e99774d230525d4d3dc2a50da7ba6b1d56bad" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/tedious/JShrink/zipball/667e99774d230525d4d3dc2a50da7ba6b1d56bad", + "reference": "667e99774d230525d4d3dc2a50da7ba6b1d56bad", + "shasum": "" + }, + "require": { + "php": "^5.6|^7.0" + }, + "require-dev": { + "fabpot/php-cs-fixer": "0.4.0", + "phpunit/phpunit": "4.0.*", + "satooshi/php-coveralls": "^0.7.0" + }, + "type": "library", + "autoload": { + "psr-0": { + "JShrink": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Robert Hafner", + "email": "tedivm@tedivm.com" + } + ], + "description": "Javascript Minifier built in PHP", + "homepage": "http://github.com/tedious/JShrink", + "keywords": [ + "javascript", + "minifier" + ], + "time": "2017-05-30T02:59:46+00:00" + }, + { "name": "tinymce/tinymce", "version": "4.6.3", "source": { @@ -2365,6 +2844,54 @@ "time": "2017-05-30T12:56:46+00:00" }, { + "name": "tubalmartin/cssmin", + "version": "v2.4.8-p10", + "source": { + "type": "git", + "url": "https://github.com/tubalmartin/YUI-CSS-compressor-PHP-port.git", + "reference": "9c640e5d2d6fe1eac2167ff138b8b0ce39475d03" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/tubalmartin/YUI-CSS-compressor-PHP-port/zipball/9c640e5d2d6fe1eac2167ff138b8b0ce39475d03", + "reference": "9c640e5d2d6fe1eac2167ff138b8b0ce39475d03", + "shasum": "" + }, + "require": { + "php": ">=5.0.0" + }, + "require-dev": { + "cogpowered/finediff": "0.3.*" + }, + "type": "library", + "autoload": { + "classmap": [ + "cssmin.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Túbal Martín", + "homepage": "http://tubalmartin.me/" + } + ], + "description": "A PHP port of the YUI CSS compressor", + "homepage": "https://github.com/tubalmartin/YUI-CSS-compressor-PHP-port", + "keywords": [ + "compress", + "compressor", + "css", + "cssmin", + "minify", + "yui" + ], + "time": "2017-04-04T14:38:03+00:00" + }, + { "name": "yii2tech/filedb", "version": "1.0.3", "source": { diff --git a/frontend/config/eauth.php b/frontend/config/eauth.php old mode 100644 new mode 100755 index 4f78a8a..4f78a8a --- a/frontend/config/eauth.php +++ b/frontend/config/eauth.php diff --git a/frontend/config/main.php b/frontend/config/main.php index 1346ea8..6a7ea51 100755 --- a/frontend/config/main.php +++ b/frontend/config/main.php @@ -15,18 +15,21 @@ 'id' => 'app-frontend', 'homeUrl' => '/', 'basePath' => dirname(__DIR__), - 'bootstrap' => [ 'log' ], + 'bootstrap' => [ + 'log', + 'assetsAutoCompress', + ], 'controllerNamespace' => 'frontend\controllers', 'controllerMap' => [ 'basket' => 'artbox\order\controllers\BasketController', ], 'components' => [ - 'request' => [ + 'request' => [ 'class' => LanguageRequest::className(), 'csrfParam' => '_csrf-frontend', 'baseUrl' => '/', ], - 'user' => [ + 'user' => [ 'identityClass' => 'artbox\order\models\Customer', 'enableAutoLogin' => true, 'identityCookie' => [ @@ -34,11 +37,11 @@ 'httpOnly' => true, ], ], - 'session' => [ + 'session' => [ // this is the name of the session cookie used for login on the frontend 'name' => 'advanced-frontend', ], - 'log' => [ + 'log' => [ 'traceLevel' => YII_DEBUG ? 3 : 0, 'targets' => [ [ @@ -58,14 +61,15 @@ ], ], ], - 'errorHandler' => [ + 'errorHandler' => [ 'errorAction' => 'site/error', ], - 'urlManager' => [ + 'urlManager' => [ 'baseUrl' => '/', 'class' => SeoUrlManager::className(), 'enablePrettyUrl' => true, 'showScriptName' => false, + 'forceRedirect' => true, 'rules' => [ [ 'pattern' => 'filter/', @@ -90,13 +94,17 @@ 'login/' => 'site/login', ], ], - 'basket' => [ + 'basket' => [ 'class' => Basket::className(), ], - 'eauth' => require( 'eauth.php' ), - 'history' => [ + 'eauth' => require( 'eauth.php' ), + 'history' => [ 'class' => History::className(), ], + 'assetsAutoCompress' => [ + 'class' => '\skeeks\yii2\assetsAuto\AssetsAutoCompressComponent', + 'enabled' => false, + ], ], 'params' => $params, ]; diff --git a/frontend/views/layouts/_basket_modal.php b/frontend/views/layouts/_basket_modal.php old mode 100644 new mode 100755 index a5c9677..a5c9677 --- a/frontend/views/layouts/_basket_modal.php +++ b/frontend/views/layouts/_basket_modal.php diff --git a/frontend/web/js/ion.rangeSlider.min.js b/frontend/web/js/ion.rangeSlider.min.js old mode 100644 new mode 100755 index af5b4df..af5b4df --- a/frontend/web/js/ion.rangeSlider.min.js +++ b/frontend/web/js/ion.rangeSlider.min.js diff --git a/frontend/web/js/script.js b/frontend/web/js/script.js index 304a0a9..f4e59d2 100755 --- a/frontend/web/js/script.js +++ b/frontend/web/js/script.js @@ -2,7 +2,6 @@ $(function() { var basket = new ArtboxBasket({ 'cartSelector': '#cart' }); - /** * Modal form submit code */ diff --git a/frontend/widgets/OptionPicker.php b/frontend/widgets/OptionPicker.php old mode 100644 new mode 100755 index 9dbec8c..9dbec8c --- a/frontend/widgets/OptionPicker.php +++ b/frontend/widgets/OptionPicker.php diff --git a/frontend/widgets/VariantGroupHelper.php b/frontend/widgets/VariantGroupHelper.php old mode 100644 new mode 100755 index 578ce99..578ce99 --- a/frontend/widgets/VariantGroupHelper.php +++ b/frontend/widgets/VariantGroupHelper.php diff --git a/frontend/widgets/VariantHelper.php b/frontend/widgets/VariantHelper.php old mode 100644 new mode 100755 index d63c8f2..d63c8f2 --- a/frontend/widgets/VariantHelper.php +++ b/frontend/widgets/VariantHelper.php diff --git a/frontend/widgets/VariantOptionHelper.php b/frontend/widgets/VariantOptionHelper.php old mode 100644 new mode 100755 index fab4294..fab4294 --- a/frontend/widgets/VariantOptionHelper.php +++ b/frontend/widgets/VariantOptionHelper.php -- libgit2 0.21.4