Merge branch 'master' into create_npm_package

Author: rickstaa

.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

.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

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();
 

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 {

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();
 

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();
 

src/fetchers/helpers/calculateRank.js renamed to src/calculateRank.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.

src/cards/repo-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.

src/cards/stats-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;

src/cards/top-languages-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.
  *

src/cards/wakatime-card.js

@@ -1,4 +1,4 @@
-import { getAnimations } from "./getStyles.js";
+import { getAnimations } from "../getStyles.js";
 import { encodeHTML, flexLayout } from "./utils.js";
 
 class Card {

src/common/Card.js

@@ -1,7 +1,7 @@
 export { blacklist } from "./blacklist.js";
 export { Card } from "./Card.js";
 export { createProgressNode } from "./createProgressNode.js";
-export { getStyles, getAnimations } from "./getStyles.js";
+export { getStyles, getAnimations } from "../getStyles.js";
 export { i18n } from "./i18n.js";
 export { icons } from "./icons.js";
 export { retryer } from "./retryer.js";

src/common/index.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,

src/fetchers/stats-fetcher.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.

src/common/getStyles.js renamed to src/getStyles.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";
 

src/assets/translations.js renamed to src/translations.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", () => {

tests/api.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 = {