From f1b0f43dedaf4d3190d64ddccc1c02a2cad142f3 Mon Sep 17 00:00:00 2001 From: salam Date: Sun, 15 Feb 2026 12:33:43 +0100 Subject: [PATCH] new mapper new colors --- app/Livewire/MapperLeft.php | 35 +++++--- app/Livewire/MapperRight.php | 34 ++++---- app/Providers/AppServiceProvider.php | 6 +- resources/css/filament/admin/theme.css | 47 +++++------ .../views/components/alarm-neutral.blade.php | 2 +- .../views/components/column/blank.blade.php | 4 +- .../views/components/column/label.blade.php | 4 +- .../events/widgets/alarm-widget.blade.php | 2 +- .../columns/mapper-left-column.blade.php | 32 ++++--- .../columns/mapper-right-column.blade.php | 34 ++++---- .../columns/parts/move-botton.blade.php | 4 +- .../columns/parts/search-left.blade.php | 5 +- .../columns/parts/search-right.blade.php | 3 +- .../views/livewire/bettype-toggle.blade.php | 83 +++++++++---------- 14 files changed, 152 insertions(+), 143 deletions(-) diff --git a/app/Livewire/MapperLeft.php b/app/Livewire/MapperLeft.php index 212976d5..307f85a0 100644 --- a/app/Livewire/MapperLeft.php +++ b/app/Livewire/MapperLeft.php @@ -46,10 +46,14 @@ class MapperLeft extends Component implements HasActions, HasSchemas, HasTable public $search_values = []; + public $search_color = 'info'; + protected $listeners = [ 'refreshMapperLeft' => '$refresh', ]; + public function isRemovingAllFilters() {} + public function removeTableFilter(string $filterName, ?string $field = null, bool $shouldTriggerUpdatedFiltersHook = true): void { if (($key = array_search($field, $this->search_values)) !== false) { @@ -68,7 +72,8 @@ class MapperLeft extends Component implements HasActions, HasSchemas, HasTable IconColumn::make('country.icon')->icon(fn (string $state): string => $state)->label(''), TextColumn::make('competition_group.name')->label('Group') ->wrap() - ->tooltip('Click to filter by this group') + ->color('primary') + ->tooltip('Filter by group') ->description(fn ($record): string => $record->country?->name ?? '') ->action(function ($record) { if ($record?->competition_group_id ?? null && ! in_array($record->competition_group_id, $this->tableFilters['events']['competition_group_id'])) { @@ -78,10 +83,9 @@ class MapperLeft extends Component implements HasActions, HasSchemas, HasTable }), TextColumn::make('starttime') ->sortable() - ->time('H:i') - ->alignCenter() - ->description(fn ($record): string => Carbon::parse($record->starttime)->format('d. M. y')), - MapperLeftColumn::make('left')->label(''), + ->time('d. M. y H:i') + ->alignCenter(), + MapperLeftColumn::make('left')->label('Event')->alignCenter(), ]) ->defaultSort('starttime') ->searchable(['home.name', 'away.name']) @@ -234,7 +238,7 @@ class MapperLeft extends Component implements HasActions, HasSchemas, HasTable $indicators = []; if ($this->search_values) { foreach ($this->search_values as $value) { - $indicators[] = Indicator::make($value)->removeField($value)->color('info'); + $indicators[] = Indicator::make($value)->removeField($value)->color($this->search_color); } } @@ -246,9 +250,15 @@ class MapperLeft extends Component implements HasActions, HasSchemas, HasTable ->persistFiltersInSession() ->deferFilters(false) ->toolbarActions([ - Action::make('refreshMapperLeft') + Action::make('refresh_left') + ->hiddenLabel() + ->icon('phosphor-arrows-counter-clockwise') + ->size(Size::Small) + ->action(function (Component $livewire) { + $this->dispatch('refreshMapperLeft'); + }), + Action::make('reload_left') ->hiddenLabel() - ->color('gray') ->icon('phosphor-x') ->size(Size::Small) ->action(function (Component $livewire) { @@ -267,13 +277,12 @@ class MapperLeft extends Component implements HasActions, HasSchemas, HasTable } #[On('search_left')] - public function searchLeft($str) + public function searchLeft($string) { - $this->search_values = SearchString::explode($str); + $t = explode('|', $string); + $this->search_values = SearchString::explode($t[0]); - // foreach ($this->search_values as $key => $value) { - // $this->tableFilters['events'][$key] = null; - // } + $this->search_color = $t[1]; $this->dispatch('refreshMapperLeft'); } diff --git a/app/Livewire/MapperRight.php b/app/Livewire/MapperRight.php index d733d337..92b1825c 100644 --- a/app/Livewire/MapperRight.php +++ b/app/Livewire/MapperRight.php @@ -45,6 +45,8 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable public $search_values = []; + public $search_color = 'info'; + protected $listeners = [ 'refreshMapperRight' => '$refresh', ]; @@ -64,15 +66,15 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable ->query(LoadProvider::load($this->search_values, auth()->user())) ->striped() ->columns([ - MapperRightColumn::make('right')->label(''), + MapperRightColumn::make('left')->label('Event')->alignCenter(), TextColumn::make('starttime') ->sortable() - ->time('H:i') - ->alignCenter() - ->description(fn ($record): string => Carbon::parse($record->starttime)->format('d. M. y')), + ->time('d. M. y H:i') + ->alignCenter(), TextColumn::make('group') ->wrap() - ->tooltip('Click to filter by this group') + ->color('primary') + ->tooltip('Filter by group') ->description(fn ($record): string => $record->country_betsapi?->name.' '.$record->country) ->action(function ($record) { if ($record?->group_id ?? null && ! in_array($record->group_id, $this->tableFilters['events']['group_id'])) { @@ -253,7 +255,7 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable $indicators = []; if ($this->search_values) { foreach ($this->search_values as $value) { - $indicators[] = Indicator::make($value)->removeField($value)->color('info'); + $indicators[] = Indicator::make($value)->removeField($value)->color($this->search_color); } } @@ -270,9 +272,15 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable ->filtersFormColumns(3) ->deferFilters(false) ->toolbarActions([ - Action::make('refreshMapperRight') + Action::make('refresh_right') + ->hiddenLabel() + ->icon('phosphor-arrows-counter-clockwise') + ->size(Size::Small) + ->action(function (Component $livewire) { + $this->dispatch('refreshMapperRight'); + }), + Action::make('reload_right') ->hiddenLabel() - ->color('gray') ->icon('phosphor-x') ->size(Size::Small) ->action(function (Component $livewire) { @@ -281,7 +289,6 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable $livewire->fill(['tableSearch' => '']); $livewire->resetTableFiltersForm(); // Clears all filters $this->dispatch('refreshMapperRight'); - // $this->dispatch('refreshMapperLeft'); }), ]); } @@ -292,13 +299,12 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable } #[On('search_right')] - public function searchRight($str) + public function searchRight($string) { - $this->search_values = SearchString::explode($str); + $t = explode('|', $string); + $this->search_values = SearchString::explode($t[0]); - // foreach ($this->tableFilters['events'] as $key => $value) { - // $this->tableFilters['events'][$key] = null; - // } + $this->search_color = $t[1]; $this->dispatch('refreshMapperRight'); } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 543dac65..f1f95272 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -58,14 +58,12 @@ class AppServiceProvider extends ServiceProvider Carbon::setLocale(app()->getLocale()); FilamentColor::register([ - 'primary' => Color::Gray, + 'primary' => Color::Blue, 'danger' => Color::Red, 'gray' => Color::Zinc, - 'info' => Color::Blue, + 'info' => Color::Lime, 'success' => Color::Green, 'warning' => Color::Orange, - 'home' => Color::Sky, - 'away' => Color::Lime, ]); } } diff --git a/resources/css/filament/admin/theme.css b/resources/css/filament/admin/theme.css index b24dffaf..1e933f2b 100644 --- a/resources/css/filament/admin/theme.css +++ b/resources/css/filament/admin/theme.css @@ -76,24 +76,6 @@ button[wire\:click="resetTableFiltersForm"] { @apply grid grid-cols-3 justify-start } -#mapper { - @layer components { - .fi-ta-ctn { - & .fi-ta-header-toolbar { - @apply !flex-row-reverse; - flex-wrap: inherit; - } - } - - .fi-pagination { - & .fi-pagination-overview { - display: block; - font-size: 11px; - } - } - } -} - /* Styling Radio Lable */ .fi-fo-radio { @@ -108,17 +90,18 @@ button[wire\:click="resetTableFiltersForm"] { #mapper_left .fi-dropdown-list-item { padding: 2px; } - +*/ #mapper_right .fi-ta-filter-indicators button, #mapper_left .fi-ta-filter-indicators button { + /** remove all filters not working */ display: none; } #mapper_right .fi-ta-filter-indicators div button, #mapper_left .fi-ta-filter-indicators div button { display: block; -} */ +} /** less padding in table @@ -140,10 +123,6 @@ less padding in table } } - .fi-ta-table thead { - display: none; - } - .fi-ta-filters-above-content-ctn { @apply py-3 } @@ -161,6 +140,26 @@ less padding in table } } + +#mapper { + @layer components { + .fi-ta-ctn { + & .fi-ta-header-toolbar { + @apply !flex-row-reverse; + flex-wrap: inherit; + } + } + + .fi-pagination { + & .fi-pagination-overview { + display: block; + font-size: 11px; + } + } + } +} + + /* Optional: Decrease overall table container padding */ /* .fi-ta-ctn { padding-top: 0.5rem !important; diff --git a/resources/views/components/alarm-neutral.blade.php b/resources/views/components/alarm-neutral.blade.php index 4bdaf361..58cfb80b 100644 --- a/resources/views/components/alarm-neutral.blade.php +++ b/resources/views/components/alarm-neutral.blade.php @@ -1,5 +1,5 @@
+ class="text-gray-400 bg-gray-50 border border-gray-300 dark:text-gray-500 dark:!border-gray-800 dark:bg-gray-900 rounded"> {{ $slot }}
diff --git a/resources/views/components/column/blank.blade.php b/resources/views/components/column/blank.blade.php index dd3d0694..774c47e6 100644 --- a/resources/views/components/column/blank.blade.php +++ b/resources/views/components/column/blank.blade.php @@ -1,3 +1,3 @@ -
-{{ $slot }} +
+ {{ $slot }}
diff --git a/resources/views/components/column/label.blade.php b/resources/views/components/column/label.blade.php index b0781125..1378b5f8 100644 --- a/resources/views/components/column/label.blade.php +++ b/resources/views/components/column/label.blade.php @@ -1,3 +1,3 @@ -
+
{{ $slot }} -
\ No newline at end of file +
diff --git a/resources/views/filament/resources/events/widgets/alarm-widget.blade.php b/resources/views/filament/resources/events/widgets/alarm-widget.blade.php index 2508a00d..47ace3ad 100644 --- a/resources/views/filament/resources/events/widgets/alarm-widget.blade.php +++ b/resources/views/filament/resources/events/widgets/alarm-widget.blade.php @@ -1,5 +1,5 @@
+ class="grid grid-cols-4 text-xs gap-1 p-1 text-gray-400 dark:text-gray-500 border rounded border-gray-200 dark:border-gray-800 bg-gray-100 dark:bg-gray-900 text-center shadow">
{{ $title }}
@if ($red) diff --git a/resources/views/filament/tables/columns/mapper-left-column.blade.php b/resources/views/filament/tables/columns/mapper-left-column.blade.php index fa5a8638..325505f4 100644 --- a/resources/views/filament/tables/columns/mapper-left-column.blade.php +++ b/resources/views/filament/tables/columns/mapper-left-column.blade.php @@ -1,32 +1,30 @@ -
  • + draggable="true" mapper="left">
    -
    {{ $record->home->name }}
    + + {{ $record->home->name }} + +
    -
    -
    {{ $record->away->name }}
    + + {{ $record->away->name }} +
    -
    - @include('filament.tables.columns.parts.search-left', ['find' => $record->home->name, 'color' => 'away']) - - @include('filament.tables.columns.parts.search-left', ['find' => $record->away->name, 'color' => 'home']) - - @include('filament.tables.columns.parts.move-botton') -
    + @include('filament.tables.columns.parts.move-botton')
  • diff --git a/resources/views/filament/tables/columns/mapper-right-column.blade.php b/resources/views/filament/tables/columns/mapper-right-column.blade.php index 0575e346..bc8e2cc4 100644 --- a/resources/views/filament/tables/columns/mapper-right-column.blade.php +++ b/resources/views/filament/tables/columns/mapper-right-column.blade.php @@ -1,33 +1,31 @@ -
  • + draggable="true" mapper="right"> -
    - @include('filament.tables.columns.parts.move-botton') - - @include('filament.tables.columns.parts.search-right', ['find' => $record->home, 'color' => 'away']) - - @include('filament.tables.columns.parts.search-right', ['find' => $record->away, 'color' => 'home']) + @include('filament.tables.columns.parts.move-botton') -
    +
    + + {{ $record->home }} + -
    -
    {{ $record->home }}
    -
    -
    {{ $record->away }}
    + + {{ $record->away }} + +
  • diff --git a/resources/views/filament/tables/columns/parts/move-botton.blade.php b/resources/views/filament/tables/columns/parts/move-botton.blade.php index ebbeba65..98649af0 100644 --- a/resources/views/filament/tables/columns/parts/move-botton.blade.php +++ b/resources/views/filament/tables/columns/parts/move-botton.blade.php @@ -1,4 +1,4 @@
    - {{-- --}} - + + {{-- --}}
    diff --git a/resources/views/filament/tables/columns/parts/search-left.blade.php b/resources/views/filament/tables/columns/parts/search-left.blade.php index 38c330d9..0569da6c 100644 --- a/resources/views/filament/tables/columns/parts/search-left.blade.php +++ b/resources/views/filament/tables/columns/parts/search-left.blade.php @@ -1,3 +1,4 @@
    - -
    \ No newline at end of file + +
    diff --git a/resources/views/filament/tables/columns/parts/search-right.blade.php b/resources/views/filament/tables/columns/parts/search-right.blade.php index d9c15b30..ce5bee8d 100644 --- a/resources/views/filament/tables/columns/parts/search-right.blade.php +++ b/resources/views/filament/tables/columns/parts/search-right.blade.php @@ -1,3 +1,4 @@
    - +
    diff --git a/resources/views/livewire/bettype-toggle.blade.php b/resources/views/livewire/bettype-toggle.blade.php index 61bf9eb9..f2cc8ff4 100644 --- a/resources/views/livewire/bettype-toggle.blade.php +++ b/resources/views/livewire/bettype-toggle.blade.php @@ -1,5 +1,5 @@
    - +
    @@ -19,53 +19,52 @@
    @role('partner_porgramm') -
    - - Missing - @if ($this->bookmakerPartnerDiffrences == 0) - - 0 - - @else - - {{ $this->bookmakerPartnerDiffrences }} - - @endif - - - +
    + + Missing + @if ($this->bookmakerPartnerDiffrences == 0) + + 0 + + @else + + {{ $this->bookmakerPartnerDiffrences }} + + @endif + + + - - + + - - -
    + + +
    @endrole - +
    - + + :color="auth()->user()->all_only_none == 1 ? 'primary' : 'gray'" tooltip="Events with {{ auth()->user()->bookmaker->name }}"> -
    @@ -84,7 +83,7 @@
    @else + tooltip="{{ $toggle['name'] }}" wire:click="toggleBettype({{ $toggle['id'] }})" :color="!$toggle['is_active'] ? 'gray' : 'primary'">
    {{ $toggle['short'] }}
    @endif