-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: Переработка проекта в менее разбитый на маленькие компоненты. fe…
…at: добавляет презентер
- Loading branch information
Showing
23 changed files
with
393 additions
and
599 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 |
|---|---|---|
| @@ -1,41 +1,42 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="UTF-8"> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1"> | ||
|
|
||
| <title>Big Trip</title> | ||
|
|
||
| <link rel="stylesheet" href="./css/style.css"> | ||
| </head> | ||
|
|
||
| <body class="page-body"> | ||
| <header class="page-header"> | ||
| <div class="page-body__container page-header__container"> | ||
| <img class="page-header__logo" src="img/logo.png" width="42" height="42" alt="Trip logo"> | ||
|
|
||
| <div class="trip-main"> | ||
| <div class="trip-main__trip-controls trip-controls"> | ||
| <div class="trip-controls__filters"> | ||
| <h2 class="visually-hidden">Filter events</h2> | ||
| <!-- Фильтры --> | ||
| </div> | ||
| </div> | ||
|
|
||
| <button class="trip-main__event-add-btn btn btn--big btn--yellow" type="button">New event</button> | ||
| <head> | ||
| <meta charset="UTF-8"> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1"> | ||
|
|
||
| <title>Big Trip</title> | ||
|
|
||
| <link rel="stylesheet" href="./css/style.css"> | ||
| </head> | ||
|
|
||
| <body class="page-body"> | ||
| <header class="page-header"> | ||
| <div class="page-body__container page-header__container"> | ||
| <img class="page-header__logo" src="img/logo.png" width="42" height="42" alt="Trip logo"> | ||
|
|
||
| <div class="trip-main"> | ||
| <div class="trip-main__trip-controls trip-controls"> | ||
| <div class="trip-controls__filters"> | ||
| <h2 class="visually-hidden">Filter events</h2> | ||
| <!-- Фильтры --> | ||
| </div> | ||
| </div> | ||
|
|
||
| </div> | ||
| </header> | ||
| <main class="page-body__page-main page-main"> | ||
| <div class="page-body__container"> | ||
| <section class="trip-events"> | ||
| <h2 class="visually-hidden">Trip events</h2> | ||
| </div> | ||
| </header> | ||
| <main class="page-body__page-main page-main"> | ||
| <div class="page-body__container"> | ||
| <section class="trip-events"> | ||
| <h2 class="visually-hidden">Trip events</h2> | ||
|
|
||
| <!-- Сортировка --> | ||
| <!-- Сортировка --> | ||
|
|
||
| <!-- Контент --> | ||
| </section> | ||
| </div> | ||
| </main> | ||
| </body> | ||
|
|
||
| <!-- Контент --> | ||
| </section> | ||
| </div> | ||
| </main> | ||
| </body> | ||
| </html> |
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 |
|---|---|---|
| @@ -1,82 +1,22 @@ | ||
| import {RenderPosition, render} from './render.js'; | ||
| import SectionTripInfo from './view/section-trip-info-view.js'; | ||
| import TripFiltersForm from './view/trip-filters-form-view.js'; | ||
| import TripFilters from './view/trip-filters-view.js'; | ||
| import SortView from './view/sort-view.js'; | ||
| import TripEventList from './view/trip-events-list-view.js'; | ||
| import TripEventItem from './view/trip-events-item-view.js'; | ||
| import Loading from './view/loading-view.js'; | ||
| import TripEventsMessage from './view/trip-events-message-view.js'; | ||
| import EventEditForm from './view/event-edit-form-view.js'; | ||
| import EventHeader from './view/event-header-view.js'; | ||
| import SectionEventDetails from './view/event-section-details-views.js'; | ||
| import EventSectionTitle from './view/event-section-title-view.js'; | ||
| import EventSectionOffers from './view/event-section-offers-view.js'; | ||
| import EventAvailableOffers from './view/event-available-offers-view.js'; | ||
| import EventOfferSelector from './view/event-offers-selector-view.js'; | ||
| import EventSectionDestination from './view/event-section-detination-view.js'; | ||
| import EventDestinationDescription from './view/event-destination-description-view.js'; | ||
| import EventPhotosTape from './view/event-photos-tape-view.js'; | ||
| import EventPhoto from './view/event-photo-view.js'; | ||
| import EventPhotosContainer from './view/event-photos-container-view.js'; | ||
| import SectionTripInfoView from './view/section-trip-info-view.js'; | ||
| import NewEventButtonView from './view/new-event-button-view.js'; | ||
| import TripFiltersFormView from './view/trip-filters-form-view.js'; | ||
| import ListPresenter from './presenter/list-presenter.js'; | ||
|
|
||
|
|
||
| const tripMain = document.querySelector('.trip-main'); | ||
| const tripEventsElement = document.querySelector('.trip-events'); | ||
| const tripControlsFilters = document.querySelector('.trip-controls__filters'); | ||
| const tripEvents = document.querySelector('.trip-events'); | ||
|
|
||
| render(new SectionTripInfo(), tripMain, RenderPosition.AFTERBEGIN); // Заголовок, даты, общая цена | ||
| render (new TripFiltersForm(), tripControlsFilters); | ||
|
|
||
| const tripFilters = document.querySelector('.trip-filters'); | ||
|
|
||
| for (let i = 0; i < 4; i++) { // Создание кнопок для сортировки по времени | ||
| render(new TripFilters(i), tripFilters); | ||
| } | ||
|
|
||
| render (new SortView(), tripEvents); // Создание кнопок для сортировки по дате, виду передвижения, цене... | ||
| render (new TripEventList(), tripEvents); // Создание списка элементов | ||
|
|
||
| const tripEventList = document.querySelector('.trip-events__list'); | ||
|
|
||
| for (let i = 0; i < 9; i++) { // Создание элементов в списке | ||
| render (new TripEventItem(), tripEventList); | ||
| } | ||
|
|
||
| render (new Loading(), tripEvents); // Сообщение о загрузке | ||
| render (new TripEventsMessage(), tripEvents); | ||
|
|
||
| const tripEventItem = document.querySelector('.trip-events__item'); | ||
| render (new EventEditForm(), tripEventItem); // Создание формы(контейнера) для редактирования события | ||
|
|
||
| const eventEditForm = document.querySelector('.event--edit'); | ||
| render (new EventHeader(), eventEditForm); // Создание header для редактирования события | ||
| render (new SectionEventDetails(), eventEditForm); // Создание Секции для редактирования деталей события | ||
|
|
||
| const eventSectionDetails = document.querySelector('.event__details'); | ||
| render (new EventSectionOffers(), eventSectionDetails); //Создание секции offers | ||
|
|
||
| const eventSectionOffers = document.querySelector('.event__section--offers'); | ||
| render (new EventSectionTitle(0), eventSectionOffers); // Создание заголовка для секции деталий события КАК ПЕРЕДАТЬ ПЕРЕМЕННЫЕ? | ||
| render (new EventAvailableOffers(), eventSectionOffers); // Создание контейнера для предложений | ||
|
|
||
| const eventAvailableOffers = document.querySelector('.event__available-offers'); | ||
|
|
||
| for (let i = 0; i < 5; i++) { // Создание элементов в списке предложений | ||
| render (new EventOfferSelector(), eventAvailableOffers); | ||
| } | ||
|
|
||
| render (new EventSectionDestination(), eventSectionDetails); // создает блок destionation | ||
| render(new SectionTripInfoView(), tripMain, RenderPosition.AFTERBEGIN); // Заголовок, даты, общая цена | ||
| render(new NewEventButtonView(), tripMain); // Заголовок, кнопка добавить событие | ||
| render (new TripFiltersFormView(), tripControlsFilters); // Кнопки сортировки | ||
|
|
||
| const eventSectionDestination = document.querySelector('.event__section--destination'); | ||
| render (new EventSectionTitle(1), eventSectionDestination); // Создание заголовка для секции описания | ||
| render (new EventDestinationDescription(), eventSectionDestination); // создает описание места | ||
| render (new EventPhotosContainer(), eventSectionDestination); | ||
|
|
||
| const EventPhotoContainer = document.querySelector('.event__photos-container'); | ||
| render (new EventPhotosTape(), EventPhotoContainer); // создает описание места | ||
| const listPresenter = new ListPresenter({ | ||
| listContainer: tripEventsElement | ||
| }); | ||
|
|
||
| const EventPhotoTape = document.querySelector('.event__photos-tape'); | ||
| for (let i = 0; i < 5; i++) { // Создание элементов в списке предложений | ||
| render (new EventPhoto(), EventPhotoTape); // создает фотографии места | ||
| } | ||
| listPresenter.init(); | ||
|
|
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,31 @@ | ||
| import { render } from '../render.js'; | ||
|
|
||
| import SortButtonView from '../view/sort-view.js'; | ||
| import TripEventListView from '../view/trip-events-list-view.js'; | ||
| import TripEventItemView from '../view/trip-events-item-view.js'; | ||
| import AddNewPointView from '../view/add-new-point-view.js'; | ||
| import EditPointView from '../view/edit-poit-view.js'; | ||
| import TripEventsMessage from '../view/trip-events-message-view.js'; | ||
|
|
||
| export default class ListPresenter { | ||
|
|
||
| listComponent = new TripEventListView(); | ||
|
|
||
| constructor({ listContainer }) { | ||
| this.listContainer = listContainer; | ||
| } | ||
|
|
||
| init() { | ||
| render(new SortButtonView(), this.listContainer); | ||
| render(new TripEventItemView(), this.listContainer); | ||
| render(new AddNewPointView(), this.listContainer); | ||
| render(new EditPointView(), this.listContainer); | ||
| render(this.listComponent, this.listContainer); | ||
|
|
||
| for (let i = 0; i < 3; i++) { // Создание элементов в списке | ||
| render (new TripEventItemView(), this.listComponent.getElement()); | ||
| } | ||
|
|
||
| render(new TripEventsMessage(), this.listContainer); | ||
| } | ||
| } |
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
Oops, something went wrong.