diff --git a/app/Http/Controllers/DownloadMeetupCalendar.php b/app/Http/Controllers/DownloadMeetupCalendar.php index cc267a41..3ef28f01 100644 --- a/app/Http/Controllers/DownloadMeetupCalendar.php +++ b/app/Http/Controllers/DownloadMeetupCalendar.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use App\Models\Meetup; +use App\Models\MeetupEvent; use Illuminate\Http\Request; use Spatie\IcalendarGenerator\Components\Calendar; use Spatie\IcalendarGenerator\Components\Event; @@ -18,14 +19,19 @@ class DownloadMeetupCalendar extends Controller */ public function __invoke(Request $request) { - $meetup = Meetup::query() - ->with([ - 'meetupEvents', - ]) - ->findOrFail($request->input('meetup')); + if ($request->has('meetup')) { + $meetup = Meetup::query() + ->with([ + 'meetupEvents', + ]) + ->findOrFail($request->input('meetup')); + $events = $meetup->meetupEvents; + } else { + $events = MeetupEvent::query()->get(); + } $entries = []; - foreach ($meetup->meetupEvents as $event) { + foreach ($events as $event) { $entries[] = Event::create() ->name($meetup->name) ->uniqueIdentifier(str($meetup->name)->slug.$event->id) diff --git a/resources/views/columns/meetups/action.blade.php b/resources/views/columns/meetups/action.blade.php index 59fbfa3c..dc280ab1 100644 --- a/resources/views/columns/meetups/action.blade.php +++ b/resources/views/columns/meetups/action.blade.php @@ -11,10 +11,10 @@ x-data="{ textToCopy: '{{ route('meetup.ics', ['country' => $country, 'meetup' => $row->id]) }}', }" - @click.prevent="window.navigator.clipboard.writeText(textToCopy);window.$wireui.notify({title:'Kalendar URL kopiert!',description:'Füge den Kalender Stream-Link in eine kompatible Kalender-App ein.',icon:'success'});" + @click.prevent="window.navigator.clipboard.writeText(textToCopy);window.$wireui.notify({title:'{{ __('Calendar Stream Url copied!') }}',description:'{{ __('Paste the calendar stream link into a compatible calendar app.') }}',icon:'success'});" amber> - {{ __('Stream Calendar (WIP)') }} ({{ $row->meetup_events_count }}) + {{ __('Calendar Stream-Url') }} ({{ $row->meetup_events_count }}) @endif @if($row->meetup_events_count < 1) diff --git a/resources/views/livewire/auth/ln-url-auth.blade.php b/resources/views/livewire/auth/ln-url-auth.blade.php index 388d5fcc..5ab7ea18 100644 --- a/resources/views/livewire/auth/ln-url-auth.blade.php +++ b/resources/views/livewire/auth/ln-url-auth.blade.php @@ -25,7 +25,7 @@ x-data="{ textToCopy: 'lightning:{{ $this->lnurl }}', }" - @click.prevent="window.navigator.clipboard.writeText(textToCopy);window.$wireui.notify({title:'URL kopiert!',icon:'success'});" + @click.prevent="window.navigator.clipboard.writeText(textToCopy);window.$wireui.notify({title:'{{ __('URL copied!') }}',icon:'success'});" > - {{ __('Email registration') }} + {{ __('Email registration') }} @endif
-

{{ __('Zeus bug:') }} https://github.com/ZeusLN/zeus/issues/1045 +

{{ __('Zeus bug:') }} https://github.com/ZeusLN/zeus/issues/1045

diff --git a/resources/views/livewire/bitcoin-event/bitcoin-event-table.blade.php b/resources/views/livewire/bitcoin-event/bitcoin-event-table.blade.php index 88edabe8..13ea53e2 100644 --- a/resources/views/livewire/bitcoin-event/bitcoin-event-table.blade.php +++ b/resources/views/livewire/bitcoin-event/bitcoin-event-table.blade.php @@ -10,10 +10,10 @@ x-data="{ textToCopy: '{{ route('bitcoinEvent.ics', ['country' => $country]) }}', }" - @click.prevent="window.navigator.clipboard.writeText(textToCopy);window.$wireui.notify({title:'Kalendar URL kopiert!',description:'Füge den Kalender Stream-Link in eine kompatible Kalender-App ein.',icon:'success'});" + @click.prevent="window.navigator.clipboard.writeText(textToCopy);window.$wireui.notify({title:'{{ __('Calendar Stream Url copied!') }}',description:'{{ __('Paste the calendar stream link into a compatible calendar app.') }}',icon:'success'});" amber> - {{ __('Stream Calendar (WIP)') }} ({{ $events->count() }}) + {{ __('Calendar Stream-Url') }} ({{ $events->count() }})
@@ -136,18 +136,6 @@ -
- - - {{ __('Stream Calendar (WIP)') }} ({{ $events->count() }}) - -
- diff --git a/resources/views/livewire/meetup/meetup-table.blade.php b/resources/views/livewire/meetup/meetup-table.blade.php index fb152059..5f6ffe8a 100644 --- a/resources/views/livewire/meetup/meetup-table.blade.php +++ b/resources/views/livewire/meetup/meetup-table.blade.php @@ -3,27 +3,39 @@ {{-- MAIN --}}
-
-

- {{ __('Bitcoiner') }} {{ __('Meetups') }} - {{ __('Plebs together strong 💪') }} -

-

+

+
+ + + {{ __('Calendar Stream-Url for all meetup events') }} + +
+
+

+ {{ __('Bitcoiner') }} {{ __('Meetups') }} + {{ __('Plebs together strong 💪') }} +

+

{{ __('Bitcoiner Meetups are a great way to meet other Bitcoiners in your area. You can learn from each other, share ideas, and have fun!') }} - @php - $focus = ''; - $map = $country->code . '_merc'; - if (!\File::exists(public_path('vendor/jvector/maps/' . $country->code . '.js'))) { - $map = 'europe_merc'; - $focus = 'focusOn: {lat:'.$country->latitude.',lng:'.$country->longitude.',scale:8,animate:true},'; - } - @endphp -

-
+ > +
+