diff --git a/packages/Webkul/Velocity/publishable/assets/css/velocity.css b/packages/Webkul/Velocity/publishable/assets/css/velocity.css index b78ee354d..d7baffcc9 100644 --- a/packages/Webkul/Velocity/publishable/assets/css/velocity.css +++ b/packages/Webkul/Velocity/publishable/assets/css/velocity.css @@ -724,9 +724,9 @@ } .btn-add-to-cart { - padding: 8px; - color: #fff !important; + padding: 8px !important; border-radius: 0px !important; + color: #FFFFFF !important; border-color: #26A37C !important; background-color: #26A37C !important; } @@ -1285,7 +1285,7 @@ top: 44px; z-index: 100; width: 350px; - left: -230px; + left: -265px; position: absolute; } @@ -1296,6 +1296,14 @@ position: relative; } +#cart-modal-content .mini-cart-container { + height: 100%; + font-size: 14px; + max-height: 200px; + overflow-y: scroll; + padding: 10px 15px 0 20px; +} + #cart-modal-content .small-card-container { margin: 0; width: 100%; @@ -1356,6 +1364,7 @@ .cart-details .cart-details-header .cart-header { max-height: 45px; margin-bottom: 20px; + padding-bottom: 20px !important; border-bottom: 2px solid #E5E5E5; } @@ -1805,6 +1814,9 @@ .order-summary-container { padding-top: 25px; + height: -webkit-max-content; + height: -moz-max-content; + height: max-content; max-width: 500px !important; } @@ -1892,6 +1904,7 @@ } .product-price .regular-price { + font-weight: 500; margin-right: 10px; text-decoration: line-through; } @@ -1911,6 +1924,8 @@ .method-sticker { font-size: 13px; padding: 4px 8px; + margin-right: 3px; + margin-bottom: 3px; text-align: center; border-radius: 1px; display: inline-block; @@ -1919,13 +1934,10 @@ } .sidebar { + z-index: 1000000; width: 230px; } -.sidebar .category-content { - margin-bottom: 10px; -} - .sidebar .category-content .category-title { top: -1px; font-weight: 600; @@ -1959,8 +1971,53 @@ display: none; } +.category-list-container { + z-index: 10; + padding: 0px !important; + background: #FFFFFF; + position: absolute !important; + -webkit-box-shadow: 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); + box-shadow: 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); +} + +.category-list-container .category { + width: 100%; + line-height: 2.5rem; + display: inline-block; +} + +.category-list-container .category span { + top: -4px; + position: relative; +} + +.category-list-container li { + padding: 7px 0 5px 15px; +} + +.category-list-container li:hover { + background: #ECECEC; +} + +.category-list-container .sub-categories { + top: 0px; + left: 100%; + z-index: 100; + padding-top: 10px; + position: absolute; + background: #FFFFFF; + border-left: 1px solid #CCCCCC; + -webkit-box-shadow: 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); + box-shadow: 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); +} + +.category-list-container .sub-categories li:nth-last-of-type(1) { + margin-bottom: 10px; +} + #sidebar-level-0 { display: none; + z-index: 100000; border-top: 1px solid #CCCCCC; } @@ -2259,6 +2316,10 @@ box-shadow: none; } +.slides-container .VueCarousel-pagination .VueCarousel-dot { + padding: 5px !important; +} + .slides-container .VueCarousel-dot--active { background-color: #26A37C !important; } @@ -2309,65 +2370,6 @@ body .container-margin { margin: auto 20px; } -.account-modal { - right: 10px; - z-index: 100; - width: 350px !important; - position: absolute !important; -} - -.account-modal .theme-btn, .account-modal .cart-details .continue-shopping-btn, .cart-details .account-modal .continue-shopping-btn, .account-modal .account-content .account-layout .bottom-toolbar .pagination .page-item, .account-content .account-layout .bottom-toolbar .pagination .account-modal .page-item { - padding: .5rem .9rem; -} - -.account-modal .modal-footer .text-left { - padding-left: 5px; -} - -.category-list-container { - z-index: 10; - padding: 0px !important; - background: #FFFFFF; - position: absolute !important; - -webkit-box-shadow: inset -1px 0 0 0 #ECECEC; - box-shadow: inset -1px 0 0 0 #ECECEC; -} - -.category-list-container .category { - width: 100%; - line-height: 2.5rem; - display: inline-block; -} - -.category-list-container .category span { - top: -4px; - position: relative; -} - -.category-list-container li { - padding: 7px 0 5px 15px; -} - -.category-list-container li:hover { - background: #ECECEC; -} - -.category-list-container .sub-category-container { - position: relative; -} - -.category-list-container .sub-categories { - top: -40px; - left: 100%; - z-index: 100; - padding-top: 10px; - position: absolute; - background: #FFFFFF; - border-left: 1px solid #CCCCCC; - -webkit-box-shadow: inset -1px 0 0 0 #ECECEC; - box-shadow: inset -1px 0 0 0 #ECECEC; -} - .root-category-menu { border-bottom: solid 1px #d8e6ed; } @@ -2623,7 +2625,7 @@ header #search-form > *:focus { /* category with custom option */ /* hot & popular categories */ .hot-categories-container .hot-category-wrapper { - padding: 0 10px 15px 0; + padding: 0 10px 0 0; } .hot-categories-container .hot-category-wrapper .card { @@ -2648,11 +2650,11 @@ header #search-form > *:focus { } .hot-categories-container .hot-category-wrapper:nth-last-child(2) { - padding: 15px 0 15px 0px; + padding: 0 0 0 0px; } .hot-categories-container .hot-category-wrapper:last-child { - padding: 15px 0 15px 10px; + padding: 0 0 0 10px; } .hot-categories-container ul, @@ -2690,8 +2692,7 @@ header #search-form > *:focus { } .popular-categories-container .popular-category-wrapper .card-description { - padding: 25px; - margin-top: 15px; + padding: 10px 20px; } .popular-categories-container .popular-category-wrapper:first-child { @@ -2767,6 +2768,7 @@ header #search-form > *:focus { .categories-sidebar-container .content-list { margin: 0; width: 100%; + height: 42px; text-align: left; list-style: none; position: relative; @@ -2777,7 +2779,6 @@ header #search-form > *:focus { .categories-sidebar-container .content-list ul { width: 100%; height: 100%; - padding-left: 10px; display: -webkit-inline-box; display: -ms-inline-flexbox; display: inline-flex; @@ -2789,11 +2790,15 @@ header #search-form > *:focus { cursor: pointer; font-size: 16px; font-weight: 600; + padding: 8px 15px; letter-spacing: 0; position: relative; color: #FFFFFF; text-decoration: none; - padding: 8px 20px 8px 5px; +} + +.categories-sidebar-container .content-list ul li:hover { + background-color: #42719a; } .velocity-divide-page { @@ -3361,6 +3366,10 @@ body::after { cursor: pointer; } +.cursor-default { + cursor: default; +} + .grey { color: #9e9e9e; } @@ -3663,6 +3672,12 @@ body::after { .small-card-container { cursor: pointer; margin-bottom: 10px; + margin-left: 0 !important; + margin-right: 0 !important; +} + +.small-card-container .material-icons { + font-size: 16px; } .small-card-container .product-image-container { @@ -3680,6 +3695,11 @@ body::after { padding: 10px 0 !important; } +.small-card-container .sticker, +.small-card-container .regular-price { + display: none; +} + .small-card-container:hover { -webkit-box-shadow: 0 6px 14px 0 rgba(0, 0, 0, 0.14); box-shadow: 0 6px 14px 0 rgba(0, 0, 0, 0.14); @@ -3809,6 +3829,8 @@ a.default { .scrollable { max-height: 100vh; overflow-y: scroll; + scrollbar-width: none; + -ms-overflow-style: none; } .scrollable::-webkit-scrollbar { @@ -3876,8 +3898,13 @@ button[disabled] { font-family: 'Webkul Rango' !important; } +.max-height-350 { + max-height: 350px; +} + .product-detail { padding-top: 20px; + margin-bottom: 60px; } .product-detail .magnifier > img { @@ -3898,6 +3925,10 @@ button[disabled] { padding: 0 15px; } +.product-detail .right .reviews { + vertical-align: top; +} + .product-detail .right .reviews > div { display: inline-block; } @@ -4012,10 +4043,21 @@ button[disabled] { vertical-align: middle; } +.store-meta-images { + margin-top: 20px; +} + +.store-meta-images img { + width: 100%; + height: 100%; + max-height: 300px; +} + @media only screen and (max-width: 1100px) { .footer .footer-content .newsletter-subscription .newsletter-wrapper .social-icons { width: 100%; padding: 5px 0; + text-align: center !important; } .footer .footer-content .newsletter-subscription .newsletter-wrapper .subscribe-newsletter { width: 100%; @@ -11006,7 +11048,7 @@ button.close { outline: 0; } -.modal.fade .modal-dialog, .modal.fade .account-modal { +.modal.fade .modal-dialog, .modal.fade #top #account + .account-modal, #top .modal.fade #account + .account-modal { -webkit-transform: translate(0, -25%); transform: translate(0, -25%); -webkit-transition: -webkit-transform 0.3s ease-out; @@ -11015,7 +11057,7 @@ button.close { transition: transform 0.3s ease-out, -webkit-transform 0.3s ease-out; } -.modal.in .modal-dialog, .modal.in .account-modal { +.modal.in .modal-dialog, .modal.in #top #account + .account-modal, #top .modal.in #account + .account-modal { -webkit-transform: translate(0, 0); transform: translate(0, 0); } @@ -11025,7 +11067,7 @@ button.close { overflow-y: auto; } -.modal-dialog, .account-modal { +.modal-dialog, #top #account + .account-modal { position: relative; width: auto; margin: 10px; @@ -11137,7 +11179,7 @@ button.close { } @media (min-width: 768px) { - .modal-dialog, .account-modal { + .modal-dialog, #top #account + .account-modal { width: 600px; margin: 30px auto; } @@ -12213,7 +12255,23 @@ body { } #top #account + .account-modal { - height: 135px; + right: 10px; + z-index: 100; + height: -webkit-max-content; + height: -moz-max-content; + height: max-content; + width: 290px !important; + position: absolute !important; +} + +#top #account + .account-modal .theme-btn, #top #account + .account-modal .cart-details .continue-shopping-btn, .cart-details #top #account + .account-modal .continue-shopping-btn, #top #account + .account-modal .account-content .account-layout .bottom-toolbar .pagination .page-item, .account-content .account-layout .bottom-toolbar .pagination #top #account + .account-modal .page-item { + padding: .5rem .9rem; +} + +#top #account + .account-modal .modal-footer { + -webkit-box-pack: unset; + -ms-flex-pack: unset; + justify-content: unset; } #top > div:last-child { @@ -12338,6 +12396,7 @@ header #search-form { height: 40px; margin: 5px 0px; background: #FFFFFF; + padding: 4px 1px 0px 0px; } header #search-form * { diff --git a/packages/Webkul/Velocity/publishable/assets/js/velocity.js b/packages/Webkul/Velocity/publishable/assets/js/velocity.js index d1c5651f8..8b0641783 100644 --- a/packages/Webkul/Velocity/publishable/assets/js/velocity.js +++ b/packages/Webkul/Velocity/publishable/assets/js/velocity.js @@ -35539,9 +35539,11 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); // // // +// +// /* harmony default export */ __webpack_exports__["default"] = ({ - props: ['id', 'url', 'addClass', 'categories', 'mainSidebar', 'categoryCount'], + props: ['id', 'url', 'addClass', 'parentSlug', 'categories', 'mainSidebar', 'categoryCount'], data: function data() { var slicedCategories = this.categories; @@ -35551,6 +35553,8 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); slicedCategories = this.categories.slice(0, categoryCount); } + if (this.parentSlug) slicedCategories['parentSlug'] = this.parentSlug; + return { slicedCategories: slicedCategories, sidebarLevel: Math.floor(Math.random() * 1000) @@ -35621,7 +35625,13 @@ var render = function() { staticClass: "category unset", class: category.children.length > 0 ? "fw6" : "", attrs: { - href: _vm.url + "/" + category["translations"][0].slug + href: + _vm.url + + "/" + + (_vm.slicedCategories.parentSlug + ? _vm.slicedCategories.parentSlug + "/" + : "") + + category["translations"][0].slug } }, [ @@ -35698,9 +35708,12 @@ var render = function() { _c("sidebar-component", { attrs: { url: _vm.url, + categories: category.children, id: "sidebar-level-" + (_vm.sidebarLevel + index), - categories: category.children + "parent-slug": category.parentSlug + ? category.parentSlug + : category["translations"][0].slug } }) ], @@ -35801,7 +35814,11 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); // /* harmony default export */ __webpack_exports__["default"] = ({ - props: ['slidesCount', 'slidesPerPage', 'navigationEnabled', 'paginationEnabled', 'addClass'] + props: ['id', 'addClass', 'slidesCount', 'slidesPerPage', 'navigationEnabled', 'paginationEnabled'], + + data: function data() { + return {}; + } }); /***/ }), diff --git a/packages/Webkul/Velocity/src/Database/Migrations/2020_01_10_122226_update_velocity_meta_data.php b/packages/Webkul/Velocity/src/Database/Migrations/2020_01_10_122226_update_velocity_meta_data.php new file mode 100644 index 000000000..73a3e3548 --- /dev/null +++ b/packages/Webkul/Velocity/src/Database/Migrations/2020_01_10_122226_update_velocity_meta_data.php @@ -0,0 +1,32 @@ +json('product_view_images')->nullable(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('velocity_meta_data', function (Blueprint $table) { + $table->dropColumn('product_view_images'); + }); + } +} diff --git a/packages/Webkul/Velocity/src/Database/Seeders/VelocityMetaDataSeeder.php b/packages/Webkul/Velocity/src/Database/Seeders/VelocityMetaDataSeeder.php index 769c14dbc..ab5b67390 100644 --- a/packages/Webkul/Velocity/src/Database/Seeders/VelocityMetaDataSeeder.php +++ b/packages/Webkul/Velocity/src/Database/Seeders/VelocityMetaDataSeeder.php @@ -18,11 +18,11 @@ class VelocityMetaDataSeeder extends Seeder 'footer_left_content' => trans('velocity::app.admin.meta-data.footer-left-raw-content'), - 'footer_middle_content' => '
', + 'footer_middle_content' => '
', 'slider' => 1, - 'subscription_bar_content' => '
' + 'subscription_bar_content' => '
' ]); } } diff --git a/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php b/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php index b8282ec2c..d75f87bf0 100644 --- a/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php +++ b/packages/Webkul/Velocity/src/Http/Controllers/Admin/ConfigurationController.php @@ -64,11 +64,18 @@ class ConfigurationController extends Controller foreach ($params['images'] as $index => $advertisement) { if ($advertisement['image_1'] !== "") { - $params['advertisement'][$index] = $this->uploadImages($advertisement, $index); + $params['advertisement'][$index] = $this->uploadAdvertisementImages($advertisement, $index); + } + } + + foreach ($params['product_view_images'] as $index => $productViewImage) { + if ($productViewImage !== "") { + $params['product_view_images'][$index] = $this->uploadImage($productViewImage, $index); } } $params['advertisement'] = json_encode($params['advertisement']); + $params['product_view_images'] = json_encode($params['product_view_images']); $params['home_page_content'] = str_replace('=>', '=>', $params['home_page_content']); unset($params['images']); @@ -82,11 +89,12 @@ class ConfigurationController extends Controller return redirect()->route($this->_config['redirect']); } - public function uploadImages($data, $index) + public function uploadAdvertisementImages($data, $index) { $type = 'images'; $request = request(); + $advertisement = []; foreach ($data as $imageId => $image) { $file = $type . '.' . $index . '.' . $imageId; $dir = "velocity/$type"; @@ -100,4 +108,22 @@ class ConfigurationController extends Controller return $advertisement; } + + public function uploadImage($data, $index) + { + $type = 'product_view_images'; + $request = request(); + + $image = ''; + $file = $type . '.' . $index; + $dir = "velocity/$type"; + + if ($request->hasFile($file)) { + Storage::delete($dir . $file); + + $image = $request->file($file)->store($dir); + } + + return $image; + } } \ No newline at end of file diff --git a/packages/Webkul/Velocity/src/Http/Controllers/Shop/SearchController.php b/packages/Webkul/Velocity/src/Http/Controllers/Shop/SearchController.php deleted file mode 100644 index 046ccf4b9..000000000 --- a/packages/Webkul/Velocity/src/Http/Controllers/Shop/SearchController.php +++ /dev/null @@ -1,54 +0,0 @@ - @shubhwebkul - * @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com) - */ - class SearchController extends Controller -{ - /** - * Contains route related configuration - * - * @var array - */ - protected $_config; - - /** - * SearchRepository object - * - * @var Object - */ - protected $searchRepository; - - /** - * Create a new controller instance. - * - * @param \Webkul\Product\Repositories\SearchRepository $searchRepository - * @return void - */ - public function __construct(SearchRepository $searchRepository) - { - $this->_config = request('_config'); - - $this->searchRepository = $searchRepository; - } - - /** - * Index to handle the view loaded with the search results - * - * @return \Illuminate\View\View - */ - public function index() - { - $results = $this->searchRepository->search(request()->all()); - - return view($this->_config['view'])->with('results', $results ? $results : null); - } -} diff --git a/packages/Webkul/Velocity/src/Http/Controllers/Shop/ShopController.php b/packages/Webkul/Velocity/src/Http/Controllers/Shop/ShopController.php new file mode 100644 index 000000000..3f92755c6 --- /dev/null +++ b/packages/Webkul/Velocity/src/Http/Controllers/Shop/ShopController.php @@ -0,0 +1,95 @@ + @shubhwebkul + * @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com) + */ + class ShopController extends Controller +{ + /** + * Contains route related configuration + * + * @var array + */ + protected $_config; + + /** + * SearchRepository object + * + * @var SearchRepository + */ + protected $searchRepository; + + /** + * ProductRepository object + * + * @var ProductRepository + */ + protected $productRepository; + + + /** + * Create a new controller instance. + * + * @param \Webkul\Product\Repositories\SearchRepository $searchRepository + * @return void + */ + public function __construct( + SearchRepository $searchRepository, + ProductRepository $productRepository + ) { + $this->_config = request('_config'); + + $this->searchRepository = $searchRepository; + $this->productRepository = $productRepository; + } + + /** + * Index to handle the view loaded with the search results + * + * @return \Illuminate\View\View + */ + public function search() + { + $results = $this->searchRepository->search(request()->all()); + + return view($this->_config['view'])->with('results', $results ? $results : null); + } + + public function fetchProductDetails($slug) + { + $product = $this->productRepository->findBySlug($slug); + + if ($product) { + $productReviewHelper = app('Webkul\Product\Helpers\Review'); + $productImageHelper = app('Webkul\Product\Helpers\ProductImage'); + + $response = [ + 'status' => true, + 'details' => [ + 'name' => $product->name, + 'urlKey' => $product->url_key, + 'priceHTML' => $product->getTypeInstance()->getPriceHtml(), + 'totalReviews' => $productReviewHelper->getTotalReviews($product), + 'rating' => ceil($productReviewHelper->getAverageRating($product)), + 'image' => $productImageHelper->getProductBaseImage($product)['small_image_url'], + ] + ]; + } else { + $response = [ + 'status' => false + ]; + } + + return $response; + } +} diff --git a/packages/Webkul/Velocity/src/Http/admin-routes.php b/packages/Webkul/Velocity/src/Http/admin-routes.php index 06da1f6a7..ee90c2d07 100644 --- a/packages/Webkul/Velocity/src/Http/admin-routes.php +++ b/packages/Webkul/Velocity/src/Http/admin-routes.php @@ -43,10 +43,4 @@ Route::group(['middleware' => ['web']], function () { }); }); }); - - Route::group(['middleware' => ['theme']], function () { - Route::get('/search', 'Webkul\Velocity\Http\Controllers\Shop\SearchController@index')->defaults('_config', [ - 'view' => 'velocity::search.search' - ])->name('shop.search.index'); - }); }); \ No newline at end of file diff --git a/packages/Webkul/Velocity/src/Http/front-routes.php b/packages/Webkul/Velocity/src/Http/front-routes.php new file mode 100644 index 000000000..ce689a927 --- /dev/null +++ b/packages/Webkul/Velocity/src/Http/front-routes.php @@ -0,0 +1,14 @@ + ['web']], function () { + Route::group(['middleware' => ['theme']], function () { + Route::namespace('Webkul\Velocity\Http\Controllers\Shop')->group(function () { + // Content Pages Route + Route::get('/product-details/{slug}', 'ShopController@fetchProductDetails')->name('velocity.shop.product'); + }); + + Route::get('/search', 'ShopController@search')->defaults('_config', [ + 'view' => 'velocity::search.search' + ])->name('shop.search.index'); + }); +}); \ No newline at end of file diff --git a/packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php b/packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php index e78968185..5ae5917a5 100644 --- a/packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php +++ b/packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php @@ -27,6 +27,7 @@ class VelocityServiceProvider extends ServiceProvider { include __DIR__ . '/../Http/helpers.php'; include __DIR__ . '/../Http/admin-routes.php'; + include __DIR__ . '/../Http/front-routes.php'; $this->app->register(EventServiceProvider::class); @@ -46,7 +47,7 @@ class VelocityServiceProvider extends ServiceProvider $velocityHelper = app('Webkul\Velocity\Helpers\Helper'); $velocityMetaData = $velocityHelper->getVelocityMetaData(); - view()->share('showRecentlyViewed', false); + view()->share('showRecentlyViewed', true); view()->share('velocityMetaData', $velocityMetaData); } diff --git a/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/carousel.vue b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/carousel.vue index ff5977013..5ed6909fd 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/carousel.vue +++ b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/carousel.vue @@ -20,11 +20,16 @@ \ No newline at end of file diff --git a/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/sidebar.vue b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/sidebar.vue index 359f9c8ce..d91b79537 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/sidebar.vue +++ b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/sidebar.vue @@ -15,10 +15,11 @@ @mouseout="toggleSidebar(id, $event, 'mouseout')" @mouseover="toggleSidebar(id, $event, 'mouseover')"> + + :href="`${url}/${slicedCategories.parentSlug ? slicedCategories.parentSlug + '/' : ''}${category['translations'][0].slug}`">
+ :parent-slug="category.parentSlug ? category.parentSlug : category['translations'][0].slug">
@@ -61,6 +63,7 @@ 'id', 'url', 'addClass', + 'parentSlug', 'categories', 'mainSidebar', 'categoryCount' @@ -76,6 +79,9 @@ slicedCategories = this.categories.slice(0, categoryCount); } + if (this.parentSlug) + slicedCategories['parentSlug'] = this.parentSlug; + return { slicedCategories, sidebarLevel: Math.floor(Math.random() * 1000), diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/_variables.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/_variables.scss index e363df7c7..e42ac06dd 100755 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/_variables.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/_variables.scss @@ -23,6 +23,7 @@ $grey-clr: rgba(0,0,0,0.53); $light-grey-clr: rgb(158, 158, 158); $light-background: #F7F7F9; $sidebar-width: 230px; +$box-shadow: 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23); $font-family-pro: 'Source Sans Pro', sans-serif; $font-family-regular: 'SourceSansPro-Regular'; diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/admin.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/admin.scss index 5a36bd684..998a57a1a 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/admin.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/admin.scss @@ -11,12 +11,6 @@ font-style: normal; } -.wk-icon { - font-size: 20px; - font-weight: 400; - text-align: center; - color: #0041ff; -} [class^="rango-"], [class*=" rango-"] { /* use !important to prevent issues with browser extensions that change fonts */ diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/app.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/app.scss index f9c511bf3..4792e19f8 100755 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/app.scss @@ -201,7 +201,21 @@ body { } + .account-modal { - height: 135px; + @extend .modal-dialog; + + right: 10px; + z-index: 100; + height: max-content; + width: 290px !important; + position: absolute !important; + + .theme-btn { + padding: .5rem .9rem; + } + + .modal-footer { + justify-content: unset; + } } } @@ -333,6 +347,7 @@ header { height: 40px; margin: 5px 0px; background: $white-color; + padding: 4px 1px 0px 0px; * { height: 100%; diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/UI.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/UI.scss index 501a7726f..d9baf2f84 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/UI.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/UI.scss @@ -30,11 +30,11 @@ } .btn-add-to-cart { - padding: 8px; - color: #fff !important; + padding: 8px !important; border-radius: 0px !important; - border-color: #26A37C !important; - background-color: #26A37C !important; + color: $white-color !important; + border-color: $theme-color !important; + background-color: $theme-color !important; &.large { padding: 12px 18px; diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss index 87473c5a8..4a84d31fb 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss @@ -511,7 +511,7 @@ top: 44px; z-index: 100; width: 350px; - left: -230px; + left: -265px; position: absolute; .close { @@ -521,6 +521,14 @@ position: relative; } + .mini-cart-container { + height: 100%; + font-size: 14px; + max-height: 200px; + overflow-y: scroll; + padding: 10px 15px 0 20px; + } + .small-card-container { margin: 0; width: 100%; @@ -581,6 +589,7 @@ .cart-header { max-height: 45px; margin-bottom: 20px; + padding-bottom: 20px !important; border-bottom: 2px solid $border-general; > h3 { @@ -1085,6 +1094,7 @@ .order-summary-container { padding-top: 25px; + height: max-content; max-width: 500px !important; > div { @@ -1172,6 +1182,7 @@ } .regular-price { + font-weight: 500; margin-right: 10px; text-decoration: line-through; } @@ -1194,6 +1205,8 @@ .method-sticker { font-size: 13px; padding: 4px 8px; + margin-right: 3px; + margin-bottom: 3px; text-align: center; border-radius: 1px; display: inline-block; @@ -1202,10 +1215,11 @@ } .sidebar { + z-index: 1000000; width: $sidebar-width; .category-content { - margin-bottom: 10px; + // margin-bottom: 10px; .category-title { top: -1px; @@ -1246,8 +1260,57 @@ } } +.category-list-container { + z-index: 10; + padding: 0px !important; + background: $white-color; + position: absolute !important; + box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23); + + .category { + @extend .cursor-pointer; + + width: 100%; + line-height: 2.5rem; + display: inline-block; + + span { + top: -4px; + position: relative; + } + } + + li { + padding: 7px 0 5px 15px; + } + + li:hover { + background: $border-light; + } + + .sub-category-container { + // position: relative; + } + + .sub-categories { + top: 0px; + left: 100%; + z-index: 100; + padding-top: 10px; + position: absolute; + background: $light-color; + border-left: 1px solid $border-common; + box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23); + + li:nth-last-of-type(1) { + margin-bottom: 10px; + } + } +} + #sidebar-level-0 { display: none; + z-index: 100000; border-top: 1px solid $border-common; } @@ -1570,6 +1633,10 @@ outline: none; box-shadow: none; } + + .VueCarousel-dot { + padding: 5px !important; + } } .VueCarousel-dot--active { diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/home.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/home.scss index c683fd89e..e7f80ec37 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/home.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/home.scss @@ -9,71 +9,6 @@ body { } } -.account-modal { - @extend .modal-dialog; - - right: 10px; - z-index: 100; - width: 350px !important; - position: absolute !important; - - .theme-btn { - padding: .5rem .9rem; - } - - .modal-footer { - .text-left { - padding-left: 5px; - } - } -} - -.category-list-container { - z-index: 10; - padding: 0px !important; - background: $white-color; - position: absolute !important; - box-shadow: inset -1px 0 0 0 $border-light; - - .category { - @extend .cursor-pointer; - - width: 100%; - line-height: 2.5rem; - display: inline-block; - - span { - top: -4px; - position: relative; - } - } -} - -.category-list-container li { - padding: 7px 0 5px 15px; -} - -.category-list-container li:hover { - background: $border-light; -} - -.category-list-container { - .sub-category-container { - position: relative; - } - - .sub-categories { - top: -40px; - left: 100%; - z-index: 100; - padding-top: 10px; - position: absolute; - background: $light-color; - border-left: 1px solid $border-common; - box-shadow: inset -1px 0 0 0 $border-light; - } -} - .root-category-menu { border-bottom: solid 1px #d8e6ed; } @@ -352,7 +287,7 @@ header #search-form > *:focus { .hot-categories-container { .hot-category-wrapper { - padding: 0 10px 15px 0; + padding: 0 10px 0 0; .card { height: 100%; @@ -381,11 +316,11 @@ header #search-form > *:focus { } .hot-category-wrapper:nth-last-child(2) { - padding: 15px 0 15px 0px; + padding: 0 0 0 0px; } .hot-category-wrapper:last-child { - padding: 15px 0 15px 10px; + padding: 0 0 0 10px; } } @@ -427,8 +362,7 @@ header #search-form > *:focus { } .card-description { - padding: 25px; - margin-top: 15px; + padding: 10px 20px; } } @@ -513,6 +447,7 @@ header #search-form > *:focus { .content-list { margin: 0; width: 100%; + height: 42px; text-align: left; list-style: none; position: relative; @@ -522,7 +457,6 @@ header #search-form > *:focus { ul { width: 100%; height: 100%; - padding-left: 10px; display: inline-flex; background-color: $link-color; @@ -532,13 +466,17 @@ header #search-form > *:focus { cursor: pointer; font-size: 16px; font-weight: 600; + padding: 8px 15px; letter-spacing: 0; position: relative; color: $white-color; text-decoration: none; - padding: 8px 20px 8px 5px; } } + + li:hover { + background-color: #42719a; + } } } } diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/media.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/media.scss index dae628f2d..b781f35dc 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/media.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/media.scss @@ -6,6 +6,7 @@ .social-icons { width: 100%; padding: 5px 0; + text-align: center !important; } .subscribe-newsletter { diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss index 518317de6..0cd1f4608 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss @@ -1,5 +1,6 @@ .product-detail { padding-top: 20px; + margin-bottom: 60px; .magnifier { > img { @@ -31,6 +32,8 @@ } .reviews { + vertical-align: top; + > div { display: inline-block; } @@ -206,4 +209,15 @@ vertical-align: middle; } } + +} + +.store-meta-images { + margin-top: 20px; + + img { + width: 100%; + height: 100%; + max-height: 300px; + } } \ No newline at end of file diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/shared.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/shared.scss index 0a6a0b9a0..25ee9b5bd 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/shared.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/shared.scss @@ -187,6 +187,9 @@ .cursor-pointer { cursor: pointer; } +.cursor-default { + cursor: default; +} .grey { color: rgb(158, 158, 158); @@ -499,6 +502,12 @@ .small-card-container { cursor: pointer; margin-bottom: 10px; + margin-left: 0 !important; + margin-right: 0 !important; + + .material-icons { + font-size: 16px; + } .product-image-container { padding: 0; @@ -516,6 +525,11 @@ display: inline-block; padding: 10px 0 !important; } + + .sticker, + .regular-price { + display: none; + } } .small-card-container:hover { @@ -655,6 +669,8 @@ a { .scrollable { max-height: 100vh; overflow-y: scroll; + scrollbar-width: none; + -ms-overflow-style: none; } .scrollable::-webkit-scrollbar { @@ -716,5 +732,8 @@ button[disabled] { font-variant: normal; -webkit-font-smoothing: antialiased; font-family: 'Webkul Rango' !important; +} +.max-height-350 { + max-height: 350px; } \ No newline at end of file diff --git a/packages/Webkul/Velocity/src/Resources/lang/en/app.php b/packages/Webkul/Velocity/src/Resources/lang/en/app.php index 7427a3a1f..040240502 100644 --- a/packages/Webkul/Velocity/src/Resources/lang/en/app.php +++ b/packages/Webkul/Velocity/src/Resources/lang/en/app.php @@ -95,13 +95,14 @@ return [ 'subscription-content' => 'Subscription bar Content', 'activate-slider' => 'Activate Slider', 'sidebar-categories' => 'Sidebar Categories', - 'footer-left-raw-content' => 'We love to craft softwares and solve the real world problems with the binaries. We are highly committed to our goals. We invest our resources to create world class easy to use softwares and applications for the enterprise business with the top notch, on the edge technology expertise.', + 'footer-left-raw-content' => '

We love to craft softwares and solve the real world problems with the binaries. We are highly committed to our goals. We invest our resources to create world class easy to use softwares and applications for the enterprise business with the top notch, on the edge technology expertise.

', 'footer-middle-content' => 'Footer Middle Content', 'update-meta-data' => 'Update Meta Data', 'advertisement-four' => 'Advertisement Four Images', 'advertisement-three' => 'Advertisement Three Images', 'advertisement-two' => 'Advertisement Two Images', 'advertisement-one' => 'Advertisement One Images', + 'product-view-image' => 'Product View Image', 'footer' => 'Footer', ], 'category' => [ diff --git a/packages/Webkul/Velocity/src/Resources/views/UI/particals.blade.php b/packages/Webkul/Velocity/src/Resources/views/UI/particals.blade.php index 9153db099..8c6c39c7e 100644 --- a/packages/Webkul/Velocity/src/Resources/views/UI/particals.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/UI/particals.blade.php @@ -1,5 +1,5 @@ diff --git a/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php b/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php index 40ff3913f..42074825e 100644 --- a/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php @@ -121,6 +121,14 @@ input-name="images[1]"> + +
+ + + + +
diff --git a/packages/Webkul/Velocity/src/Resources/views/checkout/cart/mini-cart.blade.php b/packages/Webkul/Velocity/src/Resources/views/checkout/cart/mini-cart.blade.php index 356625872..ac48b0f26 100644 --- a/packages/Webkul/Velocity/src/Resources/views/checkout/cart/mini-cart.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/checkout/cart/mini-cart.blade.php @@ -16,7 +16,7 @@
-
+
@foreach ($items as $item) @php $images = $item->product->getTypeInstance()->getBaseImage($item); diff --git a/packages/Webkul/Velocity/src/Resources/views/checkout/onepage.blade.php b/packages/Webkul/Velocity/src/Resources/views/checkout/onepage.blade.php index b4f6ddd1d..4f3258c37 100644 --- a/packages/Webkul/Velocity/src/Resources/views/checkout/onepage.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/checkout/onepage.blade.php @@ -573,20 +573,6 @@ onSubmit: function() { var this_this = this; const emptyCouponErrorText = "Please enter a coupon code"; - axios.post('{{ route('shop.checkout.check.coupons') }}', {code: this_this.coupon_code}) - .then(function(response) { - this_this.$emit('onApplyCoupon'); - - this_this.couponChanged = true; - }) - .catch(function(error) { - this_this.couponChanged = true; - - this_this.error_message = (error.response.data.message === "The given data was invalid.")? - emptyCouponErrorText : - (error.response.data.message === "Cannot Apply Coupon")? - "Sorry, this Coupon code is invalid":error.response.data.message; - }); }, changeCoupon: function() { @@ -603,16 +589,6 @@ removeCoupon: function () { var this_this = this; - - axios.post('{{ route('shop.checkout.remove.coupon') }}') - .then(function(response) { - this_this.$emit('onRemoveCoupon') - }) - .catch(function(error) { - window.flashMessages = [{'type' : 'alert-error', 'message' : error.response.data.message}]; - - this_this.$root.addFlashMessages(); - }); } } }); diff --git a/packages/Webkul/Velocity/src/Resources/views/customers/session/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/customers/session/index.blade.php index 910e23268..45497524d 100755 --- a/packages/Webkul/Velocity/src/Resources/views/customers/session/index.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/customers/session/index.blade.php @@ -9,94 +9,97 @@ {!! view_render_event('bagisto.shop.customers.login.before') !!} -
-
-

- {{ __('velocity::app.customer.login-form.customer-login')}} -

+
+
+
+

+ {{ __('velocity::app.customer.login-form.customer-login')}} +

- - - -
- -
-
-

- {{ __('velocity::app.customer.login-form.registered-user')}} -

- -

- {{ __('velocity::app.customer.login-form.form-login-text')}} -

-
- -
- - {{ csrf_field() }} - - {!! view_render_event('bagisto.shop.customers.login_form_controls.before') !!} - -
- - - - - - @{{ errors.first('email') }} - -
- -
- - - - - - @{{ errors.first('password') }} - - - - {{ __('shop::app.customer.login-form.forgot_pass') }} + + - -
- @if (Cookie::has('enable-resend')) - @if (Cookie::get('enable-resend') == true) - {{ __('shop::app.customer.login-form.resend-verification') }} - @endif - @endif -
- {!! view_render_event('bagisto.shop.customers.login_form_controls.after') !!} +
+
+

+ {{ __('velocity::app.customer.login-form.registered-user')}} +

- +

+ {{ __('velocity::app.customer.login-form.form-login-text')}} +

+
- +
+ + {{ csrf_field() }} + + {!! view_render_event('bagisto.shop.customers.login_form_controls.before') !!} + +
+ + + + + + @{{ errors.first('email') }} + +
+ +
+ + + + + + @{{ errors.first('password') }} + + + + {{ __('shop::app.customer.login-form.forgot_pass') }} + + +
+ @if (Cookie::has('enable-resend')) + @if (Cookie::get('enable-resend') == true) + {{ __('shop::app.customer.login-form.resend-verification') }} + @endif + @endif +
+
+ + {!! view_render_event('bagisto.shop.customers.login_form_controls.after') !!} + + + +
+
+
-
+ {!! view_render_event('bagisto.shop.customers.login.after') !!}
@endsection diff --git a/packages/Webkul/Velocity/src/Resources/views/customers/signup/forgot-password.blade.php b/packages/Webkul/Velocity/src/Resources/views/customers/signup/forgot-password.blade.php index 0dad7c68a..3bfc6d9ea 100755 --- a/packages/Webkul/Velocity/src/Resources/views/customers/signup/forgot-password.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/customers/signup/forgot-password.blade.php @@ -7,62 +7,64 @@ @section('content-wrapper')
-
-

- {{ __('velocity::app.customer.forget-password.forgot-password')}} -

+
+
+

+ {{ __('velocity::app.customer.forget-password.forgot-password')}} +

- - - -
+ + + +
-
-

- {{ __('velocity::app.customer.forget-password.recover-password')}} -

+
+

+ {{ __('velocity::app.customer.forget-password.recover-password')}} +

-

- {{ __('velocity::app.customer.forget-password.recover-password-text')}} -

+

+ {{ __('velocity::app.customer.forget-password.recover-password-text')}} +

- {!! view_render_event('bagisto.shop.customers.forget_password.before') !!} + {!! view_render_event('bagisto.shop.customers.forget_password.before') !!} -
+ - {{ csrf_field() }} + {{ csrf_field() }} - {!! view_render_event('bagisto.shop.customers.forget_password_form_controls.before') !!} + {!! view_render_event('bagisto.shop.customers.forget_password_form_controls.before') !!} -
- +
+ - + - - @{{ errors.first('email') }} - -
+ + @{{ errors.first('email') }} + +
- {!! view_render_event('bagisto.shop.customers.forget_password_form_controls.after') !!} + {!! view_render_event('bagisto.shop.customers.forget_password_form_controls.after') !!} - -
+ + - {!! view_render_event('bagisto.shop.customers.forget_password.after') !!} + {!! view_render_event('bagisto.shop.customers.forget_password.after') !!} +
diff --git a/packages/Webkul/Velocity/src/Resources/views/customers/signup/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/customers/signup/index.blade.php index 82a9c793c..ca2814b69 100755 --- a/packages/Webkul/Velocity/src/Resources/views/customers/signup/index.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/customers/signup/index.blade.php @@ -7,136 +7,138 @@ @section('content-wrapper')
-
-

- {{ __('velocity::app.customer.signup-form.user-registration')}} -

+
+
+

+ {{ __('velocity::app.customer.signup-form.user-registration')}} +

- - - -
+ + + +
-
-

- {{ __('velocity::app.customer.signup-form.become-user')}} -

+
+

+ {{ __('velocity::app.customer.signup-form.become-user')}} +

-

- {{ __('velocity::app.customer.signup-form.form-sginup-text')}} -

+

+ {{ __('velocity::app.customer.signup-form.form-sginup-text')}} +

- {!! view_render_event('bagisto.shop.customers.signup.before') !!} + {!! view_render_event('bagisto.shop.customers.signup.before') !!} -
+ - {{ csrf_field() }} + {{ csrf_field() }} - {!! view_render_event('bagisto.shop.customers.signup_form_controls.before') !!} + {!! view_render_event('bagisto.shop.customers.signup_form_controls.before') !!} -
- +
+ - + - - @{{ errors.first('first_name') }} - -
+ + @{{ errors.first('first_name') }} + +
-
- +
+ - + - - @{{ errors.first('last_name') }} - -
+ + @{{ errors.first('last_name') }} + +
-
- +
+ - + - - @{{ errors.first('email') }} - -
+ + @{{ errors.first('email') }} + +
-
- +
+ - + - - @{{ errors.first('password') }} - -
+ + @{{ errors.first('password') }} + +
-
- +
+ - + - - @{{ errors.first('password_confirmation') }} - -
+ + @{{ errors.first('password_confirmation') }} + +
- {!! view_render_event('bagisto.shop.customers.signup_form_controls.after') !!} + {!! view_render_event('bagisto.shop.customers.signup_form_controls.after') !!} - -
+ + - {!! view_render_event('bagisto.shop.customers.signup.after') !!} + {!! view_render_event('bagisto.shop.customers.signup.after') !!} +
diff --git a/packages/Webkul/Velocity/src/Resources/views/home/advertisements/advertisement-two.blade.php b/packages/Webkul/Velocity/src/Resources/views/home/advertisements/advertisement-two.blade.php index 82f14fa55..4e6a375f7 100644 --- a/packages/Webkul/Velocity/src/Resources/views/home/advertisements/advertisement-two.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/home/advertisements/advertisement-two.blade.php @@ -18,11 +18,11 @@