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": {
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}
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/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');
}}
>
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('.')}