diff --git a/.github/workflows/test.yml-template b/.github/workflows/test.yml-template new file mode 100644 index 000000000..8b5743ecb --- /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/README.md b/README.md index 37cba2aad..00197885c 100644 --- a/README.md +++ b/README.md @@ -36,8 +36,8 @@ This is possible because [we use the Parcel library](https://en.parceljs.org/scs ❗️ Replace `` with your Github username and copy the links to `Pull Request` description: -- [DEMO LINK](https://.github.io/layout_calendar/) -- [TEST REPORT LINK](https://.github.io/layout_calendar/report/html_report/) +- [DEMO LINK](https://bbbozhena.github.io/layout_calendar/) +- [TEST REPORT LINK](https://bbbozhena.github.io/layout_calendar/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/package-lock.json b/package-lock.json index 08a8b9f22..cfc7c3796 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", @@ -1212,10 +1212,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 8ba3c0562..5691b66ca 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 c10199d38..3c6d57982 100644 --- a/src/index.html +++ b/src/index.html @@ -14,5 +14,48 @@

Calendar

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + +
diff --git a/src/styles/index.scss b/src/styles/index.scss index 293d3b1f1..5d3fab973 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -1,3 +1,62 @@ +@import './variables'; + body { margin: 0; + font-family: Arial, Helvetica, sans-serif; + justify-content: center; + align-items: center; + display: flex; + height: 100vh; +} + +h1 { + display: none; +} + +.calendar { + display: flex; + flex-wrap: wrap; + counter-reset: day; + width: 707px; + gap: 1px; + + @each $day, $index in (sun: 6, mon: 0, tue: 1, wed: 2, thu: 3, fri: 4, sat: 5) + { + &--start-#{$day} .calendar__day:first-child { + margin-left: calc(#{$index} * (#{100px} + #{1px})); + } + } + + @for $length from 28 through 31 { + &--month-length-#{$length} .calendar__day:nth-child(n + #{$length + 1}) { + display: none; + } + } +} + +.calendar__day { + display: flex; + justify-content: center; + align-items: center; + width: $cell-size; + height: $cell-size; + border: 1px solid black; + background-color: $base-color; + cursor: pointer; + transition: + background-color $transition-duration, + transform $transition-duration; + + &::before { + content: counter(day); + counter-increment: day; + font-family: Arial, sans-serif; + font-size: 30px; + color: black; + } + + &:hover { + background-color: $hover-color; + transform: translateY($hover-offset); + } } diff --git a/src/styles/variables.scss b/src/styles/variables.scss new file mode 100644 index 000000000..7748f8732 --- /dev/null +++ b/src/styles/variables.scss @@ -0,0 +1,7 @@ +$base-color: #eee; +$columns: 7; +$padding: 10px; +$cell-size: 98px; +$hover-color: #ffbfcb; +$hover-offset: -20px; +$transition-duration: 0.5s;