rawfeed 0.1.3 → 0.2.0

data/_includes/image

@@ -1,3 +1,5 @@
+{%- include layout/data.liquid -%}
+
 {%- assign right_style = "float: right; margin-left: 10px;" -%}
 {%- assign left_style  = "float: left; margin-right: 10px;" -%}
 {%- assign bottom_style = "margin-bottom: 15px;" -%}
@@ -20,7 +22,9 @@
     <img
       src="{{ include.src }}"
       alt="{{ include.title | default: include.caption | escape }}"
-      style="display:block; width:100%; height: {{ include.height | default: 'auto' }}; border-radius: {{ include.border-radius | default: 0 }}px; border: 2px solid {{ include.border-color | default: '#ddd' }};" />
+      style="display:block; width:100%; height: {{ include.height | default: 'auto' }}; border-radius: {{ include.border-radius | default: 0 }}px; border: 1px solid {{ include.border-color | default: '#757575' }};"
+      class="{% if default_.rounding %}rounding-plugins{% endif %}"
+      />
     {%- if include.caption -%}
       <figcaption class="img-include-caption">{{ include.caption }}</figcaption>
     {%- endif -%}
@@ -31,7 +35,9 @@
     <img
       src="{{ include.src }}"
       alt="{{ include.title | default: include.caption | escape }}"
-      style="display:block; width:100%; height: {{ include.height | default: 'auto' }}; border-radius: {{ include.border-radius | default: 0 }}px; border: 2px solid {{ include.border-color | default: '#ddd' }};" />
+      style="display:block; width:100%; height: {{ include.height | default: 'auto' }}; border-radius: {{ include.border-radius | default: 0 }}px; border: 1px solid {{ include.border-color | default: '#ddd' }};"
+      class="{% if default_.rounding %}rounding-plugins{% endif %}"
+      />
     {%- if include.caption -%}
       <figcaption class="img-include-caption">{{ include.caption }}</figcaption>
     {%- endif -%}
@@ -42,7 +48,9 @@
     <img
       src="{{ include.src }}"
       alt="{{ include.title | default: include.caption | escape }}"
-      style="display:block; width:100%; height: {{ include.height | default: 'auto' }}; border-radius: {{ include.border-radius | default: 0 }}px; border: 2px solid {{ include.border-color | default: '#ddd' }};" />
+      style="display:block; width:100%; height: {{ include.height | default: 'auto' }}; border-radius: {{ include.border-radius | default: 0 }}px; border: 1px solid {{ include.border-color | default: '#ddd' }};"
+      class="{% if default_.rounding %}rounding-plugins{% endif %}"
+      />
     {%- if include.caption -%}
       <figcaption class="img-include-caption">{{ include.caption }}</figcaption>
     {%- endif -%}
@@ -53,7 +61,7 @@
     <img
       src="{{ include.src }}"
       alt="{{ include.title | default: include.caption | escape }}"
-      style="display:block; width:100%; height: {{ include.height | default: 'auto' }}; border-radius: {{ include.border-radius | default: 0 }}px; border: 2px solid {{ include.border-color | default: '#ddd' }};" />
+      style="display:block; width:100%; height: {{ include.height | default: 'auto' }}; border-radius: {{ include.border-radius | default: 0 }}px; border: 1px solid {{ include.border-color | default: '#ddd' }};" />
     {%- if include.caption -%}
       <figcaption class="img-include-caption">{{ include.caption }}</figcaption>
     {%- endif -%}

data/_includes/layout/blog_search.html

@@ -1,16 +1,18 @@
-{%- if site.blog.search.enable -%}
-<div class="row blog-search" aria-hidden="true">
+{%- include layout/data.liquid -%}
+
+{%- if blog_.search.enable -%}
+<div class="row blog-search" inert>
   <div class="col-sm">
     <div class="blog-search__wapper">
-      <strong>»</strong><input id="blog-search__input" type="text" class="blog-search__input" placeholder="{{ site.text.blog.search.placeholder }}" aria-label="{{ site.blog.search.placeholder }}">
+      <strong>»</strong><input id="blog-search__input" type="text" class="blog-search__input" placeholder="{{ blog_.search.placeholder }}" aria-label="{{ blog_.search.placeholder }}">
       <button id="blog-search__btn-clean" class="blog-search__btn-clean" type="button">
-        {{ site.text.blog.search.button_clean.text }}
+        {{ blog_.search.button_clean.text }}
       </button>
     </div>
   </div>
 
   <div id="blog-search__results-wrapper" class="row disabled">
-    <h2 class="blog-subtitle">[&nbsp;{{ site.text.blog.search.results | default: "results" }}&nbsp;]</h2>
+    <h2 class="blog-subtitle">[&nbsp;{{ blog_.search.results | default: "results" }}&nbsp;]</h2>
     <ul id="blog-search__results" class="row blog-list"></ul>
   </div>
 

data/_includes/layout/data.liquid

@@ -1,9 +1,27 @@
-{%- assign project_url = "https://github.com/williamcanin/rawfeed" -%}
 {%- assign theme_name = "rawfeed" -%}
-{%- assign data_cv = site.data.cv -%}
+{%- assign project_url = "https://rawfeed.github.io/rawfeed-jekyll" -%}
 {%- assign home_url = "/" | relative_url -%}
 {%- assign blog_url = "/blog/" | relative_url -%}
+{%- assign pixels_url = "/pixels/" | relative_url -%}
 {%- assign search_url = "/blog/?search=open" | relative_url -%}
 {%- assign tags_url = "/blog/tags/" | relative_url -%}
 {%- assign feed_url = "/feed.xml" | relative_url -%}
-{%- assign date_format = site.datelang.format -%}
+{%- assign head_ = site.data.options.head -%}
+{%- assign site_title = site.data.options.title -%}
+{%- assign author_ = site.data.options.author -%}
+{%- assign header_ = site.data.options.header -%}
+{%- assign blog_ = site.data.options.blog -%}
+{%- assign pixels_ = site.data.options.pixels -%}
+{%- assign home_ = site.data.options.home -%}
+{%- assign default_ = site.data.options.default -%}
+{%- assign page_ = site.data.options.page -%}
+{%- assign contact_ = site.data.options.contact -%}
+{%- assign footer_ = site.data.options.footer -%}
+{%- assign socials_ = site.data.options.socials -%}
+{%- assign datelang_ = site.data.options.datelang -%}
+{%- assign maintenance_ = site.data.options.maintenance -%}
+{%- assign reading_time_ = site.data.options.reading_time -%}
+
+
+
+

data/_includes/layout/disqus.html

@@ -1,30 +1,16 @@
-{% if site.blog.post.comments.disqus.shortname != "" %}
-<div class="row comments">
-  <h1 class="comments-title">[&nbsp;{{ site.text.post.comments | default: "comments" }}&nbsp;]</h1>
-  <div class="comments-content">
-    <div id="disqus_thread"></div>
-    <script>
-        /**
-         * RECOMMENDED CONFIGURATION VARIABLES: EDIT AND UNCOMMENT THE SECTION BELOW TO INSERT DYNAMIC VALUES
-         */
-        var disqus_shortname = '{{ site.blog.post.comments.disqus.shortname }}';
+{%- include layout/data.liquid -%}
 
-        // The unique URL for the discussion, usually the post's permalink.
-        var disqus_config = function () {
-            this.page.url = '{{ page.url | absolute_url }}'; // Replace with your full permalink
-            this.page.identifier = '{{ page.id }}'; // Unique ID for the discussion, use page.id or page.url
-            this.page.disable_ads = true; // disabled ads
-            this.page.recommendations = false; // disabled recommendations
-        };
+{%- if page.comments != false
+  and jekyll.environment == 'production'
+  and blog_.post.comments.provider == 'disqus'
+  and blog_.post.comments.disqus.shortname != "" -%}
 
-        (function() {
-            var d = document, s = d.createElement('script');
-            s.src = '//' + disqus_shortname + '.disqus.com/embed.js';
-            s.setAttribute('data-timestamp', +new Date());
-            (d.head || d.body).appendChild(s);
-        })();
-    </script>
-    <noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript" rel="nofollow">comments powered by Disqus.</a></noscript>
+  <div class="row comments">
+    <h1 class="comments-title">[&nbsp;{{ blog_.post.comments.title | default: "comments" }}&nbsp;]</h1>
+    <div class="comments-content">
+      <div id="disqus_thread"></div>
+      <script src="{{ '/assets/js/discus.js' | relative_url }}"></script>
+      <noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript" rel="nofollow">comments powered by Disqus.</a></noscript>
+    </div>
   </div>
-</div>
 {% endif %}

data/_includes/layout/footer.html

@@ -1,34 +1,52 @@
+<!-- [Footer] NOTE: Removing or hiding this credit violates the license terms and copyright.
+Please preserve this credit according to the license terms.
+Creative Commons Attribution 4.0 International (CC BY 4.0)
+See: https://rawfeed.github.io/rawfeed-jekyll/license/
+-->
+
 {%- include layout/data.liquid -%}
 
-<footer class="container-fluid fixed-bottom footer">
-  {%- if site.footer.top_button.enable -%}
-  <div class="row top">
-    <div class="col-sm d-flex justify-content-end">
-      <!-- old: <a id="top-link" class="top-link" href="#top"><i class="fa-regular fa-square-caret-up"></i></a> -->
-       <a id="top-link" class="top-link" href="#top">^</a>
+<footer class="fixed-bottom footer">
+
+  <!-- line top button  -->
+  {%- if footer_.top_button.enable -%}
+    <div class="row top">
+      <div class="col-md d-flex justify-content-end">
+        <a id="top-link" class="top-link" href="#top">{{ footer_.top_button.icon }}</a>
+      </div>
     </div>
-  </div>
   {%- endif -%}
+  <!-- line top button  -->
 
+  <!-- line footer content  -->
   <div class="row footer-wrapper">
 
-    {%- if site.text.footer.copyright -%}
-    <div class="col-sm">
-      <div class="footer-copyright">{{ site.title | default: theme_name }}&nbsp;{{ site.text.footer.copyright }}</div>
-    </div>
+    <!-- column copyright  -->
+    {%- if footer_.copyright -%}
+      <div class="col-md footer-copyright-wrap">
+        {%- assign year = site.time | date: "%Y" -%}
+        {%- assign since = footer_.copyright.since -%}
+      <div class="footer-copyright">©&nbsp;{{ footer_.copyright.title | default: theme_name }}&nbsp;{{ since }}{%- if since -%}-{%- endif -%}{{year}}&nbsp;{%- if footer_.copyright.message -%}-&nbsp;{{ footer_.copyright.message }}&nbsp;{%- endif -%}|&nbsp;<a href="{{  footer_.licenses.page_url | relative_url  }}">{{ footer_.licenses.title }}</a></div>
+      </div>
     {%- endif -%}
+    <!-- column copyright  -->
 
-    {%- if site.text.footer.message -%}
-    <div class="col-sm">
-        <div class="footer-message">{{ site.text.footer.message }}</div>
-    </div>
+    <!-- column message  -->
+    {%- if footer_.message -%}
+      <div class="col-md footer-message-wrap">
+          <div class="footer-message">{{ footer_.message | markdownify }}</div>
+      </div>
     {%- endif -%}
+    <!-- column message  -->
 
-    <div class="col-sm">
+    <!-- column made-by  -->
+    <div class="col-md footer-made-by-wrap">
       <div class="footer-made-by">
         Using the <a href="{{ project_url }}" target="_blank" rel="noopener noreferrer">{{ theme_name }}</a> theme for <a href="https://jekyllrb.com" target="_blank" rel="noopener noreferrer">Jekyll</a>.
       </div>
     </div>
+    <!-- column made-by  -->
 
   </div>
+  <!-- line footer content  -->
 </footer>

data/_includes/layout/giscus.html

@@ -1,21 +1,29 @@
-{%- if site.blog.post.comments.giscus.repo != "" and site.blog.post.comments.giscus.category_id != "" -%}
-<div class="row comments">
-  <h1 class="comments-title">[&nbsp;{{ site.text.post.comments | default: "comments" }}&nbsp;]</h1>
-  <div class="row comments-content">
-    <script src="https://giscus.app/client.js"
-      data-repo="{{ site.blog.post.comments.giscus.repo }}"
-      data-repo-id="{{ site.blog.post.comments.giscus.repo_id }}"
-      data-category-id="{{ site.blog.post.comments.giscus.category_id }}"
-      data-mapping="{{ site.blog.post.comments.giscus.mapping | default: 'pathname' }}"
-      data-strict="0"
-      data-reactions-enabled="{{ site.blog.post.comments.giscus.reactions_enabled | default: 1 }}"
-      data-emit-metadata="0"
-      data-input-position="bottom"
-      data-theme="{{ site.blog.post.comments.giscus.theme_light | default: 'light' }}"
-      data-lang="{{ site.blog.post.comments.giscus.lang | default: 'en' }}"
-      crossorigin="anonymous"
-      async>
-    </script>
+{%- include layout/data.liquid -%}
+
+{%- if page.comments != false
+  and jekyll.environment == 'production'
+  and blog_.post.comments.provider == 'giscus'
+  and blog_.post.comments.giscus.repo != ""
+  and blog_.post.comments.giscus.category_id != "" -%}
+
+  <div id="giscus" class="row comments">
+    <h1 class="comments-title">[&nbsp;{{ blog_.post.comments.title | default: "comments" }}&nbsp;]</h1>
+    <div class="row comments-content">
+      <script src="https://giscus.app/client.js"
+        data-repo="{{ blog_.post.comments.giscus.repo }}"
+        data-repo-id="{{ blog_.post.comments.giscus.repo_id }}"
+        data-repo-category="{{ blog_.post.comments.giscus.repo_category }}"
+        data-category-id="{{ blog_.post.comments.giscus.category_id }}"
+        data-mapping="{{ blog_.post.comments.giscus.mapping | default: 'pathname' }}"
+        data-strict="0"
+        data-reactions-enabled="{{ blog_.post.comments.giscus.reactions_enabled | default: 1 }}"
+        data-emit-metadata="0"
+        data-input-position="bottom"
+        data-theme="{{ blog_.post.comments.giscus.theme_light | default: 'light' }}"
+        data-lang="{{ blog_.post.comments.giscus.lang | default: 'en' }}"
+        crossorigin="anonymous"
+        async>
+      </script>
+    </div>
   </div>
-</div>
 {%- endif -%}

data/_includes/layout/head.html

@@ -4,56 +4,95 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <meta charset="utf-8">
   {%- if page.url == "/" -%}
-    <title>{{ site.title | default: theme_name }} | {{ site.baseurl | prepend: site.url }}</title>
+    <title>{{ site_title | replace: "/", "" | default: theme_name }} | {{ site.baseurl | prepend: site.url }}</title>
   {%- else -%}
-    <title>{{ page.title }} | {{ site.title | default: theme_name }}</title>
+    <title>{{ page.title | replace: "/", "" |  capitalize }} | {{ site_title | default: theme_name }}</title>
+  {%- endif -%}
+
+  <!-- SEO -->
+  <meta name="description" content="{{ page.description | capitalize | default: header_.description | strip_html | truncate: 50 }}">
+  <meta name="author" content="{{ page.author | default: author_ }}">
+  <meta property="og:title" content="{{ page.title | capitalize | default: site_title }}">
+  <meta property="og:locale" content="{{ default_.lang | replace: "-", "_" | default: "en_US" }}">
+  <meta property="og:locale:alternate" content="en_US">
+  <meta property="og:description" content="{{ page.description | capitalize | default: header_.description | strip_html | truncate: 50 }}">
+  <link rel="canonical" href="{{ page.url | prepend: site.url }}">
+  <meta property="og:url" content="{{ page.url | prepend: site.url }}">
+  <meta property="og:site_name" content="{{ site_title }}">
+  <meta property="og:type" content="website">
+  <meta name="twitter:card" content="summary">
+  <meta property="twitter:title" content="{{ site_title }}">
+  <meta name="robots" content="index, follow">
+  <script type="application/ld+json">
+  {"@context":"https://schema.org","@type":"WebSite","description":"{{ page.description | capitalize | default: header_.description | strip_html | truncate: 50 }}","headline":"{{ site_title }}","name":"{{ site_title }}","url":"{{ page.url | prepend: site.url }}"}</script>
+  <!-- SEO -->
+
+  {% comment %} Security {% endcomment %}
+  {%- if jekyll.environment == 'production' %}
+
+    <script src="{{ '/assets/js/no_inframe.js' | relative_url }}"></script>
+
+    <meta http-equiv="Content-Security-Policy"
+      content="
+        default-src 'self';
+        img-src 'self' data: {{ head_.csp.img-src | join: ' ' }};
+        script-src 'self' {{ head_.csp.script-src | join: ' ' }};
+        style-src 'self' 'unsafe-inline' {{ head_.csp.style-src | join: ' ' }};
+        font-src 'self' {{ head_.csp.font-src | join: ' ' }} data:;
+        connect-src 'self' {{ head_.csp.connect-src | join: ' ' }};
+        frame-src {{ head_.csp.frame-src | join: ' ' }};
+        object-src 'none';
+        base-uri 'self';
+        form-action 'self';
+    ">
+    <!-- ⚠️ CSP,HSTS,COOP and enabled in the theme, remember to also configure it in Cloudflare or your server -->
+    <meta http-equiv="Strict-Transport-Security" content="max-age=31536000; includeSubDomains; preload">
+    <meta http-equiv="Cross-Origin-Opener-Policy" content="same-origin">
+    <meta http-equiv="Cross-Origin-Embedder-Policy" content="require-corp">
+    <!-- ⚠️ CSP,HSTS,COOP enabled in the theme, remember to also configure it in Cloudflare or your server -->
   {%- endif -%}
 
   {% comment %} favicon {% endcomment %}
   <link rel="icon" type="image/png" href="{{ '/assets/images/favicon.png' | relative_url }}">
   <link rel="apple-touch-icon" href="{{ '/assets/images/favicon.png' | relative_url }}">
 
-  {% comment %} SEO (jekyll-seo-tag) {% endcomment %}
-  {%- seo -%}
-  <meta property="og:locale:alternate" content="en_US">
-
-  {%- if site.google.site_verification != "" -%}
+  {%- if head_.google.site_verification != "" -%}
     <!-- Google Site Verification -->
-    <meta name="google-site-verification" content="{{ site.google.site_verification }}">
+    <meta name="google-site-verification" content="{{ head_.google.site_verification }}">
     <!-- Google Site Verification -->
   {%- endif -%}
 
   {% comment %} Fonts {% endcomment %}
   {%- comment -%}
-  TODO: version: 0.2.0: place fonts used in the project instead of using Google Fonts.
+  TODO: version: 0.3.0: place fonts used in the project instead of using Google Fonts.
   {%- endcomment -%}
   <link rel="preconnect" href="https://fonts.googleapis.com">
   <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
   <link href="https://fonts.googleapis.com/css2?family=SUSE+Mono:ital,wght@0,100..800;1,100..800&display=swap" rel="stylesheet">
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Inconsolata:400,700&amp;display=swap">
-  <link href="https://fonts.googleapis.com/css2?family=Special+Elite&display=swap" rel="stylesheet">
   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css"/>
 
+  <!-- Google Fonts -->
+  <link rel="preconnect" href="https://fonts.googleapis.com">
+  <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+  <link href="https://fonts.googleapis.com/css2?family=Inconsolata:wght@200..900&family=JetBrains+Mono:ital,wght@0,100..800;1,100..800&family=Open+Sans:ital,wght@0,300..800;1,300..800&family=Roboto+Mono:ital,wght@0,100..700;1,100..700&family=Ubuntu:ital,wght@0,300;0,400;0,500;0,700;1,300;1,400;1,500;1,700&display=swap" rel="stylesheet">
+  <!-- Google Fonts -->
+
   {% comment %} bootstrap {% endcomment %}
   <link rel="stylesheet" href="{{ '/assets/vendor/bootstrap/css/bootstrap.min.css' | relative_url }}">
 
   {% comment %} fixes FOUC/flicker in firefox {% endcomment %}
-  <script>
-    (function() {
-      const savedTheme = localStorage.getItem('theme') || 'light';
-      document.documentElement.setAttribute('data-theme', savedTheme);
-    })();
-  </script>
+  <script src="{{ '/assets/js/theme_load.js' | relative_url }}"></script>
 
   {% comment %} load theme {% endcomment %}
   <link rel="stylesheet" href="{{ '/assets/css/style.css' | relative_url }}">
 
   {% comment %} feed {% endcomment %}
-  <link rel="alternate" type="application/atom+xml" title="{{ site.title }}" href="{{ '/feed.xml' | relative_url }}">
+  <link rel="alternate" type="application/atom+xml" title="{{ site_title }}" href="{{ '/feed.xml' | relative_url }}">
 
-  {%- if jekyll.environment == 'production' and site.google.analytics.enable == true and site.google.analytics.id != "" -%}
+  {%- if jekyll.environment == 'production' and head_.google.analytics.enable == true and head_.google.analytics.id != "" -%}
     <!-- Google Analytics -->
-    {%- include google_analytics.html -%}
+    <script src="{{ '/assets/js/google_analytics.js' | relative_url }}"></script>
     <!-- Google Analytics -->
   {%- endif -%}
 </head>