Update pages.yml

stephbuon · web-flow · commit e3621c93e20a · 2025-08-19T21:29:49.000-05:00
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
@@ -57,20 +57,23 @@ jobs:
         env:
           REPO_HTML_TITLE: ${{ github.repository }}
           OWNER: ${{ github.repository_owner }}
-          REPO_FULL: ${{ github.repository }}
+          REPO_FULL: ${{ github.repository }}   # owner/repo
         run: |
           set -e
           GENERATED=0
 
           # === Compute dynamic URLs ===
           REPO_NAME="${REPO_FULL#*/}"
           REPO_URL="https://github.com/${REPO_FULL}"
+
+          # Pages URL: special-case owner.github.io
           if [ "$REPO_NAME" = "${OWNER}.github.io" ]; then
             PAGES_URL="https://${OWNER}.github.io/"
           else
             PAGES_URL="https://${OWNER}.github.io/${REPO_NAME}/"
           fi
 
+          # Minimal Pandoc template (no default CSS)
           cat > pandoc_template.html <<'TPL'
           <!doctype html>
           <html>
@@ -94,24 +97,77 @@ jobs:
           if [ -f index.html ]; then
             echo "Keeping existing index.html (not regenerating)."
           elif [ -f README.md ]; then
+            echo "Generating index.html from README.md..."
             pandoc README.md -f markdown -t html -s \
               --template=pandoc_template.html \
               -o index.html \
               --metadata title="$REPO_HTML_TITLE"
             GENERATED=1
           else
+            echo "No index.html or README.md found; writing minimal page."
             printf '%s\n' '<!doctype html><html><head><meta charset="utf-8"><title>Site</title></head><body>' '<h1>Site</h1>' '<p>No README.md found. Add one and push to regenerate this page.</p>' '</body></html>' > index.html
             GENERATED=1
           fi
 
-          CSS='<style>body{font-family:Arial,Helvetica,sans-serif} ... </style>'
+          # Styles: grid layout + "full-height" painted sidebar column
+          CSS='<style>
+          html, body { width:100%; max-width:none; margin:0; padding:0; font-family: Arial, Helvetica, sans-serif; color:#222; }
+          h1, h2, h3, h4, h5, h6 { font-family: Arial, Helvetica, sans-serif; }
+          pre code { display:block; padding:.75em; background:#f6f8fa; border-radius:6px; font-size:90%; overflow:auto; }
+          code { font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; }
+
+          /* Page uses CSS Grid; paint the left column so the sidebar appears full-height */
+          .page {
+            display: grid;
+            grid-template-columns: 220px 1fr;
+            min-height: 100vh;
+            background: linear-gradient(to right, #f4f4f4 0, #f4f4f4 220px, transparent 220px);
+          }
+
+          .sidebar {
+            padding: 20px;
+            position: sticky;
+            top: 0;
+            height: 100vh;       /* sidebar content scrolls independently if long */
+            overflow: auto;
+          }
+          .sidebar a { display:block; margin-bottom:10px; color:#0366d6; text-decoration:none; font-weight:600; }
+          .sidebar a:hover { text-decoration:underline; }
+
+          .content { width: 100%; }
+          .container { width:100%; max-width: 1400px; margin: 0 auto; padding: 48px; }
+
+          /* Extras block spacing */
+          .extras { margin-top: 48px; }
+          .extras h2, .extras h3 { margin-top: 1.2em; }
+
+          @media (max-width: 1000px) {
+            .page { display:block; background:none; }
+            .sidebar { position: static; height:auto; overflow:visible; padding:16px; background:#f4f4f4; }
+            .container { max-width:100%; margin:0; padding:24px; }
+          }
+          </style>'
+
+          # Inject CSS into <head> (or wrap if missing)
           if grep -qi '</head>' index.html; then
             awk -v css="$CSS" 'BEGIN{IGNORECASE=1} { if (!done && match(tolower($0), /<\/head>/)) { sub(/<\/head>/, css"</head>"); done=1 } print }' index.html > index.html.tmp
             mv index.html.tmp index.html
+          else
+            TMP=$(mktemp)
+            printf '%s\n' '<!doctype html><html><head><meta charset="utf-8">' "$CSS" '</head><body>' > "$TMP"
+            # Keep body content (if any) after opening <body>
+            sed '1,/<body[^>]*>/d' index.html >> "$TMP" || true
+            printf '%s\n' '</body></html>' >> "$TMP"
+            mv "$TMP" index.html
           fi
 
+          # === Use dynamic Pages URL for the sidebar "Home" link ===
           HOMELINK="$PAGES_URL"
-          if ! grep -qi '<div class="page"' index.html; then
+
+          # Wrap body with grid + sidebar + content container (idempotent)
+          if grep -qi '<div class="page"' index.html; then
+            echo "Wrapper already present; skipping."
+          else
             awk -v home="$HOMELINK" 'BEGIN{IGNORECASE=1}
               {
                 if (!done && match(tolower($0), /<body[^>]*>/)) {
@@ -120,13 +176,22 @@ jobs:
                 }
                 print
               }' index.html > index.html.tmp && mv index.html.tmp index.html
+
+            # Close container/main/page before </body>
             awk 'BEGIN{IGNORECASE=1} { sub(/<\/body>/, "</div></main></div></body>"); print }' index.html > index.html.tmp && mv index.html.tmp index.html
           fi
 
+          # === Replace placeholders anywhere in the page ===
           esc() { printf '%s' "$1" | sed 's/[&/\\]/\\&/g'; }
           REPO_URL_ESC=$(esc "$REPO_URL")
           PAGES_URL_ESC=$(esc "$PAGES_URL")
-          sed -i -e "s/GITHUB_REPO_URL/${REPO_URL_ESC}/g" -e "s/GITHUB_REPO/${REPO_URL_ESC}/g" -e "s/GITHUB_PAGES_URL/${PAGES_URL_ESC}/g" index.html
+
+          sed -i \
+            -e "s/GITHUB_REPO_URL/${REPO_URL_ESC}/g" \
+            -e "s/GITHUB_REPO/${REPO_URL_ESC}/g" \
+            -e "s/GITHUB_PAGES_URL/${PAGES_URL_ESC}/g" \
+            index.html
+
           echo "generated=$GENERATED" >> "$GITHUB_OUTPUT"
 
       - name: Inject License/Citation/BibTeX block BELOW README content (inside container)
@@ -136,6 +201,7 @@ jobs:
           OWNER: ${{ github.repository_owner }}
         run: |
           set -e
+
           REPO_NAME="${REPO#*/}"
           REPO_URL="https://github.com/$REPO"
           if [ "$REPO_NAME" = "${OWNER}.github.io" ]; then
@@ -146,8 +212,32 @@ jobs:
           LAST_UPDATE=$(git log -1 --format=%cI || date -u +%Y-%m-%dT%H:%M:%SZ)
           YEAR=$(date -u -d "$LAST_UPDATE" +%Y 2>/dev/null || date -u +%Y)
 
-          citation_written="Steph Buongiorno. $REPO_NAME. $YEAR. Available at: $REPO_URL"
+          # Gather human contributors (optional enhancement)
+          logins=$(curl -s -H "Authorization: Bearer $GH_TOKEN" \
+            "https://api.github.com/repos/$REPO/contributors?per_page=100&anon=false" \
+            | jq -r '.[] | select((.type // "") != "Bot") | select(.login != "ghost") | .login' | sort -fu)
+
+          names=""
+          for u in $logins; do
+            name=$(curl -s -H "Authorization: Bearer $GH_TOKEN" "https://api.github.com/users/$u" | jq -r '.name // empty')
+            [ -z "$name" ] && name="$u"
+            if [ "$name" != "Steph Buongiorno" ] && [ "$u" != "stephbuon" ]; then
+              names="$names\n$name"
+            fi
+          done
+          names_sorted=$(printf "%b" "$names" | awk 'NF' | sort -fu)
+
+          citation_written="Steph Buongiorno"
+          if [ -n "$names_sorted" ]; then
+            citation_written="$citation_written; $(echo "$names_sorted" | paste -sd ', ' -)"
+          fi
+          citation_written="$citation_written. $REPO_NAME. $YEAR. Available at: $REPO_URL"
+
           authors_bibtex="Steph Buongiorno"
+          if [ -n "$names_sorted" ]; then
+            authors_bibtex="$authors_bibtex and $(echo "$names_sorted" | paste -sd ' and ' -)"
+          fi
+
           bibtex="@misc{$REPO_NAME-$YEAR,
             author = {$authors_bibtex},
             title = {$REPO_NAME},
@@ -156,15 +246,19 @@ jobs:
             note = {Last updated: $LAST_UPDATE}
           }"
 
+          # Build the extras HTML block (includes both URLs)
           EXTRAS=$(cat <<HTML
           <section class="extras">
             <hr>
             <h2>License</h2>
             <p>This project is licensed under the <a href="LICENSE">MIT License</a>.</p>
+
             <h2>Suggested Citation</h2>
             <p>$citation_written</p>
+
             <h3>BibTeX</h3>
             <pre><code>$bibtex</code></pre>
+
             <h3>Repository</h3>
             <p><em>$REPO_NAME</em><br>
             <a href="$REPO_URL">$REPO_URL</a><br>
@@ -174,6 +268,7 @@ jobs:
           HTML
           )
 
+          # Inject JUST BEFORE the wrapper closes: </div></main></div></body>
           awk -v block="$EXTRAS" 'BEGIN{IGNORECASE=1}
             {
               line=$0
