From 8009b5c64789a030bb2f1fa82b42c52eae82a78f Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Wed, 17 Oct 2018 13:10:08 +0530 Subject: [PATCH 1/2] error & loader --- .../Webkul/Admin/src/Exceptions/Handler.php | 42 +++++ .../Customer}/CustomerController.php | 2 +- packages/Webkul/Admin/src/Http/routes.php | 12 +- .../src/Providers/AdminServiceProvider.php | 7 + .../src/Resources/views/errors/403.blade.php | 30 ++++ .../src/Resources/views/errors/404.blade.php | 21 ++- .../src/Resources/views/errors/500.blade.php | 30 ++++ .../Resources/views/layouts/master.blade.php | 12 +- .../Resources/views/layouts/nav-top.blade.php | 2 +- .../src/Providers/ShopServiceProvider.php | 3 + .../assets/js/components/category-item.vue | 2 +- .../Shop/src/Resources/assets/sass/app.scss | 110 ++++++++++--- .../Shop/src/Resources/assets/sass/icons.scss | 1 - .../src/Resources/assets/sass/override.scss | 17 +- .../account/address/address.blade.php | 3 + .../account/address/create.blade.php | 5 +- .../customers/account/orders/orders.blade.php | 2 + .../account/partials/sidemenu.blade.php | 6 +- .../customers/account/profile/edit.blade.php | 6 +- .../customers/account/profile/index.blade.php | 2 +- .../customers/account/reviews/index.blade.php | 2 + .../account/wishlist/wishlist.blade.php | 2 +- .../src/Resources/views/errors/403.blade.php | 28 ++++ .../src/Resources/views/errors/404.blade.php | 28 ++++ .../src/Resources/views/errors/500.blade.php | 28 ++++ .../views/layouts/header/index.blade.php | 6 +- .../Resources/views/layouts/master.blade.php | 7 +- .../Resources/views/products/view.blade.php | 12 +- .../views/products/view/gallery.blade.php | 2 +- .../src/Resources/assets/images/404-image.svg | 26 +++ .../Ui/src/Resources/assets/sass/app.scss | 50 ++++++ .../Ui/src/Resources/assets/sass/icons.scss | 6 + public/themes/default/assets/css/shop.css | 152 ++++++++++++------ public/themes/default/assets/js/shop.js | 2 +- 34 files changed, 543 insertions(+), 123 deletions(-) create mode 100644 packages/Webkul/Admin/src/Exceptions/Handler.php rename packages/Webkul/{Core/src/Http/Controllers => Admin/src/Http/Controllers/Customer}/CustomerController.php (98%) create mode 100644 packages/Webkul/Admin/src/Resources/views/errors/403.blade.php create mode 100644 packages/Webkul/Admin/src/Resources/views/errors/500.blade.php create mode 100644 packages/Webkul/Shop/src/Resources/views/errors/403.blade.php create mode 100644 packages/Webkul/Shop/src/Resources/views/errors/404.blade.php create mode 100644 packages/Webkul/Shop/src/Resources/views/errors/500.blade.php create mode 100644 packages/Webkul/Ui/src/Resources/assets/images/404-image.svg diff --git a/packages/Webkul/Admin/src/Exceptions/Handler.php b/packages/Webkul/Admin/src/Exceptions/Handler.php new file mode 100644 index 000000000..918aca539 --- /dev/null +++ b/packages/Webkul/Admin/src/Exceptions/Handler.php @@ -0,0 +1,42 @@ +getStatusCode(); + + if(strpos($_SERVER['REQUEST_URI'], 'admin') !== false){ + return response(view('admin::errors.'.$statusCode, [ + 'msg' => $exception->getMessage(), + 'code' => $statusCode + ]), $statusCode); + }else { + return response(view('shop::errors.'.$statusCode, [ + 'msg' => $exception->getMessage(), + 'code' => $statusCode + ]), $statusCode); + } + + } + + return parent::render($request, $exception); + } +} \ No newline at end of file diff --git a/packages/Webkul/Core/src/Http/Controllers/CustomerController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php similarity index 98% rename from packages/Webkul/Core/src/Http/Controllers/CustomerController.php rename to packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php index 17c8ead1d..f883e4283 100644 --- a/packages/Webkul/Core/src/Http/Controllers/CustomerController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php @@ -1,6 +1,6 @@ ['web']], function () { //Customers Management Routes - Route::get('customer', 'Webkul\Core\Http\Controllers\CustomerController@index')->defaults('_config', [ + Route::get('customer', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@index')->defaults('_config', [ 'view' => 'admin::customers.index' ])->name('admin.customer.index'); - Route::get('customer/orders', 'Webkul\Core\Http\Controllers\CustomerController@index')->defaults('_config',[ + Route::get('customer/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\Core\Http\Controllers\CustomerController@create')->defaults('_config',[ + Route::get('customer/create', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@create')->defaults('_config',[ 'view' => 'admin::customers.create' ])->name('admin.customer.create'); - Route::post('customer/create', 'Webkul\Core\Http\Controllers\CustomerController@store')->defaults('_config',[ + Route::post('customer/create', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@store')->defaults('_config',[ 'redirect' => 'admin.customer.index' ])->name('admin.customer.store'); - Route::get('customer/edit/{id}', 'Webkul\Core\Http\Controllers\CustomerController@edit')->defaults('_config',[ + Route::get('customer/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\Core\Http\Controllers\CustomerController@update')->defaults('_config', [ + Route::put('customer/edit/{id}', 'Webkul\Admin\Http\Controllers\Customer\CustomerController@update')->defaults('_config', [ 'redirect' => 'admin.customer.index' ])->name('admin.customer.update'); diff --git a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php index 5e94fd48d..1fe463fbb 100644 --- a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php +++ b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php @@ -6,6 +6,8 @@ use Illuminate\Support\ServiceProvider; use Illuminate\Support\Facades\Event; use Illuminate\Support\Facades\Blade; use Webkul\Admin\Providers\EventServiceProvider; +use Illuminate\Contracts\Debug\ExceptionHandler; +use Webkul\Admin\Exceptions\Handler; class AdminServiceProvider extends ServiceProvider { @@ -29,6 +31,11 @@ class AdminServiceProvider extends ServiceProvider $this->composeView(); $this->app->register(EventServiceProvider::class); + + $this->app->bind( + ExceptionHandler::class, + Handler::class + ); } /** diff --git a/packages/Webkul/Admin/src/Resources/views/errors/403.blade.php b/packages/Webkul/Admin/src/Resources/views/errors/403.blade.php new file mode 100644 index 000000000..b351a4191 --- /dev/null +++ b/packages/Webkul/Admin/src/Resources/views/errors/403.blade.php @@ -0,0 +1,30 @@ +@extends('admin::layouts.content') + +@section('page_title') + +@stop + +@section('content') +
+ +
+ +
+ +
{{ $code }}
+ +
Page Not Found
+ +
The Page you are looking for doesnt exist or have secrately escaped;head backm to home and make a fresh move again.
+ + GO TO HOME + +
+ +
+ +
+ +
+@stop \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/errors/404.blade.php b/packages/Webkul/Admin/src/Resources/views/errors/404.blade.php index 3a46d37a5..b351a4191 100644 --- a/packages/Webkul/Admin/src/Resources/views/errors/404.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/errors/404.blade.php @@ -1,13 +1,30 @@ @extends('admin::layouts.content') @section('page_title') - {{ __('admin::app.catalog.categories.edit-title') }} + @stop @section('content') -
+
+
+
+ +
{{ $code }}
+ +
Page Not Found
+ +
The Page you are looking for doesnt exist or have secrately escaped;head backm to home and make a fresh move again.
+ + GO TO HOME + +
+ +
+ +
@stop \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/errors/500.blade.php b/packages/Webkul/Admin/src/Resources/views/errors/500.blade.php new file mode 100644 index 000000000..b351a4191 --- /dev/null +++ b/packages/Webkul/Admin/src/Resources/views/errors/500.blade.php @@ -0,0 +1,30 @@ +@extends('admin::layouts.content') + +@section('page_title') + +@stop + +@section('content') +
+ +
+ +
+ +
{{ $code }}
+ +
Page Not Found
+ +
The Page you are looking for doesnt exist or have secrately escaped;head backm to home and make a fresh move again.
+ + GO TO HOME + +
+ +
+ +
+ +
+@stop \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php index e7a25358c..a47db30c1 100644 --- a/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php @@ -13,14 +13,14 @@ @yield('head') @yield('css') - + - +
- + @include ('admin::layouts.nav-top') @include ('admin::layouts.nav-left') @@ -44,8 +44,10 @@ @endif window.serverErrors = []; - @if (count($errors)) - window.serverErrors = @json($errors->getMessages()); + @if(isset($errors)) + @if (count($errors)) + window.serverErrors = @json($errors->getMessages()); + @endif @endif diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php index 36a6fc1bd..a52a6a85d 100644 --- a/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php @@ -14,7 +14,7 @@
- {{ auth()->guard('admin')->user()->name }} + {{-- {{ auth()->guard('admin')->user()->name }} --}} diff --git a/packages/Webkul/Shop/src/Providers/ShopServiceProvider.php b/packages/Webkul/Shop/src/Providers/ShopServiceProvider.php index 5788874e2..2023fa252 100644 --- a/packages/Webkul/Shop/src/Providers/ShopServiceProvider.php +++ b/packages/Webkul/Shop/src/Providers/ShopServiceProvider.php @@ -6,7 +6,10 @@ use Illuminate\Support\ServiceProvider; use Illuminate\Support\Facades\Event; use Illuminate\Routing\Router; use Illuminate\Support\Facades\Blade; +use Illuminate\Contracts\Debug\ExceptionHandler; use Webkul\Shop\Providers\ComposerServiceProvider; +use Webkul\Shop\Exceptions\Handler; + class ShopServiceProvider extends ServiceProvider { 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 96c3aca5e..31126425b 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 f353ec975..54fa1f19e 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -426,6 +426,7 @@ section.slider-block { } ul.right-responsive { display: none; + cursor: pointer; li { margin-right : 5px; @@ -666,6 +667,10 @@ section.slider-block { border-bottom: 1px solid $border-color; } + .nav li ul { + padding-left: 30px; + } + .nav li:first-child { border-top: 1px solid $border-color; } @@ -674,6 +679,7 @@ section.slider-block { float:none; height: 45px; display: none; + border: none; img { margin-right:6px; @@ -888,23 +894,6 @@ section.product-detail { height: 650px; max-width: 604px; - .loader { - border: 16px solid $border-color; - border-top: 16px solid $brand-color; - border-radius: 50%; - width: 50px; - height: 50px; - animation: spin 2s linear infinite; - margin-left: 20%; - position: absolute; - margin-top: 200px; - } - - @keyframes spin { - 0% { transform: rotate(0deg); } - 100% { transform: rotate(360deg); } - } - div { display: flex; flex-direction: row; @@ -1924,11 +1913,96 @@ section.review { color: $brand-color; } } + + .responsive-side-menu{ + display: none; + } //customer account pages content .account-layout { margin-left: 5.5%; margin-top: 1%; width: 100%; + + .back-icon { + display: none; + } + } +} +//customer account page respoinsive css +@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%; + } } } @@ -1957,4 +2031,4 @@ section.review { flex-direction: column; min-height: 345px; padding: 25px; -} \ No newline at end of file +} diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/icons.scss b/packages/Webkul/Shop/src/Resources/assets/sass/icons.scss index b0eacb07b..e1757818f 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/icons.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/icons.scss @@ -16,7 +16,6 @@ width: 24px; height: 24px; margin-left:auto; - margin-bottom: 2px; } .grid-view-icon { diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/override.scss b/packages/Webkul/Shop/src/Resources/assets/sass/override.scss index 57b99801d..c43623a87 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/override.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/override.scss @@ -169,6 +169,7 @@ body { } .sort-filter { + cursor: pointer; display: inline-block; margin-top: 10px; } @@ -196,21 +197,6 @@ body { } -// @media only screen and (max-width: 660px) { -// .product-grid-3 { -// grid-template-columns: 48.5% 48.5%; -// grid-column-gap: 20px; -// } -// } - -// @media only screen and (max-width: 480px) { -// .product-grid-3 { -// grid-template-columns: 47.5% 47.5%; -// } -// } - - - //layered filter wrapper styles .layered-filter-wrapper { width: 25%; @@ -299,7 +285,6 @@ body { } .responsive-layred-filter { - @extend .layered-filter-wrapper; width: 100%; float: none; padding-right: 0px; 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 2e29b4de5..7e8450888 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 @@