Merge pull request #16 from PavelUd/master

src/const.js

@@ -4,6 +4,8 @@ export const DESTINATION_COUNT = 5;
 
 export const POINT_COUNT = 5;
 
+const DEFAULT_TYPE = 'flight';
+
 export const Mode = {
   DEFAULT: 'default',
   EDITING: 'editing',
@@ -84,14 +86,21 @@ export const EnabledSortType = {
   [POINT_SORTS.OFFERS]: false
 };
 
+export const EmptyListMessage = {
+  [FILTER_TYPES.EVERYTHING]: 'Click New Event to create your first point',
+  [FILTER_TYPES.FUTURE]: 'There are no future events now',
+  [FILTER_TYPES.PRESENT]: 'There are no present events now',
+  [FILTER_TYPES.PAST]: 'There are no past events now'
+};
+
 export const POINT_EMPTY = {
   basePrice: 0,
   dateFrom: null,
   dateTo: null,
   destination: null,
   isFavorite: false,
   offers: [],
-  type: null,
+  type: DEFAULT_TYPE,
 };
 
 const SEC_IN_MIN = 60;

src/main.js

@@ -1,9 +1,8 @@
-import TripInfoView from './view/trip-info-view.js';
-import {render, RenderPosition} from '../src/framework/render.js';
 import BoardPresenter from './presenter/board-presenter.js';
 import DestinationsModel from './model/destinations-model.js';
 import OffersModel from './model/offers-model.js';
 import PointsModel from './model/point-model.js';
+import TripInfoPresenter from './presenter/trip-info-presenter.js';
 import PointsApiService from './service/points-api-service.js';
 import FilterModel from './model/filter-model.js';
 import FilterPresenter from './presenter/filter-presenter.js';
@@ -24,7 +23,14 @@ const pointsModel = new PointsModel({service : service, destinationsModel : dest
 const filterModel = new FilterModel();
 
 const newPointButtonPresenter = new NewPointButtonPresenter({
-  container: tripEventsContainer
+  container: siteMainContainer
+});
+
+const tripInfoPresenter = new TripInfoPresenter({
+  container: siteMainContainer,
+  pointsModel,
+  destinationsModel,
+  offersModel,
 });
 
 const boardPresenter = new BoardPresenter({
@@ -42,13 +48,10 @@ const filterPresenter = new FilterPresenter({
   filterModel,
 });
 
-
-render(new TripInfoView(), siteMainContainer, RenderPosition.AFTERBEGIN);
-
-newPointButtonPresenter.init({
-  onButtonClick:boardPresenter.handleNewPointClick
-});
-
 pointsModel.init();
 filterPresenter.init();
 boardPresenter.init();
+newPointButtonPresenter.init({
+  onButtonClick:boardPresenter.handleNewPointClick
+});
+tripInfoPresenter.init();

src/model/point-model.js

@@ -1,5 +1,5 @@
 import Observable from '../framework/observable';
-import { updateItem } from '../mock/util.js';
+import { updateItem } from '../utils/common.js';
 import {UpdateType} from '../const.js';
 import { adaptToClient, adaptToServer } from '../utils/adapter.js';
 

src/presenter/board-presenter.js

@@ -1,10 +1,11 @@
 import EventListView from '../view/event-list-view';
 import EmptyView from '../view/empty-view';
+import ErrorView from '../view/error-view.js';
 import PointPresenter from './point-presenter';
 import NewPointPresenter from './new-point-presenter';
 import SortPresenter from './sort-presenter';
 import {remove, render, RenderPosition} from '../framework/render';
-import { filter, sort } from '../utils/utils';
+import { filter, sort } from '../utils/common.js';
 import LoadingView from '../view/load-view.js';
 import UiBlocker from '../framework/ui-blocker/ui-blocker.js';
 import {FILTER_TYPES, POINT_SORTS, UpdateType, UserAction} from '../const.js';
@@ -19,6 +20,7 @@ export default class BoardPresenter {
   #emptyListElement = null;
   #loadingElement = new LoadingView();
   #eventListElement = new EventListView();
+  #errorElement = new ErrorView();
   #pointPresenters = new Map();
   #destinationsModel;
   #offersModel;
@@ -68,16 +70,15 @@ export default class BoardPresenter {
   }
 
   #renderBoard = () =>{
-
-    if (this.#isLoading) {
-      this.#renderLoader();
-      return;
-    }
-
     if (this.#isError) {
+      this.#renderError();
       this.#clearBoard({ resetSortType: true });
       return;
     }
+    if (this.#isLoading) {
+      this.#renderLoader();
+      return;
+    }
 
     if (!this.points.length && !this.#isCreating) {
       this.#renderEmptyList();
@@ -96,6 +97,10 @@ export default class BoardPresenter {
     render(this.#emptyListElement, this.#container);
   };
 
+  #renderError = () => {
+    render(this.#errorElement, this.#container, RenderPosition.AFTERBEGIN);
+  };
+
   #clearBoard = ({resetSortType = false} = {}) => {
     this.#clearTaskList();
     remove(this.#emptyListElement);
@@ -132,7 +137,7 @@ export default class BoardPresenter {
       destinationsModel: this.#destinationsModel,
       offersModel: this.#offersModel,
       onPointsChange: this.#onPointChangeHandler,
-      handleModeChange: this.#modelEventHandler
+      handleModeChange: this.#handleModeChange
     });
     pointPresenter.init(point);
     this.#pointPresenters.set(point.id, pointPresenter);
@@ -174,6 +179,7 @@ export default class BoardPresenter {
   #clearTaskList = () => {
     this.#pointPresenters.forEach((presenter) => presenter.destroy());
     this.#pointPresenters.clear();
+    this.#newPointPresenter.destroy();
   };
 
   #handleSortChange = (sortType) => {
@@ -189,14 +195,17 @@ export default class BoardPresenter {
           this.#isError = true;
         } else {
           this.#isLoading = false;
+          this.#isError = false;
           remove(this.#loadingElement);
         }
         this.#renderBoard();
         break;
       case UpdateType.PATCH:
         this.#pointPresenters.get(data.id).init(data);
+        this.#pointPresenters.get(data.id).resetView();
         break;
       case UpdateType.MINOR:
+
         this.#clearBoard();
         this.#renderBoard();
         break;
@@ -207,6 +216,11 @@ export default class BoardPresenter {
     }
   };
 
+  #handleModeChange = () => {
+    this.#pointPresenters.forEach((presenter) => presenter.resetView());
+    this.#newPointPresenter.destroy();
+  };
+
   handleNewPointClick = () => {
     this.#isCreating = true;
     this.#currentSortType = POINT_SORTS.DAY;

src/presenter/filter-presenter.js

@@ -1,6 +1,6 @@
 import { UpdateType } from '../const';
 import { render, replace, remove } from '../framework/render';
-import { filter } from '../utils/utils.js';
+import { filter } from '../utils/common.js';
 import FilterView from '../view/filter-view';
 
 export default class FilterPresenter {
@@ -35,7 +35,6 @@ export default class FilterPresenter {
     const prevFilterElement = this.#filterElement;
 
     const filters = this.filters;
-
     this.#filterElement = new FilterView({
       items: filters,
       onItemChange: this.#onChangeFilter,

src/presenter/new-point-presenter.js

@@ -59,8 +59,6 @@ export default class NewPointPresenter {
       UpdateType.MINOR,
       point
     );
-
-    this.destroy({ isCanceled: false });
   };
 
   setSaving = () => {
@@ -70,17 +68,17 @@ export default class NewPointPresenter {
     });
   };
 
-  setAborting = () => {
-    this.#newPointElement.shake(this.#resetFormState);
-  };
+  setAborting() {
+    const resetFormState = () => {
+      this.#newPointElement.updateElement({
+        isDisabled: false,
+        isSaving: false,
+        isDeleting: false,
+      });
+    };
 
-  #resetFormState = () => {
-    this.#newPointElement.updateElement({
-      isDisabled: false,
-      isSaving: false,
-      isDeleting: false,
-    });
-  };
+    this.#newPointElement.shake(resetFormState);
+  }
 
   #onCloseForm = () => {
     this.destroy();