From 0a24c15f03ea6f736e7b385c05103a1a3d93313d Mon Sep 17 00:00:00 2001 From: Yurii Tymkiv Date: Mon, 7 Oct 2024 13:56:21 +0200 Subject: [PATCH 1/4] add a HTML markup --- readme.md | 4 ++-- src/index.html | 35 ++++++++++++++++++++++++++++++++++- src/styles/index.scss | 3 +++ 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/readme.md b/readme.md index 3354ca6020..05f1d3bdc3 100644 --- a/readme.md +++ b/readme.md @@ -20,8 +20,8 @@ Create a pages with product card using `flexbox`, `BEM` and `SCSS` based on [thi ❗️ Replace `` with your Github username and copy the links to `Pull Request` description: -- [DEMO LINK](https://.github.io/layout_product-cards/) -- [TEST REPORT LINK](https://.github.io/layout_product-cards/report/html_report/) +- [DEMO LINK](https://yuurex.github.io/layout_product-cards/) +- [TEST REPORT LINK](https://yuurex.github.io/layout_product-cards/report/html_report/) ❗️ Copy this `Checklist` to the `Pull Request` description after links, and put `- [x]` before each point after you checked it. diff --git a/src/index.html b/src/index.html index 43745cc17f..da6943f523 100644 --- a/src/index.html +++ b/src/index.html @@ -13,6 +13,39 @@ /> -

Product cards

+
+

+ APPLE A1419 iMac 27" Retina 5K Monoblock (MNED2UA/A) +

+

Product code: 195434

+ +
+
+
+
+
+
+
+
+ +

Reviews: 5

+
+ +
+

Price:

+

$2,199

+
+ + + BUY + +
diff --git a/src/styles/index.scss b/src/styles/index.scss index 293d3b1f13..cea90497d7 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -1,3 +1,6 @@ body { margin: 0; + background-color: antiquewhite; } + + From 2cc34cb88f5758b288fd25054c949bfe2478a080 Mon Sep 17 00:00:00 2001 From: Yurii Tymkiv Date: Tue, 8 Oct 2024 13:41:02 +0200 Subject: [PATCH 2/4] add a SCSS styles --- src/index.html | 24 +++++-- src/styles/index.scss | 144 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 162 insertions(+), 6 deletions(-) diff --git a/src/index.html b/src/index.html index da6943f523..1e146eb939 100644 --- a/src/index.html +++ b/src/index.html @@ -11,12 +11,27 @@ rel="stylesheet" href="./styles/index.scss" /> + + + +
+
+

APPLE A1419 iMac 27" Retina 5K Monoblock (MNED2UA/A)

@@ -30,13 +45,12 @@

Product code: 195434

- -

Reviews: 5

+

Reviews: 5

-
-

Price:

-

$2,199

+
+

Price:

+

$2,199

Date: Fri, 11 Oct 2024 11:26:37 +0200 Subject: [PATCH 3/4] fix a proplem with commit --- .github/workflows/test.yml-template | 29 +++++++++++++++++++++++++++++ package-lock.json | 9 +++++---- package.json | 2 +- src/index.html | 2 +- 4 files changed, 36 insertions(+), 6 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 0000000000..8b5743ecb4 --- /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 test + - name: Upload HTML report(backstop data) + if: ${{ always() }} + uses: actions/upload-artifact@v2 + with: + name: report + path: backstop_data diff --git a/package-lock.json b/package-lock.json index 373f5d0040..1890861f0c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "@mate-academy/backstop-config": "latest", "@mate-academy/bemlint": "latest", "@mate-academy/linthtml-config": "latest", - "@mate-academy/scripts": "^1.8.6", + "@mate-academy/scripts": "^1.9.12", "@mate-academy/stylelint-config": "latest", "@parcel/transformer-sass": "^2.12.0", "backstopjs": "6.3.23", @@ -1230,10 +1230,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": "1.9.12", + "resolved": "https://registry.npmjs.org/@mate-academy/scripts/-/scripts-1.9.12.tgz", + "integrity": "sha512-/OcmxMa34lYLFlGx7Ig926W1U1qjrnXbjFJ2TzUcDaLmED+A5se652NcWwGOidXRuMAOYLPU2jNYBEkKyXrFJA==", "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 4b42d42f7b..cc5756264b 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "@mate-academy/backstop-config": "latest", "@mate-academy/bemlint": "latest", "@mate-academy/linthtml-config": "latest", - "@mate-academy/scripts": "^1.8.6", + "@mate-academy/scripts": "^1.9.12", "@mate-academy/stylelint-config": "latest", "@parcel/transformer-sass": "^2.12.0", "backstopjs": "6.3.23", diff --git a/src/index.html b/src/index.html index 1e146eb939..b512e2702e 100644 --- a/src/index.html +++ b/src/index.html @@ -9,7 +9,7 @@ Product cards Date: Fri, 11 Oct 2024 12:42:29 +0200 Subject: [PATCH 4/4] fix a second proplem with commit --- src/index.html | 2 +- src/styles/{index.scss => main.scss} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename src/styles/{index.scss => main.scss} (100%) diff --git a/src/index.html b/src/index.html index b512e2702e..7060591caa 100644 --- a/src/index.html +++ b/src/index.html @@ -9,7 +9,7 @@ Product cards