Better links and pages and SEO

GrafiteInc · Aug 14, 2018 · efd285b · efd285b
1 parent a389858
commit efd285b
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/src/Models/Link.php b/src/Models/Link.php
@@ -3,6 +3,7 @@
 namespace Grafite\Cms\Models;
 
 use Grafite\Cms\Models\CmsModel;
+use Grafite\Cms\Models\Page;
 use Grafite\Cms\Traits\Translatable;
 
 class Link extends CmsModel
@@ -27,10 +28,19 @@ class Link extends CmsModel
         'external_url',
     ];
 
+    public $with = [
+        'page'
+    ];
+
     public function __construct(array $attributes = [])
     {
         $keys = array_keys(request()->except('_method', '_token'));
         $this->fillable(array_values(array_unique(array_merge($this->fillable, $keys))));
         parent::__construct($attributes);
     }
+
+    public function page()
+    {
+        return $this->belongsTo(Page::class);
+    }
 }
diff --git a/src/PublishedAssets/Theme/resources/themes/themeTemplate/layout/master.blade.php b/src/PublishedAssets/Theme/resources/themes/themeTemplate/layout/master.blade.php
@@ -1,6 +1,6 @@
 <!doctype html>
 
-<html lang="en">
+<html lang="{{ app()->getLocale() }}">
     <head>
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -12,6 +12,11 @@
         <meta name="keywords" content="@yield('seoKeywords')">
         <meta name="author" content="">
 
+        <meta property="og:title" content="@if (isset($page) && !is_null($page->title)) - {{ $page->title }} @endif">
+        <meta property="og:description" content="@yield('seoDescription')">
+        <meta property="og:image" content="">
+        <meta property="og:url" content="">
+
         <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
         <link rel="stylesheet" type="text/css" href="{{ asset('css/app.css') }}">
 

diff --git a/src/PublishedAssets/Theme/resources/themes/themeTemplate/partials/main-menu.blade.php b/src/PublishedAssets/Theme/resources/themes/themeTemplate/partials/main-menu.blade.php
@@ -2,6 +2,6 @@
     @if ($link->external)
         <li class="nav-item"><a class="nav-link" href="{{ url($link->external_url) }}">{{ $link->name }}</a></li>
     @else
-        <li class="nav-item"><a class="nav-link" href="{{ url('p/'.\Grafite\Cms\Models\Page::find($link->page_id)->url) }}">{{ $link->name }}</a></li>
+        <li class="nav-item"><a class="nav-link" href="{{ url('p/'.$link->page->url) }}">{{ $link->name }}</a></li>
     @endif
 @endforeach
diff --git a/src/PublishedAssets/Views/themes/default/partials/main-menu.blade.php b/src/PublishedAssets/Views/themes/default/partials/main-menu.blade.php
@@ -2,6 +2,6 @@
     @if ($link->external)
         <li class="nav-item"><a class="nav-link" href="{{ url($link->external_url) }}">{{ $link->name }}</a></li>
     @else
-        <li class="nav-item"><a class="nav-link" href="{{ url('p/'.\Grafite\Cms\Models\Page::find($link->page_id)->url) }}">{{ $link->name }}</a></li>
+        <li class="nav-item"><a class="nav-link" href="{{ url('p/'.$link->page->url) }}">{{ $link->name }}</a></li>
     @endif
 @endforeach