Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FE] Hotfix/design 디자인 오류 수정 #361

Merged
merged 4 commits into from
Aug 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mapbefine",
"version": "1.0.0",
"version": "0.8.0",
"description": "내 관심사로 만든 지도…? 괜찮을 지도! 괜찮을 지도는 지도 기반 참여형 데이터 매핑 서비스로서, 당신의 관심사를 다양한 지도로 만들 수 있게 도와드리고 있어요!",
"main": "index.js",
"scripts": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
1 change: 1 addition & 0 deletions frontend/src/components/ModalMyTopicList/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
4 changes: 3 additions & 1 deletion frontend/src/components/ModalTopicCard/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export interface ModalTopicCardProps {
topicId: number;
topicImage: string;
topicTitle: string;
topicCreator: string;
topicUpdatedAt: string;
topicPinCount: number;
topicClick: any;
Expand All @@ -27,6 +28,7 @@ const ModalTopicCard = ({
topicId,
topicImage,
topicTitle,
topicCreator,
topicUpdatedAt,
topicPinCount,
topicClick,
Expand Down Expand Up @@ -75,7 +77,7 @@ const ModalTopicCard = ({
</Box>

<Text color="black" $fontSize="small" $fontWeight="normal">
토픽 생성자
{topicCreator}
</Text>

<Space size={0} />
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/KaKaoRedirectPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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('로그인에 실패하였습니다. 이메일 수집을 동의해주세요.');
}
};

Expand Down
6 changes: 5 additions & 1 deletion frontend/src/pages/NewPin.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,10 @@ const NewPin = () => {

if (postTopicId) routePage(`/topics/${postTopicId}`, [postTopicId]);
} catch {
showToast('error', '핀을 추가할 수 있는 권한이 없거나 지도를 선택하지 않았습니다.');
showToast(
'error',
'핀을 추가할 수 있는 권한이 없거나 지도를 선택하지 않았습니다.',
);
}
};

Expand Down Expand Up @@ -209,6 +212,7 @@ const NewPin = () => {
type="button"
variant="primary"
onClick={() => {
if (topic && topic.name) return;
openModal('newPin');
}}
>
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/pages/PinDetail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ const PinDetail = ({

<Flex $justifyContent="space-between" $alignItems="flex-end" width="100%">
<Text color="black" $fontSize="small" $fontWeight="normal">
핀 생성자
{pin.creator}
</Text>
<Flex $flexDirection="column" $alignItems="flex-end">
<Box cursor="pointer">
Expand All @@ -135,7 +135,7 @@ const PinDetail = ({
</Text>
</Box>
<Text color="black" $fontSize="small" $fontWeight="normal">
{pin.updatedAt.split('T')[0].split('-').join('.')} 핀 수정자
{pin.updatedAt.split('T')[0].split('-').join('.')}
</Text>
</Flex>
</Flex>
Expand Down