Skip to content

Commit 0bd5e16

Browse files
Upload/Main Merge #100
Upload/Main Merge #100
2 parents d5d66c4 + f36ee6e commit 0bd5e16

23 files changed

+5
-92
lines changed

src/api/LoginApi.jsx

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ export const LoginApi = {
77
},
88

99
KakaoLogin: async (payload) => {
10-
console.log("카카오 페이로드", payload);
1110
return await instance.post("kakao/login", payload);
1211
},
1312

src/api/ScheduleApi.jsx

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ export const ScheduleApi = {
2222
},
2323
//스케줄 수정
2424
editScheduleApi: (payload) => {
25-
console.log("수정데이터?", payload);
2625
const data = instance.put(`/events/${payload.eventId}`, payload.Schedule);
2726
return data;
2827
},

src/components/follow/FollowList.jsx

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ const FollowList = () => {
3232
}, [follower, following]);
3333

3434
const handleTabChange = (tab) => {
35-
console.log(tab);
3635
setActiveTab(tab);
3736
if (tab === "following") {
3837
setBdColor({

src/components/layout/TopNavBar.jsx

-4
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ const TopNavBar = () => {
7878
await setAllChecked("");
7979
});
8080
} catch (error) {
81-
console.log("에러발생:", error);
8281
if (eventSource) eventSource.close();
8382
}
8483
};
@@ -113,15 +112,13 @@ const TopNavBar = () => {
113112
//navigate 경로는 검색페이지루트가 정해지면 변경하면됩니다
114113
onClick={() => {
115114
navigate("/userSearch");
116-
console.log("검색페이지로이동");
117115
}}
118116
/>
119117
<img
120118
className="h-[24px] cursor-pointer w-[24px] flex left-[293px] mt-[13px]"
121119
src={plusIcon}
122120
alt="추가버튼"
123121
onClick={() => {
124-
console.log("스케쥴추가페이지로이동!");
125122
//스케줄 추가를 하기 위한 파라미터 값을 넘긴다.
126123
navigate("/schedule", { state: { type: "add", id: "" } });
127124
}}
@@ -132,7 +129,6 @@ const TopNavBar = () => {
132129
src={notifyIcon}
133130
alt="알림버튼"
134131
onClick={() => {
135-
console.log("알림페이지로 이동");
136132
navigate("/notification");
137133
}}
138134
/>

src/components/login/InputEmail.jsx

+1-5
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ const InputEmail = () => {
4646
const emailRefCurrent = emailRef.current;
4747
const authenticationNumberRefCurrent = authenticationNumberRef.current;
4848
if (id === "email") {
49-
console.log("email입니다");
5049
setStyle(() => ({
5150
...style,
5251
bgColorEmail: "bg-inputBoxFocus",
@@ -114,7 +113,6 @@ const InputEmail = () => {
114113
onModalOpen();
115114
const data = await LoginApi.SendEmailAuthenticationNumber(payload);
116115
setIsLoding(() => false);
117-
console.log(data);
118116
if (data.status === 200) {
119117
sessionStorage.setItem("changePasswordEmail", payload.email);
120118
setModalStr({
@@ -124,7 +122,6 @@ const InputEmail = () => {
124122
setInputCheck(() => ({ ...InputCheck, input: true }));
125123
}
126124
} catch (error) {
127-
console.log(error.response);
128125
const { data } = error.response;
129126
if (data.status === 400) {
130127
setIsLoding(() => false);
@@ -182,7 +179,7 @@ const InputEmail = () => {
182179
onModalOpen();
183180
const { data } = await LoginApi.SendAuthenticationNumber(payload);
184181
setIsLoding(() => false);
185-
console.log(data);
182+
186183
if (data.status === 200) {
187184
setModalStr({
188185
...ModalStr,
@@ -192,7 +189,6 @@ const InputEmail = () => {
192189
setInputCheck(() => ({ ...InputCheck, modal: true }));
193190
}
194191
} catch (error) {
195-
console.log(error.response);
196192
const { data } = error.response;
197193
if (data.status === 400) {
198194
setIsLoding(() => false);

src/components/login/KakaoLoginLoding.jsx

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ const KakaoLoginLoding = () => {
1010

1111
// new URL 객체에서 searchParams객체의 get메소드를 사용하여 'code'키의 값을 추출
1212
const code = new URL(window.location.href).searchParams.get("code");
13-
console.log("카카오 인가코드", code);
1413

1514
// 페이지가 로딩됨과 동시에 디스패치로 code 전달
1615
useEffect(() => {

src/components/login/NaverLoginLoding.jsx

-7
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ function NaverLoginLoding() {
99

1010
const getToken = async () => {
1111
const navertoken = window.location.href.split("=")[1].split("&")[0];
12-
console.log(navertoken);
13-
1412
// sessionStorage.setItem("NaverAuthorization", navertoken);
1513
};
1614

@@ -24,16 +22,12 @@ function NaverLoginLoding() {
2422

2523
.then((res) => {
2624
//이미 멤버라면 Authorization이 담겨 올 것이고, member라고
27-
console.log("res", res);
28-
console.log("email?", res.data.data.email);
29-
console.log("member?", res.data.message);
3025
const email = res.data.data.email;
3126
if (res.data.message !== "non-member") {
3227
const accessToken = res.headers.get("Authorization");
3328
const nickname = res.data.data.nickname;
3429
const userId = res.data.data.userId;
3530
const profileImage = res.data.data.profileImage;
36-
console.log(nickname);
3731
sessionStorage.setItem("accessToken", accessToken);
3832
sessionStorage.setItem("nickname", nickname);
3933
sessionStorage.setItem("profileImage", profileImage);
@@ -50,7 +44,6 @@ function NaverLoginLoding() {
5044
return window.location.assign("/signup/setProfileName");
5145
}
5246
});
53-
// console.log(data);
5447
};
5548

5649
useEffect(() => {

src/components/main/InfiniteScroll.jsx

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import MoonLoader from "react-spinners/MoonLoader";
88
const InfiniteScroll = () => {
99
const dispatch = useDispatch();
1010
const { schedules, isLoading } = useSelector((state) => state.ScheduleSlice);
11-
console.log(isLoading);
1211
//페이징 생성
1312
const [page, setPage] = useState(0);
1413
//중복 실행 방저

src/components/modal/JoinerList.jsx

+1-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ const JoinerList = ({
99
setSelectedUserNames,
1010
selectedUserNames,
1111
}) => {
12-
useEffect(() => {
13-
console.log(selectedUserIds);
14-
}, [selectedUserIds]);
12+
useEffect(() => {}, [selectedUserIds]);
1513

1614
function selectHandler(followId) {
1715
// 기존 선택된 사용자 ID 리스트에서 해당 아이디가 이미 선택되어 있는지 확인

src/components/modal/KebabButtonModal.jsx

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ const KebabModal = ({ setModalOpen, id }) => {
2525
const confirmDeleteHandler = () => {
2626
//DELETE 기능넣으면 됨
2727
dispatch(__deleteSchedule([id, userId, dispatch]));
28-
console.log(id);
2928
navigate("/main");
3029
};
3130

src/components/mypage/ InvitationCard.jsx

-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ import {
66
} from "../../redux/modules/InvitationSlice";
77

88
const InvitationCard = ({ invit }) => {
9-
console.log("뭘까요?", invit);
10-
119
const hourClock = invit.time.split(":", 2)[0];
1210
let hour = 0;
1311
const min = invit.time.split(":", 2)[1];

src/components/mypage/PastEvents.jsx

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import PageInfoCard from "./PageInfoCard";
88
const PastEvents = () => {
99
const dispatch = useDispatch();
1010
const { pastSchedules } = useSelector((state) => state.ScheduleSlice);
11-
console.log(pastSchedules);
1211
const nickname = sessionStorage.getItem("nickname");
1312
const profileImg = sessionStorage.getItem("profileImage");
1413

src/components/mypage/ProfileEdit.jsx

-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ const ProfileEdit = () => {
3030
const formData = new FormData();
3131
formData.append("image", null);
3232
const response = await UserApi.editProfile(formData);
33-
console.log(response);
3433
if (response.status === 200) {
3534
alert("프로필이미지가 변경되었습니다!");
3635
setLoading(false);
@@ -43,14 +42,12 @@ const ProfileEdit = () => {
4342
setLoading(true);
4443
try {
4544
const imgFile = imgRef.current.files[0];
46-
console.log(imgFile);
4745
const formData = new FormData();
4846
if (imgFile !== undefined) {
4947
formData.append("image", imgFile);
5048
}
5149

5250
const response = await UserApi.editProfile(formData);
53-
console.log(response);
5451
if (response.status === 200) {
5552
alert("프로필이미지가 변경되었습니다!");
5653
setLoading(false);

src/components/notification/NotificationsList.jsx

-6
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ const NotificationsList = () => {
1414

1515
const getNoti = async () => {
1616
await instance.get("/notifications").then((res) => {
17-
console.log(res);
1817
const newNotifications = res.data.data.map((data) => ({
1918
id: data.notificationId,
2019
message: data.message,
@@ -23,7 +22,6 @@ const NotificationsList = () => {
2322
isChecked: data.isChecked,
2423
time: data.dateTime.toString().split("T")[1].split(".")[0].slice(0, 5),
2524
}));
26-
console.log(newNotifications);
2725
setNotifications((prevNotifications) => [
2826
...newNotifications,
2927
...prevNotifications,
@@ -72,7 +70,6 @@ const NotificationsList = () => {
7270

7371
eventSource.addEventListener("invite", (event) => {
7472
const data = JSON.parse(event.data);
75-
console.log("invite메세지 도착! parsing한거", data);
7673
// alert("초대가 도착했습니다", data.message);
7774
const newNotification = {
7875
id: data.notificationId,
@@ -93,7 +90,6 @@ const NotificationsList = () => {
9390

9491
eventSource.addEventListener("follow", (event) => {
9592
const data = JSON.parse(event.data);
96-
console.log("follow메세지 도착! parsing한거", data);
9793
const newNotification = {
9894
id: data.notificationId,
9995
message: data.message,
@@ -102,7 +98,6 @@ const NotificationsList = () => {
10298
isChecked: data.isChecked,
10399
};
104100

105-
console.log("follow알림도착!", data.message);
106101
setNotifications((prevNotifications) => [
107102
newNotification,
108103
...prevNotifications,
@@ -116,7 +111,6 @@ const NotificationsList = () => {
116111
}
117112
};
118113
fetchSse();
119-
console.log(notification);
120114
return () => {
121115
eventSource.close();
122116
};

src/components/schedule/ScheduleAdd.jsx

-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ const ScheduleAdd = () => {
3030

3131
//전역으로 받아오는 state
3232
const oldSchedule = useSelector((state) => state.ScheduleSlice.oldschedules);
33-
console.log("수정할 스케줄", oldSchedule);
3433

3534
//필요한 변수들
3635
//날짜
@@ -157,7 +156,6 @@ const ScheduleAdd = () => {
157156
setCompleteModal(true);
158157
sessionStorage.removeItem("selectedJoiner");
159158
sessionStorage.removeItem("selectedJoinerNames");
160-
console.log("생성된 스케쥴:", newSchedule);
161159
setTimeout(() => navigate("/main"), 1000);
162160
} else {
163161
setModalOpen(true);

src/components/signup/SetProfileImg.jsx

+1-6
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,8 @@ const SetProfileImg = () => {
7777

7878
//이메일 회원가입시 백단 연결
7979
const sginupAxios = async ({ formData, data, url }) => {
80-
console.log(data);
8180
const json = JSON.stringify(data);
8281
const blob = new Blob([json], { type: "application/json" });
83-
console.log(blob);
8482
formData.append("data", blob);
8583

8684
await axios
@@ -90,10 +88,9 @@ const SetProfileImg = () => {
9088
},
9189
})
9290
.then((response) => {
93-
console.log(response.status);
9491
if (response.status === 201) {
9592
setDisabled(() => true);
96-
console.log(response);
93+
9794
setModalStr({
9895
modalTitle: "회원가입완료!",
9996
modalMessage: "그님스와 함께 약속들을 관리해보아요!",
@@ -109,10 +106,8 @@ const SetProfileImg = () => {
109106
})
110107
.catch((error) => {
111108
setDisabled(() => false);
112-
console.log(error.response);
113109
const { data } = error.response;
114110
if (data.status === 400) {
115-
console.log(data.message);
116111
setModalStr({
117112
modalTitle: "다시 한 번 확인해주세요",
118113
modalMessage: "닉네임과 이름을 다시 한 번 확인해주세요.",

src/components/signup/SetProfileName.jsx

-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ const SetProfileName = () => {
9595

9696
//모달창
9797
const onMoalClose = () => {
98-
console.log("닫기 동족하나?");
9998
dispatch(__closeModal(dispatch));
10099
};
101100

src/redux/modules/FollowSlice.jsx

+1-11
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ export const __getFollower = createAsyncThunk(
2323
const data = await instance.get(`/friendship/followers`);
2424
return thunkAPI.fulfillWithValue(data.data);
2525
} catch (error) {
26-
console.log(error.response.data.errorMessage);
2726
return thunkAPI.rejectWithValue(error.response.data.errorMessage);
2827
}
2928
}
@@ -37,7 +36,6 @@ export const __getFollowing = createAsyncThunk(
3736
const data = await instance.get(`/friendship/followings`);
3837
return thunkAPI.fulfillWithValue(data.data);
3938
} catch (error) {
40-
console.log(error.response.data.errorMessage);
4139
return thunkAPI.rejectWithValue(error.response.data.errorMessage);
4240
}
4341
}
@@ -46,14 +44,12 @@ export const __getFollowing = createAsyncThunk(
4644
export const __postFollowState = createAsyncThunk(
4745
"getFollowState",
4846
async (payload, thunkAPI) => {
49-
console.log("팔로우 스테이트", payload);
5047
try {
5148
const data = await instance.post(`/friendship/followings/${payload.id}`);
5249
if (payload.state === "follower") {
5350
return thunkAPI.dispatch(__getFollower());
5451
} else return thunkAPI.dispatch(__getFollowing());
5552
} catch (error) {
56-
console.log(error.response.data.errorMessage);
5753
return thunkAPI.rejectWithValue(error.response.data.errorMessage);
5854
}
5955
}
@@ -64,10 +60,8 @@ export const __getFollowingCount = createAsyncThunk(
6460
async (payload, thunkAPI) => {
6561
try {
6662
const { data } = await instance.get(`/friendship/followings/counting`);
67-
// console.log("팔로잉 카운트", data.data);
6863
return thunkAPI.fulfillWithValue(data.data);
6964
} catch (error) {
70-
console.log(error.response.data.errorMessage);
7165
return thunkAPI.rejectWithValue(error.response.data.errorMessage);
7266
}
7367
}
@@ -78,10 +72,9 @@ export const __getFollowerCount = createAsyncThunk(
7872
async (payload, thunkAPI) => {
7973
try {
8074
const { data } = await instance.get(`/friendship/followers/counting`);
81-
// console.log("팔로워 카운트", data.data);
75+
8276
return thunkAPI.fulfillWithValue(data.data);
8377
} catch (error) {
84-
console.log(error.response.data.errorMessage);
8578
return thunkAPI.rejectWithValue(error.response.data.errorMessage);
8679
}
8780
}
@@ -97,7 +90,6 @@ export const followSlice = createSlice({
9790
state.isLoading = true;
9891
},
9992
[__getFollower.fulfilled]: (state, action) => {
100-
console.log("followerList");
10193
state.isLoading = false;
10294
state.follower.followerList = action.payload.data;
10395
},
@@ -110,7 +102,6 @@ export const followSlice = createSlice({
110102
state.isLoading = true;
111103
},
112104
[__getFollowing.fulfilled]: (state, action) => {
113-
console.log("followingList");
114105
state.isLoading = false;
115106
state.following.followingList = action.payload.data;
116107
},
@@ -125,7 +116,6 @@ export const followSlice = createSlice({
125116
[__postFollowState.fulfilled]: (state, action) => {
126117
state.isLoading = false;
127118
state.followState = action.payload;
128-
console.log(action.payload);
129119
},
130120
[__postFollowState.rejected]: (state, action) => {
131121
state.isLoading = false;

0 commit comments

Comments
 (0)