From f542628c0eb1b9e01fc6a6597dfda8802cd38986 Mon Sep 17 00:00:00 2001 From: Marian Date: Wed, 24 Jun 2026 01:35:10 +0300 Subject: [PATCH 1/2] feat: add promise solution --- .github/workflows/test.yml-template | 29 ++++++++++++++++++++++++++++ README.md | 2 +- package-lock.json | 9 +++++---- package.json | 3 +-- src/scripts/main.js | 30 ++++++++++++++++++++++++++++- 5 files changed, 65 insertions(+), 8 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 00000000..44ac4e96 --- /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 1395a36c..d9b7db80 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Create 2 promises `promise1` and `promise2`. ## Instructions 1. Replace `` with your Github username in the link - - [DEMO LINK](https://.github.io/js_promise_basic_DOM/) + - [DEMO LINK](https://m-berezovskyy.github.io/js_promise_basic_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; diff --git a/package-lock.json b/package-lock.json index 695152e8..d24e198f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "@mate-academy/eslint-config": "latest", "@mate-academy/jest-mochawesome-reporter": "^1.0.0", "@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", @@ -1467,10 +1467,11 @@ "dev": true }, "node_modules/@mate-academy/scripts": { - "version": "1.8.6", - "resolved": "https://registry.npmjs.org/@mate-academy/scripts/-/scripts-1.8.6.tgz", - "integrity": "sha512-b4om/whj4G9emyi84ORE3FRZzCRwRIesr8tJHXa8EvJdOaAPDpzcJ8A0sFfMsWH9NUOVmOwkBtOXDu5eZZ00Ig==", + "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 6921b8a3..6ca96c7b 100644 --- a/package.json +++ b/package.json @@ -18,13 +18,12 @@ "postinstall": "npm run update", "test": "npm run lint && npm run test:only" }, - "dependencies": {}, "devDependencies": { "@linthtml/linthtml": "^0.9.6", "@mate-academy/eslint-config": "latest", "@mate-academy/jest-mochawesome-reporter": "^1.0.0", "@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 c6e3f878..d164f218 100644 --- a/src/scripts/main.js +++ b/src/scripts/main.js @@ -1,3 +1,31 @@ 'use strict'; -// write your code here +const logo = document.querySelector('.logo'); + +const promise1 = new Promise((resolve, reject) => { + logo.addEventListener('click', () => { + resolve(); + }); +}); + +promise1.then(() => { + const messageDiv = document.createElement('div'); + + messageDiv.classList.add('message'); + messageDiv.textContent = 'Promise was resolved!'; + document.body.append(messageDiv); +}); + +const promise2 = new Promise((resolve, reject) => { + setTimeout(() => { + reject(new Error('Timeout!')); + }, 3000); +}); + +promise2.catch(() => { + const errorDiv = document.createElement('div'); + + errorDiv.classList.add('message', 'error-message'); + errorDiv.textContent = 'Promise was rejected!'; + document.body.append(errorDiv); +}); From 9fccbf26938cec7fedaae6ea1752089e34d8e735 Mon Sep 17 00:00:00 2001 From: Marian Date: Wed, 24 Jun 2026 01:48:04 +0300 Subject: [PATCH 2/2] fix: add missing handlers for both promises --- src/scripts/main.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/scripts/main.js b/src/scripts/main.js index d164f218..b5f8f13c 100644 --- a/src/scripts/main.js +++ b/src/scripts/main.js @@ -16,12 +16,28 @@ promise1.then(() => { document.body.append(messageDiv); }); +promise1.catch(() => { + const errorDiv = document.createElement('div'); + + errorDiv.classList.add('message', 'error-message'); + errorDiv.textContent = 'Promise was rejected!'; + document.body.append(errorDiv); +}); + const promise2 = new Promise((resolve, reject) => { setTimeout(() => { reject(new Error('Timeout!')); }, 3000); }); +promise2.then(() => { + const messageDiv = document.createElement('div'); + + messageDiv.classList.add('message'); + messageDiv.textContent = 'Promise was resolved!'; + document.body.append(messageDiv); +}); + promise2.catch(() => { const errorDiv = document.createElement('div');