fix: make changes after eslint check

htmlacademy-ecmascript · Aug 31, 2024 · 646e284 · 646e284
1 parent 650175f
commit 646e284
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 60 deletions.
diff --git a/src/main.js b/src/main.js
@@ -1,7 +1,7 @@
-import NewFilters from "./view/filters";
-import NewTripInfo from "./view/trip-info";
-import { RenderPosition, render } from "./render";
-import MainPresenter from "./presenter/main-presenter";
+import NewFilters from './view/filters';
+import NewTripInfo from './view/trip-info';
+import { RenderPosition, render } from './render';
+import MainPresenter from './presenter/main-presenter';
 
 const tripMain = document.querySelector('.trip-main');
 const tripFilters = document.querySelector('.trip-controls__filters');

diff --git a/src/presenter/main-presenter.js b/src/presenter/main-presenter.js
@@ -1,9 +1,9 @@
-import NewEventsList from "../view/events-list";
-import NewEditPoint from "../view/edit-point";
-import NewCreatePoint from "../view/create-point";
-import NewEventsItem from "../view/events-item";
-import NewSorting from "../view/sorting";
-import { render } from "../render";
+import NewEventsList from '../view/events-list';
+import NewEditPoint from '../view/edit-point';
+import NewCreatePoint from '../view/create-point';
+import NewEventsItem from '../view/events-item';
+import NewSorting from '../view/sorting';
+import { render } from '../render';
 
 const tripEvents = document.querySelector('.trip-events');
 

diff --git a/src/util.js b/src/util.js
@@ -1,5 +1,3 @@
-const getUpperCaseString = (string) => {
-  return string.charAt(0).toUpperCase() + string.slice(1);
-}
+const getUpperCaseString = (string) => string.charAt(0).toUpperCase() + string.slice(1);
 
-export { getUpperCaseString }
+export { getUpperCaseString };
diff --git a/src/view/create-point.js b/src/view/create-point.js
@@ -1,15 +1,4 @@
-import { createElement } from "../render";
-import { getUpperCaseString } from "../util";
-
-const EVENT_TYPES = ['taxi', 'bus', 'train', 'ship', 'drive', 'flight', 'check-in', 'sightseeing', 'restaurant'];
-
-const createEventTypeItem = (eventType) => {
-  return `
-<div class="event__type-item">
-<input id="event-type-${eventType}-1" class="event__type-input  visually-hidden" type="radio" name="event-type" value="${eventType}">
-<label class="event__type-label  event__type-label--${eventType}" for="event-type-${eventType}-1">${getUpperCaseString(eventType)}</label>
-</div>`
-}
+import { createElement } from '../render';
 
 function createNewCreatePointTemplate() {
   return `<li class="trip-events__item">
@@ -173,7 +162,7 @@ function createNewCreatePointTemplate() {
       </section>
     </section>
   </form>
-</li>`
+</li>`;
 }
 export default class NewCreatePoint {
   getTemplate() {

diff --git a/src/view/edit-point.js b/src/view/edit-point.js
@@ -1,5 +1,5 @@
-import { createElement } from "../render";
-import { getUpperCaseString } from "../util";
+import { createElement } from '../render';
+import { getUpperCaseString } from '../util';
 
 const EVENT_TYPES = [
   {
@@ -72,24 +72,20 @@ const EVENT_OFFERS = [
   },
 ];
 
-const createEventTypeItem = (eventType) => {
-  return `
+const createEventTypeItem = (eventType) => `
   <div class="event__type-item">
   <input id="event-type-${eventType.name}-1" class="event__type-input  visually-hidden" type="radio" name="event-type" value="${eventType.name}" ${eventType.state}>
   <label class="event__type-label  event__type-label--${eventType.name}" for="event-type-${eventType.name}-1">${getUpperCaseString(eventType.name)}</label>
-  </div>`
-}
+  </div>`;
 
-const getEventOfferItem = (eventOffer) => {
-  return `<div class="event__offer-${eventOffer.class}">
+const getEventOfferItem = (eventOffer) => `<div class="event__offer-${eventOffer.class}">
   <input class="event__offer-checkbox  visually-hidden" id="event-offer-${eventOffer.class}-1" type="checkbox" name="event-offer-${eventOffer.class}" ${eventOffer.state}>
   <label class="event__offer-label" for="event-offer-${eventOffer.class}-1">
     <span class="event__offer-title">${eventOffer.title}</span>
     &plus;&euro;&nbsp;
     <span class="event__offer-price">${eventOffer.price}</span>
   </label>
-  </div>`
-}
+  </div>`;
 
 function createNewEditPointTemplate() {
   return `<li class="trip-events__item">
@@ -159,7 +155,7 @@ function createNewEditPointTemplate() {
       </section>
     </section>
   </form>
-</li>`
+</li>`;
 }
 
 export default class NewEditPoint {

diff --git a/src/view/events-item.js b/src/view/events-item.js
@@ -1,4 +1,4 @@
-import { createElement } from "../render";
+import { createElement } from '../render';
 
 function createNewEventsItemTemplate() {
   return `<li class="trip-events__item">
@@ -37,7 +37,7 @@ function createNewEventsItemTemplate() {
       <span class="visually-hidden">Open event</span>
     </button>
   </div>
-</li>`
+</li>`;
 }
 
 export default class NewEventsItem {

diff --git a/src/view/events-list.js b/src/view/events-list.js
@@ -1,7 +1,7 @@
-import { createElement } from "../render";
+import { createElement } from '../render';
 
 function createNewEventsListTemplate() {
-  return `<ul class="trip-events__list"></ul>`
+  return '<ul class="trip-events__list"></ul>';
 }
 
 export default class NewEventsList {

diff --git a/src/view/filters.js b/src/view/filters.js
@@ -1,5 +1,5 @@
-import { createElement } from "../render";
-import { getUpperCaseString } from "../util";
+import { createElement } from '../render';
+import { getUpperCaseString } from '../util';
 
 const FILTERS = [
   {
@@ -20,20 +20,16 @@ const FILTERS = [
   }
 ];
 
-const getFiltersItem = (filter) => {
-  return `<div class="trip-filters__filter">
+const getFiltersItem = (filter) => `<div class="trip-filters__filter">
 <input id="filter-${filter.name}" class="trip-filters__filter-input  visually-hidden" type="radio" name="trip-filter" value="${filter.name}" ${filter.state}>
 <label class="trip-filters__filter-label" for="filter-${filter.name}">${getUpperCaseString(filter.name)}</label>
-</div>`
-}
-
-console.log(getFiltersItem(FILTERS[3]))
+</div>`;
 
 function createNewFiltersTemplate() {
   return `<form class="trip-filters" action="#" method="get">
   ${FILTERS.map((filter) => getFiltersItem(filter)).join('')}
   <button class="visually-hidden" type="submit">Accept filter</button>
-</form>`
+</form>`;
 }
 
 export default class NewFilters {

diff --git a/src/view/sorting.js b/src/view/sorting.js
@@ -1,5 +1,5 @@
-import { createElement } from "../render";
-import { getUpperCaseString } from "../util";
+import { createElement } from '../render';
+import { getUpperCaseString } from '../util';
 
 const SORTINGS = [
   {
@@ -24,17 +24,15 @@ const SORTINGS = [
   }
 ];
 
-const getSortingItems = (sorting) => {
-return ` <div class="trip-sort__item  trip-sort__item--${sorting.name}">
+const getSortingItems = (sorting) => ` <div class="trip-sort__item  trip-sort__item--${sorting.name}">
 <input id="sort-${sorting.name}" class="trip-sort__input  visually-hidden" type="radio" name="trip-sort" value="sort-${sorting.name}" ${sorting.state}>
 <label class="trip-sort__btn" for="sort-${sorting.name}">${getUpperCaseString(sorting.name)}</label>
-</div>`
-}
+</div>`;
 
 function createNewSortingTemplate() {
   return `<form class="trip-events__trip-sort  trip-sort" action="#" method="get">
   ${SORTINGS.map((sorting) => getSortingItems(sorting)).join('')}
-  </form>`
+  </form>`;
 }
 
 export default class NewSorting {

diff --git a/src/view/trip-info.js b/src/view/trip-info.js
@@ -1,4 +1,4 @@
-import { createElement } from "../render";
+import { createElement } from '../render';
 
 function createNewTripInfoTemplate() {
   return `<section class="trip-main__trip-info  trip-info">
@@ -11,7 +11,7 @@ function createNewTripInfoTemplate() {
   <p class="trip-info__cost">
     Total: &euro;&nbsp;<span class="trip-info__cost-value">1230</span>
   </p>
-</section>`
+</section>`;
 }
 
 export default class NewTripInfo {