Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Main #96

Open
wants to merge 139 commits into
base: main
Choose a base branch
from
Open

Main #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
139 commits
Select commit Hold shift + click to select a range
c2d1207
Rename folder for styles
firefoxic Nov 8, 2023
a51f244
Fix trees
firefoxic Nov 8, 2023
018ba07
Fix style linting
firefoxic Nov 8, 2023
694bb88
Rename folder for scripts
firefoxic Nov 8, 2023
5c1692f
Fix script linting
firefoxic Nov 8, 2023
a4668cf
Run linters in parallel
firefoxic Nov 8, 2023
c3c2d59
Fix paths for styles
firefoxic Nov 8, 2023
eba49af
Revert index.scss to styles.scss
firefoxic Nov 8, 2023
ac52f5a
Merge pull request #48 from firefoxic/feature/file-structure
nikolai-shabalin Nov 8, 2023
ab72319
Closed #49
nikolai-shabalin Nov 8, 2023
64d1f14
Move the raw files to a more intuitive place
firefoxic Nov 17, 2023
f39668a
Move `icons/` from `images/`
firefoxic Nov 17, 2023
bfca3b5
Add config for `svgo`
firefoxic Nov 17, 2023
5530547
Remove references to `woff` format
firefoxic Nov 17, 2023
db72808
Destructurize gulp
firefoxic Nov 17, 2023
5e38bea
Move `icons/` back to `images/`
firefoxic Nov 17, 2023
da4addf
Move base paths to constants
firefoxic Nov 17, 2023
b65fefa
Rename variable with dev-server to `server`
firefoxic Nov 17, 2023
3d5ca9c
Add templating engine
firefoxic Nov 17, 2023
9fddeaa
Add html minifier
firefoxic Nov 17, 2023
6988275
Replace `terser` with `esbuild`
firefoxic Nov 17, 2023
b95ff71
Move file watching into server startup task
firefoxic Nov 18, 2023
673fcd1
Move all static file paths to constant
firefoxic Nov 18, 2023
e198a55
Add watcher for static files
firefoxic Nov 18, 2023
484a28a
Add watcher for icons
firefoxic Nov 18, 2023
1178006
Fix markup watcher
firefoxic Nov 18, 2023
6bc9d18
Add folder for favicon files
firefoxic Nov 18, 2023
30e23b2
Add page for 404 error
firefoxic Nov 18, 2023
950a8d3
Add dev routing to static files
firefoxic Nov 18, 2023
875aefa
Replace `del` with buildin `rmSync` module
firefoxic Nov 18, 2023
4e9edda
Update dev dependencies
firefoxic Nov 18, 2023
0b25b6a
Merge pull request #51 from firefoxic/firefoxic/issue50
nikolai-shabalin Nov 18, 2023
aadc685
Поправляет опечатку в названии папки scripts
tsbv Nov 18, 2023
0f73a26
Merge pull request #52 from georgij-tsabiev/master
nikolai-shabalin Nov 18, 2023
0d794ed
Run linthtml for result markup
firefoxic Nov 20, 2023
cf9a953
Переименовывает файл index.css
nikolai-shabalin Nov 21, 2023
03187e5
Обновляет зависимости
nikolai-shabalin Nov 21, 2023
0f8b180
Merge pull request #54 from firefoxic/fix/linthtml
nikolai-shabalin Nov 21, 2023
d32b1e9
Add .gitattributes
firefoxic Nov 22, 2023
6bfe7a8
Merge pull request #56 from firefoxic/master
nikolai-shabalin Nov 22, 2023
b2b5326
Fix typo
firefoxic Nov 22, 2023
67ab6f6
Add one more illustration
firefoxic Nov 22, 2023
7c09e6f
Merge pull request #57 from firefoxic/master
nikolai-shabalin Nov 22, 2023
6d0c067
Ignore EOF for SVG
firefoxic Nov 22, 2023
83baa06
Merge pull request #58 from firefoxic/fix/linting
nikolai-shabalin Nov 22, 2023
563ea1f
Fix error status of w3c-validation
firefoxic Nov 23, 2023
8532287
Reorganize `package.json`
firefoxic Nov 23, 2023
a6ce386
Remove proxy-browser from supported list
firefoxic Nov 23, 2023
8417412
Update `bem-linter`
firefoxic Nov 23, 2023
e0558b7
Merge pull request #59 from firefoxic/fix/deps
nikolai-shabalin Nov 24, 2023
44e9994
Reorganize npm scripts
firefoxic Nov 26, 2023
dc28200
Fix preview script
firefoxic Nov 26, 2023
09ad36e
Split raster and vector optimizations
firefoxic Nov 26, 2023
6d57bc4
Allow to commit minified vendor libs
firefoxic Nov 26, 2023
6fda561
Merge pull request #60 from firefoxic/fix/scripts
nikolai-shabalin Nov 27, 2023
f6ffe20
Обновляет зависимости
nikolai-shabalin Dec 1, 2023
0de426f
Update required actions
firefoxic Dec 1, 2023
8090a34
Update dependencies
firefoxic Dec 4, 2023
52bf457
Bump `gulp-html-bemlinter` from `3.0.0` to `3.0.1`
firefoxic Dec 4, 2023
ecba8fa
Fix the coloring in GitHub CI
firefoxic Dec 4, 2023
eaca2e8
Get all the errors output
firefoxic Dec 4, 2023
f76ce6d
Merge pull request #61 from firefoxic/fix/erroroutput
nikolai-shabalin Dec 7, 2023
c01645d
Fix assets watcher
firefoxic Dec 8, 2023
33e531c
Rename task
firefoxic Dec 9, 2023
30df2f9
Get routes from paths to static
firefoxic Dec 9, 2023
5c1f0c4
fixup! Get routes from paths to static
firefoxic Dec 9, 2023
4cc711d
Merge pull request #63 from firefoxic/fix/watcher
nikolai-shabalin Dec 13, 2023
810b5a5
Обновляет зависимости
nikolai-shabalin Dec 13, 2023
dc0c485
Bump `linthtml-config-htmlacademy` from `1.0.13` to `1.0.14`
firefoxic Dec 14, 2023
b8eec47
Exclude vendor/ from linting
firefoxic Dec 14, 2023
0ddf39e
Merge pull request #66 from firefoxic/fix/ignore-vendor
nikolai-shabalin Dec 14, 2023
c35af5b
Обновляет зависимости
nikolai-shabalin Dec 14, 2023
499ed85
Обновляет зависимости
nikolai-shabalin Dec 18, 2023
b6a2198
Обновляет зависимости
nikolai-shabalin Dec 25, 2023
a87e246
Remove codeguide/indentation
nikolai-shabalin Dec 25, 2023
efb2fb4
Исправляет опечатку в разделе 'Работа с графикой'
tsbv Dec 28, 2023
9fe88ad
Merge pull request #69 from georgij-tsabiev/master
nikolai-shabalin Dec 29, 2023
d8b31be
Fix static file paths for dev server
firefoxic Dec 29, 2023
fedb916
Merge pull request #70 from firefoxic/fix/dev-server
nikolai-shabalin Dec 29, 2023
ff31e56
Update all dependencies
nikolai-shabalin Jan 9, 2024
69397d2
Merge pull request #71 from htmlacademy/feature/update-deps
nikolai-shabalin Jan 9, 2024
64a3dac
Update linthtml-config-htmlacademy
nikolai-shabalin Jan 12, 2024
a007c6b
Update dependencies
nikolai-shabalin Jan 16, 2024
8d82b9a
Update dependencies
nikolai-shabalin Jan 17, 2024
919e04e
Update dependencies
nikolai-shabalin Jan 18, 2024
7daa6e4
Update dependencies
nikolai-shabalin Jan 25, 2024
d4e8373
Update dependencies
nikolai-shabalin Jan 28, 2024
da572f1
Update dependencies
nikolai-shabalin Feb 1, 2024
9b9a291
Update dependencies
nikolai-shabalin Feb 8, 2024
0e53539
Update dependencies
nikolai-shabalin Feb 16, 2024
c86e820
Update dependencies
nikolai-shabalin Feb 17, 2024
5352561
Update dependencies
nikolai-shabalin Feb 19, 2024
e27ab1f
Update dependencies
nikolai-shabalin Feb 21, 2024
f336c51
Update dependencies
nikolai-shabalin Feb 22, 2024
f53a796
Update dependencies
nikolai-shabalin Feb 23, 2024
a3c49e6
Update dependencies
nikolai-shabalin Feb 24, 2024
b7aabb9
Чинит игнорирование папки vendor
nikolai-shabalin Feb 24, 2024
50a3b48
Update dependencies
nikolai-shabalin Mar 2, 2024
75995d6
Обновляет зависимости
nikolai-shabalin Mar 14, 2024
fcad692
Обновляет зависимости
nikolai-shabalin Mar 19, 2024
a040464
Update dependencies
firefoxic Mar 30, 2024
95f3c3e
Merge pull request #79 from firefoxic/update
nikolai-shabalin Mar 30, 2024
a64abed
Fix wrong path for lintBem
firefoxic Mar 30, 2024
efdc6d1
Move `icons/` to `source/`
firefoxic Mar 30, 2024
f548296
Rename `global` folder to `common`
firefoxic Mar 30, 2024
f525fa3
Merge pull request #80 from firefoxic/fix/structure
nikolai-shabalin Mar 30, 2024
a019541
Replace `autoprefixer` and `postcss-csso` with `postcss-lightningcss`
firefoxic Mar 31, 2024
cf0cc01
Improve paths processing
firefoxic Mar 31, 2024
5b59637
Add examples of connecting media resources
firefoxic Mar 31, 2024
321718d
Merge pull request #77 from firefoxic/auto/styles
nikolai-shabalin Apr 2, 2024
6a994c1
Remove nunjucks
firefoxic Apr 2, 2024
4599150
Merge pull request #81 from firefoxic/rm/nunjucks
nikolai-shabalin Apr 2, 2024
ae45e99
Обновляет зависимости
nikolai-shabalin Apr 2, 2024
98f125f
Понижает версию gulp
nikolai-shabalin Apr 2, 2024
91ec23d
Merge pull request #82 from htmlacademy/feature/update
nikolai-shabalin Apr 2, 2024
f685ee2
Add deploy on pull request
firefoxic Apr 3, 2024
f327f26
Merge pull request #55 from firefoxic/feature/reponame
nikolai-shabalin Apr 5, 2024
85340f7
Обновляет SASS
nikolai-shabalin Apr 5, 2024
6f9ca1a
Обновляет SASS
nikolai-shabalin Apr 5, 2024
f0b29a7
Merge pull request #84 from htmlacademy/update/deps
nikolai-shabalin Apr 5, 2024
721b081
Обновляет зависимости
nikolai-shabalin May 2, 2024
5b08839
Обновляет зависимости
nikolai-shabalin May 10, 2024
657d6fa
Обновляет зависимости
nikolai-shabalin May 14, 2024
5d0cab2
Обновляет зависимости
nikolai-shabalin May 17, 2024
56e6a2d
Обновляет зависимости
nikolai-shabalin May 24, 2024
cd9e0ea
Обновляет зависимости
nikolai-shabalin May 28, 2024
b0ea11c
Обновляет зависимости
nikolai-shabalin May 28, 2024
08592bd
Обновляет зависимости
nikolai-shabalin Jun 9, 2024
32542ab
Добавь инфо о фиксе ошибки в Windows (#95)
firefoxic Jul 9, 2024
2af84fd
Верстает хедер с пользовательским меню для мобилки
baranovdmitriy87 Oct 16, 2024
2fde80c
first commit
baranovdmitriy87 Oct 16, 2024
09290a5
first commit
baranovdmitriy87 Oct 16, 2024
a44270e
first commit
baranovdmitriy87 Oct 16, 2024
833227f
first commit
baranovdmitriy87 Oct 16, 2024
db3a0b0
Делает разметку и реализует хедер для мобильной версии
baranovdmitriy87 Oct 16, 2024
324305f
Merge branch 'gr-html2-baranov' of https://github.com/baranovdmitriy8…
baranovdmitriy87 Oct 16, 2024
083068f
Дедает таблет и мобайл- версии и реализуеи согласно макету
baranovdmitriy87 Oct 16, 2024
885e46f
Делает промо-слайд
baranovdmitriy87 Oct 17, 2024
038f513
Делает блок преимуществ
baranovdmitriy87 Oct 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@ indent_size = 2
end_of_line = lf
trim_trailing_whitespace = true
insert_final_newline = true

[*.svg]
insert_final_newline = false
32 changes: 16 additions & 16 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
root: true

parserOptions:
ecmaVersion: 2022
sourceType: "module"

env:
es2022: true
browser: true

globals:
noUiSlider: readonly
Pristine: readonly

extends:
"htmlacademy/vanilla"
{
"root": true,
"parserOptions": {
"ecmaVersion": 2022,
"sourceType": "module"
},
"env": {
"es2022": true,
"browser": true
},
"globals": {
"noUiSlider": "readonly",
"Pristine": "readonly"
},
"extends": "htmlacademy/vanilla"
}
10 changes: 10 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
* text eol=lf

*.ico binary
*.png binary
*.jpg binary
*.jpeg binary
*.webp binary
*.avif binary
*.woff binary
*.woff2 binary
6 changes: 4 additions & 2 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
steps:

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: 'package.json'

Expand All @@ -36,3 +36,5 @@ jobs:

- name: Run checks
run: npm run lint
env:
FORCE_COLOR: true
47 changes: 47 additions & 0 deletions .github/workflows/gh-pages-on-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Deploy on pull request

on:
pull_request_target:
branches:
- '*'

jobs:
deploy-on-pull-request:
name: Deploy on Pull Request

permissions:
contents: write

runs-on: ubuntu-latest

steps:

- name: Checkout
uses: actions/checkout@v4
with:
ref: 'refs/pull/${{ github.event.pull_request.number }}/merge'

- name: Setup Node
uses: actions/setup-node@v4
with:
node-version-file: 'package.json'

- name: Restore cache
uses: actions/cache@v3
with:
path: ~/.npm
key: cache-npm-${{ hashFiles('./package-lock.json') }}
restore-keys: cache-npm-

- name: Install dependencies
run: npm ci

- name: Build project
run: npm run build

- name: Deploy
uses: JamesIves/github-pages-deploy-action@v4
with:
folder: ./build
branch: gh-pages
target-folder: ${{ github.event.pull_request.number }}
4 changes: 2 additions & 2 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
steps:

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version-file: 'package.json'

Expand Down
8 changes: 5 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
node_modules
*.min.*
build
.idea
.DS_Store
source/.raw/
!source/.raw/**/README.md
raw/**/*.jpg
raw/**/*.jpeg
raw/**/*.png
raw/**/*.svg
!raw/**/README.md
7 changes: 1 addition & 6 deletions .stylelintrc
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
{
"extends": "stylelint-config-htmlacademy",

"rules": {
"declaration-no-important": true,
"indentation": [2, {"ignore": ["inside-parens"]}]
}
"extends": "stylelint-config-htmlacademy"
}
Loading