From 339606fce0228e56e85a15873d4569727a46a270 Mon Sep 17 00:00:00 2001 From: Soullnik Date: Fri, 10 Apr 2020 15:26:24 +0300 Subject: [PATCH 1/7] feat add git ignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3c3629e --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +node_modules From d695e474f7b4a8b6a7b654befcbcbc4fac1b93de Mon Sep 17 00:00:00 2001 From: prostiak2019 Date: Fri, 10 Apr 2020 15:51:54 +0300 Subject: [PATCH 2/7] fix: readme 1_1 --- README.md | 17 +++++++++++++++++ package-lock.json | 46 +++++++++++++--------------------------------- package.json | 12 ++++++++++-- 3 files changed, 40 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index d09a4c1..3c6516f 100644 --- a/README.md +++ b/README.md @@ -120,3 +120,20 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin'); }, ``` ***npm install webpack-dev-server --save-dev*** + +# first start # +1 +***npm install*** + + +# NOTE # +## 1 webpack.config.js ## +``` "dev": "webpack --mode development" ``` запускает компиляцию вебпака в моде девелопмент (тобишь читаемом) + +``` "build": "webpack --mode production" ``` запускает компиляцию вебпака в продакш, когда все сжимается + +``` "watch": "webpack --mode development" ``` можно убрать, т.к. в конфиге вебпака прописно watch сразу на develop + +``` "start": "webpack-dev-server --mode development --open" ``` запускает лайв сервер + +``` "clear": "del-cli dist" ``` для удаления диста (например перед пулом в репу) diff --git a/package-lock.json b/package-lock.json index 27d9342..98fcaf3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "myWebPackconfig", + "name": "mywebpackconfig", "version": "1.0.0", "lockfileVersion": 1, "requires": true, @@ -4697,8 +4697,7 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -4719,14 +4718,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -4741,20 +4738,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -4871,8 +4865,7 @@ "inherits": { "version": "2.0.4", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -4884,7 +4877,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -4899,7 +4891,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -4907,14 +4898,12 @@ "minimist": { "version": "1.2.5", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.9.0", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -4933,7 +4922,6 @@ "version": "0.5.3", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "^1.2.5" } @@ -4995,8 +4983,7 @@ "npm-normalize-package-bin": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "npm-packlist": { "version": "1.4.8", @@ -5024,8 +5011,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -5037,7 +5023,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -5115,8 +5100,7 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -5152,7 +5136,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -5172,7 +5155,6 @@ "version": "3.0.1", "bundled": true, "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -5216,14 +5198,12 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true } } }, diff --git a/package.json b/package.json index 23ed71e..3b15465 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "myWebPackconfig", + "name": "mywebpackconfig", "version": "1.0.0", "description": "text", "main": "index.js", @@ -44,5 +44,13 @@ }, "dependencies": { "bootstrap": "^4.4.1" - } + }, + "repository": { + "type": "git", + "url": "git+https://github.com/Yarovenko-Dmitry/MyWebPackConfig.git" + }, + "bugs": { + "url": "https://github.com/Yarovenko-Dmitry/MyWebPackConfig/issues" + }, + "homepage": "https://github.com/Yarovenko-Dmitry/MyWebPackConfig#readme" } From 4491a4e38ffe08d941b3e34c630aea67def32e1b Mon Sep 17 00:00:00 2001 From: prostiak2019 Date: Fri, 10 Apr 2020 16:21:43 +0300 Subject: [PATCH 3/7] fix: readme 1_2 --- README.md | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 3c6516f..384de68 100644 --- a/README.md +++ b/README.md @@ -121,19 +121,25 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin'); ``` ***npm install webpack-dev-server --save-dev*** -# first start # -1 +# First start # +##### 1 ##### +***npm init*** +##### 2 ##### ***npm install*** - # NOTE # ## 1 webpack.config.js ## -``` "dev": "webpack --mode development" ``` запускает компиляцию вебпака в моде девелопмент (тобишь читаемом) +***npm dev*** ``` "dev": "webpack --mode development" ``` +##### запускает компиляцию вебпака в моде девелопмент (тобишь читаемом) ##### -``` "build": "webpack --mode production" ``` запускает компиляцию вебпака в продакш, когда все сжимается +***npm build*** ``` "build": "webpack --mode production" ``` +##### запускает компиляцию вебпака в продакш, когда все сжимается ##### -``` "watch": "webpack --mode development" ``` можно убрать, т.к. в конфиге вебпака прописно watch сразу на develop +***npm watch*** ``` "watch": "webpack --mode development" ``` + ##### можно убрать, т.к. в конфиге вебпака прописно watch сразу на develop ##### -``` "start": "webpack-dev-server --mode development --open" ``` запускает лайв сервер +***npm start*** ``` "start": "webpack-dev-server --mode development --open" ``` +##### запускает лайв сервер ##### -``` "clear": "del-cli dist" ``` для удаления диста (например перед пулом в репу) +***npm clear*** ``` "clear": "del-cli dist" ``` +##### для удаления диста (например перед пулом в репу) ##### From c50acd4de5829d1056439edea13289121e8f130e Mon Sep 17 00:00:00 2001 From: prostiak2019 Date: Fri, 10 Apr 2020 16:58:13 +0300 Subject: [PATCH 4/7] feat: add work version --- .gitignore | 1 + README.md | 19 +++++++++++++- package-lock.json | 44 ++++++++++++++++++++++++--------- package.json | 6 ++--- src/index.html | 33 +++++++++++++++++++++++++ src/js/data.js | 0 src/sass/bootstrap/_custom.scss | 5 ++-- 7 files changed, 89 insertions(+), 19 deletions(-) create mode 100644 src/js/data.js diff --git a/.gitignore b/.gitignore index 3c3629e..76add87 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ node_modules +dist \ No newline at end of file diff --git a/README.md b/README.md index 384de68..a76ff2e 100644 --- a/README.md +++ b/README.md @@ -121,14 +121,24 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin'); ``` ***npm install webpack-dev-server --save-dev*** + + # First start # + ##### 1 ##### -***npm init*** +***git checkout develop*** ##### 2 ##### +***npm init*** +##### 3 ##### ***npm install*** + + # NOTE # + + ## 1 webpack.config.js ## + ***npm dev*** ``` "dev": "webpack --mode development" ``` ##### запускает компиляцию вебпака в моде девелопмент (тобишь читаемом) ##### @@ -143,3 +153,10 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin'); ***npm clear*** ``` "clear": "del-cli dist" ``` ##### для удаления диста (например перед пулом в репу) ##### + + + +## 2 useful commands and etc ## + +***Ctrl + C*** +##### остановить сервер ##### diff --git a/package-lock.json b/package-lock.json index 98fcaf3..e9b2f1c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4697,7 +4697,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -4718,12 +4719,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -4738,17 +4741,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -4865,7 +4871,8 @@ "inherits": { "version": "2.0.4", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -4877,6 +4884,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -4891,6 +4899,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -4898,12 +4907,14 @@ "minimist": { "version": "1.2.5", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.9.0", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -4922,6 +4933,7 @@ "version": "0.5.3", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "^1.2.5" } @@ -4983,7 +4995,8 @@ "npm-normalize-package-bin": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "npm-packlist": { "version": "1.4.8", @@ -5011,7 +5024,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -5023,6 +5037,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -5100,7 +5115,8 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -5136,6 +5152,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -5155,6 +5172,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -5198,12 +5216,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, diff --git a/package.json b/package.json index 3b15465..dee0bb2 100644 --- a/package.json +++ b/package.json @@ -47,10 +47,10 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/Yarovenko-Dmitry/MyWebPackConfig.git" + "url": "git+https://github.com/Soullnik/MyWebPackConfig.git" }, "bugs": { - "url": "https://github.com/Yarovenko-Dmitry/MyWebPackConfig/issues" + "url": "https://github.com/Soullnik/MyWebPackConfig/issues" }, - "homepage": "https://github.com/Yarovenko-Dmitry/MyWebPackConfig#readme" + "homepage": "https://github.com/Soullnik/MyWebPackConfig#readme" } diff --git a/src/index.html b/src/index.html index 274cf25..e7a50de 100644 --- a/src/index.html +++ b/src/index.html @@ -26,12 +26,45 @@ +
+
+
+
+ Card image cap + +
+ +
+
+

+

+ +
+
+
+
+
+
+ Card image cap + +
+ +
+
+

+

+ +
+
+
diff --git a/src/js/data.js b/src/js/data.js new file mode 100644 index 0000000..e69de29 diff --git a/src/sass/bootstrap/_custom.scss b/src/sass/bootstrap/_custom.scss index eff4528..4fa996a 100644 --- a/src/sass/bootstrap/_custom.scss +++ b/src/sass/bootstrap/_custom.scss @@ -3,6 +3,5 @@ body { } .collapse:not(.show) { - display: block; } - 421 git remote add origin https://github.com/Soullnik/english-for-kids.git - 422 git push -u origin master \ No newline at end of file + display: block; +} \ No newline at end of file From eb7d94da9f993c2faddda9218c202f0499193370 Mon Sep 17 00:00:00 2001 From: prostiak2019 Date: Fri, 10 Apr 2020 18:35:15 +0300 Subject: [PATCH 5/7] feat: add webpack with settings --- package.json | 2 +- src/index.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index dee0bb2..368c29e 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "start": "webpack-dev-server --mode development --open", "clear": "del-cli dist" }, - "author": "Nikolay lozicki", + "author": "webpack", "license": "ISC", "devDependencies": { "@babel/core": "^7.9.0", diff --git a/src/index.html b/src/index.html index e7a50de..f1be98b 100644 --- a/src/index.html +++ b/src/index.html @@ -18,7 +18,7 @@ - \ No newline at end of file + From 62e5d10ac463b37606cbc03c3ec585ff72c5679b Mon Sep 17 00:00:00 2001 From: prostiak2019 Date: Fri, 10 Apr 2020 18:42:17 +0300 Subject: [PATCH 6/7] feat: add webpack with settings --- package.json | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 368c29e..d43ab50 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { - "name": "mywebpackconfig", + "name": "webpackconfig", "version": "1.0.0", - "description": "text", + "description": "webpack with settings", "main": "index.js", "scripts": { "dev": "webpack --mode development", @@ -44,13 +44,5 @@ }, "dependencies": { "bootstrap": "^4.4.1" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/Soullnik/MyWebPackConfig.git" - }, - "bugs": { - "url": "https://github.com/Soullnik/MyWebPackConfig/issues" - }, - "homepage": "https://github.com/Soullnik/MyWebPackConfig#readme" + } } From d5dcb4e07b7441f3bc78e7309d533fec9b11eb11 Mon Sep 17 00:00:00 2001 From: prostiak2019 Date: Fri, 10 Apr 2020 18:46:28 +0300 Subject: [PATCH 7/7] feat: add webpack with settings --- src/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index f1be98b..63d7592 100644 --- a/src/index.html +++ b/src/index.html @@ -3,7 +3,7 @@ - english-for-kids + Titel