diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 8f6b778..eccdc44 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -3,68 +3,30 @@ namespace App\Http\Controllers\Auth; use App\Http\Controllers\Controller; -use GuzzleHttp\Client; use Illuminate\Http\Request; -use GuzzleHttp\Exception\RequestException; class LoginController extends Controller { - public function login(Request $request) + public function showLoginForm() { - $username = $request->input('username'); - $password = $request->input('password'); + return view('login'); + } - $client = new Client([ - 'base_uri' => env('API_URL', 'http://localhost:8080'), - 'timeout' => 5.0, - ]); + public function showChangePasswordForm() + { + return view('change-password'); + } - try { - // Step 1: Validate username - $usernameResponse = $client->request('POST', '/api/cms/login_username', [ - 'json' => ['username' => $username] - ]); - $usernameData = json_decode($usernameResponse->getBody()->getContents(), true); + public function showProfile() - if ($usernameData['code'] !== 200 || $usernameData['message'] !== 'Success') { - return response()->json([ - 'success' => false, - 'message' => $usernameData['message'] ?? 'Invalid username' - ], 401); - } - // Step 2: Validate password - $passwordResponse = $client->request('POST', '/api/cms/login_password', [ - 'json' => ['username' => $username, 'password' => $password] - ]); - $passwordData = json_decode($passwordResponse->getBody()->getContents(), true); + { + return view('pages.my-profile'); + } - if ($passwordData['code'] !== 200 || $passwordData['message'] !== 'Success') { - return response()->json([ - 'success' => false, - 'message' => $passwordData['message'] ?? 'Invalid password' - ], 401); - } - - // Success: Return token to frontend - return response()->json([ - 'success' => true, - 'token' => $passwordData['data']['token'] ?? null, - 'message' => 'Login successful! Redirecting...' - ]); - - } catch (RequestException $e) { - \Log::error('Guzzle error: ' . $e->getMessage()); - return response()->json([ - 'success' => false, - 'message' => $e->getMessage() ?: 'Login failed. Please try again.' - ], 500); - } catch (\Exception $e) { - \Log::error('Unexpected error: ' . $e->getMessage()); - return response()->json([ - 'success' => false, - 'message' => 'An unexpected error occurred. Please try again.' - ], 500); - } + public function storeUsername(Request $request) + { + session(['username' => $request->input('username')]); + return response()->json(['success' => true]); } } \ No newline at end of file diff --git a/config/app.php b/config/app.php index 8131e41..76230fb 100644 --- a/config/app.php +++ b/config/app.php @@ -53,6 +53,7 @@ return [ */ 'url' => env('APP_URL', 'http://localhost'), + 'api_base_url' => env('API_BASE_URL', 'http://192.168.100.6:8081'), /* |-------------------------------------------------------------------------- diff --git a/resources/views/change-password.blade.php b/resources/views/change-password.blade.php index 9766e50..384341d 100644 --- a/resources/views/change-password.blade.php +++ b/resources/views/change-password.blade.php @@ -44,7 +44,7 @@ Back to Login
- +
diff --git a/routes/web.php b/routes/web.php index 1795eeb..f7f099c 100644 --- a/routes/web.php +++ b/routes/web.php @@ -25,8 +25,8 @@ Route::post('/change-password', [AuthController::class, 'changePassword'])->name // Redirect to my-profile (adjust as needed) Route::get('/my-profile', function () { - return view('my-profile'); // Replace with your actual profile view or controller -})->name('my-profile')->middleware('auth'); + return view('pages.my-profile'); // Replace with your actual profile view or controller +})->name('my-profile'); // Handle logout Route::post('/logout', [AuthController::class, 'logout'])->name('logout');