From a43996f65a7e69362bf060ca07dba3efc326513c Mon Sep 17 00:00:00 2001 From: "shubhammehrotra.symfony@webkul.com" Date: Tue, 31 Dec 2019 11:25:28 +0530 Subject: [PATCH] search and misc. issues --- .../src/Http/Controllers/SearchController.php | 4 +- .../publishable/assets/css/velocity.css | 22 ++++++---- .../publishable/assets/js/velocity.js | 38 ++++++++++-------- .../Admin/ConfigurationController.php | 10 +++-- .../js/UI/components/content-header.vue | 2 +- .../Resources/assets/sass/components/app.scss | 12 ++++-- .../assets/sass/components/home.scss | 10 ++++- .../assets/sass/components/product-view.scss | 6 +++ .../views/admin/meta-info/meta-data.blade.php | 12 +++--- .../advertisement-one.blade.php | 2 +- .../Resources/views/search/search.blade.php | 40 ++++++++----------- 11 files changed, 93 insertions(+), 65 deletions(-) diff --git a/packages/Webkul/Shop/src/Http/Controllers/SearchController.php b/packages/Webkul/Shop/src/Http/Controllers/SearchController.php index 1ecf1ec1c..a238cbca2 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/SearchController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/SearchController.php @@ -41,8 +41,8 @@ use Webkul\Product\Repositories\SearchRepository; /** * Index to handle the view loaded with the search results - * - * @return \Illuminate\View\View + * + * @return \Illuminate\View\View */ public function index() { diff --git a/packages/Webkul/Velocity/publishable/assets/css/velocity.css b/packages/Webkul/Velocity/publishable/assets/css/velocity.css index c27652def..1bc3d0275 100644 --- a/packages/Webkul/Velocity/publishable/assets/css/velocity.css +++ b/packages/Webkul/Velocity/publishable/assets/css/velocity.css @@ -1496,13 +1496,18 @@ right: 15px !important; top: 50px !important; z-index: 100 !important; - font-size: 14px !important; + font-size: 16px !important; position: fixed !important; max-width: 400px !important; - min-height: 40px !important; + min-height: 45px !important; max-height: 100px !important; } +.alert.alert-dismissible .close { + font-size: 23px; + padding: .3rem 1.25rem; +} + #home-right-bar-container.col-12 .category-container { padding: 30px 0; } @@ -1721,7 +1726,6 @@ } .product-price .sticker { - display: none; top: 0; left: 0; border: none; @@ -1930,8 +1934,8 @@ header #search-form > *:focus { font-size: 14px; } -.container-fluid > .row:first-child { - margin-bottom: 20px; +.container > .container-fluid { + margin-bottom: 60px; } /* advertisement-one */ @@ -2617,7 +2621,7 @@ body::after { padding-left: 40px !important; } -.pr0 { +.pr0, .container > .container-fluid > .row { padding-right: 0px !important; } @@ -2710,7 +2714,7 @@ body::after { } .ml15, .advertisement-two-container .ad-2-rt { - margin-left: 15px; + margin-left: 15px !important; } .body-blur { @@ -3360,6 +3364,10 @@ button[disabled] { font-size: 16px; } +.product-detail .right .product-price .sticker { + display: none; +} + .product-detail .thumb-list { left: 15px; z-index: 1000; diff --git a/packages/Webkul/Velocity/publishable/assets/js/velocity.js b/packages/Webkul/Velocity/publishable/assets/js/velocity.js index 0645b79e1..d0e031771 100644 --- a/packages/Webkul/Velocity/publishable/assets/js/velocity.js +++ b/packages/Webkul/Velocity/publishable/assets/js/velocity.js @@ -36724,24 +36724,28 @@ var render = function() { "div", { class: "row " + (_vm.isEnabled == "0" ? "disabled" : "") }, [ - _c("div", { staticClass: "main-category fs20 pt10 col-2 pl30" }, [ - _c("i", { - class: - "rango-view-list " + - (_vm.isEnabled == "0" ? "" : "cursor-pointer") + - " align-vertical-top", - on: { - click: function($event) { - _vm.isEnabled == "0" ? "" : _vm.toggleSidebar() + _c( + "div", + { staticClass: "main-category fs20 pt10 col-2 pl30 unselectable" }, + [ + _c("i", { + class: + "rango-view-list " + + (_vm.isEnabled == "0" ? "" : "cursor-pointer") + + " align-vertical-top", + on: { + click: function($event) { + _vm.isEnabled == "0" ? "" : _vm.toggleSidebar() + } } - } - }), - _vm._v(" "), - _c("span", { - staticClass: "text-up", - domProps: { textContent: _vm._s(_vm.heading) } - }) - ]), + }), + _vm._v(" "), + _c("span", { + staticClass: "text-up", + domProps: { textContent: _vm._s(_vm.heading) } + }) + ] + ), _vm._v(" "), _c("div", { staticClass: "content-list row no-margin col-10" }, [ _c( diff --git a/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php b/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php index 7055b3af5..0e39e1492 100644 --- a/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php +++ b/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php @@ -48,14 +48,18 @@ class ConfigurationController extends Controller public function storeMetaData($id) { - if (! request()->get('slider')) { + if (request()->get('slides') == "on") { + $params = request()->all() + [ + 'slider' => 1 + ]; + } else { $params = request()->all() + [ 'slider' => 0 ]; - } else { - $params = request()->all(); } + unset($params['slides']); + $product = $this->velocityMetaDataRepository->update($params, $id); session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Velocity Theme'])); diff --git a/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/content-header.vue b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/content-header.vue index 39f1fca47..cfee988c1 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/content-header.vue +++ b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/content-header.vue @@ -1,7 +1,7 @@