login

config/admin.php

@@ -119,8 +119,6 @@ return [
 
         'controller' => Dcat\Admin\Controllers\AuthController::class,
 
-        'login_view' => 'admin::pages.login',
-
         'guard' => 'admin',
 
         'guards' => [

resources/assets/dcat/js/extensions/Form.js

@@ -394,7 +394,7 @@ $.fn.form = function (options) {
         form: $this,
     });
 
-    $this.find(':submit').click(function (event) {
+    $this.find(':submit').click(function (e) {
         Dcat.Form(options);
 
         return false;

resources/dist/dcat/js/dcat-app.js

@@ -1968,7 +1968,7 @@ $.fn.form = function (options) {
   options = $.extend(options, {
     form: $this
   });
-  $this.find(':submit').click(function (event) {
+  $this.find(':submit').click(function (e) {
     Dcat.Form(options);
     return false;
   });

resources/views/form/error.blade.php

@@ -1,4 +1,5 @@
 <div class="help-block  with-errors"></div>
+
 @if(is_array($errorKey))
     @foreach($errorKey as $key => $col)
         @if($errors->has($col.$key))

resources/views/pages/login.blade.php

@@ -1,3 +1,6 @@
+<style>
+    html body {background: #fff;}
+</style>
 
 <link rel="stylesheet" href="{{ admin_asset('@admin/css/pages/authentication.css') }}">
 
@@ -110,14 +113,16 @@ Dcat.ready(function () {
     // ajax表单提交
     $('#login-form').form({
         validate: true,
-        success: function (response) {
-            if (! response.status) {
-                Dcat.error(response.message);
+        success: function (data) {
+            if (! data.status) {
+                Dcat.error(data.message);
 
                 return false;
             }
 
-            location.href = response.redirect;
+            Dcat.success(data.message);
+
+            location.href = data.redirect;
 
             return false;
         }

src/Controllers/AuthController.php

@@ -39,17 +39,7 @@ class AuthController extends Controller
             return redirect($this->redirectPath());
         }
 
-        Admin::style(
-            <<<'CSS'
-html body {background: #fff;}
-CSS
-        );
-
-        return $content
-            ->full()
-            ->body(
-                view(config('admin.auth.login_view') ?: $this->view)
-            );
+        return $content->full()->body(view($this->view));
     }
 
     /**
@@ -251,13 +241,12 @@ CSS
      */
     protected function sendLoginResponse(Request $request)
     {
-        admin_toastr(trans('admin.login_successful'));
-
         $request->session()->regenerate();
 
-        $path = $request->session()->get('url.intended');
-
-        return $this->redirect($path ?: $this->redirectPath());
+        return $this->redirectToIntended(
+            $this->redirectPath(),
+            trans('admin.login_successful')
+        );
     }
 
     /**

src/Support/Helper.php

@@ -11,9 +11,7 @@ use Illuminate\Http\Request;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\File;
-use Illuminate\Support\MessageBag;
 use Illuminate\Support\Str;
-use Illuminate\Validation\Validator;
 
 class Helper
 {
@@ -530,26 +528,4 @@ class Helper
 
         return $request->ajax() && ! $request->pjax();
     }
-
-    /**
-     * 响应请求验证错误.
-     *
-     * @param array|MessageBag|Validator $validationMessages
-     *
-     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse
-     */
-    public static function makeValidationErrorsResponse($validationMessages)
-    {
-        if ($validationMessages instanceof Validator) {
-            $validationMessages = $validationMessages->getMessageBag();
-        }
-
-        if (! static::isAjaxRequest()) {
-            return back()->withInput()->withErrors($validationMessages);
-        }
-
-        return response()->json([
-            'errors' => is_array($validationMessages) ? $validationMessages : $validationMessages->getMessages(),
-        ], 422);
-    }
 }

src/Traits/HasFormResponse.php

@@ -5,6 +5,7 @@ namespace Dcat\Admin\Traits;
 use Dcat\Admin\Support\Helper;
 use Illuminate\Http\Request;
 use Illuminate\Support\MessageBag;
+use Illuminate\Validation\Validator;
 
 trait HasFormResponse
 {
@@ -132,6 +133,19 @@ trait HasFormResponse
         return redirect(admin_url($url), $status);
     }
 
+    /**
+     * @param string|null  $url
+     * @param array|string $options
+     *
+     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
+     */
+    public function redirectToIntended(?string $url, $options = null)
+    {
+        $path = session()->pull('url.intended');
+
+        return $this->redirect($path ?: $url, $options);
+    }
+
     /**
      * @param array|MessageBag|\Illuminate\Validation\Validator $validationMessages
      *
@@ -139,6 +153,16 @@ trait HasFormResponse
      */
     public function validationErrorsResponse($validationMessages)
     {
-        return Helper::makeValidationErrorsResponse($validationMessages);
+        if ($validationMessages instanceof Validator) {
+            $validationMessages = $validationMessages->getMessageBag();
+        }
+
+        if (! static::isAjaxRequest()) {
+            return back()->withInput()->withErrors($validationMessages);
+        }
+
+        return response()->json([
+            'errors' => is_array($validationMessages) ? $validationMessages : $validationMessages->getMessages(),
+        ], 422);
     }
 }