Updates to bring fix deprecated config items, fix local search

Author: stumbo

.github/workflows/gh-pages.yml

@@ -77,7 +77,7 @@ jobs:
         env:
           cache-name: cache-zotero_bib
         with:
-          path: ~/data
+          path: ~/static/data
           key: ${{ needs.check.outputs.zoteroVersion }}
           restore-keys: |
             ${{ needs.check.outputs.zoteroVersion }}
@@ -88,14 +88,14 @@ jobs:
         run: |
           if [[ "$CACHE_HIT" == 'true' ]]; then
             echo "Use Cache"
-            sudo cp --recursive ~/data ${GITHUB_WORKSPACE}
-            ls -la ${GITHUB_WORKSPACE}/data
+            sudo cp --recursive ~/static/data ${GITHUB_WORKSPACE}
+            ls -la ${GITHUB_WORKSPACE}/static/data
           else
             echo "Retrieve bibliography"
             cd scripts
             chmod +x ./update_bibliography.sh
             ./update_bibliography.sh
-            sudo cp --recursive ${GITHUB_WORKSPACE}/data ~/data
+            sudo cp --recursive ${GITHUB_WORKSPACE}/static/data ~/static/data
           fi 
         shell: bash
 

content/en/history/bibliography/_index.md

@@ -13,5 +13,4 @@ aliases:
 
 (This bibliography is kept in sync with our [Zotero](https://www.zotero.org/) collection [Library](https://www.zotero.org/groups/2914042/interlisp/library).
 
-
 {{< bibTable >}}

go.sum

@@ -1,7 +1,11 @@
 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/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/dependencies v0.6.0/go.mod h1:EDGc2znMbGUw0RW5kWwy2oGgLt0iVXBmoq4UOqstuNE=
 github.com/google/docsy/dependencies v0.7.2 h1:+t5ufoADQAj4XneFphz4A+UU0ICAxmNaRHVWtMYXPSI=
 github.com/google/docsy/dependencies v0.7.2/go.mod h1:gihhs5gmgeO+wuoay4FwOzob+jYJVyQbNaQOh788lD4=
 github.com/twbs/bootstrap v4.6.2+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0=

hugo.toml

@@ -7,6 +7,8 @@ enableRobotsTXT = true
 
 assetDir = "static"
 
+
+
 # ****************************************************************************
 #
 # Docsy
@@ -214,6 +216,7 @@ sidebar_search_disable = false
 navbar_logo = true
 # Set to true to disable the About link in the site footer
 footer_about_enable = false
+
 # Turn off transparency in nav bar
 navbar_translucent_over_cover_disable = true
 
@@ -278,3 +281,10 @@ enable = false
 #   url = "https://example.org/mail"
 #   icon = "fa fa-envelope"
 #   desc = "Discuss development issues around the project"
+
+[params.cdn]
+  jquery = 'https://code.jquery.com/jquery-3.7.1.min.js'
+	jquery_hash = 'sha256-/JqT3SQfawRcv/BIHPThkBvs0OEvtFFmqPF/lYI/Cxo='
+
+[params.csp]
+  scriptsrc = ["'self'", "'unsafe-inline'", "https://code.jquery.com"]

layouts/partials/hooks/body-end.html

@@ -1,3 +1,4 @@
 <!-- ><script type="text/javascript" src="/js/carousel.js"></script>
+	<script src="https://code.jquery.com/jquery-3.7.1.min.js" integrity="sha256-/JqT3SQfawRcv/BIHPThkBvs0OEvtFFmqPF/lYI/Cxo=" crossorigin="anonymous"></script>
 <link rel="stylesheet" href="/css/carousel.css"> -->
 <link rel="stylesheet" href="/css/custom.css">

layouts/shortcodes/bibTable.html

@@ -165,7 +165,15 @@
       </tr>
     </thead>
     <tbody style="overflow:auto">
-      {{ $years_items := getJSON "data/bibliography.json" }}
+      {{ $years_items := dict }}
+      {{ $bib := resources.Get "data/bibliography.json" }}
+      {{ with $bib }}
+        {{ with . | transform.Unmarshal }}
+          {{ $years_items = . }}
+        {{ end }}
+      {{ else }}
+        {{ errorf "Unable to get global resource 'data/bibliography.json'" }}
+      {{ end }}
       {{ range $year, $items := $years_items }}
         <tr>
           <th class="year"><b>{{ $year }}</b></th>

package-lock.json

@@ -12,9 +12,11 @@
 
   "dependencies": {
 
+    "jquery": "^3.7.1",
+
     "tabpanel": "^0.2.0"
 
   }
-  
+
 }
 

package.json

@@ -102,4 +102,4 @@ items=$(jq 'include "./bib-fns";map(reconstituteGroupedEntries) | from_entries'
 
 echo "Outputting CSL JSON"
 echo "$finalCount entries"
-echo "$items" > "$(dirname "$0")/../data/bibliography.json"
+echo "$items" > "$(dirname "$0")/../static/data/bibliography.json"