Merge pull request #268 from FinalDoubleTen/dev

디자인 QA / 워딩 변경

src/components/DetailSectionTop/DetailAddSchedule.tsx

@@ -202,7 +202,7 @@ const DetailAddSchedule = () => {
                   <div className="mt-[40px] flex flex-col items-center justify-center text-center">
                     <GrayCalendarIcon />
                     <p className="mt-[16px] flex-shrink-0 flex-grow-0 text-left text-sm font-semibold text-[#888]">
-                      등록된 여행이 없습니다.
+                      참여하고 있는 여정이 없어요.
                     </p>
                   </div>
                 </Dialog.Description>

src/components/Plan/PlanEditItemBox.tsx

@@ -171,7 +171,7 @@ const PlanEditItemBox = ({
         <div className="mx-auto flex h-14 max-w-md">
           <Alert
             title={'여행지 삭제'}
-            message={<>선택한 장소를 삭제하시겠습니까?</>}
+            message={<>여정에서 이 장소를 삭제할까요?</>}
             onConfirm={handleConfirm}
             closeOnConfirm={true}
             isCheck={selectedItemId}>

src/components/Plan/PlanSectionTop.tsx

@@ -20,7 +20,7 @@ import { visitDateState } from '@recoil/socket';
 import { useState } from 'react';
 import { getItem } from '@utils/localStorageFun';
 import PlanSchedule from './PlanSchedule';
-import ScrollTopButton from './ScrollTopButton';
+import ScrollTopButton from '../common/scrollTopButton/ScrollTopButton';
 
 const PlanSectionTop = () => {
   const navigate = useNavigate();

src/components/Review/MyReview.tsx

@@ -21,7 +21,7 @@ import EditDelete from '@components/common/modal/children/EditDelete';
 import MyAlert from '@components/common/modal/children/MyAlert';
 import { alertTypeState } from '@recoil/modal';
 import { PenIcon } from '@components/common/icons/Icons';
-import ScrollTopButton from '@components/Plan/ScrollTopButton';
+import ScrollTopButton from '@components/common/scrollTopButton/ScrollTopButton';
 import { MyReviewContent } from '@/@types/review.types';
 
 export default function MyReview() {

src/components/Tours/ToursList.tsx

@@ -46,6 +46,7 @@ const ToursList = ({ selectedRegion }: ToursListProps) => {
       pageStart={0}
       loadMore={() => fetchNextPage()}
       hasMore={hasNextPage}
+      threshold={500}
       loader={
         <div key={uuidv4()} className="flex justify-center">
           <Spinner />

src/components/Trip/EditCodeModal.tsx

@@ -63,14 +63,14 @@ const EditCodeModal = () => {
 
   return (
     <>
-      {isToastVisible && <ToastPopUp noun="여행 일정" verb="삭제" />}
+      {isToastVisible && <ToastPopUp noun="나의 여정" verb="삭제" />}
       {isLogin ? (
         tripAuthority === 'WRITE' ? (
           <Dialog.Root modal>
             <Dialog.Trigger asChild>
               <button
                 onClick={() => setIsEditModal(true)}
-                className="body3 rounded-lg border-[1px] border-solid border-gray2 px-[10px] py-[8px] text-gray4">
+                className="body3 rounded-lg border-[1.25px] border-solid border-gray2 px-[10px] py-[8px] text-gray4">
                 편집
               </button>
             </Dialog.Trigger>

src/components/Trip/PlanTripButton.tsx

@@ -24,7 +24,7 @@ const PlanTripButton = () => {
         <div className="pt-0.5">
           <PlanColorIcon />
         </div>
-        <p className="ml-2 text-[15px] text-gray5">여행 계획하기</p>
+        <p className="body1 ml-2 text-[15px] text-gray5">여행 계획하기</p>
       </div>
       <div className="pt-0.5">
         <RightIcon fill="#888888" />

src/components/Trip/TripSectionTop.tsx

@@ -8,7 +8,7 @@ import { LikedToursList } from './LikedToursList';
 import { useGetTripsAuthority } from '@hooks/useGetTripsAuthority';
 import { useEffect, useState } from 'react';
 import IsEditableModal from '@components/Share/IsEditableModal';
-import ScrollTopButton from '@components/Plan/ScrollTopButton';
+import ScrollTopButton from '@components/common/scrollTopButton/ScrollTopButton';
 
 const TripSectionTop = () => {
   const navigate = useNavigate();

src/components/Wish/Wish.tsx

@@ -5,7 +5,7 @@ import WishList from './WishList';
 import NoDataMessage from '@components/common/noData/NoDataMessage';
 import { getMemberTours } from '@api/member';
 import { HeartIcon } from '@components/common/icons/Icons';
-import ScrollTopButton from '@components/Plan/ScrollTopButton';
+import ScrollTopButton from '@components/common/scrollTopButton/ScrollTopButton';
 
 const Wish = () => {
   const [selectedContentTypeId, setSelectedContentTypeId] = useState<

src/components/common/icons/Icons.tsx

@@ -1041,8 +1041,8 @@ export const TopIcon: React.FC<IconProps> = () => {
 };
 
 export const ShareIcon: React.FC<ChackIconProps> = ({
-  width = 20,
-  height = 19,
+  width = 17.9,
+  height = 17,
   fill = 'none',
   color = 'black',
 }) => {

src/components/Plan/ScrollTopButton.tsx → src/components/common/scrollTopButton/ScrollTopButton.tsx

@@ -28,14 +28,13 @@ const ScrollTopButton = () => {
   }
 
   return (
-    <div
+    <button
       className="sticky bottom-[20px]
       mt-[-50px] flex h-12 w-12 cursor-pointer items-center justify-center rounded-full bg-white shadow-md"
-      style={{ left: 'calc(100%)' }}>
-      <button onClick={scrollToTop}>
-        <TopIcon />
-      </button>
-    </div>
+      style={{ left: 'calc(100%)' }}
+      onClick={scrollToTop}>
+      <TopIcon />
+    </button>
   );
 };
 

src/components/common/toastpopup/ToastPopUp.tsx

@@ -22,8 +22,10 @@ const ToastPopUp: React.FC<ToastPopUpProps> = ({ noun, verb }) => {
   }, []);
 
   useEffect(() => {
-    if (noun === '일정' || noun === '날짜 이동' || noun === '여행 일정') {
+    if (noun === '일정' || noun === '날짜 이동') {
       setParticle('이');
+    } else if (noun === '나의 여정') {
+      setParticle('에서');
     }
   }, [noun]);
 

src/components/search/SearchResult.tsx

@@ -4,7 +4,7 @@ import { useInfiniteQuery } from '@tanstack/react-query';
 import ToursCategoryItem from '@components/Tours/ToursCategoryItem';
 import { useEffect, useState } from 'react';
 import { Spinner } from '@components/common/spinner/Spinner';
-import ScrollTopButton from '@components/Plan/ScrollTopButton';
+import ScrollTopButton from '@components/common/scrollTopButton/ScrollTopButton';
 
 interface SearchResultProps {
   selectedRegion: string | null;