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

Разделяй и властвуй #5

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
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
213 changes: 213 additions & 0 deletions package-lock.json

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

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@
"@babel/preset-env": "7.21.4",
"babel-loader": "9.1.2",
"copy-webpack-plugin": "11.0.0",
"css-loader": "6.7.3",
"eslint": "8.38.0",
"eslint-config-htmlacademy": "9.0.0",
"html-webpack-plugin": "5.5.1",
"style-loader": "3.3.2",
"webpack-cli": "5.0.1",
"webpack-dev-server": "4.13.3"
},
Expand Down
2 changes: 1 addition & 1 deletion src/framework/render.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,4 @@ function remove(component) {
component.removeElement();
}

export {RenderPosition, createElement, render, replace, remove};
export { RenderPosition, createElement, render, replace, remove };
2 changes: 1 addition & 1 deletion src/main.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { render } from './framework/render.js';
import EventsModel from './model/events-model.js';
import EventsPresenter from './presenter/events-presenter.js';
import { render } from './render.js';
import FiltersView from './view/filters-view.js';

const filtersContainer = document.querySelector('.trip-controls__filters');
Expand Down
39 changes: 32 additions & 7 deletions src/presenter/events-presenter.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { render } from '../render.js';
import { render, replace } from '../framework/render.js';
import EditEventView from '../view/edit-event-view.js';
import EventView from '../view/event-view.js';
import EventsListView from '../view/events-list-view.js';
Expand All @@ -13,25 +13,50 @@
this.eventsModel = eventsModel;
}


init() {
this.events = [...this.eventsModel.getEvents()];
this.destinations = [...this.eventsModel.getDestinations()];
this.offers = [...this.eventsModel.getOffers()];
render(new EventsSortView(), this.eventsContainer);
render(this.listComponent, this.eventsContainer);

render(new EditEventView({ event: this.events[0], destination: this.eventsModel.getDestinationById(this.events[0].destination), offers: this.eventsModel.getOffersByType(this.events[0].type), allDestinations: this.eventsModel.getAllDestinationsNames() }), this.listComponent.getElement());

render(new EditEventView({ allDestinations: this.eventsModel.getAllDestinationsNames() }), this.listComponent.getElement());

for (let i = 1; i < this.events.length; i++) {
const event = this.events[i];
const type = this.events[i].type;
const destination = this.eventsModel.getDestinationById(event.destination);
const offers = this.eventsModel.getOffersById(event.offers, type);

render(new EventView({ event, destination, offers, }), this.listComponent.getElement());
const eventComponent = new EventView({
event, destination, offers, onClick: () => {
replaceEventToEditForm();
document.addEventListener('keydown', onEscKeyDown);
}
});
const editEventFormComponent = new EditEventView({
event, destination, offers,
allDestinations: this.eventsModel.getAllDestinationsNames(),
onSubmit: () => {
replaceEditFormToEvent();
document.removeEventListener('keydown', onEscKeyDown);
},
onClick: () => replaceEditFormToEvent()
});

// Ругается на Function Declaration, хотя без поднятия здесь никак(есть ли какой-нибудь совет?)

function onEscKeyDown(event) {

Check failure on line 47 in src/presenter/events-presenter.js

View workflow job for this annotation

GitHub Actions / Check

Move function declaration to function body root

Check failure on line 47 in src/presenter/events-presenter.js

View workflow job for this annotation

GitHub Actions / Check

'event' is already declared in the upper scope on line 24 column 13
event.preventDefault();
replaceEditFormToEvent();
document.removeEventListener('keydown', onEscKeyDown);
}
function replaceEventToEditForm() {

Check failure on line 52 in src/presenter/events-presenter.js

View workflow job for this annotation

GitHub Actions / Check

Move function declaration to function body root
replace(editEventFormComponent, eventComponent);
};

Check failure on line 54 in src/presenter/events-presenter.js

View workflow job for this annotation

GitHub Actions / Check

Unnecessary semicolon
function replaceEditFormToEvent() {

Check failure on line 55 in src/presenter/events-presenter.js

View workflow job for this annotation

GitHub Actions / Check

Move function declaration to function body root
replace(eventComponent, editEventFormComponent);
};

Check failure on line 57 in src/presenter/events-presenter.js

View workflow job for this annotation

GitHub Actions / Check

Unnecessary semicolon
render(eventComponent, this.listComponent.element);

}
}
}
19 changes: 0 additions & 19 deletions src/render.js

This file was deleted.

Loading
Loading