Skip to content

Commit bab5305

Browse files
junheekim61junheekim61
authored
Merge pull request #225 from APPS-sookmyung/dev
[MERGE] dev to main
2 parents 1aaecdd + e61710a commit bab5305

File tree

16 files changed

+23
-66
lines changed

16 files changed

+23
-66
lines changed

‎src/apis/cards.js‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,50 +3,42 @@ import { formDataAxios, jsonAxios } from '../axios';
33
// 전체 명함 조회
44
export const getCards = async () => {
55
const response = await jsonAxios.get(`/cards`);
6-
console.log('전체 명함 조회: ', response);
76
return response;
87
};
98

109
// 단건 명함 조회
1110
export const getCardDetail = async ({ card_id }) => {
1211
const response = await jsonAxios.get(`/cards/${card_id}`);
13-
console.log('단건 명함 조회: ', response);
1412
return response;
1513
};
1614

1715
// 그룹별 명함 조회
1816
export const getCardsByGroup = async ({ categoryId }) => {
1917
const response = await jsonAxios.get(`/cards/categories/${categoryId}`);
20-
console.log('그룹별 명함 조회: ', response);
2118
return response;
2219
};
2320

2421
// 명함 생성
2522
export const postCards = async ({ data }) => {
2623
const response = await formDataAxios.post(`/cards`, data);
27-
console.log('명함 생성: ', response);
2824
return response;
2925
};
3026

3127
// 명함 삭제
3228
export const patchCards = async ({ cardList }) => {
3329
const response = await jsonAxios.patch(`/cards`, cardList);
34-
console.log('명함 삭제: ', response);
3530
return response;
3631
};
3732

3833
// 명함 수정
3934
export const putCards = async ({ card_id, data }) => {
4035
const response = await formDataAxios.put(`/cards/${card_id}`, data);
41-
console.log('명함 수정: ', response);
4236
return response;
4337
};
4438

4539
// 명함 검색
4640
export const searchCards = async ({ keyword }) => {
47-
console.log('검색 키워드:', keyword);
4841
const response = await jsonAxios.get(`/cards?keyword=${keyword}`);
49-
console.log('명함 검색: ', response);
5042
return response;
5143
};
5244

@@ -56,13 +48,11 @@ export const putCardsPf = async ({ card_id, data }) => {
5648
`/cards/${card_id}/prof/images`,
5749
data
5850
);
59-
console.log('명함 프로필이미지 수정: ', response);
6051
return response;
6152
};
6253

6354
// 명함 사진 수정
6455
export const putCardsImg = async ({ card_id, data }) => {
6556
const response = await formDataAxios.put(`/cards/${card_id}/images`, data);
66-
console.log('명함 이미지 수정: ', response);
6757
return response;
6858
};

‎src/apis/group.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { jsonAxios } from '../axios';
33
// 그룹 리스트 가져오기
44
export const getGroupList = async () => {
55
const response = await jsonAxios.get(`/categories/name`);
6-
console.log('그룹 리스트 가져오기: ', response);
76
return response;
87
};
98

@@ -13,14 +12,12 @@ export const postGroup = async ({ name }) => {
1312
name: name,
1413
};
1514
const response = await jsonAxios.post(`/categories`, data);
16-
console.log('그룹 생성: ', response);
1715
return response;
1816
};
1917

2018
// 그룹 삭제
2119
export const deleteGroup = async ({ category_id }) => {
2220
const response = await jsonAxios.delete(`/categories/${category_id}`);
23-
console.log('그룹 생성: ', response);
2421
return response;
2522
};
2623

@@ -30,6 +27,5 @@ export const putGroup = async ({ name }) => {
3027
name: name,
3128
};
3229
const response = await jsonAxios.put(`/categories/${category_id}`, data);
33-
console.log('그룹 수정: ', response);
3430
return response;
3531
};

‎src/apis/myCard.js‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,29 @@ import { formDataAxios, jsonAxios } from '../axios';
33
// 내 명함 가져오기
44
export const getMyCard = async () => {
55
const response = await jsonAxios.get(`/me`);
6-
console.log('내 명함 가져오기: ', response);
76
return response;
87
};
98

109
// 내 명함 생성
1110
export const postMyCard = async ({ data }) => {
1211
const response = await formDataAxios.post(`/me`, data);
13-
console.log('내 명함 생성: ', response);
1412
return response;
1513
};
1614

1715
// 내 명함 삭제
1816
export const deleteMyCard = async () => {
1917
const response = await jsonAxios.delete(`/me`);
20-
console.log('내 명함 삭제: ', response);
2118
return response;
2219
};
2320

2421
// 내 명함 수정
2522
export const putMyCard = async ({ data }) => {
2623
const response = await formDataAxios.put(`/me`, data);
27-
console.log('내 명함 수정: ', response);
2824
return response;
2925
};
3026

3127
// 내 명함 프로필사진 수정
3228
export const putMyImg = async (formData) => {
3329
const response = await formDataAxios.put(`/me/images`, formData);
34-
console.log('내 명함 이미지 수정: ', response);
3530
return response;
3631
};

‎src/apis/ocr.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,5 @@ export const postOCR = async (body) => {
77
'Content-Type': 'multipart/form-data',
88
},
99
});
10-
11-
console.log('OCR 사진 업로드: ', response);
1210
return response;
1311
};

‎src/components/AddGroupModal/AddGroupModal.jsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@ export default function AddGroupModal({
8181
});
8282

8383
onGroupChange(modalBadges);
84-
console.log('newBadgeIds:', newBadgeIds);
85-
console.log('deletedBadgeIds:', deletedBadgeIds);
8684
};
8785

8886
const handleCancelBtnClick = () => {

‎src/components/Badge/BlueBadge.jsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ export default function BlueBadge({
1919
}, [activeBadge, setInfo]);
2020

2121
const handleBadgeClick = (badge) => {
22-
console.log('선택된 뱃지:', badge);
2322
setActiveBadge(badge);
2423
};
2524

‎src/components/CardInfo/CardInfo.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ export default function CardInfo({
3737
</S.CardWrapper>
3838
{!isDeleteMode && (
3939
<S.ArrowIconWrapper>
40-
<Icon id='arrow-right' fill='none' />
40+
<Icon id='arrow-right' fill='none' width={13} height={13}/>
4141
</S.ArrowIconWrapper>
4242
)}
4343
{isDeleteMode && (
4444
<S.ArrowIconWrapper>
45-
<Icon id={isSelected ? 'circle-check' : 'circle'} fill='none' />
45+
<Icon id={isSelected ? 'circle-check' : 'circle'} fill='none' width={16} height={16}/>
4646
</S.ArrowIconWrapper>
4747
)}
4848
</S.Card>

‎src/components/MyCard/MyCard.style.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ export const ExtraInfo = styled.div`
5757
color: #555;
5858
5959
p:nth-of-type(1) {
60-
font-size: 11px;
60+
font-size: 12px;
6161
font-weight: 500;
6262
}
6363
6464
p:nth-of-type(2) {
65-
font-size: 11px;
65+
font-size: 12px;
6666
font-weight: 400;
6767
}
6868
`;

‎src/nextDevelopItems/EmailLoginPage/EmailLoginPage.jsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import * as S from './EmailLoginPage.style';
2-
import Icon from '../../components/Icon/Icon';
3-
import email_login_background from '../../assets/images/email_login_background.svg';
4-
import { PrimaryButton } from '../../components';
51
import { useState } from 'react';
6-
import { MdCheckBox } from 'react-icons/md';
72
import { IoSquareOutline } from 'react-icons/io5';
3+
import { MdCheckBox } from 'react-icons/md';
84
import { useNavigate } from 'react-router-dom';
5+
import email_login_background from '../../assets/images/email_login_background.svg';
6+
import { PrimaryButton } from '../../components';
7+
import Icon from '../../components/Icon/Icon';
8+
import * as S from './EmailLoginPage.style';
99

1010
export default function EmailLoginPage() {
1111
const navigate = useNavigate();
@@ -54,7 +54,7 @@ export default function EmailLoginPage() {
5454
}}
5555
>
5656
<S.KakaoBtn>
57-
<Icon id='kakao' />
57+
<Icon id='kakao' width={15} height={14} />
5858
</S.KakaoBtn>
5959
카카오 계정 로그인
6060
</PrimaryButton>

‎src/pages/AddCardPage/AddCardPage.jsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ export default function AddCardPage() {
105105
setActiveBadge({ id: 2, name: '직접 입력' });
106106
setSearchParams({ mode: 'direct' });
107107
} catch (error) {
108-
console.log('OCR 실패: ', error);
108+
console.error('OCR 실패: ', error);
109109
alert(
110110
error.response?.data?.message || '명함 이미지 인식에 실패했습니다.'
111111
);
@@ -195,7 +195,6 @@ export default function AddCardPage() {
195195
}))
196196
}
197197
onOpenModal={() => {
198-
console.log('모달 열기 실행됨');
199198
setIsModalOpen(true);
200199
}}
201200
/>

0 commit comments

Comments
 (0)