Merge https://github.com/anuraghazra/github-readme-stats into gradient-background-1

src/cards/repo-card.js

@@ -4,10 +4,10 @@ const {
   getCardColors,
   FlexLayout,
   wrapTextMultiline,
-} = require("../src/utils");
-const icons = require("./icons");
+} = require("../common/utils");
+const icons = require("../common/icons");
+const Card = require("../common/Card");
 const toEmoji = require("emoji-name-map");
-const Card = require("./Card");
 
 const renderRepoCard = (repo, options = {}) => {
   const {

src/cards/stats-card.js

@@ -3,12 +3,20 @@ const {
   getCardColors,
   FlexLayout,
   encodeHTML,
-} = require("../src/utils");
-const { getStyles } = require("./getStyles");
-const icons = require("./icons");
-const Card = require("./Card");
+} = require("../common/utils");
+const { getStyles } = require("../getStyles");
+const icons = require("../common/icons");
+const Card = require("../common/Card");
 
-const createTextNode = ({ icon, label, value, id, index, showIcons }) => {
+const createTextNode = ({
+  icon,
+  label,
+  value,
+  id,
+  index,
+  showIcons,
+  shiftValuePos,
+}) => {
   const kValue = kFormatter(value);
   const staggerDelay = (index + 3) * 150;
 
@@ -24,7 +32,12 @@ const createTextNode = ({ icon, label, value, id, index, showIcons }) => {
     <g class="stagger" style="animation-delay: ${staggerDelay}ms" transform="translate(25, 0)">
       ${iconSvg}
       <text class="stat bold" ${labelOffset} y="12.5">${label}:</text>
-      <text class="stat" x="135" y="12.5" data-testid="${id}">${kValue}</text>
+      <text 
+        class="stat" 
+        x="${shiftValuePos ? (showIcons ? 200 : 170) : 150}" 
+        y="12.5" 
+        data-testid="${id}"
+      >${kValue}</text>
     </g>
   `;
 };
@@ -45,6 +58,7 @@ const renderStatsCard = (stats = {}, options = { hide: [] }) => {
     hide_title = false,
     hide_border = false,
     hide_rank = false,
+    include_all_commits = false,
     line_height = 25,
     title_color,
     icon_color,
@@ -74,7 +88,9 @@ const renderStatsCard = (stats = {}, options = { hide: [] }) => {
     },
     commits: {
       icon: icons.commits,
-      label: "Total Commits",
+      label: `Total Commits${
+        include_all_commits ? "" : ` (${new Date().getFullYear()})`
+      }`,
       value: totalCommits,
       id: "commits",
     },
@@ -107,6 +123,7 @@ const renderStatsCard = (stats = {}, options = { hide: [] }) => {
         ...STATS[key],
         index,
         showIcons: show_icons,
+        shiftValuePos: !include_all_commits,
       })
     );
 

src/cards/top-languages-card.js

@@ -1,5 +1,5 @@
-const { getCardColors, FlexLayout, clampValue } = require("../src/utils");
-const Card = require("./Card");
+const { getCardColors, FlexLayout, clampValue } = require("../common/utils");
+const Card = require("../common/Card");
 
 const createProgressNode = ({ width, color, name, progress }) => {
   const paddingRight = 95;

src/common/Card.js

@@ -1,5 +1,5 @@
-const { FlexLayout } = require("./utils");
-const { getAnimations } = require("./getStyles");
+const { FlexLayout } = require("../common/utils");
+const { getAnimations } = require("../getStyles");
 
 class Card {
   constructor({

src/common/retryer.js

@@ -1,4 +1,4 @@
-const { logger } = require("./utils");
+const { logger } = require("../common/utils");
 
 const retryer = async (fetcher, variables, retries = 0) => {
   if (retries > 7) {

src/common/utils.js

@@ -1,6 +1,6 @@
 const axios = require("axios");
 const wrap = require("word-wrap");
-const themes = require("../themes");
+const themes = require("../../themes");
 
 const renderError = (message, secondaryMessage = "") => {
   return `

src/fetchers/repo-fetcher.js

@@ -1,5 +1,5 @@
-const { request } = require("./utils");
-const retryer = require("./retryer");
+const { request } = require("../common/utils");
+const retryer = require("../common/retryer");
 
 const fetcher = (variables, token) => {
   return request(

src/fetchers/stats-fetcher.js

@@ -1,6 +1,9 @@
-const { request, logger } = require("./utils");
-const retryer = require("./retryer");
-const calculateRank = require("./calculateRank");
+const { request, logger } = require("../common/utils");
+const axios = require("axios");
+const retryer = require("../common/retryer");
+const calculateRank = require("../calculateRank");
+const githubUsernameRegex = require("github-username-regex");
+
 require("dotenv").config();
 
 const fetcher = (variables, token) => {
@@ -46,7 +49,45 @@ const fetcher = (variables, token) => {
   );
 };
 
-async function fetchStats(username, count_private = false) {
+// https://github.com/anuraghazra/github-readme-stats/issues/92#issuecomment-661026467
+// https://github.com/anuraghazra/github-readme-stats/pull/211/
+const totalCommitsFetcher = async (username) => {
+  if (!githubUsernameRegex.test(username)) {
+    logger.log("Invalid username");
+    return 0;
+  }
+
+  // https://developer.github.com/v3/search/#search-commits
+  const fetchTotalCommits = (variables, token) => {
+    return axios({
+      method: "get",
+      url: `https://api.github.com/search/commits?q=author:${variables.login}`,
+      headers: {
+        "Content-Type": "application/json",
+        Accept: "application/vnd.github.cloak-preview",
+        Authorization: `bearer ${token}`,
+      },
+    });
+  };
+
+  try {
+    let res = await retryer(fetchTotalCommits, { login: username });
+    if (res.data.total_count) {
+      return res.data.total_count;
+    }
+  } catch (err) {
+    logger.log(err);
+    // just return 0 if there is something wrong so that
+    // we don't break the whole app
+    return 0;
+  }
+};
+
+async function fetchStats(
+  username,
+  count_private = false,
+  include_all_commits = false
+) {
   if (!username) throw Error("Invalid username");
 
   const stats = {
@@ -61,6 +102,11 @@ async function fetchStats(username, count_private = false) {
 
   let res = await retryer(fetcher, { login: username });
 
+  let experimental_totalCommits = 0;
+  if (include_all_commits) {
+    experimental_totalCommits = await totalCommitsFetcher(username);
+  }
+
   if (res.data.errors) {
     logger.error(res.data.errors);
     throw Error(res.data.errors[0].message || "Could not fetch user");
@@ -72,11 +118,11 @@ async function fetchStats(username, count_private = false) {
   stats.name = user.name || user.login;
   stats.totalIssues = user.issues.totalCount;
 
-  stats.totalCommits = contributionCount.totalCommitContributions;
+  stats.totalCommits =
+    contributionCount.totalCommitContributions + experimental_totalCommits;
+
   if (count_private) {
-    stats.totalCommits =
-      contributionCount.totalCommitContributions +
-      contributionCount.restrictedContributionsCount;
+    stats.totalCommits += contributionCount.restrictedContributionsCount;
   }
 
   stats.totalPRs = user.pullRequests.totalCount;

src/fetchers/top-languages-fetcher.js

@@ -1,5 +1,5 @@
-const { request, logger } = require("./utils");
-const retryer = require("./retryer");
+const { request, logger } = require("../common/utils");
+const retryer = require("../common/retryer");
 require("dotenv").config();
 
 const fetcher = (variables, token) => {
@@ -49,14 +49,14 @@ async function fetchTopLanguages(username) {
     .filter((node) => {
       return node.languages.edges.length > 0;
     })
-    // flatten the list of language nodes 
+    // flatten the list of language nodes
     .reduce((acc, curr) => curr.languages.edges.concat(acc), [])
     .sort((a, b) => b.size - a.size)
     .reduce((acc, prev) => {
       // get the size of the language (bytes)
       let langSize = prev.size;
 
-      // if we already have the language in the accumulator 
+      // if we already have the language in the accumulator
       // & the current language name is same as previous name
       // add the size to the language size.
       if (acc[prev.node.name] && prev.node.name === acc[prev.node.name].name) {