From 9bba1d2c706d03120930c961c1b4a76535877d54 Mon Sep 17 00:00:00 2001
From: Digital Studium <digitalstudium001@gmail.com>
Date: Sun, 23 Jul 2023 15:53:48 +0300
Subject: [PATCH] Fix social and schema

---
 static/js/copy.js              |  2 +-
 templates/base.j2              |  1 +
 templates/components/head.j2   |  6 ++++--
 templates/components/schema.j2 | 13 ++++++-------
 templates/components/script.j2 |  2 +-
 templates/components/social.j2 | 30 +++++++++++++++---------------
 6 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/static/js/copy.js b/static/js/copy.js
index 8708aa2..26b32f7 100644
--- a/static/js/copy.js
+++ b/static/js/copy.js
@@ -39,7 +39,7 @@ function addCopyButtons(clipboard) {
         // wrapper.appendChild(preElement);
 
         var preParent = preElement.parentNode;
-        if (preParent.classList.contains('highlight') && preElement.children[0].dataset.lang != 'plaintext') {
+        if (preParent.classList.contains('codehilite') && preElement.children[0].dataset.lang != 'plaintext') {
             preParent.parentNode.insertBefore(button, preParent);
         }
     });
diff --git a/templates/base.j2 b/templates/base.j2
index c85e499..2dda296 100644
--- a/templates/base.j2
+++ b/templates/base.j2
@@ -22,6 +22,7 @@
         {% include "components/single.j2" %}
         {% endif %}
     </main>
+    {% include "components/social.j2" %}
     {% include "components/sidebar.j2" %}
     {% include "components/footer.j2" %}
     {% include "components/script.j2" %}
diff --git a/templates/components/head.j2 b/templates/components/head.j2
index 9f1eee9..d35a281 100644
--- a/templates/components/head.j2
+++ b/templates/components/head.j2
@@ -5,5 +5,7 @@
     <meta name="title" content="{{ title }}" />
     <meta name="description" content="{{ description }}" />
     <link href="/css/style.css" rel="stylesheet">
-    {% if config.custom_css %}<link href="/css/{{ config.custom_css }}" rel="stylesheet">{% endif %}
-</head>
+    {% if config.custom_css %}
+    <link href="/css/{{ config.custom_css }}" rel="stylesheet">
+    {% endif %}
+</head>
\ No newline at end of file
diff --git a/templates/components/schema.j2 b/templates/components/schema.j2
index ddb39c5..52bbcde 100644
--- a/templates/components/schema.j2
+++ b/templates/components/schema.j2
@@ -4,9 +4,9 @@
     "@context": "http://schema.org",
     "@type": "WebSite",
     "name": "{{ title }}",
-    "url": "{{ url }}",
+    "url": "{{ config.base_url }}",
     "description": "{{ description }}",
-    "thumbnailUrl": "{{ logo_url }}",
+    "thumbnailUrl": "{{ config.base_url + "/logo.svg" }}",
 }
 </script>
 {% else %}
@@ -24,22 +24,21 @@
   "name": {{ title }},  
   "headline": {{ title }},
   "inLanguage": {{ language }},
-  "wordCount": {{ wordcount }}, 
-  "description": {{ description }},
+  "description": {{ description | striptags }},
   "datePublished": {{ date_published }},
   "dateModified": {{ date_modified }},
   "author": {
     "@type": "Person",
     "name": {{ config.languages[language].author }},    
-    "url": {{ config.baseURL + "/" + language + "/about-author" }}  
+    "url": {{ config.base_url + "/" + language + "/about-author" }}  
   },
   "publisher": {
     "@type": "Organization",
     "name": "{{ config.languages[language].title }}",
-    "url": {{ config.baseUrl }},
+    "url": {{ config.base_url }},
     "logo": {
       "@type": "ImageObject",
-      "url": {{ logo_url }}
+      "url": {{ config.base_url + "/logo.svg" }}
     }
   }
 }
diff --git a/templates/components/script.j2 b/templates/components/script.j2
index 2d4d120..58dfa5b 100644
--- a/templates/components/script.j2
+++ b/templates/components/script.j2
@@ -1,3 +1,3 @@
-{% for include in includes %}
+{% for include in config['includes'] %}
 <script defer src="/js/{{ include }}"></script>
 {% endfor %}
\ No newline at end of file
diff --git a/templates/components/social.j2 b/templates/components/social.j2
index 6384b35..dd29f7e 100644
--- a/templates/components/social.j2
+++ b/templates/components/social.j2
@@ -1,20 +1,20 @@
 <div class="social-icons">
-    {{ if .Site.Params.youtube }}
-    <a href="https://youtube.com/{{ .Site.Params.Youtube }}">
-        <img src="data:image/svg+xml;base64,{{ readFile "/static/images/youtube.svg" | base64Encode }}"
-            alt="{{ .Site.Title }}" width="100" />
+    {% if config.languages[language].youtube  %}
+    <a href="https://youtube.com/{{ config.languages[language].youtube }}">
+        <img src="/images/youtube.svg"
+            alt="{{ config.languages[language].title }}" width="100" />
     </a>
-    {{ end }}
-    {{ if .Site.Params.github }}
-    <a href="https://github.com/{{ .Site.Params.Github }}">
-        <img src="data:image/svg+xml;base64,{{ readFile "/static/images/github.svg" | base64Encode }}"
-            alt="{{ .Site.Title }}" width="100" />
+    {% endif %}
+    {% if config.languages[language].github  %}
+    <a href="https://github.com/{{ config.languages[language].github }}">
+        <img src="/images/github.svg"
+            alt="{{ config.languages[language].title }}" width="100" />
     </a>
-    {{ end }}
-    {{ if .Site.Params.telegram }}
-    <a href="https://t.me/{{ .Site.Params.Telegram }}">
-        <img src="data:image/svg+xml;base64,{{ readFile "/static/images/telegram.svg" | base64Encode }}"
-            alt="{{ .Site.Title }}" width="100" />
+    {% endif %}
+    {% if config.languages[language].telegram  %}
+    <a href="https://t.me/{{ config.languages[language].telegram }}">
+        <img src="/images/telegram.svg"
+            alt="{{ config.languages[language].title }}" width="100" />
     </a>
-    {{ end }}
+    {% endif %}
 </div>
\ No newline at end of file