wip #6433 @0.5

diff --git a/app/Http/Controllers/Admin/TasksController.php b/app/Http/Controllers/Admin/TasksController.php
index 55d72866f81b4fdd4fe1a30b13d3426c1f013f43..31c70e2eead8cca6835a438936e565243b9795e2 100644 (file)
--- a/app/Http/Controllers/Admin/TasksController.php
+++ b/app/Http/Controllers/Admin/TasksController.php
@@ -14,7 +14,8 @@ class TasksController extends Controller
         $user = backpack_user();
         $notifications = $user->notifications;
         $res = view('tasks.index', ['notifications' => clone $notifications]);
-        MarkUserNotificationsAsRead::dispatchSync($user)/*->delay(now()->addSeconds(15))*/;
+        MarkUserNotificationsAsRead::dispatchSync($user)/*->delay(now()->addSeconds(15))*/
+        ;
         return $res;
     }
 

diff --git a/app/Http/Middleware/CheckIfAdmin.php b/app/Http/Middleware/CheckIfAdmin.php
index b7c086bb489bd17b337fc4ce95f481911fa2b92e..c3aa49517617b264e87fb2268b6b40de11f63620 100644 (file)
--- a/app/Http/Middleware/CheckIfAdmin.php
+++ b/app/Http/Middleware/CheckIfAdmin.php
@@ -52,6 +52,7 @@ class CheckIfAdmin
      */
     public function handle($request, Closure $next)
     {
+        start_measure('Middleware '.get_class($this));
         if (backpack_auth()->guest()) {
             return $this->respondToUnauthorizedRequest($request);
         }
@@ -60,6 +61,7 @@ class CheckIfAdmin
             return $this->respondToUnauthorizedRequest($request);
         }
 
+        stop_measure('Middleware '.get_class($this));
         return $next($request);
     }
 }

diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
index 2395ddccf9e278a719bac028ce90d5be0c2ebd8e..fd91586c951c8adc6eebd57f6a6a35568a55dd35 100644 (file)
--- a/app/Http/Middleware/RedirectIfAuthenticated.php
+++ b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -18,10 +18,11 @@ class RedirectIfAuthenticated
      */
     public function handle($request, Closure $next, $guard = null)
     {
+        start_measure('Middleware '.get_class($this));
         if (Auth::guard($guard)->check()) {
             return redirect(RouteServiceProvider::HOME);
         }
-
+        stop_measure('Middleware '.get_class($this));
         return $next($request);
     }
 }

diff --git a/composer.json b/composer.json
index b7fdb85d6bc2b4fe9b5d59f1f80e6664e9956417..b675f65dbe9094a7971f7e258cf0de8c5850b6ff 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -42,19 +42,19 @@
         "cubist/scorm": "dev-master",
         "fluidbook/tools": "dev-master",
         "hollodotme/fast-cgi-client": "^3.1.7",
-        "jolicode/slack-php-api": "^v4.5.0",
+        "jolicode/slack-php-api": "^v4.6.0",
         "jsvrcek/ics": "^0.8.5",
         "laravel-notification-channels/webpush": "^7.1",
-        "league/csv": "^9.10.0",
+        "league/csv": "^9.11.0",
         "mxl/laravel-job": "dev-master",
         "nyholm/psr7": "^1.8.0",
         "php-ffmpeg/php-ffmpeg": "^v1.1.0",
-        "rickselby/laravel-gate-cache": "^3.6",
+        "rickselby/laravel-gate-cache": "^3.7",
         "rodneyrehm/plist": "^2.0",
         "rustici-software/scormcloud-api-v2-client-php": "^2.1.0",
         "simplesoftwareio/simple-qrcode": "^4.2",
         "ryangjchandler/standalone-blade": "^0.2.0",
-        "symfony/http-client": "^v6.3.0",
+        "symfony/http-client": "^v6.4.0",
         "voku/simple_html_dom": "^4.8"
     },
     "require-dev": {

diff --git a/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php b/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php
index ac77d887d7a330743312db6e7d9974997f5bfcc7..03b613054d682727c54dadb24dee3e74ef63345a 100644 (file)
--- a/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php
+++ b/resources/views/vendor/backpack/base/inc/sidebar_content.blade.php
@@ -29,6 +29,13 @@
             });
 
             function checkUnread() {
+
+                if (!isFocused()) {
+                    console.log('is not focused');
+                    setTimeout(checkUnread, 10000);
+                    return;
+                }
+
                 $.ajax({
                     url: '{{url('tasks/countUnread')}}',
                     success: function (data) {
@@ -37,14 +44,20 @@
                         } else {
                             $('.la-bell').removeClass('unread');
                         }
+                        setTimeout(checkUnread, 10000);
                     },
+                    error: function () {
+                        setTimeout(checkUnread, 10000);
+                    }
+
                 });
             }
 
-            setInterval(function () {
-                checkUnread();
-            }, 10000);
-            checkUnread();
+            function isFocused() {
+                return document.hasFocus();
+            }
+
+            setTimeout(checkUnread, 10000);
         });
     </script>
 @endpush