diff --git a/src/components/Route/AddPlace/FromVote/VoteCard/VoteCard.tsx b/src/components/Route/AddPlace/FromVote/VoteCard/VoteCard.tsx index 9bcac2ef..434afc3d 100644 --- a/src/components/Route/AddPlace/FromVote/VoteCard/VoteCard.tsx +++ b/src/components/Route/AddPlace/FromVote/VoteCard/VoteCard.tsx @@ -8,7 +8,7 @@ import styles from './VoteCard.module.scss'; import {useGetVotesResults} from '@/hooks/Votes/vote'; -import {selectedPlaceFromVoteState} from '@/recoil/\bspaces/selectPlace'; +import {selectedPlaceFromVoteState} from '@/recoil/spaces/selectPlace'; import PlaceList from '../PlaceList/PlaceList'; diff --git a/src/components/Route/DayMove/DayMove.tsx b/src/components/Route/DayMove/DayMove.tsx index 4ed911b5..b5d02bb6 100644 --- a/src/components/Route/DayMove/DayMove.tsx +++ b/src/components/Route/DayMove/DayMove.tsx @@ -6,7 +6,7 @@ import styles from './DayMove.module.scss'; import {useDeletePlaces, usePostPlaces} from '@/hooks/Spaces/space'; -import {transformSelectedPlaces} from '@/utils/formatJourneyData'; +import {transformSelectedPlaces} from '@/components/Route/RouteTabPanel/formatJourneyData'; import {DayMoveProps} from '@/types/route'; diff --git a/src/components/Route/DayRoute/DayRoute.tsx b/src/components/Route/DayRoute/DayRoute.tsx index 7d521864..a1b9bde8 100644 --- a/src/components/Route/DayRoute/DayRoute.tsx +++ b/src/components/Route/DayRoute/DayRoute.tsx @@ -9,7 +9,7 @@ import styles from './DayRoute.module.scss'; import BottomSlide from '@/components/BottomSlide/BottomSlide'; -import {editedPlacesState} from '@/recoil/\bspaces/selectPlace'; +import {editedPlacesState} from '@/recoil/spaces/selectPlace'; import {setRouteDate} from '@/utils/formatDate'; import {findShortestPath} from '@/utils/optimizePlace'; diff --git a/src/components/Route/RouteTabPanel/RouteTabPanel.tsx b/src/components/Route/RouteTabPanel/RouteTabPanel.tsx index e0e75644..38a74155 100644 --- a/src/components/Route/RouteTabPanel/RouteTabPanel.tsx +++ b/src/components/Route/RouteTabPanel/RouteTabPanel.tsx @@ -10,10 +10,10 @@ import styles from './RouteTabPanel.module.scss'; import {usePutPlaces} from '@/hooks/Spaces/space'; import BottomSlideLeft from '@/components/BottomSlide/BottomSlideLeft'; +import {handlePlaceSelection, transformSelectedPlaces} from '@/components/Route/RouteTabPanel/formatJourneyData'; import ZoomInIcon from '@/assets/icons/zoomIn.svg?react'; -import {editedPlacesState} from '@/recoil/\bspaces/selectPlace'; -import {handlePlaceSelection, transformSelectedPlaces} from '@/utils/formatJourneyData'; +import {editedPlacesState} from '@/recoil/spaces/selectPlace'; import DayMove from '../DayMove/DayMove'; import DayNavigationBar from '../DayNavigationBar/DayNavigationBar'; diff --git a/src/utils/formatJourneyData.ts b/src/components/Route/RouteTabPanel/formatJourneyData.ts similarity index 98% rename from src/utils/formatJourneyData.ts rename to src/components/Route/RouteTabPanel/formatJourneyData.ts index 5e966c43..1640071a 100644 --- a/src/utils/formatJourneyData.ts +++ b/src/components/Route/RouteTabPanel/formatJourneyData.ts @@ -1,7 +1,13 @@ -// placeSelectionUtils.ts - import {SelectedPlace, TransformedDataItem} from '@/types/route'; +const arePlacesEqual = (place1: SelectedPlace, place2: SelectedPlace) => { + return place1.journeyId === place2.journeyId && place1.selectedId === place2.selectedId; +}; + +const isSelected = (place: SelectedPlace, selectedPlaces: SelectedPlace[]) => { + return selectedPlaces.some((selectedPlace) => arePlacesEqual(selectedPlace, place)); +}; + export const handlePlaceSelection = ( journeyId: number, selectedId: number, @@ -33,11 +39,3 @@ export const transformSelectedPlaces = (selectedPlaces: SelectedPlace[]) => { return result; }, []); }; - -const arePlacesEqual = (place1: SelectedPlace, place2: SelectedPlace) => { - return place1.journeyId === place2.journeyId && place1.selectedId === place2.selectedId; -}; - -const isSelected = (place: SelectedPlace, selectedPlaces: SelectedPlace[]) => { - return selectedPlaces.some((selectedPlace) => arePlacesEqual(selectedPlace, place)); -}; diff --git a/src/pages/AddPlaceFromVote/AddPlaceFromVote.tsx b/src/pages/AddPlaceFromVote/AddPlaceFromVote.tsx index 1bcbd152..cb34517d 100644 --- a/src/pages/AddPlaceFromVote/AddPlaceFromVote.tsx +++ b/src/pages/AddPlaceFromVote/AddPlaceFromVote.tsx @@ -15,7 +15,7 @@ import InProgressVote from '@/components/Route/AddPlace/FromVote/InProgressVote/ import {SelectedPlaces} from '@/components/Route/AddPlace/FromVote/VoteCard/VoteCard'; import BackIcon from '@/assets/back.svg?react'; -import {selectedPlaceFromVoteState} from '@/recoil/\bspaces/selectPlace'; +import {selectedPlaceFromVoteState} from '@/recoil/spaces/selectPlace'; import {Vote} from '@/types/route'; diff --git "a/src/recoil/\bspaces/selectPlace.ts" b/src/recoil/spaces/selectPlace.ts similarity index 100% rename from "src/recoil/\bspaces/selectPlace.ts" rename to src/recoil/spaces/selectPlace.ts diff --git a/src/utils/getSpaceId.ts b/src/utils/getSpaceId.ts deleted file mode 100644 index 06bae521..00000000 --- a/src/utils/getSpaceId.ts +++ /dev/null @@ -1,12 +0,0 @@ -export const getSpaceId = (): number => { - const splitUrl = window.location.pathname.split('/'); - let spaceId; - - if (typeof splitUrl[splitUrl.length - 1] === 'number') { - spaceId = splitUrl[splitUrl.length - 1]; - } else { - spaceId = splitUrl[splitUrl.length - 2]; - } - - return parseInt(spaceId); -};