akaunting 3.0 (the last dance)

app/Http/Middleware/AdminMenu.php

@@ -22,7 +22,7 @@ class AdminMenu
         }
 
         menu()->create('admin', function ($menu) {
-            $menu->style('argon');
+            $menu->style('tailwind');
 
             event(new AdminCreated($menu));
         });

app/Http/Middleware/AuthenticateOnceWithBasicAuth.php

@@ -0,0 +1,20 @@
+<?php
+ 
+namespace App\Http\Middleware;
+ 
+use Illuminate\Support\Facades\Auth;
+ 
+class AuthenticateOnceWithBasicAuth
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, $next)
+    {
+        return Auth::onceBasic() ?: $next($request);
+    }
+}

app/Http/Middleware/IdentifyCompany.php

@@ -69,7 +69,7 @@ class IdentifyCompany
     {
         $company_id = $this->getCompanyIdFromQuery() ?: $this->getCompanyIdFromHeader();
 
-        return $company_id ?: optional($this->getFirstCompanyOfUser())->id;
+        return $company_id ?: $this->getFirstCompanyOfUser()?->id;
     }
 
     protected function getCompanyIdFromRoute()
@@ -86,4 +86,4 @@ class IdentifyCompany
     {
         return (int) $this->request->header('X-Company');
     }
-}
+}

app/Http/Middleware/PortalMenu.php

@@ -22,7 +22,7 @@ class PortalMenu
         }
 
         menu()->create('portal', function ($menu) {
-            $menu->style('argon');
+            $menu->style('tailwind');
 
             event(new PortalCreated($menu));
         });

app/Http/Middleware/TrustProxies.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Middleware;
 
-use Fideloper\Proxy\TrustProxies as Middleware;
+use Illuminate\Http\Middleware\TrustProxies as Middleware;
 use Illuminate\Http\Request;
 
 class TrustProxies extends Middleware