Merge branch 'master' into create_npm_package

anuraghazra · Oct 13, 2022 · 08eeec1 · 08eeec1
2 parents 3341532 + 39535db
commit 08eeec1
Show file tree

Hide file tree

Showing 21 changed files with 36 additions and 31 deletions.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -7,7 +7,8 @@ body:
     attributes:
       label: Is your feature request related to a problem? Please describe.
       description:
-        A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+        A clear and concise description of what the problem is. Ex. I'm always
+        frustrated when [...]
   - type: textarea
     attributes:
       label: Describe the solution you'd like
@@ -16,7 +17,8 @@ body:
     attributes:
       label: Describe alternatives you've considered
       description:
-        A clear and concise description of any alternative solutions or features you've considered.
+        A clear and concise description of any alternative solutions or features
+        you've considered.
   - type: textarea
     attributes:
       label: Additional context

diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -1,3 +1,3 @@
 themes: themes/index.js
 doc-translation: docs/*
-card-i18n: src/assets/translations.js
+card-i18n: src/translations.js
diff --git a/api/index.js b/api/index.js
@@ -9,7 +9,7 @@ import {
   renderError,
 } from "../src/common/utils.js";
 import { fetchStats } from "../src/fetchers/stats-fetcher.js";
-import { isLocaleAvailable } from "../src/assets/translations.js";
+import { isLocaleAvailable } from "../src/translations.js";
 
 dotenv.config();
 

diff --git a/api/pin.js b/api/pin.js
@@ -7,7 +7,7 @@ import {
   renderError,
 } from "../src/common/utils.js";
 import { fetchRepo } from "../src/fetchers/repo-fetcher.js";
-import { isLocaleAvailable } from "../src/assets/translations.js";
+import { isLocaleAvailable } from "../src/translations.js";
 
 export default async (req, res) => {
   const {

diff --git a/api/top-langs.js b/api/top-langs.js
@@ -9,7 +9,7 @@ import {
   renderError,
 } from "../src/common/utils.js";
 import { fetchTopLanguages } from "../src/fetchers/top-languages-fetcher.js";
-import { isLocaleAvailable } from "../src/assets/translations.js";
+import { isLocaleAvailable } from "../src/translations.js";
 
 dotenv.config();
 

diff --git a/api/wakatime.js b/api/wakatime.js
@@ -8,7 +8,7 @@ import {
   renderError,
 } from "../src/common/utils.js";
 import { fetchWakatimeStats } from "../src/fetchers/wakatime-fetcher.js";
-import { isLocaleAvailable } from "../src/assets/translations.js";
+import { isLocaleAvailable } from "../src/translations.js";
 
 dotenv.config();
 

diff --git a/src/fetchers/helpers/calculateRank.js → src/calculateRank.js b/src/fetchers/helpers/calculateRank.js → src/calculateRank.js
diff --git a/src/cards/repo-card.js b/src/cards/repo-card.js
@@ -11,7 +11,7 @@ import {
   parseEmojis,
   wrapTextMultiline,
 } from "../common/utils.js";
-import { repoCardLocales } from "../assets/translations.js";
+import { repoCardLocales } from "../translations.js";
 
 /**
  * Retrieves the repository description and wraps it to fit the card width.

diff --git a/src/cards/stats-card.js b/src/cards/stats-card.js
@@ -9,8 +9,8 @@ import {
   kFormatter,
   measureText,
 } from "../common/utils.js";
-import { getStyles } from "../common/getStyles.js";
-import { statCardLocales } from "../assets/translations.js";
+import { getStyles } from "../getStyles.js";
+import { statCardLocales } from "../translations.js";
 
 /**
  * Create a stats card text item.

diff --git a/src/cards/top-languages-card.js b/src/cards/top-languages-card.js
@@ -10,7 +10,7 @@ import {
   lowercaseTrim,
   measureText,
 } from "../common/utils.js";
-import { langCardLocales } from "../assets/translations.js";
+import { langCardLocales } from "../translations.js";
 
 const DEFAULT_CARD_WIDTH = 300;
 const MIN_CARD_WIDTH = 230;

diff --git a/src/cards/wakatime-card.js b/src/cards/wakatime-card.js
@@ -8,8 +8,8 @@ import {
   getCardColors,
   lowercaseTrim,
 } from "../common/utils.js";
-import { getStyles } from "../common/getStyles.js";
-import { wakatimeCardLocales } from "../assets/translations.js";
+import { getStyles } from "../getStyles.js";
+import { wakatimeCardLocales } from "../translations.js";
 
 /** Import language colors.
  *

diff --git a/src/common/Card.js b/src/common/Card.js
@@ -1,4 +1,4 @@
-import { getAnimations } from "./getStyles.js";
+import { getAnimations } from "../getStyles.js";
 import { encodeHTML, flexLayout } from "./utils.js";
 
 class Card {

diff --git a/src/common/index.js b/src/common/index.js
@@ -1,28 +1,29 @@
 export { blacklist } from "./blacklist.js";
 export { Card } from "./Card.js";
 export { createProgressNode } from "./createProgressNode.js";
-export { getStyles, getAnimations } from "./getStyles.js";
 export { i18n } from "./i18n.js";
 export { icons } from "./icons.js";
 export { retryer } from "./retryer.js";
 export {
+  ERROR_CARD_LENGTH,
   renderError,
-  kFormatter,
   encodeHTML,
+  kFormatter,
   isValidHexColor,
-  request,
-  parseArray,
   parseBoolean,
+  parseArray,
+  clampValue,
+  isValidGradient,
   fallbackColor,
+  request,
   flexLayout,
   getCardColors,
-  clampValue,
   wrapTextMultiline,
-  measureText,
   logger,
   CONSTANTS,
   CustomError,
   MissingParamError,
+  measureText,
   lowercaseTrim,
   chunkArray,
   parseEmojis,

diff --git a/src/common/utils.js b/src/common/utils.js
@@ -414,25 +414,26 @@ function parseEmojis(str) {
 }
 
 export {
+  ERROR_CARD_LENGTH,
   renderError,
-  kFormatter,
   encodeHTML,
+  kFormatter,
   isValidHexColor,
-  request,
-  parseArray,
   parseBoolean,
+  parseArray,
+  clampValue,
+  isValidGradient,
   fallbackColor,
+  request,
   flexLayout,
   getCardColors,
-  clampValue,
   wrapTextMultiline,
-  measureText,
   logger,
   CONSTANTS,
   CustomError,
   MissingParamError,
+  measureText,
   lowercaseTrim,
   chunkArray,
   parseEmojis,
-  ERROR_CARD_LENGTH,
 };
diff --git a/src/fetchers/stats-fetcher.js b/src/fetchers/stats-fetcher.js
@@ -2,7 +2,7 @@
 import axios from "axios";
 import * as dotenv from "dotenv";
 import githubUsernameRegex from "github-username-regex";
-import { calculateRank } from "./helpers/calculateRank.js";
+import { calculateRank } from "../calculateRank.js";
 import { retryer } from "../common/retryer.js";
 import {
   CustomError,

diff --git a/src/common/getStyles.js → src/getStyles.js b/src/common/getStyles.js → src/getStyles.js
diff --git a/src/index.js b/src/index.js
@@ -1,2 +1,3 @@
 export * from "./common/index.js";
 export * from "./cards/index.js";
+export { getStyles, getAnimations } from "./getStyles.js";
diff --git a/src/assets/translations.js → src/translations.js b/src/assets/translations.js → src/translations.js
@@ -1,4 +1,4 @@
-import { encodeHTML } from "../common/utils.js";
+import { encodeHTML } from "./common/utils.js";
 
 /**
  * Retrieves stat card labels in the available locales.

diff --git a/tests/api.test.js b/tests/api.test.js
@@ -2,7 +2,7 @@ import { jest } from "@jest/globals";
 import axios from "axios";
 import MockAdapter from "axios-mock-adapter";
 import api from "../api/index.js";
-import { calculateRank } from "../src/fetchers/helpers/calculateRank.js";
+import { calculateRank } from "../src/calculateRank.js";
 import { renderStatsCard } from "../src/cards/stats-card.js";
 import { CONSTANTS, renderError } from "../src/common/utils.js";
 

diff --git a/tests/calculateRank.test.js b/tests/calculateRank.test.js
@@ -1,5 +1,5 @@
 import "@testing-library/jest-dom";
-import { calculateRank } from "../src/fetchers/helpers/calculateRank.js";
+import { calculateRank } from "../src/calculateRank.js";
 
 describe("Test calculateRank", () => {
   it("should calculate rank correctly", () => {

diff --git a/tests/fetchStats.test.js b/tests/fetchStats.test.js
@@ -1,7 +1,7 @@
 import "@testing-library/jest-dom";
 import axios from "axios";
 import MockAdapter from "axios-mock-adapter";
-import { calculateRank } from "../src/fetchers/helpers/calculateRank.js";
+import { calculateRank } from "../src/calculateRank.js";
 import { fetchStats } from "../src/fetchers/stats-fetcher.js";
 
 const data = {