content/authors: switch to key things by GitHub handle

This also means we can DRY up a whole load of code and can simply use https://github.com/$user.png for the image rather than needing to store images locally. We flip to using the directory path as the GitHub handle, because this is the key by which we identify a user. This then allows us to elide the declaration of a 'github' field in an author page. We flip to allowing the user to declare 'displayName', and use this as the rendered name in the author block. Signed-off-by: Paul Jolly <[email protected]> Change-Id: I10864ba9096d8682843ffcf46848019db0e92a67 Preview-Path: /blog/example/ Dispatch-Trailer: {"type":"trybot","CL":1169614,"patchset":7,"ref":"refs/changes/14/1169614/7","targetBranch":"alpha"}
cue-lang · Sep 19, 2023 · 3f9d311 · 3f9d311
1 parent 5f01e94
commit 3f9d311
Show file tree

Hide file tree

Showing 27 changed files with 48 additions and 79 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,3 @@
+---
+displayName: "Jonathan Matthews"
+---
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,3 @@
+---
+displayName: "Marcel van Lohuizen"
+---
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,3 @@
+---
+displayName: "Paul Jolly"
+---
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/content/docs/howto/encode-json-yaml-with-cue/en.md b/content/docs/howto/encode-json-yaml-with-cue/en.md
@@ -7,8 +7,8 @@ date: "2023-08-22"
 tags:
     - Use encodings in CUE
 authors:
-    - pauljolly
-    - marcelvanlohuizen
+    - myitcv
+    - mpvl
 meta:
     - type: readingTime
       value: 5

diff --git a/content/examples/basic/front-matter/en.md b/content/examples/basic/front-matter/en.md
@@ -10,7 +10,7 @@ tags:
     - Language
     - Ecosystem
 authors:
-    - pauljolly
+    - myitcv
 ---
 
 Hugo uses front-matter to add meta information to a content page. This can be done various formats - in the CUE website we prefer **YAML** (To be decided).

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,3 @@
+---
+displayName: "Jonathan Matthews"
+---
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,3 @@
+---
+displayName: "Marcel van Lohuizen"
+---
diff --git a/hugo/content/en/authors/myitcv/index.md b/hugo/content/en/authors/myitcv/index.md
@@ -0,0 +1,3 @@
+---
+displayName: "Paul Jolly"
+---
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/content/en/docs/howto/encode-json-yaml-with-cue/index.md b/hugo/content/en/docs/howto/encode-json-yaml-with-cue/index.md
@@ -7,8 +7,8 @@ date: "2023-08-22"
 tags:
     - Use encodings in CUE
 authors:
-    - pauljolly
-    - marcelvanlohuizen
+    - myitcv
+    - mpvl
 meta:
     - type: readingTime
       value: 5

diff --git a/hugo/content/en/examples/basic/front-matter/index.md b/hugo/content/en/examples/basic/front-matter/index.md
@@ -10,7 +10,7 @@ tags:
     - Language
     - Ecosystem
 authors:
-    - pauljolly
+    - myitcv
 ---
 
 Hugo uses front-matter to add meta information to a content page. This can be done various formats - in the CUE website we prefer **YAML** (To be decided).

diff --git a/hugo/layouts/partials/authors.html b/hugo/layouts/partials/authors.html
@@ -9,50 +9,37 @@
         {{ 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 }}">
-                    {{ else }}
-                        {{- partial "icon.html" (dict "icon" "cue" "class" "authors__image") -}}
-                    {{ end }}
+                    <img class="authors__image" src="https://github.com/{{ $authorName }}.png" alt="{{ $authorName|default .Params.name }}">
 
                     {{ if .Params.displayName }}
                         <span class="authors__display-name">{{ .Params.displayName }}</span>
                     {{ else }}
-                        <span class="authors__author-name">{{ .Params.name }}</span>
+                        <span class="authors__author-name">{{ $authorName }}</span>
                     {{ end }}
                 </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 }}">
-                        {{ else }}
-                            {{- partial "icon.html" (dict "icon" "cue" "class" "authors__image") -}}
-                        {{ end }}
+                        <img class="authors__image" src="https://github.com/{{ $authorName }}.png" alt="{{ $authorName|default .Params.name }}">
 
                         <div class="authors__name">
                             {{ if .Params.displayName }}
                                 <span class="authors__display-name">{{ .Params.displayName }}</span>
                             {{ end }}
 
-                            {{ if .Params.name }}
-                                <span class="authors__author-name">{{ .Params.name }}</span>
-                            {{ end }}
                         </div>
                     </div>
 
                     <div class="authors__links">
-                        {{ if .Params.githubLink }}
-                            <div class="authors__github">
+                        <div class="authors__github">
 
-                                <a class="authors__link" href="{{ .Params.githubLink }}">
-                                    {{ partial "icon.html" (dict "icon" "github" "class" "authors__icon") }}
-                                    <p>
-                                        <span class="authors__link-text">{{ T "author_github" }}</span>
-                                    </p>
-                                </a>
-                            </div>
-                        {{ end }}
+                            <a class="authors__link" href="https://github.com/{{ $authorName }}">
+                                {{ partial "icon.html" (dict "icon" "github" "class" "authors__icon") }}
+                                <p>
+                                    <span class="authors__link-text">{{ T "author_github" }}</span>
+                                </p>
+                            </a>
+                        </div>
 
                         <div class="authors__search">
                             <a class="authors__link" href="/search/?q=author:{{ replace .Name "/index.md" ""  }}">