merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Issue #514 fixed

This commit is contained in:
jitendra 2019-02-01 12:19:30 +05:30
parent 91b8bfeba2
commit 2d1a816349
8 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/Webkul/Admin/src/Exceptions/Handler.php
View File

@ -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);
}

10
packages/Webkul/Admin/src/Http/Controllers/Controller.php
View File

@ -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');
}
}

3
packages/Webkul/Admin/src/Http/routes.php
View File

@ -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'

4
packages/Webkul/Admin/src/Resources/views/errors/401.blade.php
View File

@ -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%;

4
packages/Webkul/Admin/src/Resources/views/errors/403.blade.php
View File

@ -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%;

6
packages/Webkul/Admin/src/Resources/views/errors/404.blade.php
View File

@ -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;">

4
packages/Webkul/Admin/src/Resources/views/errors/500.blade.php
View File

@ -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;">

1
packages/Webkul/Admin/src/Resources/views/errors/503.blade.php
View File

@ -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;">