diff --git a/src/cards/top-languages-card.js b/src/cards/top-languages-card.js
index 03a750a..16a6dc6 100644
--- a/src/cards/top-languages-card.js
+++ b/src/cards/top-languages-card.js
@@ -1,26 +1,23 @@
-const { getCardColors, FlexLayout, clampValue } = require("../common/utils");
const Card = require("../common/Card");
+const { getCardColors, FlexLayout } = require("../common/utils");
+const { createProgressNode } = require("../common/createProgressNode");
-const createProgressNode = ({ width, color, name, progress }) => {
+const createProgressTextNode = ({ width, color, name, progress }) => {
const paddingRight = 95;
const progressTextX = width - paddingRight + 10;
const progressWidth = width - paddingRight;
- const progressPercentage = clampValue(progress, 2, 100);
return `
${name}
${progress}%
-
+ ${createProgressNode({
+ x: 0,
+ y: 25,
+ color,
+ width: progressWidth,
+ progress,
+ progressBarBackgroundColor: "#ddd",
+ })}
`;
};
@@ -160,7 +157,7 @@ const renderTopLanguages = (topLangs, options = {}) => {
} else {
finalLayout = FlexLayout({
items: langs.map((lang) => {
- return createProgressNode({
+ return createProgressTextNode({
width: width,
name: lang.name,
color: lang.color || "#858585",
diff --git a/src/cards/wakatime-card.js b/src/cards/wakatime-card.js
index 7b0aca5..69a8864 100644
--- a/src/cards/wakatime-card.js
+++ b/src/cards/wakatime-card.js
@@ -1,7 +1,7 @@
-const { getCardColors, FlexLayout, clampValue } = require("../common/utils");
-const { getStyles } = require("../getStyles");
-const icons = require("../common/icons");
const Card = require("../common/Card");
+const { getStyles } = require("../getStyles");
+const { getCardColors, FlexLayout } = require("../common/utils");
+const { createProgressNode } = require("../common/createProgressNode");
const noCodingActivityNode = ({ color }) => {
return `
@@ -9,29 +9,6 @@ const noCodingActivityNode = ({ color }) => {
`;
};
-const createProgressNode = ({
- width,
- color,
- progress,
- progressBarBackgroundColor,
-}) => {
- const progressPercentage = clampValue(progress, 2, 100);
-
- return `
-
- `;
-};
-
const createTextNode = ({
id,
label,
@@ -47,6 +24,8 @@ const createTextNode = ({
const cardProgress = hideProgress
? null
: createProgressNode({
+ x: 110,
+ y: 4,
progress: percent,
color: progressBarColor,
width: 220,
@@ -154,3 +133,4 @@ const renderWakatimeCard = (stats = {}, options = { hide: [] }) => {
};
module.exports = renderWakatimeCard;
+exports.createProgressNode = createProgressNode;
diff --git a/src/common/createProgressNode.js b/src/common/createProgressNode.js
new file mode 100644
index 0000000..0f15264
--- /dev/null
+++ b/src/common/createProgressNode.js
@@ -0,0 +1,28 @@
+const { clampValue } = require("../common/utils");
+
+const createProgressNode = ({
+ x,
+ y,
+ width,
+ color,
+ progress,
+ progressBarBackgroundColor,
+}) => {
+ const progressPercentage = clampValue(progress, 2, 100);
+
+ return `
+
+ `;
+};
+
+exports.createProgressNode = createProgressNode;