From fe6d4ac1fba64d8d5bd822ff0f9e8da31f91e7ec Mon Sep 17 00:00:00 2001 From: yarik Date: Mon, 24 Apr 2017 18:50:38 +0300 Subject: [PATCH] Layout --- common/models/LoginForm.php | 7 +++++++ common/models/Newsletter.php | 38 ++++++++++++++++++++++++++++++++++++++ common/models/SearchForm.php | 38 ++++++++++++++++++++++++++++++++++++++ frontend/assets/AppAsset.php | 17 +++++++++++++++-- frontend/controllers/SiteController.php | 40 ++++++++++++++++++++++++++++++++++++++-- frontend/views/layouts/main.php | 712 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- frontend/views/site/_slider_product.php | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ frontend/views/site/index.php | 544 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- frontend/web/css/custom.css | 132 +----------------------------------------------------------------------------------------------------------------------------------- frontend/web/css/style.css | 4494 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ frontend/web/img/Dell AIO 3263-400x400.jpg | Bin 0 -> 36424 bytes frontend/web/img/cart-icon.png | Bin 0 -> 537 bytes frontend/web/img/img1.jpg | Bin 0 -> 82995 bytes frontend/web/img/img2.jpg | Bin 0 -> 61775 bytes frontend/web/img/img3.jpg | Bin 0 -> 49575 bytes frontend/web/img/logo-default.png | Bin 0 -> 49837 bytes frontend/web/img/logo.gif | Bin 0 -> 1779 bytes frontend/web/img/logo.png | Bin 2688 -> 0 bytes 18 files changed, 5448 insertions(+), 670 deletions(-) create mode 100644 common/models/Newsletter.php create mode 100644 common/models/SearchForm.php create mode 100644 frontend/views/site/_slider_product.php create mode 100644 frontend/web/css/style.css create mode 100644 frontend/web/img/Dell AIO 3263-400x400.jpg create mode 100644 frontend/web/img/cart-icon.png create mode 100644 frontend/web/img/img1.jpg create mode 100644 frontend/web/img/img2.jpg create mode 100644 frontend/web/img/img3.jpg create mode 100644 frontend/web/img/logo-default.png create mode 100644 frontend/web/img/logo.gif diff --git a/common/models/LoginForm.php b/common/models/LoginForm.php index da6de13..fcfd02b 100755 --- a/common/models/LoginForm.php +++ b/common/models/LoginForm.php @@ -13,6 +13,7 @@ public $username; public $password; public $rememberMe = true; + public $returnUrl; private $_user; @@ -30,6 +31,12 @@ ], 'required', ], + [ + [ + 'returnUrl', + ], + 'string', + ], // rememberMe must be a boolean value [ 'rememberMe', diff --git a/common/models/Newsletter.php b/common/models/Newsletter.php new file mode 100644 index 0000000..60a6b6c --- /dev/null +++ b/common/models/Newsletter.php @@ -0,0 +1,38 @@ + \Yii::t('app', 'Email'), + ]; + } + } \ No newline at end of file diff --git a/common/models/SearchForm.php b/common/models/SearchForm.php new file mode 100644 index 0000000..4a38f33 --- /dev/null +++ b/common/models/SearchForm.php @@ -0,0 +1,38 @@ + \Yii::t('app', 'Поиск по сайту'), + ]; + } + } \ No newline at end of file diff --git a/frontend/assets/AppAsset.php b/frontend/assets/AppAsset.php index 43e0171..25c2018 100755 --- a/frontend/assets/AppAsset.php +++ b/frontend/assets/AppAsset.php @@ -12,23 +12,36 @@ public $basePath = '@webroot'; public $baseUrl = '@web'; public $css = [ - 'css/site.css', + // 'css/site.css', // - 'css/animate.css', + // + 'css/style.css', - 'css/style.default.css', + // + + // 'css/style.default.css', // - 'css/owl.carousel.css', + // + 'css/owl.theme.css', + // + '//fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,500,700,800', + // + 'css/custom.css', + // + ]; public $js = [ 'js/jquery.cookie.js', + // + 'js/waypoints.min.js', + // + 'js/jquery.counterup.min.js', + // + 'js/jquery.parallax-1.1.3.js', + // + 'js/front.js', + // + 'js/owl.carousel.min.js', + // + 'js/script.js', + // - ]; public $depends = [ 'yii\web\YiiAsset', diff --git a/frontend/controllers/SiteController.php b/frontend/controllers/SiteController.php index 8575678..4d82dc5 100755 --- a/frontend/controllers/SiteController.php +++ b/frontend/controllers/SiteController.php @@ -1,6 +1,9 @@ render('index'); + $categories = Category::find() + ->with('categories.lang', 'lang') + ->where([ 'level' => 0 ]) + ->all(); + $topItems = Product::find() + ->with('lang', 'images', 'variants') + ->where('mask & 1 != 0') + ->limit(20) + ->all(); + $newItems = Product::find() + ->with('lang', 'images', 'variants') + ->where('mask & 2 != 0') + ->limit(20) + ->all(); + $saleItems = Product::find() + ->with('lang', 'images', 'variants') + ->where('mask & 4 != 0') + ->limit(20) + ->all(); + $productCount = Product::find() + ->count(); + $brandCount = Brand::find() + ->count(); + return $this->render( + 'index', + [ + 'categories' => $categories, + 'topItems' => $topItems, + 'newItems' => $newItems, + 'saleItems' => $saleItems, + 'productCount' => $productCount, + 'brandCount' => $brandCount, + ] + ); } /** diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php index 07ca6ab..551ae2c 100755 --- a/frontend/views/layouts/main.php +++ b/frontend/views/layouts/main.php @@ -6,18 +6,18 @@ * @var User $user */ use artbox\core\components\SeoComponent; - use artbox\core\helpers\ImageHelper; use artbox\core\models\Feedback; use artbox\core\models\Page; use artbox\core\models\User; + use common\models\LoginForm; + use common\models\Newsletter; + use common\models\SearchForm; use common\models\Settings; use frontend\assets\AppAsset; use noam148\imagemanager\models\ImageManager; + use yii\base\Model; use yii\bootstrap\ActiveForm; - use yii\bootstrap\Nav; use yii\bootstrap\Html; - use yii\helpers\Json; - use yii\helpers\Url; use yii\web\View; use yii\widgets\Breadcrumbs; @@ -28,6 +28,23 @@ $settings = Settings::getInstance(); $controller = Yii::$app->controller; $default_controller = Yii::$app->defaultRoute; + /** + * @var LoginForm $loginForm + */ + $loginForm = \Yii::createObject( + [ + 'class' => LoginForm::className(), + 'returnUrl' => \Yii::$app->request->absoluteUrl, + ] + ); + /** + * @var Newsletter $newsletter + */ + $newsletter = \Yii::createObject( + [ + 'class' => Newsletter::className(), + ] + ); $isHome = ( ( $controller->id === $default_controller ) && ( $controller->action->id === $controller->defaultAction ) ) ? true : false; /** * @var Page[] $pages @@ -35,6 +52,12 @@ $pages = Page::find() ->where([ 'in_menu' => true ]) ->with('lang.alias') + ->orderBy( + [ + 'sort' => SORT_ASC, + 'id' => SORT_ASC, + ] + ) ->all(); $logo = null; if ($settings->logo) { @@ -84,332 +107,274 @@
+ -
+ _________________________________________________________ --> +
- - - -