diff --git a/app/Http/Controllers/DownloadMeetupCalendar.php b/app/Http/Controllers/DownloadMeetupCalendar.php index 0a83378d..b5fe0140 100644 --- a/app/Http/Controllers/DownloadMeetupCalendar.php +++ b/app/Http/Controllers/DownloadMeetupCalendar.php @@ -24,6 +24,15 @@ class DownloadMeetupCalendar extends Controller ->findOrFail($request->input('meetup')); $events = $meetup->meetupEvents; $image = $meetup->getFirstMediaUrl('logo'); + } elseif ($request->has('my')) { + $ids = auth()->user()->meetups->pluck('id')->toArray(); + $events = MeetupEvent::query() + ->with([ + 'meetup', + ]) + ->whereHas('meetup', fn($query) => $query->whereIn('meetups.id', $ids)) + ->get(); + $image = asset('img/einundzwanzig-horizontal.png'); } else { $events = MeetupEvent::query() ->with([ diff --git a/app/Http/Livewire/Meetup/MeetupEventTable.php b/app/Http/Livewire/Meetup/MeetupEventTable.php index a3638715..5ab27c5c 100644 --- a/app/Http/Livewire/Meetup/MeetupEventTable.php +++ b/app/Http/Livewire/Meetup/MeetupEventTable.php @@ -4,6 +4,7 @@ namespace App\Http\Livewire\Meetup; use App\Models\Country; use App\Models\MeetupEvent; +use App\Traits\HasMapEmbedCodeTrait; use Livewire\Component; use RalphJSmit\Laravel\SEO\Support\SEOData; use WireUi\Traits\Actions; @@ -11,6 +12,7 @@ use WireUi\Traits\Actions; class MeetupEventTable extends Component { use Actions; + use HasMapEmbedCodeTrait; public Country $country; diff --git a/app/Http/Livewire/Meetup/MeetupTable.php b/app/Http/Livewire/Meetup/MeetupTable.php index 20caeb0f..127aad21 100644 --- a/app/Http/Livewire/Meetup/MeetupTable.php +++ b/app/Http/Livewire/Meetup/MeetupTable.php @@ -4,21 +4,16 @@ namespace App\Http\Livewire\Meetup; use App\Models\Country; use App\Models\Meetup; +use App\Traits\HasMapEmbedCodeTrait; use Livewire\Component; use RalphJSmit\Laravel\SEO\Support\SEOData; class MeetupTable extends Component { + use HasMapEmbedCodeTrait; + public Country $country; - public string $mapEmbedCode = ''; - - public function mount() - { - $this->mapEmbedCode = ''; - } - public function filterByMarker($id) { $meetup = Meetup::with(['city.country']) diff --git a/app/Traits/HasMapEmbedCodeTrait.php b/app/Traits/HasMapEmbedCodeTrait.php new file mode 100644 index 00000000..6d58dee7 --- /dev/null +++ b/app/Traits/HasMapEmbedCodeTrait.php @@ -0,0 +1,15 @@ +mapEmbedCode = ''; + } + +} diff --git a/resources/lang/de.json b/resources/lang/de.json index 8266a751..bdc4e257 100644 --- a/resources/lang/de.json +++ b/resources/lang/de.json @@ -856,5 +856,6 @@ "Click on any of the authors to see their articles.": "Klicke auf einen der Autoren, um die Artikel zu lesen.", "articles": "Artikel", "Participation confirmed": "Teilnahme bestätigt", - "There was an error on row :row. :message": "Es gab einen Fehler in Zeile :row. :message" + "There was an error on row :row. :message": "Es gab einen Fehler in Zeile :row. :message", + "Calendar Stream-Url for my meetups only": "Calendar Stream-Url nur für meine Meetups" } diff --git a/resources/lang/en.json b/resources/lang/en.json index 7ae02df2..17512bba 100644 --- a/resources/lang/en.json +++ b/resources/lang/en.json @@ -855,5 +855,7 @@ "articles": "", "Participation confirmed": "", "Perhabs": "", - "There was an error on row :row. :message": "" + "There was an error on row :row. :message": "", + "Calendar Stream-Url for my meetups only": "", + "Calendar Stream-Url for my meetups": "" } \ No newline at end of file diff --git a/resources/lang/es.json b/resources/lang/es.json index 25e790e1..9febd169 100644 --- a/resources/lang/es.json +++ b/resources/lang/es.json @@ -855,5 +855,7 @@ "articles": "", "Participation confirmed": "", "Perhabs": "", - "There was an error on row :row. :message": "" + "There was an error on row :row. :message": "", + "Calendar Stream-Url for my meetups only": "", + "Calendar Stream-Url for my meetups": "" } \ No newline at end of file diff --git a/resources/lang/fr.json b/resources/lang/fr.json index 0e6893f7..7fafac87 100644 --- a/resources/lang/fr.json +++ b/resources/lang/fr.json @@ -856,5 +856,7 @@ "articles": "", "Participation confirmed": "", "Perhabs": "", - "There was an error on row :row. :message": "" + "There was an error on row :row. :message": "", + "Calendar Stream-Url for my meetups only": "", + "Calendar Stream-Url for my meetups": "" } \ No newline at end of file diff --git a/resources/lang/hr.json b/resources/lang/hr.json index 8ac542e5..2018c99d 100644 --- a/resources/lang/hr.json +++ b/resources/lang/hr.json @@ -856,5 +856,7 @@ "articles": "", "Participation confirmed": "", "Perhabs": "", - "There was an error on row :row. :message": "" + "There was an error on row :row. :message": "", + "Calendar Stream-Url for my meetups only": "", + "Calendar Stream-Url for my meetups": "" } \ No newline at end of file diff --git a/resources/lang/it.json b/resources/lang/it.json index 0dcf3d55..3edd7427 100644 --- a/resources/lang/it.json +++ b/resources/lang/it.json @@ -856,5 +856,7 @@ "articles": "", "Participation confirmed": "", "Perhabs": "", - "There was an error on row :row. :message": "" + "There was an error on row :row. :message": "", + "Calendar Stream-Url for my meetups only": "", + "Calendar Stream-Url for my meetups": "" } \ No newline at end of file diff --git a/resources/lang/mk.json b/resources/lang/mk.json index c25dd5f7..4c6af955 100644 --- a/resources/lang/mk.json +++ b/resources/lang/mk.json @@ -856,5 +856,7 @@ "articles": "", "Participation confirmed": "", "Perhabs": "", - "There was an error on row :row. :message": "" + "There was an error on row :row. :message": "", + "Calendar Stream-Url for my meetups only": "", + "Calendar Stream-Url for my meetups": "" } \ No newline at end of file diff --git a/resources/lang/pl.json b/resources/lang/pl.json index 4cb1383d..3be8a8d1 100644 --- a/resources/lang/pl.json +++ b/resources/lang/pl.json @@ -856,5 +856,7 @@ "articles": "", "Participation confirmed": "", "Perhabs": "", - "There was an error on row :row. :message": "" + "There was an error on row :row. :message": "", + "Calendar Stream-Url for my meetups only": "", + "Calendar Stream-Url for my meetups": "" } \ No newline at end of file diff --git a/resources/lang/pt.json b/resources/lang/pt.json index 33198ec7..89e3e72c 100644 --- a/resources/lang/pt.json +++ b/resources/lang/pt.json @@ -856,5 +856,7 @@ "articles": "", "Participation confirmed": "", "Perhabs": "", - "There was an error on row :row. :message": "" + "There was an error on row :row. :message": "", + "Calendar Stream-Url for my meetups only": "", + "Calendar Stream-Url for my meetups": "" } \ No newline at end of file diff --git a/resources/lang/sv.json b/resources/lang/sv.json index 5136f958..f1bacaeb 100644 --- a/resources/lang/sv.json +++ b/resources/lang/sv.json @@ -818,5 +818,7 @@ "articles": "", "Participation confirmed": "", "Perhabs": "", - "There was an error on row :row. :message": "" + "There was an error on row :row. :message": "", + "Calendar Stream-Url for my meetups only": "", + "Calendar Stream-Url for my meetups": "" } \ No newline at end of file diff --git a/resources/lang/tr.json b/resources/lang/tr.json index b7e0b595..1d4180e6 100644 --- a/resources/lang/tr.json +++ b/resources/lang/tr.json @@ -830,5 +830,7 @@ "articles": "", "Participation confirmed": "", "Perhabs": "", - "There was an error on row :row. :message": "" + "There was an error on row :row. :message": "", + "Calendar Stream-Url for my meetups only": "", + "Calendar Stream-Url for my meetups": "" } \ No newline at end of file diff --git a/resources/views/livewire/meetup/meetup-event-table.blade.php b/resources/views/livewire/meetup/meetup-event-table.blade.php index e73ec4ed..e6ecdd23 100644 --- a/resources/views/livewire/meetup/meetup-event-table.blade.php +++ b/resources/views/livewire/meetup/meetup-event-table.blade.php @@ -6,15 +6,37 @@
- + - - {{ __('Calendar Stream-Url for all meetup events') }} - + @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> + + {{ __('Calendar Stream-Url for all meetup events') }} + + + + {{ __('Calendar Stream-Url for my meetups only') }} + + + + {{ __('Copy embed code for the map') }} {{ $country->code }} + +
@@ -32,6 +54,7 @@ .calendar { max-height: 280px; } + .calendar .calendar-header { background-color: #F7931A; color: white; diff --git a/resources/views/livewire/meetup/meetup-table.blade.php b/resources/views/livewire/meetup/meetup-table.blade.php index ef35d1a0..6e753f5f 100644 --- a/resources/views/livewire/meetup/meetup-table.blade.php +++ b/resources/views/livewire/meetup/meetup-table.blade.php @@ -15,6 +15,15 @@ {{ __('Calendar Stream-Url for all meetup events') }} + + + {{ __('Calendar Stream-Url for my meetups only') }} +