From 972ac30f5714c47253ab923bc5a672a071aeecfc Mon Sep 17 00:00:00 2001 From: semnil5202 Date: Fri, 18 Aug 2023 13:01:08 +0900 Subject: [PATCH 1/4] =?UTF-8?q?design:=20=EC=98=A4=EB=A5=98=20=EB=A9=94?= =?UTF-8?q?=EC=84=B8=EC=A7=80=20=EB=B0=8F=20=ED=94=BC=EA=B7=B8=EB=A7=88=20?= =?UTF-8?q?=EC=8B=9C=EC=95=88=EA=B3=BC=20=EB=A7=9E=EC=A7=80=20=EC=95=8A?= =?UTF-8?q?=EB=8A=94=20=EB=B6=80=EB=B6=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/pages/KaKaoRedirectPage.tsx | 2 +- frontend/src/pages/PinDetail.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/pages/KaKaoRedirectPage.tsx b/frontend/src/pages/KaKaoRedirectPage.tsx index 053b4b4a..9c4fbbcb 100644 --- a/frontend/src/pages/KaKaoRedirectPage.tsx +++ b/frontend/src/pages/KaKaoRedirectPage.tsx @@ -19,7 +19,7 @@ export const handleOAuthKakao = async (code: string) => { localStorage.setItem('user', JSON.stringify(data.member)); location.reload(); } catch (error) { - window.alert('로그인 실패'); + window.alert('로그인에 실패하였습니다. 이메일 수집을 동의해주세요.'); } }; diff --git a/frontend/src/pages/PinDetail.tsx b/frontend/src/pages/PinDetail.tsx index eb187899..11cac986 100644 --- a/frontend/src/pages/PinDetail.tsx +++ b/frontend/src/pages/PinDetail.tsx @@ -121,7 +121,7 @@ const PinDetail = ({ - 핀 생성자 + {pin.creator} @@ -135,7 +135,7 @@ const PinDetail = ({ - {pin.updatedAt.split('T')[0].split('-').join('.')} 핀 수정자 + {pin.updatedAt.split('T')[0].split('-').join('.')} From a3541a151f38aa05697ca3b826e1f57842159df7 Mon Sep 17 00:00:00 2001 From: semnil5202 Date: Fri, 18 Aug 2023 13:01:16 +0900 Subject: [PATCH 2/4] =?UTF-8?q?chore:=20=EB=B0=B0=ED=8F=AC=20=EB=B2=84?= =?UTF-8?q?=EC=A0=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/package.json b/frontend/package.json index 882616ba..43bd1a1f 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "mapbefine", - "version": "1.0.0", + "version": "0.8.0", "description": "내 관심사로 만든 지도…? 괜찮을 지도! 괜찮을 지도는 지도 기반 참여형 데이터 매핑 서비스로서, 당신의 관심사를 다양한 지도로 만들 수 있게 도와드리고 있어요!", "main": "index.js", "scripts": { From 7b38e987455b31cded6ce3bc10d62092227ae07f Mon Sep 17 00:00:00 2001 From: semnil5202 Date: Fri, 18 Aug 2023 13:12:36 +0900 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=ED=86=A0=ED=94=BD=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=EC=9E=90=EA=B0=80=20=EA=B3=A0=EC=A0=95=EA=B0=92?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EB=93=A4=EC=96=B4=EA=B0=80=20=EC=9E=88?= =?UTF-8?q?=EB=8D=98=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/ModalMyTopicList/addToMyTopicList.tsx | 1 + frontend/src/components/ModalMyTopicList/index.tsx | 1 + frontend/src/components/ModalTopicCard/index.tsx | 4 +++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/ModalMyTopicList/addToMyTopicList.tsx b/frontend/src/components/ModalMyTopicList/addToMyTopicList.tsx index 95cfc9a3..d9f1ed80 100644 --- a/frontend/src/components/ModalMyTopicList/addToMyTopicList.tsx +++ b/frontend/src/components/ModalMyTopicList/addToMyTopicList.tsx @@ -51,6 +51,7 @@ const AddToMyTopicList = ({ pin }: any) => { topicId={topic.id} topicImage={topic.image} topicTitle={topic.name} + topicCreator={topic.creator} topicUpdatedAt={topic.updatedAt} topicPinCount={topic.pinCount} topicClick={addPinToTopic} diff --git a/frontend/src/components/ModalMyTopicList/index.tsx b/frontend/src/components/ModalMyTopicList/index.tsx index 1b0c3714..a5e90e91 100644 --- a/frontend/src/components/ModalMyTopicList/index.tsx +++ b/frontend/src/components/ModalMyTopicList/index.tsx @@ -45,6 +45,7 @@ const ModalMyTopicList = ({ topicId, topicClick }: ModalMyTopicList) => { topicId={topic.id} topicImage={topic.image} topicTitle={topic.name} + topicCreator={topic.creator} topicUpdatedAt={topic.updatedAt} topicPinCount={topic.pinCount} topicClick={topicClick} diff --git a/frontend/src/components/ModalTopicCard/index.tsx b/frontend/src/components/ModalTopicCard/index.tsx index 65f0ceec..9bd69333 100644 --- a/frontend/src/components/ModalTopicCard/index.tsx +++ b/frontend/src/components/ModalTopicCard/index.tsx @@ -17,6 +17,7 @@ export interface ModalTopicCardProps { topicId: number; topicImage: string; topicTitle: string; + topicCreator: string; topicUpdatedAt: string; topicPinCount: number; topicClick: any; @@ -27,6 +28,7 @@ const ModalTopicCard = ({ topicId, topicImage, topicTitle, + topicCreator, topicUpdatedAt, topicPinCount, topicClick, @@ -75,7 +77,7 @@ const ModalTopicCard = ({ - 토픽 생성자 + {topicCreator} From 244f9cc7998023a0e48a698650ac0c3444e6224c Mon Sep 17 00:00:00 2001 From: semnil5202 Date: Fri, 18 Aug 2023 13:13:24 +0900 Subject: [PATCH 4/4] =?UTF-8?q?refactor:=20=ED=86=A0=ED=94=BD=20=EC=84=A0?= =?UTF-8?q?=ED=83=9D=20=EB=B2=84=ED=8A=BC=20=EC=A1=B0=EA=B1=B4=EB=B6=80=20?= =?UTF-8?q?=EB=B9=84=ED=99=9C=EC=84=B1=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/pages/NewPin.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frontend/src/pages/NewPin.tsx b/frontend/src/pages/NewPin.tsx index acd56bea..73af429e 100644 --- a/frontend/src/pages/NewPin.tsx +++ b/frontend/src/pages/NewPin.tsx @@ -121,7 +121,10 @@ const NewPin = () => { if (postTopicId) routePage(`/topics/${postTopicId}`, [postTopicId]); } catch { - showToast('error', '핀을 추가할 수 있는 권한이 없거나 지도를 선택하지 않았습니다.'); + showToast( + 'error', + '핀을 추가할 수 있는 권한이 없거나 지도를 선택하지 않았습니다.', + ); } }; @@ -209,6 +212,7 @@ const NewPin = () => { type="button" variant="primary" onClick={() => { + if (topic && topic.name) return; openModal('newPin'); }} >