Fix featured filters by stopping duplicate Livewire load.

Livewire was included twice on new_base pages, so month/language changes never updated the component. Also normalize bad language codes like eng and show upcoming open-online counts.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: bernardhanna

app/Livewire/OnlineCalendar.php

@@ -95,18 +95,15 @@ public function render()
         $languages = $this->baseQuery()
             ->get(['language'])
             ->flatMap(function ($event) {
-                return $event->languages ?? [];
-            })
-            ->filter(function ($language) {
-                return ! empty($language);
+                return $this->normalizedLanguagesForEvent($event);
             })
             ->unique()
             ->sort()
             ->values()
             ->map(function ($language) {
                 return [
                     'id' => $language,
-                    'name' => __("base.languages.{$language}"),
+                    'name' => __('base.languages.'.$language),
                 ];
             })
             ->prepend([
@@ -115,10 +112,14 @@ public function render()
             ])
             ->toArray();
 
+        $totalUpcoming = $this->baseQuery()->count();
+
         return view('livewire.online-calendar', [
             'countryNames' => $this->getCountryNamesFromEvents($events),
             'languages' => $languages,
             'filteredEvents' => $filteredEvents->paginate(50),
+            'totalUpcoming' => $totalUpcoming,
+            'visibleCount' => $filteredEvents->count(),
         ]);
     }
 
@@ -134,17 +135,81 @@ private function baseQuery()
 
     private function eventMatchesLanguage($event, string $selectedLanguage): bool
     {
-        $languages = $event->languages ?? [];
+        $selected = $this->normalizeLanguageCode($selectedLanguage);
 
-        if (! is_array($languages)) {
-            return strtolower((string) $languages) === strtolower($selectedLanguage);
+        if ($selected === null) {
+            return false;
         }
 
-        $normalized = array_map(static function ($language) {
-            return strtolower((string) $language);
-        }, $languages);
+        return in_array($selected, $this->normalizedLanguagesForEvent($event), true);
+    }
+
+    private function normalizedLanguagesForEvent($event): array
+    {
+        $raw = $event->languages ?? $event->language ?? [];
+
+        if (is_string($raw)) {
+            $trimmed = trim($raw);
+            if ($trimmed === '') {
+                return [];
+            }
+
+            if (str_starts_with($trimmed, '[')) {
+                $decoded = json_decode($trimmed, true);
+                $raw = is_array($decoded) ? $decoded : preg_split('/\s*,\s*/', $trimmed);
+            } else {
+                $raw = preg_split('/\s*,\s*/', $trimmed);
+            }
+        }
+
+        if (! is_array($raw)) {
+            $raw = [$raw];
+        }
+
+        return collect($raw)
+            ->map(fn ($language) => $this->normalizeLanguageCode(is_string($language) ? $language : null))
+            ->filter()
+            ->unique()
+            ->values()
+            ->all();
+    }
+
+    private function normalizeLanguageCode(?string $code): ?string
+    {
+        if ($code === null) {
+            return null;
+        }
+
+        $code = strtolower(trim($code));
+        $code = trim($code, "\"'[] ");
+
+        if ($code === '') {
+            return null;
+        }
+
+        $aliases = [
+            'eng' => 'en',
+            'deu' => 'de',
+            'ger' => 'de',
+            'fra' => 'fr',
+            'fre' => 'fr',
+            'spa' => 'es',
+            'ita' => 'it',
+            'nld' => 'nl',
+            'dut' => 'nl',
+            'pol' => 'pl',
+            'tur' => 'tr',
+            'ell' => 'el',
+            'gre' => 'el',
+        ];
+
+        $code = $aliases[$code] ?? $code;
+
+        if (! trans()->has('base.languages.'.$code)) {
+            return null;
+        }
 
-        return in_array(strtolower($selectedLanguage), $normalized, true);
+        return $code;
     }
 
     private function getCountryNamesFromEvents($events)

resources/views/components/livewire.blade.php

@@ -2,6 +2,5 @@
     @livewireStyles
 @endpush
 
-@push('scripts')
-    @livewireScripts
-@endpush
+{{-- Do not push @livewireScripts here. Layouts (new_base/base) already include them.
+     Loading Livewire twice breaks wire:model updates (filters appear to do nothing). --}}

resources/views/layout/new_base.blade.php

@@ -21,6 +21,7 @@
     <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.8.1/slick-theme.min.css" />
 
     @stack('extra-css')
+    @livewireStyles
     @include('layout.analytics')
 
     <script>

resources/views/livewire/online-calendar.blade.php

@@ -45,6 +45,12 @@ class="w-full appearance-none rounded-full border border-slate-200 bg-white py-3
         <div class="absolute top-0 w-full h-64 bg-yellow-50 hidden xl:block" style="clip-path: ellipse(65% 90% at 50% 90%)" ></div>
         <div class="bg-yellow-50">
             <div class="codeweek-container-lg relative pt-10 pb-16 md:pb-28">
+                <p class="text-center text-slate-500 text-lg mb-8">
+                    Showing {{ $visibleCount }} of {{ $totalUpcoming }} upcoming open online activities
+                    @if($selectedDate)
+                        for {{ \Carbon\Carbon::createFromDate($selectedYear, $selectedMonth, 1)->format('F Y') }}
+                    @endif
+                </p>
                 @if(count($filteredEvents) > 0)
                     <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6 xl:gap-10">
                         @foreach($filteredEvents as $event)