Fix #382: Unify the $page property

Author: caendesilva

resources/views/components/post/article.blade.php

@@ -1,19 +1,19 @@
-<article aria-label="Article" id="{{ Hyde::uriPath() ?? '' }}posts/{{ $post->slug }}" itemscope itemtype="https://schema.org/Article"
+<article aria-label="Article" id="{{ Hyde::uriPath() ?? '' }}posts/{{ $page->slug }}" itemscope itemtype="https://schema.org/Article"
     @class(['post-article mx-auto prose dark:prose-invert', 'torchlight-enabled' => Hyde\Framework\Features::hasTorchlight()])>
-    <meta itemprop="identifier" content="{{ $post->slug }}">
+    <meta itemprop="identifier" content="{{ $page->slug }}">
     @if(Hyde::uriPath())
-    <meta itemprop="url" content="{{ Hyde::uriPath('posts/' . $post->slug) }}">
+    <meta itemprop="url" content="{{ Hyde::uriPath('posts/' . $page->slug) }}">
     @endif
 
     <header aria-label="Header section" role="doc-pageheader">
         <h1 itemprop="headline" class="mb-4">{{ $title ?? 'Blog Post' }}</h1>
 		<div id="byline" aria-label="About the post" role="doc-introduction">
-            @includeWhen(isset($post->date), 'hyde::components.post.date')
-		    @includeWhen(isset($post->author), 'hyde::components.post.author')
-            @includeWhen(isset($post->category), 'hyde::components.post.category')
+            @includeWhen(isset($page->date), 'hyde::components.post.date')
+		    @includeWhen(isset($page->author), 'hyde::components.post.author')
+            @includeWhen(isset($page->category), 'hyde::components.post.category')
         </div>
     </header>
-    @includeWhen(isset($post->image), 'hyde::components.post.image')
+    @includeWhen(isset($page->image), 'hyde::components.post.image')
     <div aria-label="Article body" itemprop="articleBody">
         {!! $markdown !!}
     </div>

resources/views/components/post/author.blade.php

@@ -1,10 +1,10 @@
 by author
 <address itemprop="author" itemscope itemtype="https://schema.org/Person" aria-label="The post author" style="display: inline;"> 
-	@if($post->author->website)
-	<a href="{{ $post->author->website }}" rel="author" itemprop="url" aria-label="The author's website">
+	@if($page->author->website)
+	<a href="{{ $page->author->website }}" rel="author" itemprop="url" aria-label="The author's website">
 	@endif
-	<span itemprop="name" aria-label="The author's name" {{ ($post->author->username &&  ($post->author->username !== $post->author->name)) ? 'title=@'. urlencode($post->author->username) .'' : '' }}>{{ $post->author->name ?? $post->author->username }}</span> 
-	@if($post->author->website)
+	<span itemprop="name" aria-label="The author's name" {{ ($page->author->username &&  ($page->author->username !== $page->author->name)) ? 'title=@'. urlencode($page->author->username) .'' : '' }}>{{ $page->author->name ?? $page->author->username }}</span> 
+	@if($page->author->website)
 	</a>
 	@endif
 </address> 

resources/views/components/post/category.blade.php

@@ -1 +1 @@
-in the category "{{ $post->category }}"
+in the category "{{ $page->category }}"

resources/views/components/post/date.blade.php

@@ -1 +1 @@
-Posted <time itemprop="dateCreated datePublished" datetime="{{ $post->date->datetime }}" title="{{ $post->date->sentence }}">{{ $post->date->short }}</time>
+Posted <time itemprop="dateCreated datePublished" datetime="{{ $page->date->datetime }}" title="{{ $page->date->sentence }}">{{ $page->date->short }}</time>

resources/views/components/post/description.blade.php

@@ -1,3 +1,3 @@
 <p itemprop="abstract">
-	{{ $post->matter['description'] }}
+	{{ $page->matter['description'] }}
 </p>

resources/views/components/post/image.blade.php

@@ -1,9 +1,9 @@
 <figure aria-label="Cover image" role="doc-cover" itemprop="image" itemscope itemtype="https://schema.org/ImageObject"> 
-    <img src="{{ $post->image->getSource() }}" alt="{{ $post->image->description ?? '' }}" title="{{ $post->image->title ?? '' }}" itemprop="image" class="mb-0"> 
+    <img src="{{ $page->image->getSource() }}" alt="{{ $page->image->description ?? '' }}" title="{{ $page->image->title ?? '' }}" itemprop="image" class="mb-0"> 
     <figcaption aria-label="Image caption" itemprop="caption"> 
-        {!! $post->image->getFluentAttribution() !!} 
+        {!! $page->image->getFluentAttribution() !!} 
     </figcaption> 
-    @foreach ($post->image->getMetadataArray() as $name => $value) 
+    @foreach ($page->image->getMetadataArray() as $name => $value) 
 	<meta itemprop="{{ $name }}" content="{{ $value }}"> 
     @endforeach 
 </figure> 

resources/views/layouts/post.blade.php

@@ -4,10 +4,10 @@
 
 @push('meta')
 <!-- Blog Post Meta Tags -->
-@foreach ($post->getMetadata() as $name => $content)
+@foreach ($page->getMetadata() as $name => $content)
     <meta name="{{ $name }}" content="{{ $content }}">
 @endforeach
-@foreach ($post->getMetaProperties() as $name => $content)
+@foreach ($page->getMetaProperties() as $name => $content)
     <meta property="{{ $name }}" content="{{ $content }}">
 @endforeach
 @endpush

src/StaticPageBuilder.php

@@ -86,6 +86,7 @@ private function save(string $location, string $contents): bool|int
     private function compileView(): string
     {
         return view($this->page->view, [
+            'page' => $this->page,
             'currentPage' => $this->page->view,
         ])->render();
     }
@@ -98,7 +99,7 @@ private function compileView(): string
     private function compilePost(): string
     {
         return view('hyde::layouts/post')->with([
-            'post' => $this->page,
+            'page' => $this->page,
             'title' => $this->page->title,
             'markdown' => MarkdownConverter::parse($this->page->body),
             'currentPage' => 'posts/'.$this->page->slug,
@@ -113,6 +114,7 @@ private function compilePost(): string
     private function compilePage(): string
     {
         return view('hyde::layouts/page')->with([
+            'page' => $this->page,
             'title' => $this->page->title,
             'markdown' => MarkdownConverter::parse($this->page->body),
             'currentPage' => $this->page->slug,
@@ -127,7 +129,7 @@ private function compilePage(): string
     private function compileDocs(): string
     {
         return view('hyde::layouts/docs')->with([
-            'docs' => $this->page,
+            'page' => $this->page,
             'title' => $this->page->title,
             'markdown' => MarkdownConverter::parse($this->page->body, DocumentationPage::class),
             'currentPage' => Hyde::docsDirectory().'/'.$this->page->slug,