Merge pull request #248 from activebridge/fix/sitemap

Fix/sitemap

Author: katatsu12

_layouts/default.html

@@ -29,7 +29,6 @@
     <link rel="icon" href="data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg'%20viewBox='0 0 100 100'%3E%3ClinearGradient id='a' x1='0' x2='100' y1='0' y2='100' gradientUnits='userSpaceOnUse'%3E%3Cstop offset='0' style='stop-color:%23aa30be' /%3E%3Cstop offset='1' style='stop-color:%235723b5' /%3E%3C/linearGradient%3E%3Cpath fill='url(%23a)' d='M0 0h100v100H0z' /%3E%3Cpath fill='%23FFF' d='M74 69.5c-.7 0-1.4 0-2.1-.1-.6-.1-1.1-.5-1.1-1.1l-1.8-16c-9-2.9-21.2-4.1-31.2-1.3l-2.3 17.4c-.1.7-.7 1.2-1.5 1.1-.7-.1-1.2-.7-1.1-1.5L35 51.8c-1 .4-1.9.8-2.8 1.2-4.9 2.5-8.2 6.1-10.5 9.4l-3.9 6.3c-.4.6-1.2.8-1.8.4-.6-.4-.8-1.2-.4-1.8.3-.4.6-1 .9-1.5.8-1.4 1.8-3.1 3.1-5L37.9 31c.3-.5 1-.8 1.5-.5.6.2.9.8.9 1.4l-2.2 16.2c9.9-2.4 21.5-1.4 30.5 1.3l-1.9-17.5c-.1-.7.4-1.4 1.1-1.4.7-.1 1.4.4 1.4 1.1l2 18.6c2.8 1 5.2 2.1 7.2 3.3 3.9 2.4 6 5.2 6 7.9 0 2-.9 3.9-2.5 5.3-1.8 1.9-4.7 2.8-7.9 2.8zm-.8-2.6c2.9.2 5.5-.6 7.1-2 1.1-1 1.7-2.1 1.7-3.3 0-1.8-1.7-3.8-4.8-5.7-1.5-1-3.4-1.9-5.5-2.7l1.5 13.7zM36.9 37.7l-9.2 15c1-.7 2.2-1.4 3.4-2 1.4-.7 2.8-1.3 4.4-1.8l1.4-11.2z' /%3E%3C/svg%3E%0A">
     <link rel="icon" href="/assets/images/favicon.png" type="image/png">
     <link rel="stylesheet" href="/assets/main.css">
-    <link rel="canonical" href="{{ page.url | prepend: site.baseurl | prepend: site.url | remove: 'index.html' | remove: '.html'}}"/>
 
     <script src="/assets/js/application.js" defer></script>
     <script src="/assets/js/navbar.js" defer></script>

sitemap.xml

@@ -4,9 +4,11 @@ layout: null
 
 <?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+  {% assign redirect_links = site.pages | concat: site.posts | map: 'redirect_from' | compact | flatten %}
+
   {% for page in site.pages %}
     {% if page.url contains '.html' or page.url contains '/' %}
-      {% unless page.sitemap_exclude or page.url contains '404.html' or page.url contains '.xml' or page.url contains '.css'%}
+      {% unless redirect_links contains page.url or page.sitemap_exclude or page.url contains '404.html' or page.url contains '.xml' or page.url contains '.css'%}
         <url>
           <loc>{{ site.url }}{{ page.url | remove: 'index.html' | remove: '.html' }}</loc>
           <lastmod>{{ page.date-modified | default: site.default-date-modified | date: '%Y-%m-%d' }}</lastmod>