evgdudareff · evgdudareff · Jan 28, 2020 · Jan 29, 2020 · Jan 29, 2020 · Jan 30, 2020
diff --git a/.babelrc b/.babelrc
diff --git a/README.md b/README.md
@@ -1,22 +1,19 @@
 # hh-school-html
+
 [Demo](http://leonidfeskov.github.io/hh-school-html/)
 
 ## Установка
-* Установите [Node.js](https://nodejs.org/en/download/)
-`brew install node`
-* Установите [yarn](https://yarnpkg.com/lang/en/docs/install/) 
-`brew install yarn`
-* Установите [parcel](https://parceljs.org)
-`yarn global add parcel-bundler`
-* Установите зависимости проекта `yarn install`
+
+- Установите [Node.js](https://nodejs.org/en/download/)
+  `brew install node`
+- Установите [yarn](https://yarnpkg.com/lang/en/docs/install/)
+  `brew install yarn`
+- Установите зависимости проекта `yarn install`
 
 ## Для разработки:
-`yarn dev`
 
-откройте http://localhost:1234/
+`yarn dev`
 
 ## Сборка:
-`yarn build`
 
-## Деплой на gh-pages:
-`yarn deploy`
+`yarn build`
diff --git a/css/blocks/logo/logo-dark.svg b/css/blocks/logo/logo-dark.svg
diff --git a/package.json b/package.json
@@ -1,24 +1,37 @@
 {
   "name": "hh-school-html",
   "version": "1.0.0",
-  "homepage": "http://leonidfeskov.github.io/hh-school-html/",
-  "main": "index.js",
-  "author": "Leonid Feskov",
+  "private": true,
+  "repository": "https://github.com/evgdudareff/hh-school-html",
+  "author": "Evgeny Dudarev <evgduda@mail.ru>",
   "license": "MIT",
   "scripts": {
-    "dev": "parcel index.html",
-    "dev2": "parcel popup.html",
-    "build": "parcel build index.html --public-url .",
-    "deploy": "yarn build && gh-pages -d dist"
+    "build": "cross-env NODE_ENV=production webpack  --mode production",
+    "dev": "cross-env NODE_ENV=development webpack-dev-server  --mode development --open"
   },
   "devDependencies": {
-    "@babel/core": "^7.7.7",
-    "@babel/plugin-transform-runtime": "^7.7.6",
+    "@babel/core": "^7.8.3",
+    "@babel/polyfill": "^7.8.3",
+    "@babel/preset-env": "^7.8.3",
+    "babel-loader": "^8.0.6",
+    "clean-webpack-plugin": "^3.0.0",
+    "copy-webpack-plugin": "^5.1.1",
+    "cross-env": "^7.0.0",
+    "css-loader": "^3.4.2",
     "cssnano": "^4.1.10",
-    "gh-pages": "^2.1.1",
-    "less": "^3.10.3"
-  },
-  "dependencies": {
-    "@babel/runtime-corejs2": "^7.7.7"
+    "file-loader": "^5.0.2",
+    "html-webpack-plugin": "^3.2.0",
+    "imagemin-webpack-plugin": "^2.4.2",
+    "less": "^3.10.3",
+    "less-loader": "^5.0.0",
+    "mini-css-extract-plugin": "^0.9.0",
+    "optimize-css-assets-webpack-plugin": "^5.0.3",
+    "postcss-loader": "^3.0.0",
+    "style-loader": "^1.1.3",
+    "terser-webpack-plugin": "^2.3.4",
+    "url-loader": "^3.0.0",
+    "webpack": "^4.41.5",
+    "webpack-cli": "^3.3.10",
+    "webpack-dev-server": "^3.10.1"
   }
 }
diff --git a/css/blocks/app-mobile/app-mobile.less → src/css/blocks/app-mobile/app-mobile.less b/css/blocks/app-mobile/app-mobile.less → src/css/blocks/app-mobile/app-mobile.less
diff --git a/css/blocks/app-mobile/app-store-icon.svg → src/css/blocks/app-mobile/app-store-icon.svg b/css/blocks/app-mobile/app-store-icon.svg → src/css/blocks/app-mobile/app-store-icon.svg
diff --git a/css/blocks/app-mobile/google-play-icon.svg → ...ss/blocks/app-mobile/google-play-icon.svg b/css/blocks/app-mobile/google-play-icon.svg → ...ss/blocks/app-mobile/google-play-icon.svg
diff --git a/...ks/carousel-section/carousel-section.less → ...ks/carousel-section/carousel-section.less b/...ks/carousel-section/carousel-section.less → ...ks/carousel-section/carousel-section.less
diff --git a/...ocks/content-section/content-section.less → ...ocks/content-section/content-section.less b/...ocks/content-section/content-section.less → ...ocks/content-section/content-section.less
diff --git a/...blocks/copyright-info/copyright-info.less → ...blocks/copyright-info/copyright-info.less b/...blocks/copyright-info/copyright-info.less → ...blocks/copyright-info/copyright-info.less
diff --git a/css/blocks/feature/feature.less → src/css/blocks/feature/feature.less b/css/blocks/feature/feature.less → src/css/blocks/feature/feature.less
diff --git a/...ks/features-section/features-section.less → ...ks/features-section/features-section.less b/...ks/features-section/features-section.less → ...ks/features-section/features-section.less
diff --git a/css/blocks/footer/footer.less → src/css/blocks/footer/footer.less b/css/blocks/footer/footer.less → src/css/blocks/footer/footer.less
diff --git a/css/blocks/form/form.less → src/css/blocks/form/form.less b/css/blocks/form/form.less → src/css/blocks/form/form.less
diff --git a/css/blocks/header/header.less → src/css/blocks/header/header.less b/css/blocks/header/header.less → src/css/blocks/header/header.less
diff --git a/css/blocks/header/login-icon.svg → src/css/blocks/header/login-icon.svg b/css/blocks/header/login-icon.svg → src/css/blocks/header/login-icon.svg
diff --git a/css/blocks/header/menu-icon.svg → src/css/blocks/header/menu-icon.svg b/css/blocks/header/menu-icon.svg → src/css/blocks/header/menu-icon.svg
diff --git a/css/blocks/header/search-icon.svg → src/css/blocks/header/search-icon.svg b/css/blocks/header/search-icon.svg → src/css/blocks/header/search-icon.svg
diff --git a/css/blocks/logo/logo.less → src/css/blocks/logo/logo.less b/css/blocks/logo/logo.less → src/css/blocks/logo/logo.less
diff --git a/css/blocks/nav/nav.less → src/css/blocks/nav/nav.less b/css/blocks/nav/nav.less → src/css/blocks/nav/nav.less
diff --git a/css/blocks/navbar/navbar.less → src/css/blocks/navbar/navbar.less b/css/blocks/navbar/navbar.less → src/css/blocks/navbar/navbar.less
diff --git a/css/blocks/pagination/pagination.less → src/css/blocks/pagination/pagination.less b/css/blocks/pagination/pagination.less → src/css/blocks/pagination/pagination.less
diff --git a/css/blocks/popup/popup.less → src/css/blocks/popup/popup.less b/css/blocks/popup/popup.less → src/css/blocks/popup/popup.less
diff --git a/css/blocks/product-card/product-card.less → ...css/blocks/product-card/product-card.less b/css/blocks/product-card/product-card.less → ...css/blocks/product-card/product-card.less
diff --git a/css/blocks/social/facebook-icon.svg → src/css/blocks/social/facebook-icon.svg b/css/blocks/social/facebook-icon.svg → src/css/blocks/social/facebook-icon.svg
diff --git a/css/blocks/social/instagram-icon.svg → src/css/blocks/social/instagram-icon.svg b/css/blocks/social/instagram-icon.svg → src/css/blocks/social/instagram-icon.svg
diff --git a/css/blocks/social/social.less → src/css/blocks/social/social.less b/css/blocks/social/social.less → src/css/blocks/social/social.less
diff --git a/css/blocks/social/twitter-icon.svg → src/css/blocks/social/twitter-icon.svg b/css/blocks/social/twitter-icon.svg → src/css/blocks/social/twitter-icon.svg
diff --git a/css/blocks/social/vk-icon.svg → src/css/blocks/social/vk-icon.svg b/css/blocks/social/vk-icon.svg → src/css/blocks/social/vk-icon.svg
diff --git a/...ocks/statistics-info/statistics-info.less → ...ocks/statistics-info/statistics-info.less b/...ocks/statistics-info/statistics-info.less → ...ocks/statistics-info/statistics-info.less
diff --git a/css/common/button/button.less → src/css/common/button/button.less b/css/common/button/button.less → src/css/common/button/button.less
diff --git a/css/common/button/close.svg → src/css/common/button/close.svg b/css/common/button/close.svg → src/css/common/button/close.svg
diff --git a/css/common/checkbox/checkbox.less → src/css/common/checkbox/checkbox.less b/css/common/checkbox/checkbox.less → src/css/common/checkbox/checkbox.less
diff --git a/css/common/columns/columns.less → src/css/common/columns/columns.less b/css/common/columns/columns.less → src/css/common/columns/columns.less
diff --git a/css/common/grid/grid.less → src/css/common/grid/grid.less b/css/common/grid/grid.less → src/css/common/grid/grid.less
diff --git a/css/common/heading/heading.less → src/css/common/heading/heading.less b/css/common/heading/heading.less → src/css/common/heading/heading.less
diff --git a/css/common/input/input.less → src/css/common/input/input.less b/css/common/input/input.less → src/css/common/input/input.less
diff --git a/css/common/label/label.less → src/css/common/label/label.less b/css/common/label/label.less → src/css/common/label/label.less
diff --git a/css/common/radio-button/radio-button.less → ...css/common/radio-button/radio-button.less b/css/common/radio-button/radio-button.less → ...css/common/radio-button/radio-button.less
diff --git a/css/common/select/select.less → src/css/common/select/select.less b/css/common/select/select.less → src/css/common/select/select.less
diff --git a/css/common/textarea/textarea.less → src/css/common/textarea/textarea.less b/css/common/textarea/textarea.less → src/css/common/textarea/textarea.less
diff --git a/css/fonts.less → src/css/fonts.less b/css/fonts.less → src/css/fonts.less
diff --git a/css/global.less → src/css/global.less b/css/global.less → src/css/global.less
diff --git a/css/styles.less → src/css/styles.less b/css/styles.less → src/css/styles.less
diff --git a/css/variables.less → src/css/variables.less b/css/variables.less → src/css/variables.less
diff --git a/html/orderForm.html → src/html/orderForm.html b/html/orderForm.html → src/html/orderForm.html
diff --git a/popup.html → src/html/popup.html b/popup.html → src/html/popup.html
diff --git a/html/productCardPopup.html → src/html/productCardPopup.html b/html/productCardPopup.html → src/html/productCardPopup.html
diff --git a/images/delivery@3x.png → src/images/delivery@3x.png b/images/delivery@3x.png → src/images/delivery@3x.png
diff --git a/src/images/logo-dark.svg b/src/images/logo-dark.svg
diff --git a/css/blocks/logo/logo.svg → src/images/logo.svg b/css/blocks/logo/logo.svg → src/images/logo.svg
diff --git a/images/product-1.jpg → src/images/product-1.jpg b/images/product-1.jpg → src/images/product-1.jpg
diff --git a/images/product-2.jpg → src/images/product-2.jpg b/images/product-2.jpg → src/images/product-2.jpg
diff --git a/images/product-3.jpg → src/images/product-3.jpg b/images/product-3.jpg → src/images/product-3.jpg
diff --git a/images/product-4.jpg → src/images/product-4.jpg b/images/product-4.jpg → src/images/product-4.jpg
diff --git a/images/product-5.jpg → src/images/product-5.jpg b/images/product-5.jpg → src/images/product-5.jpg
diff --git a/images/product-6.jpg → src/images/product-6.jpg b/images/product-6.jpg → src/images/product-6.jpg
diff --git a/images/return@3x.png → src/images/return@3x.png b/images/return@3x.png → src/images/return@3x.png
diff --git a/images/slide-1.png → src/images/slide-1.png b/images/slide-1.png → src/images/slide-1.png
diff --git a/images/slide-1@1x.png → src/images/slide-1@1x.png b/images/slide-1@1x.png → src/images/slide-1@1x.png
diff --git a/images/slide-1@2x.png → src/images/slide-1@2x.png b/images/slide-1@2x.png → src/images/slide-1@2x.png
diff --git a/images/slide-1@3x.png → src/images/slide-1@3x.png b/images/slide-1@3x.png → src/images/slide-1@3x.png
diff --git a/images/slide-2.png → src/images/slide-2.png b/images/slide-2.png → src/images/slide-2.png
diff --git a/images/slide-2@1x.png → src/images/slide-2@1x.png b/images/slide-2@1x.png → src/images/slide-2@1x.png
diff --git a/images/slide-2@2x.png → src/images/slide-2@2x.png b/images/slide-2@2x.png → src/images/slide-2@2x.png
diff --git a/images/slide-2@3x.png → src/images/slide-2@3x.png b/images/slide-2@3x.png → src/images/slide-2@3x.png
diff --git a/images/support@3x.png → src/images/support@3x.png b/images/support@3x.png → src/images/support@3x.png
diff --git a/index.html → src/index.html b/index.html → src/index.html
@@ -4,7 +4,6 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta name="viewport" content="width=device-width" />
   <title>HTML и CSS</title>
-  <link rel="stylesheet" href="css/styles.less" />
 </head>
 <body class="body">
   <section class="navbar">
@@ -40,7 +39,7 @@
     <div class="columns-wrapper">
       <div class="header__content">
         <div class="header__logo">
-          <a href="#" class="logo-link"><img class="logo" src="css/blocks/logo/logo.svg" alt="hh.ru" /></a>
+          <a href="#" class="logo-link"><img class="logo" src="images/logo.svg" alt="hh.ru" /></a>
         </div>
         <div class="header__nav">
           <ul class="nav">
@@ -229,7 +228,7 @@ <h2 class="heading heading_level-2">Популярные товары</h2>
           <div class="feature features-section__feature">
             <img class="feature__image" src="images/delivery@3x.png" alt="Круглосуточная служба поддержки" />
             <div class="feature__description">
-              Круглосуточная служба&nbspподдержки
+              Круглосуточная служба&nbsp;поддержки
             </div>
           </div>
         </div>
@@ -280,7 +279,7 @@ <h2 class="heading heading_level-2">Популярные товары</h2>
         <div class="column column_s-2 column_m-2 column_l-4">
           <div class="footer__logo logo">
             <div class="logo">
-              <a href="#" class="logo-link"><img class="logo" src="css/blocks/logo/logo-dark.svg" alt="hh.ru" /></a>
+              <a href="#" class="logo-link"><img class="logo" src="images/logo-dark.svg" alt="hh.ru" /></a>
             </div> 
           </div>
         </div>
@@ -300,7 +299,7 @@ <h2 class="heading heading_level-2">Популярные товары</h2>
       </div>
     </div>
   </footer>
-  <script src="js/index.js"></script>
+
 </body>
 
 </html>
diff --git a/js/common/fieldValidation.js → src/js/common/fieldValidation.js b/js/common/fieldValidation.js → src/js/common/fieldValidation.js
diff --git a/js/common/getCoords.js → src/js/common/getCoords.js b/js/common/getCoords.js → src/js/common/getCoords.js
diff --git a/js/common/getDataAsync.js → src/js/common/getDataAsync.js b/js/common/getDataAsync.js → src/js/common/getDataAsync.js
diff --git a/js/common/getDocumentHeight.js → src/js/common/getDocumentHeight.js b/js/common/getDocumentHeight.js → src/js/common/getDocumentHeight.js
diff --git a/js/common/touchHandler.js → src/js/common/touchHandler.js b/js/common/touchHandler.js → src/js/common/touchHandler.js
diff --git a/js/common/validationError.js → src/js/common/validationError.js b/js/common/validationError.js → src/js/common/validationError.js
diff --git a/js/dev/grid.js → src/js/dev/grid.js b/js/dev/grid.js → src/js/dev/grid.js