Merge pull request #274 from Strong-Potato/248-fix-vote-slide

Fix: detail link
Strong-Potato · Jan 28, 2024 · 4828bc5 · 4828bc5
2 parents eaa1ecb + 157376c
commit 4828bc5
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 12 deletions.
diff --git a/src/assets/homeIcons/search/favoriteNull.svg b/src/assets/homeIcons/search/favoriteNull.svg
diff --git 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 (
-    <Link to={`/detail/${data.id} ${data.contentTypeId}?title=${data.title}`} className={styles.container}>
+    <Link to={detailLink} className={styles.container}>
       <div className={styles.itemBox}>
         <img
           src={imgSrc}

diff --git a/src/components/SearchFromHome/SearchList/SearchList.tsx b/src/components/SearchFromHome/SearchList/SearchList.tsx
@@ -134,7 +134,9 @@ function SearchList({forSearch}: PropsType) {
                 <span>검색 결과가 없습니다.</span>
               </div>
             )}
-            {filterData && filterData?.length > 0 && !isEnd && <ObserveTarget inViewRef={inViewRef} />}
+            {filterData && filterData?.length > 0 && !isEnd && forSearch.category === 0 && (
+              <ObserveTarget inViewRef={inViewRef} />
+            )}
           </ul>
           {forSearch.placeID !== 'undefined' ? (
             <AddToCandidateButton />

diff --git a/src/components/WishItem/WishItem.tsx b/src/components/WishItem/WishItem.tsx
@@ -1,4 +1,4 @@
-import {Link} from 'react-router-dom';
+import {Link, useSearchParams} from 'react-router-dom';
 
 import styles from './WishItem.module.scss';
 
@@ -25,9 +25,17 @@ function WishItem({filter, 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}`;
 
   return (
-    <Link to={`/detail/${data.id} ${data.contentTypeId}?title=${data.title}`} className={styles.container}>
+    <Link to={detailLink} className={styles.container}>
       <div className={styles.itemBox}>
         <img
           src={imgSrc}

diff --git 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),

diff --git 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';