Fix primary colors bug (#70)

* Fix primary colors bug * Fix styling * wip * wip * wip * Fix styling * Check if currentPanel is not null * Fix styling --------- Co-authored-by: arduinomaster22 <[email protected]> Co-authored-by: Baspa <[email protected]> Co-authored-by: Baspa <[email protected]>
vormkracht10 · Dec 19, 2024 · 1de617e · 1de617e
1 parent 8b12742
commit 1de617e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/resources/views/auth/login-two-factor.blade.php b/resources/views/auth/login-two-factor.blade.php
@@ -9,15 +9,15 @@
     @endif
     <form method="POST" action="{{ route('two-factor.login') }}" class="space-y-8">
         @csrf
-        
+
         <div style="display: none">
             <input type="text" id="recovery_code" name="recovery_code" value="">
         </div>
 
         {{ $this->form }}
 
         <div class="flex items-center justify-between mt-6">
-            <x-filament::button type="submit" class="w-full" style="background-color: {{ filament()->getCurrentPanel()->getColors()['primary'] }};">
+            <x-filament::button type="submit" class="w-full" color="default">
                 {{ __('Login') }}
             </x-filament::button>
         </div>

diff --git a/src/TwoFactorAuthServiceProvider.php b/src/TwoFactorAuthServiceProvider.php
@@ -2,11 +2,14 @@
 
 namespace Vormkracht10\TwoFactorAuth;
 
+use Filament\Facades\Filament;
 use Filament\Support\Assets\AlpineComponent;
 use Filament\Support\Assets\Asset;
 use Filament\Support\Assets\Css;
 use Filament\Support\Assets\Js;
+use Filament\Support\Colors\Color;
 use Filament\Support\Facades\FilamentAsset;
+use Filament\Support\Facades\FilamentColor;
 use Filament\Support\Facades\FilamentIcon;
 use Illuminate\Cache\RateLimiting\Limit;
 use Illuminate\Filesystem\Filesystem;
@@ -128,6 +131,15 @@ public function packageBooted(): void
             $this->getAssetPackageName()
         );
 
+        $colors = Filament::getCurrentPanel()?->getColors();
+        $color = isset($colors['primary'])
+            ? (is_string($colors['primary']) ? Color::hex($colors['primary']) : $colors['primary'])
+            : \Filament\Support\Colors\Color::Amber;
+
+        FilamentColor::register([
+            'default' => $color,
+        ]);
+
         FilamentAsset::registerScriptData(
             $this->getScriptData(),
             $this->getAssetPackageName()