diff --git a/frontend/src/components/Milestones.tsx b/frontend/src/components/Milestones.tsx
new file mode 100644
index 0000000000..5d7dced2e0
--- /dev/null
+++ b/frontend/src/components/Milestones.tsx
@@ -0,0 +1,76 @@
+import {
+ faCalendar,
+ faFolderOpen,
+ faSignsPost,
+ faCircleCheck,
+ faCircleExclamation,
+} from '@fortawesome/free-solid-svg-icons'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { useRouter } from 'next/navigation'
+import React from 'react'
+import { ProjectMilestonesType } from 'types/project'
+import { formatDate } from 'utils/dateFormatter'
+import AnchorTitle from './AnchorTitle'
+import ItemCardList from './ItemCardList'
+import { TruncatedText } from './TruncatedText'
+
+interface ProjectMilestonesProps {
+ data: ProjectMilestonesType[]
+ showAvatar?: boolean
+ showSingleColumn?: boolean
+}
+
+const Milestones: React.FC
= ({
+ data,
+ showAvatar = true,
+ showSingleColumn = true,
+}) => {
+ const router = useRouter()
+
+ return (
+
+
+
+ }
+ data={data}
+ showAvatar={showAvatar}
+ icon={faSignsPost}
+ showSingleColumn={showSingleColumn}
+ renderDetails={(item) => (
+
+
+
+ {formatDate(item.createdAt)}
+
+
+
+ {item.closedIssuesCount} closed
+
+
+
+ {item.openIssuesCount} open
+
+ {item?.repositoryName && (
+
+
+
+
+ )}
+
+ )}
+ />
+ )
+}
+
+export default Milestones
diff --git a/frontend/src/server/queries/homeQueries.ts b/frontend/src/server/queries/homeQueries.ts
index c96071823b..13811760f7 100644
--- a/frontend/src/server/queries/homeQueries.ts
+++ b/frontend/src/server/queries/homeQueries.ts
@@ -56,7 +56,7 @@ export const GET_MAIN_PAGE_DATA = gql`
title
url
}
- recentReleases(limit: 9, distinct: $distinct) {
+ recentReleases(limit: 5, distinct: $distinct) {
author {
avatarUrl
login
@@ -91,5 +91,19 @@ export const GET_MAIN_PAGE_DATA = gql`
suggestedLocation
url
}
+ recentMilestones(limit: 5, state: "all", distinct: $distinct) {
+ author {
+ avatarUrl
+ login
+ name
+ }
+ title
+ openIssuesCount
+ closedIssuesCount
+ repositoryName
+ organizationName
+ createdAt
+ url
+ }
}
`
diff --git a/frontend/src/server/queries/organizationQueries.ts b/frontend/src/server/queries/organizationQueries.ts
index fefccf2c21..5a5657c37c 100644
--- a/frontend/src/server/queries/organizationQueries.ts
+++ b/frontend/src/server/queries/organizationQueries.ts
@@ -41,7 +41,7 @@ export const GET_ORGANIZATION_DATA = gql`
title
url
}
- recentReleases(limit: 9, organization: $login, distinct: true) {
+ recentReleases(limit: 5, organization: $login, distinct: true) {
author {
avatarUrl
login
@@ -54,6 +54,20 @@ export const GET_ORGANIZATION_DATA = gql`
tagName
url
}
+ recentMilestones(limit: 5, organization: $login, distinct: true) {
+ author {
+ avatarUrl
+ login
+ name
+ }
+ title
+ openIssuesCount
+ closedIssuesCount
+ repositoryName
+ organizationName
+ createdAt
+ url
+ }
repositories(organization: $login, limit: 12) {
contributorsCount
forksCount
diff --git a/frontend/src/server/queries/projectQueries.ts b/frontend/src/server/queries/projectQueries.ts
index 8d0c580709..e70c870e27 100644
--- a/frontend/src/server/queries/projectQueries.ts
+++ b/frontend/src/server/queries/projectQueries.ts
@@ -58,6 +58,20 @@ export const GET_PROJECT_DATA = gql`
type
updatedAt
url
+ recentMilestones(limit: 5) {
+ author {
+ avatarUrl
+ login
+ name
+ }
+ title
+ openIssuesCount
+ closedIssuesCount
+ repositoryName
+ organizationName
+ createdAt
+ url
+ }
}
recentPullRequests(project: $key) {
author {
diff --git a/frontend/src/server/queries/repositoryQueries.ts b/frontend/src/server/queries/repositoryQueries.ts
index d569b2efc8..0f7a0afe95 100644
--- a/frontend/src/server/queries/repositoryQueries.ts
+++ b/frontend/src/server/queries/repositoryQueries.ts
@@ -45,6 +45,20 @@ export const GET_REPOSITORY_DATA = gql`
topics
updatedAt
url
+ recentMilestones(limit: 5) {
+ author {
+ avatarUrl
+ login
+ name
+ }
+ title
+ openIssuesCount
+ closedIssuesCount
+ repositoryName
+ organizationName
+ createdAt
+ url
+ }
}
topContributors(organization: $organizationKey, repository: $repositoryKey) {
avatarUrl
diff --git a/frontend/src/server/queries/userQueries.ts b/frontend/src/server/queries/userQueries.ts
index c7e694a32c..7782a51c14 100644
--- a/frontend/src/server/queries/userQueries.ts
+++ b/frontend/src/server/queries/userQueries.ts
@@ -19,6 +19,15 @@ export const GET_USER_DATA = gql`
title
url
}
+ recentMilestones(limit: 5, login: $key) {
+ title
+ openIssuesCount
+ closedIssuesCount
+ repositoryName
+ organizationName
+ createdAt
+ url
+ }
recentPullRequests(limit: 5, login: $key) {
createdAt
organizationName
@@ -26,7 +35,7 @@ export const GET_USER_DATA = gql`
title
url
}
- recentReleases(limit: 6, login: $key) {
+ recentReleases(limit: 5, login: $key) {
isPreRelease
name
publishedAt
diff --git a/frontend/src/types/card.ts b/frontend/src/types/card.ts
index a4c7c3e02f..04adf47afe 100644
--- a/frontend/src/types/card.ts
+++ b/frontend/src/types/card.ts
@@ -5,7 +5,12 @@ import { GeoLocDataGraphQL } from './chapter'
import { TopContributorsTypeAlgolia, TopContributorsTypeGraphql } from './contributor'
import { IconType } from './icon'
import { Level } from './level'
-import { ProjectIssuesType, ProjectReleaseType, RepositoryCardProps } from './project'
+import {
+ ProjectIssuesType,
+ ProjectReleaseType,
+ RepositoryCardProps,
+ ProjectMilestonesType,
+} from './project'
import { ItemCardPullRequests } from './user'
export interface CardProps {
@@ -39,6 +44,7 @@ export interface DetailsCardProps {
pullRequests?: ItemCardPullRequests[]
recentIssues?: ProjectIssuesType[]
recentReleases?: ProjectReleaseType[]
+ recentMilestones?: ProjectMilestonesType[]
repositories?: RepositoryCardProps[]
socialLinks?: string[]
stats?: stats[]
diff --git a/frontend/src/types/home.ts b/frontend/src/types/home.ts
index 0429163e91..e61aabb026 100644
--- a/frontend/src/types/home.ts
+++ b/frontend/src/types/home.ts
@@ -1,6 +1,6 @@
import { TopContributorsTypeGraphql } from './contributor'
import { EventType } from './event'
-import { ProjectIssuesType, ProjectReleaseType } from './project'
+import { ProjectIssuesType, ProjectReleaseType, ProjectMilestonesType } from './project'
export type MainPageData = {
topContributors: TopContributorsTypeGraphql[]
@@ -8,6 +8,7 @@ export type MainPageData = {
recentReleases: ProjectReleaseType[]
upcomingEvents: EventType[]
recentPullRequests: PullRequestsType[]
+ recentMilestones: ProjectMilestonesType[]
recentChapters: {
createdAt: string
key: string
diff --git a/frontend/src/types/project.ts b/frontend/src/types/project.ts
index cb17114f1f..d50d83a5d8 100644
--- a/frontend/src/types/project.ts
+++ b/frontend/src/types/project.ts
@@ -29,6 +29,22 @@ export interface ProjectPullRequestsType {
url: string
}
+export interface ProjectMilestonesType {
+ author: {
+ avatarUrl: string
+ key: string
+ name: string
+ login: string
+ }
+ title: string
+ openIssuesCount: number
+ closedIssuesCount: number
+ repositoryName: string
+ organizationName?: string
+ createdAt: string
+ url: string
+}
+
export interface ProjectStatsType {
contributors: number
forks: number
@@ -82,6 +98,7 @@ export interface ProjectTypeGraphql {
recentReleases: ProjectReleaseType[]
repositories: RepositoryCardProps[]
topContributors: TopContributorsTypeGraphql[]
+ recentMilestones: ProjectMilestonesType[]
}
export interface RepositoriesCardProps {
diff --git a/frontend/src/utils/dateFormatter.ts b/frontend/src/utils/dateFormatter.ts
index 77439e57ba..4688e575ba 100644
--- a/frontend/src/utils/dateFormatter.ts
+++ b/frontend/src/utils/dateFormatter.ts
@@ -1,4 +1,8 @@
export const formatDate = (input: number | string) => {
+ if (!input) {
+ return ''
+ }
+
const date =
typeof input === 'number'
? new Date(input * 1000) // Unix timestamp in seconds
diff --git a/frontend/src/utils/helpers/githubHeatmap.ts b/frontend/src/utils/helpers/githubHeatmap.ts
index 71748fa1b2..d33cfd3c75 100644
--- a/frontend/src/utils/helpers/githubHeatmap.ts
+++ b/frontend/src/utils/helpers/githubHeatmap.ts
@@ -37,10 +37,14 @@ interface HeatmapResponse {
contributions: HeatmapContribution[]
}
-export const fetchHeatmapData = async (username: string): Promise
=> {
+export const fetchHeatmapData = async (username: string): Promise => {
try {
const response = await fetch(`https://github-contributions-api.jogruber.de/v4/${username}`)
- const heatmapData: { contributions: { date: string; count: number }[] } = await response.json()
+ const heatmapData = await response.json()
+ if (heatmapData.error) {
+ return null
+ }
+
if (!heatmapData.contributions) {
return {
years: [],
@@ -79,8 +83,8 @@ export const fetchHeatmapData = async (username: string): Promise