base layout improvements

Author: sten

resources/views/components/layouts/base.blade.php

@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="csrf-token" content="{{ csrf_token() }}">
 
-    <title>{{ \Artesaos\SEOTools\SEOTools::getTitle() ?? flexiblePagesSetting(\Statikbe\FilamentFlexibleContentBlockPages\Models\Settings::SETTING_SITE_TITLE, app()->getLocale(), config('app.name') }}</title>
+    <title>{{ $title }}</title>
 
     {!! \Artesaos\SEOTools\SEOTools::generate() !!}
 

resources/views/pages/index.blade.php

@@ -5,7 +5,7 @@
     /* @var Page $page */
 @endphp
 
-<x-flexible-pages-layouts.base title="{{ $page->title }}" wide="true">
+<x-flexible-pages-base-layout title="{{ $page->title }}" wide="true">
     <header>
         <x-flexible-pages-language-switch/>
     </header>
@@ -21,4 +21,4 @@
     <footer>
         <div>{{flexiblePagesSetting(Settings::SETTING_FOOTER_COPYRIGHT)}}</div>
     </footer>
-</x-flexible-pages-layouts.base>
+</x-flexible-pages-base-layout>

src/Components/LanguageSwitch.php

@@ -9,13 +9,15 @@
 
 class LanguageSwitch extends Component
 {
+    public function __construct(public string $title){}
+
     public function render()
     {
         return view('filament-flexible-content-block-pages::components.language-switch');
     }
 
     public function shouldRender(): bool
     {
-        return count(LaravelLocalization::getSupportedLocales()) > 1;
+        return !empty(LaravelLocalization::getSupportedLocales());
     }
 }

src/Http/Controllers/PageController.php

@@ -41,8 +41,13 @@ public function index(Page $page)
         $this->setSEOLocalisationAndCanonicalUrl();
         $this->setSEOImage($page);
 
+        $title = $page->title ??
+            SEOTools::getTitle() ??
+            $this->getSettingsTitle();
+
         return view(self::TEMPLATE_PATH, [
             'page' => $page,
+            'title' => $title,
         ]);
     }
 
@@ -121,8 +126,8 @@ protected function getLocalisedUrls(): array
 
     protected function setBasicSEO(Page $page)
     {
-        SEOTools::setTitle(($page->seo_title ? $page->seo_title : $page->title).$this->getSEOTitlePostfix());
-        SEOTools::setDescription(($page->seo_description ? $page->seo_description : strip_tags($page->intro)));
+        SEOTools::setTitle(($page->seo_title ?? $page->title ?? $this->getSettingsTitle()).$this->getSEOTitlePostfix());
+        SEOTools::setDescription(($page->seo_description ?? strip_tags($page->intro)));
         SEOTools::opengraph()->setUrl(url()->current());
     }
 
@@ -181,4 +186,9 @@ function () use ($seoMedia, $conversion) {
                 ];
             });
     }
+
+    private function getSettingsTitle(): string
+    {
+        return flexiblePagesSetting(Settings::SETTING_SITE_TITLE, app()->getLocale(), config('app.name'));
+    }
 }