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

Обновление века (часть 2) #12

Merged
Merged
Changes from all commits
Commits
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
feat: 6.6. 6.7. Обновление века (часть 2) done
  • Loading branch information
NikitaBystritsky committed Jan 13, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 3da846da79af1a899b94fea0002e27efc34a73a6
7 changes: 7 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -29,6 +29,7 @@
"copy-webpack-plugin": "^12.0.2",
"css-loader": "^7.1.2",
"dayjs": "^1.11.13",
"flatpickr": "^4.6.13",
"html-webpack-plugin": "^5.6.3",
"style-loader": "^4.0.0",
"webpack": "^5.79.0",
2 changes: 2 additions & 0 deletions src/presenter/point-presenter.js
Original file line number Diff line number Diff line change
@@ -81,6 +81,7 @@ export default class PointPresenter {

resetView() {
if (this.#mode !== MODE.DEFAULT) {
this.#pointEditComponent.resetPoint(this.#point);
this.#replaceFormToPoint();
}
}
@@ -98,6 +99,7 @@ export default class PointPresenter {
};

#handleFormSubmit = (point) => {
this.#point = point;
this.#handleDataChange(point);
this.#replaceFormToPoint();
};
89 changes: 82 additions & 7 deletions src/view/edit-point-view.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import {formatToSlashDate} from '../utils.js';
import {CITIES, POINT_EMPTY, ROUTE_TYPE} from '../mock/const.js';
import AbstractStatefulView from '../framework/view/abstract-stateful-view.js';
import flatpickr from 'flatpickr';

import 'flatpickr/dist/flatpickr.min.css';

const getPicrtureItem = (picture) => `<img class="event__photo" src="${picture.src}" alt="${picture.description}">`;

@@ -13,7 +16,7 @@ const getEventTypeItem = (typeItem, type) => `<div class="event__type-item">
</div>`;

const getOfferItem = (offer, pointOffers) => `<div class="event__offer-selector">
<input class="event__offer-checkbox visually-hidden" id="event-offer-luggage-${offer.id}" type="checkbox" name="event-offer-luggage"
<input class="event__offer-checkbox visually-hidden" id="event-offer-luggage-${offer.id}" data-offerId=${offer.id} type="checkbox" name="event-offer-luggage"
${pointOffers.includes(offer.id) ? 'checked' : ''}>
<label class="event__offer-label" for="event-offer-luggage-${offer.id}">
<span class="event__offer-title">${offer.title}</span>
@@ -116,6 +119,8 @@ export default class EditPointView extends AbstractStatefulView{
#offers = [];
#destinations = [];
#pointOffers = [];
#datepickerFrom = null;
#datepickerTo = null;
#handleSubmitClick = null;
#handleDeleteClick = null;
#handleRollUpClick = null;
@@ -156,11 +161,74 @@ export default class EditPointView extends AbstractStatefulView{
this.element.querySelector('.event__type-group').addEventListener('change', this.#routeTypeChangeHandler);
this.element.querySelector('.event__input--destination').addEventListener('change', this.#destinationChangeHandler);
this.element.querySelector('.event__input--price').addEventListener('change', this.#priceChangeHandler);
this.element.querySelector('.event__available-offers')?.addEventListener('change', this.#offerChangeHandler);

this.#setDatepickers();
}

removeElement = () => {
super.removeElement();

if (this.#datepickerFrom) {
this.#datepickerFrom.destroy();
this.#datepickerFrom = null;
}

if (this.#datepickerTo) {
this.#datepickerTo.destroy();
this.#datepickerTo = null;
}
};

#dateFromCloseHandler = ([userDate]) => {
this._setState({
dateFrom: userDate
});
this.#datepickerTo.set('minDate', this._state.dateFrom);
};

#dateToCloseHandler = ([userDate]) => {
this._setState({
dateTo: userDate
});
this.#datepickerFrom.set('maxDate', this._state.dateTo);
};

#setDatepickers = () => {
const [dateFromElement, dateToElement] = this.element.querySelectorAll('.event__input--time');
const commonConfig = {
dateFormat: 'd/m/y H:i',
enableTime: true,
locate: {
firstDayOfWeek: 1,
},
'time_24hr': true
};

this.#datepickerFrom = flatpickr(
dateFromElement,
{
...commonConfig,
defaultDate: this._state.dateFrom,
onClose: this.#dateFromCloseHandler,
maxDate: this._state.dateTo
}
);

this.#datepickerTo = flatpickr(
dateToElement,
{
...commonConfig,
defaultDate: this._state.dateTo,
onClose: this.#dateToCloseHandler,
minDate: this._state.dateFrom
}
);
};

#submitClickHandler = (evt) => {
evt.preventDefault();
this.#handleSubmitClick(this._state);
this.#handleSubmitClick(EditPointView.parseStateToPoint(this._state));
};

#deleteClickHandler = (evt) => {
@@ -175,7 +243,6 @@ export default class EditPointView extends AbstractStatefulView{

#routeTypeChangeHandler = (evt) => {
const routeType = evt.target.value.charAt(0).toUpperCase() + evt.target.value.slice(1);

this.#pointOffers = this.#offers.getByType(routeType);

this.updateElement({
@@ -198,11 +265,19 @@ export default class EditPointView extends AbstractStatefulView{

#priceChangeHandler = (evt) => {
this._setState({
basePrice: evt.target.value
basePrice: Number(evt.target.value)
});
};

static parsePointToState(point) {
return {...point};
}
#offerChangeHandler = () => {
const checkedBoxes = Array.from(this.element.querySelectorAll('.event__offer-checkbox:checked'));

this._setState({
offers: checkedBoxes.map((element) => element.dataset.offerid)
});
};

static parsePointToState = (point) => ({...point});

static parseStateToPoint = (state) => state.point;
}