From 368af4b565f6a3bd159fde98cd87b0a208fbabb3 Mon Sep 17 00:00:00 2001 From: salam Date: Tue, 3 Feb 2026 16:48:02 +0100 Subject: [PATCH] wip --- .../Resources/Events/Pages/ListEvents.php | 4 + .../Resources/Events/Tables/EventsTable.php | 20 +-- app/Livewire/AlarmBookmaker.php | 5 +- app/Livewire/ComparingBookmakerMenu.php | 4 +- app/Livewire/MapperLeft.php | 21 ++- app/Livewire/MapperRight.php | 30 ++-- app/Livewire/MultilineBookmaker.php | 22 +-- app/Livewire/SportSwitcher.php | 4 - composer.json | 3 +- composer.lock | 132 +----------------- resources/css/filament/admin/theme.css | 55 ++------ .../views/components/sport-header.blade.php | 41 +++--- .../views/livewire/alarm-bookmaker.blade.php | 2 +- .../comparing-bookmaker-menu.blade.php | 3 +- .../livewire/multiline-bookmaker.blade.php | 2 +- .../views/livewire/top-menu-items.blade.php | 30 ++-- 16 files changed, 97 insertions(+), 281 deletions(-) diff --git a/app/Filament/Resources/Events/Pages/ListEvents.php b/app/Filament/Resources/Events/Pages/ListEvents.php index b4a69131..15c7f384 100644 --- a/app/Filament/Resources/Events/Pages/ListEvents.php +++ b/app/Filament/Resources/Events/Pages/ListEvents.php @@ -35,6 +35,10 @@ class ListEvents extends ListRecords public function clearFilters(): void { $this->removeTableFilters(); + + // $this->dispatch('refreshMapperLeft'); + + // $this->dispatch('refreshMapperRight'); } public function updateStar(): void diff --git a/app/Filament/Resources/Events/Tables/EventsTable.php b/app/Filament/Resources/Events/Tables/EventsTable.php index 54a5caab..e014f77d 100644 --- a/app/Filament/Resources/Events/Tables/EventsTable.php +++ b/app/Filament/Resources/Events/Tables/EventsTable.php @@ -26,6 +26,7 @@ use Filament\Actions\BulkActionGroup; use Filament\Actions\DeleteAction; use Filament\Actions\DeleteBulkAction; use Filament\Forms\Components\Hidden; +use Filament\Forms\Components\Radio; use Filament\Forms\Components\Select; use Filament\Forms\Components\Textarea; use Filament\Forms\Components\TextInput; @@ -43,7 +44,6 @@ use Filament\Tables\Table; use Illuminate\Database\Eloquent\Builder; use Illuminate\Support\Carbon; use Illuminate\Support\Facades\DB; -use JaOcero\RadioDeck\Forms\Components\RadioDeck; class EventsTable { @@ -65,7 +65,7 @@ class EventsTable return $table ->striped() - ->poll('10s') + // ->poll('10s') ->deferLoading() ->defaultPaginationPageOption(5) ->paginated([5, 10, 15]) @@ -619,6 +619,7 @@ class EventsTable ->color(fn ($record) => $record->event_user_note->isEmpty() ? 'gray' : 'info'), Action::make('event_notification') ->modalWidth(Width::Large) + ->modalDescription('Monitoring favorit and if condition is matchted the system will emit a notification') ->modalSubmitActionLabel('Save') ->extraModalFooterActions(fn (Action $action, $record) => $record->event_user_notification->isEmpty() ? [] : [$action->makeModalSubmitAction('Delete', arguments: ['delete' => true])->color('danger')]) ->modalIcon('phosphor-bell') @@ -639,27 +640,18 @@ class EventsTable }) ->schema([ Hidden::make('event_user_notification_id'), - Toggle::make('is_notified')->label('Monitoring Favorit') - // ->aboveContent('If a notification has been send "Monitoring" will be off') + Toggle::make('is_notified')->label('On/Off') ->onColor('gray') ->offColor('info'), - RadioDeck::make('odds_table_id') + Radio::make('odds_table_id') ->label('Bettype') ->columns(3) - ->colors('info') ->required() - ->extraCardsAttributes([ // Extra attributes for card elements - 'class' => 'dark:bg-gray-900!', - ]) ->options(fn ($record) => OddsTable::options_sport()), - RadioDeck::make('alarm_level_id') + Radio::make('alarm_level_id') ->label('Alarm level') - ->colors('info') ->columns(3) ->required() - ->extraCardsAttributes([ // Extra attributes for card elements - 'class' => 'dark:bg-gray-900!', - ]) ->options([ '1' => 'Level 1', '2' => 'Level 2', diff --git a/app/Livewire/AlarmBookmaker.php b/app/Livewire/AlarmBookmaker.php index 30198d1b..76090433 100644 --- a/app/Livewire/AlarmBookmaker.php +++ b/app/Livewire/AlarmBookmaker.php @@ -74,10 +74,7 @@ class AlarmBookmaker extends Component implements HasActions, HasSchemas, HasTab ->width('2rem') ->prefix('Threshold:') ->rules(['required', 'decimal:2', 'between:0,2']), - ToggleColumn::make('disabled') - ->label('Status') - ->offColor('success') - ->onColor('danger'), + ToggleColumn::make('disabled'), ]) ->defaultSort('level_id') ->deferFilters(false) diff --git a/app/Livewire/ComparingBookmakerMenu.php b/app/Livewire/ComparingBookmakerMenu.php index 73ed0b55..c5a14c66 100644 --- a/app/Livewire/ComparingBookmakerMenu.php +++ b/app/Livewire/ComparingBookmakerMenu.php @@ -56,6 +56,8 @@ class ComparingBookmakerMenu extends Component implements HasActions, HasSchemas ->where('client_bookmaker_id', $this->user->bookmaker_id) ->orderBy('sorting') ) + ->defaultPaginationPageOption(10) + ->paginated([5, 10, 15, 30, 50]) ->columns([ TextColumn::make('Position') ->alignCenter() @@ -73,7 +75,7 @@ class ComparingBookmakerMenu extends Component implements HasActions, HasSchemas ->rules(['required', 'integer', 'between:100,200']), // ToggleColumn::make('is_active'), ]) - ->searchable(['bookmaker.name']) + ->searchable(['bookmaker_id', 'bookmaker.name']) // ->filters([ // TernaryFilter::make('is_active') // ->columnSpan(2) diff --git a/app/Livewire/MapperLeft.php b/app/Livewire/MapperLeft.php index 92b57931..88292e77 100644 --- a/app/Livewire/MapperLeft.php +++ b/app/Livewire/MapperLeft.php @@ -9,7 +9,6 @@ use App\Models\CompetitionGroup; use App\Models\Country; use App\Models\Event; use App\Models\Mapper; -use App\Models\User; use Carbon\Carbon; use Filament\Actions\Action; use Filament\Actions\Concerns\InteractsWithActions; @@ -42,8 +41,6 @@ class MapperLeft extends Component implements HasActions, HasSchemas, HasTable public $search_left = false; - public $user; - protected $listeners = [ 'refreshMapperLeft' => '$refresh', ]; @@ -65,12 +62,11 @@ class MapperLeft extends Component implements HasActions, HasSchemas, HasTable $this->dispatch('refreshMapperLeft'); } + #[Lazy] public function table(Table $table): Table { - $this->user = User::getUser(); - return $table - ->query(LoadEvents::load($this->search_left, $this->user->sport_id)) + ->query(LoadEvents::load($this->search_left, auth()->user()->sport_id)) ->columns([ MapperLeftColumn::make('left')->label(''), ]) @@ -82,14 +78,14 @@ class MapperLeft extends Component implements HasActions, HasSchemas, HasTable Select::make('country_id') ->placeholder('Country') ->hiddenLabel() - ->multiple() + // ->multiple() ->columnSpan(2) ->searchable() ->preload() ->options(function () { - $res = Event::query()->where('sport_id', $this->user->sport_id)->where('betradar_id', 0)->where('starttime', '>', Carbon::now())->groupBy('country_id')->pluck('country_id')->toArray(); + $res = Event::query()->where('sport_id', auth()->user()->sport_id)->where('betradar_id', 0)->where('starttime', '>', Carbon::now())->groupBy('country_id')->pluck('country_id')->toArray(); - return Country::query()->whereIn('id', $res)->pluck('name', 'id'); + return Country::query()->where('id', $res)->orderBy('name')->pluck('name', 'id'); }) ->live() ->reactive() @@ -105,12 +101,12 @@ class MapperLeft extends Component implements HasActions, HasSchemas, HasTable ->searchable() ->options(function (Get $get) { if ($get('country_id')) { - $res = Event::query()->where('sport_id', $this->user->sport_id)->where('betradar_id', 0)->where('starttime', '>', Carbon::now())->whereIn('country_id', $get('country_id'))->groupBy('competition_group_id')->pluck('competition_group_id')->toArray(); + $res = Event::query()->where('sport_id', auth()->user()->sport_id)->where('betradar_id', 0)->where('starttime', '>', Carbon::now())->where('country_id', $get('country_id'))->groupBy('competition_group_id')->pluck('competition_group_id')->toArray(); } else { - $res = Event::query()->where('sport_id', $this->user->sport_id)->where('betradar_id', 0)->where('starttime', '>', Carbon::now())->groupBy('competition_group_id')->pluck('competition_group_id')->toArray(); + $res = Event::query()->where('sport_id', auth()->user()->sport_id)->where('betradar_id', 0)->where('starttime', '>', Carbon::now())->groupBy('competition_group_id')->pluck('competition_group_id')->toArray(); } - $comps = CompetitionGroup::with('country')->whereIn('id', $res)->get(); + $comps = CompetitionGroup::with('country')->where('id', $res)->get(); $arr = []; foreach ($comps as $val) { @@ -155,7 +151,6 @@ class MapperLeft extends Component implements HasActions, HasSchemas, HasTable Action::make('refreshMapperLeft') ->hiddenLabel() ->icon('phosphor-x') - ->color('danger') ->size(Size::Small) ->action(function (Component $livewire) { $this->search_left = ''; diff --git a/app/Livewire/MapperRight.php b/app/Livewire/MapperRight.php index 9f2a58f1..d144e5e0 100644 --- a/app/Livewire/MapperRight.php +++ b/app/Livewire/MapperRight.php @@ -8,7 +8,6 @@ use App\Livewire\Mapper\StoreMapped; use App\Models\Country; use App\Models\Event; use App\Models\Mapper; -use App\Models\User; use Filament\Actions\Action; use Filament\Actions\Concerns\InteractsWithActions; use Filament\Actions\Contracts\HasActions; @@ -45,8 +44,6 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable 'refreshMapperRight' => '$refresh', ]; - public $user; - public function removeTableFilter(string $filterName, ?string $field = null, bool $shouldTriggerUpdatedFiltersHook = true): void { $searchValues = preg_split('/\s+/', $this->search_right, -1, PREG_SPLIT_NO_EMPTY); @@ -66,10 +63,8 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable public function table(Table $table): Table { - $this->user = User::getUser(); - return $table - ->query(LoadProvider::load($this->search_right, $this->user)) + ->query(LoadProvider::load($this->search_right, auth()->user())) ->columns([ MapperRightColumn::make('right')->label(''), ])->searchable(['home', 'away']) @@ -78,17 +73,17 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable Filter::make('events') ->schema([ Select::make('country_id') - ->visible(fn () => in_array($this->user->provider_id, [3, 4])) + ->visible(fn () => in_array(auth()->user()->provider_id, [3, 4])) ->placeholder('Country') ->hiddenLabel() ->label('') ->searchable() ->preload() - ->multiple() + // ->multiple() ->columnSpan(2) ->live() ->options(function (Get $get) { - return Mapper::query()->where('sport_id', $this->user->sport_id)->where('provider_id', $this->user->provider_id)->where('starttime', '>', Carbon::now())->groupBy('country_id')->pluck('country', 'country_id')->toArray(); + return Mapper::query()->where('sport_id', auth()->user()->sport_id)->where('provider_id', auth()->user()->provider_id)->where('starttime', '>', Carbon::now())->groupBy('country_id')->pluck('country', 'country_id')->toArray(); }) ->reactive() ->afterStateUpdated(function (callable $set) { @@ -96,17 +91,17 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable }) ->placeholder('Country'), Select::make('group_cc') - ->visible(fn () => $this->user->provider_id == 2) + ->visible(fn () => auth()->user()->provider_id == 2) ->placeholder('Country') ->hiddenLabel() ->label('') ->searchable() ->preload() - ->multiple() + // ->multiple() ->columnSpan(2) ->live() ->options(function () { - $res = Mapper::query()->where('sport_id', $this->user->sport_id)->where('provider_id', $this->user->provider_id)->where('starttime', '>', Carbon::now())->groupBy('group_cc')->pluck('group_cc')->toArray(); + $res = Mapper::query()->where('sport_id', auth()->user()->sport_id)->where('provider_id', auth()->user()->provider_id)->where('starttime', '>', Carbon::now())->groupBy('group_cc')->pluck('group_cc')->toArray(); return Country::query()->whereIn('iso2', $res)->pluck('name', 'iso2'); }) @@ -126,11 +121,11 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable ->multiple() ->options(function (Get $get) { if ($get('country_id')) { - return Mapper::query()->where('sport_id', $this->user->sport_id)->where('provider_id', $this->user->provider_id)->where('starttime', '>', Carbon::now())->whereIn('country_id', $get('country_id'))->groupBy('group_id')->pluck('group', 'group_id')->toArray(); + return Mapper::query()->where('sport_id', auth()->user()->sport_id)->where('provider_id', auth()->user()->provider_id)->where('starttime', '>', Carbon::now())->where('country_id', $get('country'))->groupBy('group_id')->pluck('group', 'group_id')->toArray(); } elseif ($get('group_cc')) { - return Mapper::query()->where('sport_id', $this->user->sport_id)->where('provider_id', $this->user->provider_id)->where('starttime', '>', Carbon::now())->whereIn('group_cc', $get('group_cc'))->groupBy('group_id')->pluck('group', 'group_id')->toArray(); + return Mapper::query()->where('sport_id', auth()->user()->sport_id)->where('provider_id', auth()->user()->provider_id)->where('starttime', '>', Carbon::now())->where('group_cc', $get('group_cc'))->groupBy('group_id')->pluck('group', 'group_id')->toArray(); } else { - return Mapper::query()->where('sport_id', $this->user->sport_id)->where('provider_id', $this->user->provider_id)->where('starttime', '>', Carbon::now())->groupBy('group_id')->pluck('group', 'group_id')->toArray(); + return Mapper::query()->where('sport_id', auth()->user()->sport_id)->where('provider_id', auth()->user()->provider_id)->where('starttime', '>', Carbon::now())->groupBy('group_id')->pluck('group', 'group_id')->toArray(); } }) ->live(), @@ -139,10 +134,10 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable return $query ->when( $data['country_id'], - fn (Builder $query, $country_id) => $query->whereIn('country_id', $country_id) + fn (Builder $query, $country_id) => $query->where('country_id', $country_id) )->when( $data['group_cc'], - fn (Builder $query, $group_cc) => $query->whereIn('group_cc', $group_cc) + fn (Builder $query, $group_cc) => $query->where('group_cc', $group_cc) )->when( $data['group_id'], fn (Builder $query, $group_id) => $query->whereIn('group_id', $group_id) @@ -168,7 +163,6 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable Action::make('refreshMapperRight') ->hiddenLabel() ->icon('phosphor-x') - ->color('danger') ->size(Size::Small) ->action(function (Component $livewire) { $this->search_right = ''; diff --git a/app/Livewire/MultilineBookmaker.php b/app/Livewire/MultilineBookmaker.php index 1a32a6a8..810a5c44 100644 --- a/app/Livewire/MultilineBookmaker.php +++ b/app/Livewire/MultilineBookmaker.php @@ -21,7 +21,6 @@ use Filament\Tables\Filters\Filter; use Filament\Tables\Table; use Illuminate\Contracts\View\View; use Illuminate\Database\Eloquent\Builder; -use Illuminate\Support\Facades\DB; use Livewire\Component; class MultilineBookmaker extends Component implements HasActions, HasSchemas, HasTable @@ -52,21 +51,12 @@ class MultilineBookmaker extends Component implements HasActions, HasSchemas, Ha SelectColumn::make('bookmaker_id') ->label('Bookmaker') ->width('2rem') - ->options(function ($livewire, $record) { - $table = MultilineSetting::where('id', $livewire->tableFilters['multiline_setting_id'])->value('table'); - - $bookies = DB::table($table) - ->where('sport_id', auth()->user()->sport_id) - ->groupBy('bookmaker_id')->pluck('bookmaker_id'); - - $res = Bookmaker::whereIn('id', $bookies)->pluck('name', 'id'); - $arr = []; - foreach ($res as $id => $name) { - $arr[$id] = $name; + ->options(function () { + if (auth()->user()->sport_id == 1) { + Bookmaker::where('in_soccer', 1)->pluck('name', 'id'); + } else { + Bookmaker::where('in_other', 1)->pluck('name', 'id'); } - asort($arr); - - return $arr; }), ]) ->defaultSort('sort') @@ -77,7 +67,7 @@ class MultilineBookmaker extends Component implements HasActions, HasSchemas, Ha Radio::make('multiline_setting_id') ->extraAttributes(['id' => 'multiline_setting']) ->inline() - ->default(fn ($record) => MultilineSetting::where('sport_id', auth()->user()->sport_id)->pluck('id')->first()) + ->default(-1) ->columnSpan(6) ->columnSpanFull() ->hiddenLabel() diff --git a/app/Livewire/SportSwitcher.php b/app/Livewire/SportSwitcher.php index 6f7b5977..0b5078ae 100644 --- a/app/Livewire/SportSwitcher.php +++ b/app/Livewire/SportSwitcher.php @@ -53,10 +53,6 @@ class SportSwitcher extends Component $this->dispatch('refreshComparingBookmakerMenu'); - $this->dispatch('refreshMapperLeft'); - - $this->dispatch('refreshMapperRight'); - $this->dispatch('refreshlarmBookmaker'); } diff --git a/composer.json b/composer.json index 40be5dc5..fe213890 100644 --- a/composer.json +++ b/composer.json @@ -22,8 +22,7 @@ "laravel/framework": "^12.0", "laravel/tinker": "^2.10.1", "outhebox/blade-flags": "^1.5", - "swisnl/filament-backgrounds": "^2.0", - "tonegabes/filament-better-options": "^1.2" + "swisnl/filament-backgrounds": "^2.0" }, "require-dev": { "barryvdh/laravel-debugbar": "^3.16", diff --git a/composer.lock b/composer.lock index 282a4839..f3d9ccca 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b1f96a36e577a5a502013fb033525720", + "content-hash": "872a298c0c1cebe00cac20f0cb2539f7", "packages": [ { "name": "agencetwogether/hookshelper", @@ -9054,136 +9054,6 @@ }, "time": "2025-12-02T11:56:42+00:00" }, - { - "name": "tonegabes/filament-better-options", - "version": "1.2.2", - "source": { - "type": "git", - "url": "https://github.com/tonegabes/filament-better-options.git", - "reference": "6314bdf052108e19970f6f3e6885e05bb8801b5f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/tonegabes/filament-better-options/zipball/6314bdf052108e19970f6f3e6885e05bb8801b5f", - "reference": "6314bdf052108e19970f6f3e6885e05bb8801b5f", - "shasum": "" - }, - "require": { - "filament/forms": "^4.0", - "php": "^8.3", - "spatie/laravel-package-tools": "^1.15.0", - "tonegabes/filament-phosphor-icons": "^1.0" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "^3.86", - "larastan/larastan": "^3.0", - "laravel/pint": "^1.0", - "phpstan/phpstan-deprecation-rules": "^2.0" - }, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "ToneGabes\\BetterOptions\\BetterOptionsServiceProvider" - ] - } - }, - "autoload": { - "psr-4": { - "ToneGabes\\BetterOptions\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Tone Gabes", - "email": "tonegabes@gmail.com", - "homepage": "https://tonegabes.com", - "role": "Developer" - } - ], - "description": "Filament form components for better radio and checkbox options.", - "homepage": "https://github.com/tonegabes/filament-better-options", - "keywords": [ - "Forms", - "checkbox", - "filament", - "laravel", - "php", - "plugin", - "tonegabes" - ], - "support": { - "issues": "https://github.com/tonegabes/filament-better-options/issues", - "source": "https://github.com/tonegabes/filament-better-options" - }, - "time": "2025-10-22T19:20:56+00:00" - }, - { - "name": "tonegabes/filament-phosphor-icons", - "version": "1.2.1", - "source": { - "type": "git", - "url": "https://github.com/tonegabes/filament-phosphor-icons.git", - "reference": "f654722dee534ccddd005e667a73e8e64cb412cc" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/tonegabes/filament-phosphor-icons/zipball/f654722dee534ccddd005e667a73e8e64cb412cc", - "reference": "f654722dee534ccddd005e667a73e8e64cb412cc", - "shasum": "" - }, - "require": { - "codeat3/blade-phosphor-icons": "^2.3", - "filament/filament": "^4.0", - "php": "^8.1" - }, - "require-dev": { - "laravel/pint": "^1.22" - }, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "ToneGabes\\Filament\\Icons\\PhosphorIconsServiceProvider" - ] - } - }, - "autoload": { - "psr-4": { - "ToneGabes\\Filament\\Icons\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Tone Gabes", - "email": "tonegabes@gmail.com", - "homepage": "https://tonegabes.com", - "role": "Developer" - } - ], - "description": "Phosphor Icons Pack ready for Filament 4", - "keywords": [ - "Iconset", - "Phosphor", - "filament", - "icons", - "laravel", - "library" - ], - "support": { - "issues": "https://github.com/tonegabes/filament-phosphor-icons/issues", - "source": "https://github.com/tonegabes/filament-phosphor-icons/tree/1.2.1" - }, - "time": "2025-09-12T18:24:34+00:00" - }, { "name": "ueberdosis/tiptap-php", "version": "2.1.0", diff --git a/resources/css/filament/admin/theme.css b/resources/css/filament/admin/theme.css index 06fc05a6..f0f81843 100644 --- a/resources/css/filament/admin/theme.css +++ b/resources/css/filament/admin/theme.css @@ -19,6 +19,10 @@ button[wire\:click="resetTableFiltersForm"] { /* background-color: #0f172b; */ } +.fi-ta-table>tbody { + @apply divide-none +} + /* stripes in popups */ @layer utilities { .striped div:nth-child(even) { @@ -51,6 +55,10 @@ button[wire\:click="resetTableFiltersForm"] { @apply !text-center } +#ComparingBookmakerMenu .fi-ta-header-toolbar { + @apply grid grid-cols-3 justify-start +} + #mapper { @layer components { .fi-ta-ctn { @@ -69,18 +77,16 @@ button[wire\:click="resetTableFiltersForm"] { } } -/* Styling Radio Boxes */ -#multiline_setting { - @apply !grid grid-cols-3 gap-5 mb-4 +/* Styling Radio Lable */ + +.fi-fo-radio { + @apply !grid grid-cols-2 gap-y-3 my-5 } -#multiline_setting input { - @apply checked:border-blue-500 +.fi-fo-radio-label { + @apply p-2 border border-gray-700 rounded-md cursor-pointer has-checked:bg-blue-50 has-checked:text-blue-900 has-checked:ring-blue-200 dark:has-checked:bg-blue-950 dark:has-checked:text-blue-200 dark:has-checked:ring-blue-900 } -#multiline_setting .fi-fo-radio-label { - @apply p-3 border border-gray-700 rounded-xl cursor-pointer has-checked:bg-blue-50 has-checked:text-blue-900 has-checked:ring-blue-200 dark:has-checked:bg-blue-950 dark:has-checked:text-blue-200 dark:has-checked:ring-blue-900 -} #mapper_right .fi-ta-filter-indicators button, #mapper_left .fi-ta-filter-indicators button { @@ -90,37 +96,4 @@ button[wire\:click="resetTableFiltersForm"] { #mapper_right .fi-ta-filter-indicators div button, #mapper_left .fi-ta-filter-indicators div button { display: block; -} - -/* .fi-ta-table>tbody { - @apply divide-none -} */ -#ComparingBookmakerMenu { - - .fi-ta-cell, - .fi-input, - .fi-select-input, - .fi-ta-cell div { - padding-top: 1px !important; - padding-bottom: 1px !important; - margin-top: 0px !important; - margin-bottom: 0px !important; - border-radius: 0% !important; - } - - .flex { - padding-top: 0px !important; - padding-bottom: 0px !important; - gap: 3px !important; - - } - - .fi-tabs { - padding-top: 3px !important; - padding-bottom: 3px !important; - } - - .fi-header-heading { - font-size: 1.5rem !important; - } } \ No newline at end of file diff --git a/resources/views/components/sport-header.blade.php b/resources/views/components/sport-header.blade.php index 365706ce..2b7d6cf0 100644 --- a/resources/views/components/sport-header.blade.php +++ b/resources/views/components/sport-header.blade.php @@ -1,19 +1,22 @@ -
- @switch(auth()->user()->sport_id) - @case(1) - - @break - @case(1) - - @break - @case(3) - - @break - @case(4) - - @break - @default - - @endswitch -

{{ $slot }}

-
\ No newline at end of file +
+ @switch(auth()->user()->sport_id) + @case(1) + + @break + + @case(1) + + @break + + @case(3) + + @break + + @case(4) + + @break + + @default + @endswitch +

{{ $slot }}

+
diff --git a/resources/views/livewire/alarm-bookmaker.blade.php b/resources/views/livewire/alarm-bookmaker.blade.php index af4e2de8..8abba33b 100644 --- a/resources/views/livewire/alarm-bookmaker.blade.php +++ b/resources/views/livewire/alarm-bookmaker.blade.php @@ -1,6 +1,6 @@
- {{ auth()->user()->sport->name }} Alarm Configuration + {{ auth()->user()->sport->name }} - Alarm Configuration {{ $this->table }} diff --git a/resources/views/livewire/comparing-bookmaker-menu.blade.php b/resources/views/livewire/comparing-bookmaker-menu.blade.php index 26399ea4..f45d27da 100644 --- a/resources/views/livewire/comparing-bookmaker-menu.blade.php +++ b/resources/views/livewire/comparing-bookmaker-menu.blade.php @@ -1,7 +1,6 @@
- - {{ auth()->user()->sport->name }} Comparing Bookmaker + {{ auth()->user()->sport->name }} - Comparing Bookmaker {{ $this->table }} diff --git a/resources/views/livewire/multiline-bookmaker.blade.php b/resources/views/livewire/multiline-bookmaker.blade.php index 0f82126e..eac7d42f 100644 --- a/resources/views/livewire/multiline-bookmaker.blade.php +++ b/resources/views/livewire/multiline-bookmaker.blade.php @@ -1,6 +1,6 @@
- {{ auth()->user()->sport->name }} Multiline Configuration + {{ auth()->user()->sport->name }} - Multiline Configuration {{ $this->table }} diff --git a/resources/views/livewire/top-menu-items.blade.php b/resources/views/livewire/top-menu-items.blade.php index 8bf9e81c..c5598b6a 100644 --- a/resources/views/livewire/top-menu-items.blade.php +++ b/resources/views/livewire/top-menu-items.blade.php @@ -62,8 +62,7 @@ {{-- Event Mapper --}} - + @@ -113,28 +112,32 @@ @endif - @break + @break + @case(36) @if (auth()->user()->provider_id != 6) @endif - @break + @break + @case(10) @if (auth()->user()->provider_id != 4) @endif - @break + @break + @case(16) @if (auth()->user()->provider_id != 3) @endif - @break + @break + @default @endswitch @@ -161,16 +164,15 @@ {{-- Multiline --}} - + - + {{-- Multiline Settings - + --}} @livewire('multiline-bookmaker') @@ -183,9 +185,9 @@ - + {{-- Alarm Settings - + --}} @livewire('alarm-bookmaker') @@ -199,9 +201,9 @@ - + {{-- Comparing Bookmaker {{ $sport }} - + --}} @livewire('comparing-bookmaker-menu')