-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Keks
committed
Nov 10, 2024
0 parents
commit fcfd8d1
Showing
75 changed files
with
7,852 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
# Файл с настройками для редактора. | ||
# | ||
# Если вы разрабатываете в редакторе от JetBrains, BBEdit, Coda или SourceLair | ||
# этот файл уже поддерживается и не нужно производить никаких дополнительных | ||
# действий. | ||
# | ||
# Если вы ведёте разработку в другом редакторе, зайдите | ||
# на http://editorconfig.org и в разделе «Download a Plugin» | ||
# скачайте дополнение для вашего редактора. | ||
|
||
root = true | ||
|
||
[*] | ||
charset = utf-8 | ||
end_of_line = lf | ||
indent_size = 2 | ||
indent_style = space | ||
insert_final_newline = true | ||
trim_trailing_whitespace = true | ||
|
||
[*.md] | ||
trim_trailing_whitespace = false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
webpack.config.js |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
parserOptions: | ||
ecmaVersion: latest | ||
sourceType: 'module' | ||
|
||
env: | ||
es2022: true | ||
browser: true | ||
|
||
extends: 'htmlacademy/vanilla' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
* text eol=lf | ||
|
||
*.png binary | ||
*.jpg binary | ||
*.jpeg binary | ||
*.webp binary | ||
*.woff binary | ||
*.woff2 binary |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
name: Build | ||
|
||
on: | ||
- pull_request | ||
|
||
jobs: | ||
build: | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@master | ||
|
||
- name: Set up Node.js | ||
uses: actions/setup-node@v3 | ||
with: | ||
node-version: '18.x' | ||
|
||
- name: Build | ||
run: | | ||
NODE_ENV=development npm install && npm run build --if-present | ||
if [[ $(find . -maxdepth 1 -type d -name 'build') == '' ]] | ||
then | ||
cp -r public build | ||
fi | ||
mkdir actions_artifacts | ||
echo "prev.event.number=${{ github.event.number }}" > actions_artifacts/env | ||
mv build actions_artifacts | ||
- name: Save build | ||
uses: actions/upload-artifact@master | ||
with: | ||
name: actions_artifacts | ||
path: actions_artifacts |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
name: Project check | ||
|
||
on: | ||
push: | ||
branches: | ||
- master | ||
pull_request: | ||
branches: '*' | ||
|
||
jobs: | ||
check: | ||
name: Check | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: Set up Node.js | ||
uses: actions/setup-node@v3 | ||
with: | ||
node-version: '18' | ||
|
||
- uses: actions/checkout@master | ||
name: Checkout | ||
|
||
- name: Install dependencies | ||
run: | | ||
npm install | ||
- name: Run checks | ||
run: | | ||
npm run lint |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
name: Publish | ||
|
||
on: | ||
workflow_run: | ||
workflows: | ||
- Build | ||
types: | ||
- completed | ||
|
||
jobs: | ||
publish: | ||
runs-on: ubuntu-latest | ||
if: github.event.workflow_run.conclusion == 'success' | ||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@master | ||
|
||
- name: Download build | ||
uses: dawidd6/action-download-artifact@v2 | ||
with: | ||
name: actions_artifacts | ||
workflow: ${{ github.event.workflow_run.workflow_id }} | ||
|
||
- name: Get PR number | ||
run: | | ||
echo "PR=$(cat env | grep "prev.event.number" | awk -F '=' '{print $2}')" >> $GITHUB_ENV | ||
echo "BUILD_URL=$(echo ${{ github.repository }} | sed -r 's/\//\.github\.io\//g')" >> $GITHUB_ENV | ||
- name: Deploy build to Github Pages | ||
uses: JamesIves/github-pages-deploy-action@v4 | ||
with: | ||
folder: build | ||
clean: true | ||
git-config-name: "keksobot" | ||
git-config-email: "[email protected]" | ||
target-folder: ${{ env.PR }} | ||
commit-message: "✔️ Сборка #${{ env.PR }}" | ||
|
||
- name: Comment PR | ||
uses: thollander/actions-comment-pull-request@v2 | ||
with: | ||
message: | | ||
Ваш пулреквест опубликован. Посмотреть можно [здесь](https://${{ env.BUILD_URL }}/${{ env.PR }}/) | ||
pr_number: ${{ env.PR }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
# Файлы и папки операционной системы | ||
.DS_Store | ||
Thumbs.db | ||
|
||
# Файлы редактора | ||
.idea | ||
*.sublime* | ||
.vscode | ||
|
||
# Вспомогательные файлы | ||
*.log* | ||
node_modules/ | ||
|
||
# Собранные файлы (допишите самостоятельно) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
# Руководство по внесению изменений | ||
|
||
Поддерживайте ваш репозиторий обновлённым. Когда наставник принимает ваш пулреквест, он попадает в репозиторий Академии, но не в ваш форк. | ||
|
||
#### 1. Не коммитьте ничего самостоятельно в `master` вашего репозитория | ||
|
||
Это помешает вам аккуратно обновлять ваш репозиторий, могут возникнуть конфликты. | ||
|
||
#### 2. Прежде чем приступать к новому заданию, обновите `master` | ||
|
||
Обновить свой репозиторий из репозитория Академии можно так: | ||
|
||
``` | ||
# В вашей локальной копии переключитесь в ветку master | ||
git checkout master | ||
# Заберите изменения из репозитория Академии¹ | ||
git pull academy master | ||
# Отправьте изменения в ваш форк на Гитхабе | ||
git push | ||
``` | ||
|
||
¹ В `academy` должна быть ссылка на репозиторий Академии. Если его там нет, добавьте: | ||
|
||
``` | ||
git remote add academy [email protected]:htmlacademy-univer-js2/2577411-big-trip-4.git | ||
``` | ||
|
||
Когда вы обновили `master`, создайте ветку для нового задания: | ||
|
||
``` | ||
git checkout -b module2-task1 | ||
``` | ||
|
||
`module2-task1` — это название ветки. Под описанием каждого задания в интерфейсе курса для вас будет указано правильное название ветки. | ||
|
||
-- | ||
|
||
#### Есть вопрос? | ||
|
||
Посмотрите [коллекцию часто задаваемых вопросов по Git](http://firstaidgit.ru). |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
# Проект «Большое путешествие» | ||
|
||
* Студент: [Тимофей Мелко](https://up.htmlacademy.ru/univer-js2/4/user/2577411). | ||
* Наставник: `Неизвестно`. | ||
|
||
--- | ||
|
||
_Не удаляйте и не изменяйте папки и файлы:_ | ||
_`.editorconfig`, `.gitattributes`._ | ||
|
||
--- | ||
|
||
### Памятка | ||
|
||
#### 1. Зарегистрируйтесь на Гитхабе | ||
|
||
Если у вас ещё нет аккаунта на [github.com](https://github.com/join), скорее зарегистрируйтесь. | ||
|
||
#### 2. Создайте форк | ||
|
||
Откройте репозиторий и нажмите кнопку «Fork» в правом верхнем углу. Репозиторий из Академии будет скопирован в ваш аккаунт. | ||
|
||
<img width="769" alt="Press 'Fork'" src="https://cloud.githubusercontent.com/assets/259739/20264045/a1ddbf40-aa7a-11e6-9a1a-724a1c0123c8.png"> | ||
|
||
Получится вот так: | ||
|
||
<img width="769" alt="Forked" src="https://cloud.githubusercontent.com/assets/259739/20264122/f63219a6-aa7a-11e6-945a-89818fc7c014.png"> | ||
|
||
#### 3. Клонируйте репозиторий на свой компьютер | ||
|
||
Будьте внимательны: нужно клонировать свой репозиторий (форк), а не репозиторий Академии. Также обратите внимание, что клонировать репозиторий нужно через SSH, а не через HTTPS. Нажмите зелёную кнопку в правой части экрана, чтобы скопировать SSH-адрес вашего репозитория: | ||
|
||
<img width="769" alt="SSH" src="https://cloud.githubusercontent.com/assets/259739/20264180/42704126-aa7b-11e6-9ab4-73372b812a53.png"> | ||
|
||
Клонировать репозиторий можно так: | ||
|
||
``` | ||
git clone SSH-адрес_вашего_форка | ||
``` | ||
|
||
Команда клонирует репозиторий на ваш компьютер и подготовит всё необходимое для старта работы. | ||
|
||
#### 4. Начинайте обучение! | ||
|
||
--- | ||
|
||
<a href="https://htmlacademy.ru/intensive/ecmascript"><img align="left" width="50" height="50" title="HTML Academy" src="https://up.htmlacademy.ru/static/img/intensive/ecmascript/logo-for-github.svg"></a> | ||
|
||
Репозиторий создан для обучения на профессиональном курсе «[JavaScript. Архитектура клиентских приложений](https://htmlacademy.ru/intensive/ecmascript)» от [HTML Academy](https://htmlacademy.ru). | ||
|
||
[check-image]: https://github.com/htmlacademy-ecmascript/2577411-big-trip-4/workflows/Project%20check/badge.svg?branch=master | ||
[check-url]: https://github.com/htmlacademy-ecmascript/2577411-big-trip-4/actions |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
# Директория с вёрсткой (markup) | ||
|
||
* `loading.html` - загрузка; | ||
* главная страница: | ||
* `list.html` - со списком точек маршрута; | ||
* `list-empty.html` - с пустым списком точек маршрута; | ||
* `list-filter.html` - с отфильтрованным списком; | ||
* `list-sort.html` - с отсортированным списком; | ||
* `add-new-point.html` - с показанной формой добавления новой точки маршрута; | ||
* `add-new-point-without-offers.html` - с формой добавления новой точки маршрута такого типа, для которого нет дополнительных опций; | ||
* `add-new-point-without-destination.html` - с формой добавления новой точки маршрута с пунктом назначения, для которого нет описания и фотографий; | ||
* `edit-point.html` - с формой редактирования точки маршрута из списка; |
Oops, something went wrong.