improve SEO fields

Author: sten

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

@@ -5,9 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="csrf-token" content="{{ csrf_token() }}">
 
-    <title>{{ $title }}</title>
-
-    {!! \Artesaos\SEOTools\SEOTools::generate() !!}
+    {!! \Artesaos\SEOTools\Facades\SEOTools::generate() !!}
 
     <!-- Scripts -->
     @vite(['resources/css/app.css', 'resources/js/app.js'])

resources/views/pages/index.blade.php

@@ -5,7 +5,7 @@
     /* @var Page $page */
 @endphp
 
-<x-flexible-pages-base-layout title="{{ $page->title }}" wide="true">
+<x-flexible-pages-base-layout wide="true">
     <header>
         <x-flexible-pages-language-switch/>
     </header>

src/Components/BaseLayout.php

@@ -6,8 +6,6 @@
 
 class BaseLayout extends Component
 {
-    public function __construct(public string $title){}
-
     public function render()
     {
         return view('filament-flexible-content-block-pages::components.layouts.base');

src/Http/Controllers/PageController.php

@@ -10,6 +10,7 @@
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
 use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
+use Spatie\Image\Image;
 use Spatie\MediaLibrary\Conversions\ConversionCollection;
 use Spatie\MediaLibrary\MediaCollections\Models\Media;
 use Statikbe\FilamentFlexibleContentBlockPages\Facades\FilamentFlexibleContentBlockPages;
@@ -41,13 +42,8 @@ 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,
         ]);
     }
 
@@ -81,8 +77,12 @@ public function grandchildIndex(Page $grandparent, Page $parent, Page $page)
         return $this->index($page);
     }
 
-    protected function getSEOTitlePostfix()
+    protected function getSEOTitlePostfix(Page $page): string
     {
+        if($page->isHomePage()) {
+            return '';
+        }
+
         return sprintf(' | %s', flexiblePagesSetting(Settings::SETTING_SITE_TITLE));
     }
 
@@ -126,7 +126,8 @@ protected function getLocalisedUrls(): array
 
     protected function setBasicSEO(Page $page)
     {
-        SEOTools::setTitle(($page->seo_title ?? $page->title ?? $this->getSettingsTitle()).$this->getSEOTitlePostfix());
+        $title = $page->seo_title ?? $page->title ?? $this->getSettingsTitle();
+        SEOTools::setTitle($title . $this->getSEOTitlePostfix($page), false);
         SEOTools::setDescription(($page->seo_description ?? strip_tags($page->intro)));
         SEOTools::opengraph()->setUrl(url()->current());
     }
@@ -177,12 +178,12 @@ protected function getSEOImageDimensions(Media $seoMedia, string $conversion)
         return Cache::remember($cacheKey,
             self::CACHE_SEO_IMAGE_TTL,
             function () use ($seoMedia, $conversion) {
-                $conversionCollection = ConversionCollection::createForMedia($seoMedia);
-                $conversion = $conversionCollection->getByName($conversion);
+                $filePath = $seoMedia->getPath($conversion);
+                $image = Image::load($filePath);
 
                 return [
-                    'width' => $conversion->getWidth(),
-                    'height' => $conversion->getHeight(),
+                    'width' => $image->getWidth(),
+                    'height' => $image->getHeight(),
                 ];
             });
     }

src/Models/Page.php

@@ -67,4 +67,9 @@ public static function getUrl(string $code, ?string $locale = null): ?string
             ->first()
             ?->getViewUrl($locale);
     }
+
+    public function isHomePage(): bool
+    {
+        return $this->code === static::HOME_PAGE;
+    }
 }

src/Routes/LocalisedPageRouteHelper.php

@@ -23,7 +23,7 @@ public function defineRoutes(): void
 
     public function getUrl(Page $page, ?string $locale = null): string
     {
-        if ($page->code === Page::HOME_PAGE) {
+        if ($page->isHomePage()) {
             return LaravelLocalization::getLocalizedUrl($locale, static::ROUTE_HOME);
         }
 

src/Routes/PageRouteHelper.php

@@ -11,7 +11,7 @@ class PageRouteHelper extends AbstractPageRouteHelper
 {
     public function getUrl(Page $page, ?string $locale = null): string
     {
-        if ($page->code === Page::HOME_PAGE) {
+        if ($page->isHomePage()) {
             return route(static::ROUTE_HOME);
         }