refactor: update folder structure

This commit makes the README.md stand out more from the other files.

src/cards/stats-card.js

@@ -9,7 +9,7 @@ import {
   kFormatter,
   measureText,
 } from "../common/utils.js";
-import { getStyles } from "../getStyles.js";
+import { getStyles } from "../common/getStyles.js";
 import { statCardLocales } from "../translations.js";
 
 /**

src/cards/wakatime-card.js

@@ -8,7 +8,7 @@ import {
   getCardColors,
   lowercaseTrim,
 } from "../common/utils.js";
-import { getStyles } from "../getStyles.js";
+import { getStyles } from "../common/getStyles.js";
 import { wakatimeCardLocales } from "../translations.js";
 
 /** Import language colors.

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 {

src/common/retryer.js

@@ -45,8 +45,11 @@ const retryer = async (fetcher, variables, retries = 0) => {
     // prettier-ignore
     // also checking for bad credentials if any tokens gets invalidated
     const isBadCredential = err.response.data && err.response.data.message === "Bad credentials";
+    const isAccountSuspended =
+      err.response.data &&
+      err.response.data.message === "Sorry. Your account was suspended.";
 
-    if (isBadCredential) {
+    if (isBadCredential || isAccountSuspended) {
       logger.log(`PAT_${retries + 1} Failed`);
       retries++;
       // directly return from the function

src/fetchers/stats-fetcher.js

@@ -1,7 +1,7 @@
 // @ts-check
 import axios from "axios";
 import githubUsernameRegex from "github-username-regex";
-import { calculateRank } from "../calculateRank.js";
+import { calculateRank } from "../common/calculateRank.js";
 import { retryer } from "../common/retryer.js";
 import {
   CustomError,

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/calculateRank.js";
+import { calculateRank } from "../src/common/calculateRank.js";
 import { renderStatsCard } from "../src/cards/stats-card.js";
 import { CONSTANTS, renderError } from "../src/common/utils.js";
 

tests/calculateRank.test.js

@@ -1,5 +1,5 @@
 import "@testing-library/jest-dom";
-import { calculateRank } from "../src/calculateRank.js";
+import { calculateRank } from "../src/common/calculateRank.js";
 
 describe("Test calculateRank", () => {
   it("should calculate rank correctly", () => {

tests/e2e/e2e.test.js

@@ -11,22 +11,27 @@ import { renderStatsCard } from "../../src/cards/stats-card.js";
 import { renderTopLanguages } from "../../src/cards/top-languages-card.js";
 import { renderWakatimeCard } from "../../src/cards/wakatime-card.js";
 
-const REPO = "curly-fiesta";
+const REPO = "dummy-cra";
-const USER = "catelinemnemosyne";
+const USER = "grsdummy";
 const STATS_DATA = {
-  name: "Cateline Mnemosyne",
+  name: "grsdummy",
-  totalPRs: 1,
+  totalPRs: 2,
-  totalCommits: 7,
+  totalCommits: 2,
   totalIssues: 1,
   totalStars: 1,
-  contributedTo: 1,
+  contributedTo: 2,
   rank: {
     level: "A+",
-    score: 50.893750297869225,
+    score: 50.900829325065935,
   },
 };
 
 const LANGS_DATA = {
+  TypeScript: {
+    color: "#3178c6",
+    name: "TypeScript",
+    size: 2049,
+  },
   HTML: {
     color: "#e34c26",
     name: "HTML",
@@ -37,19 +42,19 @@ const LANGS_DATA = {
     name: "CSS",
     size: 930,
   },
-  JavaScript: {
+  Python: {
-    color: "#f1e05a",
+    color: "#3572A5",
-    name: "JavaScript",
+    name: "Python",
-    size: 1912,
+    size: 671,
   },
 };
 
 const WAKATIME_DATA = {
   human_readable_range: "last week",
   is_already_updating: false,
-  is_coding_activity_visible: true,
+  is_coding_activity_visible: false,
   is_including_today: false,
-  is_other_usage_visible: true,
+  is_other_usage_visible: false,
   is_stuck: false,
   is_up_to_date: false,
   is_up_to_date_pending_future: false,
@@ -57,24 +62,24 @@ const WAKATIME_DATA = {
   range: "last_7_days",
   status: "pending_update",
   timeout: 15,
-  username: USER,
+  username: "grsdummy",
   writes_only: false,
 };
 
 const REPOSITORY_DATA = {
-  name: "cra-test",
+  name: "dummy-cra",
-  nameWithOwner: `${USER}/cra-test`,
+  nameWithOwner: "grsdummy/dummy-cra",
   isPrivate: false,
   isArchived: false,
   isTemplate: false,
   stargazers: {
     totalCount: 1,
   },
-  description: "Simple cra test repo.",
+  description: "Dummy create react app.",
   primaryLanguage: {
-    color: "#f1e05a",
+    color: "#3178c6",
-    id: "MDg6TGFuZ3VhZ2UxNDA=",
+    id: "MDg6TGFuZ3VhZ2UyODc=",
-    name: "JavaScript",
+    name: "TypeScript",
   },
   forkCount: 0,
   starCount: 1,

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/calculateRank.js";
+import { calculateRank } from "../src/common/calculateRank.js";
 import { fetchStats } from "../src/fetchers/stats-fetcher.js";
 
 const data = {