Merge pull request #12 from WhiteShark23/module7-task1

Author: keksobot

package-lock.json

@@ -34,6 +34,7 @@
   },
   "dependencies": {
     "dayjs": "1.11.7",
-    "flatpickr": "4.6.13"
+    "flatpickr": "4.6.13",
+    "nanoid": "^5.1.6"
   }
 }

package.json

@@ -22,7 +22,7 @@ <h2 class="visually-hidden">Filter events</h2>
             </div>
           </div>
 
-          <button class="trip-main__event-add-btn  btn  btn--big  btn--yellow" type="button">New event</button>
+
         </div>
       </div>
     </header>

public/index.html

@@ -3,3 +3,22 @@ export const SortType = {
   PRICE: 'price',
   TIME: 'time',
 };
+
+export const FilterType = {
+  EVERYTHING: 'EVERYTHING',
+  FUTURE: 'FUTURE',
+  PRESENT: 'PRESENT',
+  PAST: 'PAST',
+};
+
+export const UserAction = {
+  UPDATE_POINT: 'UPDATE_POINT',
+  ADD_POINT: 'ADD_POINT',
+  DELETE_POINT: 'DELETE_POINT',
+};
+
+export const UpdateType = {
+  PATCH: 'PATCH',
+  MINOR: 'MINOR',
+  MAJOR: 'MAJOR',
+};

src/const.js

@@ -1,14 +1,43 @@
 import BoardPresenter from './presenter/board-presenter.js';
 import PointModel from './model/points-model.js';
+import FilterPresenter from './presenter/filter-presenter.js';
+import FilterModel from './model/filter-model.js';
+import NewEditButtonView from './view/new-edit-button-view.js';
+import { render, RenderPosition } from './framework/render.js';
 
 const siteTripEventsElement = document.querySelector('.trip-events');
+const siteTripMainControlsElement = document.querySelector('.trip-main__trip-controls');
 
 const pointsModel = new PointModel();
-
+const filterModel = new FilterModel();
+const newEditButtonComponent = new NewEditButtonView({
+  onClick: handleNewEditButtonClick,
+});
 
 const boardPresenter = new BoardPresenter({
   boardContainer: siteTripEventsElement,
   pointsModel,
+  filterModel,
+  onNewEditDestroy: handleNewEditFormClose,
+});
+
+const filterPresenter = new FilterPresenter({
+  filterContainer: siteTripMainControlsElement,
+  filterModel,
+  pointsModel,
 });
 
+function handleNewEditFormClose() {
+  boardPresenter.checkNoEvent();
+  newEditButtonComponent.element.disabled = false;
+}
+
+function handleNewEditButtonClick() {
+  boardPresenter.createEdit();
+  newEditButtonComponent.element.disabled = true;
+}
+
+render(newEditButtonComponent, siteTripMainControlsElement, RenderPosition.AFTEREND);
+
+filterPresenter.init();
 boardPresenter.init();

src/main.js

@@ -95,5 +95,9 @@ export const offers = [
   {
     type: 'check-in',
     offers: []
+  },
+  {
+    type: 'flight',
+    offers: []
   }
 ];

src/mocks/offers.js

@@ -0,0 +1,15 @@
+import Observable from '../framework/observable.js';
+import {FilterType} from '../const.js';
+
+export default class FilterModel extends Observable {
+  #filter = FilterType.EVERYTHING;
+
+  get filter() {
+    return this.#filter;
+  }
+
+  setFilter(updateType, filter) {
+    this.#filter = filter;
+    this._notify(updateType, filter);
+  }
+}

src/model/filter-model.js

@@ -1,8 +1,9 @@
 import { destinations } from '../mocks/destinations.js';
 import { offers } from '../mocks/offers.js';
 import { points } from '../mocks/points.js';
+import Observable from '../framework/observable.js';
 
-export default class PointModel {
+export default class PointModel extends Observable {
   points = points;
   offers = offers;
   destinations = destinations;
@@ -36,4 +37,44 @@ export default class PointModel {
 
     return allDestinations.find((item) => item.id === id);
   }
+
+  updatePoint(updateType, update) {
+    const index = this.points.findIndex((point) => point.id === update.id);
+
+    if (index === -1) {
+      throw new Error('Can\'t update unexisting task');
+    }
+
+    this.points = [
+      ...this.points.slice(0, index),
+      update,
+      ...this.points.slice(index + 1),
+    ];
+
+    this._notify(updateType, update);
+  }
+
+  addPoint(updateType, update) {
+    this.points = [
+      update,
+      ...this.points,
+    ];
+
+    this._notify(updateType, update);
+  }
+
+  deletePoint(updateType, update) {
+    const index = this.points.findIndex((point) => point.id === update.id);
+
+    if (index === -1) {
+      throw new Error('Can\'t delete unexisting task');
+    }
+
+    this.points = [
+      ...this.points.slice(0, index),
+      ...this.points.slice(index + 1),
+    ];
+
+    this._notify(updateType);
+  }
 }