Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #7 from fed1v/module6-task1
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| import {CityItem} from './city-item.tsx'; | ||
|
|
||
| type CitiesListProps = { | ||
| cityNames: string[]; | ||
| onCityClick: (city: string) => void; | ||
| } | ||
|
|
||
| export function CitiesList({cityNames, onCityClick}: CitiesListProps) { | ||
|
|
||
| return ( | ||
| <section className="locations container"> | ||
| <ul className="locations__list tabs__list"> | ||
| { | ||
| cityNames | ||
| .map((cityName) => ( | ||
| <CityItem | ||
| key={cityName} | ||
| name={cityName} | ||
| onCityClick={onCityClick} | ||
| /> | ||
| )) | ||
| } | ||
| </ul> | ||
| </section> | ||
| ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| type CityItemProps = { | ||
| name: string; | ||
| onCityClick: (city: string) => void; | ||
| } | ||
|
|
||
| export function CityItem({name, onCityClick}: CityItemProps) { | ||
| return ( | ||
| <li | ||
| className="locations__item" | ||
| onClick={() => { | ||
| onCityClick(name); | ||
| }} | ||
| > | ||
| <a className="locations__item-link tabs__item" href="#"> | ||
| <span>{name}</span> | ||
| </a> | ||
| </li> | ||
| ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| import {TypedUseSelectorHook, useDispatch, useSelector} from 'react-redux'; | ||
| import {AppDispatch, State} from '../types/state.ts'; | ||
|
|
||
|
|
||
| export const useAppDispatch = () => useDispatch<AppDispatch>(); | ||
|
|
||
| export const useAppSelector: TypedUseSelectorHook<State> = useSelector; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| import {MutableRefObject, useEffect, useRef, useState} from 'react'; | ||
| import {Nullable} from 'vitest'; | ||
| import leaflet from 'leaflet'; | ||
| import {City} from '../types/city.ts'; | ||
|
|
||
| export function useMap(mapRef: MutableRefObject<HTMLElement | null>, city: City) { | ||
| const [map, setMap] = useState<Nullable<leaflet.Map>>(null); | ||
| const isRenderedRef = useRef(false); | ||
|
|
||
| useEffect( | ||
| () => { | ||
| if (mapRef.current !== null) { | ||
| if (!isRenderedRef.current) { | ||
| const instance = leaflet.map(mapRef.current, { | ||
| center: { | ||
| lat: city.location.latitude, | ||
| lng: city.location.longitude | ||
| }, | ||
| zoom: city.location.zoom | ||
| }); | ||
|
|
||
| leaflet | ||
| .tileLayer( | ||
| 'https://{s}.basemaps.cartocdn.com/rastertiles/voyager/{z}/{x}/{y}{r}.png', | ||
| { | ||
| attribution: '© <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions">CARTO</a>', | ||
| }, | ||
| ) | ||
| .addTo(instance); | ||
|
|
||
| setMap(instance); | ||
| isRenderedRef.current = true; | ||
| } else { | ||
| map?.setView( | ||
| { | ||
| lat: city.location.latitude, | ||
| lng: city.location.longitude | ||
| }, | ||
| city.location.zoom | ||
| ); | ||
| } | ||
| } | ||
| }, [mapRef, city]); | ||
|
|
||
| return map; | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.