content/authors: switch to key things by GitHub handle

This also means we can DRY up a whole load of code (I've done a partial job for now) and can simply use https://github.com/$user.png for the image rather than needing to store anything locally. We can DRY this all up even more using CUE at a later date. Signed-off-by: Paul Jolly <[email protected]> Change-Id: I10864ba9096d8682843ffcf46848019db0e92a67 Preview-Path: /blog/example/ Dispatch-Trailer: {"type":"trybot","CL":1169614,"patchset":4,"ref":"refs/changes/14/1169614/4","targetBranch":"alpha"}
cue-lang · Sep 19, 2023 · 52b4f93 · 52b4f93
1 parent 5f01e94
commit 52b4f93
Show file tree

Hide file tree

Showing 23 changed files with 46 additions and 62 deletions.
diff --git a/content/authors/jonathanmatthews/en.md b/content/authors/jonathanmatthews/en.md
diff --git a/content/authors/jonathanmatthews/page.cue b/content/authors/jonathanmatthews/page.cue
diff --git a/content/authors/jpluscplusm/en.md b/content/authors/jpluscplusm/en.md
@@ -0,0 +1,4 @@
+---
+name: "Jonathan Matthews"
+github: "jpluscplusm"
+---
diff --git a/content/authors/jpluscplusm/page.cue b/content/authors/jpluscplusm/page.cue
@@ -0,0 +1,3 @@
+package site
+
+"authors": "jpluscplusm": {}
diff --git a/content/authors/marcelvanlohuizen/en.md b/content/authors/marcelvanlohuizen/en.md
diff --git a/content/authors/marcelvanlohuizen/page.cue b/content/authors/marcelvanlohuizen/page.cue
diff --git a/content/authors/mpvl/en.md b/content/authors/mpvl/en.md
@@ -0,0 +1,4 @@
+---
+name: "Marcel van Lohuizen"
+github: "mpvl"
+---
diff --git a/content/authors/mpvl/page.cue b/content/authors/mpvl/page.cue
@@ -0,0 +1,3 @@
+package site
+
+"authors": "mpvl": {}
diff --git a/content/authors/myitcv/en.md b/content/authors/myitcv/en.md
@@ -0,0 +1,4 @@
+---
+name: "Paul Jolly"
+github: "myitcv"
+---
diff --git a/content/authors/myitcv/page.cue b/content/authors/myitcv/page.cue
@@ -0,0 +1,3 @@
+package site
+
+"authors": "myitcv": {}
diff --git a/content/authors/pauljolly/en.md b/content/authors/pauljolly/en.md
diff --git a/content/authors/pauljolly/page.cue b/content/authors/pauljolly/page.cue
diff --git a/content/authors/pauljolly/pauljolly.jpeg b/content/authors/pauljolly/pauljolly.jpeg
diff --git a/content/blog/example/en.md b/content/blog/example/en.md
@@ -5,8 +5,8 @@ draft: false
 noindex: true
 image: "cow.jpg"
 authors:
-    - pauljolly
-    - jonathanmatthews
+    - myitcv
+    - jpluscplusm
 tags:
     - Use encodings in CUE
     - Language

diff --git a/hugo/content/en/authors/jonathanmatthews/index.md b/hugo/content/en/authors/jonathanmatthews/index.md
diff --git a/hugo/content/en/authors/jpluscplusm/index.md b/hugo/content/en/authors/jpluscplusm/index.md
@@ -0,0 +1,4 @@
+---
+name: "Jonathan Matthews"
+github: "jpluscplusm"
+---
diff --git a/hugo/content/en/authors/marcelvanlohuizen/index.md b/hugo/content/en/authors/marcelvanlohuizen/index.md
diff --git a/hugo/content/en/authors/mpvl/index.md b/hugo/content/en/authors/mpvl/index.md
@@ -0,0 +1,4 @@
+---
+name: "Marcel van Lohuizen"
+github: "mpvl"
+---
diff --git a/hugo/content/en/authors/myitcv/index.md b/hugo/content/en/authors/myitcv/index.md
@@ -0,0 +1,4 @@
+---
+name: "Paul Jolly"
+github: "myitcv"
+---
diff --git a/hugo/content/en/authors/pauljolly/index.md b/hugo/content/en/authors/pauljolly/index.md
diff --git a/hugo/content/en/authors/pauljolly/pauljolly.jpeg b/hugo/content/en/authors/pauljolly/pauljolly.jpeg
diff --git a/hugo/content/en/blog/example/index.md b/hugo/content/en/blog/example/index.md
@@ -5,8 +5,8 @@ draft: false
 noindex: true
 image: "cow.jpg"
 authors:
-    - pauljolly
-    - jonathanmatthews
+    - myitcv
+    - jpluscplusm
 tags:
     - Use encodings in CUE
     - Language

diff --git a/hugo/layouts/partials/authors.html b/hugo/layouts/partials/authors.html
@@ -9,30 +9,26 @@
         {{ range first 1 $authorMatches }}
             <details class="authors__item" data-dropdown>
                 <summary class="authors__avatar">
-                    {{ if .Params.image }}
-                        <img class="authors__image" src="/{{ .File.Dir }}{{ .Params.image }}" alt="{{ .Params.displayName|default .Params.name }}">
+                    {{ if .Params.github }}
+                        <img class="authors__image" src="https://github.com/{{ .Params.github }}.png" alt="{{ .Params.github|default .Params.name }}">
                     {{ else }}
                         {{- partial "icon.html" (dict "icon" "cue" "class" "authors__image") -}}
                     {{ end }}
 
-                    {{ if .Params.displayName }}
-                        <span class="authors__display-name">{{ .Params.displayName }}</span>
-                    {{ else }}
-                        <span class="authors__author-name">{{ .Params.name }}</span>
-                    {{ end }}
+                    <span class="authors__author-name">{{ .Params.name }}</span>
                 </summary>
 
                 <div class="authors--popover">
                     <div class="authors__avatar">
-                        {{ if .Params.image }}
-                            <img class="authors__image" src="/{{ .File.Dir }}{{ .Params.image }}" alt="{{ .Params.displayName|default .Params.name }}">
+                        {{ if .Params.github }}
+                            <img class="authors__image" src="https://github.com/{{ .Params.github }}.png" alt="{{ .Params.github|default .Params.name }}">
                         {{ else }}
                             {{- partial "icon.html" (dict "icon" "cue" "class" "authors__image") -}}
                         {{ end }}
 
                         <div class="authors__name">
-                            {{ if .Params.displayName }}
-                                <span class="authors__display-name">{{ .Params.displayName }}</span>
+                            {{ if .Params.gitbhu }}
+                                <span class="authors__display-name">{{ .Params.github }}</span>
                             {{ end }}
 
                             {{ if .Params.name }}
@@ -42,10 +38,10 @@
                     </div>
 
                     <div class="authors__links">
-                        {{ if .Params.githubLink }}
+                        {{ if .Params.github }}
                             <div class="authors__github">
 
-                                <a class="authors__link" href="{{ .Params.githubLink }}">
+                                <a class="authors__link" href="https://github.com/{{ .Params.github }}">
                                     {{ partial "icon.html" (dict "icon" "github" "class" "authors__icon") }}
                                     <p>
                                         <span class="authors__link-text">{{ T "author_github" }}</span>