From 0fe9d215b3a20b4e7a2ef4b393b423258efd2315 Mon Sep 17 00:00:00 2001
From: Yash Mehrotra <yashmehrotra95@gmail.com>
Date: Sun, 17 Apr 2022 21:33:51 +0530
Subject: [PATCH] Use base url. Fixes #79 (#90)

---
 layouts/404.html                 |  2 +-
 layouts/_default/terms.html      |  2 +-
 layouts/index.html               |  4 ++--
 layouts/partials/head.html       | 12 ++++++------
 layouts/partials/header.html     |  6 +++---
 layouts/partials/list-posts.html |  2 +-
 layouts/partials/post.html       |  2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/layouts/404.html b/layouts/404.html
index e572eff..9136ad2 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -3,7 +3,7 @@
 <div class="text-404">
   <h1 class="error-emoji"></h1>
   <h2>
-      404 ... This page does not exist, go <a href="{{ "/" | relURL }}">home</a>
+      404 ... This page does not exist, go <a href="{{ .Site.BaseURL }}">home</a>
   </h2>
 </div>
 <script>
diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html
index 0a1b3d7..a7d3dd8 100644
--- a/layouts/_default/terms.html
+++ b/layouts/_default/terms.html
@@ -5,7 +5,7 @@
     <ul class="post-tags">
         {{ range $.Site.Taxonomies.tags.ByCount }}
         <li class="post-tag">
-            <a href="/tags/{{ .Name | urlize }}/">
+            <a href="{{ $.Site.BaseURL }}/tags/{{ .Name | urlize }}/">
                 <div class="tag-name">{{ .Name }}</div>
                 <div class="tag-posts-count">{{ .Count }}</div>
             </a>
diff --git a/layouts/index.html b/layouts/index.html
index 5ce5656..7ee5b55 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -2,7 +2,7 @@
 <section class="home-about">
 	<div class="avatar">
         {{ if isset .Site.Params "avatarurl" }}
-        <img class={{ .Site.Params.AvatarSize | default "size-m" }} src='{{ .Site.Params.AvatarURL }}'>
+        <img class={{ .Site.Params.AvatarSize | default "size-m" }} src='{{ .Site.BaseURL }}{{ .Site.Params.AvatarURL }}'>
         {{ end }}
 	</div>
     <h1>{{ .Site.Title }}</h1>
@@ -17,7 +17,7 @@
         {{ range .Site.Params.SocialIcons }}
         <li class="social-icon">
             <a href="{{ .url }}">
-                <img class="svg-inject" src="/icons/{{ .name }}.svg" />
+                <img class="svg-inject" src="{{ .Site.BaseURL }}/icons/{{ .name }}.svg" />
             </a>
         </li>
         {{ end }}
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index c62827f..55151e0 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -36,13 +36,13 @@
     <!-- SEO canonicals: helps Google understand your site better when using marketing campaign tagging etc -->
     <link rel="canonical" href="{{ .Permalink }}" />
 
-    <link rel="stylesheet" type="text/css" href="/css/normalize.min.css" media="print" onload="this.media='all'">
-    <link rel="stylesheet" type="text/css" href="/css/main.css">
-    <link disabled id="dark-theme" rel="stylesheet" href="/css/dark.css">
+    <link rel="stylesheet" type="text/css" href="{{ .Site.BaseURL }}/css/normalize.min.css" media="print" onload="this.media='all'">
+    <link rel="stylesheet" type="text/css" href="{{ .Site.BaseURL }}/css/main.css">
+    <link disabled id="dark-theme" rel="stylesheet" href="{{ .Site.BaseURL }}/css/dark.css">
 
-    <script src="/js/svg-injector.min.js"></script>
-    <script src="/js/feather-icons.min.js"></script>
-    <script src="/js/main.js"></script>
+    <script src="{{ .Site.BaseURL }}/js/svg-injector.min.js"></script>
+    <script src="{{ .Site.BaseURL }}/js/feather-icons.min.js"></script>
+    <script src="{{ .Site.BaseURL }}/js/main.js"></script>
 
     <!-- Option for user to inject custom html -->
     {{ if .Site.Params.CustomHeadHTML }}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index c09fcf7..77a68a4 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -4,7 +4,7 @@
         {{ if isset .Site.Params "avatarurl" }}
         <div class="avatar">
             <a href="{{ .Site.BaseURL }}">
-                <img src="{{ .Site.Params.AvatarURL }}" alt="avatar" />
+                <img src="{{ .Site.BaseURL }}{{ .Site.Params.AvatarURL }}" alt="avatar" />
             </a>
         </div>
         {{ end }}
@@ -16,7 +16,7 @@
         <div class="nav-links">
             {{ range .Site.Menus.main }}
             <div class="nav-link">
-                <a href="{{ .URL }}">
+                <a href="{{ .URL | absURL }}">
                     {{- .Pre | safeHTML }} {{ .Name }} {{ .Post | safeHTML -}}
                 </a>
             </div>
@@ -39,7 +39,7 @@
             <ul class="nav-hamburger-list visibility-hidden">
                 {{ range .Site.Menus.main }}
                 <li class="nav-item">
-                    <a href="{{ .URL }}">
+                    <a href="{{ .URL | absURL }}">
                         {{- .Pre | safeHTML }} {{ .Name }} {{ .Post | safeHTML -}}
                     </a>
                 </li>
diff --git a/layouts/partials/list-posts.html b/layouts/partials/list-posts.html
index 8b4b091..e5db229 100644
--- a/layouts/partials/list-posts.html
+++ b/layouts/partials/list-posts.html
@@ -1,5 +1,5 @@
 <article class="post-title">
-    <a href="{{ .RelPermalink }}" class="post-link">{{ .Title }}</a>
+    <a href="{{ .Permalink }}" class="post-link">{{ .Title }}</a>
     <div class="flex-break"></div>
     <span class="post-date">{{ dateFormat "January 2, 2006" .Date }}</span>
 </article>
diff --git a/layouts/partials/post.html b/layouts/partials/post.html
index 9ddba2e..1e9d2df 100644
--- a/layouts/partials/post.html
+++ b/layouts/partials/post.html
@@ -9,7 +9,7 @@
 
         <ul class="post-tags">
         {{ range .Params.tags }}
-            <li class="post-tag"><a href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">{{ . }}</a></li>
+            <li class="post-tag"><a href="{{ "/tags/" | absLangURL }}{{ . | urlize }}">{{ . }}</a></li>
         {{ end }}
         </ul>
     </div>