diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index 2a2c568..b44d4eb 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -49,9 +49,9 @@ public function login(Request $request) $user = Auth::user(); $request->session()->put('user_id', $user->id); - // // Membuat dan menyimpan token "remember me" - // $token = $user->createToken("auth-token")->plainTextToken; - // $user->update(['remember_token' => $token]); + // Membuat dan menyimpan token "remember me" + $token = $user->createToken("auth-token")->plainTextToken; + $user->update(['remember_token' => $token]); return redirect('/dashboard')->with('success', 'Login berhasil!'); } else { @@ -122,9 +122,12 @@ public function sendResetLinkEmail(Request $request) $request->only('email') ); - return $status === Password::RESET_LINK_SENT - ? back()->with(['status' => __($status)]) - : back()->withErrors(['email' => __($status)]); + if ($status === Password::RESET_LINK_SENT) { + session()->flash('success', 'Email Berhasil Dikirim!'); + } else { + session()->flash('error', __($status)); + } + return back(); } public function resetPassword(Request $request) @@ -132,7 +135,7 @@ public function resetPassword(Request $request) $request->validate([ 'token' => 'required', 'email' => 'required|email', - 'password' => 'required|confirmed|min:6', + 'password' => 'required|confirmed|min:5', ]); $status = Password::reset( @@ -146,9 +149,11 @@ function ($user, $password) { } ); - return $status == Password::PASSWORD_RESET - ? redirect('/login')->with(['status' => __($status)]) - : back()->withErrors(['email' => [__($status)]]); + if ($status == Password::PASSWORD_RESET) { + return redirect('/login')->with('success', 'Password Berhasil Diperbarui! Silakan Login Kembali.'); + } else { + return back()->withErrors(['email' => [__($status)]]); + } } public function logout(Request $request) diff --git a/resources/views/auth/reset-password.blade.php b/resources/views/auth/reset-password.blade.php index 8683dad..1c4ea08 100644 --- a/resources/views/auth/reset-password.blade.php +++ b/resources/views/auth/reset-password.blade.php @@ -6,7 +6,6 @@
- {{-- --}}
@if(session('error'))
{{ session('error') }}
@@ -18,6 +17,7 @@
@csrf + @if($errors->has('email'))
{{ $errors->first('email') }}
@endif @@ -40,7 +40,7 @@
{{ $errors->first('password_confirmation') }}
@endif
- +
diff --git a/resources/views/ekstrakurikuler.blade.php b/resources/views/ekstrakurikuler.blade.php index 9ca5959..4ce6e04 100644 --- a/resources/views/ekstrakurikuler.blade.php +++ b/resources/views/ekstrakurikuler.blade.php @@ -42,6 +42,7 @@