diff --git a/src/card.ts b/src/card.ts index 9de4f96..8b44ad9 100644 --- a/src/card.ts +++ b/src/card.ts @@ -6,9 +6,10 @@ import { TotalIssueTrophy, TotalPullRequestTrophy, TotalRepositoryTrophy, + MultipleLangTrophy } from "./trophies.ts"; import { UserInfo } from "./github_api_client.ts"; -import { CONSTANTS, RANK_ORDER } from "./utils.ts"; +import { CONSTANTS, RANK_ORDER, RANK } from "./utils.ts"; export class Card { private width = 0; @@ -30,8 +31,12 @@ export class Card { new TotalIssueTrophy(userInfo.totalIssues), new TotalPullRequestTrophy(userInfo.totalPullRequests), new TotalRepositoryTrophy(userInfo.totalRepositories), + new MultipleLangTrophy(userInfo.languageCount), ); + // Filter by hidden + trophyList = trophyList.filter((trophy) => !trophy.hidden || trophy.rank !== RANK.UNKNOWN); + // Filter by titles if (this.titles.length != 0) { trophyList = trophyList.filter((trophy) => this.titles.includes(trophy.title)) diff --git a/src/github_api_client.ts b/src/github_api_client.ts index d116d77..7edfe14 100644 --- a/src/github_api_client.ts +++ b/src/github_api_client.ts @@ -8,6 +8,7 @@ export class UserInfo { public totalStargazers: number, public totalRepositories: number, public totalContributed: number, + public languageCount: number ) { } } @@ -42,6 +43,11 @@ export class GithubAPIClient { repositories(first: 100, ownerAffiliations: OWNER, isFork: false, orderBy: {direction: DESC, field: STARGAZERS}) { totalCount nodes { + languages(first: 1, orderBy: {direction:DESC, field: SIZE}) { + nodes { + name + } + } stargazers { totalCount } @@ -63,6 +69,13 @@ export class GithubAPIClient { const totalStargazers = userData.repositories.nodes.reduce((prev: number, node: any) => { return prev + node.stargazers.totalCount; }, 0); + + const languages = new Set(); + userData.repositories.nodes.forEach((node: any)=> { + if (node.languages.nodes[0] != undefined) { + languages.add(node.languages.nodes[0].name) + } + }); const userInfo = new UserInfo( totalCommits, userData.followers.totalCount, @@ -71,6 +84,7 @@ export class GithubAPIClient { totalStargazers, userData.repositories.totalCount, userData.repositoriesContributedTo.totalCount, + languages.size ) return userInfo; } diff --git a/src/icons.ts b/src/icons.ts index 1513826..4ce9e1e 100644 --- a/src/icons.ts +++ b/src/icons.ts @@ -1,11 +1,14 @@ import { RANK } from "./utils.ts"; const goldColor = "#FAD200"; +const goldShadowColor = "#C8A090"; const goldTextColor = "#886000"; const silverColor = "#B0B0B0"; +const sliverShadowColor = "#9090C0"; const silverTextColor = "#505050"; -const bronzeColor = "#816D46"; -const bronzeTextColor = "#614D26"; +const bronzeColor = "#A18D66"; +const bronzeShadowColor = "#816D96"; +const bronzeTextColor = "#412D06"; const leafIcon = ` @@ -30,7 +33,11 @@ Created by potrace 1.15, written by Peter Selinger 2001-2017 `; -export const getNextRankBar = (title: string, color: string, percentage: number): string => { +export const getNextRankBar = ( + title: string, + color: string, + percentage: number, +): string => { const maxWidht = 80; return `