Skip to content

Commit 1311d4a

Browse files
authored
Merge pull request #297 from prgrms-web-devcourse-final-project/refactor/296-signUp
[refactor] 회원가입 리펙토링 & 필요없는 콘솔 제거
2 parents 285bcb4 + 4c64aed commit 1311d4a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+223
-405
lines changed

src/apis/auth.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export const reissueToken = async () => {
3939

4040
if (code === 200) {
4141
useAuthStore.getState().setAccessToken(accessToken); // 토큰 전역 상태 저장
42-
console.log('토큰 재발급 성공:', accessToken);
42+
// // console.log('토큰 재발급 성공:', accessToken);
4343
} else {
4444
throw new Error('토큰 재발급 실패');
4545
}

src/apis/axios.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ axiosChatInstance.interceptors.request.use(
2626
// 토큰이 있으면 요청 헤더에 추가
2727
if (token) {
2828
config.headers.Authorization = `Bearer ${token}`;
29-
// console.log('요청 헤더에 Authorization 추가됨:', config.headers);
29+
// // console.log('요청 헤더에 Authorization 추가됨:', config.headers);
3030
}
3131
return config;
3232
},
3333
(error) => {
34-
console.log('요청 인터셉터 에러', error);
34+
// console.log('요청 인터셉터 에러', error);
3535
Promise.reject(error);
3636
},
3737
);
@@ -44,12 +44,12 @@ axiosInstance.interceptors.request.use(
4444
// 토큰이 있으면 요청 헤더에 추가
4545
if (token) {
4646
config.headers.Authorization = `Bearer ${token}`;
47-
// console.log('요청 헤더에 Authorization 추가됨:', config.headers);
47+
// // console.log('요청 헤더에 Authorization 추가됨:', config.headers);
4848
}
4949
return config;
5050
},
5151
(error) => {
52-
console.log('요청 인터셉터 에러', error);
52+
// console.log('요청 인터셉터 에러', error);
5353
Promise.reject(error);
5454
},
5555
);

src/components/ButtonInput.tsx

Lines changed: 0 additions & 54 deletions
This file was deleted.

src/components/ChatConnectLoadingSheet.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,17 @@
5555
// //채팅 요청 취소(요청 보낸 사람)
5656
// const cancel = async () => {
5757
// if (!currentRecord?.recordId) {
58-
// console.log('record가 존재하지 않습니다');
58+
// // console.log('record가 존재하지 않습니다');
5959
// return;
6060
// }
6161
// try {
62-
// console.log(currentRecord);
62+
// // console.log(currentRecord);
6363
// await cancelChatRequest(currentRecord.recordId);
64-
// console.log('채팅 취소');
64+
// // console.log('채팅 취소');
6565

6666
// closeSheet('isChatLoadingSheetOpen');
6767
// } catch (error) {
68-
// console.log(error);
68+
// // console.log(error);
6969
// }
7070
// };
7171

@@ -77,15 +77,15 @@
7777
// try {
7878
// //1 = recordId
7979
// const data = await createChatroom(1, '루루');
80-
// console.log(data);
80+
// // console.log(data);
8181
// const chatRoomId = data.data.chatRoomId;
8282

8383
// //200
8484
// //409 이면 이미 채팅방 있음 => 기존 채팅방으로
8585
// navigate(`/chatroom/${chatRoomId}`);
8686
// closeAllSheets();
8787
// } catch (error) {
88-
// console.log(error);
88+
// // console.log(error);
8989
// }
9090
// };
9191

src/components/ChatConnectLoadingSheet/ChatRequestButton.tsx

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ function ChatRequestButton({ type }: { type: 'sending' | 'receiving' }) {
1717
//채팅 요청 취소(요청 보낸 사람)
1818
const cancel = async () => {
1919
if (!currentRecord?.recordId && !pastRecord?.recordId) {
20-
console.log('record가 존재하지 않습니다');
20+
// console.log('record가 존재하지 않습니다');
2121
return;
2222
}
2323
try {
24-
console.log(currentRecord);
24+
// console.log(currentRecord);
2525
const { code } = await cancelChatRequest(
2626
currentRecord?.recordId || Number(pastRecord?.recordId),
2727
);
2828
if (code === 200) {
29-
console.log('취소 요청 성공');
29+
// console.log('취소 요청 성공');
3030
closeSheet('isRequestSendingSheetOpen');
3131
} else {
3232
throw new Error('취소 요청 실패');
@@ -42,11 +42,10 @@ function ChatRequestButton({ type }: { type: 'sending' | 'receiving' }) {
4242
//sse로 받은 상대 정보로 '보내는 사람' 바꾸기
4343
const createChat = async () => {
4444
try {
45-
const { code, data, message } = await createChatroom(
45+
const { code, data } = await createChatroom(
4646
requesterInfo.emotionRecordId as number,
4747
requesterInfo.nickname,
4848
);
49-
console.log(code, message, data);
5049

5150
if (code === 200) {
5251
const chatRoomId = data.chatRoomId;
@@ -66,7 +65,7 @@ function ChatRequestButton({ type }: { type: 'sending' | 'receiving' }) {
6665
throw new Error('이미 취소된 요청입니다.');
6766
}
6867
} catch (error) {
69-
console.log(error);
68+
// console.log(error);
7069
openModal({
7170
title: '이미 취소된 요청입니다',
7271
onConfirm: () => {
@@ -87,7 +86,7 @@ function ChatRequestButton({ type }: { type: 'sending' | 'receiving' }) {
8786
requesterInfo.nickname,
8887
);
8988
if (code === 200) {
90-
console.log('거절 성공');
89+
// console.log('거절 성공');
9190
closeSheet('isRequestReceivingSheetOpen');
9291
} else {
9392
throw new Error('요청 취소 실패');

src/components/ChatHistoryCard.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ export default function ChatHistoryCard({ item }: ChatHistoryCardProps) {
2929
//요청 보내면 sse로 recordId, 보낸 사람 정보 보내줘야 함
3030
const request = async () => {
3131
if (!item.recordId) {
32-
console.log('recordId가 존재하지 않습니다.');
32+
//// console.log('recordId가 존재하지 않습니다.');
3333
return;
3434
}
3535
try {
3636
const { code, message } = await requestChat(Number(item.recordId));
37-
console.log(code, message);
37+
// console.log(code, message);
3838

3939
//200
4040
if (code === 200) {
@@ -51,7 +51,7 @@ export default function ChatHistoryCard({ item }: ChatHistoryCardProps) {
5151
}
5252
//자신의 게시글에 요청했을 경우
5353
} catch (error) {
54-
console.log(error);
54+
// console.log(error);
5555
openModal({
5656
title: '잠시 후 다시 시도해 주세요',
5757
onConfirm: () => {

src/components/InputField.tsx

Lines changed: 11 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,48 @@
1-
import LoadingSpinnerButton from '@/components/button/LoadingSpinnerButton';
21
import Input from '@/components/Input';
32
import { twMerge } from 'tailwind-merge';
43

5-
type ButtonHandler = {
6-
buttonEnabled: boolean; // 버튼 비활성화 여부
7-
buttonText: string; // 버튼 text
8-
isPending: boolean; // pending 중인지 판단
9-
onClick: () => void; // 클릭 함수
10-
};
11-
124
interface InputFieldProps extends React.InputHTMLAttributes<HTMLInputElement> {
135
id: string;
146
label: string;
157
isValid?: boolean;
16-
validationMessage?: string;
17-
buttonHandler?: ButtonHandler;
8+
message?: string;
9+
actionButton?: React.ReactNode;
1810
}
1911

2012
export default function InputField({
2113
id,
2214
label,
2315
isValid,
24-
validationMessage,
25-
buttonHandler,
16+
message,
17+
actionButton,
2618
...props
2719
}: InputFieldProps) {
2820
return (
29-
<div className="flex flex-col w-full">
21+
<div className="flex flex-col w-full gap-0.5">
3022
{/* 라벨 */}
31-
<label htmlFor={id} className="body-r text-gray-80 ml-[5px] mb-0.5">
23+
<label htmlFor={id} className="body-r text-gray-80 pl-[5px]">
3224
{label}
3325
</label>
3426

3527
{/* 입력 필드 + 버튼 */}
3628
<div className="flex gap-2">
3729
<Input id={id} {...props} />
38-
{buttonHandler && (
39-
<LoadingSpinnerButton
40-
{...buttonHandler}
41-
className="w-[65px] flex-shrink-0"
42-
type="button"
43-
/>
44-
)}
30+
{actionButton && <div className="shrink-0">{actionButton}</div>}
4531
</div>
4632

4733
{/* 유효성 검사 메시지 */}
48-
<div className="flex items-center h-5">
49-
{validationMessage && (
34+
<div className="flex items-center h-[18px]">
35+
{message && (
5036
<p
5137
className={twMerge(
52-
'text-[9px]/[18px] ml-1',
38+
'text-[9px]/[18px] pl-[5px]',
5339
isValid ? 'text-functional-success' : 'text-functional-danger',
5440
)}
5541
>
56-
{validationMessage}
42+
{message}
5743
</p>
5844
)}
5945
</div>
6046
</div>
6147
);
6248
}
63-
64-
//사용 예시
65-
{
66-
// <InputField
67-
// type="text"
68-
// id="nickname"
69-
// label="닉네임"
70-
// placeholder="닉네임을 입력해 주세요"
71-
// errorMessage="닉네임 중복"
72-
// variant="primary"
73-
// buttonText="중복확인"
74-
// />
75-
}

src/components/KaKaoRedirection.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ function KaKaoRedirection() {
1111

1212
const handleKaKaoLogin = async () => {
1313
try {
14-
console.log('kakaoCode', kakaoCode);
14+
// console.log('kakaoCode', kakaoCode);
1515
const { code, data } = await getKakaoLogin(kakaoCode as string);
1616
if (code === 200) {
1717
setAccessToken(data.accessToken);
@@ -26,7 +26,7 @@ function KaKaoRedirection() {
2626

2727
useEffect(() => {
2828
if (kakaoCode) {
29-
console.log('🔴 kakaoCode', kakaoCode);
29+
// console.log('🔴 kakaoCode', kakaoCode);
3030
handleKaKaoLogin();
3131
}
3232
}, []);

src/components/Modal.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,11 @@ export default function Modal() {
8989
confirmText:'확인', // default: '확인'
9090
cancelText:'취소', // default: '취소'
9191
onConfirm() {
92-
console.log('확인');
92+
// console.log('확인');
9393
closeModal();
9494
},
9595
onCancel() {
96-
console.log('취소');
96+
// console.log('취소');
9797
closeModal();
9898
},
9999
})

src/components/MoreOptionsSelect.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ export default MoreOptionsSelect;
4848

4949
// 함수 선언하기
5050
// const handleEditProfile = () => {
51-
// console.log('프로필 수정 클릭!');
51+
// // console.log('프로필 수정 클릭!');
5252
// };
5353

5454
// const handleLogout = () => {
55-
// console.log('로그아웃 클릭!');
55+
// // console.log('로그아웃 클릭!');
5656
// };
5757

5858
{

0 commit comments

Comments
 (0)