diff --git a/app/Filament/Resources/Events/Tables/EventsTable.php b/app/Filament/Resources/Events/Tables/EventsTable.php index 517a5aea..ed8d215f 100644 --- a/app/Filament/Resources/Events/Tables/EventsTable.php +++ b/app/Filament/Resources/Events/Tables/EventsTable.php @@ -20,6 +20,7 @@ use Filament\Forms\Components\Select; use Filament\Schemas\Components\Utilities\Get; use Filament\Support\Enums\FontWeight; use Filament\Tables\Columns\IconColumn; +use Filament\Tables\Columns\Layout\View; use Filament\Tables\Columns\TextColumn; use Filament\Tables\Enums\FiltersLayout; use Filament\Tables\Filters\Filter; @@ -44,11 +45,13 @@ class EventsTable ->columns([ IconColumn::make('sport.icon') ->label('') + ->grow(false) ->color('primary') - ->width('1rem') + ->width(30) ->icon(fn ($record) => $record->sport->icon) ->tooltip(fn ($record) => $record->id), - MatchIds::make('match_ids'), + // MatchIds::make('match_ids') + // ->grow(false), TextColumn::make('id')->hidden()->searchable(), TextColumn::make('betsapi_id')->hidden()->searchable(), TextColumn::make('betradar_id')->hidden()->searchable(), @@ -61,22 +64,32 @@ class EventsTable ->weight(FontWeight::Bold) ->description(fn ($state): string => Carbon::createFromDate($state)->format('d. M')), TextColumn::make('country.name') + ->width('20rem') ->searchable() ->color('gray') ->label('Event') ->icon(fn ($record) => $record->country->icon) ->description(fn ($record) => $record->competition_group->name), TextColumn::make('home.name') + ->wrap() ->searchable() ->alignRight(), TextColumn::make('away.name') + ->wrap() ->searchable(), - Column3way::make('odds3way')->visible(fn () => in_array(1, self::$bettype_settings))->width(225)->label(fn () => view('filament.tables.columns.multiline.labels', ['menu' => '1x2'])), - ColumnDc::make('oddsdc')->visible(fn () => in_array(2, self::$bettype_settings))->width(225)->label(fn () => view('filament.tables.columns.multiline.labels', ['menu' => 'dc'])), - ColumnDnb::make('oddsdnb')->visible(fn () => in_array(3, self::$bettype_settings))->width(190)->label(fn () => view('filament.tables.columns.multiline.labels', ['menu' => 'dnb'])), - ColumnGgng::make('oddsggng')->visible(fn () => in_array(4, self::$bettype_settings))->width(190)->label(fn () => view('filament.tables.columns.multiline.labels', ['menu' => 'gg'])), - ColumnGgng::make('oddstq')->visible(fn () => in_array(5, self::$bettype_settings))->width(190)->label(fn () => view('filament.tables.columns.multiline.labels', ['menu' => 'tq'])), - ColumnTotal::make('oddstotal')->visible(fn () => in_array(6, self::$bettype_settings))->width(225)->label(fn () => view('filament.tables.columns.multiline.labels', ['menu' => 'ou'])), + Column3way::make('odds3way')->visible(fn () => in_array(1, self::$bettype_settings))->width(225)->label('1 X 2'), + ColumnDc::make('oddsdc')->visible(fn () => in_array(2, self::$bettype_settings))->width(225)->label('Double Chance'), + ColumnDnb::make('oddsdnb')->visible(fn () => in_array(3, self::$bettype_settings))->width(190)->label('Draw No Bet'), + ColumnGgng::make('oddsggng')->visible(fn () => in_array(4, self::$bettype_settings))->width(190)->label('Goal No Goal'), + ColumnGgng::make('oddstq')->visible(fn () => in_array(5, self::$bettype_settings))->width(190)->label('To Qualify'), + ColumnTotal::make('oddstotal')->visible(fn () => in_array(6, self::$bettype_settings))->width(225)->label('Totals'), + + // Column3way::make('odds3way')->visible(fn () => in_array(1, self::$bettype_settings))->width(225)->label(fn () => view('filament.tables.columns.multiline.labels', ['menu' => '1x2'])), + // ColumnDc::make('oddsdc')->visible(fn () => in_array(2, self::$bettype_settings))->width(225)->label(fn () => view('filament.tables.columns.multiline.labels', ['menu' => 'dc'])), + // ColumnDnb::make('oddsdnb')->visible(fn () => in_array(3, self::$bettype_settings))->width(190)->label(fn () => view('filament.tables.columns.multiline.labels', ['menu' => 'dnb'])), + // ColumnGgng::make('oddsggng')->visible(fn () => in_array(4, self::$bettype_settings))->width(190)->label(fn () => view('filament.tables.columns.multiline.labels', ['menu' => 'gg'])), + // ColumnGgng::make('oddstq')->visible(fn () => in_array(5, self::$bettype_settings))->width(190)->label(fn () => view('filament.tables.columns.multiline.labels', ['menu' => 'tq'])), + // ColumnTotal::make('oddstotal')->visible(fn () => in_array(6, self::$bettype_settings))->width(225)->label(fn () => view('filament.tables.columns.multiline.labels', ['menu' => 'ou'])), ]) ->poll('10s') ->defaultSort('starttime', 'ASC') diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index a305c12a..72d5c99e 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -45,7 +45,7 @@ class AppServiceProvider extends ServiceProvider Carbon::setLocale(app()->getLocale()); view()->composer('*', function ($view) { - $sport_id = Auth::user()->sport_id; + $sport_id = Auth::user()->sport_id ?? 0; switch ($sport_id) { case 1: diff --git a/package-lock.json b/package-lock.json index f37f407c..d8e299a1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1990,7 +1990,6 @@ "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true, "license": "MIT", - "peer": true, "engines": { "node": ">=12" }, @@ -2224,7 +2223,6 @@ "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 14f95702..f99e47bd 100644 --- a/resources/css/filament/admin/theme.css +++ b/resources/css/filament/admin/theme.css @@ -14,11 +14,12 @@ button[wire\:click="resetTableFiltersForm"] { /* .fi-ta-header-toolbar { @apply flex-row-reverse; } - +*/ +/* searchbox left */ .fi-ta-header-toolbar>*:nth-child(2) { width: 100%; justify-content: space-between; -} */ +} .fi-ta-header-cell-oddstotal, .fi-ta-header-cell-oddstq, @@ -27,5 +28,5 @@ button[wire\:click="resetTableFiltersForm"] { .fi-ta-header-cell-odds3way, .fi-ta-header-cell-oddsdc, .fi-ta-header-cell-id { - @apply !p-0 + @apply !text-center } \ No newline at end of file diff --git a/resources/views/filament/tables/columns/column-ggng.blade.php b/resources/views/filament/tables/columns/column-ggng.blade.php index 456fc487..6836c0e6 100644 --- a/resources/views/filament/tables/columns/column-ggng.blade.php +++ b/resources/views/filament/tables/columns/column-ggng.blade.php @@ -2,7 +2,7 @@ $loadData($record, $record->multiline_client); @endphp -@include('filament.tables.columns.multiline.fumetto_dnb') +@include('filament.tables.columns.multiline.fumetto_ggng')
diff --git a/resources/views/filament/tables/columns/column-total.blade.php b/resources/views/filament/tables/columns/column-total.blade.php index 973cfb38..fb5745fd 100644 --- a/resources/views/filament/tables/columns/column-total.blade.php +++ b/resources/views/filament/tables/columns/column-total.blade.php @@ -2,7 +2,7 @@ $loadData($record, $record->multiline_client); @endphp -@include('filament.tables.columns.multiline.fumetto_dc') +@include('filament.tables.columns.multiline.fumetto_total')
diff --git a/resources/views/filament/tables/columns/column-tq.blade.php b/resources/views/filament/tables/columns/column-tq.blade.php index d1a7b766..99d01897 100644 --- a/resources/views/filament/tables/columns/column-tq.blade.php +++ b/resources/views/filament/tables/columns/column-tq.blade.php @@ -2,7 +2,7 @@ $loadData($record, $record->multiline_client); @endphp -@include('filament.tables.columns.multiline.fumetto_dnb') +@include('filament.tables.columns.multiline.fumetto_tq')
diff --git a/resources/views/filament/tables/columns/column_3way.blade.php b/resources/views/filament/tables/columns/column_3way.blade.php index c675d04d..f8abc346 100644 --- a/resources/views/filament/tables/columns/column_3way.blade.php +++ b/resources/views/filament/tables/columns/column_3way.blade.php @@ -4,9 +4,16 @@ @include('filament.tables.columns.multiline.fumetto_1x2') -
+ {{--
+
1
+
X
+
2
+
M
--}} + @foreach ($getData() as $item) @include('filament.tables.columns.multiline.bkm', [ 'bookmaker_id' => $item->bookmaker_id, diff --git a/resources/views/filament/tables/columns/multiline/fumetto.total.blade.php b/resources/views/filament/tables/columns/multiline/fumetto_total.blade.php similarity index 100% rename from resources/views/filament/tables/columns/multiline/fumetto.total.blade.php rename to resources/views/filament/tables/columns/multiline/fumetto_total.blade.php diff --git a/resources/views/filament/tables/responsive-bettype-columns.blade.php b/resources/views/filament/tables/responsive-bettype-columns.blade.php new file mode 100644 index 00000000..176ee9a3 --- /dev/null +++ b/resources/views/filament/tables/responsive-bettype-columns.blade.php @@ -0,0 +1,5 @@ +
+ @foreach ($getComponents() as $layoutComponent) + {{ $layoutComponent->record($getRecord())->recordKey($getRecordKey())->rowLoop($getRowLoop())->renderInLayout() }} + @endforeach +
diff --git a/resources/views/livewire/top-menu-items.blade.php b/resources/views/livewire/top-menu-items.blade.php index 3c2074a2..e4a85907 100644 --- a/resources/views/livewire/top-menu-items.blade.php +++ b/resources/views/livewire/top-menu-items.blade.php @@ -1,5 +1,7 @@
@if ($this->current == 'filament.admin.resources.events.index') + + @foreach ($sports as $id => $name) @@ -30,6 +32,91 @@
+ + + + + Settings + + + + + + + {{-- wire:click="openViewModal" --}} + + Alarm Settings + + + + + Alarm Settings + + + {{-- Modal content --}} +
+ Alarm Settings Content +
+ +
+ + + {{-- wire:click="openViewModal" --}} + + Multiline Settings + + + + + Multiline Settings + + + {{-- Modal content --}} +
+ Multiline Settings Content +
+ +
+ + + + {{-- wire:click="openViewModal" --}} + + Level Settings + + + + + Level Settings + + + {{-- Modal content --}} +
+ Level Settings Content +
+ +
+ + + + {{-- wire:click="openViewModal" --}} + + Methods Settings + + + + + Methods Settings + + + {{-- Modal content --}} +
+ Methods Settings Content +
+ +
+
+
@endif