From 3fb36fd2299005eca7a15e9a64a7332ac66e1b56 Mon Sep 17 00:00:00 2001 From: Hojin Date: Fri, 26 Jan 2024 03:48:50 +0900 Subject: [PATCH 1/9] =?UTF-8?q?Feat:=20=EC=BB=A4=EC=84=9C=EA=B3=B5?= =?UTF-8?q?=EC=9C=A0=20=EB=AA=A8=EB=B0=94=EC=9D=BC=ED=99=98=EA=B2=BD?= =?UTF-8?q?=EC=97=90=EC=84=A0=20=EC=95=88=EB=90=98=EA=B2=8C=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + pnpm-lock.yaml | 18 ++++++++++++++++++ src/components/Plan/PlanSectionTop.tsx | 9 +++++++-- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c962cb80..b572eba0 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,7 @@ "path": "^0.12.7", "react": "^18.2.0", "react-beautiful-dnd": "^13.1.1", + "react-device-detect": "^2.2.3", "react-dom": "^18.2.0", "react-hook-form": "^7.49.2", "react-icons": "^5.0.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index abcef86b..95225e8f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -74,6 +74,9 @@ dependencies: react-beautiful-dnd: specifier: ^13.1.1 version: 13.1.1(react-dom@18.2.0)(react@18.2.0) + react-device-detect: + specifier: ^2.2.3 + version: 2.2.3(react-dom@18.2.0)(react@18.2.0) react-dom: specifier: ^18.2.0 version: 18.2.0(react@18.2.0) @@ -5139,6 +5142,17 @@ packages: - react-native dev: false + /react-device-detect@2.2.3(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-buYY3qrCnQVlIFHrC5UcUoAj7iANs/+srdkwsnNjI7anr3Tt7UY6MqNxtMLlr0tMBied0O49UZVK8XKs3ZIiPw==} + peerDependencies: + react: '>= 0.14.0' + react-dom: '>= 0.14.0' + dependencies: + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + ua-parser-js: 1.0.37 + dev: false + /react-dom@18.2.0(react@18.2.0): resolution: {integrity: sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==} peerDependencies: @@ -5900,6 +5914,10 @@ packages: engines: {node: '>=14.17'} hasBin: true + /ua-parser-js@1.0.37: + resolution: {integrity: sha512-bhTyI94tZofjo+Dn8SN6Zv8nBDvyXTymAdM3LDI/0IboIUwTu1rEhW7v2TfiVsoYWgkQ4kOVqnI8APUFbIQIFQ==} + dev: false + /undici-types@5.26.5: resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} dev: false diff --git a/src/components/Plan/PlanSectionTop.tsx b/src/components/Plan/PlanSectionTop.tsx index 60cae7e6..0c84359f 100644 --- a/src/components/Plan/PlanSectionTop.tsx +++ b/src/components/Plan/PlanSectionTop.tsx @@ -22,6 +22,7 @@ import { getItem } from '@utils/localStorageFun'; import PlanSchedule from './PlanSchedule'; import PlanCursor from './PlanCursor'; import PlanOtherCursor from './PlanOtherCursor'; +import { isMobile } from 'react-device-detect'; const PlanSectionTop = () => { const navigate = useNavigate(); @@ -81,8 +82,12 @@ const PlanSectionTop = () => { }, [isEnter]); return (
- - + {!isMobile && ( + <> + + + + )} { From ae7e7a14430d36b49b7e6feb203069c8537711f3 Mon Sep 17 00:00:00 2001 From: sue Date: Fri, 26 Jan 2024 12:06:00 +0900 Subject: [PATCH 2/9] =?UTF-8?q?Desigin:=20Nav,=20Tab=20=EA=B0=84=EA=B2=A9?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/nav/Nav.tsx | 24 ++++++++++++------------ src/components/common/tab/Tab.tsx | 6 ++++-- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/components/common/nav/Nav.tsx b/src/components/common/nav/Nav.tsx index e0b3e51c..b29f1d70 100644 --- a/src/components/common/nav/Nav.tsx +++ b/src/components/common/nav/Nav.tsx @@ -38,14 +38,14 @@ const Nav = () => { navigate('/'); window.scrollTo({ top: 0, left: 0, behavior: 'smooth' }); }} - className="cursor-pointer flex-col items-center justify-center px-2"> + className="w-[53.12px] cursor-pointer flex-col items-center justify-center px-2">
-

+

홈

@@ -53,7 +53,7 @@ const Nav = () => { {isLoggedIn ? (
navigate('/mytrip')} - className="cursor-pointer flex-col items-center justify-center px-2"> + className="cursor-pointe w-[53.12px] flex-col items-center justify-center px-2">
{isActive('/mytrip') ? ( @@ -61,7 +61,7 @@ const Nav = () => { )}
-

+

일정

@@ -76,14 +76,14 @@ const Nav = () => { } onConfirm={handleConfirm}> -
+
-

+

일정

@@ -93,14 +93,14 @@ const Nav = () => { {isLoggedIn ? (
navigate('/wishlist')} - className="cursor-pointer flex-col items-center justify-center px-2"> + className="w-[53.12px] cursor-pointer flex-col items-center justify-center px-2">
-

+

관심목록

@@ -115,14 +115,14 @@ const Nav = () => { } onConfirm={handleConfirm}> -
+
-

+

관심목록

@@ -131,14 +131,14 @@ const Nav = () => {
navigate('/mypage')} - className="cursor-pointer flex-col items-center justify-center px-1"> + className="w-[53.12px] cursor-pointer flex-col items-center justify-center px-1 pt-[1px]">
-

+

내정보

diff --git a/src/components/common/tab/Tab.tsx b/src/components/common/tab/Tab.tsx index c75d14f2..7d012b00 100644 --- a/src/components/common/tab/Tab.tsx +++ b/src/components/common/tab/Tab.tsx @@ -29,14 +29,16 @@ const Tab = ({ lists, contents }: TabProps) => { defaultValue="tab0" onValueChange={handleTabChange}> {lists.map((list, index) => { return ( {list} From 7ed23e04f257412ed9bc6bccd132ebe713aa952e Mon Sep 17 00:00:00 2001 From: Hojin Date: Fri, 26 Jan 2024 12:45:27 +0900 Subject: [PATCH 3/9] =?UTF-8?q?Fix:=20=EA=B8=80=EC=9E=90=EC=88=98=EC=A0=9C?= =?UTF-8?q?=ED=95=9C=2019->16,=20=EC=9D=B4=EB=9F=B0=EC=A0=90=EC=9D=B4?= =?UTF-8?q?=EC=A2=8B=EC=95=98=EC=96=B4=EC=9A=94=20=EC=84=B8=EB=A1=9C?= =?UTF-8?q?=EA=B0=80=EC=9A=B4=EB=8D=B0=EC=A0=95=EB=A0=AC=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DetailSectionBottom/DetailReviewStats.tsx | 2 +- src/components/Plan/PlanEditItemBox.tsx | 4 ++-- src/components/Plan/PlanItemBox.tsx | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/DetailSectionBottom/DetailReviewStats.tsx b/src/components/DetailSectionBottom/DetailReviewStats.tsx index 7a2342b4..ade45a12 100644 --- a/src/components/DetailSectionBottom/DetailReviewStats.tsx +++ b/src/components/DetailSectionBottom/DetailReviewStats.tsx @@ -25,7 +25,7 @@ const DetailReviewStats = () => { backgroundColor: getColor(data.keywordCount), }} /> -
+

{getEmoji(data.content)}

{data.content}

diff --git a/src/components/Plan/PlanEditItemBox.tsx b/src/components/Plan/PlanEditItemBox.tsx index 48230566..c1a3fa98 100644 --- a/src/components/Plan/PlanEditItemBox.tsx +++ b/src/components/Plan/PlanEditItemBox.tsx @@ -140,8 +140,8 @@ const PlanEditItemBox = ({ />
- {item.name.length > 17 - ? item.name.slice(0, 17) + '...' + {item.name.length > 16 + ? item.name.slice(0, 16) + '...' : item.name}
diff --git a/src/components/Plan/PlanItemBox.tsx b/src/components/Plan/PlanItemBox.tsx index a09fb8cd..4cdd0f64 100644 --- a/src/components/Plan/PlanItemBox.tsx +++ b/src/components/Plan/PlanItemBox.tsx @@ -84,8 +84,8 @@ const PlanItemBox = ({ />
- {item.name.length > 19 - ? item.name.slice(0, 19) + '...' + {item.name.length > 16 + ? item.name.slice(0, 16) + '...' : item.name}
From e0680a2a215be98ac73e584f475d0ac3086d2c32 Mon Sep 17 00:00:00 2001 From: Hojin Date: Fri, 26 Jan 2024 13:22:39 +0900 Subject: [PATCH 4/9] =?UTF-8?q?Fix:=20=EB=AA=A8=EB=B0=94=EC=9D=BC=ED=99=98?= =?UTF-8?q?=EA=B2=BD=EC=97=90=EC=84=9C=20=EB=82=A8=EC=9D=98=EC=BB=A4?= =?UTF-8?q?=EC=84=9C=EB=8A=94=20=EB=B3=BC=EC=88=98=EC=9E=88=EA=B2=8C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Plan/PlanSectionTop.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Plan/PlanSectionTop.tsx b/src/components/Plan/PlanSectionTop.tsx index 00abda5b..afe01e17 100644 --- a/src/components/Plan/PlanSectionTop.tsx +++ b/src/components/Plan/PlanSectionTop.tsx @@ -86,9 +86,9 @@ const PlanSectionTop = () => { {!isMobile && ( <> - )} + { From f379969c882744780200fe7f1efdf6bf2e564c68 Mon Sep 17 00:00:00 2001 From: NohWookJin Date: Fri, 26 Jan 2024 14:19:26 +0900 Subject: [PATCH 5/9] =?UTF-8?q?fix:=20=EA=B0=84=EA=B2=A9=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/MyTrip/MyTripIngItem.tsx | 8 ++++---- src/components/MyTrip/MyTripItem.tsx | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/MyTrip/MyTripIngItem.tsx b/src/components/MyTrip/MyTripIngItem.tsx index e054b93f..479009a5 100644 --- a/src/components/MyTrip/MyTripIngItem.tsx +++ b/src/components/MyTrip/MyTripIngItem.tsx @@ -16,7 +16,7 @@ const MyTripIngItem: React.FC = ({ myTripList }) => {
navigate(`/trip/${tripId}`)}> -
+
= ({ myTripList }) => { alt="여행지 이미지" />
-
+
{tripStatus}
-
+
{tripName}
-
+
{startDate.replace(/-/g, '.')} -{' '} {endDate.replace(/-/g, '.').split('2024.')}{' '} {tripDuration === '0박 1일' ? null : ` (${tripDuration})`} diff --git a/src/components/MyTrip/MyTripItem.tsx b/src/components/MyTrip/MyTripItem.tsx index 7776541d..b5878161 100644 --- a/src/components/MyTrip/MyTripItem.tsx +++ b/src/components/MyTrip/MyTripItem.tsx @@ -64,8 +64,8 @@ const MyTripItem: React.FC = ({ myTripList }) => { alt="여행지 이미지" />
-
-
+
+
{tripName}
@@ -76,7 +76,7 @@ const MyTripItem: React.FC = ({ myTripList }) => {
-
+
{numberOfTripMember}명과 공유중
From a72392bea735b6c63ebfd9876caf8f6fe2d40642 Mon Sep 17 00:00:00 2001 From: NohWookJin Date: Fri, 26 Jan 2024 14:31:15 +0900 Subject: [PATCH 6/9] =?UTF-8?q?style:=20=EC=97=AC=EB=B0=B1=20=EC=A1=B0?= =?UTF-8?q?=EC=A0=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/MyTrip/MyTripIngItem.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/MyTrip/MyTripIngItem.tsx b/src/components/MyTrip/MyTripIngItem.tsx index 479009a5..3ff6392c 100644 --- a/src/components/MyTrip/MyTripIngItem.tsx +++ b/src/components/MyTrip/MyTripIngItem.tsx @@ -30,7 +30,7 @@ const MyTripIngItem: React.FC = ({ myTripList }) => {
-
+
{tripName}
From e9a3b81698ccc7798049ceae9837bb0d2fa6f416 Mon Sep 17 00:00:00 2001 From: NohWookJin Date: Fri, 26 Jan 2024 14:31:32 +0900 Subject: [PATCH 7/9] =?UTF-8?q?style:=20=EC=97=AC=EC=A0=95=20=EB=AC=B8?= =?UTF-8?q?=EA=B5=AC=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/nav/Nav.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/common/nav/Nav.tsx b/src/components/common/nav/Nav.tsx index e0b3e51c..3d0bf45e 100644 --- a/src/components/common/nav/Nav.tsx +++ b/src/components/common/nav/Nav.tsx @@ -62,7 +62,7 @@ const Nav = () => { )}

- 일정 + 여정

) : ( @@ -84,7 +84,7 @@ const Nav = () => { />

- 일정 + 여정

From 9b0e09483ecc46c2a18846112fed9c4d166a78ca Mon Sep 17 00:00:00 2001 From: Hojin Date: Fri, 26 Jan 2024 14:40:02 +0900 Subject: [PATCH 8/9] =?UTF-8?q?Fix:=20=EB=B9=84=EB=A1=9C=EA=B7=B8=EC=9D=B8?= =?UTF-8?q?=EC=8B=9C=20=EC=9D=BC=EC=A0=95=EC=B6=94=EA=B0=80=20=EC=9B=8C?= =?UTF-8?q?=EB=94=A9=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DetailSectionTop/DetailAddSchedule.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/DetailSectionTop/DetailAddSchedule.tsx b/src/components/DetailSectionTop/DetailAddSchedule.tsx index 0b39bba6..9dd0d3f8 100644 --- a/src/components/DetailSectionTop/DetailAddSchedule.tsx +++ b/src/components/DetailSectionTop/DetailAddSchedule.tsx @@ -265,9 +265,9 @@ const DetailAddSchedule = () => { title={'로그인'} message={ <> - 새로운 여행 생성 시 로그인이 필요합니다. + 일정에 추가하려면 로그인이 필요해요.
- 로그인 하시겠습니까? + 로그인하러 가볼까요? } onConfirm={() => handleNavigate('/login')}> From c3922278979087563d04dfe01e35d52ba64f9c24 Mon Sep 17 00:00:00 2001 From: Hojin Date: Fri, 26 Jan 2024 14:43:16 +0900 Subject: [PATCH 9/9] =?UTF-8?q?Fix:=20=EC=9D=BC=EC=A0=95=20->=20=EC=97=AC?= =?UTF-8?q?=EC=A0=95=EC=9C=BC=EB=A1=9C=20=EB=AC=B8=EA=B5=AC=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DetailSectionTop/DetailAddSchedule.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/DetailSectionTop/DetailAddSchedule.tsx b/src/components/DetailSectionTop/DetailAddSchedule.tsx index 9dd0d3f8..e976a48c 100644 --- a/src/components/DetailSectionTop/DetailAddSchedule.tsx +++ b/src/components/DetailSectionTop/DetailAddSchedule.tsx @@ -265,7 +265,7 @@ const DetailAddSchedule = () => { title={'로그인'} message={ <> - 일정에 추가하려면 로그인이 필요해요. + 여정에 추가하려면 로그인이 필요해요.
로그인하러 가볼까요?