Skip to content

Commit 67b434d

Browse files
anuraghazraanuraghazra
authoredAug 2, 2020
chore(*): reorganized all files and folders (anuraghazra#283)
1 parent e7dcda0 commit 67b434d

25 files changed

+79
-67
lines changed
 

‎api/index.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ const {
55
parseArray,
66
clampValue,
77
CONSTANTS,
8-
} = require("../src/utils");
9-
const fetchStats = require("../src/fetchStats");
10-
const renderStatsCard = require("../src/renderStatsCard");
8+
} = require("../src/common/utils");
9+
const fetchStats = require("../src/fetchers/stats-fetcher");
10+
const renderStatsCard = require("../src/cards/stats-card");
1111

1212
module.exports = async (req, res) => {
1313
const {

‎api/pin.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ const {
55
clampValue,
66
CONSTANTS,
77
logger,
8-
} = require("../src/utils");
9-
const fetchRepo = require("../src/fetchRepo");
10-
const renderRepoCard = require("../src/renderRepoCard");
8+
} = require("../src/common/utils");
9+
const fetchRepo = require("../src/fetchers/repo-fetcher");
10+
const renderRepoCard = require("../src/cards/repo-card");
1111

1212
module.exports = async (req, res) => {
1313
const {

‎api/top-langs.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ const {
55
parseBoolean,
66
parseArray,
77
CONSTANTS,
8-
} = require("../src/utils");
9-
const fetchTopLanguages = require("../src/fetchTopLanguages");
10-
const renderTopLanguages = require("../src/renderTopLanguages");
8+
} = require("../src/common/utils");
9+
const fetchTopLanguages = require("../src/fetchers/top-languages-fetcher");
10+
const renderTopLanguages = require("../src/cards/top-languages-card");
1111

1212
module.exports = async (req, res) => {
1313
const {

‎src/renderRepoCard.js renamed to ‎src/cards/repo-card.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ const {
44
getCardColors,
55
FlexLayout,
66
wrapTextMultiline,
7-
} = require("../src/utils");
8-
const icons = require("./icons");
7+
} = require("../common/utils");
8+
const icons = require("../common/icons");
9+
const Card = require("../common/Card");
910
const toEmoji = require("emoji-name-map");
10-
const Card = require("./Card");
1111

1212
const renderRepoCard = (repo, options = {}) => {
1313
const {

‎src/renderStatsCard.js renamed to ‎src/cards/stats-card.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ const {
33
getCardColors,
44
FlexLayout,
55
encodeHTML,
6-
} = require("../src/utils");
7-
const { getStyles } = require("./getStyles");
8-
const icons = require("./icons");
9-
const Card = require("./Card");
6+
} = require("../common/utils");
7+
const { getStyles } = require("../getStyles");
8+
const icons = require("../common/icons");
9+
const Card = require("../common/Card");
1010

1111
const createTextNode = ({
1212
icon,

‎src/renderTopLanguages.js renamed to ‎src/cards/top-languages-card.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const { getCardColors, FlexLayout, clampValue } = require("../src/utils");
2-
const Card = require("./Card");
1+
const { getCardColors, FlexLayout, clampValue } = require("../common/utils");
2+
const Card = require("../common/Card");
33

44
const createProgressNode = ({ width, color, name, progress }) => {
55
const paddingRight = 95;

‎src/Card.js renamed to ‎src/common/Card.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const { FlexLayout } = require("./utils");
2-
const { getAnimations } = require("./getStyles");
1+
const { FlexLayout } = require("../common/utils");
2+
const { getAnimations } = require("../getStyles");
33

44
class Card {
55
constructor({

‎src/icons.js renamed to ‎src/common/icons.js

File renamed without changes.

‎src/retryer.js renamed to ‎src/common/retryer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const { logger } = require("./utils");
1+
const { logger } = require("../common/utils");
22

33
const retryer = async (fetcher, variables, retries = 0) => {
44
if (retries > 7) {

‎src/utils.js renamed to ‎src/common/utils.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const axios = require("axios");
22
const wrap = require("word-wrap");
3-
const themes = require("../themes");
3+
const themes = require("../../themes");
44

55
const renderError = (message, secondaryMessage = "") => {
66
return `

‎src/fetchRepo.js renamed to ‎src/fetchers/repo-fetcher.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const { request } = require("./utils");
2-
const retryer = require("./retryer");
1+
const { request } = require("../common/utils");
2+
const retryer = require("../common/retryer");
33

44
const fetcher = (variables, token) => {
55
return request(

‎src/fetchStats.js renamed to ‎src/fetchers/stats-fetcher.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
const { request, logger } = require("./utils");
1+
const { request, logger } = require("../common/utils");
22
const axios = require("axios");
3-
const retryer = require("./retryer");
4-
const calculateRank = require("./calculateRank");
3+
const retryer = require("../common/retryer");
4+
const calculateRank = require("../calculateRank");
55
const githubUsernameRegex = require("github-username-regex");
66

77
require("dotenv").config();

‎src/fetchTopLanguages.js renamed to ‎src/fetchers/top-languages-fetcher.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const { request, logger } = require("./utils");
2-
const retryer = require("./retryer");
1+
const { request, logger } = require("../common/utils");
2+
const retryer = require("../common/retryer");
33
require("dotenv").config();
44

55
const fetcher = (variables, token) => {
@@ -49,14 +49,14 @@ async function fetchTopLanguages(username) {
4949
.filter((node) => {
5050
return node.languages.edges.length > 0;
5151
})
52-
// flatten the list of language nodes
52+
// flatten the list of language nodes
5353
.reduce((acc, curr) => curr.languages.edges.concat(acc), [])
5454
.sort((a, b) => b.size - a.size)
5555
.reduce((acc, prev) => {
5656
// get the size of the language (bytes)
5757
let langSize = prev.size;
5858

59-
// if we already have the language in the accumulator
59+
// if we already have the language in the accumulator
6060
// & the current language name is same as previous name
6161
// add the size to the language size.
6262
if (acc[prev.node.name] && prev.node.name === acc[prev.node.name].name) {

‎tests/api.test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ require("@testing-library/jest-dom");
22
const axios = require("axios");
33
const MockAdapter = require("axios-mock-adapter");
44
const api = require("../api/index");
5-
const renderStatsCard = require("../src/renderStatsCard");
6-
const { renderError, CONSTANTS } = require("../src/utils");
5+
const renderStatsCard = require("../src/cards/stats-card");
6+
const { renderError, CONSTANTS } = require("../src/common/utils");
77
const calculateRank = require("../src/calculateRank");
88

99
const stats = {

‎tests/card.test.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
require("@testing-library/jest-dom");
22
const cssToObject = require("css-to-object");
3-
const Card = require("../src/Card");
4-
const icons = require("../src/icons");
5-
const { getCardColors } = require("../src/utils");
3+
const Card = require("../src/common/Card");
4+
const icons = require("../src/common/icons");
5+
const { getCardColors } = require("../src/common/utils");
66
const { queryByTestId } = require("@testing-library/dom");
77

88
describe("Card", () => {

‎tests/fetchRepo.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require("@testing-library/jest-dom");
22
const axios = require("axios");
33
const MockAdapter = require("axios-mock-adapter");
4-
const fetchRepo = require("../src/fetchRepo");
4+
const fetchRepo = require("../src/fetchers/repo-fetcher");
55

66
const data_repo = {
77
repository: {

‎tests/fetchStats.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require("@testing-library/jest-dom");
22
const axios = require("axios");
33
const MockAdapter = require("axios-mock-adapter");
4-
const fetchStats = require("../src/fetchStats");
4+
const fetchStats = require("../src/fetchers/stats-fetcher");
55
const calculateRank = require("../src/calculateRank");
66

77
const data = {

‎tests/fetchTopLanguages.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require("@testing-library/jest-dom");
22
const axios = require("axios");
33
const MockAdapter = require("axios-mock-adapter");
4-
const fetchTopLanguages = require("../src/fetchTopLanguages");
4+
const fetchTopLanguages = require("../src/fetchers/top-languages-fetcher");
55

66
const mock = new MockAdapter(axios);
77

‎tests/pin.test.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ require("@testing-library/jest-dom");
22
const axios = require("axios");
33
const MockAdapter = require("axios-mock-adapter");
44
const pin = require("../api/pin");
5-
const renderRepoCard = require("../src/renderRepoCard");
6-
const { renderError } = require("../src/utils");
5+
const renderRepoCard = require("../src/cards/repo-card");
6+
const { renderError } = require("../src/common/utils");
77

88
const data_repo = {
99
repository: {
@@ -17,7 +17,7 @@ const data_repo = {
1717
name: "TypeScript",
1818
},
1919
forkCount: 100,
20-
isTemplate: false
20+
isTemplate: false,
2121
},
2222
};
2323

‎tests/renderRepoCard.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require("@testing-library/jest-dom");
22
const cssToObject = require("css-to-object");
3-
const renderRepoCard = require("../src/renderRepoCard");
3+
const renderRepoCard = require("../src/cards/repo-card");
44

55
const { queryByTestId } = require("@testing-library/dom");
66
const themes = require("../themes");

‎tests/renderStatsCard.test.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require("@testing-library/jest-dom");
22
const cssToObject = require("css-to-object");
3-
const renderStatsCard = require("../src/renderStatsCard");
3+
const renderStatsCard = require("../src/cards/stats-card");
44

55
const {
66
getByTestId,
@@ -188,7 +188,6 @@ describe("Test renderStatsCard", () => {
188188
);
189189
});
190190

191-
192191
it("should render icons correctly", () => {
193192
document.body.innerHTML = renderStatsCard(stats, {
194193
show_icons: true,

‎tests/renderTopLanguages.test.js

+30-17
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
require("@testing-library/jest-dom");
22
const cssToObject = require("css-to-object");
3-
const renderTopLanguages = require("../src/renderTopLanguages");
3+
const renderTopLanguages = require("../src/cards/top-languages-card");
44

5-
const {
6-
getByTestId,
7-
queryByTestId,
8-
queryAllByTestId,
9-
} = require("@testing-library/dom");
5+
const { queryByTestId, queryAllByTestId } = require("@testing-library/dom");
106
const themes = require("../themes");
117

128
describe("Test renderTopLanguages", () => {
@@ -72,7 +68,7 @@ describe("Test renderTopLanguages", () => {
7268

7369
// multiple languages passed
7470
document.body.innerHTML = renderTopLanguages(langs, {
75-
hide: ["HTML","css"],
71+
hide: ["HTML", "css"],
7672
});
7773
expect(queryAllByTestId(document.body, "lang-name")[0]).toBeInTheDocument(
7874
"javascript"
@@ -189,18 +185,35 @@ describe("Test renderTopLanguages", () => {
189185
});
190186
});
191187

192-
it('should render with layout compact', () => {
193-
document.body.innerHTML = renderTopLanguages(langs, {layout: 'compact'});
188+
it("should render with layout compact", () => {
189+
document.body.innerHTML = renderTopLanguages(langs, { layout: "compact" });
194190

195-
expect(queryByTestId(document.body, "header")).toHaveTextContent("Most Used Languages");
191+
expect(queryByTestId(document.body, "header")).toHaveTextContent(
192+
"Most Used Languages"
193+
);
196194

197-
expect(queryAllByTestId(document.body, "lang-name")[0]).toHaveTextContent("HTML 40.00%");
198-
expect(queryAllByTestId(document.body, "lang-progress")[0]).toHaveAttribute("width","120.00");
195+
expect(queryAllByTestId(document.body, "lang-name")[0]).toHaveTextContent(
196+
"HTML 40.00%"
197+
);
198+
expect(queryAllByTestId(document.body, "lang-progress")[0]).toHaveAttribute(
199+
"width",
200+
"120.00"
201+
);
199202

200-
expect(queryAllByTestId(document.body, "lang-name")[1]).toHaveTextContent("javascript 40.00%");
201-
expect(queryAllByTestId(document.body, "lang-progress")[1]).toHaveAttribute("width","120.00");
203+
expect(queryAllByTestId(document.body, "lang-name")[1]).toHaveTextContent(
204+
"javascript 40.00%"
205+
);
206+
expect(queryAllByTestId(document.body, "lang-progress")[1]).toHaveAttribute(
207+
"width",
208+
"120.00"
209+
);
202210

203-
expect(queryAllByTestId(document.body, "lang-name")[2]).toHaveTextContent("css 20.00%");
204-
expect(queryAllByTestId(document.body, "lang-progress")[2]).toHaveAttribute("width","60.00");
205-
})
211+
expect(queryAllByTestId(document.body, "lang-name")[2]).toHaveTextContent(
212+
"css 20.00%"
213+
);
214+
expect(queryAllByTestId(document.body, "lang-progress")[2]).toHaveAttribute(
215+
"width",
216+
"60.00"
217+
);
218+
});
206219
});

‎tests/retryer.test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require("@testing-library/jest-dom");
2-
const retryer = require("../src/retryer");
3-
const { logger } = require("../src/utils");
2+
const retryer = require("../src/common/retryer");
3+
const { logger } = require("../src/common/utils");
44

55
const fetcher = jest.fn((variables, token) => {
66
logger.log(variables, token);

‎tests/top-langs.test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ require("@testing-library/jest-dom");
22
const axios = require("axios");
33
const MockAdapter = require("axios-mock-adapter");
44
const topLangs = require("../api/top-langs");
5-
const renderTopLanguages = require("../src/renderTopLanguages");
6-
const { renderError } = require("../src/utils");
5+
const renderTopLanguages = require("../src/cards/top-languages-card");
6+
const { renderError } = require("../src/common/utils");
77

88
const data_langs = {
99
data: {

‎tests/utils.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const {
66
FlexLayout,
77
getCardColors,
88
wrapTextMultiline,
9-
} = require("../src/utils");
9+
} = require("../src/common/utils");
1010

1111
const { queryByTestId } = require("@testing-library/dom");
1212

0 commit comments

Comments
 (0)
Please sign in to comment.