Merge branch 'master' into multilang-2020-11-27

matsuyoshi30 · Dec 9, 2020 · ac399da · ac399da
2 parents 2e0a8c6 + 9e4dd68
commit ac399da
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -175,6 +175,17 @@ If you want to enable google analytics when running hugo as server, add `enableG
   enableGoogleAnalytics = true
 ```
 
+#### Enable UglyURLs
+
+If you want to enable "Ugly URLs" (e.g. exmaple.com/urls.html), add `uglyurls = true` to top level and [params] of your config.toml.
+
+```
+uglyurls = true
+
+[params]
+  uglyurls = true
+```
+
 ## Frontmatter example
 
 ```
@@ -221,4 +232,4 @@ $ npm run build-prod
 [MIT](./LICENSE).
 
 
-[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fmatsuyoshi30%2Fharbor.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2Fmatsuyoshi30%2Fharbor?ref=badge_large)
+[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fmatsuyoshi30%2Fharbor.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2Fmatsuyoshi30%2Fharbor?ref=badge_large)
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
@@ -15,16 +15,28 @@
       <ul class="pager">
         {{ if .Paginator.HasPrev }}
           <li class="previous">
+            {{ if $.Site.Params.uglyurls }}
+            <a href="{{ replaceRE "\\.html$" "/" .Permalink }}page/{{ .Paginator.Prev.PageNumber }}.html"
+              >&larr; {{ i18n "newer" }}</a
+            >
+            {{ else }}
             <a href="{{ .Permalink }}page/{{ .Paginator.Prev.PageNumber }}/"
               >&larr; {{ i18n "newer" }}</a
             >
+            {{ end }}
           </li>
         {{ end }}
         {{ if .Paginator.HasNext }}
           <li class="next">
+            {{ if $.Site.Params.uglyurls }}
+            <a href="{{ replaceRE "\\.html$" "/" .Permalink }}page/{{ .Paginator.Next.PageNumber }}.html"
+              >{{ i18n "older" }} &rarr;</a
+            >
+            {{ else }}
             <a href="{{ .Permalink }}page/{{ .Paginator.Next.PageNumber }}/"
               >{{ i18n "older" }} &rarr;</a
             >
+            {{ end }}
           </li>
         {{ end }}
       </ul>

diff --git a/layouts/_default/single.html b/layouts/_default/single.html
@@ -6,9 +6,8 @@
       {{ if .Params.tags }}
         <div class="blog-tags">
           {{ range .Params.tags }}
-            <a href="{{ "" | absLangURL }}/tags/{{ . | urlize }}/">{{ . }}</a
+            <a href="{{ "" | absLangURL }}tags/{{ . | urlize }}{{ if $.Site.Params.uglyurls }}.html{{else}}/{{ end }}">{{ . }}</a
             >&nbsp;
-            <a href="{{ "" | absLangURL }}/tags/{{ . | urlize }}/">{{ . }}</a>&nbsp;
           {{ end }}
         </div>
       {{ end }}

diff --git a/layouts/partials/postmeta.html b/layouts/partials/postmeta.html
@@ -4,7 +4,7 @@
   {{ if .Params.categories }}
     &nbsp;&nbsp;&nbsp;<em class="fa fa-folder-open"></em>&nbsp;
     {{ range .Params.categories }}
-      <a href="{{ $.Site.BaseURL }}/categories/{{ . | urlize }}/">{{ . }}</a
+      <a href="{{ $.Site.BaseURL }}categories/{{ . | urlize }}{{ if $.Site.Params.uglyurls }}.html{{else}}/{{ end }}">{{ . }}</a
       >&nbsp;
     {{ end }}
   {{ end }}

diff --git a/package.json b/package.json
@@ -42,8 +42,10 @@
     }
   },
   "lint-staged": {
-    "!(bundle).{js,html}": [
-      "prettier-eslint --write $PWD/'static/src/**/*.js $PWD/'layouts/**/*.html'",
+    "!(bundle).html": [
+      "prettier-eslint --write $PWD/'static/src/**/*.js $PWD/'layouts/**/*.html'"
+    ],
+    "!(bundle).js": [
       "eslint $PWD/'static/src/**/*.js'"
     ]
   }