updates

Author: OStefan2001

src/App/templates/app/index.html.twig

@@ -1,6 +1,5 @@
 {% extends '@layout/default.html.twig' %}
 {% block json_ld %} {{ include('@jsonld/index.jsonld.twig') }} {% endblock %}
-{% block title %}A PSR-15 compliant application{% endblock %}
 {% block head_links %}<link rel="alternate" type="text/markdown" href="/index.md">{% endblock %}
 
 {% block content %}

src/App/templates/error/404.html.twig

@@ -1,6 +1,5 @@
 {% extends '@layout/default.html.twig' %}
 
-{% block title %}404 Not Found{% endblock %}
 {% block canonical %}{% endblock %}
 
 {% block content %}

src/App/templates/error/410.html.twig

@@ -1,6 +1,5 @@
 {% extends '@layout/default.html.twig' %}
 
-{% block title %}410 Gone{% endblock %}
 {% block canonical %}{% endblock %}
 
 {% block content %}

src/App/templates/layout/blog-post.html.twig

@@ -20,7 +20,7 @@
                 "mainEntityOfPage": "{{ app.url ~ path('page::blog-resource', {categorySlug: article.category.slug, slug: article.slug}) }}",
                 "datePublished": "{{ article.postDate|date('c') }}",
                 "dateModified": "{{ article.postDate|date('c') }}",
-                "image": "{{ meta.openGraphImage ? app.url ~ meta.openGraphImage : app.meta.image }}",
+                "image": "{{ ogImageUrl }}",
                 "articleSection": {{ article.category.name|json_encode|raw }},
                 "author": {
                     "@type": "Person",
@@ -60,8 +60,6 @@
 </script>
 {% endblock %}
 
-{% block title %}{{ article.title }}{% endblock %}
-
 {% block head_links %}
     <link rel="alternate" type="text/markdown" href="{{ url('app::markdown-article', {categorySlug: article.category.slug, slug: article.slug}) }}">
 {% endblock %}

src/App/templates/layout/default.html.twig

@@ -8,6 +8,9 @@
             document.documentElement.setAttribute('data-theme', saved === 'dark' ? 'dark' : 'light');
         })();
     </script>
+    {% set meta = meta ?? article ?? category ?? tag ?? null %}
+    {% set ogImage = meta.openGraphImage ?? null %}
+    {% set ogImageUrl = ogImage ? (app.url ~ ogImage) : app.meta.image %}
     {{ include('@partial/meta.html.twig') }}
     {% block canonical %}<link rel="canonical" href="{{ url(routeName ?? null) }}" />
     {% endblock %}<link rel="apple-touch-icon" sizes="180x180" href="{{ asset('images/app/favicon/apple-touch-icon.png') }}">

src/App/templates/partial/meta.html.twig

@@ -1,4 +1,3 @@
-{% set ogImage = meta.openGraphImage ?? null %}
 {% set ogDescription = meta.description ?? meta.excerpt ?? app.meta.description %}
 <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
@@ -8,7 +7,7 @@
     <meta name="description"         content="{{ ogDescription }}"/>
     <meta property="og:title"        content="{{ meta.title ?? meta.name ?? app.meta.title }}"/>
     <meta property="og:description"  content="{{ ogDescription }}"/>
-    <meta property="og:image"        content="{{ ogImage ? (app.url ~ ogImage) : app.meta.image }}"/>
+    <meta property="og:image"        content="{{ ogImageUrl }}"/>
     <meta property="og:image:alt"    content="{{ ogDescription }}"/>
     <meta property="og:type"         content="{{ meta.type ?? (ogType ?? app.meta.type) }}"/>
     <meta property="og:site_name"    content="{{ app.meta.siteName }}"/>
@@ -18,5 +17,5 @@
     <meta name="twitter:site"        content="{{ app.meta.twitterSite }}"/>
     <meta name="twitter:title"       content="{{ meta.title ?? meta.name ?? app.meta.title }}"/>
     <meta name="twitter:description" content="{{ ogDescription }}"/>
-    <meta name="twitter:image"       content="{{ ogImage ? (app.url ~ ogImage) : app.meta.image }}"/>
+    <meta name="twitter:image"       content="{{ ogImageUrl }}"/>
     <meta name="twitter:image:alt"   content="{{ ogDescription }}"/>

src/Blog/src/Handler/GetCategoryResourceHandler.php

@@ -34,8 +34,6 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         if ($category->getPublishedPostsCount() === 0) {
             return $this->blogService->gone($categories);
         }
-        $meta = $category;
-
         $queryParams = $request->getQueryParams();
         $params      = Paginator::getParams($queryParams, 'articles.id');
         $data        = Paginator::wrapper(
@@ -49,7 +47,6 @@ public function handle(ServerRequestInterface $request): ResponseInterface
                 [
                     'categories' => $categories,
                     'category'   => $category,
-                    'meta'       => $meta,
                     'data'       => $data,
                 ]
             );

src/Blog/src/Handler/GetPostResourceHandler.php

@@ -60,7 +60,6 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         if ($article->getStatus() !== PostStatusEnum::Published) {
             return $this->blogService->notFound($categories);
         }
-        $meta     = $article;
         $adjacent = $this->articleRepository->getAdjacentPosts($article);
 
         if ($article->isTwig()) {
@@ -69,7 +68,6 @@ public function handle(ServerRequestInterface $request): ResponseInterface
                     "page::blog-resource/{$categorySlug}/{$slug}",
                     [
                         'article'      => $article,
-                        'meta'         => $meta,
                         'categories'   => $categories,
                         'previousPost' => $adjacent['previous'],
                         'nextPost'     => $adjacent['next'],
@@ -95,7 +93,6 @@ public function handle(ServerRequestInterface $request): ResponseInterface
                 'page::markdown-article',
                 [
                     'article'      => $article,
-                    'meta'         => $meta,
                     'categories'   => $categories,
                     'previousPost' => $adjacent['previous'],
                     'nextPost'     => $adjacent['next'],

src/Blog/src/Handler/GetTagResourceHandler.php

@@ -33,8 +33,6 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         if ($tag === null) {
             return $this->blogService->notFound($categories);
         }
-        $meta = $tag;
-
         $queryParams = $request->getQueryParams();
         $params      = Paginator::getParams($queryParams, 'articles.id');
         $data        = Paginator::wrapper(
@@ -48,7 +46,6 @@ public function handle(ServerRequestInterface $request): ResponseInterface
                 [
                     'categories' => $categories,
                     'tag'        => $tag,
-                    'meta'       => $meta,
                     'data'       => $data,
                 ]
             );

src/Blog/templates/page/blog.html.twig

@@ -1,8 +1,6 @@
 {% extends '@layout/default.html.twig' %}
 {% block json_ld %} {{ include('@jsonld/blog.jsonld.twig') }} {% endblock %}
 
-{% block title %}Posts{% endblock %}
-
 {% block page_title %}
     {{ include('@partial/title-section.html.twig', {
         badge: 'Blog',