Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: trip connect search #287

Merged
merged 1 commit into from
Jan 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ import {Button} from '@chakra-ui/react';
import {useLocation, useNavigate} from 'react-router-dom';
import {useRecoilValue, useSetRecoilState} from 'recoil';

import {usePostPlaces} from '@/hooks/Spaces/space';
import {usePostPlaces, usePostSearchPlaces} from '@/hooks/Spaces/space';

import {selectedPlaceState, selectedTripPlaceState} from '@/recoil/vote/selectPlace';
import {activeTabIndexState} from '@/recoil/spaces/trip';
import {selectedPlaceState, selectedTripPlaceState, selectedTripSearchPlaceState} from '@/recoil/vote/selectPlace';

//prop이나 params로 trip or vote 판별, onClick에 삼항연산자로 함수 넣기
const AddToCandidateButton = () => {
Expand All @@ -18,26 +19,52 @@ const AddToCandidateButton = () => {
const voteId = voteIdArray[1];
const selectedPlaces = useRecoilValue(selectedPlaceState);
const selectedTripPlaces = useRecoilValue(selectedTripPlaceState);
const selectedTripSearchPlace = useRecoilValue(selectedTripSearchPlaceState);
const setTripRecoil = useSetRecoilState(selectedTripPlaceState);
const counts = isInVote ? selectedPlaces.length : selectedTripPlaces.length;
const setTripSearchRecoil = useSetRecoilState(selectedTripSearchPlaceState);
const postPlaces = usePostPlaces();
const path = location.pathname;
const setSelectedTabIndex = useSetRecoilState(activeTabIndexState);
const counts = isInVote
? selectedPlaces.length
: path === '/wishes/bring'
? selectedTripPlaces.length
: selectedTripSearchPlace.length;

const addPlaces = async () => {
await postPlaces.mutateAsync({
spaceId: Number(spaceId),
journeyId: Number(voteId),
placeIds: selectedTripPlaces,
});
navigate(`/trip/${spaceId}`, {state: {id: spaceId}});
setSelectedTabIndex(1);
setTripRecoil([]);
navigate(`/trip/${spaceId}`, {state: {id: spaceId}});
};

const postSearchPlaces = usePostSearchPlaces();

const addSearchPlaces = async () => {
await postSearchPlaces.mutateAsync({
spaceId: Number(spaceId),
journeyId: Number(voteId),
places: selectedTripSearchPlace,
});
navigate(`/trip/${spaceId}`, {state: {id: spaceId}});
setTripSearchRecoil([]);
setSelectedTabIndex(1);
};

const handleAddCandidates = () => {
// 경로 추후 수정
if (isInVote) {
navigate(`/trip/${spaceId}/votes/${voteId}/votememo`, {replace: true});
} else {
addPlaces();
if (path === '/wishes/bring') {
addPlaces();
} else {
addSearchPlaces();
}
}
};
return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import styles from './SelectButton.module.scss';

import useGetSelectedArray from '@/hooks/useGetSelectedArray';

import {selectedPlaceState, selectedTripPlaceState} from '@/recoil/vote/selectPlace';
import {selectedPlaceState, selectedTripPlaceState, selectedTripSearchPlaceState} from '@/recoil/vote/selectPlace';

import {SearchItemType} from '@/types/home';

Expand All @@ -22,7 +22,9 @@ const SelectButton = ({data}: Propstype) => {
const selectedPlaces = useRecoilValue(selectedPlaceState);
const selectedTripPlaces = useRecoilValue(selectedTripPlaceState);
const setRecoil = useSetRecoilState(selectedTripPlaceState);
const setSearchRecoil = useSetRecoilState(selectedTripSearchPlaceState);
const {toggleItemInNewArray} = useGetSelectedArray(selectedPlaceState);
const pathname = location.pathname;

const handleClick = (e: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
console.log(selectedTripPlaces);
Expand All @@ -32,19 +34,35 @@ const SelectButton = ({data}: Propstype) => {
if (isInVote) {
toggleItemInNewArray(data);
} else {
setRecoil((currentArray) => {
const index = currentArray.findIndex((item) => item === data.id);
if (pathname === '/wishes/bring') {
setRecoil((currentArray) => {
const index = currentArray.findIndex((item) => item === data.id);

if (index !== -1) {
const newArray = [...currentArray.slice(0, index), ...currentArray.slice(index + 1)];
console.log('newArray:', newArray);
return newArray;
} else {
const newArray = [...currentArray, data.id];
console.log('newArray:', newArray);
return newArray;
}
});
if (index !== -1) {
const newArray = [...currentArray.slice(0, index), ...currentArray.slice(index + 1)];
console.log('newArray:', newArray);
return newArray;
} else {
const newArray = [...currentArray, data.id];
console.log('newArray:', newArray);
return newArray;
}
});
} else {
setSearchRecoil((currentArray) => {
const index = currentArray.findIndex((item) => item.placeId === data.id);

if (index !== -1) {
const newArray = [...currentArray.slice(0, index), ...currentArray.slice(index + 1)];
console.log('newArray:', newArray);
return newArray;
} else {
const newArray = [...currentArray, {placeId: data.id, contentTypeId: data.contentTypeId}];
console.log('newArray:', newArray);
return newArray;
}
});
}
}
};

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
@use "@/sass" as *;
@use '@/sass' as *;

.container {
@include slide_button_container;

.slide_box {
padding: 0 20px;
@include slide_list_container;
gap: 8px;

Expand Down
6 changes: 6 additions & 0 deletions src/recoil/vote/selectPlace.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,9 @@ export const selectedTripPlaceState = atom<number[]>({
default: [],
effects_UNSTABLE: [persistAtom],
});

export const selectedTripSearchPlaceState = atom<{placeId: number; contentTypeId: number}[]>({
key: 'selectedTripPlaceState',
default: [],
effects_UNSTABLE: [persistAtom],
});
Loading