From 2d1a81634971d3008cb2293cf214ef7490a160fa Mon Sep 17 00:00:00 2001
From: jitendra <jitendra@webkul.com>
Date: Fri, 1 Feb 2019 12:19:30 +0530
Subject: [PATCH] Issue #514 fixed

---
 packages/Webkul/Admin/src/Exceptions/Handler.php       |  9 ---------
 .../Webkul/Admin/src/Http/Controllers/Controller.php   | 10 ++++++++++
 packages/Webkul/Admin/src/Http/routes.php              |  3 +++
 .../Admin/src/Resources/views/errors/401.blade.php     |  4 ++--
 .../Admin/src/Resources/views/errors/403.blade.php     |  4 ++--
 .../Admin/src/Resources/views/errors/404.blade.php     |  6 +++---
 .../Admin/src/Resources/views/errors/500.blade.php     |  4 ++--
 .../Admin/src/Resources/views/errors/503.blade.php     |  1 +
 8 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/packages/Webkul/Admin/src/Exceptions/Handler.php b/packages/Webkul/Admin/src/Exceptions/Handler.php
index e52ac5c17..90c2c6862 100755
--- a/packages/Webkul/Admin/src/Exceptions/Handler.php
+++ b/packages/Webkul/Admin/src/Exceptions/Handler.php
@@ -33,15 +33,6 @@ class Handler extends ExceptionHandler
         } else if ($exception instanceof PDOException) {
             return $this->response($path, 500);
         }
-        // else if ($exception instanceof ErrorException) {
-
-        //     if (strpos($_SERVER['REQUEST_URI'], 'admin') !== false) {
-        //         return response()->view('admin::errors.500', [], 500);
-        //     }else {
-        //         return response()->view('shop::errors.500', [], 500);
-        //     }
-
-        // }
 
         return parent::render($request, $exception);
     }
diff --git a/packages/Webkul/Admin/src/Http/Controllers/Controller.php b/packages/Webkul/Admin/src/Http/Controllers/Controller.php
index 0a0005bde..7be383568 100755
--- a/packages/Webkul/Admin/src/Http/Controllers/Controller.php
+++ b/packages/Webkul/Admin/src/Http/Controllers/Controller.php
@@ -10,4 +10,14 @@ use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 class Controller extends BaseController
 {
     use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function redirectToLogin()
+    {
+        return redirect()->route('admin.session.create');
+    }
 }
diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php
index 841be901f..1b5446ef3 100755
--- a/packages/Webkul/Admin/src/Http/routes.php
+++ b/packages/Webkul/Admin/src/Http/routes.php
@@ -2,6 +2,9 @@
 
 Route::group(['middleware' => ['web']], function () {
     Route::prefix('admin')->group(function () {
+
+        Route::get('/', 'Webkul\Admin\Http\Controllers\Controller@redirectToLogin');
+
         // Login Routes
         Route::get('/login', 'Webkul\User\Http\Controllers\SessionController@create')->defaults('_config', [
             'view' => 'admin::users.sessions.create'
diff --git a/packages/Webkul/Admin/src/Resources/views/errors/401.blade.php b/packages/Webkul/Admin/src/Resources/views/errors/401.blade.php
index df9846347..80d3a9c8f 100755
--- a/packages/Webkul/Admin/src/Resources/views/errors/401.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/errors/401.blade.php
@@ -1,10 +1,10 @@
-@extends('admin::layouts.content')
+@extends(auth()->guard('admin')->check() ? 'admin::layouts.master' : 'shop::layouts.master')
 
 @section('page_title')
     {{ __('admin::app.error.401.page-title') }}
 @stop
 
-@section('content')
+@section('content-wrapper')
     <div class="error-container" style="width: 100%; display: flex; justify-content: center;">
 
         <div class="wrapper" style="display: flex; height: 60vh; width: 100%;
diff --git a/packages/Webkul/Admin/src/Resources/views/errors/403.blade.php b/packages/Webkul/Admin/src/Resources/views/errors/403.blade.php
index 8763a4939..cae43272f 100755
--- a/packages/Webkul/Admin/src/Resources/views/errors/403.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/errors/403.blade.php
@@ -1,10 +1,10 @@
-@extends('admin::layouts.content')
+@extends(auth()->guard('admin')->check() ? 'admin::layouts.master' : 'shop::layouts.master')
 
 @section('page_title')
     {{ __('admin::app.error.403.page-title') }}
 @stop
 
-@section('content')
+@section('content-wrapper')
     <div class="error-container" style="width: 100%; display: flex; justify-content: center;">
 
         <div class="wrapper" style="display: flex; height: 60vh; width: 100%;
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 a9f532197..a0c633b31 100755
--- a/packages/Webkul/Admin/src/Resources/views/errors/404.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/errors/404.blade.php
@@ -1,11 +1,11 @@
-@extends('admin::layouts.content')
+@extends(auth()->guard('admin')->check() ? 'admin::layouts.master' : 'shop::layouts.master')
 
 @section('page_title')
     {{ __('admin::app.error.404.page-title') }}
 @stop
 
-@section('content')
-    <div class="error-container" style="width: 100%; display: flex; justify-content: center;">
+@section('content-wrapper')
+    <div class="error-container" style="padding: 40px; width: 100%; display: flex; justify-content: center;">
 
         <div class="wrapper" style="display: flex; height: 60vh; width: 100%;
             justify-content: start; align-items: center;">
diff --git a/packages/Webkul/Admin/src/Resources/views/errors/500.blade.php b/packages/Webkul/Admin/src/Resources/views/errors/500.blade.php
index d9e0dbea8..3c64a45d1 100755
--- a/packages/Webkul/Admin/src/Resources/views/errors/500.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/errors/500.blade.php
@@ -1,10 +1,10 @@
-@extends('admin::layouts.content')
+@extends(auth()->guard('admin')->check() ? 'admin::layouts.master' : 'shop::layouts.master')
 
 @section('page_title')
     {{ __('admin::app.error.500.page-title') }}
 @stop
 
-@section('content')
+@section('content-wrapper')
 
     <div class="error-container" style="width: 100%; display: flex; justify-content: center;">
 
diff --git a/packages/Webkul/Admin/src/Resources/views/errors/503.blade.php b/packages/Webkul/Admin/src/Resources/views/errors/503.blade.php
index e8c61c841..94a066469 100644
--- a/packages/Webkul/Admin/src/Resources/views/errors/503.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/errors/503.blade.php
@@ -6,6 +6,7 @@
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>Document</title>
 </head>
+
 <body>
     <div class="error-container" style="width: 100%; display: flex; justify-content: center;">