From d89a32afc5949ae03cd85e5b978dde1f182b5af3 Mon Sep 17 00:00:00 2001 From: HolgerHatGarKeineNode Date: Mon, 6 Feb 2023 23:36:43 +0100 Subject: [PATCH] links to landing --- app/Http/Livewire/Tables/MeetupEventTable.php | 10 +++++++--- app/Http/Livewire/Tables/MeetupTable.php | 4 +++- .../views/columns/meetup_events/name.blade.php | 12 +++++++----- resources/views/columns/meetups/name.blade.php | 13 ++++++++----- 4 files changed, 25 insertions(+), 14 deletions(-) diff --git a/app/Http/Livewire/Tables/MeetupEventTable.php b/app/Http/Livewire/Tables/MeetupEventTable.php index 5b91b1fc..a9327543 100644 --- a/app/Http/Livewire/Tables/MeetupEventTable.php +++ b/app/Http/Livewire/Tables/MeetupEventTable.php @@ -17,7 +17,7 @@ class MeetupEventTable extends DataTableComponent public function configure(): void { $this->setPrimaryKey('id') - ->setAdditionalSelects(['meetup_events.id','meetup_events.meetup_id']) + ->setAdditionalSelects(['meetup_events.id', 'meetup_events.meetup_id']) ->setDefaultSort('start', 'asc') ->setThAttributes(function (Column $column) { return [ @@ -56,7 +56,9 @@ class MeetupEventTable extends DataTableComponent return [ Column::make(__('Meetup'), 'meetup.name') ->format( - fn($value, $row, Column $column) => view('columns.meetup_events.name')->withRow($row) + fn($value, $row, Column $column) => view('columns.meetup_events.name') + ->withRow($row) + ->withCountry($this->country) ) ->searchable(fn($builder, $term) => $builder->where('meetups.name', 'ilike', '%'.$term.'%')) ->sortable(), @@ -72,7 +74,9 @@ class MeetupEventTable extends DataTableComponent ->collapseOnMobile(), Column::make(__('Link'), 'link') ->label( - fn($row, Column $column) => view('columns.meetup_events.link')->withRow($row)->withCountry($this->country) + fn($row, Column $column) => view('columns.meetup_events.link') + ->withRow($row) + ->withCountry($this->country) ), ]; } diff --git a/app/Http/Livewire/Tables/MeetupTable.php b/app/Http/Livewire/Tables/MeetupTable.php index d435ca78..2d34bc42 100644 --- a/app/Http/Livewire/Tables/MeetupTable.php +++ b/app/Http/Livewire/Tables/MeetupTable.php @@ -49,7 +49,9 @@ class MeetupTable extends DataTableComponent return [ Column::make(__('Name'), 'name') ->format( - fn($value, $row, Column $column) => view('columns.meetups.name')->withRow($row) + fn($value, $row, Column $column) => view('columns.meetups.name') + ->withRow($row) + ->withCountry($this->country) ) ->searchable(fn($builder, $term) => $builder->where('meetups.name', 'ilike', '%'.$term.'%')), Column::make(__('Plebs')) diff --git a/resources/views/columns/meetup_events/name.blade.php b/resources/views/columns/meetup_events/name.blade.php index c760a74c..9c0a3ffe 100644 --- a/resources/views/columns/meetup_events/name.blade.php +++ b/resources/views/columns/meetup_events/name.blade.php @@ -1,6 +1,8 @@ -
- {{ $row->meetup->name }} -
- {{ $row->meetup->name }} + +
+ {{ $row->meetup->name }} +
+ {{ $row->meetup->name }} +
-
+ diff --git a/resources/views/columns/meetups/name.blade.php b/resources/views/columns/meetups/name.blade.php index 7433148e..c7b3e135 100644 --- a/resources/views/columns/meetups/name.blade.php +++ b/resources/views/columns/meetups/name.blade.php @@ -1,6 +1,9 @@ -
- {{ $row->name }} -
- {{ $row->name }} + +
+ {{ $row->name }} +
+ {{ $row->name }} +
-
+ +