Merge pull request #15 from WhiteShark23/master

Author: keksobot

package-lock.json

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

package.json

@@ -0,0 +1,8 @@
+import ApiService from '../framework/api-service.js';
+
+export default class DestinationsApiService extends ApiService {
+  get destinations() {
+    return this._load({url: 'destinations'})
+      .then(ApiService.parseResponse);
+  }
+}

src/api/destinations-api-service.js

@@ -0,0 +1,8 @@
+import ApiService from '../framework/api-service.js';
+
+export default class OfferssApiService extends ApiService {
+  get offers() {
+    return this._load({url: 'offers'})
+      .then(ApiService.parseResponse);
+  }
+}

src/api/offers-api-service.js

@@ -0,0 +1,67 @@
+import ApiService from '../framework/api-service.js';
+
+const Method = {
+  GET: 'GET',
+  PUT: 'PUT',
+  POST: 'POST',
+  DELETE: 'DELETE',
+};
+
+export default class PointsApiService extends ApiService {
+  get points() {
+    return this._load({url: 'points'})
+      .then(ApiService.parseResponse);
+  }
+
+  async updatePoint(point) {
+    const response = await this._load({
+      url: `points/${point.id}`,
+      method: Method.PUT,
+      body: JSON.stringify(this.#adaptedToServer(point)),
+      headers: new Headers({'Content-Type': 'application/json'}),
+    });
+
+    const parsedResponse = await ApiService.parseResponse(response);
+
+    return parsedResponse;
+  }
+
+  async addPoint(point) {
+    const response = await this._load({
+      url: 'points',
+      method: Method.POST,
+      body: JSON.stringify(this.#adaptedToServer(point)),
+      headers: new Headers({'Content-Type': 'application/json'}),
+    });
+
+    const parsedResponse = await ApiService.parseResponse(response);
+
+    return parsedResponse;
+  }
+
+  async deletePoint(point) {
+    const response = await this._load({
+      url: `points/${point.id}`,
+      method: Method.DELETE,
+    });
+
+    return response;
+  }
+
+  #adaptedToServer(point) {
+    const apdatedPoint = {
+      ...point,
+      'date_to': point.dateTo,
+      'date_from': point.dateFrom,
+      'is_favorite': point.isFavorite,
+      'base_price': Number(point.basePrice),
+    };
+
+    delete apdatedPoint.dateTo;
+    delete apdatedPoint.dateFrom;
+    delete apdatedPoint.isFavorite;
+    delete apdatedPoint.basePrice;
+
+    return apdatedPoint;
+  }
+}

src/api/point-api-service.js

@@ -1,14 +1,14 @@
 export const SortType = {
-  DEFAULT: 'default',
+  DAY: 'day',
   PRICE: 'price',
   TIME: 'time',
 };
 
 export const FilterType = {
-  EVERYTHING: 'EVERYTHING',
-  FUTURE: 'FUTURE',
-  PRESENT: 'PRESENT',
-  PAST: 'PAST',
+  EVERYTHING: 'everything',
+  FUTURE: 'future',
+  PRESENT: 'present',
+  PAST: 'past',
 };
 
 export const UserAction = {
@@ -21,4 +21,5 @@ export const UpdateType = {
   PATCH: 'PATCH',
   MINOR: 'MINOR',
   MAJOR: 'MAJOR',
+  INIT: 'INIT',
 };

src/const.js

@@ -4,11 +4,22 @@ 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';
+import PointsApiService from './api/point-api-service.js';
+import DestinationsApiService from './api/destinations-api-service.js';
+import OfferssApiService from './api/offers-api-service.js';
+
+const AUTHORIZATION = 'Basic sa2sfr33wcr1sa2j';
+const END_POINT = 'https://22.objects.htmlacademy.pro/big-trip';
 
 const siteTripEventsElement = document.querySelector('.trip-events');
 const siteTripMainControlsElement = document.querySelector('.trip-main__trip-controls');
+const pointsModel = new PointModel({
+  pointsApiService: new PointsApiService(END_POINT, AUTHORIZATION),
+  destinationsApiService: new DestinationsApiService(END_POINT, AUTHORIZATION),
+  offerssApiService: new OfferssApiService(END_POINT, AUTHORIZATION),
+});
+
 
-const pointsModel = new PointModel();
 const filterModel = new FilterModel();
 const newEditButtonComponent = new NewEditButtonView({
   onClick: handleNewEditButtonClick,
@@ -39,5 +50,9 @@ function handleNewEditButtonClick() {
 
 render(newEditButtonComponent, siteTripMainControlsElement, RenderPosition.AFTEREND);
 
+pointsModel.init()
+  .finally(() => {
+    render(newEditButtonComponent, siteTripMainControlsElement, RenderPosition.AFTEREND);
+  });
 filterPresenter.init();
 boardPresenter.init();