From 7dd9be7efa2bf86c0aec69ff25640b86c2e4f3ae Mon Sep 17 00:00:00 2001 From: Rawaa Al Kabbani Date: Mon, 30 Sep 2019 23:51:54 +0200 Subject: [PATCH 1/2] edit week1 homework --- homework/index.js | 152 +++++++++++++++++++++++++---------- homework/style.css | 195 ++++++++++++++++++++++++++++++++++++++++++++- package.json | 4 +- 3 files changed, 306 insertions(+), 45 deletions(-) diff --git a/homework/index.js b/homework/index.js index d8a04f271..f16884f22 100644 --- a/homework/index.js +++ b/homework/index.js @@ -1,47 +1,119 @@ -'use strict'; - -{ - function fetchJSON(url, cb) { - const xhr = new XMLHttpRequest(); - xhr.open('GET', url); - xhr.responseType = 'json'; - xhr.onload = () => { - if (xhr.status < 400) { - cb(null, xhr.response); - } else { - cb(new Error(`Network error: ${xhr.status} - ${xhr.statusText}`)); - } - }; - xhr.onerror = () => cb(new Error('Network request failed')); - xhr.send(); +const fetchRepositories = async url => { + try { + const response = await fetch(url); + const dataList = await response.json(); + return dataList; } - - function createAndAppend(name, parent, options = {}) { - const elem = document.createElement(name); - parent.appendChild(elem); - Object.keys(options).forEach(key => { - const value = options[key]; - if (key === 'text') { - elem.textContent = value; - } else { - elem.setAttribute(key, value); - } - }); - return elem; + catch (err) { + alert(err) } +}; +const logData = async (url) => { + const repositoriesData = await fetchRepositories(url); + const FooCodingRepositories = repositoriesData.sort((a, b) => + a.name.localeCompare(b.name, 'fr', { ignorePunctuation: true })); + createPage(FooCodingRepositories); +}; +const logContributors = async (url) => { + const contributorsData = await fetchRepositories(url); + const FooCodingContributors = contributorsData.sort((a, b) => + a.login.localeCompare(b.login, 'fr', { ignorePunctuation: true })); + handleContributors(FooCodingContributors); +}; + +function createElement(parentElement, element, nameId) { + const newElement = document.createElement(element); + newElement.setAttribute('id', nameId); + parentElement.appendChild(newElement); + return newElement; +} +const createOption = (item, index) => { + const newOption = document.createElement('option'); + const repositoriesSelect = document.getElementById('repositoriesSelect'); + newOption.className = 'repositoryOption'; + newOption.text = item.name; + newOption.value = index; + repositoriesSelect.appendChild(newOption); +} - function main(url) { - fetchJSON(url, (err, data) => { - const root = document.getElementById('root'); - if (err) { - createAndAppend('div', root, { text: err.message, class: 'alert-error' }); - } else { - createAndAppend('pre', root, { text: JSON.stringify(data, null, 2) }); - } - }); +function createList(parentElement, element, lio, li1, li2, li3, aUrl) { + for (let y = 0; y < 4; y++) { + createElement(parentElement, element, `li${y}`); } + const liTags = document.getElementsByTagName('li') + const p0 = createElement(liTags[0], 'p', 'repository'); + const contentP0 = document.createTextNode('Repository:'); + p0.appendChild(contentP0); + const aElement = createElement(liTags[0], 'a', 'repositoryValue'); + aElement.href = aUrl; + const aContent = document.createTextNode(lio); + aElement.appendChild(aContent); + appendToLi(liTags[1], 'p', 'description', 'Description:', 'descriptionValue', li1); + appendToLi(liTags[2], 'p', 'forks', 'Forks:', 'forksValue', li2); + appendToLi(liTags[3], 'p', 'updated', 'Updated:', 'updatedValue', li3); +} + +function appendToLi(indexLi, element, nameIdP1, textNodeP1, nameIdP2, textNodeP2) { + const p1 = createElement(indexLi, element, nameIdP1); + const contentP1 = document.createTextNode(textNodeP1); + p1.appendChild(contentP1); + const p2 = createElement(indexLi, element, nameIdP2); + const contentP2 = document.createTextNode(textNodeP2); + p2.appendChild(contentP2); +} - const REPOS_URL = 'https://api.github.com/orgs/foocoding/repos?per_page=100'; +function createPage(repositories) { + // create upperDiv + const upperDiv = createElement(mainDiv, 'div', 'upperDiv'); + const upperDivP = createElement(upperDiv, 'p', 'upperDivP'); + const upperDivPContent = document.createTextNode('FooCoding Repositories'); + upperDivP.appendChild(upperDivPContent); + const select = createElement(upperDiv, 'select', 'repositoriesSelect'); + repositories.forEach(createOption); + // create leftRightDivDiv + const leftRightDiv = createElement(mainDiv, 'div', 'leftRightDiv'); + // create leftDiv + const leftDiv = createElement(leftRightDiv, 'div', 'leftDiv'); + const repositoryDetails = createElement(leftDiv, 'ul', 'repositoryDetails'); + const defaultRepository = repositories[0]; + createList(repositoryDetails, 'li', defaultRepository.name, defaultRepository.description, defaultRepository.forks, defaultRepository.updated_at, defaultRepository.html_url); + // create rightDiv + createElement(leftRightDiv, 'div', 'rightDiv'); + // fetch contributors to implement the rightDiv + const defaultContributorsUrl = defaultRepository.contributors_url; + logContributors(defaultContributorsUrl); + // addEventListener on select change + select.addEventListener('change', () => { + const liElement = document.querySelectorAll('li'); + for (let i = 0; i < liElement.length; i++) { + liElement[i].parentElement.removeChild(liElement[i]); + } + const selectedRepository = repositories[select.value]; + createList(repositoryDetails, 'li', 'detailsList', selectedRepository.name, selectedRepository.description, selectedRepository.forks, selectedRepository.updated_at); + const ContributorsUrl = selectedRepository.contributors_url; + logContributors(ContributorsUrl); + }); +} - window.onload = () => main(REPOS_URL); +function handleContributors(contributors) { + const rightDiv = document.getElementById('rightDiv'); + rightDiv.innerHTML = ''; + contributors.forEach(contributor => { + // create subDiv for each contributor + const subDiv = document.createElement('div'); + subDiv.className = 'contributor' + rightDiv.appendChild(subDiv); + const image = document.createElement('img'); + image.className = 'image'; + image.setAttribute('src', contributor.avatar_url); + subDiv.appendChild(image); + const login = createElement(subDiv, 'p', 'login'); + const loginContent = document.createTextNode(contributor.login) + login.appendChild(loginContent); + const contributions = createElement(subDiv, 'p', 'contributions'); + const contributionsContent = document.createTextNode(contributor.contributions) + contributions.appendChild(contributionsContent); + }); } +const mainDiv = document.body; +logData('https://api.github.com/orgs/foocoding/repos?per_page=100'); diff --git a/homework/style.css b/homework/style.css index a8985a8a5..bff7a0db6 100644 --- a/homework/style.css +++ b/homework/style.css @@ -1,3 +1,192 @@ -.alert-error { - color: red; -} \ No newline at end of file +body { + max-width: 768px; + width: 100%; + margin-top: 0px; + margin-right: auto; + margin-left: auto; + background-color: #f5f5f5; + font-family: 'Roboto', sans-serif; + text-align: left; + color: rgb(0, 0, 0, 87%); +} +#upperDiv { + display: flex; + width: 93%; + margin-left: 3%; + margin-right: 4%; + background-color: #0072ce; +} +#upperDiv > #upperDivP { + color: white; + width: 40%; + padding-left: 2%; + font-size: 10px; +} +#upperDiv > #repositoriesSelect { + width: 40%; + border-radius: 4px; + font-size: 9px; +} +#leftRightDiv { + display: flex; +} +#leftRightDiv > #leftDiv { + margin-top: 2%; + margin-left: 3%; + margin-right: 3%; + width: 45%; + height: 30%; + background-color: white; + font-size: 8px; +} +#leftRightDiv > #rightDiv { + width: 45%; + margin-top: 2%; + margin-right: 2%; + background-color: white; +} +#li0, +#li1, +#li2, +#li3 { + display: flex; +} +#li0 > #repository, +#li1 > #description, +#li2 > #forks, +#li3 > #updated { + width: 40%; + margin-top: 1%; + margin-left: 0%; + font-weight: bold; +} +#li0 > #repositoryValue, +#li1 > #descriptionValue, +#li2 > #forksValue, +#li3 > #updatedValue { + width: 60%; + margin-top: 1%; + margin-left: 3%; +} +img { + width: 3%; + height: 3%; + border-radius: 4px; +} +.contributor { + display: flex; + margin-top: auto; + border-bottom: 0.3px solid #a9a9a9; + padding-top: 4%; + padding-bottom: 4%; +} +.contributor > .image { + width: 35%; + margin-left: 6%; +} +.contributor > #login { + width: 30%; + margin-top: 15%; + margin-left: 3%; + font-weight: bold; + font-size: 6px; +} +.contributor > #contributions { + width: 10%; + height: 10%; + margin-top: 15%; + background-color: rgb(169, 169, 169); + font-size: 8px; + text-align: center; + border-radius: 4px; + font-weight: bold; + color: white; +} +@media (min-width: 769px) and (max-width: 1024px) { + #leftRightDiv > #leftDiv { + padding-right: 2%; + margin-left: 3%; + width: 45%; + } + #leftRightDiv > #rightDiv { + width: 45%; + margin-right: 3%; + font-size: 14px; + } + #li0 > #repository, + #li1 > #description, + #li2 > #forks, + #li3 > #updated { + width: 20%; + margin-top: 1%; + margin-left: 0%; + font-weight: bold; + font-size: 12px; + } + #li0 > #repositoryValue, + #li1 > #descriptionValue, + #li2 > #forksValue, + #li3 > #updatedValue { + width: 70%; + margin-top: 1%; + margin-right: 1%; + font-size: 12px; + } + .contributor > .image { + width: 30px; + height: 30px; + margin-left: 7%; + } + .contributor > #login { + width: 10%; + margin-left: 3%; + font-size: 30px; + font-size: 12px; + } + .contributor > #contributions { + width: 8%; + height: 10%; + margin-right: 6%; + font-size: 12; + } +} +@media (min-width: 1025px) and (max-width: 1280px) { + #upperDiv > #upperDivP { + width: 22%; + font-size: 14px; + } + #upperDiv > #repositoriesSelect { + width: 22%; + font-size: 14px; + } + #leftRightDiv { + font-size: 12px; + } + #li0 > #repository, + #li1 > #description, + #li2 > #forks, + #li3 > #updated { + font-size: 14px; + } + #li0 > #repositoryValue, + #li1 > #descriptionValue, + #li2 > #forksValue, + #li3 > #updatedValue { + font-size: 14px; + } + .contributor > .image { + width: 25%; + height: 25%; + margin-left: 10%; + } + .contributor > #login { + width: 30%; + margin-left: 10%; + font-size: 14px; + } + .contributor > #contributions { + width: 12%; + height: 12%; + font-size: 14px; + } +} diff --git a/package.json b/package.json index fd3398c5b..b918b8cbd 100644 --- a/package.json +++ b/package.json @@ -12,10 +12,10 @@ "eslint": "^5.9.0", "eslint-config-airbnb": "^17.1.0", "eslint-config-airbnb-base": "^13.1.0", - "eslint-config-prettier": "^3.3.0", + //"eslint-config-prettier": "^3.3.0", "eslint-plugin-import": "^2.14.0", "eslint-plugin-jsx-a11y": "^6.1.2", - "eslint-plugin-prettier": "^3.0.0", + //"eslint-plugin-prettier": "^3.0.0", "eslint-plugin-react": "^7.11.1", "prettier": "^1.15.2" } From 40ae65d3f7a8dc4072063e1fd3d2aa01c214dc8d Mon Sep 17 00:00:00 2001 From: Rawaa Al Kabbani Date: Fri, 11 Oct 2019 18:39:57 +0200 Subject: [PATCH 2/2] changes to week1-version2 to be week2 --- .vscode/settings.json | 3 + homework/App.js | 2 +- homework/index.js | 142 +++++++++++++++++++++++++--------------- homework/style.css | 149 ++++++++++++------------------------------ package.json | 4 +- 5 files changed, 137 insertions(+), 163 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index f7a55df12..e2e5d8e80 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -5,6 +5,9 @@ "editor.detectIndentation": false, "editor.tabSize": 2, "cSpell.words": [ + "Cramer", + "linebreak", + "plusplus", "tabindex" ] } \ No newline at end of file diff --git a/homework/App.js b/homework/App.js index 5f81a47a1..c38143143 100644 --- a/homework/App.js +++ b/homework/App.js @@ -72,7 +72,7 @@ class App { * @param {Error} error An Error object describing the error. */ renderError(error) { - console.log(error); // TODO: replace with your own code + throw new Error(error); // TODO: replace with your own code } } diff --git a/homework/index.js b/homework/index.js index f16884f22..44393a060 100644 --- a/homework/index.js +++ b/homework/index.js @@ -1,32 +1,17 @@ -const fetchRepositories = async url => { - try { - const response = await fetch(url); - const dataList = await response.json(); - return dataList; - } - catch (err) { - alert(err) - } -}; -const logData = async (url) => { - const repositoriesData = await fetchRepositories(url); - const FooCodingRepositories = repositoriesData.sort((a, b) => - a.name.localeCompare(b.name, 'fr', { ignorePunctuation: true })); - createPage(FooCodingRepositories); -}; -const logContributors = async (url) => { - const contributorsData = await fetchRepositories(url); - const FooCodingContributors = contributorsData.sort((a, b) => - a.login.localeCompare(b.login, 'fr', { ignorePunctuation: true })); - handleContributors(FooCodingContributors); -}; - +const mainDiv = document.body; function createElement(parentElement, element, nameId) { const newElement = document.createElement(element); newElement.setAttribute('id', nameId); parentElement.appendChild(newElement); return newElement; } + +const fetchRepositories = async url => { + const response = await fetch(url); + const dataList = await response.json(); + return dataList; +}; + const createOption = (item, index) => { const newOption = document.createElement('option'); const repositoriesSelect = document.getElementById('repositoriesSelect'); @@ -34,13 +19,22 @@ const createOption = (item, index) => { newOption.text = item.name; newOption.value = index; repositoriesSelect.appendChild(newOption); +}; + +function appendToLi(indexLi, element, nameIdP1, textNodeP1, nameIdP2, textNodeP2) { + const p1 = createElement(indexLi, element, nameIdP1); + const contentP1 = document.createTextNode(textNodeP1); + p1.appendChild(contentP1); + const p2 = createElement(indexLi, element, nameIdP2); + const contentP2 = document.createTextNode(textNodeP2); + p2.appendChild(contentP2); } function createList(parentElement, element, lio, li1, li2, li3, aUrl) { for (let y = 0; y < 4; y++) { createElement(parentElement, element, `li${y}`); } - const liTags = document.getElementsByTagName('li') + const liTags = document.getElementsByTagName('li'); const p0 = createElement(liTags[0], 'p', 'repository'); const contentP0 = document.createTextNode('Repository:'); p0.appendChild(contentP0); @@ -53,15 +47,44 @@ function createList(parentElement, element, lio, li1, li2, li3, aUrl) { appendToLi(liTags[3], 'p', 'updated', 'Updated:', 'updatedValue', li3); } -function appendToLi(indexLi, element, nameIdP1, textNodeP1, nameIdP2, textNodeP2) { - const p1 = createElement(indexLi, element, nameIdP1); - const contentP1 = document.createTextNode(textNodeP1); - p1.appendChild(contentP1); - const p2 = createElement(indexLi, element, nameIdP2); - const contentP2 = document.createTextNode(textNodeP2); - p2.appendChild(contentP2); +function handleContributors(contributors) { + const rightDiv = document.getElementById('rightDiv'); + rightDiv.innerHTML = ''; + const contributorsTitle = createElement(rightDiv, 'div', 'contributorsTitle'); + const contributorsTitleContent = document.createTextNode('Contributors'); + contributorsTitle.appendChild(contributorsTitleContent); + contributors.forEach(contributor => { + // create subDiv for each contributor + const subDiv = document.createElement('div'); + subDiv.className = 'contributor'; + rightDiv.appendChild(subDiv); + const image = document.createElement('img'); + image.className = 'image'; + image.setAttribute('src', contributor.avatar_url); + subDiv.appendChild(image); + const login = createElement(subDiv, 'p', 'login'); + const loginContent = document.createTextNode(contributor.login); + login.appendChild(loginContent); + const contributions = createElement(subDiv, 'p', 'contributions'); + const contributionsContent = document.createTextNode(contributor.contributions); + contributions.appendChild(contributionsContent); + }); } +const logContributors = async url => { + try { + const contributorsData = await fetchRepositories(url); + const FooCodingContributors = contributorsData.sort((a, b) => + a.login.localeCompare(b.login, 'fr', { ignorePunctuation: true }), + ); + handleContributors(FooCodingContributors); + } catch (error) { + const errorDiv = createElement(mainDiv, 'div', 'errorDiv'); + const errorContent = document.createTextNode('error'); + errorDiv.appendChild(errorContent); + } +}; + function createPage(repositories) { // create upperDiv const upperDiv = createElement(mainDiv, 'div', 'upperDiv'); @@ -76,7 +99,17 @@ function createPage(repositories) { const leftDiv = createElement(leftRightDiv, 'div', 'leftDiv'); const repositoryDetails = createElement(leftDiv, 'ul', 'repositoryDetails'); const defaultRepository = repositories[0]; - createList(repositoryDetails, 'li', defaultRepository.name, defaultRepository.description, defaultRepository.forks, defaultRepository.updated_at, defaultRepository.html_url); + const updated = defaultRepository.updated_at; + const formatUpdated = updated.replace(/T/, ', ').replace(/Z/, ''); + createList( + repositoryDetails, + 'li', + defaultRepository.name, + defaultRepository.description, + defaultRepository.forks, + formatUpdated, + defaultRepository.html_url, + ); // create rightDiv createElement(leftRightDiv, 'div', 'rightDiv'); // fetch contributors to implement the rightDiv @@ -89,31 +122,32 @@ function createPage(repositories) { liElement[i].parentElement.removeChild(liElement[i]); } const selectedRepository = repositories[select.value]; - createList(repositoryDetails, 'li', 'detailsList', selectedRepository.name, selectedRepository.description, selectedRepository.forks, selectedRepository.updated_at); + const updatedForSelect = selectedRepository.updated_at; + const formatUpdatedForSelect = updatedForSelect.replace(/T/, ', ').replace(/Z/, ''); + createList( + repositoryDetails, + 'li', + selectedRepository.name, + selectedRepository.description, + selectedRepository.forks, + formatUpdatedForSelect, + ); const ContributorsUrl = selectedRepository.contributors_url; logContributors(ContributorsUrl); }); } -function handleContributors(contributors) { - const rightDiv = document.getElementById('rightDiv'); - rightDiv.innerHTML = ''; - contributors.forEach(contributor => { - // create subDiv for each contributor - const subDiv = document.createElement('div'); - subDiv.className = 'contributor' - rightDiv.appendChild(subDiv); - const image = document.createElement('img'); - image.className = 'image'; - image.setAttribute('src', contributor.avatar_url); - subDiv.appendChild(image); - const login = createElement(subDiv, 'p', 'login'); - const loginContent = document.createTextNode(contributor.login) - login.appendChild(loginContent); - const contributions = createElement(subDiv, 'p', 'contributions'); - const contributionsContent = document.createTextNode(contributor.contributions) - contributions.appendChild(contributionsContent); - }); -} -const mainDiv = document.body; +const logData = async url => { + try { + const repositoriesData = await fetchRepositories(url); + const FooCodingRepositories = repositoriesData.sort((a, b) => + a.name.localeCompare(b.name, 'fr', { ignorePunctuation: true }), + ); + createPage(FooCodingRepositories); + } catch (error) { + const errorDiv = createElement(mainDiv, 'div', 'errorDiv'); + const errorContent = document.createTextNode('error'); + errorDiv.appendChild(errorContent); + } +}; logData('https://api.github.com/orgs/foocoding/repos?per_page=100'); diff --git a/homework/style.css b/homework/style.css index bff7a0db6..cfcb5c955 100644 --- a/homework/style.css +++ b/homework/style.css @@ -4,7 +4,7 @@ body { margin-top: 0px; margin-right: auto; margin-left: auto; - background-color: #f5f5f5; + background-color: #d3d3d3; font-family: 'Roboto', sans-serif; text-align: left; color: rgb(0, 0, 0, 87%); @@ -16,62 +16,68 @@ body { margin-right: 4%; background-color: #0072ce; } -#upperDiv > #upperDivP { +#upperDivP { color: white; width: 40%; padding-left: 2%; font-size: 10px; } -#upperDiv > #repositoriesSelect { +#repositoriesSelect { width: 40%; border-radius: 4px; font-size: 9px; } #leftRightDiv { display: flex; + font-size: 8px; } -#leftRightDiv > #leftDiv { +#leftDiv { margin-top: 2%; margin-left: 3%; margin-right: 3%; width: 45%; - height: 30%; + height: 45%; background-color: white; - font-size: 8px; } -#leftRightDiv > #rightDiv { +#rightDiv { width: 45%; margin-top: 2%; - margin-right: 2%; background-color: white; } +ul { + margin-right: 4%; +} #li0, #li1, #li2, #li3 { display: flex; } -#li0 > #repository, -#li1 > #description, -#li2 > #forks, -#li3 > #updated { - width: 40%; +#repository, +#description, +#forks, +#updated { + width: 30%; margin-top: 1%; margin-left: 0%; font-weight: bold; } -#li0 > #repositoryValue, -#li1 > #descriptionValue, -#li2 > #forksValue, -#li3 > #updatedValue { - width: 60%; +#repositoryValue, +#descriptionValue, +#forksValue, +#updatedValue { + width: 70%; margin-top: 1%; - margin-left: 3%; + padding-left: 6%; + padding-right: 6%; } -img { - width: 3%; - height: 3%; - border-radius: 4px; +#contributorsTitle { + margin-left: 10%; + font-weight: bold; + color: #a9a9a9; + margin-top: auto; + padding-top: 4%; + padding-bottom: 4%; } .contributor { display: flex; @@ -81,112 +87,43 @@ img { padding-bottom: 4%; } .contributor > .image { - width: 35%; - margin-left: 6%; + width: 20%; + height: 20%; + margin-left: 10%; + border-radius: 4px; } -.contributor > #login { +#login { width: 30%; margin-top: 15%; margin-left: 3%; font-weight: bold; - font-size: 6px; } -.contributor > #contributions { - width: 10%; - height: 10%; +#contributions { + width: 8%; + height: 14%; margin-top: 15%; + margin-left: 20%; background-color: rgb(169, 169, 169); - font-size: 8px; text-align: center; border-radius: 4px; font-weight: bold; color: white; } @media (min-width: 769px) and (max-width: 1024px) { - #leftRightDiv > #leftDiv { - padding-right: 2%; - margin-left: 3%; - width: 45%; - } - #leftRightDiv > #rightDiv { - width: 45%; - margin-right: 3%; - font-size: 14px; - } - #li0 > #repository, - #li1 > #description, - #li2 > #forks, - #li3 > #updated { - width: 20%; - margin-top: 1%; - margin-left: 0%; - font-weight: bold; - font-size: 12px; - } - #li0 > #repositoryValue, - #li1 > #descriptionValue, - #li2 > #forksValue, - #li3 > #updatedValue { - width: 70%; - margin-top: 1%; - margin-right: 1%; - font-size: 12px; - } - .contributor > .image { - width: 30px; - height: 30px; - margin-left: 7%; - } - .contributor > #login { - width: 10%; - margin-left: 3%; - font-size: 30px; + #leftRightDiv { font-size: 12px; } - .contributor > #contributions { - width: 8%; - height: 10%; - margin-right: 6%; - font-size: 12; - } } @media (min-width: 1025px) and (max-width: 1280px) { - #upperDiv > #upperDivP { - width: 22%; + #upperDivP { + width: 30%; font-size: 14px; } - #upperDiv > #repositoriesSelect { + #repositoriesSelect { width: 22%; - font-size: 14px; - } - #leftRightDiv { font-size: 12px; } - #li0 > #repository, - #li1 > #description, - #li2 > #forks, - #li3 > #updated { - font-size: 14px; - } - #li0 > #repositoryValue, - #li1 > #descriptionValue, - #li2 > #forksValue, - #li3 > #updatedValue { - font-size: 14px; - } - .contributor > .image { - width: 25%; - height: 25%; - margin-left: 10%; - } - .contributor > #login { - width: 30%; - margin-left: 10%; - font-size: 14px; - } - .contributor > #contributions { - width: 12%; - height: 12%; + #leftRightDiv { font-size: 14px; } } diff --git a/package.json b/package.json index b918b8cbd..fd3398c5b 100644 --- a/package.json +++ b/package.json @@ -12,10 +12,10 @@ "eslint": "^5.9.0", "eslint-config-airbnb": "^17.1.0", "eslint-config-airbnb-base": "^13.1.0", - //"eslint-config-prettier": "^3.3.0", + "eslint-config-prettier": "^3.3.0", "eslint-plugin-import": "^2.14.0", "eslint-plugin-jsx-a11y": "^6.1.2", - //"eslint-plugin-prettier": "^3.0.0", + "eslint-plugin-prettier": "^3.0.0", "eslint-plugin-react": "^7.11.1", "prettier": "^1.15.2" }