-
Notifications
You must be signed in to change notification settings - Fork 1
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
Шаблонизируй это #4
Merged
Merged
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
3ccb7ac
feat: Создает моковые данные. Создает генератор события(event). Подкл…
licos87 f1fbc97
fix: Правит даты. Переделывает отображение даты и времени. feat: Доба…
licos87 196d2d3
feat: Создает моковые данные. Создает связь данных и вбюшки через в п…
licos87 1fda5eb
feat: Добавялет модели destinations, offers. fix: Исправляет отображе…
licos87 873c449
feat: добавляет логику редактирования точки, добавляет методы в модел…
licos87 1e6a88a
feat: вставляет логику отображения вариантов пунктов назначения в ред…
licos87 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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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 |
---|---|---|
|
@@ -22,5 +22,8 @@ | |
}, | ||
"engines": { | ||
"node": "20" | ||
}, | ||
"dependencies": { | ||
"dayjs": "1.11.7" | ||
} | ||
} |
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
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,149 @@ | ||
import { getRandomArrayElement } from '../utils'; | ||
|
||
const offers = [ | ||
{ | ||
title: 'Order Uber', | ||
price: 20, | ||
}, | ||
{ | ||
title: 'Add luggage', | ||
price: 50, | ||
}, | ||
{ | ||
title: 'Switch to comfort', | ||
price: 80, | ||
}, | ||
{ | ||
title: 'Rent a car', | ||
price: 200, | ||
}, | ||
{ | ||
title: 'Add breakfast', | ||
price: 50, | ||
}, | ||
{ | ||
title: 'Book tickets', | ||
price: 40, | ||
}, | ||
{ | ||
title: 'Lunch in city', | ||
price: 30, | ||
}, | ||
]; | ||
|
||
const typePoint = [ | ||
{ | ||
type: 'Taxi', | ||
img: './img/icons/taxi.png', | ||
price: 20, | ||
}, | ||
{ | ||
type: 'Bus', | ||
img: './img/icons/bus.png', | ||
price: 10, | ||
}, | ||
{ | ||
type: 'Train', | ||
img: './img/icons/train.png', | ||
price: 15, | ||
}, | ||
{ | ||
type: 'Ship', | ||
img: './img/icons/ship.png', | ||
price: 120, | ||
}, | ||
{ | ||
type: 'Drive', | ||
img: './img/icons/drive.png', | ||
price: 160, | ||
}, | ||
{ | ||
type: 'Flight', | ||
img: './img/icons/flight.png', | ||
price: 160, | ||
}, | ||
{ | ||
type: 'Check-in', | ||
img: './img/icons/check-in.png', | ||
price: 600, | ||
}, | ||
{ | ||
type: 'Sightseeing', | ||
img: './img/icons/sightseeing.png', | ||
price: 50, | ||
}, | ||
{ | ||
type: 'Restaurant', | ||
img: './img/icons/restaurant.png', | ||
price: 200, | ||
}, | ||
]; | ||
|
||
const destination = [ | ||
{ | ||
title: 'Chamonix', | ||
description: 'Chamonix-Mont-Blanc (usually shortened to Chamonix) is a resort area near the junction of France, Switzerland and Italy. At the base of Mont Blanc, the highest summit in the Alps, it\'s renowned for its skiing.', | ||
photo: [], | ||
}, | ||
{ | ||
title: 'Amsterdam', | ||
description: 'Amsterdam fans out south from the Amsterdam Centraal station and Damrak, the main street off the station. The oldest area of the town is known as De Wallen (English: "The Quays"). It lies to the east of Damrak and contains the city\'s famous red-light district. To the south of De Wallen is the old Jewish quarter of Waterlooplein.', | ||
photo: [], | ||
}, | ||
{ | ||
title: 'Geneva', | ||
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.', | ||
photo: ['img/photos/1.jpg', 'img/photos/2.jpg', 'img/photos/3.jpg', 'img/photos/4.jpg', 'img/photos/5.jpg',], | ||
}, | ||
]; | ||
|
||
|
||
const mockEvents = [ | ||
{ | ||
title: `${typePoint[0].type} ${destination[1].title}`, | ||
icon: `${typePoint[0].img}`, | ||
price: typePoint[0].price, | ||
eventStartTime: new Date('2019-03-18T10:30'), | ||
eventEndtTime: new Date('2019-03-18T11:00'), | ||
offers: [offers[0],], | ||
isFavorite: true, | ||
}, | ||
{ | ||
title: `${typePoint[5].type} ${destination[0].title}`, | ||
icon: `${typePoint[5].img}`, | ||
price: typePoint[5].price, | ||
eventStartTime: new Date('2019-03-18T12:25'), | ||
eventEndtTime: new Date('2019-03-18T13:35'), | ||
offers: [offers[1], offers[2],], | ||
isFavorite: false, | ||
}, | ||
{ | ||
title: `${typePoint[4].type} ${destination[0].title}`, | ||
icon: `${typePoint[4].img}`, | ||
price: typePoint[4].price, | ||
eventStartTime: new Date('2019-03-18T14:30'), | ||
eventEndtTime: new Date('2019-03-18T16:05'), | ||
offers: [offers[3],], | ||
isFavorite: true, | ||
}, | ||
{ | ||
title: `${typePoint[6].type} ${destination[0].title}`, | ||
icon: `${typePoint[6].img}`, | ||
price: typePoint[6].price, | ||
eventStartTime: new Date('2019-03-18T10:30'), | ||
eventEndtTime: new Date('2019-03-18T11:00'), | ||
offers: [offers[0],], | ||
isFavorite: true, | ||
}, | ||
]; | ||
|
||
/** | ||
* Returns a random event from mockEvents array. | ||
* @returns {Object} - Random event. | ||
*/ | ||
function getRandomEvent() { | ||
return getRandomArrayElement(mockEvents); | ||
} | ||
|
||
|
||
export {getRandomEvent}; |
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,11 @@ | ||
import {getRandomEvent} from '../mock/event.js'; | ||
|
||
const EVENT_COUNT = 4; | ||
|
||
export default class EventModel { | ||
event = Array.from({length: EVENT_COUNT}, getRandomEvent); | ||
|
||
getEvents() { | ||
return this.event; | ||
} | ||
} |
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 |
---|---|---|
|
@@ -2,28 +2,29 @@ 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 EventItemView from '../view/event-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 }) { | ||
constructor({ listContainer, eventModel }) { | ||
this.listContainer = listContainer; | ||
this.eventModel = eventModel; | ||
} | ||
|
||
init() { | ||
this.listEvents = [...this.eventModel.getEvents()]; | ||
|
||
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()); | ||
for (let i = 0; i < this.listEvents.length; i++) { // Создание элементов в списке | ||
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. PoinstModel.forEach((item) => { render (new EventItemView({obj}), this.listComponent.getElement()); |
||
render (new EventItemView({event: this.listEvents[i]}), 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
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,35 @@ | ||
import dayjs from 'dayjs'; | ||
|
||
/** | ||
* Returns a random element from the given array. | ||
* @param {Array} items - Array of any type of elements. | ||
* @returns {any} - Random element from the array. | ||
*/ | ||
function getRandomArrayElement(items) { | ||
return items[Math.floor(Math.random() * items.length)]; | ||
} | ||
|
||
const DATE_FORMAT = 'MMM DD'; | ||
const TIME_FORMAT = 'HH:mm'; | ||
|
||
/** | ||
* Returns a humanized representation of a given due date. | ||
* @param {string} dueDate - Due date in ISO format. | ||
* @returns {string} - Humanized representation of given due date, or empty string if due date is not given. | ||
*/ | ||
function humanizeEventDate(eventDate, format) { | ||
if (format === 'date') { | ||
return eventDate ? dayjs(eventDate).format(DATE_FORMAT).toUpperCase() : ''; | ||
} | ||
return eventDate ? dayjs(eventDate).format(TIME_FORMAT).toUpperCase() : ''; | ||
} | ||
|
||
function diffTime(startTime, endTime) { | ||
let time = dayjs(endTime).diff(startTime, 'm'); | ||
if (time > 60) { | ||
time = `${Math.floor(time / 60)}H ${time % 60}M`; | ||
} | ||
return time; | ||
} | ||
|
||
export {getRandomArrayElement, humanizeEventDate, diffTime}; |
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.
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.
PoinsModel