Skip to content

[FIX]Refactor Leaderboard #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Sing-Li merged 13 commits into from
Feb 24, 2022
Merged

[FIX]Refactor Leaderboard #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d38374e
Refactor Leaderboard
samad-yar-khan Feb 6, 2022
81c7b58
Make seperate leaderboard component. Hide CCS Leaks
samad-yar-khan Feb 6, 2022
33c4ad0
Update leaderboard documentation
samad-yar-khan Feb 7, 2022
418d252
Rebase With master
samad-yar-khan Feb 10, 2022
f37d125
Move data fetching logic to component
samad-yar-khan Feb 8, 2022
8b938b8
Update Documentation
samad-yar-khan Feb 8, 2022
97f3ab1
Make wrapper class for leaderboard
samad-yar-khan Feb 8, 2022
2a90ceb
fix Imports'
samad-yar-khan Feb 10, 2022
e678515
rebased
samad-yar-khan Feb 10, 2022
f4d7fdf
Remove Fetch from [id].js
samad-yar-khan Feb 10, 2022
f48f066
Update Documentation
samad-yar-khan Feb 10, 2022
8007a91
Fix LGTM Errors
samad-yar-khan Feb 10, 2022
62fe4e2
Remove Spaces and console statemnets
samad-yar-khan Feb 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 0 additions & 67 deletions app/components/leaderBoardRow.js
View file
Open in desktop

This file was deleted.

46 changes: 0 additions & 46 deletions app/components/leaderBoardTable.js
View file
Open in desktop

This file was deleted.

142 changes: 142 additions & 0 deletions app/components/leaderboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
import Image from "next/image";
import { contributorList } from "../lib/leaderboard";
import { fetchAPI } from "../lib/api";
import { Container, Col, Table } from "react-bootstrap";
import styles from "../styles/Leaderboard.module.css";

export function Leaderboard({ contributors, community, leaderboardSize }) {
contributors = contributorList(contributors);

return (
<Container
fluid
className="d-flex flex-column align-items-center gap-2 gap-md-5"
>
<Col className="d-flex flex-column align-items-center gap-2 pt-3">
<h1 className={`display-6 fw-bold text-center ${styles.hero_heading}`}>
<span className={styles.redText}>{community}</span> GSoC Contribution
Leaderboard
</h1>
<p
className={`fw-regular col-10 col-md-8 text-center ${styles.hero_subheading}`}
>
Start your open-source jourey with {community}
</p>
</Col>
<Col className="d-flex flex-column align-items-center col-10 col-md-8">
<Table className={`${styles["leader-board-table"]} d-sm-table-sm`}>
<thead>
<tr>
<th scope="col" colSpan="1" className="d-sm-none d-table-cell">
Rank
</th>
<th scope="col" colSpan="1">
Contributor
</th>
<th scope="col" colSpan="2">
UserName
</th>
<th scope="col" colSpan="1" className="d-none d-sm-table-cell">
Open PRs
</th>
<th scope="col" colSpan="1" className="d-none d-sm-table-cell">
Merged PRs
</th>
<th scope="col" colSpan="1" className="d-none d-sm-table-cell">
Issues
</th>
</tr>
</thead>
<tbody>
{contributors
.slice(0, leaderboardSize)
.map((contributor, index) => (
<tr>
<td
scope="col"
colSpan="1"
className="d-sm-none d-table-cell"
>
{index + 1}
</td>
<td scope="row" colSpan="1">
<Image
src={contributor.avatarUrl}
title={contributor.username}
alt={contributor.username}
height={42}
width={42}
/>
</td>
<td colSpan="2">
<a href={contributor.profileUrl}>
<span>{contributor.username}</span>
</a>
</td>
<td
className={
contributor.openPRsNumber > 0
? "d-none d-sm-table-cell"
: `${styles["disabled-link"]} d-none d-sm-table-cell`
}
colSpan="1"
>
<a
href={contributor.openPRsLink}
target={"blank"}
className="leader-board-link"
>
{contributor.openPRsNumber}
</a>
</td>
<td
className={
contributor.mergedPRsNumber > 0
? "d-none d-sm-table-cell"
: `${styles["disabled-link"]} d-none d-sm-table-cell`
}
colSpan="1"
>
<a href={contributor.mergedPRsLink} target={"blank"}>
{contributor.mergedPRsNumber}
</a>
</td>
<td
className={
contributor.issuesNumber > 0
? "d-none d-sm-table-cell"
: `${styles["disabled-link"]} d-none d-sm-table-cell`
}
colSpan="1"
>
<a href={contributor.issuesLink} target={"blank"}>
{contributor.issuesNumber}
</a>
</td>
</tr>
))}
</tbody>
</Table>
</Col>
</Container>
);
}

export async function getLeaderboardProps(communityId, leaderboardSize) {
let contributors = [];
let communityName = null;
let communities = await fetchAPI("/communities");

communities.forEach((community) => {
if (community.communityId === communityId) {
contributors = community.contributors;
communityName = community.communityName;
}
});

return {
contributors: contributors,
community: communityName,
leaderboardSize,
};
}
122 changes: 122 additions & 0 deletions app/components/leaderboardcompact.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
import Image from "next/image";
import styles from "../styles/Leaderboardcompact.module.css";
import Table from "react-bootstrap/Table";
import { contributorList } from "../lib/leaderboard";
import { fetchAPI } from "../lib/api";

export function LeaderboardCompact({ contributors, leaderboardSize }) {
contributors = contributorList(contributors);

return (
<>
<Table className={`${styles["leader-board-table"]} d-sm-table-sm`}>
<thead>
<tr>
<th scope="col" colSpan="1" className="d-sm-none d-table-cell">
Rank
</th>
<th scope="col" colSpan="1">
Contributor
</th>
<th scope="col" colSpan="2">
UserName
</th>
<th scope="col" colSpan="1" className="d-none d-sm-table-cell">
Open PRs
</th>
<th scope="col" colSpan="1" className="d-none d-sm-table-cell">
Merged PRs
</th>
<th scope="col" colSpan="1" className="d-none d-sm-table-cell">
Issues
</th>
</tr>
</thead>
<tbody>
{contributors.slice(0, leaderboardSize).map((contributor, index) => (
<tr>
<td scope="col" colSpan="1" className="d-sm-none d-table-cell">
{index + 1}
</td>
<td scope="row" colSpan="1">
<Image
src={contributor.avatarUrl}
title={contributor.username}
alt={contributor.username}
height={42}
width={42}
/>
</td>
<td colSpan="2">
<a href={contributor.profileUrl}>
<span>{contributor.username}</span>
</a>
</td>
<td
className={
contributor.openPRsNumber > 0
? "d-none d-sm-table-cell"
: `${styles["disabled-link"]} d-none d-sm-table-cell`
}
colSpan="1"
>
<a
href={contributor.openPRsLink}
target={"blank"}
className="leader-board-link"
>
{contributor.openPRsNumber}
</a>
</td>
<td
className={
contributor.mergedPRsNumber > 0
? "d-none d-sm-table-cell"
: `${styles["disabled-link"]} d-none d-sm-table-cell`
}
colSpan="1"
>
<a href={contributor.mergedPRsLink} target={"blank"}>
{contributor.mergedPRsNumber}
</a>
</td>
<td
className={
contributor.issuesNumber > 0
? "d-none d-sm-table-cell"
: `${styles["disabled-link"]} d-none d-sm-table-cell`
}
colSpan="1"
>
<a href={contributor.issuesLink} target={"blank"}>
{contributor.issuesNumber}
</a>
</td>
</tr>
))}
</tbody>
</Table>
</>
);
}

export async function getLeaderboardCompactProps(communityId,leaderboardSize){

let contributors = [];
let communityName = null;
let communities = await fetchAPI("/communities");

communities.forEach((community) => {
if (community.communityId === communityId) {
contributors = community.contributors;
communityName = community.communityName;
}
});

return {
contributors: contributors,
community: communityName,
leaderboardSize
};

}
Loading