From 7c775a571eff3a5372fe8a205a712f709c2b131a Mon Sep 17 00:00:00 2001 From: jitendra Date: Tue, 21 Aug 2018 18:44:48 +0530 Subject: [PATCH] Issue fixed --- .../views/users/roles/create.blade.php | 6 +- .../views/users/roles/edit.blade.php | 6 +- packages/Webkul/Shop/src/Http/routes.php | 5 + .../Shop/src/Resources/assets/sass/app.scss | 616 +++++++++++++++ .../views/layouts/header/index.blade.php | 2 +- .../store/product/details/index.blade.php | 190 ++--- .../store/product/view/cart/index.blade.php | 28 +- .../Webkul/Ui/src/DataGrid/ProductGrid.php | 2 +- .../views/datagrid/table/default.blade.php | 2 + public/themes/default/assets/css/shop.css | 704 +++++++++++++++++- .../default/assets/images/404-image.svg | 26 + public/themes/default/assets/images/4star.svg | 13 + .../default/assets/images/icon-grid-view.svg | 17 + .../default/assets/images/icon-list-view.svg | 19 + .../default/assets/images/icon-share.svg | 10 + public/themes/default/assets/images/jeans.jpg | Bin 0 -> 4565 bytes .../default/assets/images/jeans_big.jpg | Bin 0 -> 13696 bytes public/themes/default/assets/js/shop.js | 599 ++++++++++++--- 18 files changed, 2011 insertions(+), 234 deletions(-) create mode 100644 public/themes/default/assets/images/404-image.svg create mode 100644 public/themes/default/assets/images/4star.svg create mode 100644 public/themes/default/assets/images/icon-grid-view.svg create mode 100644 public/themes/default/assets/images/icon-list-view.svg create mode 100644 public/themes/default/assets/images/icon-share.svg create mode 100644 public/themes/default/assets/images/jeans.jpg create mode 100644 public/themes/default/assets/images/jeans_big.jpg diff --git a/packages/Webkul/Admin/src/Resources/views/users/roles/create.blade.php b/packages/Webkul/Admin/src/Resources/views/users/roles/create.blade.php index 5c5ea2334..975797a26 100644 --- a/packages/Webkul/Admin/src/Resources/views/users/roles/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/users/roles/create.blade.php @@ -28,13 +28,15 @@
- + @{{ errors.first('name') }}
- +
diff --git a/packages/Webkul/Admin/src/Resources/views/users/roles/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/users/roles/edit.blade.php index 9c2d7200d..76f11b906 100644 --- a/packages/Webkul/Admin/src/Resources/views/users/roles/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/users/roles/edit.blade.php @@ -30,13 +30,15 @@
- + @{{ errors.first('name') }}
- +
diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php index 4e2c6fc38..58d2c1c90 100644 --- a/packages/Webkul/Shop/src/Http/routes.php +++ b/packages/Webkul/Shop/src/Http/routes.php @@ -9,4 +9,9 @@ Route::group(['middleware' => ['web']], function () { Route::get('/categories/{slug}', 'Webkul\Shop\Http\Controllers\CategoryController@index')->defaults('_config', [ 'view' => 'shop::products.index' ]); + + Route::view('/cart', 'shop::store.product.view.cart.index'); + + Route::view('/products/{slug}', 'shop::store.product.details.index'); + }); diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index a438068c1..5b9425167 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -870,3 +870,619 @@ section.slider-block { //edit form ends } //account ends here + + + + +//customers page css ends here + +// product pages css starts here + +section.product-detail, section.product-review { + font-size: 16px; + color: $product-font-color; + + div.category-breadcrumbs { + display: inline; + } + + div.layouter { + display:flex; + flex-flow: row; + margin-top: 21px; + + .mixed-group { + + .single-image { + padding: 2px; + + img { + height: 280px; + width: 280px; + } + } + + .details { + + .product-name { + margin-top: 20px; + font-size: 24px; + margin-bottom: 20px; + } + + .price { + margin-bottom: 14px; + + .main-price { + font-size: 24px; + color: $product-price-color; + } + + .real-price { + color: $real-price; + text-decoration-line: line-through; + } + } + } + } + + .rating-reviews { + margin-top: 30px; + + .title-inline { + display: inline-flex; + align-items: center; + justify-content: space-between; + margin-bottom: 20px; + width: 100%; + + button { + float: right; + border-radius: 0px !important; + } + } + + .overall { + display: flex; + flex-direction: row; + align-items: center; + justify-content: space-between; + height: 150px; + + .left-side { + margin-bottom: 20px; + + .number{ + font-size: 34px; + } + } + + .right-side { + display: block; + + .rater { + display: inline-flex; + align-items: center; + + .star { + width: 50px; + height: 20px; + padding: 1px; + margin-right: 8px; + } + + .line-bar { + height: 4px; + width: 158px; + margin-right: 12px; + background: $bar-color; + + .line-value { + height: 4px; + width: 100px; + background-color: $dark-blue-shade; + } + } + } + } + + } + + .reviews { + margin-top: 34px; + margin-bottom: 90px; + + .review { + margin-bottom: 25px; + + .title { + margin-bottom: 5px; + } + + .stars { + margin-bottom: 15px; + } + .message { + margin-bottom: 10px; + } + } + .view-all { + margin-top:15px; + color: $logo-color; + margin-bottom:15px; + } + } + } + + div.product-image-group { + display:flex; + flex-direction: row; + justify-content: flex-start; + margin-right: 2.5%; + + .side-group { + display: flex; + flex-direction: column; + margin-right: 4px; + } + + .product-hero-image { + display: block; + position: relative; + + .wishlist { + position: absolute; + top: 10px; + right: 12px; + } + + .share { + position: absolute; + top: 10px; + right: 45px; + } + } + } + + .details { + + .product-heading { + font-size: 24px; + color: $product-font-color; + margin-bottom: 14px; + } + + .rating { + color: $product-font-color; + margin-bottom: 14px; + } + + .price { + margin-bottom: 14px; + + .main-price { + font-size: 24px; + color: $product-price-color; + } + } + + .stock-status { + margin-bottom: 14px; + } + + .description { + margin-bottom: 14px; + } + + hr{ + border-top: 1px solid $horizontal-rule-color; + margin-bottom: 17px; + } + + .attributes { + display: block; + width: 100%; + + .attribute { + height: 39px; + margin-bottom: 20px; + + .title { + float: left; + height: 100%; + min-width: 130px; + padding-top: 9px; + } + + .values { + display: inline-flex; + + .colors { + margin-right:5px; + } + .colors:last-child { + margin-right: 0; + } + + .red { + height: 37px; + width: 37px; + background: red; + border: 1px solid $border-color; + border-radius: 2px; + } + + .blue { + height: 37px; + width: 37px; + background: blue; + border: 1px solid $border-color; + border-radius: 2px; + } + + .green { + height: 37px; + width: 37px; + background: green; + border: 1px solid $border-color; + border-radius: 2px; + } + + .size { + margin-right:5px; + line-height: 38px; + height: 37px; + width: 60px; + border: 1px solid $border-color; + border-radius: 2px; + text-align: center; + vertical-align: middle; + } + .size:last-child { + margin-right: 0; + } + + .quantity { + .values { + .control { + height: 37px !important; + width: 30px !important; + } + } + } + } + } + } + + .full-description { + font-size: 16px; + } + + .full-specification{ + + } + + .rating-reviews { + margin-top: 30px; + + .title{ + margin-bottom: 15px; + } + + .overall { + + .number{ + font-size: 34px; + } + + button { + float: right; + border-radius: 0px !important; + } + + margin-bottom: 5px; + } + + .reviews { + margin-top: 34px; + margin-bottom: 80px; + + .review { + margin-bottom: 25px; + + .stars { + margin-bottom: 15px; + } + .message { + margin-bottom: 10px; + } + } + .view-all { + margin-top:15px; + color: $logo-color; + margin-bottom:15px; + } + } + } + } + + } + + // .related-products-wrapper { + // margin-bottom: 80px; + + // .title{ + // margin-bottom: 22px; + // text-align: center; + // } + + // .horizontal-rule { + // height: 1px; + // background: $horizontal-rule-color; + // width: 148px; + // margin-bottom: 24px; + // margin-left:auto; + // margin-right:auto; + // } + + // .related-products { + // display: grid; + // grid-template-columns: repeat(auto-fit, minmax(250px, 1fr)); + // grid-gap: 10px; + // } + + // } +} + +/* cart pages and elements css begins here */ + +section.cart { + color: $product-font-color; + font-size: 16px; + margin-bottom: 80px; + + .title { + font-size: 24px; + } + + .cart-content { + margin-top: 21px; + padding: 1px; + display: flex; + flex-direction: row; + + .left-side { + width: 68.6%; + margin-right: 2.4%; + + .item { + padding: 1.1%; + margin-bottom: 20px; + display: flex; + flex-direction: row; + + .item-image { + height: 160px; + width: 160px; + } + + .item-details { + display: flex; + flex-direction: column; + + .item-title { + font-size: 18px; + margin-bottom: 10px; + } + + .price { + margin-bottom: 10px; + + .main-price { + font-size: 18px; + margin-right: 4px; + } + + .real-price { + margin-right: 4px; + text-decoration-line: line-through; + } + + .discount { + color: $product-price-color; + } + } + + .summary { + margin-bottom: 17px; + } + + .misc { + display: inline-flex; + align-items: center; + justify-content: flex-start; + + div.qty-text { + color: $gray-shade; + margin-right: 10px; + } + + div.box { + height: 38px; + width: 60px; + text-align: center; + line-height: 38px; + border: 1px solid $border-color; + border-radius: 3px; + margin-right: 30px; + } + + .remove { + color: $dark-blue-shade; + margin-right: 30px; + } + + .towishlist { + color : $dark-blue-shade; + } + + } + } + } + + .misc-controls { + float: right; + + span { + margin-right: 15px; + } + + button { + border-radius: 0px; + } + } + } + + .right-side { + width: 29%; + display: block; + + .price-section { + width: 100%; + padding: 10px 10px 18px 18px; + margin-bottom: 20px; + + .title { + font-size: 16px; + font-weight: bold; + padding-bottom: 8px; + margin-bottom: 10px; + } + + .all-item-details { + margin-bottom: 17px; + + .item-details { + margin-bottom: 10px; + + .name { + } + + .price { + float: right; + } + } + } + .horizontal-rule { + width: 100%; + height: 1px; + vertical-align: middle; + background: #e8e8e8; + } + + .total-details { + margin-top: 10px; + + .amount { + float: right; + } + } + } + + .coupon-section { + padding: 10px 10px 18px 18px; + + .title { + font-size: 16px; + font-weight: bold; + margin-bottom: 10px; + } + + .control-group { + margin-bottom: 12px !important; + + input.coupon-input::-moz-placeholder { + font-family: "montserrat", sans-serif; + font-size: 16px; + color: $product-font-color; + } + + input.coupon-input::-webkit-input-placeholder { + font-family: "montserrat", sans-serif; + font-size: 16px; + color: $product-font-color; + } + + } + + button { + margin-bottom: 10px; + background-color: $color-black; + border-radius: 0px; + } + + .coupon-details { + + .coupon { + margin-bottom: 8px; + + .discount { + float: right; + } + } + } + + .horizontal-rule { + width: 100%; + height: 1px; + vertical-align: middle; + background: #e8e8e8; + margin-bottom: 9px; + } + + .after-coupon-amount { + + .name { + font-weight: bold; + } + + .amount { + float: right; + font-weight: bold; + } + + } + + } + + } + } + +} + +.related-products-wrapper { + margin-bottom: 80px; + + .title{ + margin-bottom: 22px; + font-size: 18px; + color: $product-font-color; + text-align: center; + } + + .horizontal-rule { + height: 1px; + background: $horizontal-rule-color; + width: 148px; + margin-bottom: 24px; + margin-left:auto; + margin-right:auto; + } + + .related-products { + display: grid; + grid-template-columns: repeat(auto-fit, minmax(250px, 1fr)); + grid-gap: 10px; + } + +} diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php index 0d54952ce..858add8ec 100644 --- a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php @@ -6,7 +6,7 @@