From d077b6a4298bb9b9c2241f7f5725f3ca025d3ca4 Mon Sep 17 00:00:00 2001 From: salam Date: Sun, 15 Feb 2026 09:19:26 +0100 Subject: [PATCH] wip --- app/Console/Commands/Grapper/TxOdds/Odds.php | 3 +- .../Resources/Events/EventResource.php | 1 + .../Resources/Events/Tables/EventsTable.php | 8 +-- app/Livewire/Mapper/LoadEvents.php | 16 ++--- app/Livewire/Mapper/LoadProvider.php | 6 +- app/Livewire/Mapper/SearchString.php | 13 ++++ app/Livewire/MapperLeft.php | 48 +++++++-------- app/Livewire/MapperRight.php | 40 +++++------- app/Models/Event.php | 1 + composer.lock | 31 +++++----- .../2023_05_25_112700_create_events_table.php | 1 + ..._11_08_053426_create_odds3way_ht_table.php | 2 +- ...4_11_08_053426_create_odds_3ways_table.php | 2 +- ...1_08_053430_create_odds_2ways_s1_table.php | 2 +- ...4_11_08_053430_create_odds_2ways_table.php | 2 +- ...2024_11_08_053430_create_odds_dc_table.php | 2 +- ...024_11_08_053430_create_odds_dnb_table.php | 2 +- ...24_11_08_053430_create_odds_ggng_table.php | 2 +- ...2024_11_08_053430_create_odds_tq_table.php | 2 +- ..._08_053439_create_odds_points_q1_table.php | 2 +- ..._11_08_053439_create_odds_points_table.php | 2 +- ..._08_053445_create_odds_points_ht_table.php | 2 +- ...1_08_053445_create_odds_total_ht_table.php | 2 +- ...1_08_053445_create_odds_total_q1_table.php | 2 +- ...4_11_08_053445_create_odds_total_table.php | 2 +- resources/css/filament/admin/theme.css | 61 +++++++++++-------- 26 files changed, 134 insertions(+), 123 deletions(-) create mode 100644 app/Livewire/Mapper/SearchString.php diff --git a/app/Console/Commands/Grapper/TxOdds/Odds.php b/app/Console/Commands/Grapper/TxOdds/Odds.php index 840843b5..1c21ff6b 100644 --- a/app/Console/Commands/Grapper/TxOdds/Odds.php +++ b/app/Console/Commands/Grapper/TxOdds/Odds.php @@ -227,6 +227,7 @@ class Odds $sport_id = (int) $row->group['spid']; $event = [ + 'has_markets' => 1, 'provider_id' => (int) Nuh::$options['provider_id'], 'starttime' => $row->time, 'sport_id' => $sport_id, @@ -237,7 +238,7 @@ class Odds 'competition_group_id' => (int) $row->group['cgid'], ]; - $res = Event::firstOrCreate(['id' => (int) $row['id']], $event); + $res = Event::updateOrCreate(['id' => (int) $row['id']], $event); if ($res) { $event_id = $res->id; } diff --git a/app/Filament/Resources/Events/EventResource.php b/app/Filament/Resources/Events/EventResource.php index 1767a3f1..e7d530ff 100644 --- a/app/Filament/Resources/Events/EventResource.php +++ b/app/Filament/Resources/Events/EventResource.php @@ -62,6 +62,7 @@ class EventResource extends Resource ->with('event_bookmaker') ->with('event_user_star') ->with('event_user_note') + ->where('has_markets', 1) ->where('sport_id', auth()->user()->sport_id); if (config('env.app_env') == 'production') { diff --git a/app/Filament/Resources/Events/Tables/EventsTable.php b/app/Filament/Resources/Events/Tables/EventsTable.php index 635d59c6..32611d91 100644 --- a/app/Filament/Resources/Events/Tables/EventsTable.php +++ b/app/Filament/Resources/Events/Tables/EventsTable.php @@ -674,10 +674,10 @@ class EventsTable ])->iconButton() ->icon('phosphor-dots-three-vertical'), - ])->toolbarActions([ - BulkActionGroup::make([ - DeleteBulkAction::make()->visible(fn () => auth()->user()->hasRole('super_admin')), - ]), + // ])->toolbarActions([ + // BulkActionGroup::make([ + // DeleteBulkAction::make()->visible(fn () => auth()->user()->hasRole('super_admin')), + // ]), ]); } } diff --git a/app/Livewire/Mapper/LoadEvents.php b/app/Livewire/Mapper/LoadEvents.php index 74eba052..c25fe3a6 100644 --- a/app/Livewire/Mapper/LoadEvents.php +++ b/app/Livewire/Mapper/LoadEvents.php @@ -9,14 +9,11 @@ use Illuminate\Support\Facades\Auth; class LoadEvents { - public static function load($search_left, $sport_id) + public static function load($search_values) { - if ($search_left) { - - $searchValues = preg_split('/\s+/', $search_left, -1, PREG_SPLIT_NO_EMPTY); - - $element_ids = Element::where(function ($query) use ($searchValues) { - foreach ($searchValues as $value) { + if ($search_values) { + $element_ids = Element::where(function ($query) use ($search_values) { + foreach ($search_values as $value) { $query->orWhere('name', 'LIKE', '%'.$value.'%'); } })->pluck('id')->toArray(); @@ -24,17 +21,16 @@ class LoadEvents $query = Event::query() ->with('home') ->with('away') - ->where('sport_id', $sport_id) + ->where('sport_id', auth()->user()->sport_id) ->where('starttime', '>', Carbon::now()) ->where(function ($query) use ($element_ids) { $query->orWhereIn('home_id', $element_ids)->orWhereIn('away_id', $element_ids); }); - } else { $query = Event::query() ->with('home') ->with('away') - ->where('sport_id', $sport_id) + ->where('sport_id', auth()->user()->sport_id) ->where('starttime', '>', Carbon::now()); } diff --git a/app/Livewire/Mapper/LoadProvider.php b/app/Livewire/Mapper/LoadProvider.php index 7b2e0e74..7e98c7fa 100644 --- a/app/Livewire/Mapper/LoadProvider.php +++ b/app/Livewire/Mapper/LoadProvider.php @@ -18,14 +18,12 @@ class LoadProvider if ($search_right) { - $searchValues = preg_split('/\s+/', $search_right, -1, PREG_SPLIT_NO_EMPTY); - return Mapper::query() ->where('starttime', '>', Carbon::now()) ->where('sport_id', $user->sport_id) ->where('provider_id', $user->provider_id) - ->where(function ($query) use ($searchValues) { - foreach ($searchValues as $value) { + ->where(function ($query) use ($search_right) { + foreach ($search_right as $value) { $query->orWhere('home', 'LIKE', '%'.$value.'%') ->orWhere('away', 'LIKE', '%'.$value.'%'); } diff --git a/app/Livewire/Mapper/SearchString.php b/app/Livewire/Mapper/SearchString.php new file mode 100644 index 00000000..8553e57b --- /dev/null +++ b/app/Livewire/Mapper/SearchString.php @@ -0,0 +1,13 @@ + '$refresh', @@ -51,26 +52,18 @@ class MapperLeft extends Component implements HasActions, HasSchemas, HasTable public function removeTableFilter(string $filterName, ?string $field = null, bool $shouldTriggerUpdatedFiltersHook = true): void { - $searchValues = preg_split('/\s+/', $this->search_left, -1, PREG_SPLIT_NO_EMPTY); - - if (($key = array_search($field, $searchValues)) !== false) { - unset($searchValues[$key]); - } - - if ($searchValues) { - $this->search_left = implode(' ', $searchValues); - } else { - $this->search_left = ''; + if (($key = array_search($field, $this->search_values)) !== false) { + unset($this->search_values[$key]); } $this->dispatch('refreshMapperLeft'); } - #[Lazy] public function table(Table $table): Table { return $table - ->query(LoadEvents::load($this->search_left, auth()->user()->sport_id)) + ->query(LoadEvents::load($this->search_values)) + ->striped() ->columns([ IconColumn::make('country.icon')->icon(fn (string $state): string => $state)->label(''), TextColumn::make('competition_group.name')->label('Group') @@ -100,6 +93,7 @@ class MapperLeft extends Component implements HasActions, HasSchemas, HasTable FusedGroup::make([ Select::make('country_id') ->placeholder('Country') + ->visible(fn () => auth()->user()->sport_id != 5) ->hiddenLabel() ->searchable() ->preload() @@ -139,7 +133,6 @@ class MapperLeft extends Component implements HasActions, HasSchemas, HasTable ->label('') ->searchable() ->options(function (Get $get) { - $map = Country::all()->pluck('name', 'id')->toArray(); $query = CompetitionGroup::where('sport_id', auth()->user()->sport_id) ->whereHas('event', function ($query) { @@ -150,6 +143,7 @@ class MapperLeft extends Component implements HasActions, HasSchemas, HasTable if ($get('country_id') ?? null) { $res = $query->where('country_id', $get('country_id'))->get(); } else { + $timeframe = $get('starttime_period') ?? null; if ($timeframe['start'] || $timeframe['end']) { @@ -170,9 +164,14 @@ class MapperLeft extends Component implements HasActions, HasSchemas, HasTable } }); } - $res = $query->groupBy('country_id')->get(); + if (auth()->user()->sport_id != 5) { + $res = $query->groupBy('country_id')->get(); + } else { + $res = $query->get(); + } } $arr = []; + $map = Country::all()->pluck('name', 'id')->toArray(); foreach ($res as $value) { if (isset($map[$value->country_id])) { $arr[$value->id] = $map[$value->country_id].' '.$value->name; @@ -233,9 +232,8 @@ class MapperLeft extends Component implements HasActions, HasSchemas, HasTable }); })->indicateUsing(function (): array { $indicators = []; - if ($this->search_left) { - $searchValues = preg_split('/\s+/', $this->search_left, -1, PREG_SPLIT_NO_EMPTY); - foreach ($searchValues as $value) { + if ($this->search_values) { + foreach ($this->search_values as $value) { $indicators[] = Indicator::make($value)->removeField($value)->color('info'); } } @@ -254,7 +252,7 @@ class MapperLeft extends Component implements HasActions, HasSchemas, HasTable ->icon('phosphor-x') ->size(Size::Small) ->action(function (Component $livewire) { - $this->search_left = ''; + $this->search_values = []; $this->tableSearch = ''; // Clears the main search bar $livewire->fill(['tableSearch' => '']); $livewire->resetTableFiltersForm(); // Clears all filters @@ -271,12 +269,11 @@ class MapperLeft extends Component implements HasActions, HasSchemas, HasTable #[On('search_left')] public function searchLeft($str) { + $this->search_values = SearchString::explode($str); - foreach ($this->tableFilters['events'] as $key => $value) { - $this->tableFilters['events'][$key] = null; - } - - $this->search_left = $str; + // foreach ($this->search_values as $key => $value) { + // $this->tableFilters['events'][$key] = null; + // } $this->dispatch('refreshMapperLeft'); } @@ -295,8 +292,7 @@ class MapperLeft extends Component implements HasActions, HasSchemas, HasTable }) ->action(function ($arguments) { StoreMapped::store($arguments, $this->elements_swopped); - $this->search_right = ''; - $this->search_left = ''; + $this->search_values = []; $this->dispatch('refreshMapperLeft'); $this->dispatch('refreshMapperRight'); diff --git a/app/Livewire/MapperRight.php b/app/Livewire/MapperRight.php index 0ffadc3c..d733d337 100644 --- a/app/Livewire/MapperRight.php +++ b/app/Livewire/MapperRight.php @@ -4,6 +4,7 @@ namespace App\Livewire; use App\Filament\Tables\Columns\MapperRightColumn; use App\Livewire\Mapper\LoadProvider; +use App\Livewire\Mapper\SearchString; use App\Livewire\Mapper\StoreMapped; use App\Models\Country; use App\Models\Event; @@ -42,7 +43,7 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable public $elements_swopped = false; - public $search_right = false; + public $search_values = []; protected $listeners = [ 'refreshMapperRight' => '$refresh', @@ -50,16 +51,8 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable public function removeTableFilter(string $filterName, ?string $field = null, bool $shouldTriggerUpdatedFiltersHook = true): void { - $searchValues = preg_split('/\s+/', $this->search_right, -1, PREG_SPLIT_NO_EMPTY); - - if (($key = array_search($field, $searchValues)) !== false) { - unset($searchValues[$key]); - } - - if ($searchValues) { - $this->search_right = implode(' ', $searchValues); - } else { - $this->search_right = ''; + if (($key = array_search($field, $this->search_values)) !== false) { + unset($this->search_values[$key]); } $this->dispatch('refreshMapperRight'); @@ -68,7 +61,8 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable public function table(Table $table): Table { return $table - ->query(LoadProvider::load($this->search_right, auth()->user())) + ->query(LoadProvider::load($this->search_values, auth()->user())) + ->striped() ->columns([ MapperRightColumn::make('right')->label(''), TextColumn::make('starttime') @@ -93,7 +87,7 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable ->schema([ FusedGroup::make([ Select::make('country_id') - ->visible(fn () => in_array(auth()->user()->provider_id, [3, 4])) + ->visible(fn () => in_array(auth()->user()->provider_id, [3, 4]) && auth()->user()->sport_id != 5) ->placeholder('Country') ->hiddenLabel() ->label('') @@ -257,9 +251,8 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable }); })->indicateUsing(function (): array { $indicators = []; - if ($this->search_right) { - $searchValues = preg_split('/\s+/', $this->search_right, -1, PREG_SPLIT_NO_EMPTY); - foreach ($searchValues as $value) { + if ($this->search_values) { + foreach ($this->search_values as $value) { $indicators[] = Indicator::make($value)->removeField($value)->color('info'); } } @@ -283,7 +276,7 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable ->icon('phosphor-x') ->size(Size::Small) ->action(function (Component $livewire) { - $this->search_right = ''; + $this->search_values = []; $this->tableSearch = ''; // Clears the main search bar $livewire->fill(['tableSearch' => '']); $livewire->resetTableFiltersForm(); // Clears all filters @@ -301,11 +294,11 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable #[On('search_right')] public function searchRight($str) { - foreach ($this->tableFilters['events'] as $key => $value) { - $this->tableFilters['events'][$key] = null; - } + $this->search_values = SearchString::explode($str); - $this->search_right = $str; + // foreach ($this->tableFilters['events'] as $key => $value) { + // $this->tableFilters['events'][$key] = null; + // } $this->dispatch('refreshMapperRight'); } @@ -324,8 +317,7 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable return view('livewire.confirm-mapping', ['event' => $event, 'mapper' => $mapper]); })->action(function ($arguments) { StoreMapped::store($arguments, $this->elements_swopped); - $this->search_right = ''; - $this->search_left = ''; + $this->search_values = []; $this->dispatch('refreshMapperLeft'); $this->dispatch('refreshMapperRight'); }) @@ -345,6 +337,6 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable public function render() { - return view('livewire.mapper-left'); + return view('livewire.mapper-right'); } } diff --git a/app/Models/Event.php b/app/Models/Event.php index d9a7cf7e..1e192a21 100644 --- a/app/Models/Event.php +++ b/app/Models/Event.php @@ -8,6 +8,7 @@ class Event extends Model { protected $fillable = [ 'id', + 'has_markets', 'provider_id', 'betsapi_id', 'betradar_id', diff --git a/composer.lock b/composer.lock index 1200f0d0..80fd2a06 100644 --- a/composer.lock +++ b/composer.lock @@ -5153,20 +5153,21 @@ }, { "name": "outhebox/blade-flags", - "version": "1.5.4", + "version": "1.6.1", "source": { "type": "git", "url": "https://github.com/MohmmedAshraf/blade-flags.git", - "reference": "f467991314b93ed83c12dafe7ec40ab43b5a61c1" + "reference": "8c5bc1f483fd9daf06cd2a1edb746a549683dccd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/MohmmedAshraf/blade-flags/zipball/f467991314b93ed83c12dafe7ec40ab43b5a61c1", - "reference": "f467991314b93ed83c12dafe7ec40ab43b5a61c1", + "url": "https://api.github.com/repos/MohmmedAshraf/blade-flags/zipball/8c5bc1f483fd9daf06cd2a1edb746a549683dccd", + "reference": "8c5bc1f483fd9daf06cd2a1edb746a549683dccd", "shasum": "" }, "require": { "blade-ui-kit/blade-icons": "^1.1", + "ext-json": "*", "illuminate/support": "^8.0|^9.0|^10.0|^11.0|^12.0", "php": "^7.4|^8.0|^8.1|^8.2" }, @@ -5209,7 +5210,7 @@ ], "support": { "issues": "https://github.com/MohmmedAshraf/blade-flags/issues", - "source": "https://github.com/MohmmedAshraf/blade-flags/tree/1.5.4" + "source": "https://github.com/MohmmedAshraf/blade-flags/tree/js-v0.1.2" }, "funding": [ { @@ -5217,7 +5218,7 @@ "type": "github" } ], - "time": "2025-08-30T07:16:05+00:00" + "time": "2026-02-14T14:49:30+00:00" }, { "name": "paragonie/constant_time_encoding", @@ -13236,16 +13237,16 @@ }, { "name": "webmozart/assert", - "version": "2.1.2", + "version": "2.1.3", "source": { "type": "git", "url": "https://github.com/webmozarts/assert.git", - "reference": "ce6a2f100c404b2d32a1dd1270f9b59ad4f57649" + "reference": "6976757ba8dd70bf8cbaea0914ad84d8b51a9f46" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/ce6a2f100c404b2d32a1dd1270f9b59ad4f57649", - "reference": "ce6a2f100c404b2d32a1dd1270f9b59ad4f57649", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/6976757ba8dd70bf8cbaea0914ad84d8b51a9f46", + "reference": "6976757ba8dd70bf8cbaea0914ad84d8b51a9f46", "shasum": "" }, "require": { @@ -13292,19 +13293,19 @@ ], "support": { "issues": "https://github.com/webmozarts/assert/issues", - "source": "https://github.com/webmozarts/assert/tree/2.1.2" + "source": "https://github.com/webmozarts/assert/tree/2.1.3" }, - "time": "2026-01-13T14:02:24+00:00" + "time": "2026-02-13T21:01:40+00:00" } ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": {}, "prefer-stable": true, "prefer-lowest": false, "platform": { "php": "^8.3" }, - "platform-dev": [], - "plugin-api-version": "2.6.0" + "platform-dev": {}, + "plugin-api-version": "2.9.0" } diff --git a/database/migrations/2023_05_25_112700_create_events_table.php b/database/migrations/2023_05_25_112700_create_events_table.php index e2b96114..1a29d68e 100644 --- a/database/migrations/2023_05_25_112700_create_events_table.php +++ b/database/migrations/2023_05_25_112700_create_events_table.php @@ -13,6 +13,7 @@ return new class extends Migration { Schema::create('events', function (Blueprint $table) { $table->id(); + $table->boolean('has_markets')->default(0); $table->integer('provider_id')->default(0)->nullable()->index()->references('id')->on('providers'); $table->integer('betsapi_id')->default(0)->nullable()->index(); $table->integer('betradar_id')->default(0)->nullable()->index(); diff --git a/database/migrations/2024_11_08_053426_create_odds3way_ht_table.php b/database/migrations/2024_11_08_053426_create_odds3way_ht_table.php index 2b496b81..1c7ef407 100644 --- a/database/migrations/2024_11_08_053426_create_odds3way_ht_table.php +++ b/database/migrations/2024_11_08_053426_create_odds3way_ht_table.php @@ -17,7 +17,7 @@ return new class extends Migration $table->integer('sport_id')->index()->references('id')->on('sports'); $table->integer('bookmaker_id')->index()->references('id')->on('bookmakers'); $table->integer('provider_id')->default(0)->nullable()->index()->references('id')->on('providers'); - $table->bigInteger('offer_id')->default(0); + $table->integer('offer_id')->default(0); $table->string('bmoid')->nullable(); $table->decimal('h3w', 6, 2)->default(0); $table->decimal('d3w', 6, 2)->default(0); diff --git a/database/migrations/2024_11_08_053426_create_odds_3ways_table.php b/database/migrations/2024_11_08_053426_create_odds_3ways_table.php index f92ea81b..d1645f48 100644 --- a/database/migrations/2024_11_08_053426_create_odds_3ways_table.php +++ b/database/migrations/2024_11_08_053426_create_odds_3ways_table.php @@ -17,7 +17,7 @@ return new class extends Migration $table->integer('sport_id')->index()->references('id')->on('sports'); $table->integer('bookmaker_id')->index()->references('id')->on('bookmakers'); $table->integer('provider_id')->default(0)->nullable()->index()->references('id')->on('providers'); - $table->bigInteger('offer_id')->default(0); + $table->integer('offer_id')->default(0); $table->string('bmoid')->nullable(); $table->decimal('h3w', 6, 2)->default(0); $table->decimal('d3w', 6, 2)->default(0); diff --git a/database/migrations/2024_11_08_053430_create_odds_2ways_s1_table.php b/database/migrations/2024_11_08_053430_create_odds_2ways_s1_table.php index 2b9a960f..82cdc340 100644 --- a/database/migrations/2024_11_08_053430_create_odds_2ways_s1_table.php +++ b/database/migrations/2024_11_08_053430_create_odds_2ways_s1_table.php @@ -17,7 +17,7 @@ return new class extends Migration $table->integer('sport_id')->index()->references('id')->on('sports'); $table->integer('bookmaker_id')->index()->references('id')->on('bookmakers'); $table->integer('provider_id')->default(0)->nullable()->index()->references('id')->on('providers'); - $table->bigInteger('offer_id')->default(0); + $table->integer('offer_id')->default(0); $table->string('bmoid')->nullable(); $table->decimal('h2w', 6, 2)->default(0); $table->decimal('a2w', 6, 2)->default(0); diff --git a/database/migrations/2024_11_08_053430_create_odds_2ways_table.php b/database/migrations/2024_11_08_053430_create_odds_2ways_table.php index 8fe0826f..b2831641 100644 --- a/database/migrations/2024_11_08_053430_create_odds_2ways_table.php +++ b/database/migrations/2024_11_08_053430_create_odds_2ways_table.php @@ -17,7 +17,7 @@ return new class extends Migration $table->integer('sport_id')->index()->references('id')->on('sports'); $table->integer('bookmaker_id')->index()->references('id')->on('bookmakers'); $table->integer('provider_id')->default(0)->nullable()->index()->references('id')->on('providers'); - $table->bigInteger('offer_id')->default(0); + $table->integer('offer_id')->default(0); $table->string('bmoid')->nullable(); $table->decimal('h2w', 6, 2)->default(0); $table->decimal('a2w', 6, 2)->default(0); diff --git a/database/migrations/2024_11_08_053430_create_odds_dc_table.php b/database/migrations/2024_11_08_053430_create_odds_dc_table.php index 35712806..203c5391 100644 --- a/database/migrations/2024_11_08_053430_create_odds_dc_table.php +++ b/database/migrations/2024_11_08_053430_create_odds_dc_table.php @@ -18,7 +18,7 @@ return new class extends Migration $table->integer('bookmaker_id')->index()->references('id')->on('bookmakers'); $table->integer('provider_id')->default(0)->nullable()->index()->references('id')->on('providers'); $table->string('bmoid')->nullable(); - $table->bigInteger('offer_id')->default(0); + $table->integer('offer_id')->default(0); $table->decimal('dc1x', 6, 2)->default(0); $table->decimal('dc12', 6, 2)->default(0); $table->decimal('dcx2', 6, 2)->default(0); diff --git a/database/migrations/2024_11_08_053430_create_odds_dnb_table.php b/database/migrations/2024_11_08_053430_create_odds_dnb_table.php index f3f4d3de..f7d7c668 100644 --- a/database/migrations/2024_11_08_053430_create_odds_dnb_table.php +++ b/database/migrations/2024_11_08_053430_create_odds_dnb_table.php @@ -17,7 +17,7 @@ return new class extends Migration $table->integer('sport_id')->index()->references('id')->on('sports'); $table->integer('bookmaker_id')->index()->references('id')->on('bookmakers'); $table->integer('provider_id')->default(0)->nullable()->index()->references('id')->on('providers'); - $table->bigInteger('offer_id')->default(0); + $table->integer('offer_id')->default(0); $table->string('bmoid')->nullable(); $table->decimal('dnb1', 6, 2)->default(0); $table->decimal('dnb2', 6, 2)->default(0); diff --git a/database/migrations/2024_11_08_053430_create_odds_ggng_table.php b/database/migrations/2024_11_08_053430_create_odds_ggng_table.php index 34225c91..c9a41acf 100644 --- a/database/migrations/2024_11_08_053430_create_odds_ggng_table.php +++ b/database/migrations/2024_11_08_053430_create_odds_ggng_table.php @@ -17,7 +17,7 @@ return new class extends Migration $table->integer('sport_id')->index()->references('id')->on('sports'); $table->integer('bookmaker_id')->index()->references('id')->on('bookmakers'); $table->integer('provider_id')->default(0)->nullable()->index()->references('id')->on('providers'); - $table->bigInteger('offer_id')->default(0); + $table->integer('offer_id')->default(0); $table->string('bmoid')->nullable(); $table->decimal('gg', 6, 2)->default(0); $table->decimal('ng', 6, 2)->default(0); diff --git a/database/migrations/2024_11_08_053430_create_odds_tq_table.php b/database/migrations/2024_11_08_053430_create_odds_tq_table.php index ccc6f490..0b6e2a6e 100644 --- a/database/migrations/2024_11_08_053430_create_odds_tq_table.php +++ b/database/migrations/2024_11_08_053430_create_odds_tq_table.php @@ -17,7 +17,7 @@ return new class extends Migration $table->integer('sport_id')->index()->references('id')->on('sports'); $table->integer('bookmaker_id')->index()->references('id')->on('bookmakers'); $table->integer('provider_id')->default(0)->nullable()->index()->references('id')->on('providers'); - $table->bigInteger('offer_id')->default(0); + $table->integer('offer_id')->default(0); $table->string('bmoid')->nullable(); $table->decimal('htq', 6, 2)->default(0); $table->decimal('atq', 6, 2)->default(0); diff --git a/database/migrations/2024_11_08_053439_create_odds_points_q1_table.php b/database/migrations/2024_11_08_053439_create_odds_points_q1_table.php index 3e4dbe5b..587f5e54 100644 --- a/database/migrations/2024_11_08_053439_create_odds_points_q1_table.php +++ b/database/migrations/2024_11_08_053439_create_odds_points_q1_table.php @@ -17,7 +17,7 @@ return new class extends Migration $table->integer('sport_id')->index()->references('id')->on('sports'); $table->integer('bookmaker_id')->index()->references('id')->on('bookmakers'); $table->integer('provider_id')->default(0)->nullable()->index()->references('id')->on('providers'); - $table->bigInteger('offer_id')->default(0); + $table->integer('offer_id')->default(0); $table->string('bmoid')->nullable(); $table->decimal('home', 6, 2)->default(0); $table->decimal('away', 6, 2)->default(0); diff --git a/database/migrations/2024_11_08_053439_create_odds_points_table.php b/database/migrations/2024_11_08_053439_create_odds_points_table.php index 99a8e2a6..d228cb20 100644 --- a/database/migrations/2024_11_08_053439_create_odds_points_table.php +++ b/database/migrations/2024_11_08_053439_create_odds_points_table.php @@ -17,7 +17,7 @@ return new class extends Migration $table->integer('sport_id')->index()->references('id')->on('sports'); $table->integer('bookmaker_id')->index()->references('id')->on('bookmakers'); $table->integer('provider_id')->default(0)->nullable()->index()->references('id')->on('providers'); - $table->bigInteger('offer_id')->default(0); + $table->integer('offer_id')->default(0); $table->string('bmoid')->nullable(); $table->decimal('home', 6, 2)->default(0); $table->decimal('away', 6, 2)->default(0); diff --git a/database/migrations/2024_11_08_053445_create_odds_points_ht_table.php b/database/migrations/2024_11_08_053445_create_odds_points_ht_table.php index f68488dc..f43b1faa 100644 --- a/database/migrations/2024_11_08_053445_create_odds_points_ht_table.php +++ b/database/migrations/2024_11_08_053445_create_odds_points_ht_table.php @@ -17,7 +17,7 @@ return new class extends Migration $table->integer('sport_id')->index()->references('id')->on('sports'); $table->integer('bookmaker_id')->index()->references('id')->on('bookmakers'); $table->integer('provider_id')->default(0)->nullable()->index()->references('id')->on('providers'); - $table->bigInteger('offer_id')->default(0); + $table->integer('offer_id')->default(0); $table->string('bmoid')->nullable(); $table->decimal('home', 6, 2)->default(0); $table->decimal('away', 6, 2)->default(0); diff --git a/database/migrations/2024_11_08_053445_create_odds_total_ht_table.php b/database/migrations/2024_11_08_053445_create_odds_total_ht_table.php index e97fa2ce..0a47e53e 100644 --- a/database/migrations/2024_11_08_053445_create_odds_total_ht_table.php +++ b/database/migrations/2024_11_08_053445_create_odds_total_ht_table.php @@ -17,7 +17,7 @@ return new class extends Migration $table->integer('sport_id')->index()->references('id')->on('sports'); $table->integer('bookmaker_id')->index()->references('id')->on('bookmakers'); $table->integer('provider_id')->default(0)->nullable()->index()->references('id')->on('providers'); - $table->bigInteger('offer_id')->default(0); + $table->integer('offer_id')->default(0); $table->string('bmoid')->nullable(); $table->decimal('over', 6, 2)->default(0); $table->decimal('under', 6, 2)->default(0); diff --git a/database/migrations/2024_11_08_053445_create_odds_total_q1_table.php b/database/migrations/2024_11_08_053445_create_odds_total_q1_table.php index 2050408d..f90fa50f 100644 --- a/database/migrations/2024_11_08_053445_create_odds_total_q1_table.php +++ b/database/migrations/2024_11_08_053445_create_odds_total_q1_table.php @@ -17,7 +17,7 @@ return new class extends Migration $table->integer('sport_id')->index()->references('id')->on('sports'); $table->integer('bookmaker_id')->index()->references('id')->on('bookmakers'); $table->integer('provider_id')->default(0)->nullable()->index()->references('id')->on('providers'); - $table->bigInteger('offer_id')->default(0); + $table->integer('offer_id')->default(0); $table->string('bmoid')->nullable(); $table->decimal('over', 6, 2)->default(0); $table->decimal('under', 6, 2)->default(0); diff --git a/database/migrations/2024_11_08_053445_create_odds_total_table.php b/database/migrations/2024_11_08_053445_create_odds_total_table.php index d2fbbf5c..21f6299c 100644 --- a/database/migrations/2024_11_08_053445_create_odds_total_table.php +++ b/database/migrations/2024_11_08_053445_create_odds_total_table.php @@ -17,7 +17,7 @@ return new class extends Migration $table->integer('sport_id')->index()->references('id')->on('sports'); $table->integer('bookmaker_id')->index()->references('id')->on('bookmakers'); $table->integer('provider_id')->default(0)->nullable()->index()->references('id')->on('providers'); - $table->bigInteger('offer_id')->default(0); + $table->integer('offer_id')->default(0); $table->string('bmoid')->nullable(); $table->decimal('over', 6, 2)->default(0); $table->decimal('under', 6, 2)->default(0); diff --git a/resources/css/filament/admin/theme.css b/resources/css/filament/admin/theme.css index 41e5235d..b24dffaf 100644 --- a/resources/css/filament/admin/theme.css +++ b/resources/css/filament/admin/theme.css @@ -9,11 +9,6 @@ @source '../../../../vendor/guava/filament-modal-relation-managers/resources/**/*'; @source '../../../../vendor/jaocero/radio-deck/resources/views'; -.fi-ta-header-toolbar, -.fi-ta-filters-above-content-ctn { - @apply pt-0 -} - /* Reduce gap between widgets and content */ .fi-page-content { @apply gap-y-5; @@ -55,9 +50,6 @@ button[wire\:click="resetTableFiltersForm"] { @apply bg-gray-600/5; } -/* .fi-ta-header-toolbar { - @apply flex-row-reverse; -} */ /* searchbox move to left */ .fi-ta-header-toolbar> :nth-child(2) { justify-content: space-between; @@ -112,7 +104,7 @@ button[wire\:click="resetTableFiltersForm"] { @apply p-2 border border-gray-200 shadow rounded-md cursor-pointer has-checked:bg-blue-50 has-checked:text-blue-900 dark:has-checked:bg-blue-950 dark:has-checked:text-blue-200 } -#mapper_right .fi-dropdown-list-item, +/* #mapper_right .fi-dropdown-list-item, #mapper_left .fi-dropdown-list-item { padding: 2px; } @@ -126,29 +118,48 @@ button[wire\:click="resetTableFiltersForm"] { #mapper_right .fi-ta-filter-indicators div button, #mapper_left .fi-ta-filter-indicators div button { display: block; -} +} */ /** less padding in table */ -/* .fi-ta-table thead { - display: none; -} +#mapper_right, +#mapper_left { + @layer components { + .fi-ta-ctn { + & .fi-ta-filters { + display: grid; + row-gap: 0; + } + } -.fi-ta-header-toolbar { - padding-top: 0.25rem !important; - padding-bottom: 0.25rem !important; -} + .fi-ta-text { + &:not(.fi-inline) { + padding-block: 0.2rem; + } + } + } -.fi-ta-cell { - padding-top: 0.25rem !important; - padding-bottom: 0.25rem !important; -} + .fi-ta-table thead { + display: none; + } -.fi-ta-cell>div { - padding-top: 0px !important; - padding-bottom: 0px !important; -} */ + .fi-ta-filters-above-content-ctn { + @apply py-3 + } + + .fi-ta-header-toolbar { + @apply py-3 + } + + .fi-ta-cell { + @apply py-0.5 + } + + .fi-ta-cell>div { + @apply py-0.5 + } +} /* Optional: Decrease overall table container padding */ /* .fi-ta-ctn {