nate/Siteforge
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix lint errors, upgrade react-simple-maps to v5 (clears high vuln), My Notes: search other studies + Markdown download; v2.42.2
Publish Container / build (push) Has been cancelled
Details

Browse Source 
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
nmemmertandClaude Sonnet 5.5 committed 2026-10-15 08:08:08 -04:00
1 parent cf8835119e
commit 401fd451de
5 files changed
+233 -90
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

package-lock.json
Generated
+172 -76
View File
@@ -1,12 +1,12 @@
{ {
"name": "siteforge", "name": "siteforge",
"version": "2.42.0", "version": "2.42.1",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "siteforge", "name": "siteforge",
"version": "2.42.0", "version": "2.42.1",
"dependencies": { "dependencies": {
"@aws-sdk/client-s3": "^3.1135.0", "@aws-sdk/client-s3": "^3.1135.0",
"@dnd-kit/core": "^6.3.1", "@dnd-kit/core": "^6.3.1",
@@ -32,7 +32,7 @@
"react-dom": "^19.2.4", "react-dom": "^19.2.4",
"react-markdown": "^10.1.0", "react-markdown": "^10.1.0",
"react-router-dom": "^7.13.1", "react-router-dom": "^7.13.1",
"react-simple-maps": "^3.0.0", "react-simple-maps": "^5.0.5",
"remark-gfm": "^4.0.1", "remark-gfm": "^4.0.1",
"resend": "^6.10.0", "resend": "^6.10.0",
"tar": "^7.5.19" "tar": "^7.5.19"
@@ -3744,6 +3744,46 @@
"node": ">=12" "node": ">=12"
} }
}, },
"node_modules/@types/d3-color": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.3.tgz",
"integrity": "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==",
"license": "MIT"
},
"node_modules/@types/d3-geo": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/@types/d3-geo/-/d3-geo-3.1.1.tgz",
"integrity": "sha512-65Emv9fQiQQqphLlRkuQ5ypPsOmWPhtBGCMv61JDPEPMvsx+gzhGf74yw1a78xFKPj6zw4AgQICJoQv0vK9M2w==",
"license": "MIT",
"dependencies": {
"@types/geojson": "*"
}
},
"node_modules/@types/d3-interpolate": {
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz",
"integrity": "sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==",
"license": "MIT",
"dependencies": {
"@types/d3-color": "*"
}
},
"node_modules/@types/d3-selection": {
"version": "3.0.12",
"resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-3.0.12.tgz",
"integrity": "sha512-Qe/KWYhEiIIxGs7HrAAjMfShxKldx19SJtr5zu53f3afPsdZNz7HHtdTLXo/kqeiWNXVycI24kSnfzBYkTzpgw==",
"license": "MIT"
},
"node_modules/@types/d3-zoom": {
"version": "3.0.9",
"resolved": "https://registry.npmjs.org/@types/d3-zoom/-/d3-zoom-3.0.9.tgz",
"integrity": "sha512-0sE1406XBYJGiqD3AusTl9ZqC//2mIXix51tbom25gDCA8ri4xnSZg28CaSE8Srl6FClqABUKfsn0qghgdepMA==",
"license": "MIT",
"dependencies": {
"@types/d3-interpolate": "*",
"@types/d3-selection": "*"
}
},
"node_modules/@types/debug": { "node_modules/@types/debug": {
"version": "4.1.13", "version": "4.1.13",
"resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.13.tgz", "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.13.tgz",
@@ -3768,6 +3808,12 @@
"@types/estree": "*" "@types/estree": "*"
} }
}, },
"node_modules/@types/geojson": {
"version": "7946.0.16",
"resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.16.tgz",
"integrity": "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==",
"license": "MIT"
},
"node_modules/@types/hast": { "node_modules/@types/hast": {
"version": "3.0.5", "version": "3.0.5",
"resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.5.tgz", "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.5.tgz",
@@ -3846,6 +3892,15 @@
"dev": true, "dev": true,
"license": "MIT" "license": "MIT"
}, },
"node_modules/@types/topojson-specification": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/@types/topojson-specification/-/topojson-specification-1.0.5.tgz",
"integrity": "sha512-C7KvcQh+C2nr6Y2Ub4YfgvWvWCgP2nOQMtfhlnwsRL4pYmmwzBS7HclGiS87eQfDOU/DLQpX6GEscviaz4yLIQ==",
"license": "MIT",
"dependencies": {
"@types/geojson": "*"
}
},
"node_modules/@types/trusted-types": { "node_modules/@types/trusted-types": {
"version": "2.0.7", "version": "2.0.7",
"resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz", "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
@@ -4958,99 +5013,132 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/d3-array": { "node_modules/d3-array": {
"version": "2.12.1", "version": "3.2.4",
"resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz", "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz",
"integrity": "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==", "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
"license": "BSD-3-Clause", "license": "ISC",
"dependencies": { "dependencies": {
"internmap": "^1.0.0" "internmap": "1 - 2"
},
"engines": {
"node": ">=12"
} }
}, },
"node_modules/d3-color": { "node_modules/d3-color": {
"version": "2.0.0", "version": "3.1.0",
"resolved": "https://registry.npmjs.org/d3-color/-/d3-color-2.0.0.tgz", "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz",
"integrity": "sha512-SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ==", "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==",
"license": "BSD-3-Clause" "license": "ISC",
"engines": {
"node": ">=12"
}
}, },
"node_modules/d3-dispatch": { "node_modules/d3-dispatch": {
"version": "2.0.0", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-2.0.0.tgz", "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz",
"integrity": "sha512-S/m2VsXI7gAti2pBoLClFFTMOO1HTtT0j99AuXLoGFKO6deHDdnv6ZGTxSTTUTgO1zVcv82fCOtDjYK4EECmWA==", "integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==",
"license": "BSD-3-Clause" "license": "ISC",
"engines": {
"node": ">=12"
}
}, },
"node_modules/d3-drag": { "node_modules/d3-drag": {
"version": "2.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-2.0.0.tgz", "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-3.0.0.tgz",
"integrity": "sha512-g9y9WbMnF5uqB9qKqwIIa/921RYWzlUDv9Jl1/yONQwxbOfszAWTCm8u7HOTgJgRDXiRZN56cHT9pd24dmXs8w==", "integrity": "sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==",
"license": "BSD-3-Clause", "license": "ISC",
"dependencies": { "dependencies": {
"d3-dispatch": "1 - 2", "d3-dispatch": "1 - 3",
"d3-selection": "2" "d3-selection": "3"
},
"engines": {
"node": ">=12"
} }
}, },
"node_modules/d3-ease": { "node_modules/d3-ease": {
"version": "2.0.0", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-2.0.0.tgz", "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz",
"integrity": "sha512-68/n9JWarxXkOWMshcT5IcjbB+agblQUaIsbnXmrzejn2O82n3p2A9R2zEB9HIEFWKFwPAEDDN8gR0VdSAyyAQ==", "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==",
"license": "BSD-3-Clause" "license": "BSD-3-Clause",
"engines": {
"node": ">=12"
}
}, },
"node_modules/d3-geo": { "node_modules/d3-geo": {
"version": "2.0.2", "version": "3.1.1",
"resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-2.0.2.tgz", "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.1.tgz",
"integrity": "sha512-8pM1WGMLGFuhq9S+FpPURxic+gKzjluCD/CHTuUF3mXMeiCo0i6R0tO1s4+GArRFde96SLcW/kOFRjoAosPsFA==", "integrity": "sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==",
"license": "BSD-3-Clause", "license": "ISC",
"dependencies": { "dependencies": {
"d3-array": "^2.5.0" "d3-array": "2.5.0 - 3"
},
"engines": {
"node": ">=12"
} }
}, },
"node_modules/d3-interpolate": { "node_modules/d3-interpolate": {
"version": "2.0.1", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-2.0.1.tgz", "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
"integrity": "sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ==", "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==",
"license": "BSD-3-Clause", "license": "ISC",
"dependencies": { "dependencies": {
"d3-color": "1 - 2" "d3-color": "1 - 3"
},
"engines": {
"node": ">=12"
} }
}, },
"node_modules/d3-selection": { "node_modules/d3-selection": {
"version": "2.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-2.0.0.tgz", "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz",
"integrity": "sha512-XoGGqhLUN/W14NmaqcO/bb1nqjDAw5WtSYb2X8wiuQWvSZUsUVYsOSkOybUrNvcBjaywBdYPy03eXHMXjk9nZA==", "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==",
"license": "BSD-3-Clause" "license": "ISC",
"engines": {
"node": ">=12"
}
}, },
"node_modules/d3-timer": { "node_modules/d3-timer": {
"version": "2.0.0", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-2.0.0.tgz", "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz",
"integrity": "sha512-TO4VLh0/420Y/9dO3+f9abDEFYeCUr2WZRlxJvbp4HPTQcSylXNiL6yZa9FIUvV1yRiFufl1bszTCLDqv9PWNA==", "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==",
"license": "BSD-3-Clause" "license": "ISC",
"engines": {
"node": ">=12"
}
}, },
"node_modules/d3-transition": { "node_modules/d3-transition": {
"version": "2.0.0", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-2.0.0.tgz", "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-3.0.1.tgz",
"integrity": "sha512-42ltAGgJesfQE3u9LuuBHNbGrI/AJjNL2OAUdclE70UE6Vy239GCBEYD38uBPoLeNsOhFStGpPI0BAOV+HMxog==", "integrity": "sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==",
"license": "BSD-3-Clause", "license": "ISC",
"dependencies": { "dependencies": {
"d3-color": "1 - 2", "d3-color": "1 - 3",
"d3-dispatch": "1 - 2", "d3-dispatch": "1 - 3",
"d3-ease": "1 - 2", "d3-ease": "1 - 3",
"d3-interpolate": "1 - 2", "d3-interpolate": "1 - 3",
"d3-timer": "1 - 2" "d3-timer": "1 - 3"
},
"engines": {
"node": ">=12"
}, },
"peerDependencies": { "peerDependencies": {
"d3-selection": "2" "d3-selection": "2 - 3"
} }
}, },
"node_modules/d3-zoom": { "node_modules/d3-zoom": {
"version": "2.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-2.0.0.tgz", "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-3.0.0.tgz",
"integrity": "sha512-fFg7aoaEm9/jf+qfstak0IYpnesZLiMX6GZvXtUSdv8RH2o4E2qeelgdU09eKS6wGuiGMfcnMI0nTIqWzRHGpw==", "integrity": "sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==",
"license": "BSD-3-Clause", "license": "ISC",
"dependencies": { "dependencies": {
"d3-dispatch": "1 - 2", "d3-dispatch": "1 - 3",
"d3-drag": "2", "d3-drag": "2 - 3",
"d3-interpolate": "1 - 2", "d3-interpolate": "1 - 3",
"d3-selection": "2", "d3-selection": "2 - 3",
"d3-transition": "2" "d3-transition": "2 - 3"
},
"engines": {
"node": ">=12"
} }
}, },
"node_modules/data-view-buffer": { "node_modules/data-view-buffer": {
@@ -6650,10 +6738,13 @@
} }
}, },
"node_modules/internmap": { "node_modules/internmap": {
"version": "1.0.1", "version": "2.0.3",
"resolved": "https://registry.npmjs.org/internmap/-/internmap-1.0.1.tgz", "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
"integrity": "sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==", "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==",
"license": "ISC" "license": "ISC",
"engines": {
"node": ">=12"
}
}, },
"node_modules/ip-address": { "node_modules/ip-address": {
"version": "10.7.4", "version": "10.7.4",
@@ -9775,20 +9866,25 @@
} }
}, },
"node_modules/react-simple-maps": { "node_modules/react-simple-maps": {
"version": "3.0.0", "version": "5.0.5",
"resolved": "https://registry.npmjs.org/react-simple-maps/-/react-simple-maps-3.0.0.tgz", "resolved": "https://registry.npmjs.org/react-simple-maps/-/react-simple-maps-5.0.5.tgz",
"integrity": "sha512-vKNFrvpPG8Vyfdjnz5Ne1N56rZlDfHXv5THNXOVZMqbX1rWZA48zQuYT03mx6PAKanqarJu/PDLgshIZAfHHqw==", "integrity": "sha512-I8fROu8ESwUOnmYOwqr9IBV6DDuAIXDrTZOqaRv5IuxIKUI3qawmCeiSxGFB5szY25LzZcflzb1LHRqGW+estA==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"d3-geo": "^2.0.2", "@types/d3-geo": "^3.1.1",
"d3-selection": "^2.0.0", "@types/d3-zoom": "^3.0.8",
"d3-zoom": "^2.0.0", "@types/geojson": "^7946.0.13",
"@types/topojson-specification": "^1.0.5",
"d3-color": "^3.1.0",
"d3-geo": "^3.1.0",
"d3-interpolate": "^3.0.1",
"d3-selection": "^3.0.0",
"d3-zoom": "^3.0.0",
"topojson-client": "^3.1.0" "topojson-client": "^3.1.0"
}, },
"peerDependencies": { "peerDependencies": {
"prop-types": "^15.7.2", "react": "^16.8.0 || 17.x || 18.x || 19.x",
"react": "^16.8.0 || 17.x || 18.x", "react-dom": "^16.8.0 || 17.x || 18.x || 19.x"
"react-dom": "^16.8.0 || 17.x || 18.x"
} }
}, },
"node_modules/readable-stream": { "node_modules/readable-stream": {
package.json
+2 -2
View File
@@ -1,7 +1,7 @@
{ {
"name": "siteforge", "name": "siteforge",
"private": true, "private": true,
"version": "2.42.1", "version": "2.42.2",
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",
@@ -38,7 +38,7 @@
"react-dom": "^19.2.4", "react-dom": "^19.2.4",
"react-markdown": "^10.1.0", "react-markdown": "^10.1.0",
"react-router-dom": "^7.13.1", "react-router-dom": "^7.13.1",
"react-simple-maps": "^3.0.0", "react-simple-maps": "^5.0.5",
"remark-gfm": "^4.0.1", "remark-gfm": "^4.0.1",
"resend": "^6.10.0", "resend": "^6.10.0",
"tar": "^7.5.19" "tar": "^7.5.19"
src/App.css
+3
View File
@@ -14162,3 +14162,6 @@ a.sl-pager-link:hover { border-color: rgba(201, 168, 76, 0.6); transform: transl
.notes-reader-meta { margin: 0.25rem 0 1rem; font-size: 0.82rem; color: #7a7060; } .notes-reader-meta { margin: 0.25rem 0 1rem; font-size: 0.82rem; color: #7a7060; }
.notes-copy-btn { background: none; border: 0; padding: 0; color: #c9a84c; cursor: pointer; font: inherit; text-decoration: underline; } .notes-copy-btn { background: none; border: 0; padding: 0; color: #c9a84c; cursor: pointer; font: inherit; text-decoration: underline; }
.notes-copy-btn:hover { color: #e3c46a; } .notes-copy-btn:hover { color: #e3c46a; }
.notes-other-matches { margin-top: 1rem; }
.notes-export-btn { margin-top: 1rem; width: 100%; }
src/studyPages.tsx
+56 -7
View File
@@ -240,6 +240,10 @@ function getReleaseDateDisplay(section: StudySection): string {
return date.toLocaleDateString('en-US', { month: 'short', day: 'numeric', year: 'numeric' }) return date.toLocaleDateString('en-US', { month: 'short', day: 'numeric', year: 'numeric' })
} }
function isFutureDate(iso: string) {
return new Date(iso).getTime() > Date.now()
}
function getNoteId(studySlug: string, sectionId: string) { function getNoteId(studySlug: string, sectionId: string) {
return `${studySlug}--${sectionId}` return `${studySlug}--${sectionId}`
} }
@@ -1020,7 +1024,7 @@ export function StudyLandingPage({ content }: Props) {
<ul className="study-track-facts"> <ul className="study-track-facts">
{variant === 'planned' ? ( {variant === 'planned' ? (
<li> <li>
{study.startsAt && new Date(study.startsAt).getTime() > Date.now() {study.startsAt && isFutureDate(study.startsAt)
? `Starts ${new Date(study.startsAt).toLocaleDateString('en-US', { weekday: 'long', month: 'long', day: 'numeric' })}` ? `Starts ${new Date(study.startsAt).toLocaleDateString('en-US', { weekday: 'long', month: 'long', day: 'numeric' })}`
: 'Preparing lesson structure and media'} : 'Preparing lesson structure and media'}
</li> </li>
@@ -1883,11 +1887,8 @@ export function ColossiansStudySectionPage({ content }: Props) {
const [bsbPassageLoading, setBsbPassageLoading] = useState(false) const [bsbPassageLoading, setBsbPassageLoading] = useState(false)
const savedNoteCount = Object.values(noteMap).filter(v => v?.trim()).length const savedNoteCount = Object.values(noteMap).filter(v => v?.trim()).length
const lessonAudioEmbedUrl = useMemo(() => { const audioEmbedTrimmed = section?.audioEmbedUrl?.trim() ?? ''
const trimmed = section?.audioEmbedUrl?.trim() ?? '' const lessonAudioEmbedUrl = /^https?:\/\//i.test(audioEmbedTrimmed) ? audioEmbedTrimmed : ''
if (!trimmed) return ''
return /^https?:\/\//i.test(trimmed) ? trimmed : ''
}, [section?.audioEmbedUrl])
const currentStudySlug = study?.slug ?? 'colossians' const currentStudySlug = study?.slug ?? 'colossians'
const noteId = section?.id ? getNoteId(currentStudySlug, section.id) : '' const noteId = section?.id ? getNoteId(currentStudySlug, section.id) : ''
@@ -2822,6 +2823,35 @@ export function ColossiansStudyNotesPage({ content }: Props) {
: sorted : sorted
const active = visible.find(item => item.sectionId === activeNoteTab) ?? visible[0] const active = visible.find(item => item.sectionId === activeNoteTab) ?? visible[0]
const otherStudyMatches = queryText
? enrolledStudies
.filter(s2 => s2.slug !== study.slug)
.flatMap(s2 => {
const p2 = `${s2.slug}--`
return Object.entries(notes)
.filter(([key]) => key.startsWith(p2))
.map(([key, note]) => ({ study: s2, section: s2.sections.find(sec => sec.id === key.slice(p2.length)), note }))
.filter(item => item.section && `${item.section.title} ${item.section.reference ?? ''} ${noteText(item.note)}`.toLowerCase().includes(queryText))
})
: []
function downloadStudyNotesMarkdown() {
const body = sorted.map(({ section, sectionId, note }) => {
const blocks = Object.entries(parseNoteMap(note))
.filter(([, html]) => html?.trim())
.map(([key, html]) => `### ${ANCHOR_LABELS[key] ?? key}\n\n${stripHtml(html)}`)
.join('\n\n')
return `## ${section?.title ?? sectionId}${section?.reference ? ` (${section.reference})` : ''}\n\n${blocks}`
}).join('\n\n---\n\n')
const blob = new Blob([`# ${study!.title} — My Notes\n\n${body}\n`], { type: 'text/markdown' })
const url = URL.createObjectURL(blob)
const a = document.createElement('a')
a.href = url
a.download = `${study!.slug}-notes-${new Date().toISOString().slice(0, 10)}.md`
a.click()
URL.revokeObjectURL(url)
}
return ( return (
<main className="notes-page" aria-label="My study notes"> <main className="notes-page" aria-label="My study notes">
<div className="notes-shell"> <div className="notes-shell">
@@ -2896,7 +2926,7 @@ export function ColossiansStudyNotesPage({ content }: Props) {
onChange={e => setNoteQuery(e.target.value)} onChange={e => setNoteQuery(e.target.value)}
/> />
{visible.length === 0 ? ( {visible.length === 0 ? (
<p className="notes-empty-text">No notes match “{noteQuery.trim()}”.</p> <p className="notes-empty-text">No notes match “{noteQuery.trim()}” in this study.</p>
) : ( ) : (
<ul className="notes-list" role="tablist" aria-label="Lesson notes"> <ul className="notes-list" role="tablist" aria-label="Lesson notes">
{visible.map(({ sectionId, section, note }) => { {visible.map(({ sectionId, section, note }) => {
@@ -2923,6 +2953,25 @@ export function ColossiansStudyNotesPage({ content }: Props) {
})} })}
</ul> </ul>
)} )}
{otherStudyMatches.length > 0 && (
<div className="notes-other-matches">
<p className="notes-reader-label">Also in your other studies</p>
<ul className="notes-list">
{otherStudyMatches.map(({ study: s2, section, note }) => (
<li key={`${s2.slug}-${section!.id}`}>
<Link className="notes-item" to={`/study/${s2.slug}/notes`}>
<span className="notes-item-body">
<strong>{section!.title}</strong>
<small>{s2.title}</small>
<span className="notes-item-snippet">{noteText(note).slice(0, 110)}</span>
</span>
</Link>
</li>
))}
</ul>
</div>
)}
<button type="button" className="btn-secondary notes-export-btn" onClick={downloadStudyNotesMarkdown}>Download notes (.md)</button>
</aside> </aside>
{active && ( {active && (
vite.config.ts
-5
View File
@@ -47,11 +47,6 @@ export default defineConfig({
}, },
}), }),
], ],
resolve: {
alias: {
'react-simple-maps': 'react-simple-maps/dist/index.es.js',
},
},
server: { server: {
proxy: { proxy: {
'/api': 'http://localhost:4173', '/api': 'http://localhost:4173',