Merge pull request #16 from WhiteShark23/master

Author: keksobot

src/const.js

@@ -4,6 +4,19 @@ export const SortType = {
   TIME: 'time',
 };
 
+export const MILISECONDS_IN_MINUTE = 60000;
+export const MINUTES_IN_HOUR = 60;
+export const MINUTES_IN_DAY = 1440;
+
+export const DateFormat = {
+  monthDay: 'MMM D',
+  hourMinute: 'HH:mm',
+  yearMonthDay: 'YYYY-MM-DD',
+  dateTime:'DD/MM/YY HH:mm',
+  dateTimeT: 'YYYY-MM-DDTHH:mm'
+
+};
+
 export const FilterType = {
   EVERYTHING: 'everything',
   FUTURE: 'future',

src/presenter/event-presenter.js

@@ -151,7 +151,7 @@ export default class EventPresenter {
     }
 
     const resetFormState = () => {
-      this.#eventEditComponent.updateElement({
+      this.#eventEditComponent?.updateElement({
         isDisabled: false,
         isSaving: false,
         isDeleting: false,

src/presenter/new-event-presenter.js

@@ -68,7 +68,7 @@ export default class NewEventPresenter {
 
   setAborting() {
     const resetFormState = () => {
-      this.#eventEditComponent.updateElement({
+      this.#eventEditComponent?.updateElement({
         isDisabled: false,
         isSaving: false,
         isDeleting: false,

src/utils/util.js

@@ -1,18 +1,5 @@
 import dayjs from 'dayjs';
-
-
-const MILISECONDS_IN_MINUTE = 60000;
-const MINUTES_IN_HOUR = 60;
-const MINUTES_IN_DAY = 1440;
-
-export const DateFormat = {
-  monthDay: 'MMM D',
-  hourMinute: 'HH:mm',
-  yearMonthDay: 'YYYY-MM-DD',
-  dateTime:'DD/MM/YY HH:mm',
-  dateTimeT: 'YYYY-MM-DDTHH:mm'
-
-};
+import { MILISECONDS_IN_MINUTE, MINUTES_IN_HOUR, MINUTES_IN_DAY } from '../const';
 
 export const DefaultPoint = {
   basePrice: 0,

src/view/edit-event.js

@@ -1,5 +1,6 @@
 import AbstractStatefulView from '../framework/view/abstract-stateful-view.js';
-import { humanizeTaskDueDate, DateFormat } from '../utils/util.js';
+import { humanizeTaskDueDate } from '../utils/util.js';
+import { DateFormat } from '../const.js';
 import flatpickr from 'flatpickr';
 import { DefaultPoint } from '../utils/util.js';
 
@@ -63,10 +64,10 @@ function createGroupDestinationTemplate (allDestinations, type, destination, id)
 function createTimeTemplate(id, dateFrom, dateTo) {
   return `<div class="event__field-group  event__field-group--time">
             <label class="visually-hidden" for="event-start-time-${id}">From</label>
-            <input class="event__input  event__input--time" id="event-start-time-${id}" type="text" name="event-start-time" value="${humanizeTaskDueDate(dateFrom, DateFormat.dateTime)} required>
+            <input required class="event__input  event__input--time" id="event-start-time-${id}" type="text" name="event-start-time" value="${humanizeTaskDueDate(dateFrom, DateFormat.dateTime)}">
             &mdash;
             <label class="visually-hidden" for="event-end-time-${id}">To</label>
-            <input class="event__input  event__input--time" id="event-end-time-${id}" type="text" name="event-end-time" value="${humanizeTaskDueDate(dateTo, DateFormat.dateTime)} required>
+            <input required class="event__input  event__input--time" id="event-end-time-${id}" type="text" name="event-end-time" value="${humanizeTaskDueDate(dateTo, DateFormat.dateTime)}">
           </div>
   `;
 }

src/view/item-event.js

@@ -1,5 +1,6 @@
 import AbstractView from '../framework/view/abstract-view.js';
-import { getTimePeriod, humanizeTaskDueDate, DateFormat } from '../utils/util.js';
+import { getTimePeriod, humanizeTaskDueDate } from '../utils/util.js';
+import { DateFormat } from '../const.js';
 import dayjs from 'dayjs';
 
 function createItemEventTemplate(point, offer, destination) {