-
Notifications
You must be signed in to change notification settings - Fork 0
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
Время разбивать камни #3
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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,5 @@ | ||
import GlobalPresenter from './presenter/global-presenter.js'; | ||
|
||
const globalPresenter = new GlobalPresenter(); | ||
|
||
globalPresenter.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,68 @@ | ||
import { render, RenderPosition } from '../render.js'; | ||
import TripInfo from '../view/trip-info'; | ||
import TripFiltersView from '../view/trip-filters-view'; | ||
import EventAddButtonView from '../view/event-add-button-view'; | ||
import TripSortView from '../view/trip-sort-view'; | ||
import TripEventsListView from '../view/trip-events-list-view'; | ||
import TripListItem from '../view/trip-event-list-item-view'; | ||
import TripEventsPointView from '../view/trip-events-point-view'; | ||
import EventAddAndEditFormView from '../view/event-add-and-edit-form-view'; | ||
|
||
export default class GlobalPresenter { | ||
|
||
constructor() { | ||
this.pageHeader = document.querySelector('.page-header'); | ||
this.tripMain = this.pageHeader.querySelector('.trip-main'); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. вот эти параметры мы передаем снаружи |
||
this.tripFilters = this.pageHeader.querySelector('.trip-controls__filters'); | ||
|
||
this.pageMain = document.querySelector('.page-main'); | ||
this.tripEvents = this.pageMain.querySelector('.trip-events'); | ||
} | ||
|
||
renderTripInfo() { | ||
render(new TripInfo(), this.tripMain, RenderPosition.AFTERBEGIN); | ||
} | ||
|
||
renderTripFilters() { | ||
render(new TripFiltersView(), this.tripFilters, RenderPosition.BEFOREEND); | ||
} | ||
|
||
renderEventAddButton() { | ||
render(new EventAddButtonView(), this.tripMain, RenderPosition.BEFOREEND); | ||
} | ||
|
||
renderTripSort() { | ||
render(new TripSortView(), this.tripEvents, RenderPosition.BEFOREEND); | ||
} | ||
|
||
renderTripEventsList() { | ||
render(new TripEventsListView(), this.tripEvents, RenderPosition.BEFOREEND); | ||
} | ||
|
||
renderFormEdit() { | ||
this.tripEventsList = this.tripEvents.querySelector('.trip-events__list'); | ||
|
||
const formEditPoint = new EventAddAndEditFormView(); | ||
|
||
render(new TripListItem(formEditPoint.getTemplate()), this.tripEventsList, RenderPosition.BEFOREEND); | ||
} | ||
|
||
renderTripEventPoint() { | ||
this.tripEventsList = this.tripEvents.querySelector('.trip-events__list'); | ||
|
||
const tripEventPoint = new TripEventsPointView(); | ||
|
||
[1, 2, 3].forEach(() => render(new TripListItem(tripEventPoint.getTemplate()), this.tripEventsList, RenderPosition.BEFOREEND)); | ||
|
||
} | ||
|
||
init() { | ||
this.renderTripInfo(); | ||
this.renderTripFilters(); | ||
this.renderEventAddButton(); | ||
this.renderTripSort(); | ||
this.renderTripEventsList(); | ||
this.renderFormEdit(); | ||
this.renderTripEventPoint(); | ||
} | ||
} |
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,163 @@ | ||
import { createElement } from '../render.js'; | ||
|
||
function createEventAddAndEditFormTemplate() { | ||
return ` | ||
<form class="event event--edit" action="#" method="post"> | ||
<header class="event__header"> | ||
<div class="event__type-wrapper"> | ||
<label class="event__type event__type-btn" for="event-type-toggle-1"> | ||
<span class="visually-hidden">Choose event type</span> | ||
<img class="event__type-icon" width="17" height="17" src="img/icons/flight.png" alt="Event type icon"> | ||
</label> | ||
<input class="event__type-toggle visually-hidden" id="event-type-toggle-1" type="checkbox"> | ||
<div class="event__type-list"> | ||
<fieldset class="event__type-group"> | ||
<legend class="visually-hidden">Event type</legend> | ||
<div class="event__type-item"> | ||
<input id="event-type-taxi-1" class="event__type-input visually-hidden" type="radio" name="event-type" value="taxi"> | ||
<label class="event__type-label event__type-label--taxi" for="event-type-taxi-1">Taxi</label> | ||
</div> | ||
<div class="event__type-item"> | ||
<input id="event-type-bus-1" class="event__type-input visually-hidden" type="radio" name="event-type" value="bus"> | ||
<label class="event__type-label event__type-label--bus" for="event-type-bus-1">Bus</label> | ||
</div> | ||
<div class="event__type-item"> | ||
<input id="event-type-train-1" class="event__type-input visually-hidden" type="radio" name="event-type" value="train"> | ||
<label class="event__type-label event__type-label--train" for="event-type-train-1">Train</label> | ||
</div> | ||
<div class="event__type-item"> | ||
<input id="event-type-ship-1" class="event__type-input visually-hidden" type="radio" name="event-type" value="ship"> | ||
<label class="event__type-label event__type-label--ship" for="event-type-ship-1">Ship</label> | ||
</div> | ||
<div class="event__type-item"> | ||
<input id="event-type-drive-1" class="event__type-input visually-hidden" type="radio" name="event-type" value="drive"> | ||
<label class="event__type-label event__type-label--drive" for="event-type-drive-1">Drive</label> | ||
</div> | ||
<div class="event__type-item"> | ||
<input id="event-type-flight-1" class="event__type-input visually-hidden" type="radio" name="event-type" value="flight" checked> | ||
<label class="event__type-label event__type-label--flight" for="event-type-flight-1">Flight</label> | ||
</div> | ||
<div class="event__type-item"> | ||
<input id="event-type-check-in-1" class="event__type-input visually-hidden" type="radio" name="event-type" value="check-in"> | ||
<label class="event__type-label event__type-label--check-in" for="event-type-check-in-1">Check-in</label> | ||
</div> | ||
<div class="event__type-item"> | ||
<input id="event-type-sightseeing-1" class="event__type-input visually-hidden" type="radio" name="event-type" value="sightseeing"> | ||
<label class="event__type-label event__type-label--sightseeing" for="event-type-sightseeing-1">Sightseeing</label> | ||
</div> | ||
<div class="event__type-item"> | ||
<input id="event-type-restaurant-1" class="event__type-input visually-hidden" type="radio" name="event-type" value="restaurant"> | ||
<label class="event__type-label event__type-label--restaurant" for="event-type-restaurant-1">Restaurant</label> | ||
</div> | ||
</fieldset> | ||
</div> | ||
</div> | ||
<div class="event__field-group event__field-group--destination"> | ||
<label class="event__label event__type-output" for="event-destination-1"> | ||
Flight | ||
</label> | ||
<input class="event__input event__input--destination" id="event-destination-1" type="text" name="event-destination" value="Geneva" list="destination-list-1"> | ||
<datalist id="destination-list-1"> | ||
<option value="Amsterdam"></option> | ||
<option value="Geneva"></option> | ||
<option value="Chamonix"></option> | ||
</datalist> | ||
</div> | ||
<div class="event__field-group event__field-group--time"> | ||
<label class="visually-hidden" for="event-start-time-1">From</label> | ||
<input class="event__input event__input--time" id="event-start-time-1" type="text" name="event-start-time" value="19/03/19 00:00"> | ||
— | ||
<label class="visually-hidden" for="event-end-time-1">To</label> | ||
<input class="event__input event__input--time" id="event-end-time-1" type="text" name="event-end-time" value="19/03/19 00:00"> | ||
</div> | ||
<div class="event__field-group event__field-group--price"> | ||
<label class="event__label" for="event-price-1"> | ||
<span class="visually-hidden">Price</span> | ||
€ | ||
</label> | ||
<input class="event__input event__input--price" id="event-price-1" type="text" name="event-price" value=""> | ||
</div> | ||
<button class="event__save-btn btn btn--blue" type="submit">Save</button> | ||
<button class="event__reset-btn" type="reset">Cancel</button> | ||
</header> | ||
<section class="event__details"> | ||
<section class="event__section event__section--offers"> | ||
<h3 class="event__section-title event__section-title--offers">Offers</h3> | ||
<div class="event__available-offers"> | ||
<div class="event__offer-selector"> | ||
<input class="event__offer-checkbox visually-hidden" id="event-offer-luggage-1" type="checkbox" name="event-offer-luggage" checked> | ||
<label class="event__offer-label" for="event-offer-luggage-1"> | ||
<span class="event__offer-title">Add luggage</span> | ||
+€ | ||
<span class="event__offer-price">30</span> | ||
</label> | ||
</div> | ||
<div class="event__offer-selector"> | ||
<input class="event__offer-checkbox visually-hidden" id="event-offer-comfort-1" type="checkbox" name="event-offer-comfort" checked> | ||
<label class="event__offer-label" for="event-offer-comfort-1"> | ||
<span class="event__offer-title">Switch to comfort class</span> | ||
+€ | ||
<span class="event__offer-price">100</span> | ||
</label> | ||
</div> | ||
<div class="event__offer-selector"> | ||
<input class="event__offer-checkbox visually-hidden" id="event-offer-meal-1" type="checkbox" name="event-offer-meal"> | ||
<label class="event__offer-label" for="event-offer-meal-1"> | ||
<span class="event__offer-title">Add meal</span> | ||
+€ | ||
<span class="event__offer-price">15</span> | ||
</label> | ||
</div> | ||
<div class="event__offer-selector"> | ||
<input class="event__offer-checkbox visually-hidden" id="event-offer-seats-1" type="checkbox" name="event-offer-seats"> | ||
<label class="event__offer-label" for="event-offer-seats-1"> | ||
<span class="event__offer-title">Choose seats</span> | ||
+€ | ||
<span class="event__offer-price">5</span> | ||
</label> | ||
</div> | ||
<div class="event__offer-selector"> | ||
<input class="event__offer-checkbox visually-hidden" id="event-offer-train-1" type="checkbox" name="event-offer-train"> | ||
<label class="event__offer-label" for="event-offer-train-1"> | ||
<span class="event__offer-title">Travel by train</span> | ||
+€ | ||
<span class="event__offer-price">40</span> | ||
</label> | ||
</div> | ||
</div> | ||
</section> | ||
<section class="event__section event__section--destination"> | ||
<h3 class="event__section-title event__section-title--destination">Destination</h3> | ||
<p class="event__destination-description">Geneva is a city in Switzerland that lies at the southern tip of expansive Lac Léman (Lake Geneva). Surrounded by the Alps and Jura mountains, the city has views of dramatic Mont Blanc.</p> | ||
<div class="event__photos-container"> | ||
<div class="event__photos-tape"> | ||
<img class="event__photo" src="img/photos/1.jpg" alt="Event photo"> | ||
<img class="event__photo" src="img/photos/2.jpg" alt="Event photo"> | ||
<img class="event__photo" src="img/photos/3.jpg" alt="Event photo"> | ||
<img class="event__photo" src="img/photos/4.jpg" alt="Event photo"> | ||
<img class="event__photo" src="img/photos/5.jpg" alt="Event photo"> | ||
</div> | ||
</div> | ||
</section> | ||
</section> | ||
</form> | ||
`; | ||
} | ||
|
||
export default class EventAddAndEditFormView { | ||
getTemplate() { | ||
return createEventAddAndEditFormTemplate(); | ||
} | ||
|
||
getElement() { | ||
if (!this.element) { | ||
this.element = createElement(this.getTemplate()); | ||
} | ||
|
||
return this.element; | ||
} | ||
|
||
removeElement() { | ||
this.element = null; | ||
} | ||
} |
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,25 @@ | ||
import { createElement } from '../render.js'; | ||
|
||
function createEventAddButtonTemplate() { | ||
return ` | ||
<button class="trip-main__event-add-btn btn btn--big btn--yellow" type="button">New event</button> | ||
`; | ||
} | ||
|
||
export default class EventAddButtonView { | ||
getTemplate() { | ||
return createEventAddButtonTemplate(); | ||
} | ||
|
||
getElement() { | ||
if (!this.element) { | ||
this.element = createElement(this.getTemplate()); | ||
} | ||
|
||
return this.element; | ||
} | ||
|
||
removeElement() { | ||
this.element = null; | ||
} | ||
} |
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 @@ | ||
import { createElement } from '../render'; | ||
|
||
function createTripListItemTemplate(data) { | ||
return ` | ||
<li class="trip-events__item">${data}</li> | ||
`; | ||
} | ||
|
||
export default class TripListItem { | ||
constructor(data) { | ||
this.data = data; | ||
} | ||
|
||
getTemplate() { | ||
return createTripListItemTemplate(this.data); | ||
} | ||
|
||
getElement() { | ||
if (!this.element) { | ||
this.element = createElement(this.getTemplate()); | ||
} | ||
|
||
return this.element; | ||
} | ||
|
||
removeElement() { | ||
this.element = null; | ||
} | ||
} |
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,25 @@ | ||
import {createElement} from '../render.js'; | ||
|
||
function createTripEventsListTemplate() { | ||
return ` | ||
<ul class="trip-events__list"></ul> | ||
`; | ||
} | ||
|
||
export default class TripEventsListView { | ||
getTemplate() { | ||
return createTripEventsListTemplate(); | ||
} | ||
|
||
getElement() { | ||
if (!this.element) { | ||
this.element = createElement(this.getTemplate()); | ||
} | ||
|
||
return this.element; | ||
} | ||
|
||
removeElement() { | ||
this.element = null; | ||
} | ||
} |
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,59 @@ | ||
import {createElement} from '../render.js'; | ||
|
||
function createTripEventsPointTemplate() { | ||
return ` | ||
<div class="event"> | ||
<time class="event__date" datetime="2019-03-18">MAR 18</time> | ||
<div class="event__type"> | ||
<img class="event__type-icon" width="42" height="42" src="img/icons/taxi.png" alt="Event type icon"> | ||
</div> | ||
<h3 class="event__title">Taxi Amsterdam</h3> | ||
<div class="event__schedule"> | ||
<p class="event__time"> | ||
<time class="event__start-time" datetime="2019-03-18T10:30">10:30</time> | ||
— | ||
<time class="event__end-time" datetime="2019-03-18T11:00">11:00</time> | ||
</p> | ||
<p class="event__duration">30M</p> | ||
</div> | ||
<p class="event__price"> | ||
€ <span class="event__price-value">20</span> | ||
</p> | ||
<h4 class="visually-hidden">Offers:</h4> | ||
<ul class="event__selected-offers"> | ||
<li class="event__offer"> | ||
<span class="event__offer-title">Order Uber</span> | ||
+€ | ||
<span class="event__offer-price">20</span> | ||
</li> | ||
</ul> | ||
<button class="event__favorite-btn event__favorite-btn--active" type="button"> | ||
<span class="visually-hidden">Add to favorite</span> | ||
<svg class="event__favorite-icon" width="28" height="28" viewBox="0 0 28 28"> | ||
<path d="M14 21l-8.22899 4.3262 1.57159-9.1631L.685209 9.67376 9.8855 8.33688 14 0l4.1145 8.33688 9.2003 1.33688-6.6574 6.48934 1.5716 9.1631L14 21z"/> | ||
</svg> | ||
</button> | ||
<button class="event__rollup-btn" type="button"> | ||
<span class="visually-hidden">Open event</span> | ||
</button> | ||
</div> | ||
`; | ||
} | ||
|
||
export default class TripEventsPointView { | ||
getTemplate() { | ||
return createTripEventsPointTemplate(); | ||
} | ||
|
||
getElement() { | ||
if (!this.element) { | ||
this.element = createElement(this.getTemplate()); | ||
} | ||
|
||
return this.element; | ||
} | ||
|
||
removeElement() { | ||
this.element = null; | ||
} | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
здесь нам нужно передать в Presenter main container и events container, куда мы уже будем рендерить наши элементы