Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/App/templates/app/index.html.twig
Original file line number Diff line number Diff line change
@@ -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 %}
Expand Down
1 change: 0 additions & 1 deletion src/App/templates/error/404.html.twig
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{% extends '@layout/default.html.twig' %}

{% block title %}404 Not Found{% endblock %}
{% block canonical %}{% endblock %}

{% block content %}
Expand Down
1 change: 0 additions & 1 deletion src/App/templates/error/410.html.twig
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{% extends '@layout/default.html.twig' %}

{% block title %}410 Gone{% endblock %}
{% block canonical %}{% endblock %}

{% block content %}
Expand Down
1 change: 0 additions & 1 deletion src/App/templates/error/error.html.twig
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{% extends '@layout/default.html.twig' %}

{% block title %}{{ status }} {{ reason }}{% endblock %}
{% block canonical %}{% endblock %}

{% block content %}
Expand Down
10 changes: 7 additions & 3 deletions src/App/templates/layout/blog-post.html.twig
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
{% extends '@layout/default.html.twig' %}

{% set canonicalUrl = app.url ~ path('page::blog-resource', {categorySlug: article.category.slug, slug: article.slug}) %}
{% set ogType = 'article' %}

{% block canonical %}<link rel="canonical" href="{{ canonicalUrl }}" />
{% endblock %}

{% block json_ld %}
<script type="application/ld+json">
{
Expand All @@ -14,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",
Expand Down Expand Up @@ -54,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 %}
Expand Down
3 changes: 3 additions & 0 deletions src/App/templates/layout/default.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}">
Expand Down
18 changes: 10 additions & 8 deletions src/App/templates/partial/meta.html.twig
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
{% 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" />
<meta name="msapplication-TileColor" content="#2d89ef">
<meta name="theme-color" content="#ffffff">
<title>{{ meta.title ?? meta.name ?? app.meta.title }}</title>
<meta name="description" content="{{ (meta.description ?? meta.excerpt ?? app.meta.description) }}"/>
<meta name="description" content="{{ ogDescription }}"/>
<meta property="og:title" content="{{ meta.title ?? meta.name ?? app.meta.title }}"/>
<meta property="og:description" content="{{ (meta.description ?? meta.excerpt ?? app.meta.description) }}"/>
<meta property="og:image" content="{{ ogImage ? (app.url ~ ogImage) : app.meta.image }}"/>
<meta property="og:type" content="{{ meta.type ?? app.meta.type }}"/>
<meta property="og:description" content="{{ ogDescription }}"/>
<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 }}"/>
<meta property="og:url" content="{{ meta.url ?? (routeName is defined and routeName ? url(routeName) : app.url) }}"/>
<meta property="og:url" content="{{ meta.url ?? (canonicalUrl ?? (routeName is defined and routeName ? url(routeName) : app.url)) }}"/>
<meta property="og:locale" content="{{ app.meta.locale }}"/>
<meta name="twitter:card" content="{{ app.meta.twitterCard }}"/>
<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="{{ (meta.description ?? meta.excerpt ?? app.meta.description) }}"/>
<meta name="twitter:image" content="{{ ogImage ? (app.url ~ ogImage) : app.meta.image }}"/>
<meta name="twitter:description" content="{{ ogDescription }}"/>
<meta name="twitter:image" content="{{ ogImageUrl }}"/>
<meta name="twitter:image:alt" content="{{ ogDescription }}"/>
3 changes: 0 additions & 3 deletions src/Blog/src/Handler/GetCategoryResourceHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -49,7 +47,6 @@ public function handle(ServerRequestInterface $request): ResponseInterface
[
'categories' => $categories,
'category' => $category,
'meta' => $meta,
'data' => $data,
]
);
Expand Down
3 changes: 0 additions & 3 deletions src/Blog/src/Handler/GetPostResourceHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand All @@ -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'],
Expand All @@ -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'],
Expand Down
3 changes: 0 additions & 3 deletions src/Blog/src/Handler/GetTagResourceHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -48,7 +46,6 @@ public function handle(ServerRequestInterface $request): ResponseInterface
[
'categories' => $categories,
'tag' => $tag,
'meta' => $meta,
'data' => $data,
]
);
Expand Down
2 changes: 0 additions & 2 deletions src/Blog/templates/page/author-resource.html.twig
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{% extends '@layout/default.html.twig' %}
{% block json_ld %} {{ include('@jsonld/author-resource.jsonld.twig') }} {% endblock %}

{% block title %}{{ author.name }}{% endblock %}

{% block page_title %}
{{ include('@partial/title-section.html.twig', {
back_href: url('page::blog'),
Expand Down
2 changes: 0 additions & 2 deletions src/Blog/templates/page/authors.html.twig
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{% extends '@layout/default.html.twig' %}
{% block json_ld %} {{ include('@jsonld/authors.jsonld.twig') }} {% endblock %}

{% block title %}Authors{% endblock %}

{% block page_title %}
{{ include('@partial/title-section.html.twig', {
badge: 'Explore',
Expand Down
2 changes: 0 additions & 2 deletions src/Blog/templates/page/blog.html.twig
Original file line number Diff line number Diff line change
@@ -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',
Expand Down
2 changes: 0 additions & 2 deletions src/Blog/templates/page/categories.html.twig
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{% extends '@layout/default.html.twig' %}
{% block json_ld %} {{ include('@jsonld/categories.jsonld.twig') }} {% endblock %}

{% block title %}Categories{% endblock %}

{% block page_title %}
{{ include('@partial/title-section.html.twig', {
badge: 'Explore',
Expand Down
2 changes: 0 additions & 2 deletions src/Blog/templates/page/category-resource.html.twig
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{% extends '@layout/default.html.twig' %}
{% block json_ld %} {{ include('@jsonld/category-resource.jsonld.twig') }} {% endblock %}

{% block title %}{{ category.name }}{% endblock %}

{% block page_title %}
{{ include('@partial/title-section.html.twig', {
back_href: url('page::categories'),
Expand Down
2 changes: 0 additions & 2 deletions src/Blog/templates/page/contact.html.twig
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{% extends '@layout/default.html.twig' %}
{% block json_ld %} {{ include('@jsonld/contact.jsonld.twig') }} {% endblock %}

{% block title %}Contact{% endblock %}

{% block stylesheets %}<link href="{{ asset('css/contact.css') }}" rel="stylesheet" />{% endblock %}

{% set support_links = [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{% extends '@layout/default.html.twig' %}
{% block json_ld %} {{ include('@jsonld/dotkernel-packages-oss-lifecycle.jsonld.twig') }} {% endblock %}

{% block title %}Dotkernel Packages OSS Lifecycle{% endblock %}

{% block page_title %}
{{ include('@partial/title-section.html.twig', {
badge: 'Open Source',
Expand Down
2 changes: 0 additions & 2 deletions src/Blog/templates/page/tag-resource.html.twig
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{% extends '@layout/default.html.twig' %}
{% block json_ld %} {{ include('@jsonld/tag-resource.jsonld.twig') }} {% endblock %}

{% block title %}{{ tag.name }}{% endblock %}

{% block page_title %}
{{ include('@partial/title-section.html.twig', {
back_href: url('page::blog'),
Expand Down
2 changes: 0 additions & 2 deletions src/Page/templates/page/about.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
openGraphImage: '/opengraph/pages/twitter-card-about-dk.com.png',
} %}

{% block title %}About Us{% endblock %}

{% block head_links %}<link rel="alternate" type="text/markdown" href="/about.md">{% endblock %}

{% block stylesheets %}
Expand Down
2 changes: 0 additions & 2 deletions src/Page/templates/page/admin.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
openGraphImage: '/opengraph/pages/twitter-card-admin.png',
} %}

{% block title %}Dotkernel Admin{% endblock %}

{% block head_links %}<link rel="alternate" type="text/markdown" href="/admin.md">{% endblock %}

{% block stylesheets %}
Expand Down
2 changes: 0 additions & 2 deletions src/Page/templates/page/api.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
openGraphImage: '/opengraph/pages/twitter-card-api.png',
} %}

{% block title %}Dotkernel API{% endblock %}

{% block head_links %}<link rel="alternate" type="text/markdown" href="/api.md">{% endblock %}

{% block stylesheets %}
Expand Down
2 changes: 0 additions & 2 deletions src/Page/templates/page/architecture.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
openGraphImage: '/opengraph/pages/twitter-card-architecture.png',
} %}

{% block title %}Architecture{% endblock %}

{% block head_links %}<link rel="alternate" type="text/markdown" href="/architecture.md">{% endblock %}

{% block stylesheets %}
Expand Down
2 changes: 0 additions & 2 deletions src/Page/templates/page/dotboost.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
openGraphImage: '/opengraph/pages/twitter-card-dotboost.png',
} %}

{% block title %}dotboost{% endblock %}

{% block head_links %}<link rel="alternate" type="text/markdown" href="/dotboost.md">{% endblock %}

{% block stylesheets %}
Expand Down
2 changes: 0 additions & 2 deletions src/Page/templates/page/frontend.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
openGraphImage: '/opengraph/pages/twitter-card-frontend.png',
} %}

{% block title %}Dotkernel Frontend{% endblock %}

{% block head_links %}<link rel="alternate" type="text/markdown" href="/frontend.md">{% endblock %}

{% block stylesheets %}
Expand Down
2 changes: 0 additions & 2 deletions src/Page/templates/page/light.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
openGraphImage: '/opengraph/pages/twitter-card-light.png',
} %}

{% block title %}Dotkernel Light{% endblock %}

{% block head_links %}<link rel="alternate" type="text/markdown" href="/light.md">{% endblock %}

{% block stylesheets %}
Expand Down
2 changes: 0 additions & 2 deletions src/Page/templates/page/queue.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
openGraphImage: '/opengraph/pages/twitter-card-queue.png',
} %}

{% block title %}Dotkernel Queue{% endblock %}

{% block head_links %}<link rel="alternate" type="text/markdown" href="/queue.md">{% endblock %}

{% block stylesheets %}
Expand Down
2 changes: 0 additions & 2 deletions src/Page/templates/page/wsl2.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
openGraphImage: '/opengraph/pages/twitter-card-wsl2.png',
} %}

{% block title %}Development Environment{% endblock %}

{% block head_links %}<link rel="alternate" type="text/markdown" href="/wsl2.md">{% endblock %}

{% block stylesheets %}
Expand Down
Loading