Feature: make issues and github stuff work outside of CYF

common-theme/hugo.toml

@@ -35,9 +35,7 @@ repo = "https://github.com/YOUR_ORG_HERE/YOUR_REPO/"
 root = "YOUR_REPO_I_THINK"
 orgapi = "https://api.github.com/repos/YOUR_ORG_HERE/"
 pdrepo = "PD-curriculum-repo"
-# We use a proxy which concatenates paginated responses, otherwise we miss results.
-# Daniel is currently hosting this code https://github.com/illicitonion/github-issue-proxy but we should work out a long-term maintainable solution to this problem.
-issuesorgapi = "https://github-issue-proxy.illicitonion.com/repos/CodeYourFuture/"
+
 
 [markup]
 [markup.tableOfContents]

common-theme/layouts/partials/block/data.html

@@ -50,7 +50,7 @@
 {{ else }}
   {{ if "github" | in $src }}
     {{/* Change base URL to api.github.com */}}
-    {{ $newSrc := replace $src "https://github.com/CodeYourFuture/" "https://api.github.com/repos/CodeYourFuture/" }}
+    {{ $newSrc := replace $src "https://github.com/" "https://api.github.com/repos/" }}
 
     {{ if (in $src "issues") }}
       {{ .Scratch.SetInMap "blockData" "type" "issue" }}

common-theme/layouts/partials/block/pullreq.html

@@ -41,7 +41,6 @@ <h2 class="e-heading__2" id="{{ $id }}">
       >See more pull requests</a
     >
   </section>
-{{ else if eq ($response | len) 0 }}
 {{ else }}
   {{ errorf "Error, fetch of %s failed: %v" $blockData.api $response }}
 {{ end }}

common-theme/layouts/partials/fetch-paginated-issues.html

@@ -0,0 +1,29 @@
+{{/* # This is a recursive partial
+  # The point is to walk the paginated issues
+  # So we don't lose coursework tasks pushed off page 1 as pull requests start piling up
+*/}}
+{{/* set the current page we are getting */}}
+{{ $issuesUrl := print .issuesUrlBase .page }}
+{{/* fetch the issues using the new style in v0.127 */}}
+{{ $pageOfIssues := resources.GetRemote $issuesUrl .headers }}
+
+{{ if eq nil $pageOfIssues }}
+  {{ errorf "🏷️ Issues not fetched: API at %s returned nil" $issuesUrl }}
+{{ else if $pageOfIssues.Err }}
+  {{ errorf "🏷️ Issues not fetched: %s" $pageOfIssues.Err }}
+{{ else }}
+  {{ if ne $pageOfIssues nil }}
+    {{ $pageOfIssues = $pageOfIssues.Content | transform.Unmarshal }}
+
+    {{/* get the issues we have so far in our Scratch.
+      This how we make these issues available to our parent partial issues.html
+    */}}
+    {{ $fetchedIssues := .Scratch.Get "issues" }}
+    {{ .Scratch.Set "issues" (append $fetchedIssues $pageOfIssues) }}
+    {{/* If we got 100 issues, there might be more. Let's fetch the next page */}}
+    {{ if eq (len $pageOfIssues) 99 }}
+      {{ $nextPage := add .page 1 }}
+      {{ partial "fetch-paginated-issues.html" (dict "Scratch" .Scratch "issuesUrlBase" .issuesUrlBase  "page" $nextPage "headers" .headers ) }}
+    {{ end }}
+  {{ end }}
+{{ end }}

common-theme/layouts/partials/issues.html

@@ -1,20 +1,25 @@
 {{ $repo := .Params.backlog }}
-{{ $issuesUrl := print .Site.Params.issuesorgapi $repo "/issues?per_page=100&state=open&direction=asc&type=issue" }}
 {{ $filter := .Params.backlog_filter }}
+{{ $issuesUrlBase := print $.Site.Params.orgapi $repo "/issues?per_page=100&state=open&direction=asc&page=" }}
 {{ $currentPath := .Page.RelPermalink }}
-<!-- api call -->
-{{ $headers := (dict) }}
-{{ if ne (os.Getenv "HUGO_CURRICULUM_GITHUB_BEARER_TOKEN") "" }}
-  {{ $headers = merge $headers (dict "Authorization" (printf "Bearer %s" (getenv "HUGO_CURRICULUM_GITHUB_BEARER_TOKEN"))) }}
+{{/* <!-- api call --> */}}
+{{ $headers := dict }}
+{{ $token := os.Getenv "HUGO_CURRICULUM_GITHUB_BEARER_TOKEN" }}
+{{ if ne $token "" }}
+  {{ $headers = dict "headers" (dict "Authorization" (print "Bearer " $token)) }}
 {{ end }}
-{{ $issues := getJSON $issuesUrl $headers }}
-<!-- if no object show error -->
+{{/* <!-- walk through paginated issues --> */}}
+{{ .Page.Scratch.Set "issues" slice }}
+{{ partial "fetch-paginated-issues.html" (dict "Scratch" .Page.Scratch "issuesUrlBase" $issuesUrlBase "currentPath" $currentPath "page" 1 "headers" $headers) }}
+{{ $issues := .Page.Scratch.Get "issues" }}
+
+{{/* <!-- if no object show error --> */}}
 {{ if ne $issues nil }}
-  <!-- range over issues list and pull out useful data -->
+  {{/* <!-- range over issues list and pull out useful data --> */}}
   {{ range $issues }}
 
     {{ $showIssue := true }}
-    <!-- if a filter exists, only show issues with the right label -->
+    {{/* <!-- if a filter exists, only show issues with the right label --> */}}
     {{ if $filter }}
       {{ $showIssue = false }}
       {{ range .labels }}
@@ -25,7 +30,7 @@
         {{ end }}
       {{ end }}
     {{ end }}
-    <!-- now show the issue -->
+    {{/* <!-- now show the issue --> */}}
     {{ if $showIssue }}
       {{ if strings.Contains .body "_No response_" }}
         {{ errorf "Issue %s contains _No response_ - please edit the issue to remove it." .html_url }}
@@ -64,5 +69,5 @@
     {{ end }}
   {{ end }}
 {{ else }}
-  {{ errorf "Error, fetch of %s failed: %v" $issuesUrl $issues }}
+  {{ errorf "Error, fetch of %s failed: %v" $issuesUrlBase $issues }}
 {{ end }}

common-theme/layouts/shortcodes/contributors.html

@@ -1,18 +1,25 @@
-{{ $repo := .Get 0 }}
+{{ $repo := .Get 0 |default $.Site.Params.orgapi }}
 {{ $headers := (dict) }}
 {{ if ne (os.Getenv "HUGO_CURRICULUM_GITHUB_BEARER_TOKEN") "" }}
   {{ $headers = merge $headers (dict "Authorization" (printf "Bearer %s" (getenv "HUGO_CURRICULUM_GITHUB_BEARER_TOKEN"))) }}
 {{ end }}
-{{ $contributors := getJSON (printf "%s%s/contributors" $.Site.Params.orgapi $repo) $headers }}
+{{ $contributors := printf "%s/contributors" $repo }}
+{{ $contributors := resources.GetRemote $contributors $headers }}
 
+{{ if $contributors.Err }}
+  {{ errorf "🏷️ No contributors: %s . Error: %s" $repo $contributors.Err }}
+{{ else }}
+  {{ $contributors = $contributors.Content | transform.Unmarshal }}
 
-<ol class="c-contributors">
-  {{ range sort $contributors ".contributions" "desc" }}
-    <li class="c-contributor">
-      <h3 class="c-contributor__name">
-        <a class="c-contributor__link" href="{{ .html_url }}">{{ .login }}</a>
-      </h3>
-      <img class="c-contributor__avatar" src="{{ .avatar_url }}" alt="" />
-    </li>
-  {{ end }}
-</ol>
+
+  <ol class="c-contributors">
+    {{ range sort $contributors ".contributions" "desc" }}
+      <li class="c-contributor">
+        <h3 class="c-contributor__name">
+          <a class="c-contributor__link" href="{{ .html_url }}">{{ .login }}</a>
+        </h3>
+        <img class="c-contributor__avatar" src="{{ .avatar_url }}" alt="" />
+      </li>
+    {{ end }}
+  </ol>
+{{ end }}

org-cyf-guides/content/contributing/contributors/index.md

@@ -8,11 +8,11 @@ emoji: 🧑🏿‍🤝‍🧑🏿
 
 ## ⏳ 2023 Curriculum
 
-{{< contributors "curriculum">}}
+{{< contributors "https://api.github.com/repos/CodeYourFuture/curriculum" >}}
 
 ## ⌛ [2020 Syllabus](https://syllabus.codeyourfuture.io/)
 
-{{< contributors "syllabus">}}
+{{< contributors "https://api.github.com/repos/CodeYourFuture/syllabus" >}}
 
 ➕➕ Plus hundreds of volunteers who have contributed to the curriculum and classes since 2016.
 

org-cyf-guides/hugo.toml

@@ -37,9 +37,6 @@ repo = "https://github.com/CodeYourFuture/curriculum/"
 pdrepo = "CYF-PD"
 root = "curriculum"
 orgapi = "https://api.github.com/repos/CodeYourFuture/"
-# We use a proxy which concatenates paginated responses, otherwise we miss results.
-# Daniel is currently hosting this code https://github.com/illicitonion/github-issue-proxy but we should work out a long-term maintainable solution to this problem.
-issuesorgapi = "https://github-issue-proxy.illicitonion.com/repos/CodeYourFuture/"
 
 
 [caches.getjson]

org-cyf-guides/package.json

@@ -5,8 +5,8 @@
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "start:dev": "dotenv -e ../.env -- hugo server --environment issues-are-cached-and-incomplete",
-    "build:dev": "dotenv -e ../.env  -- hugo --environment issues-are-cached-and-incomplete"
+    "start:dev": "dotenv -e ../.env -- hugo server --environment development",
+    "build:dev": "dotenv -e ../.env  -- hugo --environment development"
   },
   "keywords": [],
   "author": "",

org-cyf-itp/hugo.toml

@@ -47,10 +47,6 @@ repo = "https://github.com/CodeYourFuture/curriculum/"
 pdrepo = "CYF-PD"
 root = "curriculum"
 orgapi = "https://api.github.com/repos/CodeYourFuture/"
-# We use a proxy which concatenates paginated responses, otherwise we miss results.
-# Daniel is currently hosting this code https://github.com/illicitonion/github-issue-proxy but we should work out a long-term maintainable solution to this problem.
-issuesorgapi = "https://github-issue-proxy.illicitonion.com/repos/CodeYourFuture/"
-
 
 [caches.getjson]
 # Disable caching of fetches - we want every build to get up to date content for issues, so that if people make clarifications or fixes to issues, we pick them up.

org-cyf-itp/package.json

@@ -5,8 +5,8 @@
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "start:dev": "dotenv -e ../.env -- hugo server --environment issues-are-cached-and-incomplete",
-    "build:dev": "dotenv -e ../.env  -- hugo --environment issues-are-cached-and-incomplete"
+    "start:dev": "dotenv -e ../.env -- hugo server --environment development",
+    "build:dev": "dotenv -e ../.env  -- hugo --environment development"
   },
   "keywords": [],
   "author": "",

org-cyf-piscine/hugo.toml

@@ -40,9 +40,6 @@ repo = "https://github.com/CodeYourFuture/curriculum/"
 pdrepo = "CYF-PD"
 root = "curriculum"
 orgapi = "https://api.github.com/repos/CodeYourFuture/"
-# We use a proxy which concatenates paginated responses, otherwise we miss results.
-# Daniel is currently hosting this code https://github.com/illicitonion/github-issue-proxy but we should work out a long-term maintainable solution to this problem.
-issuesorgapi = "https://github-issue-proxy.illicitonion.com/repos/CodeYourFuture/"
 
 
 [caches.getjson]

org-cyf-piscine/package.json

@@ -5,8 +5,8 @@
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "start:dev": "dotenv -e ../.env -- hugo server --environment issues-are-cached-and-incomplete",
-    "build:dev": "dotenv -e ../.env  -- hugo --environment issues-are-cached-and-incomplete"
+    "start:dev": "dotenv -e ../.env -- hugo server --environment development",
+    "build:dev": "dotenv -e ../.env  -- hugo --environment development"
   },
   "keywords": [],
   "author": "",

org-cyf-sdc/hugo.toml

@@ -45,9 +45,6 @@ repo = "https://github.com/CodeYourFuture/curriculum/"
 pdrepo = "CYF-PD"
 root = "curriculum"
 orgapi = "https://api.github.com/repos/CodeYourFuture/"
-# We use a proxy which concatenates paginated responses, otherwise we miss results.
-# Daniel is currently hosting this code https://github.com/illicitonion/github-issue-proxy but we should work out a long-term maintainable solution to this problem.
-issuesorgapi = "https://github-issue-proxy.illicitonion.com/repos/CodeYourFuture/"
 
 
 [caches.getjson]

org-cyf-sdc/package.json

@@ -5,8 +5,8 @@
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "start:dev": "dotenv -e ../.env -- hugo server --environment issues-are-cached-and-incomplete",
-    "build:dev": "dotenv -e ../.env  -- hugo --environment issues-are-cached-and-incomplete"
+    "start:dev": "dotenv -e ../.env -- hugo server --environment development",
+    "build:dev": "dotenv -e ../.env  -- hugo --environment development"
   },
   "keywords": [],
   "author": "",

org-cyf/hugo.toml

@@ -46,10 +46,6 @@ repo = "https://github.com/CodeYourFuture/curriculum/"
 pdrepo = "CYF-PD"
 root = "curriculum"
 orgapi = "https://api.github.com/repos/CodeYourFuture/"
-# We use a proxy which concatenates paginated responses, otherwise we miss results.
-# Daniel is currently hosting this code https://github.com/illicitonion/github-issue-proxy but we should work out a long-term maintainable solution to this problem.
-issuesorgapi = "https://github-issue-proxy.illicitonion.com/repos/CodeYourFuture/"
-
 
 [caches.getjson]
 # Disable caching of fetches - we want every build to get up to date content for issues, so that if people make clarifications or fixes to issues, we pick them up.

org-cyf/package.json

@@ -5,8 +5,8 @@
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "start:dev": "dotenv -e ../.env -- hugo server --environment issues-are-cached-and-incomplete",
-    "build:dev": "dotenv -e ../.env  -- hugo --environment issues-are-cached-and-incomplete"
+    "start:dev": "dotenv -e ../.env -- hugo server --environment development",
+    "build:dev": "dotenv -e ../.env  -- hugo --environment development"
   },
   "keywords": [],
   "author": "",

org-mcb/config/issues-are-cached-and-incomplete/config.toml

@@ -0,0 +1,12 @@
+# This config is optimised for speed of local interation of general Hugo set-up without worrying about issue freshness or completeness.
+# To build with this config, run `hugo server --environment issues-are-cached-and-incomplete`.
+
+[params]
+# Don't use the paginating proxy, because it's slow.
+# This means some issues will be missing when fetched.
+issuesorgapi = "https://api.github.com/repos/Migracode-Barcelona/"
+
+[caches.getjson]
+# Cache JSON responses because making fetches is slow when iterating.
+# This means updates to issues (or newly created ones) won't be picked up when rebuilding.
+maxAge = "4h"