From bb5c761f532680ff4da4455d23d0334a20a22f42 Mon Sep 17 00:00:00 2001 From: Yamyam-code Date: Sun, 28 Jan 2024 23:46:31 +0900 Subject: [PATCH 1/3] Fix: no obs in category --- src/components/SearchFromHome/SearchList/SearchList.tsx | 4 +++- src/pages/SearchFromHome/SearchFromHome.tsx | 6 ------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/components/SearchFromHome/SearchList/SearchList.tsx b/src/components/SearchFromHome/SearchList/SearchList.tsx index beac9d6a..bfab4508 100644 --- a/src/components/SearchFromHome/SearchList/SearchList.tsx +++ b/src/components/SearchFromHome/SearchList/SearchList.tsx @@ -134,7 +134,9 @@ function SearchList({forSearch}: PropsType) { 검색 결과가 없습니다. )} - {filterData && filterData?.length > 0 && !isEnd && } + {filterData && filterData?.length > 0 && !isEnd && forSearch.category === 0 && ( + + )} {forSearch.placeID !== 'undefined' ? ( diff --git a/src/pages/SearchFromHome/SearchFromHome.tsx b/src/pages/SearchFromHome/SearchFromHome.tsx index 03f3cb6d..454127d4 100644 --- a/src/pages/SearchFromHome/SearchFromHome.tsx +++ b/src/pages/SearchFromHome/SearchFromHome.tsx @@ -44,8 +44,6 @@ function SearchFromHome() { querystring.hot ) { if (!querystring.placeID && !querystring.tripDate) { - console.log(1); - setForSearch({ keyword: querystring.keyword === '없음' ? '' : querystring.keyword, category: parseInt(querystring.category), @@ -58,8 +56,6 @@ function SearchFromHome() { }); } if (querystring.placeID && !querystring.tripDate) { - console.log(2); - setForSearch({ keyword: querystring.keyword === '없음' ? '' : querystring.keyword, category: parseInt(querystring.category), @@ -72,8 +68,6 @@ function SearchFromHome() { }); } if (querystring.placeID && querystring.tripDate) { - console.log(3); - setForSearch({ keyword: querystring.keyword === '없음' ? '' : querystring.keyword, category: parseInt(querystring.category), From bed786db990013f58efa9160fd47f1d89db90ae4 Mon Sep 17 00:00:00 2001 From: Yamyam-code Date: Mon, 29 Jan 2024 00:09:35 +0900 Subject: [PATCH 2/3] Fix: change wish null icon --- src/assets/homeIcons/search/favoriteNull.svg | 10 ++++++++++ src/pages/Wishes/Wishes.tsx | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 src/assets/homeIcons/search/favoriteNull.svg diff --git a/src/assets/homeIcons/search/favoriteNull.svg b/src/assets/homeIcons/search/favoriteNull.svg new file mode 100644 index 00000000..f2c52a86 --- /dev/null +++ b/src/assets/homeIcons/search/favoriteNull.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/pages/Wishes/Wishes.tsx b/src/pages/Wishes/Wishes.tsx index 9a96c3b6..fda44dc5 100644 --- a/src/pages/Wishes/Wishes.tsx +++ b/src/pages/Wishes/Wishes.tsx @@ -11,7 +11,7 @@ import Tabs from '@/components/SearchFromHome/SearchList/Tabs/Tabs'; import WishesHeader from '@/components/WishItem/WishesHeader/WishesHeader'; import {getUserWishes} from '@/api/wishes'; -import SearchNull from '@/assets/homeIcons/search/searchNull.svg?react'; +import SearchNull from '@/assets/homeIcons/search/favoriteNull.svg?react'; import {translateLocation} from '@/utils/translateSearchData'; import WishItem from '../../components/WishItem/WishItem'; From 157376c70fddd74e215c685503a54c6903fd2743 Mon Sep 17 00:00:00 2001 From: Yamyam-code Date: Mon, 29 Jan 2024 00:48:28 +0900 Subject: [PATCH 3/3] Fix: change wish null icon --- .../SearchList/SearchItem/SearchItem.tsx | 13 +++++++++++-- src/components/WishItem/WishItem.tsx | 12 ++++++++++-- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/components/SearchFromHome/SearchList/SearchItem/SearchItem.tsx b/src/components/SearchFromHome/SearchList/SearchItem/SearchItem.tsx index 83a636c3..d79b3f5a 100644 --- a/src/components/SearchFromHome/SearchList/SearchItem/SearchItem.tsx +++ b/src/components/SearchFromHome/SearchList/SearchItem/SearchItem.tsx @@ -1,4 +1,4 @@ -import {Link} from 'react-router-dom'; +import {Link, useSearchParams} from 'react-router-dom'; import styles from './SearchItem.module.scss'; @@ -22,9 +22,18 @@ function SearchItem({forSearch, data, categoryChange}: PropsType) { const location = areas.filter((area) => area.areaCode === data.location.areaCode)[0].name; const category = translateCategoryToStr(data.contentTypeId); const imgSrc = data.thumbnail ? data.thumbnail : nullImg; + const [searchPrams] = useSearchParams(); + const tripId = searchPrams.get('placeID'); + const journyId = searchPrams.get('tripDate')?.split(' ')[1]; + const path = searchPrams.get('tripDate')?.split(' ')[0]; + const detailLink = + path === 'trip' + ? `/detail/${data.id} ${data.contentTypeId}?title=${data.title}&tripId=${tripId}&journyId=${journyId}` + : `/detail/${data.id} ${data.contentTypeId}?title=${data.title}`; + console.log(path); return ( - +
area.areaCode === data.location.areaCode)[0].name; const category = translateCategoryToStr(data.contentTypeId); const imgSrc = data.thumbnail ? data.thumbnail : nullImg; + const [searchPrams] = useSearchParams(); + const tripId = searchPrams.get('placeID'); + const journyId = searchPrams.get('tripDate')?.split(' ')[1]; + const path = searchPrams.get('tripDate')?.split(' ')[0]; + const detailLink = + path === 'trip' + ? `/detail/${data.id} ${data.contentTypeId}?title=${data.title}&tripId=${tripId}&journyId=${journyId}` + : `/detail/${data.id} ${data.contentTypeId}?title=${data.title}`; return ( - +