From a8fb117ca208f5e2f9f4b1b27f04923b68594f90 Mon Sep 17 00:00:00 2001
From: Hu Tao <73904+hut2016@users.noreply.github.com>
Date: Mon, 19 Sep 2022 21:26:56 +0800
Subject: [PATCH] Fix various links

---
 layouts/blog/list.html         | 10 +++++-----
 layouts/blog/single.html       |  4 ++--
 layouts/partials/blogPost.html | 10 +++++-----
 layouts/partials/footer.html   | 12 ++++++------
 layouts/partials/head.html     |  8 ++++----
 layouts/partials/header.html   |  8 ++++----
 6 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/layouts/blog/list.html b/layouts/blog/list.html
index 8ef2829..56b01de 100644
--- a/layouts/blog/list.html
+++ b/layouts/blog/list.html
@@ -20,19 +20,19 @@ <h1>{{ .Title }}</h1>
         <div class="col-lg-4 col-md-6">
           <article class="blog-post-item">
             <div class="blog-post-thumb">
-              <a href="{{ .Permalink }}">
-                <img src="{{ .Params.featureImage | absURL }}" alt="blog-thumb"
+              <a href="{{ .RelPermalink }}">
+                <img src="{{ .Site.Home.RelPermalink }}{{ .Params.featureImage }}" alt="blog-thumb"
               /></a>
             </div>
             <div class="blog-post-content">
               <h2>
-                <a href="{{ .Permalink }}"
+                <a href="{{ .RelPermalink }}"
                   >{{ .Title }}</a
                 >
               </h2>
               <div class="post-author">
                 <div class="thumb">
-                  <img src="{{ .Params.authorThumb | absURL }}" alt="author-thumb" />
+                  <img src="{{ .Site.Home.RelPermalink }}{{ .Params.authorThumb }}" alt="author-thumb" />
                 </div>
                 <div class="meta">
                   <h3>{{ .Params.author }}</h3>
@@ -69,4 +69,4 @@ <h3>{{ .Params.author }}</h3>
   </div>
 </section>
 
-{{ end }}
\ No newline at end of file
+{{ end }}
diff --git a/layouts/blog/single.html b/layouts/blog/single.html
index ca2b7d5..55125ea 100644
--- a/layouts/blog/single.html
+++ b/layouts/blog/single.html
@@ -10,7 +10,7 @@ <h2>
         <div class="post-meta">
           <ul>
             <li>
-              <img src="{{ .Params.authorThumb | absURL }}" alt="author-thumb" />
+              <img src="{{ .Site.Home.RelPermalink }}{{ .Params.authorThumb }}" alt="author-thumb" />
             </li>
             <li>
               <h5>
@@ -39,4 +39,4 @@ <h5>
   </div>
 </section>
 
-{{ end }}
\ No newline at end of file
+{{ end }}
diff --git a/layouts/partials/blogPost.html b/layouts/partials/blogPost.html
index b1cfa07..7ea6ccf 100644
--- a/layouts/partials/blogPost.html
+++ b/layouts/partials/blogPost.html
@@ -14,19 +14,19 @@ <h2>{{ .title }}</h2>
           <div class="col-lg-4 col-md-6">
             <article class="blog-post-item">
               <div class="blog-post-thumb">
-                <a href="{{ .Permalink }}">
+                <a href="{{ .RelPermalink }}">
                   <img src="{{ .Params.featureImage }}" alt="post-thumb"
                 /></a>
               </div>
               <div class="blog-post-content">
                 <h2>
-                  <a href="{{ .Permalink }}"
+                  <a href="{{ .RelPermalink }}"
                     >{{ .Title }}</a
                   >
                 </h2>
                 <div class="post-author">
                   <div class="thumb">
-                    <img src="{{ .Params.authorThumb }}" alt="author-thumb" />
+                    <img src="{{ .Site.Home.RelPermalink }}{{ .Params.authorThumb }}" alt="author-thumb" />
                   </div>
                   <div class="meta">
                     <h3>{{ .Params.author }}</h3>
@@ -38,7 +38,7 @@ <h3>{{ .Params.author }}</h3>
           </div>
           {{ end }}
           <div class="see-all-post col-12">
-            <a href="{{ "blog" | absURL }}" data-text="{{ .blogButtonText }}" class="btn btn-primary">
+            <a href="{{ "blog" }}" data-text="{{ .blogButtonText }}" class="btn btn-primary">
               <span>{{ .blogButtonText }}</span>
             </a>
           </div>
@@ -46,4 +46,4 @@ <h3>{{ .Params.author }}</h3>
       </div>
     </section>
   {{ end }}
-{{ end }}
\ No newline at end of file
+{{ end }}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 3c5c33c..47e088d 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -47,7 +47,7 @@ <h2>{{ .Site.Params.footerTitle }}</h2>
     <div class="row">
       <div class="col-lg-4 col-md-4">
         <div class="footer-description">
-          <img src="{{ .Site.Params.logo | absURL }}" alt="logo">
+          <img src="{{ $.Site.Home.RelPermalink }}{{ .Site.Params.logo }}" alt="logo">
           <p>
             {{ .Site.Params.copyright1 }}
               </br>
@@ -73,7 +73,7 @@ <h4>Sitemap</h4>
             <ul>
               {{ $sitemap := .Site.Menus.sitemap }}
                 {{ range $sitemap }}
-                  <li><a href="{{ .URL | absURL }}">{{ .Name }}</a></li>
+                  <li><a href="{{ .URL }}">{{ .Name }}</a></li>
               {{ end }}
             </ul>
           </div>
@@ -97,10 +97,10 @@ <h4>Address</h4>
 </footer>
 
 {{ $style := resources.Get "scss/non-critical.scss" | resources.ToCSS | minify }}
-<link href="{{ $style.Permalink }}" rel="stylesheet" />
+<link href="{{ $style.RelPermalink }}" rel="stylesheet" />
 {{ $vendor := resources.Get "js/vendor.js" | minify }}
-<script src="{{ $vendor.Permalink }}"></script>
+<script src="{{ $vendor.RelPermalink }}"></script>
 <!-- {{ $formhandler := resources.Get "js/form-handler.js" | minify }}
-<script src="{{ $formhandler.Permalink }}"></script> -->
+<script src="{{ $formhandler.RelPermalink }}"></script> -->
 {{ $script := resources.Get "js/script.js" | minify }}
-<script src="{{ $script.Permalink }}"></script>
+<script src="{{ $script.RelPermalink }}"></script>
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 9e9a951..d5ee37c 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -8,15 +8,15 @@
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 
   {{ "<!-- Themify -->" | safeHTML }}
-  <link rel="stylesheet" href="{{ "themify/themify.css" | absURL }}">
+  <link rel="stylesheet" href="{{ $.Site.Home.RelPermalink }}{{ "themify/themify.css" }}">
 
   {{ "<!-- Critical CSS -->" | safeHTML }}
   {{ $stylex := resources.Get "scss/critical.scss" | resources.ToCSS | minify }}
-  <link href="{{ $stylex.Permalink }}" rel="stylesheet" />
+  <link href="{{ $stylex.RelPermalink }}" rel="stylesheet" />
 
   {{ "<!--Favicon-->" | safeHTML }}
-  <link rel="shortcut icon" href="{{ "images/favicon.png" | absURL }}" type="image/x-icon" />
-  <link rel="icon" href="{{ "images/favicon.png" | absURL }}" type="image/x-icon" />
+  <link rel="shortcut icon" href="{{ .Site.Home.RelPermalink }}{{ "images/favicon.png" }}" type="image/x-icon" />
+  <link rel="icon" href="{{ .Site.Home.RelPermalink }}{{ "images/favicon.png" }}" type="image/x-icon" />
   {{ with site.Params.googleAnalytics }}
   {{ "<!-- Google Analytics -->" | safeHTML }}
   <script async src="https://www.googletagmanager.com/gtag/js?id={{ . }}"></script>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 8c50cd7..a2f24e9 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -1,10 +1,10 @@
 <nav class="main-nav navbar navbar-expand-lg">
   <div class="container-fluid">
     {{ "<!-- Logo -->" | safeHTML }}
-    <a class="navbar-brand" href="{{ .Site.BaseURL }}">
+    <a class="navbar-brand" href="{{ .Site.Home.RelPermalink }}">
       <img
         class="logo-main"
-        src="{{ .Site.Params.logo | absURL }}"
+        src="{{ .Site.Home.RelPermalink }}{{ .Site.Params.logo }}"
         alt="logo-white"
       />
     </a>
@@ -26,13 +26,13 @@
       <ul class="navbar-nav ml-auto">
       {{ range $index, $element := $menu }}
         <li class="nav-item">
-          <a href="{{ $.Site.BaseURL }}{{ .URL }}" class="nav-link {{ if $.IsHome }}scroll{{ end }}">{{ .Name }}</a>
+          <a href="{{ $.Site.Home.RelPermalink }}{{ .URL }}" class="nav-link {{ if $.IsHome }}scroll{{ end }}">{{ .Name }}</a>
         </li>
       {{ end }}
       </ul>
       <div class="account-list list-inline">
         <li class="list-inline-item">
-          <a href="{{ "contact" | absURL }}" class="btn btn-sm btn-violate">
+          <a href="{{ $.Site.Home.RelPermalink }}{{ "contact" }}" class="btn btn-sm btn-violate">
             Get in touch
           </a>
         </li>