Using default branch when grabbing meta.yaml, improving date formatti…

…ng, and sorting of projects (#109)
opensacorg · Dec 13, 2024 · 976cf43 · 976cf43
1 parent 41cd8ea
commit 976cf43
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/app/projects/github.js b/src/app/projects/github.js
@@ -42,7 +42,7 @@ export const fetchGithubProjectData = async (ghFullResponses) => {
  */
 export const fetchGithubSingleProject = async (ghResponse) => {
   const ghData = mapGhData(ghResponse);
-  const meta = await fetchMetaFile(ghData.full_name);
+  const meta = await fetchMetaFile(ghData.full_name, ghData.default_branch);
   return meta
     ? {
         ...ghData,
@@ -57,6 +57,7 @@ const mapGhData = (ghResponse) => ({
   homepage: ghResponse.homepage,
   name: ghResponse.name,
   full_name: ghResponse.full_name,
+  default_branch: ghResponse.default_branch,
   html_url: ghResponse.html_url,
   api_url: ghResponse.url,
   created_at: ghResponse.created_at,
@@ -121,7 +122,7 @@ screenshots:
  * @param string ghFullName, in the form of "owner/repo"
  * @returns 
  */
-const fetchMetaFile = async (ghFullName) => {
+const fetchMetaFile = async (ghFullName, defaultBranchName) => {
   console.dir(`${ghFullName}/${githubProject}`)
   console.dir(localMetaYaml)
   if (
@@ -132,7 +133,7 @@ const fetchMetaFile = async (ghFullName) => {
   }
 
   const metaResponse = await fetch(
-    `https://raw.githubusercontent.com/${ghFullName}/main/${metaFile}`
+    `https://raw.githubusercontent.com/${ghFullName}/${defaultBranchName}/${metaFile}`
   );
   if (metaResponse.status === 404) {
     return null;

diff --git a/src/app/projects/projectCard.jsx b/src/app/projects/projectCard.jsx
@@ -32,7 +32,7 @@ export default function ProjectCard({
         <p className={`project-card-description ${isLoading && 'project-card-loading'}`}>{projectText}</p>
       </div>
       <div className={`project-card-last-updated ${isLoading && 'project-card-loading'}`}>
-        Last Updated: {lastUpdatedTimestamp.format("ddd MMM D, H:mma")}
+        Last Updated: {lastUpdatedTimestamp.format("ddd MMM D Y")}
       </div>
       <div className={`project-card-buttons-container`}>
         <Button className={`btn btn-blue ${isLoading && 'project-card-loading'}`} href={pageUrl} textContent="Learn More" />

diff --git a/src/app/projects/projects.jsx b/src/app/projects/projects.jsx
@@ -36,7 +36,7 @@ export default function Projects({githubOwner}) {
 
   useEffect(() => {
     if (data) {
-      setProjectsData(data.sort((a, b) => new Date(b.created_at) - new Date(a.created_at)))
+      setProjectsData(data.sort((a, b) => new Date(b.updated_at) - new Date(a.updated_at)))
     }
   }, [data]);