einundzwanzig/einundzwanzig-portal
1
0
Fork 0
mirror of https://github.com/Einundzwanzig-Podcast/einundzwanzig-portal.git synced 2025-12-11 06:46:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'update'

Browse Source
This commit is contained in:
fsociety
2024-03-15 15:21:35 +01:00
parent 56ba2dd7c9 13a8b13156
commit 1388c02f9b
7 changed files with 67 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app/Http/Controllers/Api/VenueController.php
View File

@@ -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;
});
}
/**

2
app/Http/Livewire/Profile/Meetups.php
View File

@@ -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,

1
app/Http/Livewire/Tables/VenueTable.php
View File

@@ -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');
}

2
resources/views/livewire/bitcoin-event/form/bitcoin-event-form.blade.php
View File

@@ -79,7 +79,7 @@
]"
option-label="name"
option-value="id"
option-description="city.name"
option-description="description"
/>
</x-input.group>

12
resources/views/livewire/meetup/landing-page-event.blade.php
View File

@@ -2,6 +2,18 @@
<livewire:frontend.header :country="null"/>
{{-- MAIN --}}
<section class="w-full mb-12 mt-2">
@can('update', $meetupEvent)
<div class="max-w-screen-2xl mx-auto px-2 sm:px-10 space-y-4 flex flex-col sm:flex-row justify-end">
<x-button
:href="route('meetup.event.form', ['country' => $meetup->city->country, 'meetupEvent' => $meetupEvent])"
primary lg class="whitespace-nowrap cursor-pointer">
<i class="fa fa-thin fa-edit mr-2"></i>
{{ __('Edit') }}
</x-button>
</div>
@endcan
<div class="max-w-screen-2xl mx-auto px-2 sm:px-10 space-y-4 flex flex-col sm:flex-row">
<div class="relative py-4 sm:py-4">

14
resources/views/livewire/meetup/landing-page.blade.php
View File

@@ -2,8 +2,22 @@
<livewire:frontend.header :country="null"/>
{{-- MAIN --}}
<section class="w-full mb-12 mt-8">
@can('update', $meetup)
<div class="max-w-screen-2xl mx-auto px-2 sm:px-10 space-y-4 flex flex-col sm:flex-row justify-end">
<x-button
:href="route('meetup.meetup.form', ['meetup' => $meetup->id, 'country' => $meetup->city->country->code])"
primary lg class="whitespace-nowrap cursor-pointer">
<i class="fa fa-thin fa-edit mr-2"></i>
{{ __('Edit') }}
</x-button>
</div>
@endcan
<div class="max-w-screen-2xl mx-auto px-2 sm:px-10 space-y-4 flex flex-col sm:flex-row">
<div class="flex flex-col sm:flex-row">
<div class="sm:w-10/12 flex flex-col">
<h1 class="mb-6 text-5xl font-extrabold leading-none tracking-normal text-gray-200 sm:text-6xl md:text-6xl lg:text-7xl md:tracking-tight">
<span

20
resources/views/livewire/profile/meetups.blade.php
View File

@@ -37,7 +37,7 @@
</p>
<div class="grid grid-cols-1 gap-2">
@foreach($myMeetupNames as $myMeetup)
<div class="flex items-center space-x-2">
<div class="flex flex-col sm:flex-row items-center space-x-2 space-y-1 sm:space-y-0">
<div>
<a href="{{ $myMeetup['link'] }}">
<x-badge
@@ -45,7 +45,7 @@
label="{{ $myMeetup['name'] }}"/>
</a>
</div>
<div>
<div class="flex flex-col sm:flex-row space-y-1 sm:space-y-0 sm:space-x-1 justify-center">
<x-badge
x-data="{}"
@click.prevent="window.navigator.clipboard.writeText('{{ $myMeetup['ics'] }}');window.$wireui.notify({title:'{{ __('Calendar Stream Url copied!') }}',description:'{{ __('Paste the calendar stream link into a compatible calendar app.') }}',icon:'success'});"
@@ -53,6 +53,22 @@
<i class="fa fa-thin fa-calendar-circle-exclamation mr-2"></i>
{{ __('Calendar') }}
</x-badge>
<a
href="{{ route('meetup.meetup.form', ['meetup' => $myMeetup['id'], 'country' => $myMeetup['country']]) }}">
<x-badge
primary lg class="whitespace-nowrap cursor-pointer">
<i class="fa fa-thin fa-edit mr-2"></i>
{{ __('Edit') }}
</x-badge>
</a>
<a
href="{{ route('meetup.table.meetupEvent', ['country' => $myMeetup['country']]) }}">
<x-badge
primary lg class="whitespace-nowrap cursor-pointer">
<i class="fa fa-thin fa-list mr-2"></i>
{{ __('Events') }}
</x-badge>
</a>
</div>
</div>
@endforeach