diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 340cff5c..f3065d38 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,7 @@ jobs: with: node-version: ${{ matrix.node-version }} - run: npm install - - run: npm start & sleep 5 && npm test + - run: npm test - name: Upload HTML report(backstop data) if: ${{ always() }} uses: actions/upload-artifact@v2 diff --git a/.linthtmlrc.json b/.linthtmlrc.json index 0f2047a7..774726eb 100644 --- a/.linthtmlrc.json +++ b/.linthtmlrc.json @@ -1,3 +1,49 @@ { - "extends": "@mate-academy/linthtml-config" + "attr-bans": [ + "align", + "background", + "bgcolor", + "border", + "frameborder", + "style" + ], + "attr-name-ignore-regex": "viewBox", + "attr-no-dup": true, + "attr-quote-style": "double", + "attr-req-value": true, + "class-no-dup": true, + "doctype-first": true, + "doctype-html5": true, + "fig-req-figcaption": true, + "head-req-title": true, + "html-req-lang": true, + "id-class-style": false, + "id-no-dup": true, + "img-req-src": true, + "img-req-alt": "allownull", + "indent-width": 2, + "indent-style": "spaces", + "indent-width-cont": true, + "input-radio-req-name": true, + "spec-char-escape": true, + "tag-bans": [ + "b", + "i", + "u", + "center", + "style", + "marquee", + "font", + "s" + ], + "tag-name-lowercase": true, + "tag-name-match": true, + "tag-self-close": "never", + "tag-close": true, + "text-ignore-regex": "&", + "title-no-dup": true, + "line-end-style": "lf", + "attr-new-line": 2, + "attr-name-style": "dash", + "attr-no-unsafe-char": true } diff --git a/README.md b/README.md index 36dc318d..4b29adae 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ 1. Replace `` with your Github username in the link - - [DEMO LINK](https://.github.io/js_get_data_DOM/) + - [DEMO LINK](https://Liliya-Kalinichenko.github.io/js_get_data_DOM/) 2. Follow [this instructions](https://mate-academy.github.io/layout_task-guideline/) - - There are no tests for this task so use `npm run lint` command instead of `npm test` + - There are no tests for this task so use `npm run lint` command instead of `npm test` ### Task: TOP 10 LARGEST COUNTRIES BY POPULATION diff --git a/package.json b/package.json index eb1d8619..302fa4e3 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "@mate-academy/bemlint": "^0.1.1", "@mate-academy/eslint-config": "*", "@mate-academy/linthtml-config": "0.0.2", - "@mate-academy/scripts": "^0.8.10", + "@mate-academy/scripts": "^1.2.9", "@mate-academy/stylelint-config": "0.0.9", "colors": "^1.3.3", "eslint": "^5.16.0", diff --git a/src/scripts/main.js b/src/scripts/main.js index c6e3f878..5ba93df0 100644 --- a/src/scripts/main.js +++ b/src/scripts/main.js @@ -1,3 +1,15 @@ 'use strict'; -// write your code here +const populations = document.querySelectorAll('.population'); + +const totalPopulation = [...populations] + .map(el => parseFloat(el.textContent.replaceAll(',', ''))) + .reduce((sum, el) => sum + el, 0); + +const averagePopulation = totalPopulation / populations.length; + +document.querySelector('.total-population') + .textContent = totalPopulation.toLocaleString('en-US'); + +document.querySelector('.average-population') + .textContent = averagePopulation.toLocaleString('en-US');