From 572dbf1f31113e0c29ea0e83a80c301dedfebc0d Mon Sep 17 00:00:00 2001
From: HolgerHatGarKeineNode <fsociety.mkv@pm.me>
Date: Sun, 23 Nov 2025 20:50:59 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=8C=8D=20Add=20dynamic=20country=20parame?=
 =?UTF-8?q?ter=20to=20settings=20routes=20and=20enhance=20data=20relations?=
 =?UTF-8?q?hips?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Updated settings route links to include `country` parameter dynamically resolved from session.
- Improved relational queries by adding `city.country` to meetups map and `coursesEvents.course` to lecturers data.
---
 .../views/components/layouts/app/header.blade.php   |  2 +-
 .../views/components/layouts/app/sidebar.blade.php  |  6 +++---
 .../views/components/settings/layout.blade.php      |  4 ++--
 resources/views/livewire/lecturers/index.blade.php  | 13 ++++++++-----
 resources/views/livewire/meetups/map.blade.php      |  2 +-
 routes/web.php                                      |  3 ---
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/resources/views/components/layouts/app/header.blade.php b/resources/views/components/layouts/app/header.blade.php
index e235d9e..d13aa35 100644
--- a/resources/views/components/layouts/app/header.blade.php
+++ b/resources/views/components/layouts/app/header.blade.php
@@ -78,7 +78,7 @@
             <flux:menu.separator/>
 
             <flux:menu.radio.group>
-                <flux:menu.item :href="route_with_country('settings.profile')" icon="cog"
+                <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>
 
diff --git a/resources/views/components/layouts/app/sidebar.blade.php b/resources/views/components/layouts/app/sidebar.blade.php
index 402476b..6daeb7d 100644
--- a/resources/views/components/layouts/app/sidebar.blade.php
+++ b/resources/views/components/layouts/app/sidebar.blade.php
@@ -69,7 +69,7 @@
     <flux:spacer/>
 
     <flux:navlist variant="outline">
-        <flux:navlist.item icon="language" :href="route('settings.profile')"
+        <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') }}
@@ -128,7 +128,7 @@
                 <flux:menu.separator/>
 
                 <flux:menu.radio.group>
-                    <flux:menu.item :href="route('settings.profile')" icon="cog"
+                    <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>
 
@@ -189,7 +189,7 @@
                 <flux:menu.separator/>
 
                 <flux:menu.radio.group>
-                    <flux:menu.item :href="route('settings.profile')" icon="cog"
+                    <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>
 
diff --git a/resources/views/components/settings/layout.blade.php b/resources/views/components/settings/layout.blade.php
index 8753ebb..73c101a 100644
--- a/resources/views/components/settings/layout.blade.php
+++ b/resources/views/components/settings/layout.blade.php
@@ -1,9 +1,9 @@
 <div class="flex items-start max-md:flex-col">
     <div class="me-10 w-full pb-4 md:w-[220px]">
         <flux:navlist>
-            <flux:navlist.item :href="route('settings.profile')" wire:navigate>{{ __('Profile') }}</flux:navlist.item>
+            <flux:navlist.item :href="route('settings.profile', ['country' => str(session('lang_country', 'de'))->after('-')->lower()])" wire:navigate>{{ __('Profile') }}</flux:navlist.item>
             {{--<flux:navlist.item :href="route('settings.password')" wire:navigate>{{ __('Password') }}</flux:navlist.item>--}}
-            <flux:navlist.item :href="route('settings.appearance')" wire:navigate>{{ __('Appearance') }}</flux:navlist.item>
+            <flux:navlist.item :href="route('settings.appearance', ['country' => str(session('lang_country', 'de'))->after('-')->lower()])" wire:navigate>{{ __('Appearance') }}</flux:navlist.item>
         </flux:navlist>
     </div>
 
diff --git a/resources/views/livewire/lecturers/index.blade.php b/resources/views/livewire/lecturers/index.blade.php
index 768aae8..f783ec8 100644
--- a/resources/views/livewire/lecturers/index.blade.php
+++ b/resources/views/livewire/lecturers/index.blade.php
@@ -23,14 +23,17 @@ class extends Component {
     public function with(): array
     {
         return [
-            'lecturers' => Lecturer::with([
-                'createdBy', 'coursesEvents' => fn($query) => $query->where('from', '>=', now())->orderBy('from', 'asc')
-            ])
+            'lecturers' => Lecturer::query()
+                ->with([
+                    'createdBy',
+                    'coursesEvents' => fn($query) => $query->where('from', '>=', now())->orderBy('from', 'asc'),
+                    'coursesEvents.course',
+                ])
                 ->withExists([
-                    'coursesEvents as has_future_events' => fn($query) => $query->where('from', '>=', now())
+                    'coursesEvents as has_future_events' => fn($query) => $query->where('from', '>=', now()),
                 ])
                 ->withCount([
-                    'coursesEvents as future_events_count' => fn($query) => $query->where('from', '>=', now())
+                    'coursesEvents as future_events_count' => fn($query) => $query->where('from', '>=', now()),
                 ])
                 ->when($this->search, fn($query)
                     => $query
diff --git a/resources/views/livewire/meetups/map.blade.php b/resources/views/livewire/meetups/map.blade.php
index 0d1d563..08683fe 100644
--- a/resources/views/livewire/meetups/map.blade.php
+++ b/resources/views/livewire/meetups/map.blade.php
@@ -44,7 +44,7 @@ class extends Component {
                     'meetups.simplex',
                     'meetups.signal',
                 ])
-                ->with(['city:id,country_id,longitude,latitude'])
+                ->with(['city:id,country_id,longitude,latitude', 'city.country'])
                 ->get()
                 ->map(function ($meetup) {
                     $meetup->load(['meetupEvents' => function($query) {
diff --git a/routes/web.php b/routes/web.php
index 1d4dc23..53590be 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -107,10 +107,7 @@ Route::middleware(['auth'])
 
         Volt::route('venue-create', 'venues.create')->name('venues.create');
         Volt::route('venue-edit/{venue}', 'venues.edit')->name('venues.edit');
-    });
 
-Route::middleware(['auth'])
-    ->group(function () {
         Route::redirect('settings', 'settings/profile');
 
         Volt::route('settings/profile', 'settings.profile')->name('settings.profile');