Skip to content

Commit ed9af05

Browse files
committed
fix auth
1 parent 44d308b commit ed9af05

File tree

4 files changed

+6
-20
lines changed

4 files changed

+6
-20
lines changed

src/app/Http/Controllers/Auth/ForgotPasswordController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Backpack\CRUD\app\Http\Controllers\Auth;
44

5-
use Backpack\CRUD\app\Auth\SendsPasswordResetEmails;
5+
use Backpack\CRUD\app\Library\Auth\SendsPasswordResetEmails;
66
use Illuminate\Routing\Controller;
77
use Illuminate\Support\Facades\Password;
88

src/app/Http/Controllers/Auth/LoginController.php

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -83,21 +83,4 @@ protected function guard()
8383
{
8484
return backpack_auth();
8585
}
86-
87-
// -------------------------------------------------------
88-
// Laravel overwrites for loading backpack views
89-
// -------------------------------------------------------
90-
91-
/**
92-
* Show the application login form.
93-
*
94-
* @return \Illuminate\Http\Response
95-
*/
96-
public function showLoginForm()
97-
{
98-
$this->data['title'] = trans('backpack::base.login'); // set the page title
99-
$this->data['username'] = $this->username();
100-
101-
return view(backpack_view('auth.login'), $this->data);
102-
}
10386
}

src/app/Http/Controllers/Auth/ResetPasswordController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Backpack\CRUD\app\Http\Controllers\Auth;
44

5-
use Backpack\Crud\app\Library\Auth\ResetsPasswords;
5+
use Backpack\CRUD\app\Library\Auth\ResetsPasswords;
66
use Illuminate\Http\Request;
77
use Illuminate\Routing\Controller;
88
use Illuminate\Support\Facades\Password;

src/app/Library/Auth/AuthenticatesUsers.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ trait AuthenticatesUsers
1818
*/
1919
public function showLoginForm()
2020
{
21-
return view('auth.login');
21+
$this->data['title'] = trans('backpack::base.login'); // set the page title
22+
$this->data['username'] = $this->username();
23+
24+
return view(backpack_view('auth.login'), $this->data);
2225
}
2326

2427
/**

0 commit comments

Comments
 (0)