Code cleanup, bug squashing

diff --git a/app/Entities/Models/Page.php b/app/Entities/Models/Page.php
index c244219ea87dec147c9dc37f0838c6cda8ff0c6e..89ed26ea87768bab4dc661daa0f215831724ca6d 100644 (file)
--- a/app/Entities/Models/Page.php
+++ b/app/Entities/Models/Page.php
@@ -130,9 +130,10 @@ class Page extends BookChild
     /**
      * Returns URL to a cover image for the page.
      */
     /**
      * Returns URL to a cover image for the page.
      */

-    public function getCoverImage(): string
+    public function getCoverImage()

     {
     {

-        $default = $this->book->getBookCover();
+        //$default = $this->book->getBookCover();
+        $default = url('/logo.png');

 
         $firstImage = (new PageContent($this))->fetchFirstImage();
 
 
         $firstImage = (new PageContent($this))->fetchFirstImage();
 

diff --git a/app/Entities/Tools/PageContent.php b/app/Entities/Tools/PageContent.php
index 51562e71f01b38cc8935b9a7e6f32c36138155e4..84506f6718aedc7bbb7e48aead482e47df78beef 100644 (file)
--- a/app/Entities/Tools/PageContent.php
+++ b/app/Entities/Tools/PageContent.php
@@ -362,7 +362,7 @@ class PageContent
     /**
      * Retrieve first image in page content and return the source URL.
      */
     /**
      * Retrieve first image in page content and return the source URL.
      */

-    public function fetchFirstImage(): string
+    public function fetchFirstImage()

     {
         $htmlContent = $this->page->html;
 
     {
         $htmlContent = $this->page->html;
 


@@ -370,6 +370,6 @@ class PageContent
         $dom->loadHTML($htmlContent);
         $images = $dom->getElementsByTagName('img');
 
         $dom->loadHTML($htmlContent);
         $images = $dom->getElementsByTagName('img');
 

-        return $images ? $images[0]->getAttribute('src') : null;
+        return $images->length > 0 ? $images[0]->getAttribute('src') : null;

     }
 }
     }
 }

diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php
index 0810feeb10f6d77a2b9e4c95758416ddc5710584..35f0d122931ff7cd04f1685de6368814c3f786ab 100644 (file)
--- a/resources/views/pages/show.blade.php
+++ b/resources/views/pages/show.blade.php
@@ -3,9 +3,6 @@
 @push('social-meta')
     <meta property="og:description" content="{{ Str::limit($page->text, 100, '...') }}">
     <meta property="og:image" content="{{ $page->getCoverImage() }}">
 @push('social-meta')
     <meta property="og:description" content="{{ Str::limit($page->text, 100, '...') }}">
     <meta property="og:image" content="{{ $page->getCoverImage() }}">

-
-
-    $pageContent->getNavigation($page->html);

 @endpush
 
 @section('body')
 @endpush
 
 @section('body')