diff --git a/app/Http/Controllers/Backend/Auth/LoginController.php b/app/Http/Controllers/Backend/Auth/LoginController.php
index e777e1f..c799e56 100644
--- a/app/Http/Controllers/Backend/Auth/LoginController.php
+++ b/app/Http/Controllers/Backend/Auth/LoginController.php
@@ -49,16 +49,16 @@ class LoginController extends Controller
// Check the current guard and redirect accordingly
if (Auth::guard('admin')->check()) {
// Redirect admins to their dashboard
- return route('admin.dashboard');
+ return '/';
}
if (Auth::guard('web')->check()) {
// Redirect regular users to their home or default page
- return route('trx_order_elevation.index');
+ return '/';
}
// Default redirection if no condition matches
- return '/admin/login';
+ return '/login';
}
/**
@@ -104,11 +104,14 @@ class LoginController extends Controller
AuditTrailHelper::AuthAttempt('Login', 'User (' . $request->email . ') Logged in to the System');
return redirect($redirectTo);
+ } else {
+ // Log activity
+ AuditTrailHelper::AuthAttempt('Login', 'Failed login attempt for User (' . $request->email . ')');
+
+ // Login failed
+ session()->flash('error', 'Invalid email or password.');
+ return back();
}
-
- // Login failed
- session()->flash('error', 'Invalid email or password.');
- return back();
}
/**
diff --git a/app/Http/Controllers/Forms/FormUpCountryController.php b/app/Http/Controllers/Forms/FormUpCountryController.php
index 56fe9f9..8f06cf3 100644
--- a/app/Http/Controllers/Forms/FormUpCountryController.php
+++ b/app/Http/Controllers/Forms/FormUpCountryController.php
@@ -596,6 +596,7 @@ class FormUpCountryController extends Controller
public function destroy($id)
{
$this->checkAuthorization(auth()->user(), ['forms.country.delete']);
+ $role = auth()->user()->getRoleNames()[0];
$form = FormUpCountry::findOrfail($id);
if($form->status != 'On Progress' && $role == 'Medical Representatif') {
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
new file mode 100644
index 0000000..277a565
--- /dev/null
+++ b/resources/views/auth/login.blade.php
@@ -0,0 +1,83 @@
+
+
+
+
+ {{ config('app.app_name') }} - Login
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }})
+
+
Login into {{ config('app.app_name') }}
+
+
+
+
+
+
+
+