From dde2a626e6bb1a38de50532c94b519e9cc5c5fe8 Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Thu, 18 Oct 2018 10:33:00 +0530 Subject: [PATCH 1/6] laoder changes --- packages/Webkul/Admin/src/Http/routes.php | 10 ++- .../Admin/src/Resources/lang/en/app.php | 1 + .../views/catalog/categories/create.blade.php | 6 ++ .../views/catalog/categories/edit.blade.php | 9 ++- .../Webkul/Category/src/Models/Category.php | 2 +- .../src/Repositories/CategoryRepository.php | 60 ++++++++++++++- .../Http/Controllers/ChannelController.php | 2 +- .../Controllers/ExchangeRateController.php | 10 ++- .../src/Repositories/ChannelRepository.php | 5 +- .../src/Http/Controllers/SliderController.php | 19 +++++ .../Shop/src/Resources/assets/sass/app.scss | 77 +++++++++++++++++++ .../account/partials/sidemenu.blade.php | 2 +- .../Controllers/TaxCategoryController.php | 21 +++-- .../src/Http/Controllers/TaxController.php | 3 - .../Http/Controllers/TaxRateController.php | 19 +++++ .../Ui/src/Resources/assets/sass/app.scss | 7 +- public/themes/default/assets/css/shop.css | 70 +++++++++++++++++ public/themes/default/assets/js/shop.js | 2 +- .../themes/default/assets/mix-manifest.json | 2 +- 19 files changed, 298 insertions(+), 29 deletions(-) diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php index bab0cc24f..48b4ee63f 100644 --- a/packages/Webkul/Admin/src/Http/routes.php +++ b/packages/Webkul/Admin/src/Http/routes.php @@ -64,8 +64,7 @@ Route::group(['middleware' => ['web']], function () { 'redirect' => 'admin.customer.index' ])->name('admin.customer.update'); - Route::get('customers/delete/{id}', 'Webkul\Admin\Http\Controllers\CustomerController@destroy')->name('admin.customer.delete'); - + Route::get('customer/delete/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@destroy')->name('admin.customer.delete'); Route::get('reviews', 'Webkul\Product\Http\Controllers\ReviewController@index')->defaults('_config',[ 'view' => 'admin::customers.review.index' @@ -262,6 +261,8 @@ Route::group(['middleware' => ['web']], function () { 'redirect' => 'admin.users.index' ])->name('admin.users.update'); + Route::get('/users/delete/{id}', 'Webkul\User\Http\Controllers\UserController@destroy')->name('admin.users.delete'); + // User Role Routes Route::get('/roles', 'Webkul\User\Http\Controllers\RoleController@index')->defaults('_config', [ @@ -410,6 +411,7 @@ Route::group(['middleware' => ['web']], function () { 'redirect' => 'admin::sliders.index' ])->name('admin.sliders.store'); + Route::get('/slider/delete/{id}', 'Webkul\Shop\Http\Controllers\SliderController@destroy')->name('admin.sliders.delete'); //tax routes Route::get('/tax-categories', 'Webkul\Tax\Http\Controllers\TaxController@index')->defaults('_config', [ @@ -433,6 +435,8 @@ Route::group(['middleware' => ['web']], function () { 'redirect' => 'admin.tax-categories.index' ])->name('admin.tax-categories.update'); + Route::get('/tax-categories/delete/{id}', 'Webkul\Tax\Http\Controllers\TaxCategoryController@destroy')->name('admin.tax-categories.delete'); + //tax category ends @@ -456,6 +460,8 @@ Route::group(['middleware' => ['web']], function () { Route::put('tax-rates/update/{id}', 'Webkul\Tax\Http\Controllers\TaxRateController@update')->defaults('_config', [ 'redirect' => 'admin.tax-rates.index' ])->name('admin.tax-rates.update'); + + Route::get('/tax-rates/delete/{id}', 'Webkul\Tax\Http\Controllers\TaxRateController@destroy')->name('admin.tax-rates.delete'); //tax rate ends }); }); diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index 1a191775a..9730a95db 100644 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -265,6 +265,7 @@ return [ 'meta_title' => 'Meta Title', 'meta_description' => 'Meta Description', 'meta_keywords' => 'Meta Keywords', + 'image' => 'Image', ] ], diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php index 4c26d509b..a1c02aeb4 100644 --- a/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php @@ -66,6 +66,12 @@ @{{ errors.first('description') }} +
+
+ diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php index 0cc75d9e8..de9ce4b72 100644 --- a/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/categories/edit.blade.php @@ -8,7 +8,7 @@
get('locale') ?: app()->getLocale(); ?> -
+
@@ -79,6 +79,13 @@ @{{ errors.first('{!!$locale!!}[description]') }}
+
+
+
diff --git a/packages/Webkul/Category/src/Models/Category.php b/packages/Webkul/Category/src/Models/Category.php index 5fd7ef670..9fbda2311 100644 --- a/packages/Webkul/Category/src/Models/Category.php +++ b/packages/Webkul/Category/src/Models/Category.php @@ -11,5 +11,5 @@ class Category extends TranslatableModel public $translatedAttributes = ['name', 'description', 'slug', 'meta_title', 'meta_description', 'meta_keywords']; - protected $fillable = ['position', 'status', 'parent_id','image']; + protected $fillable = ['position', 'status', 'parent_id']; } \ No newline at end of file diff --git a/packages/Webkul/Category/src/Repositories/CategoryRepository.php b/packages/Webkul/Category/src/Repositories/CategoryRepository.php index da80cbcb4..d4574759b 100644 --- a/packages/Webkul/Category/src/Repositories/CategoryRepository.php +++ b/packages/Webkul/Category/src/Repositories/CategoryRepository.php @@ -1,7 +1,7 @@ -make($this->model()); - + foreach(core()->getAllLocales() as $locale) { foreach ($model->translatedAttributes as $attribute) { if(isset($data[$attribute])) { @@ -54,7 +54,11 @@ class CategoryRepository extends Repository } } - return $this->model->create($data); + $category = $this->model->create($data); + + $this->uploadImages($data, $category); + + return $category; } /** @@ -99,4 +103,52 @@ class CategoryRepository extends Repository get_class($this->model), $slug ); } + + /** + * @param array $data + * @param $id + * @param string $attribute + * @return mixed + */ + public function update(array $data, $id, $attribute = "id") + { + $category = $this->find($id); + + $category->update($data); + + $this->uploadImages($data, $category); + + return $category; + } + + /** + * @param array $data + * @param mixed $category + * @return void + */ + public function uploadImages($data, $category,$type = "image") + { + if(isset($data[$type])) { + foreach ($data[$type] as $imageId => $image) { + $file = $type . '.' . $imageId; + $dir = 'category/' . $category->id; + + if(request()->hasFile($file)) { + if($category->{$type}) { + Storage::delete($category->{$type}); + } + + $category->{$type} = request()->file($file)->store($dir); + $category->save(); + } + } + } else { + if($category->{$type}) { + Storage::delete($category->{$type}); + } + + $category->{$type} = null; + $category->save(); + } + } } \ No newline at end of file diff --git a/packages/Webkul/Core/src/Http/Controllers/ChannelController.php b/packages/Webkul/Core/src/Http/Controllers/ChannelController.php index cdbb7d48b..6b4646a2b 100644 --- a/packages/Webkul/Core/src/Http/Controllers/ChannelController.php +++ b/packages/Webkul/Core/src/Http/Controllers/ChannelController.php @@ -79,7 +79,7 @@ class ChannelController extends Controller 'currencies' => 'required|array|min:1', 'base_currency_id' => 'required' ]); - + $this->channel->create(request()->all()); session()->flash('success', 'Channel created successfully.'); diff --git a/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php b/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php index 11e8ab49b..b9e7a3e57 100644 --- a/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php +++ b/packages/Webkul/Core/src/Http/Controllers/ExchangeRateController.php @@ -140,6 +140,14 @@ class ExchangeRateController extends Controller */ public function destroy($id) { - $this->exchangeRate->delete($id); + if($this->exchangeRate->count() == 1) { + session()->flash('error', 'At least one Exchange rate is required.'); + } else { + $this->exchangeRate->delete($id); + + session()->flash('success', 'Exchange rate deleted successfully.'); + } + + return redirect()->back(); } } \ No newline at end of file diff --git a/packages/Webkul/Core/src/Repositories/ChannelRepository.php b/packages/Webkul/Core/src/Repositories/ChannelRepository.php index 92ea24717..a3d1f364b 100644 --- a/packages/Webkul/Core/src/Repositories/ChannelRepository.php +++ b/packages/Webkul/Core/src/Repositories/ChannelRepository.php @@ -1,7 +1,7 @@ - $image) { $file = $type . '.' . $imageId; diff --git a/packages/Webkul/Shop/src/Http/Controllers/SliderController.php b/packages/Webkul/Shop/src/Http/Controllers/SliderController.php index c987bbc13..5855ecfb6 100644 --- a/packages/Webkul/Shop/src/Http/Controllers/SliderController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/SliderController.php @@ -57,4 +57,23 @@ class SliderController extends controller session()->flash('success', 'Slider created successfully.'); return redirect()->back(); } + + /** + * Remove the specified resource from storage. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function destroy($id) + { + if($this->slider->count() == 1) { + session()->flash('error', 'At least one slider is required.'); + } else { + $this->slider->delete($id); + + session()->flash('success', 'Slider deleted successfully.'); + } + + return redirect()->back(); + } } \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index ce8d641ee..ea56ef229 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -2052,3 +2052,80 @@ section.review { } } } + +@media only screen and (max-width: 770px) { + .account-content { + flex-direction: column; + + .account-side-menu { + display: none; + width:100%; + border: none; + + li { + margin-left: 0%; + width: 100%; + + a { + color : $font-color; + } + } + } + + .responsive-side-menu { + cursor: pointer; + padding-top:13px; + display: block; + height: 46px; + border-bottom: 1px solid $border-color; + border-top: 1px solid $border-color; + + .right { + float: right; + } + } + + .account-layout { + margin-left: 0%; + margin-top: 20px; + + .account-head { + display: flex; + justify-content: space-between; + border-bottom: 1px solid $border-color; + border-top: 1px solid $border-color; + height: 46px; + + .back-icon { + display: block; + } + + span { + margin-top: 12px; + font-size: 18px; + } + + .horizontal-rule { + display: none; + } + } + + .account-table-content { + margin-top: 2%; + + table tbody tr { + display: grid; + margin-bottom: 20px; + } + } + } + + .account-items-list , .edit-form { + margin-top: 20px; + } + + .control-group .control { + width: 100%; + } + } +} diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/partials/sidemenu.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/partials/sidemenu.blade.php index 4e550a2b5..e5653b189 100644 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/partials/sidemenu.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/partials/sidemenu.blade.php @@ -1,4 +1,4 @@ -
+ diff --git a/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php b/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php index e000e6733..16d8a76f2 100644 --- a/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php +++ b/packages/Webkul/Tax/src/Http/Controllers/TaxCategoryController.php @@ -54,7 +54,7 @@ class TaxCategoryController extends Controller * @return void */ public function __construct( - TaxCategory $taxCategory, + TaxCategory $taxCategory, TaxRate $taxRate, TaxMap $taxMap ) @@ -165,16 +165,21 @@ class TaxCategoryController extends Controller } /** - * Destroy a tax category + * Remove the specified resource from storage. * - * @return mixed + * @param int $id + * @return \Illuminate\Http\Response */ + public function destroy($id) + { + if($this->taxCategory->count() == 1) { + session()->flash('error', 'At least one tax category is required.'); + } else { + $this->taxCategorye->delete($id); - public function destroy($id) { - if($this->taxCategory()->delete($id)) { - session()->flash('success', 'The tax category is successfully deleted'); - - return redirect()->back(); + session()->flash('success', 'Tax category deleted successfully.'); } + + return redirect()->back(); } } \ No newline at end of file diff --git a/packages/Webkul/Tax/src/Http/Controllers/TaxController.php b/packages/Webkul/Tax/src/Http/Controllers/TaxController.php index 95c4c0acb..1372806b9 100644 --- a/packages/Webkul/Tax/src/Http/Controllers/TaxController.php +++ b/packages/Webkul/Tax/src/Http/Controllers/TaxController.php @@ -86,7 +86,4 @@ class TaxController extends Controller { return view($this->_config['view']); } - - - } \ No newline at end of file diff --git a/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php b/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php index 67efe7f7c..7e920dca3 100644 --- a/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php +++ b/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php @@ -152,6 +152,25 @@ class TaxRateController extends Controller return redirect()->back(); } + return redirect()->back(); + } + + /** + * Remove the specified resource from storage. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function destroy($id) + { + if($this->taxRate->count() == 1) { + session()->flash('error', 'At least one tax rate is required.'); + } else { + $this->taxRate->delete($id); + + session()->flash('success', 'Tax rate deleted successfully.'); + } + return redirect()->back(); } } \ No newline at end of file diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss index 03e56a6be..e4d478e09 100644 --- a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss @@ -825,9 +825,10 @@ h2 { height: 48px; display: inline-block; box-sizing: border-box; - position: absolute; - margin-left: 18.5%; - margin-top: 15%; + position: relative; + margin-left: 46%; + margin-top: 35%; + margin-bottom: 35%; } .cp-round:before { diff --git a/public/themes/default/assets/css/shop.css b/public/themes/default/assets/css/shop.css index c1555bd80..e280fc2e3 100644 --- a/public/themes/default/assets/css/shop.css +++ b/public/themes/default/assets/css/shop.css @@ -2733,3 +2733,73 @@ section.review .review-layouter .review-form .review-detail .rating-calculate .p .sale-container .totals .sale-summary tr.border td { border-bottom: 1px solid #C7C7C7; } + +@media only screen and (max-width: 770px) { + .account-content { + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; + } + .account-content .account-side-menu { + display: none; + width: 100%; + border: none; + } + .account-content .account-side-menu li { + margin-left: 0%; + width: 100%; + } + .account-content .account-side-menu li a { + color: #242424; + } + .account-content .responsive-side-menu { + cursor: pointer; + padding-top: 13px; + display: block; + height: 46px; + border-bottom: 1px solid #C7C7C7; + border-top: 1px solid #C7C7C7; + } + .account-content .responsive-side-menu .right { + float: right; + } + .account-content .account-layout { + margin-left: 0%; + margin-top: 20px; + } + .account-content .account-layout .account-head { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: space-between; + border-bottom: 1px solid #C7C7C7; + border-top: 1px solid #C7C7C7; + height: 46px; + } + .account-content .account-layout .account-head .back-icon { + display: block; + } + .account-content .account-layout .account-head span { + margin-top: 12px; + font-size: 18px; + } + .account-content .account-layout .account-head .horizontal-rule { + display: none; + } + .account-content .account-layout .account-table-content { + margin-top: 2%; + } + .account-content .account-layout .account-table-content table tbody tr { + display: grid; + margin-bottom: 20px; + } + .account-content .account-items-list, .account-content .edit-form { + margin-top: 20px; + } + .account-content .control-group .control { + width: 100%; + } +} diff --git a/public/themes/default/assets/js/shop.js b/public/themes/default/assets/js/shop.js index f4d4f1ec9..5f6e762b8 100644 --- a/public/themes/default/assets/js/shop.js +++ b/public/themes/default/assets/js/shop.js @@ -31526,7 +31526,7 @@ if (false) { /* 50 */ /***/ (function(module, exports, __webpack_require__) { -!function(t,e){ true?module.exports=e():"function"==typeof define&&define.amd?define("vue-slider-component",[],e):"object"==typeof exports?exports["vue-slider-component"]=e():t["vue-slider-component"]=e()}(this,function(){return function(t){function e(s){if(i[s])return i[s].exports;var r=i[s]={i:s,l:!1,exports:{}};return t[s].call(r.exports,r,r.exports,e),r.l=!0,r.exports}var i={};return e.m=t,e.c=i,e.i=function(t){return t},e.d=function(t,i,s){e.o(t,i)||Object.defineProperty(t,i,{configurable:!1,enumerable:!0,get:s})},e.n=function(t){var i=t&&t.__esModule?function(){return t.default}:function(){return t};return e.d(i,"a",i),i},e.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},e.p="",e(e.s=2)}([function(t,e,i){i(7);var s=i(5)(i(1),i(6),null,null);t.exports=s.exports},function(t,e,i){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var s=function(){var t="undefined"!=typeof window?window.devicePixelRatio||1:1;return function(e){return Math.round(e*t)/t}}();e.default={name:"VueSliderComponent",props:{width:{type:[Number,String],default:"auto"},height:{type:[Number,String],default:6},data:{type:Array,default:null},dotSize:{type:Number,default:16},dotWidth:{type:Number,required:!1},dotHeight:{type:Number,required:!1},min:{type:Number,default:0},max:{type:Number,default:100},interval:{type:Number,default:1},show:{type:Boolean,default:!0},disabled:{type:[Boolean,Array],default:!1},piecewise:{type:Boolean,default:!1},tooltip:{type:[String,Boolean],default:"always"},eventType:{type:String,default:"auto"},direction:{type:String,default:"horizontal"},reverse:{type:Boolean,default:!1},lazy:{type:Boolean,default:!1},clickable:{type:Boolean,default:!0},speed:{type:Number,default:.5},realTime:{type:Boolean,default:!1},stopPropagation:{type:Boolean,default:!1},value:{type:[String,Number,Array,Object],default:0},piecewiseLabel:{type:Boolean,default:!1},debug:{type:Boolean,default:!0},fixed:{type:Boolean,default:!1},processDragable:{type:Boolean,default:!1},useKeyboard:{type:Boolean,default:!1},actionsKeyboard:{type:Array,default:function(){return[function(t){return t-1},function(t){return t+1}]}},tooltipMerge:{type:Boolean,default:!0},sliderStyle:[Array,Object,Function],focusStyle:[Array,Object,Function],tooltipDir:[Array,String],formatter:[String,Function],mergeFormatter:[String,Function],piecewiseStyle:Object,disabledStyle:Object,piecewiseActiveStyle:Object,processStyle:Object,bgStyle:Object,tooltipStyle:[Array,Object,Function],disabledDotStyle:[Array,Object,Function],labelStyle:Object,labelActiveStyle:Object},data:function(){return{flag:!1,keydownFlag:null,focusFlag:!1,processFlag:!1,processSign:null,size:0,fixedValue:0,focusSlider:0,currentValue:0,currentSlider:0,isComponentExists:!0,isMounted:!1}},computed:{dotWidthVal:function(){return"number"==typeof this.dotWidth?this.dotWidth:this.dotSize},dotHeightVal:function(){return"number"==typeof this.dotHeight?this.dotHeight:this.dotSize},flowDirection:function(){return"vue-slider-"+this.direction+(this.reverse?"-reverse":"")},tooltipMergedPosition:function(){if(!this.isMounted)return{};var t=this.tooltipDirection[0];if(this.$refs.dot0){if("vertical"===this.direction){var e={};return e[t]="-"+(this.dotHeightVal/2-this.width/2+9)+"px",e}var i={};return i[t]="-"+(this.dotWidthVal/2-this.height/2+9)+"px",i.left="50%",i}},tooltipDirection:function(){var t=this.tooltipDir||("vertical"===this.direction?"left":"top");return Array.isArray(t)?this.isRange?t:t[1]:this.isRange?[t,t]:t},tooltipStatus:function(){return"hover"===this.tooltip&&this.flag?"vue-slider-always":this.tooltip?"vue-slider-"+this.tooltip:""},tooltipClass:function(){return["vue-slider-tooltip-"+this.tooltipDirection,"vue-slider-tooltip"]},disabledArray:function(){return Array.isArray(this.disabled)?this.disabled:[this.disabled,this.disabled]},boolDisabled:function(){return this.disabledArray.every(function(t){return!0===t})},isDisabled:function(){return"none"===this.eventType||this.boolDisabled},disabledClass:function(){return this.boolDisabled?"vue-slider-disabled":""},stateClass:function(){return{"vue-slider-state-process-drag":this.processFlag,"vue-slider-state-drag":this.flag&&!this.processFlag&&!this.keydownFlag,"vue-slider-state-focus":this.focusFlag}},isRange:function(){return Array.isArray(this.value)},slider:function(){return this.isRange?[this.$refs.dot0,this.$refs.dot1]:this.$refs.dot},minimum:function(){return this.data?0:this.min},val:{get:function(){return this.data?this.isRange?[this.data[this.currentValue[0]],this.data[this.currentValue[1]]]:this.data[this.currentValue]:this.currentValue},set:function(t){if(this.data)if(this.isRange){var e=this.data.indexOf(t[0]),i=this.data.indexOf(t[1]);e>-1&&i>-1&&(this.currentValue=[e,i])}else{var s=this.data.indexOf(t);s>-1&&(this.currentValue=s)}else this.currentValue=t}},currentIndex:function(){return this.isRange?this.data?this.currentValue:[this.getIndexByValue(this.currentValue[0]),this.getIndexByValue(this.currentValue[1])]:this.getIndexByValue(this.currentValue)},indexRange:function(){return this.isRange?this.currentIndex:[0,this.currentIndex]},maximum:function(){return this.data?this.data.length-1:this.max},multiple:function(){var t=(""+this.interval).split(".")[1];return t?Math.pow(10,t.length):1},spacing:function(){return this.data?1:this.interval},total:function(){return this.data?this.data.length-1:(Math.floor((this.maximum-this.minimum)*this.multiple)%(this.interval*this.multiple)!=0&&this.printError("Prop[interval] is illegal, Please make sure that the interval can be divisible"),(this.maximum-this.minimum)/this.interval)},gap:function(){return this.size/this.total},position:function(){return this.isRange?[(this.currentValue[0]-this.minimum)/this.spacing*this.gap,(this.currentValue[1]-this.minimum)/this.spacing*this.gap]:(this.currentValue-this.minimum)/this.spacing*this.gap},limit:function(){return this.isRange?this.fixed?[[0,(this.total-this.fixedValue)*this.gap],[this.fixedValue*this.gap,this.size]]:[[0,this.position[1]],[this.position[0],this.size]]:[0,this.size]},valueLimit:function(){return this.isRange?this.fixed?[[this.minimum,this.maximum-this.fixedValue*(this.spacing*this.multiple)/this.multiple],[this.minimum+this.fixedValue*(this.spacing*this.multiple)/this.multiple,this.maximum]]:[[this.minimum,this.currentValue[1]],[this.currentValue[0],this.maximum]]:[this.minimum,this.maximum]},idleSlider:function(){return 0===this.currentSlider?1:0},wrapStyles:function(){return"vertical"===this.direction?{height:"number"==typeof this.height?this.height+"px":this.height,padding:this.dotHeightVal/2+"px "+this.dotWidthVal/2+"px"}:{width:"number"==typeof this.width?this.width+"px":this.width,padding:this.dotHeightVal/2+"px "+this.dotWidthVal/2+"px"}},sliderStyles:function(){return Array.isArray(this.sliderStyle)?this.isRange?this.sliderStyle:this.sliderStyle[1]:"function"==typeof this.sliderStyle?this.sliderStyle(this.val,this.currentIndex):this.isRange?[this.sliderStyle,this.sliderStyle]:this.sliderStyle},focusStyles:function(){return Array.isArray(this.focusStyle)?this.isRange?this.focusStyle:this.focusStyle[1]:"function"==typeof this.focusStyle?this.focusStyle(this.val,this.currentIndex):this.isRange?[this.focusStyle,this.focusStyle]:this.focusStyle},disabledDotStyles:function(){var t=this.disabledDotStyle;if(Array.isArray(t))return t;if("function"==typeof t){var e=t(this.val,this.currentIndex);return Array.isArray(e)?e:[e,e]}return t?[t,t]:[{backgroundColor:"#ccc"},{backgroundColor:"#ccc"}]},tooltipStyles:function(){return Array.isArray(this.tooltipStyle)?this.isRange?this.tooltipStyle:this.tooltipStyle[1]:"function"==typeof this.tooltipStyle?this.tooltipStyle(this.val,this.currentIndex):this.isRange?[this.tooltipStyle,this.tooltipStyle]:this.tooltipStyle},elemStyles:function(){return"vertical"===this.direction?{width:this.width+"px",height:"100%"}:{height:this.height+"px"}},dotStyles:function(){return"vertical"===this.direction?{width:this.dotWidthVal+"px",height:this.dotHeightVal+"px",left:-(this.dotWidthVal-this.width)/2+"px"}:{width:this.dotWidthVal+"px",height:this.dotHeightVal+"px",top:-(this.dotHeightVal-this.height)/2+"px"}},piecewiseDotStyle:function(){return"vertical"===this.direction?{width:this.width+"px",height:this.width+"px"}:{width:this.height+"px",height:this.height+"px"}},piecewiseDotWrap:function(){if(!this.piecewise&&!this.piecewiseLabel)return!1;for(var t=[],e=0;e<=this.total;e++){var i="vertical"===this.direction?{bottom:this.gap*e-this.width/2+"px",left:0}:{left:this.gap*e-this.height/2+"px",top:0},s=this.reverse?this.total-e:e,r=this.data?this.data[s]:this.spacing*s+this.min;t.push({style:i,label:this.formatter?this.formatting(r):r,inRange:s>=this.indexRange[0]&&s<=this.indexRange[1]})}return t}},watch:{value:function(t){this.flag||this.setValue(t,!0)},max:function(t){if(tthis.max)return this.printError("The minimum value can not be greater than the maximum value.");var e=this.limitValue(this.val);this.setValue(e),this.refresh()},show:function(t){var e=this;t&&!this.size&&this.$nextTick(function(){e.refresh()})},fixed:function(){this.computedFixedValue()}},methods:{bindEvents:function(){document.addEventListener("touchmove",this.moving,{passive:!1}),document.addEventListener("touchend",this.moveEnd,{passive:!1}),document.addEventListener("mousedown",this.blurSlider),document.addEventListener("mousemove",this.moving),document.addEventListener("mouseup",this.moveEnd),document.addEventListener("mouseleave",this.moveEnd),document.addEventListener("keydown",this.handleKeydown),document.addEventListener("keyup",this.handleKeyup),window.addEventListener("resize",this.refresh),this.isRange&&this.tooltipMerge&&(this.$refs.dot0.addEventListener("transitionend",this.handleOverlapTooltip),this.$refs.dot1.addEventListener("transitionend",this.handleOverlapTooltip))},unbindEvents:function(){document.removeEventListener("touchmove",this.moving),document.removeEventListener("touchend",this.moveEnd),document.removeEventListener("mousedown",this.blurSlider),document.removeEventListener("mousemove",this.moving),document.removeEventListener("mouseup",this.moveEnd),document.removeEventListener("mouseleave",this.moveEnd),document.removeEventListener("keydown",this.handleKeydown),document.removeEventListener("keyup",this.handleKeyup),window.removeEventListener("resize",this.refresh),this.isRange&&this.tooltipMerge&&(this.$refs.dot0.removeEventListener("transitionend",this.handleOverlapTooltip),this.$refs.dot1.removeEventListener("transitionend",this.handleOverlapTooltip))},handleKeydown:function(t){if(!this.useKeyboard||!this.focusFlag)return!1;switch(t.keyCode){case 37:case 40:t.preventDefault(),this.keydownFlag=!0,this.flag=!0,this.changeFocusSlider(this.actionsKeyboard[0]);break;case 38:case 39:t.preventDefault(),this.keydownFlag=!0,this.flag=!0,this.changeFocusSlider(this.actionsKeyboard[1])}},handleKeyup:function(){this.keydownFlag&&(this.keydownFlag=!1,this.flag=!1)},changeFocusSlider:function(t){var e=this;if(this.isRange){var i=this.currentIndex.map(function(i,s){if(s===e.focusSlider||e.fixed){var r=t(i),o=e.fixed?e.valueLimit[s]:[0,e.total];if(r<=o[1]&&r>=o[0])return r}return i});i[0]>i[1]&&(this.focusSlider=0===this.focusSlider?1:0,i=i.reverse()),this.setIndex(i)}else this.setIndex(t(this.currentIndex))},blurSlider:function(t){var e=this.isRange?this.$refs["dot"+this.focusSlider]:this.$refs.dot;if(!e||e===t.target)return!1;this.focusFlag=!1},formatting:function(t){return"string"==typeof this.formatter?this.formatter.replace(/\{value\}/,t):this.formatter(t)},mergeFormatting:function(t,e){return"string"==typeof this.mergeFormatter?this.mergeFormatter.replace(/\{(value1|value2)\}/g,function(i,s){return"value1"===s?t:e}):this.mergeFormatter(t,e)},getPos:function(t){return this.realTime&&this.getStaticData(),"vertical"===this.direction?this.reverse?t.pageY-this.offset:this.size-(t.pageY-this.offset):this.reverse?this.size-(t.clientX-this.offset):t.clientX-this.offset},processClick:function(t){this.fixed&&t.stopPropagation()},wrapClick:function(t){var e=this;if(this.isDisabled||!this.clickable||this.processFlag)return!1;var i=this.getPos(t);if(this.isRange)if(this.disabledArray.every(function(t){return!1===t}))this.currentSlider=i>(this.position[1]-this.position[0])/2+this.position[0]?1:0;else if(this.disabledArray[0]){if(ithis.position[1])return!1;this.currentSlider=0}if(this.disabledArray[this.currentSlider])return!1;if(this.setValueOnPos(i),this.isRange&&this.tooltipMerge){var s=setInterval(function(){return e.handleOverlapTooltip()},16.7);setTimeout(function(){return window.clearInterval(s)},1e3*this.speed)}},moveStart:function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0,i=arguments[2];if(this.disabledArray[e])return!1;if(this.stopPropagation&&t.stopPropagation(),this.isRange&&(this.currentSlider=e,i)){if(!this.processDragable)return!1;this.processFlag=!0,this.processSign={pos:this.position,start:this.getPos(t.targetTouches&&t.targetTouches[0]?t.targetTouches[0]:t)}}!i&&this.useKeyboard&&(this.focusFlag=!0,this.focusSlider=e),this.flag=!0,this.$emit("drag-start",this)},moving:function(t){if(this.stopPropagation&&t.stopPropagation(),!this.flag)return!1;t.preventDefault(),t.targetTouches&&t.targetTouches[0]&&(t=t.targetTouches[0]),this.processFlag?(this.currentSlider=0,this.setValueOnPos(this.processSign.pos[0]+this.getPos(t)-this.processSign.start,!0),this.currentSlider=1,this.setValueOnPos(this.processSign.pos[1]+this.getPos(t)-this.processSign.start,!0)):this.setValueOnPos(this.getPos(t),!0),this.isRange&&this.tooltipMerge&&this.handleOverlapTooltip()},moveEnd:function(t){var e=this;if(this.stopPropagation&&t.stopPropagation(),!this.flag)return!1;this.$emit("drag-end",this),this.lazy&&this.isDiff(this.val,this.value)&&this.syncValue(),this.flag=!1,window.setTimeout(function(){e.processFlag=!1},0),this.setPosition()},setValueOnPos:function(t,e){var i=this.isRange?this.limit[this.currentSlider]:this.limit,s=this.isRange?this.valueLimit[this.currentSlider]:this.valueLimit;if(t>=i[0]&&t<=i[1]){this.setTransform(t);var r=this.getValueByIndex(Math.round(t/this.gap));this.setCurrentValue(r,e),this.isRange&&this.fixed&&(this.setTransform(t+this.fixedValue*this.gap*(0===this.currentSlider?1:-1),!0),this.setCurrentValue((r*this.multiple+this.fixedValue*this.spacing*this.multiple*(0===this.currentSlider?1:-1))/this.multiple,e,!0))}else tthis.maximum)return!1;this.isRange?this.isDiff(this.currentValue[s],t)&&(this.currentValue.splice(s,1,t),this.lazy&&this.flag||this.syncValue()):this.isDiff(this.currentValue,t)&&(this.currentValue=t,this.lazy&&this.flag||this.syncValue()),e||this.setPosition()},getValueByIndex:function(t){return(this.spacing*this.multiple*t+this.minimum*this.multiple)/this.multiple},getIndexByValue:function(t){return Math.round((t-this.minimum)*this.multiple)/(this.spacing*this.multiple)},setIndex:function(t){if(Array.isArray(t)&&this.isRange){var e=void 0;e=this.data?[this.data[t[0]],this.data[t[1]]]:[this.getValueByIndex(t[0]),this.getValueByIndex(t[1])],this.setValue(e)}else t=this.getValueByIndex(t),this.isRange&&(this.currentSlider=t>(this.currentValue[1]-this.currentValue[0])/2+this.currentValue[0]?1:0),this.setCurrentValue(t)},setValue:function(t,e,i){var s=this;if(this.isDiff(this.val,t)){var r=this.limitValue(t);this.val=this.isRange?r.concat():r,this.computedFixedValue(),this.syncValue(e)}this.$nextTick(function(){return s.setPosition(i)})},computedFixedValue:function(){if(!this.fixed)return this.fixedValue=0,!1;this.fixedValue=this.currentIndex[1]-this.currentIndex[0]},setPosition:function(t){this.flag||this.setTransitionTime(void 0===t?this.speed:t),this.isRange?(this.setTransform(this.position[0],1===this.currentSlider),this.setTransform(this.position[1],0===this.currentSlider)):this.setTransform(this.position),this.flag||this.setTransitionTime(0)},setTransform:function(t,e){var i=e?this.idleSlider:this.currentSlider,r=s(("vertical"===this.direction?this.dotHeightVal/2-t:t-this.dotWidthVal/2)*(this.reverse?-1:1)),o="vertical"===this.direction?"translateY("+r+"px)":"translateX("+r+"px)",n=this.fixed?this.fixedValue*this.gap+"px":(0===i?this.position[1]-t:t-this.position[0])+"px",l=this.fixed?(0===i?t:t-this.fixedValue*this.gap)+"px":(0===i?t:this.position[0])+"px";this.isRange?(this.slider[i].style.transform=o,this.slider[i].style.WebkitTransform=o,this.slider[i].style.msTransform=o,"vertical"===this.direction?(this.$refs.process.style.height=n,this.$refs.process.style[this.reverse?"top":"bottom"]=l):(this.$refs.process.style.width=n,this.$refs.process.style[this.reverse?"right":"left"]=l)):(this.slider.style.transform=o,this.slider.style.WebkitTransform=o,this.slider.style.msTransform=o,"vertical"===this.direction?(this.$refs.process.style.height=t+"px",this.$refs.process.style[this.reverse?"top":"bottom"]=0):(this.$refs.process.style.width=t+"px",this.$refs.process.style[this.reverse?"right":"left"]=0))},setTransitionTime:function(t){if(t||this.$refs.process.offsetWidth,this.isRange){for(var e=0;ee.max?(e.printError("The value of the slider is "+t+", the maximum value is "+e.max+", the value of this slider can not be greater than the maximum value"),e.max):i};return this.isRange?t.map(function(t){return i(t)}):i(t)},syncValue:function(t){var e=this.isRange?this.val.concat():this.val;this.$emit("input",e),t||this.$emit("callback",e)},getValue:function(){return this.val},getIndex:function(){return this.currentIndex},getStaticData:function(){this.$refs.elem&&(this.size="vertical"===this.direction?this.$refs.elem.offsetHeight:this.$refs.elem.offsetWidth,this.offset="vertical"===this.direction?this.$refs.elem.getBoundingClientRect().top+window.pageYOffset||document.documentElement.scrollTop:this.$refs.elem.getBoundingClientRect().left)},refresh:function(){this.$refs.elem&&(this.getStaticData(),this.computedFixedValue(),this.setPosition())},printError:function(t){this.debug&&console.error("[VueSlider error]: "+t)},handleOverlapTooltip:function(){var t=this.tooltipDirection[0]===this.tooltipDirection[1];if(this.isRange&&t){var e=this.reverse?this.$refs.tooltip1:this.$refs.tooltip0,i=this.reverse?this.$refs.tooltip0:this.$refs.tooltip1,s=e.getBoundingClientRect().right,r=i.getBoundingClientRect().left,o=e.getBoundingClientRect().y,n=i.getBoundingClientRect().y+i.getBoundingClientRect().height,l="horizontal"===this.direction&&s>r,a="vertical"===this.direction&&n>o;l||a?this.handleDisplayMergedTooltip(!0):this.handleDisplayMergedTooltip(!1)}},handleDisplayMergedTooltip:function(t){var e=this.$refs.tooltip0,i=this.$refs.tooltip1,s=this.$refs.process.getElementsByClassName("vue-merged-tooltip")[0];t?(e.style.visibility="hidden",i.style.visibility="hidden",s.style.visibility="visible"):(e.style.visibility="visible",i.style.visibility="visible",s.style.visibility="hidden")}},mounted:function(){var t=this;if(this.isComponentExists=!0,"undefined"==typeof window||"undefined"==typeof document)return this.printError("window or document is undefined, can not be initialization.");this.$nextTick(function(){t.isComponentExists&&(t.getStaticData(),t.setValue(t.limitValue(t.value),!0,0),t.bindEvents())}),this.isMounted=!0},beforeDestroy:function(){this.isComponentExists=!1,this.unbindEvents()}}},function(t,e,i){"use strict";var s=i(0);t.exports=s},function(t,e,i){e=t.exports=i(4)(),e.push([t.i,'.vue-slider-component{position:relative;box-sizing:border-box;-ms-user-select:none;user-select:none;-webkit-user-select:none;-moz-user-select:none;-o-user-select:none}.vue-slider-component.vue-slider-disabled{opacity:.5;cursor:not-allowed}.vue-slider-component.vue-slider-has-label{margin-bottom:15px}.vue-slider-component.vue-slider-disabled .vue-slider-dot{cursor:not-allowed}.vue-slider-component .vue-slider{position:relative;display:block;border-radius:15px;background-color:#ccc}.vue-slider-component .vue-slider:after{content:"";position:absolute;left:0;top:0;width:100%;height:100%;z-index:2}.vue-slider-component .vue-slider-process{position:absolute;border-radius:15px;background-color:#3498db;transition:all 0s;z-index:1}.vue-slider-component .vue-slider-process.vue-slider-process-dragable{cursor:pointer;z-index:3}.vue-slider-component.vue-slider-horizontal .vue-slider-process{width:0;height:100%;top:0;left:0;will-change:width}.vue-slider-component.vue-slider-vertical .vue-slider-process{width:100%;height:0;bottom:0;left:0;will-change:height}.vue-slider-component.vue-slider-horizontal-reverse .vue-slider-process{width:0;height:100%;top:0;right:0}.vue-slider-component.vue-slider-vertical-reverse .vue-slider-process{width:100%;height:0;top:0;left:0}.vue-slider-component .vue-slider-dot{position:absolute;border-radius:50%;background-color:#fff;box-shadow:.5px .5px 2px 1px rgba(0,0,0,.32);transition:all 0s;will-change:transform;cursor:pointer;z-index:5}.vue-slider-component .vue-slider-dot.vue-slider-dot-focus{box-shadow:0 0 2px 1px #3498db}.vue-slider-component .vue-slider-dot.vue-slider-dot-dragging{z-index:5}.vue-slider-component .vue-slider-dot.vue-slider-dot-disabled{z-index:4}.vue-slider-component.vue-slider-horizontal .vue-slider-dot{left:0}.vue-slider-component.vue-slider-vertical .vue-slider-dot{bottom:0}.vue-slider-component.vue-slider-horizontal-reverse .vue-slider-dot{right:0}.vue-slider-component.vue-slider-vertical-reverse .vue-slider-dot{top:0}.vue-slider-component .vue-slider-tooltip-wrap{display:none;position:absolute;z-index:9}.vue-slider-component .vue-slider-tooltip{display:block;font-size:14px;white-space:nowrap;padding:2px 5px;min-width:20px;text-align:center;color:#fff;border-radius:5px;border:1px solid #3498db;background-color:#3498db}.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-top{top:-9px;left:50%;-webkit-transform:translate(-50%,-100%);transform:translate(-50%,-100%)}.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-bottom{bottom:-9px;left:50%;-webkit-transform:translate(-50%,100%);transform:translate(-50%,100%)}.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-left{top:50%;left:-9px;-webkit-transform:translate(-100%,-50%);transform:translate(-100%,-50%)}.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-right{top:50%;right:-9px;-webkit-transform:translate(100%,-50%);transform:translate(100%,-50%)}.vue-slider-component .vue-slider-tooltip-top .vue-merged-tooltip .vue-slider-tooltip:before,.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-top .vue-slider-tooltip:before{content:"";position:absolute;bottom:-10px;left:50%;width:0;height:0;border:5px solid transparent;border:6px solid transparent\\0;border-top-color:inherit;-webkit-transform:translate(-50%);transform:translate(-50%)}.vue-slider-component .vue-slider-tooltip-wrap.vue-merged-tooltip{display:block;visibility:hidden}.vue-slider-component .vue-slider-tooltip-bottom .vue-merged-tooltip .vue-slider-tooltip:before,.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-bottom .vue-slider-tooltip:before{content:"";position:absolute;top:-10px;left:50%;width:0;height:0;border:5px solid transparent;border:6px solid transparent\\0;border-bottom-color:inherit;-webkit-transform:translate(-50%);transform:translate(-50%)}.vue-slider-component .vue-slider-tooltip-left .vue-merged-tooltip .vue-slider-tooltip:before,.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-left .vue-slider-tooltip:before{content:"";position:absolute;top:50%;right:-10px;width:0;height:0;border:5px solid transparent;border:6px solid transparent\\0;border-left-color:inherit;-webkit-transform:translateY(-50%);transform:translateY(-50%)}.vue-slider-component .vue-slider-tooltip-right .vue-merged-tooltip .vue-slider-tooltip:before,.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-right .vue-slider-tooltip:before{content:"";position:absolute;top:50%;left:-10px;width:0;height:0;border:5px solid transparent;border:6px solid transparent\\0;border-right-color:inherit;-webkit-transform:translateY(-50%);transform:translateY(-50%)}.vue-slider-component .vue-slider-dot.vue-slider-hover:hover .vue-slider-tooltip-wrap{display:block}.vue-slider-component .vue-slider-dot.vue-slider-always .vue-slider-tooltip-wrap{display:block!important}.vue-slider-component .vue-slider-piecewise{position:absolute;width:100%;padding:0;margin:0;left:0;top:0;height:100%;list-style:none}.vue-slider-component .vue-slider-piecewise-item{position:absolute;width:8px;height:8px}.vue-slider-component .vue-slider-piecewise-dot{position:absolute;left:50%;top:50%;width:100%;height:100%;display:inline-block;background-color:rgba(0,0,0,.16);border-radius:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);z-index:2;transition:all .3s}.vue-slider-component .vue-slider-piecewise-item:first-child .vue-slider-piecewise-dot,.vue-slider-component .vue-slider-piecewise-item:last-child .vue-slider-piecewise-dot{visibility:hidden}.vue-slider-component.vue-slider-horizontal-reverse .vue-slider-piecewise-label,.vue-slider-component.vue-slider-horizontal .vue-slider-piecewise-label{position:absolute;display:inline-block;top:100%;left:50%;white-space:nowrap;font-size:12px;color:#333;-webkit-transform:translate(-50%,8px);transform:translate(-50%,8px);visibility:visible}.vue-slider-component.vue-slider-vertical-reverse .vue-slider-piecewise-label,.vue-slider-component.vue-slider-vertical .vue-slider-piecewise-label{position:absolute;display:inline-block;top:50%;left:100%;white-space:nowrap;font-size:12px;color:#333;-webkit-transform:translate(8px,-50%);transform:translate(8px,-50%);visibility:visible}.vue-slider-component .vue-slider-sr-only{clip:rect(1px,1px,1px,1px);height:1px;width:1px;overflow:hidden;position:absolute!important}',""])},function(t,e){t.exports=function(){var t=[];return t.toString=function(){for(var t=[],e=0;ei.parts.length&&(s.parts.length=i.parts.length)}else{for(var n=[],r=0;r-1&&i>-1&&(this.currentValue=[e,i])}else{var s=this.data.indexOf(t);s>-1&&(this.currentValue=s)}else this.currentValue=t}},currentIndex:function(){return this.isRange?this.data?this.currentValue:[this.getIndexByValue(this.currentValue[0]),this.getIndexByValue(this.currentValue[1])]:this.getIndexByValue(this.currentValue)},indexRange:function(){return this.isRange?this.currentIndex:[0,this.currentIndex]},maximum:function(){return this.data?this.data.length-1:this.max},multiple:function(){var t=(""+this.interval).split(".")[1];return t?Math.pow(10,t.length):1},spacing:function(){return this.data?1:this.interval},total:function(){return this.data?this.data.length-1:(Math.floor((this.maximum-this.minimum)*this.multiple)%(this.interval*this.multiple)!=0&&this.printError("Prop[interval] is illegal, Please make sure that the interval can be divisible"),(this.maximum-this.minimum)/this.interval)},gap:function(){return this.size/this.total},position:function(){return this.isRange?[(this.currentValue[0]-this.minimum)/this.spacing*this.gap,(this.currentValue[1]-this.minimum)/this.spacing*this.gap]:(this.currentValue-this.minimum)/this.spacing*this.gap},limit:function(){return this.isRange?this.fixed?[[0,(this.total-this.fixedValue)*this.gap],[this.fixedValue*this.gap,this.size]]:[[0,this.position[1]],[this.position[0],this.size]]:[0,this.size]},valueLimit:function(){return this.isRange?this.fixed?[[this.minimum,this.maximum-this.fixedValue*(this.spacing*this.multiple)/this.multiple],[this.minimum+this.fixedValue*(this.spacing*this.multiple)/this.multiple,this.maximum]]:[[this.minimum,this.currentValue[1]],[this.currentValue[0],this.maximum]]:[this.minimum,this.maximum]},idleSlider:function(){return 0===this.currentSlider?1:0},wrapStyles:function(){return"vertical"===this.direction?{height:"number"==typeof this.height?this.height+"px":this.height,padding:this.dotHeightVal/2+"px "+this.dotWidthVal/2+"px"}:{width:"number"==typeof this.width?this.width+"px":this.width,padding:this.dotHeightVal/2+"px "+this.dotWidthVal/2+"px"}},sliderStyles:function(){return Array.isArray(this.sliderStyle)?this.isRange?this.sliderStyle:this.sliderStyle[1]:"function"==typeof this.sliderStyle?this.sliderStyle(this.val,this.currentIndex):this.isRange?[this.sliderStyle,this.sliderStyle]:this.sliderStyle},focusStyles:function(){return Array.isArray(this.focusStyle)?this.isRange?this.focusStyle:this.focusStyle[1]:"function"==typeof this.focusStyle?this.focusStyle(this.val,this.currentIndex):this.isRange?[this.focusStyle,this.focusStyle]:this.focusStyle},disabledDotStyles:function(){var t=this.disabledDotStyle;if(Array.isArray(t))return t;if("function"==typeof t){var e=t(this.val,this.currentIndex);return Array.isArray(e)?e:[e,e]}return t?[t,t]:[{backgroundColor:"#ccc"},{backgroundColor:"#ccc"}]},tooltipStyles:function(){return Array.isArray(this.tooltipStyle)?this.isRange?this.tooltipStyle:this.tooltipStyle[1]:"function"==typeof this.tooltipStyle?this.tooltipStyle(this.val,this.currentIndex):this.isRange?[this.tooltipStyle,this.tooltipStyle]:this.tooltipStyle},elemStyles:function(){return"vertical"===this.direction?{width:this.width+"px",height:"100%"}:{height:this.height+"px"}},dotStyles:function(){return"vertical"===this.direction?{width:this.dotWidthVal+"px",height:this.dotHeightVal+"px",left:-(this.dotWidthVal-this.width)/2+"px"}:{width:this.dotWidthVal+"px",height:this.dotHeightVal+"px",top:-(this.dotHeightVal-this.height)/2+"px"}},piecewiseDotStyle:function(){return"vertical"===this.direction?{width:this.width+"px",height:this.width+"px"}:{width:this.height+"px",height:this.height+"px"}},piecewiseDotWrap:function(){if(!this.piecewise&&!this.piecewiseLabel)return!1;for(var t=[],e=0;e<=this.total;e++){var i="vertical"===this.direction?{bottom:this.gap*e-this.width/2+"px",left:0}:{left:this.gap*e-this.height/2+"px",top:0},s=this.reverse?this.total-e:e,r=this.data?this.data[s]:this.spacing*s+this.min;t.push({style:i,label:this.formatter?this.formatting(r):r,inRange:s>=this.indexRange[0]&&s<=this.indexRange[1]})}return t}},watch:{value:function(t){this.flag||this.setValue(t,!0)},max:function(t){if(tthis.max)return this.printError("The minimum value can not be greater than the maximum value.");var e=this.limitValue(this.val);this.setValue(e),this.refresh()},show:function(t){var e=this;t&&!this.size&&this.$nextTick(function(){e.refresh()})},fixed:function(){this.computedFixedValue()}},methods:{bindEvents:function(){document.addEventListener("touchmove",this.moving,{passive:!1}),document.addEventListener("touchend",this.moveEnd,{passive:!1}),document.addEventListener("mousedown",this.blurSlider),document.addEventListener("mousemove",this.moving),document.addEventListener("mouseup",this.moveEnd),document.addEventListener("mouseleave",this.moveEnd),document.addEventListener("keydown",this.handleKeydown),document.addEventListener("keyup",this.handleKeyup),window.addEventListener("resize",this.refresh),this.isRange&&this.tooltipMerge&&(this.$refs.dot0.addEventListener("transitionend",this.handleOverlapTooltip),this.$refs.dot1.addEventListener("transitionend",this.handleOverlapTooltip))},unbindEvents:function(){document.removeEventListener("touchmove",this.moving),document.removeEventListener("touchend",this.moveEnd),document.removeEventListener("mousedown",this.blurSlider),document.removeEventListener("mousemove",this.moving),document.removeEventListener("mouseup",this.moveEnd),document.removeEventListener("mouseleave",this.moveEnd),document.removeEventListener("keydown",this.handleKeydown),document.removeEventListener("keyup",this.handleKeyup),window.removeEventListener("resize",this.refresh),this.isRange&&this.tooltipMerge&&(this.$refs.dot0.removeEventListener("transitionend",this.handleOverlapTooltip),this.$refs.dot1.removeEventListener("transitionend",this.handleOverlapTooltip))},handleKeydown:function(t){if(!this.useKeyboard||!this.focusFlag)return!1;switch(t.keyCode){case 37:case 40:t.preventDefault(),this.keydownFlag=!0,this.flag=!0,this.changeFocusSlider(this.actionsKeyboard[0]);break;case 38:case 39:t.preventDefault(),this.keydownFlag=!0,this.flag=!0,this.changeFocusSlider(this.actionsKeyboard[1])}},handleKeyup:function(){this.keydownFlag&&(this.keydownFlag=!1,this.flag=!1)},changeFocusSlider:function(t){var e=this;if(this.isRange){var i=this.currentIndex.map(function(i,s){if(s===e.focusSlider||e.fixed){var r=t(i),o=e.fixed?e.valueLimit[s]:[0,e.total];if(r<=o[1]&&r>=o[0])return r}return i});i[0]>i[1]&&(this.focusSlider=0===this.focusSlider?1:0,i=i.reverse()),this.setIndex(i)}else this.setIndex(t(this.currentIndex))},blurSlider:function(t){var e=this.isRange?this.$refs["dot"+this.focusSlider]:this.$refs.dot;if(!e||e===t.target)return!1;this.focusFlag=!1},formatting:function(t){return"string"==typeof this.formatter?this.formatter.replace(/\{value\}/,t):this.formatter(t)},mergeFormatting:function(t,e){return"string"==typeof this.mergeFormatter?this.mergeFormatter.replace(/\{(value1|value2)\}/g,function(i,s){return"value1"===s?t:e}):this.mergeFormatter(t,e)},getPos:function(t){return this.realTime&&this.getStaticData(),"vertical"===this.direction?this.reverse?t.pageY-this.offset:this.size-(t.pageY-this.offset):this.reverse?this.size-(t.clientX-this.offset):t.clientX-this.offset},processClick:function(t){this.fixed&&t.stopPropagation()},wrapClick:function(t){var e=this;if(this.isDisabled||!this.clickable||this.processFlag)return!1;var i=this.getPos(t);if(this.isRange)if(this.disabledArray.every(function(t){return!1===t}))this.currentSlider=i>(this.position[1]-this.position[0])/2+this.position[0]?1:0;else if(this.disabledArray[0]){if(ithis.position[1])return!1;this.currentSlider=0}if(this.disabledArray[this.currentSlider])return!1;if(this.setValueOnPos(i),this.isRange&&this.tooltipMerge){var s=setInterval(function(){return e.handleOverlapTooltip()},16.7);setTimeout(function(){return window.clearInterval(s)},1e3*this.speed)}},moveStart:function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0,i=arguments[2];if(this.disabledArray[e])return!1;if(this.stopPropagation&&t.stopPropagation(),this.isRange&&(this.currentSlider=e,i)){if(!this.processDragable)return!1;this.processFlag=!0,this.processSign={pos:this.position,start:this.getPos(t.targetTouches&&t.targetTouches[0]?t.targetTouches[0]:t)}}!i&&this.useKeyboard&&(this.focusFlag=!0,this.focusSlider=e),this.flag=!0,this.$emit("drag-start",this)},moving:function(t){if(this.stopPropagation&&t.stopPropagation(),!this.flag)return!1;t.preventDefault(),t.targetTouches&&t.targetTouches[0]&&(t=t.targetTouches[0]),this.processFlag?(this.currentSlider=0,this.setValueOnPos(this.processSign.pos[0]+this.getPos(t)-this.processSign.start,!0),this.currentSlider=1,this.setValueOnPos(this.processSign.pos[1]+this.getPos(t)-this.processSign.start,!0)):this.setValueOnPos(this.getPos(t),!0),this.isRange&&this.tooltipMerge&&this.handleOverlapTooltip()},moveEnd:function(t){var e=this;if(this.stopPropagation&&t.stopPropagation(),!this.flag)return!1;this.$emit("drag-end",this),this.lazy&&this.isDiff(this.val,this.value)&&this.syncValue(),this.flag=!1,window.setTimeout(function(){e.processFlag=!1},0),this.setPosition()},setValueOnPos:function(t,e){var i=this.isRange?this.limit[this.currentSlider]:this.limit,s=this.isRange?this.valueLimit[this.currentSlider]:this.valueLimit;if(t>=i[0]&&t<=i[1]){this.setTransform(t);var r=this.getValueByIndex(Math.round(t/this.gap));this.setCurrentValue(r,e),this.isRange&&this.fixed&&(this.setTransform(t+this.fixedValue*this.gap*(0===this.currentSlider?1:-1),!0),this.setCurrentValue((r*this.multiple+this.fixedValue*this.spacing*this.multiple*(0===this.currentSlider?1:-1))/this.multiple,e,!0))}else tthis.maximum)return!1;this.isRange?this.isDiff(this.currentValue[s],t)&&(this.currentValue.splice(s,1,t),this.lazy&&this.flag||this.syncValue()):this.isDiff(this.currentValue,t)&&(this.currentValue=t,this.lazy&&this.flag||this.syncValue()),e||this.setPosition()},getValueByIndex:function(t){return(this.spacing*this.multiple*t+this.minimum*this.multiple)/this.multiple},getIndexByValue:function(t){return Math.round((t-this.minimum)*this.multiple)/(this.spacing*this.multiple)},setIndex:function(t){if(Array.isArray(t)&&this.isRange){var e=void 0;e=this.data?[this.data[t[0]],this.data[t[1]]]:[this.getValueByIndex(t[0]),this.getValueByIndex(t[1])],this.setValue(e)}else t=this.getValueByIndex(t),this.isRange&&(this.currentSlider=t>(this.currentValue[1]-this.currentValue[0])/2+this.currentValue[0]?1:0),this.setCurrentValue(t)},setValue:function(t,e,i){var s=this;if(this.isDiff(this.val,t)){var r=this.limitValue(t);this.val=this.isRange?r.concat():r,this.computedFixedValue(),this.syncValue(e)}this.$nextTick(function(){return s.setPosition(i)})},computedFixedValue:function(){if(!this.fixed)return this.fixedValue=0,!1;this.fixedValue=this.currentIndex[1]-this.currentIndex[0]},setPosition:function(t){this.flag||this.setTransitionTime(void 0===t?this.speed:t),this.isRange?(this.setTransform(this.position[0],1===this.currentSlider),this.setTransform(this.position[1],0===this.currentSlider)):this.setTransform(this.position),this.flag||this.setTransitionTime(0)},setTransform:function(t,e){var i=e?this.idleSlider:this.currentSlider,r=s(("vertical"===this.direction?this.dotHeightVal/2-t:t-this.dotWidthVal/2)*(this.reverse?-1:1)),o="vertical"===this.direction?"translateY("+r+"px)":"translateX("+r+"px)",n=this.fixed?this.fixedValue*this.gap+"px":(0===i?this.position[1]-t:t-this.position[0])+"px",l=this.fixed?(0===i?t:t-this.fixedValue*this.gap)+"px":(0===i?t:this.position[0])+"px";this.isRange?(this.slider[i].style.transform=o,this.slider[i].style.WebkitTransform=o,this.slider[i].style.msTransform=o,"vertical"===this.direction?(this.$refs.process.style.height=n,this.$refs.process.style[this.reverse?"top":"bottom"]=l):(this.$refs.process.style.width=n,this.$refs.process.style[this.reverse?"right":"left"]=l)):(this.slider.style.transform=o,this.slider.style.WebkitTransform=o,this.slider.style.msTransform=o,"vertical"===this.direction?(this.$refs.process.style.height=t+"px",this.$refs.process.style[this.reverse?"top":"bottom"]=0):(this.$refs.process.style.width=t+"px",this.$refs.process.style[this.reverse?"right":"left"]=0))},setTransitionTime:function(t){if(t||this.$refs.process.offsetWidth,this.isRange){for(var e=0;ee.max?(e.printError("The value of the slider is "+t+", the maximum value is "+e.max+", the value of this slider can not be greater than the maximum value"),e.max):i};return this.isRange?t.map(function(t){return i(t)}):i(t)},syncValue:function(t){var e=this.isRange?this.val.concat():this.val;this.$emit("input",e),this.keydownFlag&&this.$emit("on-keypress",e),t||this.$emit("callback",e)},getValue:function(){return this.val},getIndex:function(){return this.currentIndex},getStaticData:function(){this.$refs.elem&&(this.size="vertical"===this.direction?this.$refs.elem.offsetHeight:this.$refs.elem.offsetWidth,this.offset="vertical"===this.direction?this.$refs.elem.getBoundingClientRect().top+window.pageYOffset||document.documentElement.scrollTop:this.$refs.elem.getBoundingClientRect().left)},refresh:function(){this.$refs.elem&&(this.getStaticData(),this.computedFixedValue(),this.setPosition())},printError:function(t){this.debug&&console.error("[VueSlider error]: "+t)},handleOverlapTooltip:function(){var t=this.tooltipDirection[0]===this.tooltipDirection[1];if(this.isRange&&t){var e=this.reverse?this.$refs.tooltip1:this.$refs.tooltip0,i=this.reverse?this.$refs.tooltip0:this.$refs.tooltip1,s=e.getBoundingClientRect().right,r=i.getBoundingClientRect().left,o=e.getBoundingClientRect().y,n=i.getBoundingClientRect().y+i.getBoundingClientRect().height,l="horizontal"===this.direction&&s>r,a="vertical"===this.direction&&n>o;l||a?this.handleDisplayMergedTooltip(!0):this.handleDisplayMergedTooltip(!1)}},handleDisplayMergedTooltip:function(t){var e=this.$refs.tooltip0,i=this.$refs.tooltip1,s=this.$refs.process.getElementsByClassName("vue-merged-tooltip")[0];t?(e.style.visibility="hidden",i.style.visibility="hidden",s.style.visibility="visible"):(e.style.visibility="visible",i.style.visibility="visible",s.style.visibility="hidden")}},mounted:function(){var t=this;if(this.isComponentExists=!0,"undefined"==typeof window||"undefined"==typeof document)return this.printError("window or document is undefined, can not be initialization.");this.$nextTick(function(){t.isComponentExists&&(t.getStaticData(),t.setValue(t.limitValue(t.value),!0,t.startAnimation?t.speed:0),t.bindEvents())}),this.isMounted=!0},beforeDestroy:function(){this.isComponentExists=!1,this.unbindEvents()}}},function(t,e,i){"use strict";var s=i(0);t.exports=s},function(t,e,i){e=t.exports=i(4)(),e.push([t.i,'.vue-slider-component{position:relative;box-sizing:border-box;-ms-user-select:none;user-select:none;-webkit-user-select:none;-moz-user-select:none;-o-user-select:none}.vue-slider-component.vue-slider-disabled{opacity:.5;cursor:not-allowed}.vue-slider-component.vue-slider-has-label{margin-bottom:15px}.vue-slider-component.vue-slider-disabled .vue-slider-dot{cursor:not-allowed}.vue-slider-component .vue-slider{position:relative;display:block;border-radius:15px;background-color:#ccc}.vue-slider-component .vue-slider:after{content:"";position:absolute;left:0;top:0;width:100%;height:100%;z-index:2}.vue-slider-component .vue-slider-process{position:absolute;border-radius:15px;background-color:#3498db;transition:all 0s;z-index:1}.vue-slider-component .vue-slider-process.vue-slider-process-dragable{cursor:pointer;z-index:3}.vue-slider-component.vue-slider-horizontal .vue-slider-process{width:0;height:100%;top:0;left:0;will-change:width}.vue-slider-component.vue-slider-vertical .vue-slider-process{width:100%;height:0;bottom:0;left:0;will-change:height}.vue-slider-component.vue-slider-horizontal-reverse .vue-slider-process{width:0;height:100%;top:0;right:0}.vue-slider-component.vue-slider-vertical-reverse .vue-slider-process{width:100%;height:0;top:0;left:0}.vue-slider-component .vue-slider-dot{position:absolute;border-radius:50%;background-color:#fff;box-shadow:.5px .5px 2px 1px rgba(0,0,0,.32);transition:all 0s;will-change:transform;cursor:pointer;z-index:5}.vue-slider-component .vue-slider-dot.vue-slider-dot-focus{box-shadow:0 0 2px 1px #3498db}.vue-slider-component .vue-slider-dot.vue-slider-dot-dragging{z-index:5}.vue-slider-component .vue-slider-dot.vue-slider-dot-disabled{z-index:4}.vue-slider-component.vue-slider-horizontal .vue-slider-dot{left:0}.vue-slider-component.vue-slider-vertical .vue-slider-dot{bottom:0}.vue-slider-component.vue-slider-horizontal-reverse .vue-slider-dot{right:0}.vue-slider-component.vue-slider-vertical-reverse .vue-slider-dot{top:0}.vue-slider-component .vue-slider-tooltip-wrap{display:none;position:absolute;z-index:9}.vue-slider-component .vue-slider-tooltip{display:block;font-size:14px;white-space:nowrap;padding:2px 5px;min-width:20px;text-align:center;color:#fff;border-radius:5px;border:1px solid #3498db;background-color:#3498db}.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-top{top:-9px;left:50%;transform:translate(-50%,-100%)}.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-bottom{bottom:-9px;left:50%;transform:translate(-50%,100%)}.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-left{top:50%;left:-9px;transform:translate(-100%,-50%)}.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-right{top:50%;right:-9px;transform:translate(100%,-50%)}.vue-slider-component .vue-slider-tooltip-top .vue-merged-tooltip .vue-slider-tooltip:before,.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-top .vue-slider-tooltip:before{content:"";position:absolute;bottom:-10px;left:50%;width:0;height:0;border:5px solid transparent;border:6px solid transparent\\0;border-top-color:inherit;transform:translate(-50%)}.vue-slider-component .vue-slider-tooltip-wrap.vue-merged-tooltip{display:block;visibility:hidden}.vue-slider-component .vue-slider-tooltip-bottom .vue-merged-tooltip .vue-slider-tooltip:before,.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-bottom .vue-slider-tooltip:before{content:"";position:absolute;top:-10px;left:50%;width:0;height:0;border:5px solid transparent;border:6px solid transparent\\0;border-bottom-color:inherit;transform:translate(-50%)}.vue-slider-component .vue-slider-tooltip-left .vue-merged-tooltip .vue-slider-tooltip:before,.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-left .vue-slider-tooltip:before{content:"";position:absolute;top:50%;right:-10px;width:0;height:0;border:5px solid transparent;border:6px solid transparent\\0;border-left-color:inherit;transform:translateY(-50%)}.vue-slider-component .vue-slider-tooltip-right .vue-merged-tooltip .vue-slider-tooltip:before,.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-right .vue-slider-tooltip:before{content:"";position:absolute;top:50%;left:-10px;width:0;height:0;border:5px solid transparent;border:6px solid transparent\\0;border-right-color:inherit;transform:translateY(-50%)}.vue-slider-component .vue-slider-dot.vue-slider-hover:hover .vue-slider-tooltip-wrap{display:block}.vue-slider-component .vue-slider-dot.vue-slider-always .vue-slider-tooltip-wrap{display:block!important}.vue-slider-component .vue-slider-piecewise{position:absolute;width:100%;padding:0;margin:0;left:0;top:0;height:100%;list-style:none}.vue-slider-component .vue-slider-piecewise-item{position:absolute;width:8px;height:8px}.vue-slider-component .vue-slider-piecewise-dot{position:absolute;left:50%;top:50%;width:100%;height:100%;display:inline-block;background-color:rgba(0,0,0,.16);border-radius:50%;transform:translate(-50%,-50%);z-index:2;transition:all .3s}.vue-slider-component .vue-slider-piecewise-item:first-child .vue-slider-piecewise-dot,.vue-slider-component .vue-slider-piecewise-item:last-child .vue-slider-piecewise-dot{visibility:hidden}.vue-slider-component.vue-slider-horizontal-reverse .vue-slider-piecewise-label,.vue-slider-component.vue-slider-horizontal .vue-slider-piecewise-label{position:absolute;display:inline-block;top:100%;left:50%;white-space:nowrap;font-size:12px;color:#333;transform:translate(-50%,8px);visibility:visible}.vue-slider-component.vue-slider-vertical-reverse .vue-slider-piecewise-label,.vue-slider-component.vue-slider-vertical .vue-slider-piecewise-label{position:absolute;display:inline-block;top:50%;left:100%;white-space:nowrap;font-size:12px;color:#333;transform:translate(8px,-50%);visibility:visible}.vue-slider-component .vue-slider-sr-only{clip:rect(1px,1px,1px,1px);height:1px;width:1px;overflow:hidden;position:absolute!important}',""])},function(t,e){t.exports=function(){var t=[];return t.toString=function(){for(var t=[],e=0;ei.parts.length&&(s.parts.length=i.parts.length)}else{for(var n=[],r=0;r Date: Thu, 18 Oct 2018 10:45:35 +0530 Subject: [PATCH 2/6] loader changes --- .../Webkul/Shop/src/Resources/views/products/view.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/Webkul/Shop/src/Resources/views/products/view.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view.blade.php index 8cdf3c963..167f4ffe8 100644 --- a/packages/Webkul/Shop/src/Resources/views/products/view.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/view.blade.php @@ -14,7 +14,7 @@ - +
@csrf() From e91d6f184b606b6265d423daa0450dd122c6c1ac Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Thu, 18 Oct 2018 11:00:04 +0530 Subject: [PATCH 3/6] loader css change --- packages/Webkul/Shop/src/Resources/assets/sass/app.scss | 8 ++++++++ packages/Webkul/Ui/src/Resources/assets/sass/app.scss | 4 ---- public/themes/default/assets/css/shop.css | 6 ++++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index 3edc7d67e..9b1b942a0 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -2242,3 +2242,11 @@ section.review { } } } + + +// css for loader +.cp-spinner { + margin-left: 46%; + margin-top: 35%; + margin-bottom: 35%; +} \ No newline at end of file diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss index e4d478e09..392742513 100644 --- a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss @@ -826,9 +826,6 @@ h2 { display: inline-block; box-sizing: border-box; position: relative; - margin-left: 46%; - margin-top: 35%; - margin-bottom: 35%; } .cp-round:before { @@ -862,7 +859,6 @@ h2 { top: 0; left: 0; animation: spin 1s ease-in-out infinite; - } @keyframes spin { diff --git a/public/themes/default/assets/css/shop.css b/public/themes/default/assets/css/shop.css index ee2b5d023..09845db9b 100644 --- a/public/themes/default/assets/css/shop.css +++ b/public/themes/default/assets/css/shop.css @@ -2836,3 +2836,9 @@ section.review .review-layouter .review-form .review-detail .rating-calculate .p width: 100%; } } + +.cp-spinner { + margin-left: 46%; + margin-top: 35%; + margin-bottom: 35%; +} From bd752c7e3e42875244838a993530f53a698937ef Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Thu, 18 Oct 2018 12:55:00 +0530 Subject: [PATCH 4/6] conflict --- packages/Webkul/Admin/src/Http/routes.php | 24 ++++++++++++------- .../src/Http/Controllers/SliderController.php | 20 +++++++--------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php index 2fd906573..a872d9e38 100644 --- a/packages/Webkul/Admin/src/Http/routes.php +++ b/packages/Webkul/Admin/src/Http/routes.php @@ -40,31 +40,31 @@ Route::group(['middleware' => ['web']], function () { Route::get('dashboard', 'Webkul\Admin\Http\Controllers\DashboardController@index')->name('admin.dashboard.index'); //Customers Management Routes - Route::get('customer', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@index')->defaults('_config', [ + Route::get('customers', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@index')->defaults('_config', [ 'view' => 'admin::customers.index' ])->name('admin.customer.index'); - Route::get('customer/orders', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@index')->defaults('_config',[ + Route::get('customers/orders', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@index')->defaults('_config',[ 'view' => 'admin::customers.orders.index' ])->name('admin.customer.orders.index'); - Route::get('customer/create', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@create')->defaults('_config',[ + Route::get('customers/create', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@create')->defaults('_config',[ 'view' => 'admin::customers.create' ])->name('admin.customer.create'); - Route::post('customer/create', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@store')->defaults('_config',[ + Route::post('customers/create', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@store')->defaults('_config',[ 'redirect' => 'admin.customer.index' ])->name('admin.customer.store'); - Route::get('customer/edit/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@edit')->defaults('_config',[ + Route::get('customers/edit/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@edit')->defaults('_config',[ 'view' => 'admin::customers.edit' ])->name('admin.customer.edit'); - Route::put('customer/edit/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@update')->defaults('_config', [ + Route::put('customers/edit/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@update')->defaults('_config', [ 'redirect' => 'admin.customer.index' ])->name('admin.customer.update'); - Route::get('customer/delete/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@destroy')->name('admin.customer.delete'); + Route::get('customers/delete/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@destroy')->name('admin.customer.delete'); Route::get('reviews', 'Webkul\Product\Http\Controllers\ReviewController@index')->defaults('_config',[ 'view' => 'admin::customers.review.index' @@ -411,7 +411,15 @@ Route::group(['middleware' => ['web']], function () { 'redirect' => 'admin::sliders.index' ])->name('admin.sliders.store'); - Route::get('/slider/delete/{id}', 'Webkul\Shop\Http\Controllers\SliderController@destroy')->name('admin.sliders.delete'); + //slider edit + Route::get('slider/edit/{id}','Webkul\Shop\Http\Controllers\SliderController@edit')->defaults('_config',[ + 'view' => 'admin::settings.sliders.edit' + ])->name('admin.sliders.edit'); + Route::post('slider/edit/{id}','Webkul\Shop\Http\Controllers\SliderController@update')->defaults('_config',[ + 'redirect' => 'admin::sliders.index' + ])->name('admin.sliders.update'); + //destroy a slider item + Route::get('slider/delete/{id}', 'Webkul\Shop\Http\Controllers\SliderController@destroy'); //tax routes Route::get('/tax-categories', 'Webkul\Tax\Http\Controllers\TaxController@index')->defaults('_config', [ diff --git a/packages/Webkul/Shop/src/Http/Controllers/SliderController.php b/packages/Webkul/Shop/src/Http/Controllers/SliderController.php index 5855ecfb6..e9d3fc11b 100644 --- a/packages/Webkul/Shop/src/Http/Controllers/SliderController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/SliderController.php @@ -58,22 +58,18 @@ class SliderController extends controller return redirect()->back(); } - /** - * Remove the specified resource from storage. + /** + * Delete a slider item and preserve the last one from deleting * - * @param int $id - * @return \Illuminate\Http\Response + * @return mixed */ - public function destroy($id) - { - if($this->slider->count() == 1) { - session()->flash('error', 'At least one slider is required.'); + public function destroy($id) { + if($this->slider->findWhere(['channel_id' => core()->getCurrentChannel()->id])->count() == 1) { + session()->flash('warning', 'Cannot Delete The Last Slider Item'); } else { - $this->slider->delete($id); - - session()->flash('success', 'Slider deleted successfully.'); + $this->slider->destroy($id); + session()->flash('success', 'Slider Item Successfully Deleted'); } - return redirect()->back(); } } \ No newline at end of file From 489c1cdd1ba228f50ec0cb9a30468ee70eed6325 Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Tue, 23 Oct 2018 17:21:04 +0530 Subject: [PATCH 5/6] customer group & responsive --- .../Webkul/Customer/src/Models/Customer.php | 4 +- ...stomersAddress.php => CustomerAddress.php} | 2 +- .../{CustomerGroups.php => CustomerGroup.php} | 2 +- .../CustomerAddressRepository.php | 2 +- .../Repositories/CustomerGroupRepository.php | 2 +- .../Repositories/ProductReviewRepository.php | 2 - .../Shop/src/Resources/assets/sass/app.scss | 329 +++++++++++--- .../src/Resources/assets/sass/components.scss | 15 - .../Shop/src/Resources/assets/sass/icons.scss | 6 + .../src/Resources/assets/sass/override.scss | 165 ------- .../Webkul/Shop/src/Resources/lang/en/app.php | 7 +- .../views/customers/account/index.blade.php | 26 -- .../customers/account/orders/view.blade.php | 10 +- .../account/partials/sidemenu.blade.php | 32 +- .../customers/account/reviews/index.blade.php | 7 +- .../account/reviews/reviews.blade.php | 5 + .../views/layouts/header/index.blade.php | 9 +- .../Resources/views/products/index.blade.php | 8 +- .../views/products/list/toolbar.blade.php | 48 +- public/themes/default/assets/css/shop.css | 420 +++++++++--------- 20 files changed, 570 insertions(+), 531 deletions(-) rename packages/Webkul/Customer/src/Models/{CustomersAddress.php => CustomerAddress.php} (86%) rename packages/Webkul/Customer/src/Models/{CustomerGroups.php => CustomerGroup.php} (84%) diff --git a/packages/Webkul/Customer/src/Models/Customer.php b/packages/Webkul/Customer/src/Models/Customer.php index c587195f4..9e31965d3 100644 --- a/packages/Webkul/Customer/src/Models/Customer.php +++ b/packages/Webkul/Customer/src/Models/Customer.php @@ -4,7 +4,7 @@ namespace Webkul\Customer\Models; use Illuminate\Notifications\Notifiable; use Illuminate\Foundation\Auth\User as Authenticatable; -use Webkul\Customer\Models\CustomersGroups; +use Webkul\Customer\Models\CustomerGroup; use Webkul\Sales\Models\Order; // use Webkul\User\Notifications\AdminResetPassword; @@ -36,6 +36,6 @@ class Customer extends Authenticatable */ public function customerGroup() { - return $this->belongsTo(CustomersGroups::class); + return $this->belongsTo(CustomerGroup::class); } } diff --git a/packages/Webkul/Customer/src/Models/CustomersAddress.php b/packages/Webkul/Customer/src/Models/CustomerAddress.php similarity index 86% rename from packages/Webkul/Customer/src/Models/CustomersAddress.php rename to packages/Webkul/Customer/src/Models/CustomerAddress.php index 2e9ffbd2e..927742082 100644 --- a/packages/Webkul/Customer/src/Models/CustomersAddress.php +++ b/packages/Webkul/Customer/src/Models/CustomerAddress.php @@ -3,7 +3,7 @@ namespace Webkul\Customer\Models; use Illuminate\Database\Eloquent\Model; -class CustomersAddress extends Model +class CustomerAddress extends Model { protected $table = 'customer_addresses'; diff --git a/packages/Webkul/Customer/src/Models/CustomerGroups.php b/packages/Webkul/Customer/src/Models/CustomerGroup.php similarity index 84% rename from packages/Webkul/Customer/src/Models/CustomerGroups.php rename to packages/Webkul/Customer/src/Models/CustomerGroup.php index 27ed1a786..47e77ff5b 100644 --- a/packages/Webkul/Customer/src/Models/CustomerGroups.php +++ b/packages/Webkul/Customer/src/Models/CustomerGroup.php @@ -3,7 +3,7 @@ namespace Webkul\Customer\Models; use Illuminate\Database\Eloquent\Model; -class CustomersGroups extends Model +class CustomerGroup extends Model { protected $table = 'customer_groups'; diff --git a/packages/Webkul/Customer/src/Repositories/CustomerAddressRepository.php b/packages/Webkul/Customer/src/Repositories/CustomerAddressRepository.php index 621c91bae..b172328e7 100644 --- a/packages/Webkul/Customer/src/Repositories/CustomerAddressRepository.php +++ b/packages/Webkul/Customer/src/Repositories/CustomerAddressRepository.php @@ -21,7 +21,7 @@ class CustomerAddressRepository extends Repository function model() { - return 'Webkul\Customer\Models\CustomersAddress'; + return 'Webkul\Customer\Models\CustomerAddress'; } /** diff --git a/packages/Webkul/Customer/src/Repositories/CustomerGroupRepository.php b/packages/Webkul/Customer/src/Repositories/CustomerGroupRepository.php index 2aa6489df..28746cb72 100644 --- a/packages/Webkul/Customer/src/Repositories/CustomerGroupRepository.php +++ b/packages/Webkul/Customer/src/Repositories/CustomerGroupRepository.php @@ -21,7 +21,7 @@ class CustomerGroupRepository extends Repository function model() { - return 'Webkul\Customer\Models\CustomersGroups'; + return 'Webkul\Customer\Models\CustomerGroup'; } /** diff --git a/packages/Webkul/Product/src/Repositories/ProductReviewRepository.php b/packages/Webkul/Product/src/Repositories/ProductReviewRepository.php index 71c19f9ce..1a4ec846c 100644 --- a/packages/Webkul/Product/src/Repositories/ProductReviewRepository.php +++ b/packages/Webkul/Product/src/Repositories/ProductReviewRepository.php @@ -57,8 +57,6 @@ class ProductReviewRepository extends Repository $reviews = $this->model->where(['customer_id'=> $customerId, 'status' => 'approved'])->with('product')->get(); - // dd($reviews); - return $reviews; } } \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index c0cf15bd0..6e34f1eb0 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -33,6 +33,13 @@ grid-auto-rows: auto; } + @media only screen and (max-width: 551px) { + .product-grid-3 { + grid-template-columns: 48.5% 48.5%; + grid-column-gap: 20px; + } + } + @media only screen and (max-width: 854px) { .product-grid-4 { grid-template-columns: 29.5% 29.5% 29.5%; @@ -121,6 +128,21 @@ } } + @media only screen and (max-width: 425px) { + .product-card { + font-size: 90%; + + .btn.btn-md { + padding: 5px; + } + } + + .product-grid-4 { + grid-template-columns: 48.5% 48.5%; + grid-column-gap: 10px; + } + } + .product-list { min-height: 200px; @@ -724,8 +746,43 @@ section.slider-block { @media all and (max-width: 720px) { - .header-bottom { - display: none !important; + .header { + .header-bottom { + height: auto; + display: none; + + .nav a { + display:inline-block; + padding: 12px 4.8px 12px 8px; + } + + ul.nav , .nav li{ + height: auto; + } + + .nav > li { + float: none; + } + + .nav li ul { + padding-left: 20px; + } + + .nav li > .icon{ + float: right; + display: block; + } + + .nav li a > .icon{ + display: none; + } + + .nav ul { + position: unset; + border: none; + box-shadow: none; + } + } } ul.search-container { @@ -743,51 +800,6 @@ section.slider-block { ul.right-responsive { display: flex !important; } - - .responsive-nav { - margin-top: 20px; - display: none; - - .nav a { - display:inline-block; - color: $font-color; - text-decoration: none; - padding: 12px 4.8px 12px 8px; - text-transform: uppercase; - letter-spacing: 2px; - } - - .nav li > .icon{ - float: right; - } - - .nav li a > .icon{ - display: none; - } - - .nav > li { - border-bottom: 1px solid $border-color; - } - - .nav li ul { - padding-left: 30px; - } - - .nav li:first-child { - border-top: 1px solid $border-color; - } - - .nav > li:last-child { - float:none; - height: 45px; - display: none; - border: none; - - img { - margin-right:6px; - } - } - } } //footer responsive with out media query. @@ -877,6 +889,100 @@ section.slider-block { flex-direction: row; width: 100%; + .layered-filter-wrapper { + width: 25%; + float: left; + padding-right: 20px; + min-height: 1px; + + .filter-title { + border-bottom: 1px solid $border-color; + color: $font-color; + padding: 10px 0; + } + + .filter-attributes { + .filter-attributes-item { + border-bottom: 1px solid $border-color; + padding-bottom: 10px; + + .filter-attributes-title { + padding: 10px 40px 0 10px; + color: #5E5E5E; + cursor: pointer; + position: relative; + + .remove-filter-link { + font-weight: 400; + color: $brand-color; + margin-right: 10px; + } + + .icon { + background-image: url('../images/arrow-down.svg') !important; + width: 10px; + height: 10px; + position: absolute; + right: 15px; + top: 14px; + } + } + + .filter-attributes-content { + padding: 10px; + display: none; + + ol.items { + padding: 0; + margin: 0; + list-style: none none; + + li.item { + padding: 8px 0; + color: #5E5E5E; + + .checkbox { + margin: 0; + + .checkbox-view { + height: 16px; + width: 16px; + background-image: url("../images/checkbox.svg"); + } + + input:checked + .checkbox-view { + background-image: url("../images/checkbox-checked.svg"); + } + } + } + } + + .price-range-wrapper { + margin-top: 21px; + } + } + + &.active { + .filter-attributes-content { + display: block; + } + + .filter-attributes-title .icon { + background-image: url('../images//arrow-up.svg') !important; + } + } + } + } + } + + .responsive-layred-filter { + display: none; + @extend .layered-filter-wrapper; + width: 100%; + float: none; + padding-right: 0px; + } + .category-block { width: 80%; display: block; @@ -904,12 +1010,12 @@ section.slider-block { color: $font-color; line-height: 45px; - span:first-child { - display: inline; - } - - span:last-child { + span { display: none; + + &:first-child { + display: inline; + } } } @@ -957,14 +1063,6 @@ section.slider-block { } } - .reponsive-sorter-limiter { - display: none; - } - - .responsive-layred-filter{ - display: none; - } - .bottom-toolbar { display: block; margin-top: 40px; @@ -973,6 +1071,55 @@ section.slider-block { } } +//category page responsivs css +@media only screen and (max-width: 840px) { + .main { + .layered-filter-wrapper{ + display: none; + } + + .category-block { + width: 100% !important; + + .top-toolbar { + display: flex; + flex-direction: column; + + .page-info { + border-bottom: 1px solid $border-color; + line-height: 15px; + + span { + display: inline; + + &:first-child{ + display: none; + } + } + + .sort-filter { + float: right; + cursor: pointer; + } + } + + .pager { + margin-top: 20px; + display: none; + + .view-mode { + display: none; + } + } + } + + .responsive-layred-filter { + display: block; + } + } + } +} + // product pages css starts here section.product-detail { color: $font-color; @@ -2158,6 +2305,67 @@ section.review { } } +@media only screen and (max-width: 770px) { + .sale-container { + .sale-section { + .section-content { + .row { + display: flex; + flex-direction: column; + + .title { + line-height: 20px; + } + } + + // .table { + // table { + // display: flex; + // border: none; + + // tr { + // display: grid; + // } + + // thead th , tbody td { + // font-weight: 700; + // padding: 12px 0px; + // background: none; + // color: $font-color; + // } + // } + // } + + .totals { + .sale-summary { + width: 100%; + + tr { + td { + &:nth-child(2) { + display: none; + } + + } + } + } + } + .order-box-container { + display: flex; + flex-direction: column; + + .box { + width: 100%; + margin: 10px auto; + } + } + } + } + } +} + + + @media only screen and (max-width: 770px) { .account-content { flex-direction: column; @@ -2235,7 +2443,6 @@ section.review { } } - // css for loader .cp-spinner { margin-left: 46%; diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/components.scss b/packages/Webkul/Shop/src/Resources/assets/sass/components.scss index b5259a317..18ec3a43f 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/components.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/components.scss @@ -1,18 +1,3 @@ -@media only screen and (max-width: 425px) { - .product-card { - font-size: 90%; - - .btn.btn-md { - padding: 5px; - } - } - - .product-grid-4 { - grid-template-columns: 48.5% 48.5%; - grid-column-gap: 10px; - } -} - //wishlist icon hover properties .add-to-wishlist { diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/icons.scss b/packages/Webkul/Shop/src/Resources/assets/sass/icons.scss index e1757818f..0ad81d721 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/icons.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/icons.scss @@ -118,4 +118,10 @@ background-image: url("../images/Expand-Light-On.svg"); width: 18px; height: 18px; +} + +.icon-menu-close-adj { + background-image: url("../images/cross-icon-adj.svg"); + width: 32px; + height: 32px; } \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/override.scss b/packages/Webkul/Shop/src/Resources/assets/sass/override.scss index ad44108ae..898cc8495 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/override.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/override.scss @@ -126,168 +126,3 @@ body { .mt-90 { margin-top: 90px; } - -@media only screen and (max-width: 551px) { - .product-grid-3 { - grid-template-columns: 48.5% 48.5%; - grid-column-gap: 20px; - } -} - -@media only screen and (max-width: 840px) { - - .layered-filter-wrapper{ - display: none; - } - - .main { - - .category-block { - width: 100% !important; - - .top-toolbar { - border-bottom: 1px solid $border-color; - - .page-info { - - span:first-child { - display: none; - } - - span:last-child { - display: inline; - } - } - - .pager { - - .view-mode { - margin-right: 0px; - - .grid-view , .list-view { - display: none; - } - - .sort-filter { - cursor: pointer; - display: inline-block; - margin-top: 10px; - } - } - - .sorter , .limiter{ - display: none; - } - } - } - - .reponsive-sorter-limiter { - display: none; - - select { - background: #FFFFFF; - border: 1px solid #C7C7C7; - border-radius: 3px; - color: #242424; - padding: 10px; - } - } - } - } - -} - -//layered filter wrapper styles -.layered-filter-wrapper { - width: 25%; - float: left; - padding-right: 20px; - min-height: 1px; - - .filter-title { - border-bottom: 1px solid $border-color; - color: $font-color; - padding: 10px 0; - } - - .filter-attributes { - .filter-attributes-item { - border-bottom: 1px solid $border-color; - padding-bottom: 10px; - - .filter-attributes-title { - padding: 10px 40px 0 10px; - color: #5E5E5E; - cursor: pointer; - position: relative; - - .remove-filter-link { - font-weight: 400; - color: $brand-color; - margin-right: 10px; - } - - .icon { - background-image: url('../images/arrow-down.svg') !important; - width: 10px; - height: 10px; - position: absolute; - right: 15px; - top: 14px; - } - } - - .filter-attributes-content { - padding: 10px; - display: none; - - ol.items { - padding: 0; - margin: 0; - list-style: none none; - - li.item { - padding: 8px 0; - color: #5E5E5E; - - .checkbox { - margin: 0; - - .checkbox-view { - height: 16px; - width: 16px; - background-image: url("../images/checkbox.svg"); - } - - input:checked + .checkbox-view { - background-image: url("../images/checkbox-checked.svg"); - } - } - } - } - - .price-range-wrapper { - margin-top: 21px; - } - } - - &.active { - .filter-attributes-content { - display: block; - } - - .filter-attributes-title .icon { - background-image: url('../images//arrow-up.svg') !important; - } - } - } - } -} - -.responsive-layred-filter { - @extend .layered-filter-wrapper; - width: 100%; - float: none; - padding-right: 0px; -} - diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php index 973b47420..bbed35b6b 100644 --- a/packages/Webkul/Shop/src/Resources/lang/en/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php @@ -168,7 +168,12 @@ return [ 'review' => [ 'index' => [ - 'title' => 'Reviews' + 'title' => 'Reviews', + 'page-title' => 'Customer - Reviews' + ], + + 'view' => [ + 'page-tile' => 'Review #:id', ] ] ] diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/index.blade.php index 49ff25e8a..efd7966d1 100644 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/index.blade.php @@ -5,29 +5,3 @@

Account Index Page

@endsection -@push('scripts') - +@endpush \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php index a81ab1a9a..d3c8bc759 100644 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/reviews/index.blade.php @@ -1,6 +1,11 @@ @inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage') @extends('shop::layouts.master') + +@section('page_title') + {{ __('shop::app.customer.account.review.index.page-title') }} +@endsection + @section('content-wrapper') @push('scripts') @@ -218,7 +215,7 @@ var searchResponsive = document.getElementsByClassName('search-responsive')[0]; var sortLimit = document.getElementsByClassName('reponsive-sorter-limiter')[0]; var layerFilter = document.getElementsByClassName('responsive-layred-filter')[0]; - var navResponsive = document.getElementsByClassName('responsive-nav')[0]; + var navResponsive = document.getElementsByClassName('header-bottom')[0]; var thumbList = document.getElementsByClassName('thumb-list')[0]; search.addEventListener("click", header); diff --git a/packages/Webkul/Shop/src/Resources/views/products/index.blade.php b/packages/Webkul/Shop/src/Resources/views/products/index.blade.php index 4681b375b..6a5fb2d81 100644 --- a/packages/Webkul/Shop/src/Resources/views/products/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/index.blade.php @@ -69,9 +69,11 @@ $(document).ready(function() { var sort = document.getElementById("sort"); var filter = document.getElementById("filter"); - var sortLimit = document.getElementsByClassName('reponsive-sorter-limiter')[0]; + var sortLimit = document.getElementsByClassName('pager')[0]; var layerFilter = document.getElementsByClassName('responsive-layred-filter')[0]; + layerFilter.style.display ="none"; + if(sort && filter) { sort.addEventListener("click", sortFilter); filter.addEventListener("click", sortFilter); @@ -84,7 +86,7 @@ sort.classList.remove("sort-icon"); sort.classList.add("icon-menu-close-adj"); - filter.classList.remove("icon-menu-close"); + filter.classList.remove("icon-menu-close-adj"); filter.classList.add("filter-icon"); sortLimit.style.display = "flex"; @@ -98,6 +100,8 @@ sort.classList.add("sort-icon"); layerFilter.style.display = "block"; + layerFilter.style.marginTop = "10px"; + sortLimit.style.display = "none"; } else { sort.classList.remove("icon-menu-close-adj"); diff --git a/packages/Webkul/Shop/src/Resources/views/products/list/toolbar.blade.php b/packages/Webkul/Shop/src/Resources/views/products/list/toolbar.blade.php index b93e40f6c..a0a3ee1de 100644 --- a/packages/Webkul/Shop/src/Resources/views/products/list/toolbar.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/list/toolbar.blade.php @@ -7,7 +7,12 @@ {{ __('shop::app.products.pager-info', ['showing' => $products->firstItem() . '-' . $products->lastItem(), 'total' => $products->total()]) }} - Men + Men + + + + +
@@ -32,12 +37,6 @@ @endif - -
- - -
-
@@ -76,41 +75,6 @@
-
- -
- - - -
- -
- - - -
- -
diff --git a/public/themes/default/assets/css/shop.css b/public/themes/default/assets/css/shop.css index 3b03c9279..2df5b4df1 100644 --- a/public/themes/default/assets/css/shop.css +++ b/public/themes/default/assets/css/shop.css @@ -120,17 +120,10 @@ height: 18px; } -@media only screen and (max-width: 425px) { - .product-card { - font-size: 90%; - } - .product-card .btn.btn-md { - padding: 5px; - } - .product-grid-4 { - grid-template-columns: 48.5% 48.5%; - grid-column-gap: 10px; - } +.icon-menu-close-adj { + background-image: url("../images/cross-icon-adj.svg"); + width: 32px; + height: 32px; } .add-to-wishlist .wishlist-icon:hover { @@ -380,143 +373,6 @@ body { margin-top: 90px; } -@media only screen and (max-width: 551px) { - .product-grid-3 { - grid-template-columns: 48.5% 48.5%; - grid-column-gap: 20px; - } -} - -@media only screen and (max-width: 840px) { - .layered-filter-wrapper, .responsive-layred-filter { - display: none; - } - .main .category-block { - width: 100% !important; - } - .main .category-block .top-toolbar { - border-bottom: 1px solid #C7C7C7; - } - .main .category-block .top-toolbar .page-info span:first-child { - display: none; - } - .main .category-block .top-toolbar .page-info span:last-child { - display: inline; - } - .main .category-block .top-toolbar .pager .view-mode { - margin-right: 0px; - } - .main .category-block .top-toolbar .pager .view-mode .grid-view, .main .category-block .top-toolbar .pager .view-mode .list-view { - display: none; - } - .main .category-block .top-toolbar .pager .view-mode .sort-filter { - cursor: pointer; - display: inline-block; - margin-top: 10px; - } - .main .category-block .top-toolbar .pager .sorter, .main .category-block .top-toolbar .pager .limiter { - display: none; - } - .main .category-block .reponsive-sorter-limiter { - display: none; - } - .main .category-block .reponsive-sorter-limiter select { - background: #FFFFFF; - border: 1px solid #C7C7C7; - border-radius: 3px; - color: #242424; - padding: 10px; - } -} - -.layered-filter-wrapper, .responsive-layred-filter { - width: 25%; - float: left; - padding-right: 20px; - min-height: 1px; -} - -.layered-filter-wrapper .filter-title, .responsive-layred-filter .filter-title { - border-bottom: 1px solid #C7C7C7; - color: #242424; - padding: 10px 0; -} - -.layered-filter-wrapper .filter-attributes .filter-attributes-item, .responsive-layred-filter .filter-attributes .filter-attributes-item { - border-bottom: 1px solid #C7C7C7; - padding-bottom: 10px; -} - -.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-title, .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-title { - padding: 10px 40px 0 10px; - color: #5E5E5E; - cursor: pointer; - position: relative; -} - -.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-title .remove-filter-link, .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-title .remove-filter-link { - font-weight: 400; - color: #0031F0; - margin-right: 10px; -} - -.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-title .icon, .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-title .icon { - background-image: url("../images/arrow-down.svg") !important; - width: 10px; - height: 10px; - position: absolute; - right: 15px; - top: 14px; -} - -.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content, .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content { - padding: 10px; - display: none; -} - -.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items, .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items { - padding: 0; - margin: 0; - list-style: none none; -} - -.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item, .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item { - padding: 8px 0; - color: #5E5E5E; -} - -.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox, .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox { - margin: 0; -} - -.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox .checkbox-view, .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox .checkbox-view { - height: 16px; - width: 16px; - background-image: url("../images/checkbox.svg"); -} - -.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox input:checked + .checkbox-view, .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox input:checked + .checkbox-view { - background-image: url("../images/checkbox-checked.svg"); -} - -.layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content .price-range-wrapper, .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content .price-range-wrapper { - margin-top: 21px; -} - -.layered-filter-wrapper .filter-attributes .filter-attributes-item.active .filter-attributes-content, .responsive-layred-filter .filter-attributes .filter-attributes-item.active .filter-attributes-content { - display: block; -} - -.layered-filter-wrapper .filter-attributes .filter-attributes-item.active .filter-attributes-title .icon, .responsive-layred-filter .filter-attributes .filter-attributes-item.active .filter-attributes-title .icon { - background-image: url("../images//arrow-up.svg") !important; -} - -.responsive-layred-filter { - width: 100%; - float: none; - padding-right: 0px; -} - .main-container-wrapper { max-width: 1300px; width: auto; @@ -545,6 +401,13 @@ body { grid-auto-rows: auto; } +@media only screen and (max-width: 551px) { + .main-container-wrapper .product-grid-3 { + grid-template-columns: 48.5% 48.5%; + grid-column-gap: 20px; + } +} + @media only screen and (max-width: 854px) { .main-container-wrapper .product-grid-4 { grid-template-columns: 29.5% 29.5% 29.5%; @@ -639,6 +502,19 @@ body { background: #2ED04C; } +@media only screen and (max-width: 425px) { + .main-container-wrapper .product-card { + font-size: 90%; + } + .main-container-wrapper .product-card .btn.btn-md { + padding: 5px; + } + .main-container-wrapper .product-grid-4 { + grid-template-columns: 48.5% 48.5%; + grid-column-gap: 10px; + } +} + .main-container-wrapper .product-list { min-height: 200px; } @@ -1322,8 +1198,35 @@ section.slider-block div.slider-content div.slider-control .light-right-icon { } @media all and (max-width: 720px) { - .header-bottom { - display: none !important; + .header .header-bottom { + height: auto; + display: none; + } + .header .header-bottom .nav a { + display: inline-block; + padding: 12px 4.8px 12px 8px; + } + .header .header-bottom ul.nav, .header .header-bottom .nav li { + height: auto; + } + .header .header-bottom .nav > li { + float: none; + } + .header .header-bottom .nav li ul { + padding-left: 20px; + } + .header .header-bottom .nav li > .icon { + float: right; + display: block; + } + .header .header-bottom .nav li a > .icon { + display: none; + } + .header .header-bottom .nav ul { + position: unset; + border: none; + -webkit-box-shadow: none; + box-shadow: none; } ul.search-container { display: none !important; @@ -1339,42 +1242,6 @@ section.slider-block div.slider-content div.slider-control .light-right-icon { display: -ms-flexbox !important; display: flex !important; } - .responsive-nav { - margin-top: 20px; - display: none; - } - .responsive-nav .nav a { - display: inline-block; - color: #242424; - text-decoration: none; - padding: 12px 4.8px 12px 8px; - text-transform: uppercase; - letter-spacing: 2px; - } - .responsive-nav .nav li > .icon { - float: right; - } - .responsive-nav .nav li a > .icon { - display: none; - } - .responsive-nav .nav > li { - border-bottom: 1px solid #C7C7C7; - } - .responsive-nav .nav li ul { - padding-left: 30px; - } - .responsive-nav .nav li:first-child { - border-top: 1px solid #C7C7C7; - } - .responsive-nav .nav > li:last-child { - float: none; - height: 45px; - display: none; - border: none; - } - .responsive-nav .nav > li:last-child img { - margin-right: 6px; - } } .footer { @@ -1460,6 +1327,95 @@ section.slider-block div.slider-content div.slider-control .light-right-icon { width: 100%; } +.main .category-container .layered-filter-wrapper, .main .category-container .responsive-layred-filter { + width: 25%; + float: left; + padding-right: 20px; + min-height: 1px; +} + +.main .category-container .layered-filter-wrapper .filter-title, .main .category-container .responsive-layred-filter .filter-title { + border-bottom: 1px solid #C7C7C7; + color: #242424; + padding: 10px 0; +} + +.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item, .main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item { + border-bottom: 1px solid #C7C7C7; + padding-bottom: 10px; +} + +.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-title, .main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-title { + padding: 10px 40px 0 10px; + color: #5E5E5E; + cursor: pointer; + position: relative; +} + +.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-title .remove-filter-link, .main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-title .remove-filter-link { + font-weight: 400; + color: #0031F0; + margin-right: 10px; +} + +.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-title .icon, .main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-title .icon { + background-image: url("../images/arrow-down.svg") !important; + width: 10px; + height: 10px; + position: absolute; + right: 15px; + top: 14px; +} + +.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content, .main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content { + padding: 10px; + display: none; +} + +.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items, .main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items { + padding: 0; + margin: 0; + list-style: none none; +} + +.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item, .main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item { + padding: 8px 0; + color: #5E5E5E; +} + +.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox, .main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox { + margin: 0; +} + +.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox .checkbox-view, .main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox .checkbox-view { + height: 16px; + width: 16px; + background-image: url("../images/checkbox.svg"); +} + +.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox input:checked + .checkbox-view, .main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content ol.items li.item .checkbox input:checked + .checkbox-view { + background-image: url("../images/checkbox-checked.svg"); +} + +.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item .filter-attributes-content .price-range-wrapper, .main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item .filter-attributes-content .price-range-wrapper { + margin-top: 21px; +} + +.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item.active .filter-attributes-content, .main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item.active .filter-attributes-content { + display: block; +} + +.main .category-container .layered-filter-wrapper .filter-attributes .filter-attributes-item.active .filter-attributes-title .icon, .main .category-container .responsive-layred-filter .filter-attributes .filter-attributes-item.active .filter-attributes-title .icon { + background-image: url("../images//arrow-up.svg") !important; +} + +.main .category-container .responsive-layred-filter { + display: none; + width: 100%; + float: none; + padding-right: 0px; +} + .main .category-container .category-block { width: 80%; display: block; @@ -1488,12 +1444,12 @@ section.slider-block div.slider-content div.slider-control .light-right-icon { line-height: 45px; } -.main .top-toolbar .page-info span:first-child { - display: inline; +.main .top-toolbar .page-info span { + display: none; } -.main .top-toolbar .page-info span:last-child { - display: none; +.main .top-toolbar .page-info span:first-child { + display: inline; } .main .top-toolbar .pager { @@ -1539,14 +1495,6 @@ section.slider-block div.slider-content div.slider-control .light-right-icon { display: inline-block; } -.main .reponsive-sorter-limiter { - display: none; -} - -.main .responsive-layred-filter { - display: none; -} - .main .bottom-toolbar { display: block; margin-top: 40px; @@ -1554,6 +1502,48 @@ section.slider-block div.slider-content div.slider-control .light-right-icon { text-align: center; } +@media only screen and (max-width: 840px) { + .main .layered-filter-wrapper, .main .category-container .responsive-layred-filter { + display: none; + } + .main .category-block { + width: 100% !important; + } + .main .category-block .top-toolbar { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; + } + .main .category-block .top-toolbar .page-info { + border-bottom: 1px solid #C7C7C7; + line-height: 15px; + } + .main .category-block .top-toolbar .page-info span { + display: inline; + } + .main .category-block .top-toolbar .page-info span:first-child { + display: none; + } + .main .category-block .top-toolbar .page-info .sort-filter { + float: right; + cursor: pointer; + } + .main .category-block .top-toolbar .pager { + margin-top: 20px; + display: none; + } + .main .category-block .top-toolbar .pager .view-mode { + display: none; + } + .main .category-block .responsive-layred-filter { + display: block; + } +} + section.product-detail { color: #242424; } @@ -2757,6 +2747,40 @@ section.review .review-layouter .review-form .review-detail .rating-calculate .p border-bottom: 1px solid #C7C7C7; } +@media only screen and (max-width: 770px) { + .sale-container .sale-section .section-content .row { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; + } + .sale-container .sale-section .section-content .row .title { + line-height: 20px; + } + .sale-container .sale-section .section-content .totals .sale-summary { + width: 100%; + } + .sale-container .sale-section .section-content .totals .sale-summary tr td:nth-child(2) { + display: none; + } + .sale-container .sale-section .section-content .order-box-container { + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -ms-flex-direction: column; + flex-direction: column; + } + .sale-container .sale-section .section-content .order-box-container .box { + width: 100%; + margin: 10px auto; + } +} + @media only screen and (max-width: 770px) { .account-content { -webkit-box-orient: vertical; From 832d75485f2c72cda7188e39d12bc645d5834813 Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Thu, 25 Oct 2018 10:13:26 +0530 Subject: [PATCH 6/6] product review --- .../assets/js/components/category-item.vue | 2 +- .../Shop/src/Resources/assets/sass/app.scss | 430 +++++++++++------- .../Webkul/Shop/src/Resources/lang/en/app.php | 3 + .../account/address/address.blade.php | 1 + .../customers/account/address/edit.blade.php | 4 +- .../customers/account/orders/index.blade.php | 2 + .../customers/account/orders/view.blade.php | 87 ++++ .../customers/account/profile/index.blade.php | 2 +- .../customers/account/reviews/index.blade.php | 2 +- .../views/layouts/header/index.blade.php | 4 - .../views/products/reviews/create.blade.php | 41 +- .../views/products/reviews/index.blade.php | 174 +++---- .../views/products/reviews/product.blade.php | 1 - public/themes/default/assets/css/shop.css | 375 +++++++++------ public/themes/default/assets/js/shop.js | 2 +- 15 files changed, 706 insertions(+), 424 deletions(-) delete mode 100644 packages/Webkul/Shop/src/Resources/views/products/reviews/product.blade.php diff --git a/packages/Webkul/Shop/src/Resources/assets/js/components/category-item.vue b/packages/Webkul/Shop/src/Resources/assets/js/components/category-item.vue index 31126425b..5c5ef5f18 100644 --- a/packages/Webkul/Shop/src/Resources/assets/js/components/category-item.vue +++ b/packages/Webkul/Shop/src/Resources/assets/js/components/category-item.vue @@ -4,7 +4,7 @@ {{ this.item['translations'][0].name }}  -
    diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index a8c5a7371..728a59da9 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -738,10 +738,6 @@ section.slider-block { border-top: 1px solid $border-color; } } - - .responsive-nav { - display: none; - } } @media all and (max-width: 720px) { @@ -753,7 +749,6 @@ section.slider-block { .nav a { display:inline-block; - padding: 12px 4.8px 12px 8px; } ul.nav , .nav li{ @@ -764,15 +759,20 @@ section.slider-block { float: none; } - .nav li ul { - padding-left: 20px; - } + // .nav li ul { + // padding-left: 20px; + // } .nav li > .icon{ float: right; display: block; } + .nav li .left{ + height: 16px; + width: 16px; + } + .nav li a > .icon{ display: none; } @@ -782,6 +782,11 @@ section.slider-block { border: none; box-shadow: none; } + + .nav > li li:hover > ul { + margin-left: 0px; + top: 0px; + } } } @@ -1360,7 +1365,6 @@ section.product-detail { margin-right: 0px; .thumb-frame { - img { height: 100%; width: auto; @@ -1392,11 +1396,8 @@ section.product-detail { } @media only screen and (max-width: 510px){ - section.product-detail div.layouter form { - div.product-image-group { - .product-hero-image img { width: 100% !important; } @@ -1892,49 +1893,37 @@ section.cart { // review page start here section.review { - color: $font-color; - .category-breadcrumbs { display: inline; } .review-layouter { display: flex; - flex-direction: row; .product-info { + font-size: 24px; .product-image { img { - display: block; height: 280px; width: 280px; } } - .product-name { - margin-top: 20px; - - span { - font-size: 24px; - } - } - .product-price { - margin-top: 10px; - .pro-price { - font-size: 24px; color: $disc-price; } .pro-price-not { margin-left: 10px; + font-size: 16px; color: $disc-price-pro; } .offer { margin-left: 10px; + font-size: 16px; } } } @@ -1944,69 +1933,41 @@ section.review { width: 49%; .heading { - margin-top: 10px; + color: #242424; + font-weight: 600; - .btn.btn-primary.right { + .right { float: right; margin-top: -10px; } } .rating { - margin-top : 25px; color: $font-color-light; - - span { - display: inline; - } - } - - .stars { - - width: 270px; - display: inline-block; - label.star { - font-size: 36px; - color: #d4d4d4; - transition: all .2s; + font-size: 25px; + color: #d4d4d4; + transition: all .2s; } label.star:before { content: '\2605'; } - } .write-review { - margin-top: 25px; - - .control-group { - margin-bottom: 0px; - - textarea { - margin-top: 5px; - border: 2px solid $border-color; - border-radius: 3px; - width: 600px; - height: 120px; - } + label { + color: $font-color-light; + font-size: 16px; } - } - - .submit-button { - margin-top: 10px; - - button { - background: $brand-color; - font-size: 14px; - color: $background-color; - - text-align: center; - width: 120px; - height: 38px; - border: none; + textarea { + margin-top: 5px; + border: 2px solid $border-color; + color: $font-color-light; + border-radius: 3px; + width: 90%; + height: 120px; } } @@ -2023,17 +1984,14 @@ section.review { width: 48%; .avg-rating-count{ - span { font-size: 34px; - text-align: center; } } } .rating-calculate { - .progress-only { width:20px; border: 1px solid blue; @@ -2041,10 +1999,123 @@ section.review { } } } + + .ratings-reviews { + display: flex; + align-items: center; + justify-content: space-between; + + .left-side { + padding: 40px 20px 40px 20px; + width: 50%; + + .rate { + font-size: 34px; + } + + .stars.icon { + height: 16px; + width: 16px; + } + } + + .right-side { + width: 50%; + + .rater { + display: inline-flex; + align-items: center; + padding-top: 5px; + width: 100%; + + .star-name { + margin-right: 5px; + } + + .rate-number { + width:15px; + } + + .percentage { + width: 15%; + margin-right: 10px; + + span { + float: right; + white-space: nowrap; + } + } + + .line-bar { + height: 4px; + width: 65%; + margin-right: 5px; + background: #D8D8D8; + + .line-value { + background-color: #0031F0; + } + } + } + } + } } } // review page end here +// review responsive css start here +@media only screen and (max-width: 770px) { + section.review { + .category-breadcrumbs{ + display: none; + } + + .review-layouter { + flex-direction: column; + + .product-info .product-image { + max-width: 280px; + margin-left: auto; + margin-right: auto; + } + + .review-form { + width: 100%; + margin-left: 0px; + + .heading .right { + margin-top: 50px; + } + + .ratings-reviews { + flex-direction: column; + width: 100%; + + .left-side { + width: 100%; + padding: 0px 0px 40px 0px; + margin-top: -50px; + } + + .right-side { + width: 100%; + + .rater .line-bar { + width: 100%; + } + + .rater .percentage { + width: 10%; + margin-right: 0px; + } + } + } + } + } + } +} +//review responsive css end here + //customers auth page css goes here .auth-content { @@ -2180,6 +2251,88 @@ section.review { .account-head { margin-bottom: 20px; + + .back-icon { + display: none; + } + } + } +} + +//customer account page responsive layout +@media only screen and (max-width: 770px) { + .account-content { + flex-direction: column; + + .account-side-menu { + display: none; + width:100%; + border: none; + + li { + margin-left: 0%; + width: 100%; + + a { + color : $font-color; + } + } + } + + .responsive-side-menu { + cursor: pointer; + padding-top:13px; + display: block; + height: 46px; + border-bottom: 1px solid $border-color; + border-top: 1px solid $border-color; + + .right { + float: right; + } + } + + .account-layout { + margin-left: 0%; + margin-top: 20px; + + .account-head { + display: flex; + justify-content: space-between; + border-bottom: 1px solid $border-color; + border-top: 1px solid $border-color; + height: 46px; + + .back-icon { + display: block; + } + + span { + margin-top: 12px; + font-size: 18px; + } + + .horizontal-rule { + display: none; + } + } + + .account-table-content { + margin-top: 2%; + + table tbody tr { + display: grid; + margin-bottom: 20px; + } + } + } + + .account-items-list , .edit-form { + margin-top: 20px; + } + + .control-group .control { + width: 100%; } } } @@ -2258,7 +2411,6 @@ section.review { color: #8E8E8E; } - .box-content { color: #3A3A3A; } @@ -2268,6 +2420,10 @@ section.review { .qty-row { display: block; } + + .responsive-table { + display: none; + } } } @@ -2318,38 +2474,41 @@ section.review { } } - // .table { - // table { - // display: flex; - // border: none; + .table{ + display: none; + } - // tr { - // display: grid; - // } + .responsive-table { + border: 1px solid $border-color; + margin-top: 5px; + width: 100%; + display: block; - // thead th , tbody td { - // font-weight: 700; - // padding: 12px 0px; - // background: none; - // color: $font-color; - // } - // } - // } + tbody td { + padding: 8px 5px; + + &:first-child { + width: 25%; + } + + &:last-child { + padding-left: 10px; + } + } + } .totals { .sale-summary { width: 100%; - tr { - td { - &:nth-child(2) { - display: none; - } - + tr td { + &:nth-child(2) { + display: none; } } } } + .order-box-container { display: flex; flex-direction: column; @@ -2364,85 +2523,6 @@ section.review { } } - - -@media only screen and (max-width: 770px) { - .account-content { - flex-direction: column; - - .account-side-menu { - display: none; - width:100%; - border: none; - - li { - margin-left: 0%; - width: 100%; - - a { - color : $font-color; - } - } - } - - .responsive-side-menu { - cursor: pointer; - padding-top:13px; - display: block; - height: 46px; - border-bottom: 1px solid $border-color; - border-top: 1px solid $border-color; - - .right { - float: right; - } - } - - .account-layout { - margin-left: 0%; - margin-top: 20px; - - .account-head { - display: flex; - justify-content: space-between; - border-bottom: 1px solid $border-color; - border-top: 1px solid $border-color; - height: 46px; - - .back-icon { - display: block; - } - - span { - margin-top: 12px; - font-size: 18px; - } - - .horizontal-rule { - display: none; - } - } - - .account-table-content { - margin-top: 2%; - - table tbody tr { - display: grid; - margin-bottom: 20px; - } - } - } - - .account-items-list , .edit-form { - margin-top: 20px; - } - - .control-group .control { - width: 100%; - } - } -} - // css for loader .cp-spinner { margin-left: 46%; diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php index 7af6c6919..b43e2a085 100644 --- a/packages/Webkul/Shop/src/Resources/lang/en/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php @@ -17,6 +17,9 @@ return [ 'add-review-page-title' => 'Add Review', 'write-review' => 'Write a review', 'review-title' => 'Give Your Review a Title', + 'product-review-page-title' => 'Product Review', + 'rating-reviews' => 'Rating & Reviews', + 'submit' => 'SUBMIT', ], 'customer' => [ diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/address.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/address.blade.php index 26caedc2d..5a2a87908 100644 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/address/address.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/address/address.blade.php @@ -13,6 +13,7 @@