From 0973b89845f45d591e75b75f6701d80403f18cd3 Mon Sep 17 00:00:00 2001 From: sue Date: Sat, 27 Jan 2024 11:58:07 +0900 Subject: [PATCH 1/2] =?UTF-8?q?Remove:=20=EC=97=AC=EC=A0=95=20=EB=AF=B8?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=20=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/plan/planPlaceSearch.page.tsx | 5 ----- src/router/socketRouter.tsx | 2 -- 2 files changed, 7 deletions(-) delete mode 100644 src/pages/plan/planPlaceSearch.page.tsx diff --git a/src/pages/plan/planPlaceSearch.page.tsx b/src/pages/plan/planPlaceSearch.page.tsx deleted file mode 100644 index 522b2d2b..00000000 --- a/src/pages/plan/planPlaceSearch.page.tsx +++ /dev/null @@ -1,5 +0,0 @@ -const PlanPlaceSearch = () => { - return
여행계획 - 여행지 검색 추가 페이지
; -}; - -export default PlanPlaceSearch; diff --git a/src/router/socketRouter.tsx b/src/router/socketRouter.tsx index 8de2d225..6b0fcfc3 100644 --- a/src/router/socketRouter.tsx +++ b/src/router/socketRouter.tsx @@ -2,7 +2,6 @@ import { Route, Routes } from 'react-router-dom'; import { useSocket, socketContext } from '@hooks/useSocket'; import PlanTrip from '@pages/plan/planTrip.page'; import { PlanAddPlace } from '@components/addToList/addToOurPlace/PlanAddPlace.page'; -import PlanPlaceSearch from '@pages/plan/planPlaceSearch.page'; import Trip from '@pages/trip/trip.page'; import MainLayout from './routerLayout'; import Share from '@pages/share/share.page'; @@ -16,7 +15,6 @@ const SocketRoutes = () => { } /> } /> - } /> ); From f22721487fdbe4ae243a9238901833c2c2bbd943 Mon Sep 17 00:00:00 2001 From: sue Date: Sat, 27 Jan 2024 14:54:24 +0900 Subject: [PATCH 2/2] =?UTF-8?q?Design:=20=EB=94=94=EC=9E=90=EC=9D=B8=20QA?= =?UTF-8?q?=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Plan/PlanItemBox.tsx | 3 +-- src/components/Plan/TripBudget.tsx | 9 ++++----- src/components/Tours/ToursCategoryItem.tsx | 2 +- .../LikedToursLists/LikedToursListCategoryItem.tsx | 4 ++-- src/components/Trip/TripPreference.tsx | 4 ++-- src/components/Wish/WishCategoryItem.tsx | 4 ++-- src/components/common/alert/Alert.tsx | 6 +++--- src/components/common/icons/Icons.tsx | 4 ++-- src/components/common/nav/Nav.tsx | 6 +----- src/components/common/tab/Tab.tsx | 14 ++++++++++++-- src/components/common/toastpopup/ToastPopUp.tsx | 2 +- src/pages/create/createTrip.page.tsx | 4 ++-- src/pages/trip/tripEdit.page.tsx | 4 ++-- 13 files changed, 35 insertions(+), 31 deletions(-) diff --git a/src/components/Plan/PlanItemBox.tsx b/src/components/Plan/PlanItemBox.tsx index 4cdd0f64..ef8900e7 100644 --- a/src/components/Plan/PlanItemBox.tsx +++ b/src/components/Plan/PlanItemBox.tsx @@ -98,14 +98,13 @@ const PlanItemBox = ({ {tripAuthority == 'WRITE' && ( handlePrice(inputPrice, item.tripItemId) } closeOnConfirm={true} children={ } content={ diff --git a/src/components/Plan/TripBudget.tsx b/src/components/Plan/TripBudget.tsx index e8ea6d82..8ad1b2eb 100644 --- a/src/components/Plan/TripBudget.tsx +++ b/src/components/Plan/TripBudget.tsx @@ -75,17 +75,16 @@ const TripBudget = () => { {tripAuthority == 'WRITE' && ( handleSetTargetBudget(inputBudget)} onCancel={() => setInputBudget('')} closeOnConfirm={true} children={ ); diff --git a/src/components/Trip/TripPreference.tsx b/src/components/Trip/TripPreference.tsx index 16749894..3e82027d 100644 --- a/src/components/Trip/TripPreference.tsx +++ b/src/components/Trip/TripPreference.tsx @@ -89,7 +89,7 @@ const RatioBar = ({ value, total, color, label1, label2 }: RatioBarParams) => {
{label1}
-
+
{label2}
@@ -97,7 +97,7 @@ const RatioBar = ({ value, total, color, label1, label2 }: RatioBarParams) => { ) : ( <>
{label1}
-
+
diff --git a/src/components/Wish/WishCategoryItem.tsx b/src/components/Wish/WishCategoryItem.tsx index 4fcf3516..db207f9c 100644 --- a/src/components/Wish/WishCategoryItem.tsx +++ b/src/components/Wish/WishCategoryItem.tsx @@ -21,13 +21,13 @@ const WishCategoryItem: React.FC = ({ }; const buttonStyle = isSelected - ? 'bg-[#28D8FF] text-white font-bold' + ? 'bg-[#28D8FF] text-white font-bold border-[#28D8FF]' : 'bg-[#fff] text-[#888] border-[#ededed]'; return ( ); diff --git a/src/components/common/alert/Alert.tsx b/src/components/common/alert/Alert.tsx index dbb26a3f..0c66fc3c 100644 --- a/src/components/common/alert/Alert.tsx +++ b/src/components/common/alert/Alert.tsx @@ -33,13 +33,13 @@ const Alert: FC = ({ + } mt-[10px] pb-[5px] font-bold leading-normal`}>

= ({ ); }; -export const CalendarIcon2: React.FC = ({ size = 25 }) => { +export const CalendarIcon2: React.FC = ({ size = 24 }) => { return ( = ({ size = 25 }) => { }; export const CalendarIcon3: React.FC = ({ - size = 25, + size = 24, color = 'black', fill = 'none', className, diff --git a/src/components/common/nav/Nav.tsx b/src/components/common/nav/Nav.tsx index 3ec01923..144ce514 100644 --- a/src/components/common/nav/Nav.tsx +++ b/src/components/common/nav/Nav.tsx @@ -55,11 +55,7 @@ const Nav = () => { onClick={() => navigate('/mytrip')} className="cursor-pointe w-[53.12px] flex-col items-center justify-center px-2">

- {isActive('/mytrip') ? ( - - ) : ( - - )} + {isActive('/mytrip') ? : }

여정 diff --git a/src/components/common/tab/Tab.tsx b/src/components/common/tab/Tab.tsx index 7d012b00..71e004c1 100644 --- a/src/components/common/tab/Tab.tsx +++ b/src/components/common/tab/Tab.tsx @@ -16,11 +16,15 @@ const Tab = ({ lists, contents }: TabProps) => { }; let isDayTab = false; + let isParticipationTab = false; lists.forEach((list) => { if (list.includes('DAY')) { isDayTab = true; } + if (list.includes('참여')) { + isParticipationTab = true; + } }); return ( @@ -30,7 +34,9 @@ const Tab = ({ lists, contents }: TabProps) => { onValueChange={handleTabChange}> {lists.map((list, index) => { @@ -38,7 +44,11 @@ const Tab = ({ lists, contents }: TabProps) => { {list} diff --git a/src/components/common/toastpopup/ToastPopUp.tsx b/src/components/common/toastpopup/ToastPopUp.tsx index 75c28bb0..e868c5d2 100644 --- a/src/components/common/toastpopup/ToastPopUp.tsx +++ b/src/components/common/toastpopup/ToastPopUp.tsx @@ -41,7 +41,7 @@ const ToastPopUp: React.FC = ({ noun, verb }) => { transform: visible ? 'translate(-50%, 0)' : 'translate(-50%, -50%)', width: '335px', // 375 - 40(20 20)(패딩) height: '64px', - borderRadius: '1rem', + borderRadius: '8px', border: '1px solid #29DDF6', backgroundColor: '#F2FDFF', color: '#062139', diff --git a/src/pages/create/createTrip.page.tsx b/src/pages/create/createTrip.page.tsx index ce7c23fc..2cdbc23c 100644 --- a/src/pages/create/createTrip.page.tsx +++ b/src/pages/create/createTrip.page.tsx @@ -1,7 +1,7 @@ import { ButtonPrimary } from '@components/common/button/Button'; import BackHeader from '@components/common/header/BackHeader'; import { - CalendarIcon, + CalendarIcon3, CloseIcon, CounterIcon, PlanIcon, @@ -134,7 +134,7 @@ export const CreateTrip = () => { { setShowSelectDate(true); }} diff --git a/src/pages/trip/tripEdit.page.tsx b/src/pages/trip/tripEdit.page.tsx index d9750bf9..36c94c07 100644 --- a/src/pages/trip/tripEdit.page.tsx +++ b/src/pages/trip/tripEdit.page.tsx @@ -2,7 +2,7 @@ import { putTrips } from '@api/trips'; import { BackBox } from '@components/common'; import { ButtonPrimary } from '@components/common/button/Button'; import { - CalendarIcon, + CalendarIcon3, CloseIcon, CounterIcon, PlanIcon, @@ -158,7 +158,7 @@ const TripEdit = () => { { setShowSelectDate(true); }}