Docsy v0.11.0 (#465)

* Remove deprecated DisqusShortname sections * Switch deprecated getJSON to transform.Unmarshal https://gohugo.io/functions/data/getjson/ * Update to docsy v0.11.0 * Update hugo version to 0.139.3
NeuroDesk · Dec 10, 2024 · 1f3d5dc · 1f3d5dc
1 parent c895a4e
commit 1f3d5dc
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 17 deletions.
diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -26,7 +26,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     env:
-      HUGO_VERSION: 0.123.6
+      HUGO_VERSION: 0.139.3
     steps:
       - name: Install Hugo CLI
         run: |

diff --git a/go.mod b/go.mod
@@ -3,6 +3,6 @@ module github.com/neurodesk/neurodesk.github.io
 go 1.19
 
 require (
-	github.com/google/docsy v0.10.0 // indirect
+	github.com/google/docsy v0.11.0 // indirect
 	github.com/google/docsy/dependencies v0.7.2 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -2,6 +2,7 @@ github.com/FortAwesome/Font-Awesome v0.0.0-20220831210243-d3a7818c253f/go.mod h1
 github.com/FortAwesome/Font-Awesome v0.0.0-20230327165841-0698449d50f2/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo=
 github.com/FortAwesome/Font-Awesome v0.0.0-20240108205627-a1232e345536/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo=
 github.com/FortAwesome/Font-Awesome v0.0.0-20240402185447-c0f460dca7f7/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo=
+github.com/FortAwesome/Font-Awesome v0.0.0-20240716171331-37eff7fa00de/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo=
 github.com/google/docsy v0.6.0 h1:43bVF18t2JihAamelQjjGzx1vO2ljCilVrBgetCA8oI=
 github.com/google/docsy v0.6.0/go.mod h1:VKKLqD8PQ7AglJc98yBorATfW7GrNVsn0kGXVYF6G+M=
 github.com/google/docsy v0.7.1 h1:DUriA7Nr3lJjNi9Ulev1SfiG1sUYmvyDeU4nTp7uDxY=
@@ -10,6 +11,8 @@ github.com/google/docsy v0.9.1 h1:+jqges1YCd+yHeuZ1BUvD8V8mEGVtPxULg5j/vaJ984=
 github.com/google/docsy v0.9.1/go.mod h1:saOqKEUOn07Bc0orM/JdIF3VkOanHta9LU5Y53bwN2U=
 github.com/google/docsy v0.10.0 h1:6tMDacPwAyRWNCfvsn/9qGOZDQ8b0aRzjRZvnZPY5dg=
 github.com/google/docsy v0.10.0/go.mod h1:c0nIAqmRTOuJ01F85U/wJPQtc3Zj9N58Kea9bOT2AJc=
+github.com/google/docsy v0.11.0 h1:QnV40cc28QwS++kP9qINtrIv4hlASruhC/K3FqkHAmM=
+github.com/google/docsy v0.11.0/go.mod h1:hGGW0OjNuG5ZbH5JRtALY3yvN8ybbEP/v2iaK4bwOUI=
 github.com/google/docsy/dependencies v0.6.0/go.mod h1:EDGc2znMbGUw0RW5kWwy2oGgLt0iVXBmoq4UOqstuNE=
 github.com/google/docsy/dependencies v0.7.1/go.mod h1:gihhs5gmgeO+wuoay4FwOzob+jYJVyQbNaQOh788lD4=
 github.com/google/docsy/dependencies v0.7.2 h1:+t5ufoADQAj4XneFphz4A+UU0ICAxmNaRHVWtMYXPSI=

diff --git a/layouts/applications/single.html b/layouts/applications/single.html
@@ -30,8 +30,21 @@ <h1>{{ .Title }}</h1>
 		  >
 
 		<ul id="list">
-
-		{{ $applist := getJSON "https://raw.githubusercontent.com/NeuroDesk/neurocommand/main/cvmfs/applist.json" }}
+
+		{{ $applist := dict }}
+		{{ $url := "https://raw.githubusercontent.com/NeuroDesk/neurocommand/main/cvmfs/applist.json" }}
+		{{ with resources.GetRemote $url }}
+		{{ with .Err }}
+			{{ errorf "%s" . }}
+		{{ else }}
+			{{ $applist = . | transform.Unmarshal }}
+		{{ end }}
+		{{ else }}
+		{{ errorf "Unable to get remote resource %q" $url }}
+		{{ end }}
+
+
+		{{/*  {{ $applist := getJSON "https://raw.githubusercontent.com/NeuroDesk/neurocommand/main/cvmfs/applist.json" }}  */}}
 		{{ range $applist.list }}
 		<li>	
 			{{ .application }} 
@@ -46,10 +59,6 @@ <h1>{{ .Title }}</h1>
 		{{ partial "feedback.html" .Site.Params.ui.feedback }}
 		<br />
 	{{ end }}
-	{{ if (.Site.DisqusShortname) }}
-		<br />
-		{{ partial "disqus-comment.html" . }}
-	{{ end }}
 	{{ partial "page-meta-lastmod.html" . }}
 </div>
 {{ end }}
diff --git a/layouts/developers/list.html b/layouts/developers/list.html
@@ -14,10 +14,6 @@ <h1>{{ .Title }}</h1>
 		{{ partial "feedback.html" .Site.Params.ui.feedback -}}
 		<br />
 	{{ end -}}
-	{{ if (.Site.DisqusShortname) -}}
-		<br />
-		{{- partial "disqus-comment.html" . -}}
-	{{ end -}}
 	{{ partial "page-meta-lastmod.html" . -}}
 </div>
 {{ end -}}
diff --git a/layouts/index.json b/layouts/index.json
@@ -1 +1,12 @@
-{{- getJSON "https://raw.githubusercontent.com/NeuroDesk/neurocommand/main/cvmfs/applist.json" | jsonify -}}
+{{ $data := dict }}
+{{ $url := "https://raw.githubusercontent.com/NeuroDesk/neurocommand/main/cvmfs/applist.json" }}
+{{ with resources.GetRemote $url }}
+  {{ with .Err }}
+    {{ errorf "%s" . }}
+  {{ else }}
+    {{ $data = . | transform.Unmarshal }}
+  {{ end }}
+{{ else }}
+  {{ errorf "Unable to get remote resource %q" $url }}
+{{ end }}
+{{ $data | jsonify }}
diff --git a/layouts/tutorials-examples/list.html b/layouts/tutorials-examples/list.html
@@ -14,10 +14,6 @@ <h1>{{ .Title }}</h1>
 		{{ partial "feedback.html" .Site.Params.ui.feedback -}}
 		<br />
 	{{ end -}}
-	{{ if (.Site.DisqusShortname) -}}
-		<br />
-		{{- partial "disqus-comment.html" . -}}
-	{{ end -}}
 	{{ partial "page-meta-lastmod.html" . -}}
 </div>
 {{ end -}}