From 51b8150a41faf1a5a0daf91346b81e7fb938b33c Mon Sep 17 00:00:00 2001 From: Ko2doo Date: Mon, 10 Jun 2024 19:30:00 +0500 Subject: [PATCH] =?UTF-8?q?UPD:FIX:10.06.2024:19:30=20=3D>=20=D0=9C=D0=B8?= =?UTF-8?q?=D0=B3=D1=80=D0=B0=D1=86=D0=B8=D1=8F=20=D0=B4=D0=BE=20gulp=20v5?= =?UTF-8?q?.0.0=20+=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=BD=D0=B5=D0=BA=D0=BE=D1=82=D0=BE=D1=80=D1=8B?= =?UTF-8?q?=D1=85=20=D0=B7=D0=B0=D0=B2=D0=B8=D1=81=D0=B8=D0=BC=D0=BE=D1=81?= =?UTF-8?q?=D1=82=D0=B5=D0=B9=20=D1=80=D0=B0=D0=B7=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D0=BA=D0=B8=20+=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82?= =?UTF-8?q?=D0=B0=20=D0=BA=D0=BE=D1=88=D0=BA=D0=B8=20=D0=BC=D1=8B=D1=88?= =?UTF-8?q?=D0=BA=D0=B8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 50 +++++++++++++-------------- src/scripts/main/modules/buttons.mjs | 31 ++++++++++++----- src/views/sections/_first_section.njk | 8 ++--- 3 files changed, 52 insertions(+), 37 deletions(-) diff --git a/package.json b/package.json index c30cbb9..bba41e3 100644 --- a/package.json +++ b/package.json @@ -68,28 +68,28 @@ }, "homepage": "https://github.com/Template-Craft/gulp-nunjucks-starter-kit#readme", "devDependencies": { - "@babel/core": "^7.23.0", - "@babel/eslint-parser": "^7.22.15", - "@babel/preset-env": "^7.22.20", - "@babel/register": "^7.22.15", - "@types/archiver": "^6.0.1", - "@types/gulp": "^4.0.14", - "@types/gulp-clean-css": "^4.3.2", - "@types/gulp-concat": "^0.0.35", - "@types/gulp-plumber": "^0.0.35", - "@types/gulp-postcss": "^8.0.4", - "@types/gulp-rename": "^2.0.3", - "@types/node-notifier": "^8.0.3", - "@types/webpack-stream": "^3.2.13", - "@types/yargs": "^17.0.26", - "archiver": "^6.0.1", - "autoprefixer": "^10.4.16", + "@babel/core": "^7.24.7", + "@babel/eslint-parser": "^7.24.7", + "@babel/preset-env": "^7.24.7", + "@babel/register": "^7.24.6", + "@types/archiver": "^6.0.2", + "@types/gulp": "^4.0.17", + "@types/gulp-clean-css": "^4.3.4", + "@types/gulp-concat": "^0.0.37", + "@types/gulp-plumber": "^0.0.37", + "@types/gulp-postcss": "^8.0.6", + "@types/gulp-rename": "^2.0.6", + "@types/node-notifier": "^8.0.5", + "@types/webpack-stream": "^3.2.15", + "@types/yargs": "^17.0.32", + "archiver": "^7.0.1", + "autoprefixer": "^10.4.19", "babel-loader": "^9.1.3", - "browser-sync": "^2.29.3", + "browser-sync": "^3.0.2", "chalk": "^5.3.0", "concat": "^1.0.3", - "cssnano": "^6.0.1", - "cssnano-preset-advanced": "^6.0.1", + "cssnano": "^7.0.2", + "cssnano-preset-advanced": "^7.0.2", "del": "^7.1.0", "eslint": "^8.50.0", "eslint-config-prettier": "^9.0.0", @@ -98,7 +98,7 @@ "eslint-plugin-import": "^2.28.1", "eslint-plugin-n": "^16.1.0", "eslint-plugin-promise": "^6.1.1", - "gulp": "^4.0.2", + "gulp": "^5.0.0", "gulp-beautify": "^3.0.0", "gulp-concat": "^2.6.1", "gulp-if": "^3.0.0", @@ -106,17 +106,17 @@ "gulp-notify": "^4.0.0", "gulp-nunjucks-render": "^2.2.3", "gulp-plumber": "^1.2.1", - "gulp-postcss": "^9.0.1", + "gulp-postcss": "^10.0.0", "gulp-rename": "^2.0.0", "gulp-replace": "^1.1.4", "gulp-sass": "^5.1.0", "gulp-sourcemaps": "^3.0.0", "node-notifier": "^10.0.1", - "postcss": "^8.4.31", + "postcss": "^8.4.38", "postcss-sort-media-queries": "^5.2.0", - "prettier": "^3.0.3", - "sass": "^1.68.0", - "webpack": "^5.88.2", + "prettier": "^3.3.1", + "sass": "^1.77.4", + "webpack": "^5.91.0", "webpack-stream": "^7.0.0", "yargs": "^17.7.2" }, diff --git a/src/scripts/main/modules/buttons.mjs b/src/scripts/main/modules/buttons.mjs index 7561b00..8009b66 100644 --- a/src/scripts/main/modules/buttons.mjs +++ b/src/scripts/main/modules/buttons.mjs @@ -1,20 +1,35 @@ +/* eslint-disable camelcase */ /* eslint-disable no-unused-expressions */ 'use strict'; export const btnCardAnimals = () => { + let cat_count = 2; + let mouse_count = 4; + const getButton = document.querySelector('.js-btn__card-animals'); - const getCardItem = document.querySelector('.js-card-animals'); + const getAnimal = document.querySelectorAll('.js-card-animals > ol > li'); + + const animal = getAnimal; + + for (let i = 0; i < animal.length; i++) { + animal[i].setAttribute('data-animal-count', `${i}`); + } + + getButton.addEventListener('click', function () { + cat_count++; + mouse_count--; - getButton.addEventListener('click', (event) => { - event.preventDefault; - const styles = ['background: #faebd7; box-shadow: 0 4px 16px -4px rgb(239 146 23); transform: scale(1.2);']; + const cat = animal[0]; + cat.innerHTML = `cat : ${cat_count}`; - getCardItem.classList.toggle('is-active'); + const mouse = animal[2]; + mouse.innerHTML = `mouse : ${mouse_count}`; - if (document.querySelector('.js-card-animals.is-active') !== null) { - getCardItem.setAttribute('style', styles); + if (mouse_count === 0) { + this.setAttribute('disabled', ''); + cat.innerHTML = `Cats win!`; } else { - getCardItem.removeAttribute('style'); + this.removeAttribute('disabled', ''); } }); }; diff --git a/src/views/sections/_first_section.njk b/src/views/sections/_first_section.njk index a581e41..f7e8298 100644 --- a/src/views/sections/_first_section.njk +++ b/src/views/sections/_first_section.njk @@ -2,15 +2,15 @@
- {% set arr = { "кошки": "2", "собака": "1", "мышей": "15" }%} + {% set arr_animals = { "cat": "2", "dog": "1", "mouse": "4" }%}
    - {% for item, about in arr %} -
  1. У нас есть: {{ about }} {{ item -}}
    2. + {% for animal, count in arr_animals %} +
  2. {{- animal }} : {{ count -}}
    3. {% endfor %}
- +