refactor: FileContributor type

Author: wackerow

src/components/CrowdinContributors.tsx

@@ -1,4 +1,4 @@
-import type { Author, CrowdinContributor } from "@/lib/types"
+import type { CrowdinContributor, FileContributor } from "@/lib/types"
 
 import FileContributors from "@/components/FileContributors"
 
@@ -11,22 +11,17 @@ const CrowdinContributors = ({
   lastUpdatedDate,
   contributors,
 }: CrowdinContributorsProps) => {
-  const mappedContributors: Author[] = contributors.map(
-    ({ id, username, avatarUrl }) => ({
-      name: username,
-      email: id.toString(),
-      avatarUrl: avatarUrl,
-      user: {
-        login: username,
-        url: `https://crowdin.com/profile/${username}`,
-      },
+  const mappedContributors: FileContributor[] = contributors.map(
+    ({ username, avatarUrl }) => ({
+      login: username,
+      avatar_url: avatarUrl,
+      html_url: `https://crowdin.com/profile/${username}`,
+      date: lastUpdatedDate,
     })
   )
 
   return (
     <FileContributors
-      error={mappedContributors.length === 0} // TODO: Confirm GH error handling
-      loading={!mappedContributors.length}
       contributors={mappedContributors}
       lastEdit={lastUpdatedDate}
     />

src/components/FileContributors.tsx

@@ -13,7 +13,7 @@ import {
   VStack,
 } from "@chakra-ui/react"
 
-import type { GitHubContributor, Lang } from "@/lib/types"
+import type { FileContributor, Lang } from "@/lib/types"
 
 import { Button } from "@/components/Buttons"
 import InlineLink from "@/components/Link"
@@ -30,7 +30,7 @@ const ContributorList = ({ children }: { children: React.ReactNode }) => (
   </UnorderedList>
 )
 
-type ContributorProps = { contributor: GitHubContributor }
+type ContributorProps = { contributor: FileContributor }
 const Contributor = ({ contributor }: ContributorProps) => (
   <ListItem p={2} display="flex" alignItems="center">
     <Avatar
@@ -48,7 +48,7 @@ const Contributor = ({ contributor }: ContributorProps) => (
 
 export type FileContributorsProps = FlexProps & {
   editPath?: string
-  contributors: GitHubContributor[]
+  contributors: FileContributor[]
   lastEdit: string
 }
 
@@ -62,14 +62,14 @@ const FileContributors = ({
 
   const isDesktop = useBreakpointValue({ base: false, md: true })
 
-  const lastContributor: GitHubContributor = contributors.length
+  const lastContributor: FileContributor = contributors.length
     ? contributors[0]
     : ({
         avatar_url: "",
         login: "",
         html_url: "",
         date: Date.now().toString(),
-      } as GitHubContributor)
+      } as FileContributor)
 
   return (
     <>

src/components/GitHubContributors.tsx

@@ -1,13 +1,13 @@
 import type { FlexProps } from "@chakra-ui/react"
 
-import type { GitHubContributor } from "@/lib/types"
+import type { FileContributor } from "@/lib/types"
 
 import FileContributors from "@/components/FileContributors"
 
 export type GitHubContributors = FlexProps & {
   editPath?: string
   lastUpdatedDate: string
-  contributors: GitHubContributor[]
+  contributors: FileContributor[]
 }
 
 const GitHubContributors = ({

src/lib/api/fetchGitHistory.ts

@@ -1,7 +1,7 @@
 import fs from "fs"
 import { join } from "path"
 
-import type { GitHubContributor } from "@/lib/types"
+import type { FileContributor } from "@/lib/types"
 
 import {
   COMMIT_HISTORY_JSON,
@@ -66,7 +66,7 @@ export const fetchAndSaveGitHistory = async (mdDir: string) => {
       const { login, avatar_url, html_url } = contribution.author
       const { date } = contribution.commit.author
       return { login, avatar_url, html_url, date }
-    }) as GitHubContributor[]
+    }) as FileContributor[]
 
   // Remove duplicates from same login
   const uniqueContributors = contributors.filter(

src/lib/interfaces.ts

@@ -3,7 +3,7 @@ import type { StaticImageData } from "next/image"
 import type {
   CrowdinContributor,
   Frontmatter,
-  GitHubContributor,
+  FileContributor,
   Lang,
   Layout,
   ToCItem,
@@ -108,7 +108,7 @@ export interface MdPageContent {
   lastUpdatedDate?: string
   contentNotTranslated: boolean
   crowdinContributors: CrowdinContributor[]
-  contributors: GitHubContributor[]
+  contributors: FileContributor[]
 }
 
 // Local environment framework

src/lib/types.ts

@@ -370,7 +370,7 @@ export type Author = {
   }
 }
 
-export type GitHubContributor = {
+export type FileContributor = {
   login: string
   avatar_url: string
   html_url: string