Module2 task1 #5
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,33 @@ | ||
| const TYPE = [ | ||
| 'Taxi', | ||
| 'Bus', | ||
| 'Train', | ||
| 'Ship', | ||
| 'Drive', | ||
| 'Flight', | ||
| 'Check-in', | ||
| 'Sightseeing', | ||
| 'Restaurant', | ||
| ]; | ||
| const CITIES = [ | ||
| 'New-York', | ||
| 'Tokio', | ||
| 'Saint-Petersburg', | ||
| 'London', | ||
| 'Paris', | ||
| 'San-Francisco', | ||
| 'Moscow', | ||
| ]; | ||
| const OFFERS = [ | ||
| 'Add luggage', | ||
| 'Switch to comfort class', | ||
| 'Add meal', | ||
| 'Choose seats', | ||
| 'Travel by train', | ||
| 'Order Uber', | ||
| 'Rent a car', | ||
| 'Add breakfast', | ||
| 'Book tickets', | ||
| 'Lunch in city', | ||
| ]; | ||
| export { TYPE, CITIES, OFFERS }; |
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
Empty file.
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,82 @@ | ||
| import { getRandomArrayElement, getRandomInteger } from '../utils.js'; | ||
| import { TYPE, OFFERS } from '../const.js'; | ||
|
|
||
| const mockOffers = [ | ||
| { | ||
| 'type': getRandomArrayElement(TYPE), | ||
| 'offers': [ | ||
| { | ||
| 'id': '575c1f4b-b575-4ef7-b9ec-9e4e218f9ac0', | ||
| 'title': getRandomArrayElement(OFFERS), | ||
| 'price': getRandomInteger(100, 300) | ||
| }, | ||
| { | ||
| 'id': '2666bc9c-0ec7-4156-8a30-deadcca5d0c7', | ||
| 'title': getRandomArrayElement(OFFERS), | ||
| 'price': getRandomInteger(100, 300) | ||
| }, | ||
| { | ||
| 'id': 'a0499b61-8c63-4f89-84bc-0a5740aad819', | ||
| 'title': getRandomArrayElement(OFFERS), | ||
| 'price': getRandomInteger(100, 300) | ||
| }, | ||
| { | ||
| 'id': '5345f195-ce01-4217-b986-0ebd5c1b9177', | ||
| 'title': getRandomArrayElement(OFFERS), | ||
| 'price': getRandomInteger(100, 300) | ||
| }, | ||
| { | ||
| 'id': '3c8d6fa3-7ff8-459b-a1aa-0e581e45c779', | ||
| 'title': getRandomArrayElement(OFFERS), | ||
| 'price': getRandomInteger(100, 300) | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| 'type': getRandomArrayElement(TYPE), | ||
| 'offers': [ | ||
| { | ||
| 'id': 'a4dd55b0-77e6-42da-83f6-7e9b57764d85', | ||
| 'title': getRandomArrayElement(OFFERS), | ||
| 'price': getRandomInteger(100, 300) | ||
| }, | ||
| { | ||
| 'id': '49da3166-b680-4fb3-a3fc-3750d534e18e', | ||
| 'title': getRandomArrayElement(OFFERS), | ||
| 'price': getRandomInteger(100, 300) | ||
| }, | ||
| { | ||
| 'id': 'e9d4c4d5-03ab-4da1-ad2f-053ffafba6f1', | ||
| 'title': getRandomArrayElement(OFFERS), | ||
| 'price': getRandomInteger(100, 300) | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| 'type': getRandomArrayElement(TYPE), | ||
| 'offers': [ | ||
| { | ||
| 'id': '33cc680e-5a46-46c4-8cab-072b1f5b9b5f', | ||
| 'title': getRandomArrayElement(OFFERS), | ||
| 'price': getRandomInteger(100, 300) | ||
| }, | ||
| { | ||
| 'id': 'e420f53e-f5b3-4ccc-9f05-e6b5deb4421a', | ||
| 'title': getRandomArrayElement(OFFERS), | ||
| 'price': getRandomInteger(100, 300) | ||
| }, | ||
| { | ||
| 'id': 'd283cad1-cea0-43ea-a762-d66bd66b2c4c', | ||
| 'title': getRandomArrayElement(OFFERS), | ||
| 'price': getRandomInteger(100, 300) | ||
| } | ||
| ] | ||
| }, | ||
| ]; | ||
|
|
||
| function getRandomOffers() { | ||
| return getRandomArrayElement(mockOffers); | ||
| } | ||
| export {getRandomOffers}; | ||
| //console.log(getRandomOffers()) | ||
|
|
||
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,90 @@ | ||
| import { getRandomArrayElement, getRandomInteger } from '../utils.js'; | ||
| import { TYPE, CITIES, OFFERS } from '../const.js'; | ||
|
|
||
| const mockPoints = [ | ||
| { | ||
| 'id': '02ec2f95-051c-4ce4-a60f-7f9eed7ec84f', | ||
| 'basePrice': getRandomInteger(500, 2000), | ||
| 'dateFrom': '2024-11-02T21:55:08.370Z', | ||
| 'dateTo': '2024-11-04T08:28:08.370Z', | ||
| 'destination': getRandomArrayElement(CITIES), | ||
| 'isFavorite': false, | ||
| 'offers': [ | ||
|
There was a problem hiding this comment. Тоже касается и поля offers |
||
| getRandomArrayElement(OFFERS), | ||
| getRandomArrayElement(OFFERS), | ||
| getRandomArrayElement(OFFERS), | ||
| getRandomArrayElement(OFFERS), | ||
| getRandomArrayElement(OFFERS), | ||
| ], | ||
| 'type': getRandomArrayElement(TYPE) | ||
| }, | ||
| { | ||
| 'id': '88586f92-70fa-4d0d-bc04-2841803772b0', | ||
| 'basePrice': getRandomInteger(500, 2000), | ||
| 'dateFrom': '2024-11-04T20:40:08.370Z', | ||
| 'dateTo': '2024-11-05T18:46:08.370Z', | ||
| 'destination': getRandomArrayElement(CITIES), | ||
| 'isFavorite': true, | ||
| 'offers': [ | ||
| getRandomArrayElement(OFFERS), | ||
| getRandomArrayElement(OFFERS), | ||
| ], | ||
| 'type': getRandomArrayElement(TYPE) | ||
| }, | ||
| { | ||
| 'id': '849780ca-492d-481e-8929-c5a4137d216e', | ||
| 'basePrice': getRandomInteger(500, 2000), | ||
| 'dateFrom': '2024-11-07T05:18:08.370Z', | ||
| 'dateTo': '2024-11-07T21:13:08.370Z', | ||
| 'destination': getRandomArrayElement(CITIES), | ||
| 'isFavorite': true, | ||
| 'offers': [ | ||
| getRandomArrayElement(OFFERS), | ||
| ], | ||
| 'type': getRandomArrayElement(TYPE) | ||
| }, | ||
| { | ||
| 'id': 'd378e714-b66a-4cd1-8c02-ddb09255dc1d', | ||
| 'basePrice': getRandomInteger(500, 2000), | ||
| 'dateFrom': '2024-11-09T19:01:08.370Z', | ||
| 'dateTo': '2024-11-10T01:12:08.370Z', | ||
| 'destination': getRandomArrayElement(CITIES), | ||
| 'isFavorite': false, | ||
| 'offers': [ | ||
| getRandomArrayElement(OFFERS), | ||
| getRandomArrayElement(OFFERS), | ||
| getRandomArrayElement(OFFERS), | ||
| ], | ||
| 'type': getRandomArrayElement(TYPE) | ||
| }, | ||
| { | ||
| 'id': 'fa8b3372-f5d1-4358-85de-051faccedf1d', | ||
| 'basePrice': getRandomInteger(500, 2000), | ||
| 'dateFrom': '2024-11-11T12:14:08.370Z', | ||
| 'dateTo': '2024-11-12T19:18:08.370Z', | ||
| 'destination': getRandomArrayElement(CITIES), | ||
| 'isFavorite': true, | ||
| 'offers': [ | ||
| getRandomArrayElement(OFFERS), | ||
| ], | ||
| 'type': getRandomArrayElement(TYPE) | ||
| }, | ||
| { | ||
| 'id': '0376175d-c725-47f8-bd9c-4bf2975cb033', | ||
| 'basePrice': getRandomInteger(500, 2000), | ||
| 'dateFrom': '2024-11-13T13:03:08.370Z', | ||
| 'dateTo': '2024-11-14T02:51:08.370Z', | ||
| 'destination': getRandomArrayElement(CITIES), | ||
| 'isFavorite': true, | ||
| 'offers': [ | ||
| getRandomArrayElement(OFFERS), | ||
| ], | ||
| 'type': getRandomArrayElement(TYPE) | ||
| }, | ||
| ]; | ||
|
|
||
| function getRandomPoint() { | ||
| return getRandomArrayElement(mockPoints); //Функция-обертка, возвращающая getRandomArrayElement ОДНОГО ПОИНТА!!! | ||
| } | ||
| export {getRandomPoint}; | ||
|
|
||
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 @@ | ||
|
|
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,17 @@ | ||
| import {getRandomPoint} from '../mock/points.js'; | ||
| import {getRandomOffers} from '../mock/offers.js'; | ||
| const POINT_COUNT = 5; //Количество поинтов (сколько раз отрисуется поинт getRandomPoint) | ||
|
|
||
| export default class PointsModel { | ||
| points = Array.from({length: POINT_COUNT}, getRandomPoint); //Записываем в points массив поинтов | ||
| offers = Array.from({length: 1}, getRandomOffers); | ||
|
|
||
| getPoints() { | ||
| return this.points; | ||
| } | ||
|
|
||
| getOffers() { | ||
| return this.offers; | ||
| } | ||
| } | ||
|
|
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,17 +1,23 @@ | ||
|
|
||
| import PointView from '../view/trip-point-view.js'; //Точка маршрута | ||
| import OffersView from '../view/trip-edit-point-view.js';//Форма редактирования | ||
| import {render, RenderPosition} from '../render.js'; | ||
|
|
||
| export default class BoardPresenter { | ||
|
|
||
|
|
||
| constructor({container, pointsModel}) { | ||
| this.container = container; | ||
| this.pointsModel = pointsModel; | ||
| } | ||
|
|
||
| init() { | ||
| this.boardOffers = [...this.pointsModel.getOffers()]; | ||
| this.boardPoints = [...this.pointsModel.getPoints()]; | ||
| render(new OffersView({offers: this.boardOffers[0]}), this.container, RenderPosition.BEFOREEND); //Отображение формы редактирования | ||
| for (let i = 0; i < this.boardPoints.length; i++) { | ||
| render(new PointView({points: this.boardPoints[i]}), this.container, RenderPosition.BEFOREEND); //Отображение Точки маршрута 3 раза | ||
| } | ||
| } | ||
| } | ||
|
|
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 @@ | ||
| function getRandomArrayElement(items) { | ||
| return items[Math.floor(Math.random() * items.length)]; | ||
| } | ||
| function getRandomInteger(min, max) { | ||
| const rand = Math.floor(min + Math.random() * (max + 1 - min)); | ||
| return Math.floor(rand); | ||
| } | ||
| export { getRandomArrayElement, getRandomInteger }; |
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
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.
По моему тут в поле тип должен быть конкретный уникальный тип, а в случае применения функции helper он может дублироваться