Fix primary colors bug

vormkracht10 · Dec 19, 2024 · 810c44b · 810c44b
1 parent 8b12742
commit 810c44b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/resources/views/auth/login-two-factor.blade.php b/resources/views/auth/login-two-factor.blade.php
@@ -17,7 +17,7 @@
         {{ $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="primary">
                 {{ __('Login') }}
             </x-filament::button>
         </div>

diff --git a/src/TwoFactorAuthServiceProvider.php b/src/TwoFactorAuthServiceProvider.php
@@ -6,7 +6,9 @@
 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 +130,24 @@ public function packageBooted(): void
             $this->getAssetPackageName()
         );
 
+        $colors = filament()->getCurrentPanel()->getColors();
+        if (isset($colors['primary'])) {
+            if (is_string($colors['primary'])) {
+                $color = Color::hex($colors['primary']);
+            } else {
+                $color = $colors['primary'];
+            }
+        } else {
+            $color = \Filament\Support\Colors\Color::Amber;
+        }
+
+        FilamentColor::register([
+            'default' => $color
+        ]);
+
+
+
+
         FilamentAsset::registerScriptData(
             $this->getScriptData(),
             $this->getAssetPackageName()
@@ -171,7 +191,7 @@ public function packageBooted(): void
                  * This route name is used multiple places in filament.
                  */
                 Route::prefix(config('filament.path'))->group(function () {
-                    Route::get('/filament-login', fn () => Redirect::route('login'))
+                    Route::get('/filament-login', fn() => Redirect::route('login'))
                         ->name('auth.login');
                 });
             });