Merge pull request #158 from IFRCGo/feature/WN-242

Feature/wn 242
IFRCGo · Feb 22, 2025 · 441555d · 441555d
2 parents 5bd8443 + 2961282
commit 441555d
Show file tree

Hide file tree

Showing 6 changed files with 169 additions and 143 deletions.
diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php
@@ -14,16 +14,16 @@ class ForgotPasswordController extends Controller
 
     public function __construct()
     {
-        $this->middleware('guest');
+        $this->middleware('guest')->except('sendResetLinkEmail');
     }
 
-    
+
     protected function sendResetLinkResponse(Request $request, $response)
     {
         return ['status' => __($response)];
     }
 
-    
+
     protected function sendResetLinkFailedResponse(Request $request, $response)
     {
                 if ($response === Password::INVALID_USER) {
@@ -32,4 +32,5 @@ protected function sendResetLinkFailedResponse(Request $request, $response)
 
         return response()->json(['email' => __($response)], Response::HTTP_BAD_REQUEST);
     }
+
 }
diff --git a/config/mail.php b/config/mail.php
@@ -4,9 +4,10 @@
 
 
 
-    'driver' => env('MAIL_DRIVER', 'ses'),
 
-
+    'driver' => env('MAIL_DRIVER', 'smtp'),
+
+
 
     'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
 
@@ -42,6 +43,7 @@
 
         'paths' => [
             resource_path('views/vendor/mail'),
+            'timeout' => 80,
         ],
     ],
 

diff --git a/resources/assets/js/pages/content/auditLog.vue b/resources/assets/js/pages/content/auditLog.vue
@@ -2,10 +2,10 @@
   <b-container fluid>
     <page-banner>
       <b-col>
-        <h1>{{ $t('content.audit_log.audit_log') }}</h1>
+        <h1 class="sec-title">{{ $t('content.audit_log.my_audit_log') }}</h1>
       </b-col>
       <b-col>
-        <b-button size="lg" variant="dark" class="float-right rtl-float-left mr-2 rtl-ml-2" prop='link' href="/api/organisations/instructions/export" v-if="can(user, permissions.USERS_CREATE)" @click="$fireGTEvent($gtagEvents.DownloadAuditLogReport)">
+        <b-button class="float-right rtl-float-left mr-2 rtl-ml-2 btn-outline-primary" prop='link' href="/api/organisations/instructions/export" v-if="can(user, permissions.USERS_CREATE)" @click="$fireGTEvent($gtagEvents.DownloadAuditLogReport)">
           {{ $t('users.list.download_report') }}
         </b-button>
       </b-col>
@@ -314,6 +314,7 @@ export default {
       societies: 'content/organisations'
     })
   }
+
 }
 </script>
 <style scoped>