diff options
author | navanchauhan <navanchauhan@gmail.com> | 2022-05-22 12:20:59 -0600 |
---|---|---|
committer | navanchauhan <navanchauhan@gmail.com> | 2022-05-22 12:20:59 -0600 |
commit | 8b56f067823153f21fafac102bfa05ac41110983 (patch) | |
tree | 380534dda0e3d17c51dbe7a0643fffb418d4e5b1 /templates | |
parent | 2e510fedcfb58d99b7bf63cb908ea5107dd96433 (diff) | |
parent | 27dc62cf3bd9686f30d66071701b3d2558874090 (diff) |
fixing conflicts
Diffstat (limited to 'templates')
-rw-r--r-- | templates/base.html | 26 | ||||
-rw-r--r-- | templates/head_tag.html | 5 | ||||
-rw-r--r-- | templates/index.html | 2 | ||||
-rw-r--r-- | templates/post.html | 15 |
4 files changed, 32 insertions, 16 deletions
diff --git a/templates/base.html b/templates/base.html index 2a48404..caca658 100644 --- a/templates/base.html +++ b/templates/base.html @@ -8,23 +8,25 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0"> <title>Hey - {% block title %}{% endblock %}</title> <meta name="og:site_name" content="Navan Chauhan" /> - <link rel="canonical" href="https://navanchauhan.github.io/" /> - <meta name="twitter:url" content="https://navanchauhan.github.io/" /> - <meta name="og:url" content="https://navanchauhan.github.io/" /> - <meta name="twitter:title" content="Hey" /> - <meta name="og:title" content="Hey" /> - <meta name="description" content="Welcome to my personal fragment of the internet." /> - <meta name="twitter:description" content="Welcome to my personal fragment of the internet. Majority of the posts should be complete." /> - <meta name="og:description" content="Welcome to my personal fragment of the internet." /> - <meta name="twitter:card" content="summary" /> + <link rel="canonical" href="https://web.navan.dev/" /> + <meta name="twitter:url" content="https://web.navan.dev/" /> + <meta name="og:url" content="https://web.navan.dev/" /> + <meta name="twitter:title" content="Hey - {% block twittertitle %}{% endblock %}" /> + <meta name="og:title" content="Hey - {% block ogtitle %}{% endblock %}" /> + <meta name="description" content="{% block description %}{% endblock %}" /> + <meta name="twitter:description" content="{% block twitterdescription %}{% endblock %}" /> + <meta name="og:description" content="{% block ogdescription %}{% endblock %}" /> + <meta name="twitter:card" content="{% block twitter2description %}{% endblock %}" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> <link rel="shortcut icon" href="/images/favicon.png" type="image/png" /> <link rel="alternate" href="/feed.rss" type="application/rss+xml" title="Subscribe to Navan Chauhan" /> - <meta name="twitter:image" content="https://navanchauhan.github.io/images/logo.png" /> - <meta name="og:image" content="https://navanchauhan.github.io/images/logo.png" /> + <meta name="twitter:image" content="https://web.navan.dev/images/logo.png" /> + <meta name="og:image" content="https://web.navan.dev/images/logo.png" /> <link rel="manifest" href="manifest.json" /> <meta name="google-site-verification" content="LVeSZxz-QskhbEjHxOi7-BM5dDxTg53x2TwrjFxfL0k" /> <script async src="//gc.zgo.at/count.js" data-goatcounter="https://navanchauhan.goatcounter.com/count"></script> + <script defer data-domain="web.navan.dev" src="https://plausible.io/js/plausible.js"></script> + <script defer data-domain="web.navan.dev" src="https://plausible.navan.dev/js/plausible.js"></script> {% endblock %} </head> <body> @@ -34,4 +36,4 @@ <script src="assets/manup.min.js"></script> <script src="/pwabuilder-sw-register.js"></script> </body> -</html>
\ No newline at end of file +</html> diff --git a/templates/head_tag.html b/templates/head_tag.html index 586cbf8..778bf81 100644 --- a/templates/head_tag.html +++ b/templates/head_tag.html @@ -16,4 +16,7 @@ <meta name="og:image" content="https://navanchauhan.github.io/images/logo.png" /> <link rel="manifest" href="manifest.json" /> <meta name="google-site-verification" content="LVeSZxz-QskhbEjHxOi7-BM5dDxTg53x2TwrjFxfL0k" /> - <script async src="//gc.zgo.at/count.js" data-goatcounter="https://navanchauhan.goatcounter.com/count"></script>
\ No newline at end of file + <script async src="//gc.zgo.at/count.js" data-goatcounter="https://navanchauhan.goatcounter.com/count"></script> + <script defer data-domain="web.navan.dev" src="https://plausible.io/js/plausible.js"></script> + <script defer data-domain="web.navan.dev" src="https://plausible.navan.dev/js/plausible.js"></script> + diff --git a/templates/index.html b/templates/index.html index cc66cd3..a651ea2 100644 --- a/templates/index.html +++ b/templates/index.html @@ -14,7 +14,7 @@ <li>Published On: {{post.date}}</li> <li>Tags: {% for tag in post.tags %} - {{ tag }}, + {{ tag }}{{ ", " if not loop.last else "" }} {% endfor %} </ul> diff --git a/templates/post.html b/templates/post.html index 596ded2..7ee3975 100644 --- a/templates/post.html +++ b/templates/post.html @@ -1,8 +1,19 @@ {% extends "base.html" %} -{% block title %}Post{% endblock %} + +{% block title %}Post - {{content.metadata.title}}{% endblock %} +{% block ogtitle %}Post - {{content.metadata.title}}{% endblock %} +{% block twittertitle %}Post - {{content.metadata.title}}{% endblock %} + +{% block description %} {{content.metadata.description}} {% endblock %} +{% block ogdescription %} {{content.metadata.description}} {% endblock %} +{% block twitterdescription %} {{content.metadata.description}} {% endblock %} +{% block twitter2description %} {{content.metadata.description}} {% endblock %} {% block body %} <main> {{ content}} + <div class="commentbox"></div> + <script src="https://unpkg.com/commentbox.io/dist/commentBox.min.js"></script> + <script>commentBox('5650347917836288-proj')</script> </main> -{% endblock %}
\ No newline at end of file +{% endblock %} |