From 72ea2ba783e94dc8da345d6d16e65daf6973cc63 Mon Sep 17 00:00:00 2001 From: HolgerHatGarKeineNode Date: Mon, 29 Jan 2024 18:39:49 +0100 Subject: [PATCH 1/3] feat(VenueTable): remove country filter from venue query Removed the filter that limits venue results to a specific country in the VenueTable. This change will provide results from all countries. --- app/Http/Livewire/Tables/VenueTable.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Http/Livewire/Tables/VenueTable.php b/app/Http/Livewire/Tables/VenueTable.php index a9a7f599..bc4dd7d3 100644 --- a/app/Http/Livewire/Tables/VenueTable.php +++ b/app/Http/Livewire/Tables/VenueTable.php @@ -79,7 +79,6 @@ class VenueTable extends DataTableComponent ->withCount([ 'courseEvents', ]) - ->whereHas('city.country', fn ($query) => $query->where('code', $this->country)) ->orderByDesc('course_events_count') ->orderBy('venues.id'); } From bb5b7ddd4e6115f62dd84e0adf7a6dc272300eb7 Mon Sep 17 00:00:00 2001 From: HolgerHatGarKeineNode Date: Mon, 29 Jan 2024 18:44:46 +0100 Subject: [PATCH 2/3] feat: Add venue description to Venue API and update form view (#72ea2ba) In the VenueController, the Venue API now includes a description of the venue by concatenating the city name and street. This change is reflected in the 'bitcoin-event-form' view where the 'option-description' attribute now uses the venue's description instead of the city name. --- app/Http/Controllers/Api/VenueController.php | 39 ++++++++++--------- .../form/bitcoin-event-form.blade.php | 2 +- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/app/Http/Controllers/Api/VenueController.php b/app/Http/Controllers/Api/VenueController.php index 72cb720f..8995445e 100644 --- a/app/Http/Controllers/Api/VenueController.php +++ b/app/Http/Controllers/Api/VenueController.php @@ -17,26 +17,27 @@ class VenueController extends Controller public function index(Request $request) { return Venue::query() - ->with(['city:id,name,country_id', 'city.country:id,name,code']) - ->select('id', 'name', 'city_id') - ->orderBy('name') - ->when( - $request->search, - fn(Builder $query) => $query - ->where('name', 'ilike', "%{$request->search}%") - ) - ->when( - $request->exists('selected'), - fn(Builder $query) => $query->whereIn('id', - $request->input('selected', [])), - fn(Builder $query) => $query->limit(10) - ) - ->get() - ->map(function (Venue $venue) { - $venue->flag = asset('vendor/blade-country-flags/4x3-'.$venue->city->country->code.'.svg'); + ->with(['city:id,name,country_id', 'city.country:id,name,code']) + ->select('id', 'name', 'city_id') + ->orderBy('name') + ->when( + $request->search, + fn(Builder $query) => $query + ->where('name', 'ilike', "%{$request->search}%") + ) + ->when( + $request->exists('selected'), + fn(Builder $query) => $query->whereIn('id', + $request->input('selected', [])), + fn(Builder $query) => $query->limit(10) + ) + ->get() + ->map(function (Venue $venue) { + $venue->flag = asset('vendor/blade-country-flags/4x3-' . $venue->city->country->code . '.svg'); + $venue->description = $venue->city->name . ', ' . $venue->street; - return $venue; - }); + return $venue; + }); } /** diff --git a/resources/views/livewire/bitcoin-event/form/bitcoin-event-form.blade.php b/resources/views/livewire/bitcoin-event/form/bitcoin-event-form.blade.php index 8160c39a..6e486b0e 100644 --- a/resources/views/livewire/bitcoin-event/form/bitcoin-event-form.blade.php +++ b/resources/views/livewire/bitcoin-event/form/bitcoin-event-form.blade.php @@ -79,7 +79,7 @@ ]" option-label="name" option-value="id" - option-description="city.name" + option-description="description" /> From 13a8b13156d5d5e434c8dd2ffd819b725137562a Mon Sep 17 00:00:00 2001 From: fsociety Date: Fri, 15 Mar 2024 15:18:28 +0100 Subject: [PATCH 3/3] meetups and meetups-events edit buttons added on all landing pages --- app/Http/Livewire/Profile/Meetups.php | 2 ++ .../meetup/landing-page-event.blade.php | 12 +++++++++++ .../livewire/meetup/landing-page.blade.php | 14 +++++++++++++ .../views/livewire/profile/meetups.blade.php | 20 +++++++++++++++++-- 4 files changed, 46 insertions(+), 2 deletions(-) diff --git a/app/Http/Livewire/Profile/Meetups.php b/app/Http/Livewire/Profile/Meetups.php index 428c0047..bb4a5478 100644 --- a/app/Http/Livewire/Profile/Meetups.php +++ b/app/Http/Livewire/Profile/Meetups.php @@ -61,6 +61,7 @@ class Meetups extends Component ->map(fn($meetup) => [ 'id' => $meetup->id, 'name' => $meetup->name, + 'country' => $meetup->city->country->code, 'link' => route('meetup.landing', [ 'country' => $meetup->city->country->code, 'meetup' => $meetup, @@ -122,6 +123,7 @@ class Meetups extends Component ->map(fn($meetup) => [ 'id' => $meetup->id, 'name' => $meetup->name, + 'country' => $meetup->city->country->code, 'link' => route('meetup.landing', [ 'country' => $meetup->city->country->code, 'meetup' => $meetup, diff --git a/resources/views/livewire/meetup/landing-page-event.blade.php b/resources/views/livewire/meetup/landing-page-event.blade.php index 71531ebe..56fd3e51 100644 --- a/resources/views/livewire/meetup/landing-page-event.blade.php +++ b/resources/views/livewire/meetup/landing-page-event.blade.php @@ -2,6 +2,18 @@ {{-- MAIN --}}
+ + @can('update', $meetupEvent) +
+ + + {{ __('Edit') }} + +
+ @endcan +
diff --git a/resources/views/livewire/meetup/landing-page.blade.php b/resources/views/livewire/meetup/landing-page.blade.php index 5ede093a..1bad37f5 100644 --- a/resources/views/livewire/meetup/landing-page.blade.php +++ b/resources/views/livewire/meetup/landing-page.blade.php @@ -2,8 +2,22 @@ {{-- MAIN --}}
+ + @can('update', $meetup) +
+ + + {{ __('Edit') }} + +
+ @endcan +
+
+

@foreach($myMeetupNames as $myMeetup) -
+
- @endforeach