einundzwanzig/einundzwanzig-app
1
0
Fork 0
mirror of https://github.com/HolgerHatGarKeineNode/einundzwanzig-app.git synced 2025-12-13 23:56:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

🌍 Add global map route, refine country-specific routes, and enhance sidebar functionality

Browse Source 
- Introduced `meetups.map-world` route for global meetup map view.
- Updated `meetups.map` route to include dynamic filtering based on country.
- Enhanced sidebar with icons and flags for improved navigation clarity.
This commit is contained in:
HolgerHatGarKeineNode
2025-11-23 23:01:42 +01:00
parent 2cfd7abc07
commit a66a6a7207
3 changed files with 39 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
resources/views/components/layouts/app/sidebar.blade.php
View File

@@ -30,7 +30,22 @@
</flux:navlist.item>
<flux:navlist.item icon="map" :href="route_with_country('meetups.map')"
:current="request()->routeIs('meetups.map')"
wire:navigate>{{ __('Karte') }}</flux:navlist.item>
wire:navigate>
<div class="flex items-center space-x-2">
<span>{{ __('Karte') }}</span>
<img alt="{{ request()->route('country') }}"
src="{{ asset('vendor/blade-flags/country-'.request()->route('country').'.svg') }}"
width="24" height="12"/>
</div>
</flux:navlist.item>
<flux:navlist.item icon="map" :href="route_with_country('meetups.map-world')"
:current="request()->routeIs('meetups.map-world')"
wire:navigate>
<div class="flex items-center space-x-2">
<span>{{ __('Welt-Karte') }}</span>
<flux:icon name="globe-europe-africa"/>
</div>
</flux:navlist.item>
</flux:navlist.group>
<flux:navlist.group :heading="__('Kurse')" class="grid">
@@ -49,7 +64,8 @@
</flux:navlist.group>
<flux:navlist.group :heading="__('Diverses')" class="grid">
<flux:navlist.group :heading="__('Orte/Gebiete')" expandable :expanded="request()->routeIs('cities.*') || request()->routeIs('venues.*')">
<flux:navlist.group :heading="__('Orte/Gebiete')" expandable
:expanded="request()->routeIs('cities.*') || request()->routeIs('venues.*')">
<flux:navlist.item icon="building-office-2" :href="route_with_country('cities.index')"
:current="request()->routeIs('cities.index')"
wire:navigate
@@ -69,7 +85,8 @@
<flux:spacer/>
<flux:navlist variant="outline">
<flux:navlist.item icon="language" :href="route('settings.profile', ['country' => str(session('lang_country', 'de'))->after('-')->lower()])"
<flux:navlist.item icon="language"
:href="route('settings.profile', ['country' => str(session('lang_country', 'de'))->after('-')->lower()])"
:current="request()->routeIs('settings.profile')"
wire:navigate>
{{ __('Sprache wechseln') }}
@@ -108,7 +125,7 @@
<flux:menu.radio.group>
<div class="p-0 text-sm font-normal">
<div class="flex items-center gap-2 px-1 py-1.5 text-start text-sm">
<flux:avatar :src="auth()->user()->profile_photo_url" size="sm" class="shrink-0" />
<flux:avatar :src="auth()->user()->profile_photo_url" size="sm" class="shrink-0"/>
<div class="grid flex-1 text-start text-sm leading-tight">
<span class="truncate font-semibold">{{ auth()->user()?->name }}</span>
@@ -128,8 +145,10 @@
<flux:menu.separator/>
<flux:menu.radio.group>
<flux:menu.item :href="route('settings.profile', ['country' => str(session('lang_country', 'de'))->after('-')->lower()])" icon="cog"
wire:navigate>{{ __('Settings') }}</flux:menu.item>
<flux:menu.item
:href="route('settings.profile', ['country' => str(session('lang_country', 'de'))->after('-')->lower()])"
icon="cog"
wire:navigate>{{ __('Settings') }}</flux:menu.item>
</flux:menu.radio.group>
<flux:menu.separator/>
@@ -169,7 +188,7 @@
<flux:menu.radio.group>
<div class="p-0 text-sm font-normal">
<div class="flex items-center gap-2 px-1 py-1.5 text-start text-sm">
<flux:avatar :src="auth()->user()->profile_photo_url" size="sm" class="shrink-0" />
<flux:avatar :src="auth()->user()->profile_photo_url" size="sm" class="shrink-0"/>
<div class="grid flex-1 text-start text-sm leading-tight">
<span class="truncate font-semibold">{{ auth()->user()?->name }}</span>
@@ -189,8 +208,10 @@
<flux:menu.separator/>
<flux:menu.radio.group>
<flux:menu.item :href="route('settings.profile', ['country' => str(session('lang_country', 'de'))->after('-')->lower()])" icon="cog"
wire:navigate>{{ __('Settings') }}</flux:menu.item>
<flux:menu.item
:href="route('settings.profile', ['country' => str(session('lang_country', 'de'))->after('-')->lower()])"
icon="cog"
wire:navigate>{{ __('Settings') }}</flux:menu.item>
</flux:menu.radio.group>
<flux:menu.separator/>

8
resources/views/livewire/meetups/map.blade.php
View File

@@ -13,9 +13,11 @@ class extends Component {
public string $country = 'de';
public float $latitude = 0.0;
public float $longitude = 0.0;
public string $currentRouteName = '';
public function mount(): void
{
$this->currentRouteName = request()->route()->getName();
$this->country = request()->route('country', config('app.domain_country'));
$geoCountry = \Lwwcas\LaravelCountries\Models\Country::query()
->where('iso_alpha_2', str($this->country)->upper())
@@ -45,6 +47,12 @@ class extends Component {
'meetups.signal',
])
->with(['city:id,country_id,longitude,latitude', 'city.country'])
->when(
$this->currentRouteName === 'meetups.map',
fn($query)
=> $query
->whereHas('city.country', fn($query) => $query->where('code', $this->country))
)
->get()
->map(function ($meetup) {
$meetup->load(['meetupEvents' => function($query) {

1
routes/web.php
View File

@@ -74,6 +74,7 @@ Route::middleware([])
Volt::route('meetups', 'meetups.index')->name('meetups.index');
Volt::route('map', 'meetups.map')->name('meetups.map');
Volt::route('map-world', 'meetups.map')->name('meetups.map-world');
Volt::route('meetup/{meetup:slug}', 'meetups.landingpage')->name('meetups.landingpage');
Volt::route('meetup/{meetup:slug}/event/{event}',
'meetups.landingpage-event')->name('meetups.landingpage-event');