mirror of
https://github.com/HolgerHatGarKeineNode/einundzwanzig-app.git
synced 2025-12-13 23:56:47 +00:00
🌍 Add Top-Countries, Top-Meetups, and Activities dashboard components
- Introduced three new Livewire components for the dashboard: - Top Countries: Displays countries with the most users. - Top Meetups: Highlights meetups with the largest user counts. - Activities: Showcases recent meetups and events. - Updated `dashboard.blade.php` to lazy-load these components. - Expanded multilingual support for relevant labels across all languages.
This commit is contained in:
@@ -204,4 +204,11 @@ class extends Component {
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{{-- Neue Statistiken und Activities (Lazy loaded) --}}
|
||||
<div class="grid auto-rows-min gap-4 grid-cols-1 md:grid-cols-2 2xl:grid-cols-3">
|
||||
<livewire:dashboard.top-countries lazy/>
|
||||
<livewire:dashboard.top-meetups lazy/>
|
||||
<livewire:dashboard.activities lazy/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
114
resources/views/livewire/dashboard/activities.blade.php
Normal file
114
resources/views/livewire/dashboard/activities.blade.php
Normal file
@@ -0,0 +1,114 @@
|
||||
<?php
|
||||
|
||||
use App\Models\Meetup;
|
||||
use App\Models\MeetupEvent;
|
||||
use Livewire\Attributes\Lazy;
|
||||
use Livewire\Volt\Component;
|
||||
|
||||
new
|
||||
#[Lazy]
|
||||
class extends Component {
|
||||
public function with(): array
|
||||
{
|
||||
// Recent Activities - Neue Meetups und Events
|
||||
$recentMeetups = Meetup::with(['city.country'])
|
||||
->orderBy('created_at', 'desc')
|
||||
->limit(5)
|
||||
->get();
|
||||
|
||||
$recentEvents = MeetupEvent::with(['meetup.city.country'])
|
||||
->orderBy('created_at', 'desc')
|
||||
->limit(5)
|
||||
->get();
|
||||
|
||||
// Kombiniere und sortiere Activities
|
||||
$activities = collect($recentMeetups->map(fn($m) => ['type' => 'meetup', 'data' => $m, 'created_at' => $m->created_at]))
|
||||
->merge($recentEvents->map(fn($e) => ['type' => 'event', 'data' => $e, 'created_at' => $e->created_at]))
|
||||
->sortByDesc('created_at')
|
||||
->take(10);
|
||||
|
||||
return [
|
||||
'activities' => $activities,
|
||||
];
|
||||
}
|
||||
|
||||
public function placeholder(): string
|
||||
{
|
||||
return <<<'HTML'
|
||||
<div class="relative overflow-hidden rounded-xl border border-neutral-200 dark:border-neutral-700">
|
||||
<div class="p-6">
|
||||
<flux:heading size="lg" class="mb-4">{{ __('Aktivitäten') }}</flux:heading>
|
||||
<flux:text class="text-sm text-zinc-500 mb-4">{{ __('Neue Meetups und Termine') }}</flux:text>
|
||||
<flux:separator class="my-4"/>
|
||||
<div class="flex items-center justify-center py-8">
|
||||
<flux:icon.arrow-path class="animate-spin size-6 text-zinc-400" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
HTML;
|
||||
}
|
||||
}; ?>
|
||||
|
||||
<div class="relative overflow-hidden rounded-xl border border-neutral-200 dark:border-neutral-700">
|
||||
<div class="p-6">
|
||||
<flux:heading size="lg" class="mb-4">{{ __('Aktivitäten') }}</flux:heading>
|
||||
<flux:text class="text-sm text-zinc-500 mb-4">{{ __('Neue Meetups und Termine') }}</flux:text>
|
||||
|
||||
@if($activities->count() > 0)
|
||||
<flux:separator class="my-4"/>
|
||||
<div class="space-y-3">
|
||||
@foreach($activities as $activity)
|
||||
@if($activity['type'] === 'meetup')
|
||||
@php $meetup = $activity['data']; @endphp
|
||||
<a href="{{ route('meetups.landingpage', ['meetup' => $meetup, 'country' => $meetup->city->country->code]) }}"
|
||||
class="block p-2 hover:bg-zinc-50 dark:hover:bg-zinc-800 rounded-lg transition-colors">
|
||||
<div class="flex items-start gap-3">
|
||||
<flux:avatar
|
||||
size="sm"
|
||||
src="{{ $meetup->getFirstMedia('logo') ? $meetup->getFirstMediaUrl('logo', 'thumb') : asset('android-chrome-512x512.png') }}"/>
|
||||
<div class="flex-1 min-w-0">
|
||||
<div class="flex items-center gap-2">
|
||||
<flux:badge color="green" size="sm">{{ __('Neues Meetup') }}</flux:badge>
|
||||
<span class="text-2xl">{{ $meetup->city->country->emoji }}</span>
|
||||
</div>
|
||||
<div class="font-medium mt-1">{{ $meetup->name }}</div>
|
||||
<div class="text-xs text-zinc-500">
|
||||
{{ $meetup->city->name }}, {{ $meetup->city->country->name }}
|
||||
</div>
|
||||
<div class="text-xs text-zinc-400 mt-1">
|
||||
{{ $activity['created_at']->diffForHumans() }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
@else
|
||||
@php $event = $activity['data']; @endphp
|
||||
<a href="{{ route('meetups.landingpage-event', ['meetup' => $event->meetup->slug, 'event' => $event->id, 'country' => $event->meetup->city->country->code]) }}"
|
||||
class="block p-2 hover:bg-zinc-50 dark:hover:bg-zinc-800 rounded-lg transition-colors">
|
||||
<div class="flex items-start gap-3">
|
||||
<flux:avatar
|
||||
size="sm"
|
||||
src="{{ $event->meetup->getFirstMedia('logo') ? $event->meetup->getFirstMediaUrl('logo', 'thumb') : asset('android-chrome-512x512.png') }}"/>
|
||||
<div class="flex-1 min-w-0">
|
||||
<div class="flex items-center gap-2">
|
||||
<flux:badge color="blue" size="sm">{{ __('Neuer Termin') }}</flux:badge>
|
||||
<span class="text-2xl">{{ $event->meetup->city->country->emoji }}</span>
|
||||
</div>
|
||||
<div class="font-medium mt-1">{{ $event->meetup->name }}</div>
|
||||
<div class="text-xs text-zinc-500">
|
||||
{{ $event->start->asDateTime() }}
|
||||
</div>
|
||||
<div class="text-xs text-zinc-400 mt-1">
|
||||
{{ $activity['created_at']->diffForHumans() }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
@endif
|
||||
@endforeach
|
||||
</div>
|
||||
@else
|
||||
<div class="text-sm text-zinc-500">{{ __('Keine Aktivitäten') }}</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
118
resources/views/livewire/dashboard/top-countries.blade.php
Normal file
118
resources/views/livewire/dashboard/top-countries.blade.php
Normal file
@@ -0,0 +1,118 @@
|
||||
<?php
|
||||
|
||||
use Livewire\Attributes\Lazy;
|
||||
use Livewire\Volt\Component;
|
||||
|
||||
new
|
||||
#[Lazy]
|
||||
class extends Component {
|
||||
public function with(): array
|
||||
{
|
||||
// Top Countries - Länder mit den meisten Usern
|
||||
$topCountries = \App\Models\Country::select('countries.*')
|
||||
->join('cities', 'cities.country_id', '=', 'countries.id')
|
||||
->join('meetups', 'meetups.city_id', '=', 'cities.id')
|
||||
->join('meetup_user', 'meetup_user.meetup_id', '=', 'meetups.id')
|
||||
->groupBy('countries.id')
|
||||
->selectRaw('COUNT(DISTINCT meetup_user.user_id) as user_count')
|
||||
->orderBy('user_count', 'desc')
|
||||
->limit(10)
|
||||
->get()
|
||||
->map(function ($country) {
|
||||
// Optimierte Query: Hole alle User-Erstellungsdaten für dieses Land auf einmal
|
||||
$userCreationDates = \DB::table('users')
|
||||
->join('meetup_user', 'users.id', '=', 'meetup_user.user_id')
|
||||
->join('meetups', 'meetup_user.meetup_id', '=', 'meetups.id')
|
||||
->join('cities', 'meetups.city_id', '=', 'cities.id')
|
||||
->where('cities.country_id', $country->id)
|
||||
->whereNotNull('users.created_at')
|
||||
->orderBy('users.created_at')
|
||||
->pluck('users.created_at')
|
||||
->unique()
|
||||
->values();
|
||||
|
||||
if ($userCreationDates->isEmpty()) {
|
||||
$country->sparkline = [0];
|
||||
return $country;
|
||||
}
|
||||
|
||||
// Berechne monatliche Buckets für kumulative Zählung
|
||||
$startDate = \Carbon\Carbon::parse($userCreationDates->first())->startOfMonth();
|
||||
$endDate = now()->endOfMonth();
|
||||
$monthsDiff = max(1, $startDate->diffInMonths($endDate));
|
||||
$interval = max(1, ceil($monthsDiff / 12));
|
||||
|
||||
// Generiere 12 Zeitpunkte
|
||||
$sparklineData = [];
|
||||
$currentDate = $startDate->copy();
|
||||
|
||||
for ($i = 0; $i < 12 && $currentDate <= $endDate; $i++) {
|
||||
// Zähle kumulative User bis zu diesem Zeitpunkt
|
||||
$count = $userCreationDates->filter(function ($date) use ($currentDate) {
|
||||
return \Carbon\Carbon::parse($date) <= $currentDate;
|
||||
})->count();
|
||||
|
||||
$sparklineData[] = $count;
|
||||
$currentDate->addMonths($interval);
|
||||
}
|
||||
|
||||
$country->sparkline = $sparklineData;
|
||||
return $country;
|
||||
});
|
||||
|
||||
return [
|
||||
'topCountries' => $topCountries,
|
||||
];
|
||||
}
|
||||
|
||||
public function placeholder(): string
|
||||
{
|
||||
return <<<'HTML'
|
||||
<div class="relative overflow-hidden rounded-xl border border-neutral-200 dark:border-neutral-700">
|
||||
<div class="p-6">
|
||||
<flux:heading size="lg" class="mb-4">{{ __('Top Länder') }}</flux:heading>
|
||||
<flux:text class="text-sm text-zinc-500 mb-4">{{ __('Länder mit den meisten Usern') }}</flux:text>
|
||||
<flux:separator class="my-4"/>
|
||||
<div class="flex items-center justify-center py-8">
|
||||
<flux:icon.arrow-path class="animate-spin size-6 text-zinc-400" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
HTML;
|
||||
}
|
||||
}; ?>
|
||||
|
||||
<div class="relative overflow-hidden rounded-xl border border-neutral-200 dark:border-neutral-700">
|
||||
<div class="p-6">
|
||||
<flux:heading size="lg" class="mb-4">{{ __('Top Länder') }}</flux:heading>
|
||||
<flux:text class="text-sm text-zinc-500 mb-4">{{ __('Länder mit den meisten Usern') }}</flux:text>
|
||||
|
||||
@if($topCountries->count() > 0)
|
||||
<flux:separator class="my-4"/>
|
||||
<div class="space-y-3">
|
||||
@foreach($topCountries as $country)
|
||||
<div class="flex items-center justify-between gap-3 p-2 hover:bg-zinc-50 dark:hover:bg-zinc-800 rounded-lg transition-colors">
|
||||
<a href="{{ route('meetups.map', ['country' => $country->code]) }}">
|
||||
<div class="flex items-center gap-3 flex-1">
|
||||
<img alt="{{ $country->code }}"
|
||||
src="{{ asset('vendor/blade-flags/country-'.$country->code.'.svg') }}"
|
||||
width="24" height="12"/>
|
||||
<div class="flex-1">
|
||||
<div class="font-medium">{{ $country->name }}</div>
|
||||
<div class="text-xs text-zinc-500">{{ $country->user_count }} {{ __('User') }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
<flux:chart :value="$country->sparkline" class="w-[5rem] aspect-[3/1]">
|
||||
<flux:chart.svg gutter="0">
|
||||
<flux:chart.line class="text-green-500 dark:text-green-400" />
|
||||
</flux:chart.svg>
|
||||
</flux:chart>
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
@else
|
||||
<div class="text-sm text-zinc-500">{{ __('Keine Daten verfügbar') }}</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
112
resources/views/livewire/dashboard/top-meetups.blade.php
Normal file
112
resources/views/livewire/dashboard/top-meetups.blade.php
Normal file
@@ -0,0 +1,112 @@
|
||||
<?php
|
||||
|
||||
use App\Models\Meetup;
|
||||
use Livewire\Attributes\Lazy;
|
||||
use Livewire\Volt\Component;
|
||||
|
||||
new
|
||||
#[Lazy]
|
||||
class extends Component {
|
||||
public function with(): array
|
||||
{
|
||||
// Top Meetups - Meetups mit den meisten Usern
|
||||
$topMeetups = Meetup::withCount('users')
|
||||
->with(['city.country'])
|
||||
->orderBy('users_count', 'desc')
|
||||
->limit(10)
|
||||
->get()
|
||||
->map(function ($meetup) {
|
||||
// Optimierte Query: Hole alle User-Erstellungsdaten für dieses Meetup auf einmal
|
||||
$userCreationDates = \DB::table('users')
|
||||
->join('meetup_user', 'users.id', '=', 'meetup_user.user_id')
|
||||
->where('meetup_user.meetup_id', $meetup->id)
|
||||
->whereNotNull('users.created_at')
|
||||
->orderBy('users.created_at')
|
||||
->pluck('users.created_at')
|
||||
->unique()
|
||||
->values();
|
||||
|
||||
if ($userCreationDates->isEmpty()) {
|
||||
$meetup->sparkline = [0];
|
||||
return $meetup;
|
||||
}
|
||||
|
||||
// Berechne monatliche Buckets für kumulative Zählung
|
||||
$startDate = \Carbon\Carbon::parse($userCreationDates->first())->startOfMonth();
|
||||
$endDate = now()->endOfMonth();
|
||||
$monthsDiff = max(1, $startDate->diffInMonths($endDate));
|
||||
$interval = max(1, ceil($monthsDiff / 12));
|
||||
|
||||
// Generiere 12 Zeitpunkte
|
||||
$sparklineData = [];
|
||||
$currentDate = $startDate->copy();
|
||||
|
||||
for ($i = 0; $i < 12 && $currentDate <= $endDate; $i++) {
|
||||
// Zähle kumulative User bis zu diesem Zeitpunkt
|
||||
$count = $userCreationDates->filter(function ($date) use ($currentDate) {
|
||||
return \Carbon\Carbon::parse($date) <= $currentDate;
|
||||
})->count();
|
||||
|
||||
$sparklineData[] = $count;
|
||||
$currentDate->addMonths($interval);
|
||||
}
|
||||
|
||||
$meetup->sparkline = $sparklineData;
|
||||
return $meetup;
|
||||
});
|
||||
|
||||
return [
|
||||
'topMeetups' => $topMeetups,
|
||||
];
|
||||
}
|
||||
|
||||
public function placeholder(): string
|
||||
{
|
||||
return <<<'HTML'
|
||||
<div class="relative overflow-hidden rounded-xl border border-neutral-200 dark:border-neutral-700">
|
||||
<div class="p-6">
|
||||
<flux:heading size="lg" class="mb-4">{{ __('Top Meetups') }}</flux:heading>
|
||||
<flux:text class="text-sm text-zinc-500 mb-4">{{ __('Meetups mit den meisten Usern') }}</flux:text>
|
||||
<flux:separator class="my-4"/>
|
||||
<div class="flex items-center justify-center py-8">
|
||||
<flux:icon.arrow-path class="animate-spin size-6 text-zinc-400" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
HTML;
|
||||
}
|
||||
}; ?>
|
||||
|
||||
<div class="relative overflow-hidden rounded-xl border border-neutral-200 dark:border-neutral-700">
|
||||
<div class="p-6">
|
||||
<flux:heading size="lg" class="mb-4">{{ __('Top Meetups') }}</flux:heading>
|
||||
<flux:text class="text-sm text-zinc-500 mb-4">{{ __('Meetups mit den meisten Usern') }}</flux:text>
|
||||
|
||||
@if($topMeetups->count() > 0)
|
||||
<flux:separator class="my-4"/>
|
||||
<div class="space-y-3">
|
||||
@foreach($topMeetups as $meetup)
|
||||
<a href="{{ route('meetups.landingpage', ['meetup' => $meetup, 'country' => $meetup->city->country->code]) }}"
|
||||
class="flex items-center justify-between gap-3 p-2 hover:bg-zinc-50 dark:hover:bg-zinc-800 rounded-lg transition-colors block">
|
||||
<div class="flex items-center gap-3 flex-1">
|
||||
<flux:avatar
|
||||
size="sm"
|
||||
src="{{ $meetup->getFirstMedia('logo') ? $meetup->getFirstMediaUrl('logo', 'thumb') : asset('android-chrome-512x512.png') }}"/>
|
||||
<div class="flex-1">
|
||||
<div class="font-medium">{{ $meetup->name }}</div>
|
||||
<div class="text-xs text-zinc-500">{{ $meetup->users_count }} {{ __('User') }}</div>
|
||||
</div>
|
||||
</div>
|
||||
<flux:chart :value="$meetup->sparkline" class="w-[5rem] aspect-[3/1]">
|
||||
<flux:chart.svg gutter="0">
|
||||
<flux:chart.line class="text-green-500 dark:text-green-400" />
|
||||
</flux:chart.svg>
|
||||
</flux:chart>
|
||||
</a>
|
||||
@endforeach
|
||||
</div>
|
||||
@else
|
||||
<div class="text-sm text-zinc-500">{{ __('Keine Daten verfügbar') }}</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
Reference in New Issue
Block a user