Skip to content

Commit

Permalink
chore(*): reorganized all files and folders (#283)
Browse files Browse the repository at this point in the history
  • Loading branch information
anuraghazra authored Aug 2, 2020
1 parent e7dcda0 commit 67b434d
Show file tree
Hide file tree
Showing 25 changed files with 79 additions and 67 deletions.
6 changes: 3 additions & 3 deletions api/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ const {
parseArray,
clampValue,
CONSTANTS,
} = require("../src/utils");
const fetchStats = require("../src/fetchStats");
const renderStatsCard = require("../src/renderStatsCard");
} = require("../src/common/utils");
const fetchStats = require("../src/fetchers/stats-fetcher");
const renderStatsCard = require("../src/cards/stats-card");

module.exports = async (req, res) => {
const {
Expand Down
6 changes: 3 additions & 3 deletions api/pin.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ const {
clampValue,
CONSTANTS,
logger,
} = require("../src/utils");
const fetchRepo = require("../src/fetchRepo");
const renderRepoCard = require("../src/renderRepoCard");
} = require("../src/common/utils");
const fetchRepo = require("../src/fetchers/repo-fetcher");
const renderRepoCard = require("../src/cards/repo-card");

module.exports = async (req, res) => {
const {
Expand Down
6 changes: 3 additions & 3 deletions api/top-langs.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ const {
parseBoolean,
parseArray,
CONSTANTS,
} = require("../src/utils");
const fetchTopLanguages = require("../src/fetchTopLanguages");
const renderTopLanguages = require("../src/renderTopLanguages");
} = require("../src/common/utils");
const fetchTopLanguages = require("../src/fetchers/top-languages-fetcher");
const renderTopLanguages = require("../src/cards/top-languages-card");

module.exports = async (req, res) => {
const {
Expand Down
6 changes: 3 additions & 3 deletions src/renderRepoCard.js → src/cards/repo-card.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ const {
getCardColors,
FlexLayout,
wrapTextMultiline,
} = require("../src/utils");
const icons = require("./icons");
} = require("../common/utils");
const icons = require("../common/icons");
const Card = require("../common/Card");
const toEmoji = require("emoji-name-map");
const Card = require("./Card");

const renderRepoCard = (repo, options = {}) => {
const {
Expand Down
8 changes: 4 additions & 4 deletions src/renderStatsCard.js → src/cards/stats-card.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ const {
getCardColors,
FlexLayout,
encodeHTML,
} = require("../src/utils");
const { getStyles } = require("./getStyles");
const icons = require("./icons");
const Card = require("./Card");
} = require("../common/utils");
const { getStyles } = require("../getStyles");
const icons = require("../common/icons");
const Card = require("../common/Card");

const createTextNode = ({
icon,
Expand Down
4 changes: 2 additions & 2 deletions src/renderTopLanguages.js → src/cards/top-languages-card.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const { getCardColors, FlexLayout, clampValue } = require("../src/utils");
const Card = require("./Card");
const { getCardColors, FlexLayout, clampValue } = require("../common/utils");
const Card = require("../common/Card");

const createProgressNode = ({ width, color, name, progress }) => {
const paddingRight = 95;
Expand Down
4 changes: 2 additions & 2 deletions src/Card.js → src/common/Card.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const { FlexLayout } = require("./utils");
const { getAnimations } = require("./getStyles");
const { FlexLayout } = require("../common/utils");
const { getAnimations } = require("../getStyles");

class Card {
constructor({
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/retryer.js → src/common/retryer.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { logger } = require("./utils");
const { logger } = require("../common/utils");

const retryer = async (fetcher, variables, retries = 0) => {
if (retries > 7) {
Expand Down
2 changes: 1 addition & 1 deletion src/utils.js → src/common/utils.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const axios = require("axios");
const wrap = require("word-wrap");
const themes = require("../themes");
const themes = require("../../themes");

const renderError = (message, secondaryMessage = "") => {
return `
Expand Down
4 changes: 2 additions & 2 deletions src/fetchRepo.js → src/fetchers/repo-fetcher.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const { request } = require("./utils");
const retryer = require("./retryer");
const { request } = require("../common/utils");
const retryer = require("../common/retryer");

const fetcher = (variables, token) => {
return request(
Expand Down
6 changes: 3 additions & 3 deletions src/fetchStats.js → src/fetchers/stats-fetcher.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const { request, logger } = require("./utils");
const { request, logger } = require("../common/utils");
const axios = require("axios");
const retryer = require("./retryer");
const calculateRank = require("./calculateRank");
const retryer = require("../common/retryer");
const calculateRank = require("../calculateRank");
const githubUsernameRegex = require("github-username-regex");

require("dotenv").config();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const { request, logger } = require("./utils");
const retryer = require("./retryer");
const { request, logger } = require("../common/utils");
const retryer = require("../common/retryer");
require("dotenv").config();

const fetcher = (variables, token) => {
Expand Down Expand Up @@ -49,14 +49,14 @@ async function fetchTopLanguages(username) {
.filter((node) => {
return node.languages.edges.length > 0;
})
// flatten the list of language nodes
// flatten the list of language nodes
.reduce((acc, curr) => curr.languages.edges.concat(acc), [])
.sort((a, b) => b.size - a.size)
.reduce((acc, prev) => {
// get the size of the language (bytes)
let langSize = prev.size;

// if we already have the language in the accumulator
// if we already have the language in the accumulator
// & the current language name is same as previous name
// add the size to the language size.
if (acc[prev.node.name] && prev.node.name === acc[prev.node.name].name) {
Expand Down
4 changes: 2 additions & 2 deletions tests/api.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ require("@testing-library/jest-dom");
const axios = require("axios");
const MockAdapter = require("axios-mock-adapter");
const api = require("../api/index");
const renderStatsCard = require("../src/renderStatsCard");
const { renderError, CONSTANTS } = require("../src/utils");
const renderStatsCard = require("../src/cards/stats-card");
const { renderError, CONSTANTS } = require("../src/common/utils");
const calculateRank = require("../src/calculateRank");

const stats = {
Expand Down
6 changes: 3 additions & 3 deletions tests/card.test.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
require("@testing-library/jest-dom");
const cssToObject = require("css-to-object");
const Card = require("../src/Card");
const icons = require("../src/icons");
const { getCardColors } = require("../src/utils");
const Card = require("../src/common/Card");
const icons = require("../src/common/icons");
const { getCardColors } = require("../src/common/utils");
const { queryByTestId } = require("@testing-library/dom");

describe("Card", () => {
Expand Down
2 changes: 1 addition & 1 deletion tests/fetchRepo.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require("@testing-library/jest-dom");
const axios = require("axios");
const MockAdapter = require("axios-mock-adapter");
const fetchRepo = require("../src/fetchRepo");
const fetchRepo = require("../src/fetchers/repo-fetcher");

const data_repo = {
repository: {
Expand Down
2 changes: 1 addition & 1 deletion tests/fetchStats.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require("@testing-library/jest-dom");
const axios = require("axios");
const MockAdapter = require("axios-mock-adapter");
const fetchStats = require("../src/fetchStats");
const fetchStats = require("../src/fetchers/stats-fetcher");
const calculateRank = require("../src/calculateRank");

const data = {
Expand Down
2 changes: 1 addition & 1 deletion tests/fetchTopLanguages.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require("@testing-library/jest-dom");
const axios = require("axios");
const MockAdapter = require("axios-mock-adapter");
const fetchTopLanguages = require("../src/fetchTopLanguages");
const fetchTopLanguages = require("../src/fetchers/top-languages-fetcher");

const mock = new MockAdapter(axios);

Expand Down
6 changes: 3 additions & 3 deletions tests/pin.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ require("@testing-library/jest-dom");
const axios = require("axios");
const MockAdapter = require("axios-mock-adapter");
const pin = require("../api/pin");
const renderRepoCard = require("../src/renderRepoCard");
const { renderError } = require("../src/utils");
const renderRepoCard = require("../src/cards/repo-card");
const { renderError } = require("../src/common/utils");

const data_repo = {
repository: {
Expand All @@ -17,7 +17,7 @@ const data_repo = {
name: "TypeScript",
},
forkCount: 100,
isTemplate: false
isTemplate: false,
},
};

Expand Down
2 changes: 1 addition & 1 deletion tests/renderRepoCard.test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require("@testing-library/jest-dom");
const cssToObject = require("css-to-object");
const renderRepoCard = require("../src/renderRepoCard");
const renderRepoCard = require("../src/cards/repo-card");

const { queryByTestId } = require("@testing-library/dom");
const themes = require("../themes");
Expand Down
3 changes: 1 addition & 2 deletions tests/renderStatsCard.test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require("@testing-library/jest-dom");
const cssToObject = require("css-to-object");
const renderStatsCard = require("../src/renderStatsCard");
const renderStatsCard = require("../src/cards/stats-card");

const {
getByTestId,
Expand Down Expand Up @@ -188,7 +188,6 @@ describe("Test renderStatsCard", () => {
);
});


it("should render icons correctly", () => {
document.body.innerHTML = renderStatsCard(stats, {
show_icons: true,
Expand Down
47 changes: 30 additions & 17 deletions tests/renderTopLanguages.test.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
require("@testing-library/jest-dom");
const cssToObject = require("css-to-object");
const renderTopLanguages = require("../src/renderTopLanguages");
const renderTopLanguages = require("../src/cards/top-languages-card");

const {
getByTestId,
queryByTestId,
queryAllByTestId,
} = require("@testing-library/dom");
const { queryByTestId, queryAllByTestId } = require("@testing-library/dom");
const themes = require("../themes");

describe("Test renderTopLanguages", () => {
Expand Down Expand Up @@ -72,7 +68,7 @@ describe("Test renderTopLanguages", () => {

// multiple languages passed
document.body.innerHTML = renderTopLanguages(langs, {
hide: ["HTML","css"],
hide: ["HTML", "css"],
});
expect(queryAllByTestId(document.body, "lang-name")[0]).toBeInTheDocument(
"javascript"
Expand Down Expand Up @@ -189,18 +185,35 @@ describe("Test renderTopLanguages", () => {
});
});

it('should render with layout compact', () => {
document.body.innerHTML = renderTopLanguages(langs, {layout: 'compact'});
it("should render with layout compact", () => {
document.body.innerHTML = renderTopLanguages(langs, { layout: "compact" });

expect(queryByTestId(document.body, "header")).toHaveTextContent("Most Used Languages");
expect(queryByTestId(document.body, "header")).toHaveTextContent(
"Most Used Languages"
);

expect(queryAllByTestId(document.body, "lang-name")[0]).toHaveTextContent("HTML 40.00%");
expect(queryAllByTestId(document.body, "lang-progress")[0]).toHaveAttribute("width","120.00");
expect(queryAllByTestId(document.body, "lang-name")[0]).toHaveTextContent(
"HTML 40.00%"
);
expect(queryAllByTestId(document.body, "lang-progress")[0]).toHaveAttribute(
"width",
"120.00"
);

expect(queryAllByTestId(document.body, "lang-name")[1]).toHaveTextContent("javascript 40.00%");
expect(queryAllByTestId(document.body, "lang-progress")[1]).toHaveAttribute("width","120.00");
expect(queryAllByTestId(document.body, "lang-name")[1]).toHaveTextContent(
"javascript 40.00%"
);
expect(queryAllByTestId(document.body, "lang-progress")[1]).toHaveAttribute(
"width",
"120.00"
);

expect(queryAllByTestId(document.body, "lang-name")[2]).toHaveTextContent("css 20.00%");
expect(queryAllByTestId(document.body, "lang-progress")[2]).toHaveAttribute("width","60.00");
})
expect(queryAllByTestId(document.body, "lang-name")[2]).toHaveTextContent(
"css 20.00%"
);
expect(queryAllByTestId(document.body, "lang-progress")[2]).toHaveAttribute(
"width",
"60.00"
);
});
});
4 changes: 2 additions & 2 deletions tests/retryer.test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require("@testing-library/jest-dom");
const retryer = require("../src/retryer");
const { logger } = require("../src/utils");
const retryer = require("../src/common/retryer");
const { logger } = require("../src/common/utils");

const fetcher = jest.fn((variables, token) => {
logger.log(variables, token);
Expand Down
4 changes: 2 additions & 2 deletions tests/top-langs.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ require("@testing-library/jest-dom");
const axios = require("axios");
const MockAdapter = require("axios-mock-adapter");
const topLangs = require("../api/top-langs");
const renderTopLanguages = require("../src/renderTopLanguages");
const { renderError } = require("../src/utils");
const renderTopLanguages = require("../src/cards/top-languages-card");
const { renderError } = require("../src/common/utils");

const data_langs = {
data: {
Expand Down
2 changes: 1 addition & 1 deletion tests/utils.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const {
FlexLayout,
getCardColors,
wrapTextMultiline,
} = require("../src/utils");
} = require("../src/common/utils");

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

Expand Down

0 comments on commit 67b434d

Please sign in to comment.