From 24de0e93a71908b96d24cac2e313733673dd0244 Mon Sep 17 00:00:00 2001 From: salam Date: Thu, 25 Dec 2025 10:41:30 +0100 Subject: [PATCH] primary color based on Sport smaler sport icons --- .../Administrator/AdministratorCluster.php | 2 + .../Clusters/Settings/SettingsCluster.php | 2 + .../Resources/Events/Tables/EventsTable.php | 5 +-- app/Providers/AppServiceProvider.php | 39 +++++++++++++++---- app/Providers/Filament/AdminPanelProvider.php | 2 +- package-lock.json | 2 + resources/css/filament/admin/theme.css | 7 ++-- .../tables/columns/multiline/odds.blade.php | 2 +- .../views/livewire/bettype-toggle.blade.php | 2 +- .../views/livewire/top-menu-items.blade.php | 2 +- 10 files changed, 47 insertions(+), 18 deletions(-) diff --git a/app/Filament/Clusters/Administrator/AdministratorCluster.php b/app/Filament/Clusters/Administrator/AdministratorCluster.php index 106a1e52..a4411467 100644 --- a/app/Filament/Clusters/Administrator/AdministratorCluster.php +++ b/app/Filament/Clusters/Administrator/AdministratorCluster.php @@ -9,4 +9,6 @@ use Filament\Support\Icons\Heroicon; class AdministratorCluster extends Cluster { protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedSquares2x2; + + protected static ?int $navigationSort = 3; } diff --git a/app/Filament/Clusters/Settings/SettingsCluster.php b/app/Filament/Clusters/Settings/SettingsCluster.php index d3630503..986777ae 100644 --- a/app/Filament/Clusters/Settings/SettingsCluster.php +++ b/app/Filament/Clusters/Settings/SettingsCluster.php @@ -9,4 +9,6 @@ use Filament\Support\Icons\Heroicon; class SettingsCluster extends Cluster { protected static string|BackedEnum|null $navigationIcon = Heroicon::AdjustmentsHorizontal; + + protected static ?int $navigationSort = 2; } diff --git a/app/Filament/Resources/Events/Tables/EventsTable.php b/app/Filament/Resources/Events/Tables/EventsTable.php index 016472ea..517a5aea 100644 --- a/app/Filament/Resources/Events/Tables/EventsTable.php +++ b/app/Filament/Resources/Events/Tables/EventsTable.php @@ -19,7 +19,6 @@ use Filament\Actions\EditAction; use Filament\Forms\Components\Select; use Filament\Schemas\Components\Utilities\Get; use Filament\Support\Enums\FontWeight; -use Filament\Support\Enums\IconSize; use Filament\Tables\Columns\IconColumn; use Filament\Tables\Columns\TextColumn; use Filament\Tables\Enums\FiltersLayout; @@ -45,11 +44,11 @@ class EventsTable ->columns([ IconColumn::make('sport.icon') ->label('') + ->color('primary') ->width('1rem') - ->size(IconSize::ExtraLarge) ->icon(fn ($record) => $record->sport->icon) ->tooltip(fn ($record) => $record->id), - // MatchIds::make('match_ids'), + MatchIds::make('match_ids'), TextColumn::make('id')->hidden()->searchable(), TextColumn::make('betsapi_id')->hidden()->searchable(), TextColumn::make('betradar_id')->hidden()->searchable(), diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 8a2dd9ee..a305c12a 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -9,6 +9,7 @@ use Filament\Support\Facades\FilamentColor; use Filament\Support\Facades\FilamentView; use Filament\Tables\View\TablesRenderHook; use Filament\View\PanelsRenderHook; +use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Blade; use Illuminate\Support\ServiceProvider; @@ -43,14 +44,36 @@ class AppServiceProvider extends ServiceProvider Carbon::setLocale(app()->getLocale()); - FilamentColor::register([ - 'danger' => Color::Red, - 'gray' => Color::Zinc, - 'primary' => Color::Blue, - 'success' => Color::Green, - 'warning' => Color::Yellow, - 'info' => Color::Fuchsia, - ]); + view()->composer('*', function ($view) { + $sport_id = Auth::user()->sport_id; + + switch ($sport_id) { + case 1: + FilamentColor::register(['primary' => Color::Blue]); + break; + case 2: + FilamentColor::register(['primary' => Color::Slate]); + break; + case 3: + FilamentColor::register(['primary' => Color::Red]); + break; + case 5: + FilamentColor::register(['primary' => Color::Yellow]); + break; + default: + FilamentColor::register(['primary' => Color::Blue]); + break; + } + }); + + // FilamentColor::register([ + // 'danger' => Color::Red, + // 'gray' => Color::Zinc, + // 'primary' => Color::Blue, + // 'success' => Color::Green, + // 'warning' => Color::Yellow, + // 'info' => Color::Fuchsia, + // ]); } } diff --git a/app/Providers/Filament/AdminPanelProvider.php b/app/Providers/Filament/AdminPanelProvider.php index c4cc1c5b..c0a421db 100644 --- a/app/Providers/Filament/AdminPanelProvider.php +++ b/app/Providers/Filament/AdminPanelProvider.php @@ -64,7 +64,7 @@ class AdminPanelProvider extends PanelProvider ->discoverPages(in: app_path('Filament/Pages'), for: 'App\Filament\Pages') ->discoverClusters(in: app_path('Filament/Clusters'), for: 'App\\Filament\\Clusters') ->pages([ - Dashboard::class, + // Dashboard::class, ]) ->maxContentWidth(Width::ScreenTwoExtraLarge) ->breadcrumbs(false) diff --git a/package-lock.json b/package-lock.json index d8e299a1..f37f407c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1990,6 +1990,7 @@ "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=12" }, @@ -2223,6 +2224,7 @@ "integrity": "sha512-dZwN5L1VlUBewiP6H9s2+B3e3Jg96D0vzN+Ry73sOefebhYr9f94wwkMNN/9ouoU8pV1BqA1d1zGk8928cx0rg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "esbuild": "^0.27.0", "fdir": "^6.5.0", diff --git a/resources/css/filament/admin/theme.css b/resources/css/filament/admin/theme.css index affb0bff..14f95702 100644 --- a/resources/css/filament/admin/theme.css +++ b/resources/css/filament/admin/theme.css @@ -5,19 +5,20 @@ @source '../../../../resources/views/filament/pages/**/*'; @source '../../../../vendor/awcodes/light-switch/resources/**/*.blade.php'; +/* hide reset link in filters */ .fi-ta-filters-heading, button[wire\:click="resetTableFiltersForm"] { display: none; } -.fi-ta-header-toolbar { +/* .fi-ta-header-toolbar { @apply flex-row-reverse; } .fi-ta-header-toolbar>*:nth-child(2) { width: 100%; justify-content: space-between; -} +} */ .fi-ta-header-cell-oddstotal, .fi-ta-header-cell-oddstq, @@ -26,5 +27,5 @@ button[wire\:click="resetTableFiltersForm"] { .fi-ta-header-cell-odds3way, .fi-ta-header-cell-oddsdc, .fi-ta-header-cell-id { - padding: 0 !important; + @apply !p-0 } \ No newline at end of file diff --git a/resources/views/filament/tables/columns/multiline/odds.blade.php b/resources/views/filament/tables/columns/multiline/odds.blade.php index 52eb266b..93310f8c 100644 --- a/resources/views/filament/tables/columns/multiline/odds.blade.php +++ b/resources/views/filament/tables/columns/multiline/odds.blade.php @@ -1,4 +1,4 @@ -
+
  @if (isset($odd)) {{ number_format($odd, $decimal) }} diff --git a/resources/views/livewire/bettype-toggle.blade.php b/resources/views/livewire/bettype-toggle.blade.php index a2cdf99d..087f39c4 100644 --- a/resources/views/livewire/bettype-toggle.blade.php +++ b/resources/views/livewire/bettype-toggle.blade.php @@ -1,6 +1,6 @@
@foreach ($multilines as $multiline) - {{ $multiline['short'] }} @endforeach
diff --git a/resources/views/livewire/top-menu-items.blade.php b/resources/views/livewire/top-menu-items.blade.php index 7ea40f30..3c2074a2 100644 --- a/resources/views/livewire/top-menu-items.blade.php +++ b/resources/views/livewire/top-menu-items.blade.php @@ -1,6 +1,6 @@
@if ($this->current == 'filament.admin.resources.events.index') - + @foreach ($sports as $id => $name)