Контроль и ограничения (часть 2)

src/components/cards-sorting-options/cards-sorting-options.tsx

@@ -0,0 +1,28 @@
+import React from 'react';
+import { useAppDispatch, useAppSelector } from '../../hooks';
+import { filters } from '../../utils';
+import { changeSortOptions } from '../../store/action';
+
+function CardsSortingOptions(): JSX.Element {
+  const chosenSortType = useAppSelector((state) => state.sortType);
+  const dispatch = useAppDispatch();
+  const [isSortOpened, setIsSortOpened] = React.useState(false);
+  return (
+    <form className="places__sorting" action="#" method="get">
+      <span className="places__sorting-caption">Sort by</span>
+      <span className="places__sorting-type" tabIndex={0} onClick={() => setIsSortOpened(!isSortOpened)}>
+        {chosenSortType}
+        <svg className="places__sorting-arrow" width="7" height="4">
+          <use xlinkHref="#icon-arrow-select"></use>
+        </svg>
+      </span>
+      <ul className={`places__options places__options--custom ${(isSortOpened) ? 'places__options--opened' : ''}`}>
+        <li className={`places__option ${(chosenSortType === filters.POPULAR) ? 'places__option--active' : ''}`} tabIndex={0} onClick={() => dispatch(changeSortOptions(filters.POPULAR))}>Popular</li>
+        <li className={`places__option ${(chosenSortType === filters.LOW_TO_HIGH) ? 'places__option--active' : ''}`} tabIndex={0} onClick={() => dispatch(changeSortOptions(filters.LOW_TO_HIGH))}>Price: low to high</li>
+        <li className={`places__option ${(chosenSortType === filters.HIGH_TO_LOW) ? 'places__option--active' : ''}`} tabIndex={0} onClick={() => dispatch(changeSortOptions(filters.HIGH_TO_LOW))}>Price: high to low</li>
+        <li className={`places__option ${(chosenSortType === filters.TOP_RATED) ? 'places__option--active' : ''}`} tabIndex={0} onClick={() => dispatch(changeSortOptions(filters.TOP_RATED))}>Top rated first</li>
+      </ul>
+    </form>
+  );
+}
+export default CardsSortingOptions;

src/components/map/map.tsx

@@ -1,19 +1,32 @@
 import React, { useEffect } from 'react';
-import { Marker, layerGroup } from 'leaflet';
+import { Icon, Marker, layerGroup } from 'leaflet';
 import useMap from '../../hooks/use-map';
-import { City } from '../../types/city';
 import { Point } from '../../types/point';
 import 'leaflet/dist/leaflet.css';
+import { useAppSelector } from '../../hooks';
+import { URL_MARKER_CURRENT, URL_MARKER_STANDART } from '../../const';
 
 type MapProps = {
-  city: City;
   points: Point[];
-  selectedPoint?: Point;
 }
 
+const currentIcon = new Icon({
+  iconUrl: URL_MARKER_CURRENT,
+  iconSize: [32, 32],
+  iconAnchor: [20, 40]
+});
+
+const standartIcon = new Icon({
+  iconUrl: URL_MARKER_STANDART,
+  iconSize: [32, 32],
+  iconAnchor: [20, 40]
+});
+
 function Map(props: MapProps): JSX.Element {
-  const {city, points, selectedPoint} = props;
+  const city = useAppSelector((state) => state.city);
+  const highlightedMarker = useAppSelector((state) => state.highlightedMarker);
 
+  const {points} = props;
   const mapRef = React.useRef(null);
   const map = useMap(mapRef, city);
 
@@ -25,15 +38,22 @@ function Map(props: MapProps): JSX.Element {
           lat: point.lat,
           lng: point.lng
         });
+        let icon;
+        if (point === highlightedMarker) {
+          icon = currentIcon;
+        } else {
+          icon = standartIcon;
+        }
         marker
+          .setIcon(icon)
           .addTo(markerLayer);
       });
-
+      map.setView([city.lat, city.lng], 11);
       return () => {
         map.removeLayer(markerLayer);
       };
     }
-  }, [map, points, selectedPoint]);
+  }, [map, points, highlightedMarker, city]);
 
   return <div style={{height: '100%'}} ref={mapRef}></div>;
 }

src/components/offer-card/offer-card.tsx

@@ -1,3 +1,5 @@
+import { useAppDispatch } from '../../hooks';
+import { changeHighlightedMarker } from '../../store/action';
 import { Offer } from '../../types/offer';
 import { Link } from 'react-router-dom';
 
@@ -7,8 +9,12 @@ type OfferProps = {
 }
 
 function OfferCard({offer, cardType}: OfferProps): JSX.Element {
+  const dispatch = useAppDispatch();
   return (
-    <article className={cardType}>
+    <article className={cardType}
+      onMouseEnter={() => dispatch(changeHighlightedMarker(offer.point))}
+      onMouseLeave={() => dispatch(changeHighlightedMarker(undefined))}
+    >
       {offer.isPremium ? (
         <div className="place-card__mark">
           <span>Premium</span>

src/components/offer-list/offer-list.tsx

@@ -1,4 +1,5 @@
-import { listToCard, typeOfCardList } from '../../const';
+import { getSortedOffers, listToCard, typeOfCardList } from '../../utils';
+import { useAppSelector } from '../../hooks';
 import { Offer } from '../../types/offer';
 import OfferCard from '../offer-card/offer-card';
 
@@ -8,10 +9,11 @@ type OfferListProps = {
 };
 
 function OfferList({offers, listType}: OfferListProps): JSX.Element {
+  const chosenSortType = useAppSelector((state) => state.sortType);
   const type = listToCard.get(listType);
   return (
     <div className={(listType)}>
-      {offers.map((offer) => (
+      {getSortedOffers(offers, chosenSortType)?.map((offer) => (
         <OfferCard key={offer.id} offer={offer} cardType={(type !== undefined) ? type : 'cities__card place-card'}/>
       ))}
     </div>

src/const.ts

@@ -1,7 +1,3 @@
-export const Settings = {
-  placesCount: 55,
-} as const;
-
 export enum AppRoute {
   Main = '/',
   Login = '/login',
@@ -15,16 +11,8 @@ export enum AuthorizationStatus {
   Unknown = 'UNKNOWN',
 }
 
-export enum typeOfCardList {
-  favourites = 'favorites__places',
-  nearest = 'near-places__list places__list',
-  standart = 'cities__places-list places__list tabs__content',
-}
+export const URL_MARKER_CURRENT =
+  '/img/pin-active.svg';
 
-export const listToCard = new Map(
-  [
-    [typeOfCardList.favourites, 'favorites__card place-card'],
-    [typeOfCardList.nearest, 'near-places__card place-card'],
-    [typeOfCardList.standart, 'cities__card place-card']
-  ]
-);
+export const URL_MARKER_STANDART =
+  '/img/pin.svg';

src/mocks/cities.ts

@@ -3,18 +3,18 @@ import { City } from '../types/city';
 export const CITIES: City[] = [
   {
     title: 'Paris',
-    lat: 52.3740300,
-    lng: 4.8896900
+    lat: 48.864716,
+    lng: 2.349014
   },
   {
     title: 'Brussels',
-    lat: 52.3740300,
-    lng: 4.8896900
+    lat: 50.85034,
+    lng: 4.35171
   },
   {
     title: 'Cologne',
-    lat: 52.3740300,
-    lng: 4.8896900
+    lat: 50.935173,
+    lng: 6.953101
   },
   {
     title: 'Amsterdam',
@@ -23,12 +23,12 @@ export const CITIES: City[] = [
   },
   {
     title: 'Hamburg',
-    lat: 52.3740300,
-    lng: 4.8896900
+    lat: 53.551086,
+    lng: 9.993682
   },
   {
     title: 'Dusseldorf',
-    lat: 52.3740300,
-    lng: 4.8896900
+    lat: 51.233334,
+    lng: 6.783333
   },
 ];

src/mocks/offers.ts

@@ -27,7 +27,7 @@ export const OFFERS: Offer[] = [
     isFavorite: true,
     rating: 4,
     reviews: [REVIEWS[1]],
-    city: CITIES[1],
+    city: CITIES[0],
     point: POINTS[1]
   },
   {

src/mocks/points.ts

@@ -2,16 +2,16 @@ import { Point } from '../types/point';
 
 export const POINTS: Point[] = [
   {
-    lat: 52.3909553943508,
-    lng: 4.85309666406198
+    lat: 48.856716,
+    lng: 2.369014
   },
   {
-    lat: 52.3609553943508,
-    lng: 4.85309666406198
+    lat: 48.876716,
+    lng: 2.349014
   },
   {
-    lat: 52.3909553943508,
-    lng: 4.929309666406198
+    lat: 48.826716,
+    lng: 2.319014
   },
   {
     lat: 52.3809553943508,

src/pages/favorites-screen/favorites-screen.tsx

@@ -1,6 +1,6 @@
 import { Offer } from '../../types/offer';
 import { Link } from 'react-router-dom';
-import { typeOfCardList } from '../../const';
+import { typeOfCardList } from '../../utils';
 import OfferList from '../../components/offer-list/offer-list';
 
 type FavoritesScreenProps = {

src/pages/main-screen/main-screen.tsx

@@ -1,9 +1,10 @@
 import OfferList from '../../components/offer-list/offer-list';
 import { Link } from 'react-router-dom';
 import Map from '../../components/map/map';
-import { typeOfCardList } from '../../const';
+import { typeOfCardList } from '../../utils';
 import { useAppSelector } from '../../hooks';
 import CityList from '../../components/city-list/city-list';
+import CardsSortingOptions from '../../components/cards-sorting-options/cards-sorting-options';
 
 function MainScreen(): JSX.Element {
   const [city, offers] = useAppSelector((state) => [state.city, state.offers]);
@@ -55,26 +56,12 @@ function MainScreen(): JSX.Element {
             <section className="cities__places places">
               <h2 className="visually-hidden">Places</h2>
               <b className="places__found">{chosenOffers.length} places to stay in {city.title}</b>
-              <form className="places__sorting" action="#" method="get">
-                <span className="places__sorting-caption">Sort by</span>
-                <span className="places__sorting-type" tabIndex={0}>
-                  Popular
-                  <svg className="places__sorting-arrow" width="7" height="4">
-                    <use xlinkHref="#icon-arrow-select"></use>
-                  </svg>
-                </span>
-                <ul className="places__options places__options--custom places__options--opened">
-                  <li className="places__option places__option--active" tabIndex={0}>Popular</li>
-                  <li className="places__option" tabIndex={0}>Price: low to high</li>
-                  <li className="places__option" tabIndex={0}>Price: high to low</li>
-                  <li className="places__option" tabIndex={0}>Top rated first</li>
-                </ul>
-              </form>
+              <CardsSortingOptions/>
               <OfferList offers={chosenOffers} listType={typeOfCardList.standart}/>
             </section>
             <div className="cities__right-section">
               <section className="cities__map map">
-                <Map points={points} city={city} selectedPoint={undefined}/>
+                <Map points={points}/>
               </section>
             </div>
           </div>

src/pages/offer-screen/offer-screen.tsx

@@ -2,11 +2,10 @@ import { Link } from 'react-router-dom';
 import ReviewsList from '../../components/reviews-list/reviews-list';
 import { OFFERS } from '../../mocks/offers';
 import { Offer } from '../../types/offer';
-import { CITIES } from '../../mocks/cities';
 import { POINTS } from '../../mocks/points';
 import Map from '../../components/map/map';
 import OfferList from '../../components/offer-list/offer-list';
-import { typeOfCardList } from '../../const';
+import { typeOfCardList } from '../../utils';
 
 type OfferScreenProps = {
   offer: Offer;
@@ -168,7 +167,7 @@ function OfferScreen({offer}: OfferScreenProps): JSX.Element {
             </div>
           </div>
           <section className="offer__map map">
-            <Map points={[POINTS[0], POINTS[1], POINTS[2]]} city={CITIES[1]} selectedPoint={undefined}/>
+            <Map points={[POINTS[0], POINTS[1], POINTS[2]]}/>
           </section>
         </section>
         <div className="container">

src/store/action.ts

@@ -1,8 +1,17 @@
 import { createAction } from '@reduxjs/toolkit';
 import { City } from '../types/city';
+import { Point } from '../types/point';
 
 export const getOffers = createAction('OFFERS_GET');
 
 export const changeCity = createAction('CITY_CHANGE', (value: City) => ({
   payload: value
 }));
+
+export const changeSortOptions = createAction('CHANGE_SORT_OPTIONS', (value: string) => ({
+  payload: value
+}));
+
+export const changeHighlightedMarker = createAction('CHANGE_HIGHLIGHTED_MARKER', (value: Point | undefined) => ({
+  payload: value
+}));

src/store/reducer.ts

@@ -3,16 +3,23 @@ import { CITIES } from '../mocks/cities';
 import { OFFERS } from '../mocks/offers';
 import { City } from '../types/city';
 import { Offer } from '../types/offer';
-import { changeCity, getOffers } from './action';
+import { changeCity, changeHighlightedMarker, changeSortOptions, getOffers } from './action';
+import { filters } from '../utils';
+import { Point } from '../types/point';
+
 
 type StateType = {
     city: City;
     offers: Offer[];
+    sortType: string;
+    highlightedMarker?: Point;
   }
 
 const initialState: StateType = {
   city: CITIES[0],
-  offers: OFFERS
+  offers: OFFERS,
+  sortType: filters.POPULAR,
+  highlightedMarker: undefined
 };
 
 const reducer = createReducer(initialState, (builder) => {
@@ -22,6 +29,12 @@ const reducer = createReducer(initialState, (builder) => {
     })
     .addCase(changeCity, (state, action) => {
       state.city = action.payload;
+    })
+    .addCase(changeSortOptions, (state, action) => {
+      state.sortType = action.payload;
+    })
+    .addCase(changeHighlightedMarker, (state, action) => {
+      state.highlightedMarker = action.payload;
     });
 });