diff --git a/.babelrc b/.babelrc
deleted file mode 100644
index 1f67998..0000000
--- a/.babelrc
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "plugins": [
- [
- "@babel/plugin-transform-runtime",
- {
- "corejs": 2
- }
- ]
- ]
-}
diff --git a/README.md b/README.md
index 8fd64aa..4fe2275 100644
--- 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
deleted file mode 100644
index 264aa83..0000000
--- a/css/blocks/logo/logo-dark.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/package.json b/package.json
index e31b378..c96b9a4 100644
--- 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 ",
"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 b/src/css/blocks/app-mobile/app-mobile.less
similarity index 100%
rename from css/blocks/app-mobile/app-mobile.less
rename to src/css/blocks/app-mobile/app-mobile.less
diff --git a/css/blocks/app-mobile/app-store-icon.svg b/src/css/blocks/app-mobile/app-store-icon.svg
similarity index 100%
rename from css/blocks/app-mobile/app-store-icon.svg
rename to src/css/blocks/app-mobile/app-store-icon.svg
diff --git a/css/blocks/app-mobile/google-play-icon.svg b/src/css/blocks/app-mobile/google-play-icon.svg
similarity index 100%
rename from css/blocks/app-mobile/google-play-icon.svg
rename to src/css/blocks/app-mobile/google-play-icon.svg
diff --git a/css/blocks/carousel-section/carousel-section.less b/src/css/blocks/carousel-section/carousel-section.less
similarity index 100%
rename from css/blocks/carousel-section/carousel-section.less
rename to src/css/blocks/carousel-section/carousel-section.less
diff --git a/css/blocks/content-section/content-section.less b/src/css/blocks/content-section/content-section.less
similarity index 100%
rename from css/blocks/content-section/content-section.less
rename to src/css/blocks/content-section/content-section.less
diff --git a/css/blocks/copyright-info/copyright-info.less b/src/css/blocks/copyright-info/copyright-info.less
similarity index 100%
rename from css/blocks/copyright-info/copyright-info.less
rename to src/css/blocks/copyright-info/copyright-info.less
diff --git a/css/blocks/feature/feature.less b/src/css/blocks/feature/feature.less
similarity index 100%
rename from css/blocks/feature/feature.less
rename to src/css/blocks/feature/feature.less
diff --git a/css/blocks/features-section/features-section.less b/src/css/blocks/features-section/features-section.less
similarity index 100%
rename from css/blocks/features-section/features-section.less
rename to src/css/blocks/features-section/features-section.less
diff --git a/css/blocks/footer/footer.less b/src/css/blocks/footer/footer.less
similarity index 100%
rename from css/blocks/footer/footer.less
rename to src/css/blocks/footer/footer.less
diff --git a/css/blocks/form/form.less b/src/css/blocks/form/form.less
similarity index 100%
rename from css/blocks/form/form.less
rename to src/css/blocks/form/form.less
diff --git a/css/blocks/header/header.less b/src/css/blocks/header/header.less
similarity index 100%
rename from css/blocks/header/header.less
rename to src/css/blocks/header/header.less
diff --git a/css/blocks/header/login-icon.svg b/src/css/blocks/header/login-icon.svg
similarity index 100%
rename from css/blocks/header/login-icon.svg
rename to src/css/blocks/header/login-icon.svg
diff --git a/css/blocks/header/menu-icon.svg b/src/css/blocks/header/menu-icon.svg
similarity index 100%
rename from css/blocks/header/menu-icon.svg
rename to src/css/blocks/header/menu-icon.svg
diff --git a/css/blocks/header/search-icon.svg b/src/css/blocks/header/search-icon.svg
similarity index 100%
rename from css/blocks/header/search-icon.svg
rename to src/css/blocks/header/search-icon.svg
diff --git a/css/blocks/logo/logo.less b/src/css/blocks/logo/logo.less
similarity index 100%
rename from css/blocks/logo/logo.less
rename to src/css/blocks/logo/logo.less
diff --git a/css/blocks/nav/nav.less b/src/css/blocks/nav/nav.less
similarity index 100%
rename from css/blocks/nav/nav.less
rename to src/css/blocks/nav/nav.less
diff --git a/css/blocks/navbar/navbar.less b/src/css/blocks/navbar/navbar.less
similarity index 100%
rename from css/blocks/navbar/navbar.less
rename to src/css/blocks/navbar/navbar.less
diff --git a/css/blocks/pagination/pagination.less b/src/css/blocks/pagination/pagination.less
similarity index 100%
rename from css/blocks/pagination/pagination.less
rename to src/css/blocks/pagination/pagination.less
diff --git a/css/blocks/popup/popup.less b/src/css/blocks/popup/popup.less
similarity index 100%
rename from css/blocks/popup/popup.less
rename to src/css/blocks/popup/popup.less
diff --git a/css/blocks/product-card/product-card.less b/src/css/blocks/product-card/product-card.less
similarity index 100%
rename from css/blocks/product-card/product-card.less
rename to src/css/blocks/product-card/product-card.less
diff --git a/css/blocks/social/facebook-icon.svg b/src/css/blocks/social/facebook-icon.svg
similarity index 100%
rename from css/blocks/social/facebook-icon.svg
rename to src/css/blocks/social/facebook-icon.svg
diff --git a/css/blocks/social/instagram-icon.svg b/src/css/blocks/social/instagram-icon.svg
similarity index 100%
rename from css/blocks/social/instagram-icon.svg
rename to src/css/blocks/social/instagram-icon.svg
diff --git a/css/blocks/social/social.less b/src/css/blocks/social/social.less
similarity index 100%
rename from css/blocks/social/social.less
rename to src/css/blocks/social/social.less
diff --git a/css/blocks/social/twitter-icon.svg b/src/css/blocks/social/twitter-icon.svg
similarity index 100%
rename from css/blocks/social/twitter-icon.svg
rename to src/css/blocks/social/twitter-icon.svg
diff --git a/css/blocks/social/vk-icon.svg b/src/css/blocks/social/vk-icon.svg
similarity index 100%
rename from css/blocks/social/vk-icon.svg
rename to src/css/blocks/social/vk-icon.svg
diff --git a/css/blocks/statistics-info/statistics-info.less b/src/css/blocks/statistics-info/statistics-info.less
similarity index 100%
rename from css/blocks/statistics-info/statistics-info.less
rename to src/css/blocks/statistics-info/statistics-info.less
diff --git a/css/common/button/button.less b/src/css/common/button/button.less
similarity index 100%
rename from css/common/button/button.less
rename to src/css/common/button/button.less
diff --git a/css/common/button/close.svg b/src/css/common/button/close.svg
similarity index 100%
rename from css/common/button/close.svg
rename to src/css/common/button/close.svg
diff --git a/css/common/checkbox/checkbox.less b/src/css/common/checkbox/checkbox.less
similarity index 100%
rename from css/common/checkbox/checkbox.less
rename to src/css/common/checkbox/checkbox.less
diff --git a/css/common/columns/columns.less b/src/css/common/columns/columns.less
similarity index 100%
rename from css/common/columns/columns.less
rename to src/css/common/columns/columns.less
diff --git a/css/common/grid/grid.less b/src/css/common/grid/grid.less
similarity index 100%
rename from css/common/grid/grid.less
rename to src/css/common/grid/grid.less
diff --git a/css/common/heading/heading.less b/src/css/common/heading/heading.less
similarity index 100%
rename from css/common/heading/heading.less
rename to src/css/common/heading/heading.less
diff --git a/css/common/input/input.less b/src/css/common/input/input.less
similarity index 100%
rename from css/common/input/input.less
rename to src/css/common/input/input.less
diff --git a/css/common/label/label.less b/src/css/common/label/label.less
similarity index 100%
rename from css/common/label/label.less
rename to src/css/common/label/label.less
diff --git a/css/common/radio-button/radio-button.less b/src/css/common/radio-button/radio-button.less
similarity index 100%
rename from css/common/radio-button/radio-button.less
rename to src/css/common/radio-button/radio-button.less
diff --git a/css/common/select/select.less b/src/css/common/select/select.less
similarity index 100%
rename from css/common/select/select.less
rename to src/css/common/select/select.less
diff --git a/css/common/textarea/textarea.less b/src/css/common/textarea/textarea.less
similarity index 100%
rename from css/common/textarea/textarea.less
rename to src/css/common/textarea/textarea.less
diff --git a/css/fonts.less b/src/css/fonts.less
similarity index 100%
rename from css/fonts.less
rename to src/css/fonts.less
diff --git a/css/global.less b/src/css/global.less
similarity index 100%
rename from css/global.less
rename to src/css/global.less
diff --git a/css/styles.less b/src/css/styles.less
similarity index 100%
rename from css/styles.less
rename to src/css/styles.less
diff --git a/css/variables.less b/src/css/variables.less
similarity index 100%
rename from css/variables.less
rename to src/css/variables.less
diff --git a/html/orderForm.html b/src/html/orderForm.html
similarity index 100%
rename from html/orderForm.html
rename to src/html/orderForm.html
diff --git a/popup.html b/src/html/popup.html
similarity index 100%
rename from popup.html
rename to src/html/popup.html
diff --git a/html/productCardPopup.html b/src/html/productCardPopup.html
similarity index 100%
rename from html/productCardPopup.html
rename to src/html/productCardPopup.html
diff --git a/images/delivery@3x.png b/src/images/delivery@3x.png
similarity index 100%
rename from images/delivery@3x.png
rename to src/images/delivery@3x.png
diff --git a/src/images/logo-dark.svg b/src/images/logo-dark.svg
new file mode 100644
index 0000000..a9367d4
--- /dev/null
+++ b/src/images/logo-dark.svg
@@ -0,0 +1,5 @@
+
diff --git a/css/blocks/logo/logo.svg b/src/images/logo.svg
similarity index 100%
rename from css/blocks/logo/logo.svg
rename to src/images/logo.svg
diff --git a/images/product-1.jpg b/src/images/product-1.jpg
similarity index 100%
rename from images/product-1.jpg
rename to src/images/product-1.jpg
diff --git a/images/product-2.jpg b/src/images/product-2.jpg
similarity index 100%
rename from images/product-2.jpg
rename to src/images/product-2.jpg
diff --git a/images/product-3.jpg b/src/images/product-3.jpg
similarity index 100%
rename from images/product-3.jpg
rename to src/images/product-3.jpg
diff --git a/images/product-4.jpg b/src/images/product-4.jpg
similarity index 100%
rename from images/product-4.jpg
rename to src/images/product-4.jpg
diff --git a/images/product-5.jpg b/src/images/product-5.jpg
similarity index 100%
rename from images/product-5.jpg
rename to src/images/product-5.jpg
diff --git a/images/product-6.jpg b/src/images/product-6.jpg
similarity index 100%
rename from images/product-6.jpg
rename to src/images/product-6.jpg
diff --git a/images/return@3x.png b/src/images/return@3x.png
similarity index 100%
rename from images/return@3x.png
rename to src/images/return@3x.png
diff --git a/images/slide-1.png b/src/images/slide-1.png
similarity index 100%
rename from images/slide-1.png
rename to src/images/slide-1.png
diff --git a/images/slide-1@1x.png b/src/images/slide-1@1x.png
similarity index 100%
rename from images/slide-1@1x.png
rename to src/images/slide-1@1x.png
diff --git a/images/slide-1@2x.png b/src/images/slide-1@2x.png
similarity index 100%
rename from images/slide-1@2x.png
rename to src/images/slide-1@2x.png
diff --git a/images/slide-1@3x.png b/src/images/slide-1@3x.png
similarity index 100%
rename from images/slide-1@3x.png
rename to src/images/slide-1@3x.png
diff --git a/images/slide-2.png b/src/images/slide-2.png
similarity index 100%
rename from images/slide-2.png
rename to src/images/slide-2.png
diff --git a/images/slide-2@1x.png b/src/images/slide-2@1x.png
similarity index 100%
rename from images/slide-2@1x.png
rename to src/images/slide-2@1x.png
diff --git a/images/slide-2@2x.png b/src/images/slide-2@2x.png
similarity index 100%
rename from images/slide-2@2x.png
rename to src/images/slide-2@2x.png
diff --git a/images/slide-2@3x.png b/src/images/slide-2@3x.png
similarity index 100%
rename from images/slide-2@3x.png
rename to src/images/slide-2@3x.png
diff --git a/images/support@3x.png b/src/images/support@3x.png
similarity index 100%
rename from images/support@3x.png
rename to src/images/support@3x.png
diff --git a/index.html b/src/index.html
similarity index 97%
rename from index.html
rename to src/index.html
index 8eaee71..39c9d49 100644
--- a/index.html
+++ b/src/index.html
@@ -4,7 +4,6 @@
HTML и CSS
-