From 987568bb3348e62f3c78c19733445dee8e29ba0a Mon Sep 17 00:00:00 2001 From: Olga Shcherbatiuk Date: Sun, 13 Sep 2026 15:38:22 +0300 Subject: [PATCH 1/2] solution --- .github/workflows/test.yml-template | 29 +++++++++++++++++++++++++ README.md | 6 +++--- package-lock.json | 9 ++++---- package.json | 2 +- src/scripts/main.js | 33 ++++++++++++++++++++++++++++- 5 files changed, 70 insertions(+), 9 deletions(-) create mode 100644 .github/workflows/test.yml-template diff --git a/.github/workflows/test.yml-template b/.github/workflows/test.yml-template new file mode 100644 index 000000000..44ac4e963 --- /dev/null +++ b/.github/workflows/test.yml-template @@ -0,0 +1,29 @@ +name: Test + +on: + pull_request: + branches: [ master ] + +jobs: + build: + + runs-on: ubuntu-latest + + strategy: + matrix: + node-version: [20.x] + + steps: + - uses: actions/checkout@v2 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node-version }} + - run: npm install + - run: npm start & sleep 5 && npm test + - name: Upload tests report(cypress mochaawesome merged HTML report) + if: ${{ always() }} + uses: actions/upload-artifact@v2 + with: + name: report + path: reports diff --git a/README.md b/README.md index 294f077fb..1165b64f6 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ 1. Replace `` with your Github username in the link - - [DEMO LINK](https://.github.io/js_task_parse_list_DOM/) + - [DEMO LINK](https://AlucardYagamiGame.github.io/js_task_parse_list_DOM/) 2. Follow [this instructions](https://mate-academy.github.io/layout_task-guideline/) - Run `npm run test` command to test your code; - Run `npm run test:only -- -n` to run fast test ignoring linter; @@ -10,14 +10,14 @@ Hey there! Can you parse data from the list and sort it based on data attributes? Your task: Sort list by salary in descending order. -Get an array of employees. Write two functions: +Get an array of employees. Write two functions: - first, which sorts the list by salary from data attributes - second, which returns an array of objects, where objects are employees. The schema for the employee: ``` { - name, + name, position, salary, age diff --git a/package-lock.json b/package-lock.json index c3a278e3e..afdd680c2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@linthtml/linthtml": "^0.9.6", "@mate-academy/eslint-config": "latest", "@mate-academy/linthtml-config": "latest", - "@mate-academy/scripts": "^1.8.5", + "@mate-academy/scripts": "^2.1.3", "@mate-academy/stylelint-config": "latest", "@parcel/transformer-sass": "^2.12.0", "cypress": "^13.13.0", @@ -1497,10 +1497,11 @@ "dev": true }, "node_modules/@mate-academy/scripts": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@mate-academy/scripts/-/scripts-1.8.5.tgz", - "integrity": "sha512-mHRY2FkuoYCf5U0ahIukkaRo5LSZsxrTSgMJheFoyf3VXsTvfM9OfWcZIDIDB521kdPrScHHnRp+JRNjCfUO5A==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@mate-academy/scripts/-/scripts-2.1.3.tgz", + "integrity": "sha512-a07wHTj/1QUK2Aac5zHad+sGw4rIvcNl5lJmJpAD7OxeSbnCdyI6RXUHwXhjF5MaVo9YHrJ0xVahyERS2IIyBQ==", "dev": true, + "license": "MIT", "dependencies": { "@octokit/rest": "^17.11.2", "@types/get-port": "^4.2.0", diff --git a/package.json b/package.json index 8e38597e8..a43a43f70 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "@linthtml/linthtml": "^0.9.6", "@mate-academy/eslint-config": "latest", "@mate-academy/linthtml-config": "latest", - "@mate-academy/scripts": "^1.8.5", + "@mate-academy/scripts": "^2.1.3", "@mate-academy/stylelint-config": "latest", "@parcel/transformer-sass": "^2.12.0", "cypress": "^13.13.0", diff --git a/src/scripts/main.js b/src/scripts/main.js index a765fdb1d..2aa624464 100644 --- a/src/scripts/main.js +++ b/src/scripts/main.js @@ -1,3 +1,34 @@ 'use strict'; -// write code here +const ul = document.querySelector('ul'); + +function getEmployees(list) { + const items = list.querySelectorAll('li'); + + return Array.from(items).map((item) => ({ + name: item.textContent.trim(), + position: item.dataset.position, + salary: item.dataset.salary, + age: parseInt(item.dataset.age), + })); +} + +function helperParseSalary(salary) { + return parseInt(salary.replace(/[$,]/g, '')); +} + +function sortList(listElement) { + const items = listElement.querySelectorAll('li'); + + const sortedItems = Array.from(items).sort((a, b) => { + const salaryA = helperParseSalary(a.dataset.salary); + const salaryB = helperParseSalary(b.dataset.salary); + + return salaryB - salaryA; + }); + + listElement.append(...sortedItems); +} + +sortList(ul); +getEmployees(ul); From 84af1deca92c5c040ceff7d67a5cdc9c16f52da0 Mon Sep 17 00:00:00 2001 From: Olga Shcherbatiuk Date: Sun, 13 Sep 2026 15:48:43 +0300 Subject: [PATCH 2/2] fix --- src/scripts/main.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/scripts/main.js b/src/scripts/main.js index 2aa624464..0082b7829 100644 --- a/src/scripts/main.js +++ b/src/scripts/main.js @@ -8,13 +8,13 @@ function getEmployees(list) { return Array.from(items).map((item) => ({ name: item.textContent.trim(), position: item.dataset.position, - salary: item.dataset.salary, - age: parseInt(item.dataset.age), + salary: helperParseSalary(item.dataset.salary), + age: parseInt(item.dataset.age, 10), })); } function helperParseSalary(salary) { - return parseInt(salary.replace(/[$,]/g, '')); + return parseInt(salary.replace(/[$,]/g, ''), 10); } function sortList(listElement) {