Skip to content

Commit

Permalink
Merge pull request #143 from WebDeViper/refactor/console
Browse files Browse the repository at this point in the history
refactor: 콘솔로그 삭제
  • Loading branch information
hoonsdev authored Dec 5, 2023
2 parents 6fd0e17 + adfd42d commit 50ee983
Show file tree
Hide file tree
Showing 17 changed files with 6 additions and 106 deletions.
2 changes: 0 additions & 2 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,9 @@ function App() {
useEffect(() => {
if (isAuth) {
socket.on('newNotice', message => {
console.log(message, 'message');
dispatch(getAlarmMessage(message));
});
socket.on('newGroupRequest', message => {
console.log(message, '그룹 메세지');
dispatch(getAlarmMessage(message));
});
}
Expand Down
13 changes: 2 additions & 11 deletions src/pages/AlarmPage/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,8 @@ export default function AlarmPage() {
const arr: number[] = [];

for (let i = (currentPageGroup - 1) * 5 + 1; i <= Math.min(currentPageGroup * 5, totalPage); i++) {
console.log('추가!!!');
arr.push(i);
}
console.log('잘 추가됐나 :: ', arr);
// setPageList(arr);
setPagination(prev => {
return { ...prev, pageList: arr };
});
Expand All @@ -46,23 +43,19 @@ export default function AlarmPage() {

useEffect(() => {
const newMessage = [...alarmMessage].reverse();
// console.log(newMessage.slice((currentPage - 1) * 10, (currentPage - 1) * 10 + 10));
setAlarmList(newMessage.slice((currentPage - 1) * 10, (currentPage - 1) * 10 + 10));
// setAlarmList(newMessage);
setPagination(prev => {
return { ...prev, totalPage: Math.ceil(newMessage.length / 10) };
});
}, [alarmMessage]);
}, [alarmMessage, currentPage]);

useEffect(() => {
const newMessage = [...alarmMessage].reverse();
setAlarmList(newMessage.slice((currentPage - 1) * 10, (currentPage - 1) * 10 + 10));
}, [currentPage]);
}, [currentPage, alarmMessage]);

// 현재 페이지 설정
const handleSetPage = (page: number) => {
console.log(`페이지 ${page}로 변경!!!!`);
// setCurrentPage(page);
setPagination(prev => {
return { ...prev, currentPage: page };
});
Expand All @@ -89,8 +82,6 @@ export default function AlarmPage() {
}
};

// console.log('이 페이지 맞나');

const renderNotification = (value: Alarm) => {
switch (value.notification_kind) {
case 'new_notice':
Expand Down
1 change: 0 additions & 1 deletion src/pages/CreateGroupPage/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ export default function CreateGroupPage() {
setValue('groupImgFile', selectedFile);
const url = URL.createObjectURL(selectedFile);
setImgUrl(`${url}`);
console.log(url);
}
}
};
Expand Down
6 changes: 0 additions & 6 deletions src/pages/NoticePage/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,8 @@ export default function NoticePage({ isServiceAdmin }: Props) {
const arr: number[] = [];

for (let i = (currentPageGroup - 1) * 5 + 1; i <= Math.min(currentPageGroup * 5, totalPage); i++) {
console.log('추가!!!');
arr.push(i);
}
console.log('잘 추가됐나 :: ', arr);
// setPageList(arr);
setPagination(prev => {
return { ...prev, pageList: arr };
});
Expand All @@ -48,7 +45,6 @@ export default function NoticePage({ isServiceAdmin }: Props) {
try {
const response = await API.get(`/notices?currentPage=${currentPage}`);
const data = await response.data;
console.log('공지사항 :: ', data);
const { notices, total } = data;
// 공지사항 각 데이터 설정
setNotice(notices.reverse());
Expand Down Expand Up @@ -76,8 +72,6 @@ export default function NoticePage({ isServiceAdmin }: Props) {

// 현재 페이지 설정
const handleSetPage = (page: number) => {
console.log(`페이지 ${page}로 변경!!!!`);
// setCurrentPage(page);
setPagination(prev => {
return { ...prev, currentPage: page };
});
Expand Down
4 changes: 0 additions & 4 deletions src/pages/OAuthPage/KakaoPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,11 @@ export default function KakaoPage() {
code,
},
});
// console.log('토큰값:: ', response.data);

const { access_token } = response.data;
const profile = await getFirebaseCustomToken(access_token);
profile.provider = 'kakao';

// console.log('최종 profile :: ', profile);
// 리덕스에서 로그인 로직 처리 후 리덕스로 상태관리
await dispatch(socialUser(profile));
dispatch(socialRefreshUser());
Expand All @@ -48,7 +46,6 @@ export default function KakaoPage() {
Authorization: `Bearer ${access_token}`,
},
});
// console.log('두번째 토큰값::', response.data);

const profile = response.data;
return profile;
Expand All @@ -59,7 +56,6 @@ export default function KakaoPage() {

useEffect(() => {
const code = new URL(window.location.href).searchParams.get('code');
// console.log(code);
if (code) {
getToken(code);
}
Expand Down
8 changes: 2 additions & 6 deletions src/pages/ProfilePage/GroupInfo/GroupRequest.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ export default function GroupRequest({ group, setHasGroupRequests }: Props) {

// 요청 수락
const handleAccept = async (requestId: string) => {
const res = await API.post(`/group/studyGroup/${group.group_id}/${requestId}/requests/accept`);
console.log(res.data, '수락 응답!!');
await API.post(`/group/studyGroup/${group.group_id}/${requestId}/requests/accept`);
const newRequest = request.filter(item => item.userId !== requestId);
// 요청을 수락한 후 해당 요청을 배열에서 제거
setRequest(newRequest);
Expand All @@ -24,15 +23,12 @@ export default function GroupRequest({ group, setHasGroupRequests }: Props) {

// 요청 거절
const handleReject = async (requestId: string) => {
const res = await API.post(`/group/studyGroup/${group.group_id}/${requestId}/requests/reject`);
console.log(res.data, '거절 응답!!');
await API.post(`/group/studyGroup/${group.group_id}/${requestId}/requests/reject`);
const newRequest = request.filter(item => item.userId !== requestId);
// 요청을 거절한 후 해당 요청을 배열에서 제거
setRequest(newRequest);
};

console.log('리퀘스트는 :: ', request);

return (
<>
{group.nickNames.length > 0 && request.length > 0 && (
Expand Down
1 change: 0 additions & 1 deletion src/pages/ProfilePage/GroupInfo/MyGroupRequest.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ interface Props {

export default function MyGroupRequest({ groupInfo, setPendingGroups }: Props) {
const handleCancelRequest = async () => {
console.log('내가 신청중인 그룹 취소!!');
try {
const res = await API.delete(`/group/studyGroup/${groupInfo.group_id}/joinRequests`);
if (res.data.isSuccess) {
Expand Down
2 changes: 0 additions & 2 deletions src/pages/ProfilePage/GroupInfo/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ export default function GroupInfo() {
useEffect(() => {
const getGroups = async () => {
const res = await API.get('/group/getJoinRequest');
console.log('내 그룹에 신청중인 사람들 :: ', res.data);
const filteredGroup = res.data.groups;
filteredGroup.map((group: any) => {
group.nickNames.length > 0 ? setHasGroupRequests(true) : '';
Expand All @@ -21,7 +20,6 @@ export default function GroupInfo() {
const getPendingGroups = async () => {
try {
const res = await API.get('/group/pendingGroups');
console.log('팬딩 그룹 서버 요청 :: ', res.data);
setPendingGroups(res.data.pendingGroups); // 서버에서 받은 데이터를 설정
} catch (error) {
console.error('Error fetching pending groups:', error);
Expand Down
8 changes: 2 additions & 6 deletions src/pages/ProfilePage/UserInfo/EditCategory.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useEffect, useState } from 'react';
import { useState } from 'react';
import { SimpleDropdown } from '../../../components/common/Dropdown';
import { Button } from '../../../components/common/Button';
import { profileUser } from '../../../store/thunkFunctions';
Expand All @@ -12,13 +12,9 @@ interface Props {
}

export default function EditCategory({ dispatch }: Props) {
const currentCategory = useAppSelector(state => state.user?.userInfo?.category);
const currentCategory = useAppSelector(state => state.user.userInfo.category);
const [category, setCategory] = useState<string | null>(currentCategory);

useEffect(() => {
console.log('마이페이지 카테고리 변경 잘 되나 ::', category);
}, [category]);

const handleClick = (e: React.MouseEvent<HTMLDivElement>) => {
const target = e.currentTarget;
setCategory(target.innerText);
Expand Down
2 changes: 0 additions & 2 deletions src/pages/ProfilePage/UserInfo/EditNickName.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ export default function EditNickName({ dispatch }: Props) {

const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
const inputNick = e.target.value;
// console.log(inputNick.trim().length);
inputNick.trim() ? setNickName(inputNick) : setNickName('');
if (!inputNick) {
setMessage('');
Expand All @@ -42,7 +41,6 @@ export default function EditNickName({ dispatch }: Props) {
setIsValidate(true);
}
};
console.log('닉네임 상태>>>', nickName);

// input에서 엔터로 중복체크
const handleKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
Expand Down
2 changes: 0 additions & 2 deletions src/pages/ProfilePage/UserInfo/EditProfileImage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ export default function EditProfileImage() {
const profileImgPath = useAppSelector(state => state.user?.userInfo.profileImg);
const [isImgChanged, setIsImgChanged] = useState(false);
const imgRef = useRef<HTMLInputElement>(null);
// console.log('마이페이지 유저>>>', profileImgPath);

// 프로필 사진 변경 (버튼 누르면 input 클릭되게)
const handleChangeProfileImg = (e: React.MouseEvent) => {
Expand Down Expand Up @@ -63,7 +62,6 @@ export default function EditProfileImage() {
// 요청이 실패했을 때 실행할 코드
console.error('요청 중 오류가 발생했습니다.', error);
}
// console.log(imgRef.current.files[0]);
};

return (
Expand Down
25 changes: 0 additions & 25 deletions src/pages/RankingPage/GroupRank/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// import { Card } from 'flowbite-react';
// import React from 'react';
import { useMediaQuery } from 'react-responsive';
import FadeLoader from 'react-spinners/FadeLoader';

Expand All @@ -18,8 +16,6 @@ interface GroupRank {
export default function GroupRank({ groupRanking, calculateTime, isLoading }: Props) {
const isTablet = useMediaQuery({ maxWidth: 768 });

// console.log('그룹 랭킹 :: ', groupRanking);

return (
<section className="flex flex-col">
{isLoading ? (
Expand All @@ -31,27 +27,6 @@ export default function GroupRank({ groupRanking, calculateTime, isLoading }: Pr
<div className="groupRankingWrap">
<div className="top3 flex flex-col gap-2 mb-2">
{groupRanking?.slice(0, 3)?.map((group: GroupRank, index: number) => (
// <div
// key={Math.random() * 1000000000000}
// className={`rank${
// index + 1
// } flex justify-between md:items-center md:w-1/3 mb-3 shadow-xl rounded-lg py-2`}
// >
// {!isTablet && (
// <div className="w-1/2 flex justify-center">
// <img
// className="w-3/4 h-full rounded-lg"
// src={import.meta.env.VITE_APP_BACK_URL + group.group_img_path}
// alt="그룹 이미지"
// />
// </div>
// )}
// <div className="groupInfoWrap flex md:flex-col w-full md:w-1/2 md:gap-0 items-center justify-between gap-5 px-5 md:px-0">
// <span className="font-extrabold text-lg">{index + 1}등</span>
// <span className="font-bold">{group.group_name}</span>
// <span>{group.averageTime ? calculateTime(group.averageTime) : '00:00:00'}</span>
// </div>
// </div>
<div
key={Math.random() * 1000000000000}
className={`rank${
Expand Down
25 changes: 0 additions & 25 deletions src/pages/RankingPage/UserRank/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// import { Card } from 'flowbite-react';
// import React from 'react';
import { useMediaQuery } from 'react-responsive';
import FadeLoader from 'react-spinners/FadeLoader';

Expand All @@ -18,8 +16,6 @@ interface IUserRank {
export default function UserRank({ userRanking, calculateTime, isLoading }: Props) {
const isTablet = useMediaQuery({ maxWidth: 768 });

// console.log('유저 랭킹 :: ', userRanking);

return (
<section className="flex flex-col">
{isLoading ? (
Expand All @@ -32,27 +28,6 @@ export default function UserRank({ userRanking, calculateTime, isLoading }: Prop
<div>
<div className="top3 flex flex-col gap-2 mb-2">
{userRanking?.slice(0, 3)?.map((user, index) => (
// <div
// key={Math.random() * 1000000000000}
// className={`rank${
// index + 1
// } flex justify-between md:items-center md:w-1/3 mb-3 shadow-xl rounded-lg py-2`}
// >
// {!isTablet && (
// <div className="w-1/2 flex justify-center">
// <img
// className="w-3/4 h-full rounded-lg"
// src={import.meta.env.VITE_APP_BACK_URL + user.user_profile_image_path}
// alt="유저 이미지"
// />
// </div>
// )}
// <div className="userInfoWrap flex md:flex-col w-full md:w-1/2 md:gap-0 items-center justify-between gap-5 px-5 md:px-0">
// <span className="font-extrabold text-lg">{index + 1}등</span>
// <span className="font-bold">{user.user_nickname}</span>
// <span>{user.user_total_time ? calculateTime(user.user_total_time) : '00:00:00'}</span>
// </div>
// </div>
<div
key={Math.random() * 1000000000000}
className={`rank${
Expand Down
10 changes: 0 additions & 10 deletions src/pages/RankingPage/index.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
import { useCallback, useEffect, useState } from 'react';
import { API } from '../../utils/axios';
import categories from '../../data/category';
// import DropDown from '../../components/common/DropDown';
// import UserRank from './userRank';
// import GroupRank from './groupRank';
import UserRank from './UserRank';
import GroupRank from './GroupRank';
// import { Badge } from 'flowbite-react';
import calculateTime from '../../utils/calculateTime';
import { useAppSelector } from '../../store/store';
import Badge from '../../components/common/Badge';
Expand All @@ -25,13 +21,10 @@ export default function RankingPage() {
const [rankType, setRankType] = useState('user');
const [isLoading, setIsLoading] = useState(true);

// console.log('뭐지??', top3, other);

// 처음 들어왔을 때 디폴트 카테고리로 조회한 결과 보여주기
const getFirstRank = async () => {
try {
const res = await API.get('/ranking');
console.log(res.data);
if (res.data) {
setRank(res.data);
setIsLoading(false);
Expand All @@ -43,7 +36,6 @@ export default function RankingPage() {

// 서버에서 응답받은 데이터로 랭킹 state 업데이트하는 함수
const setRank = (data: any) => {
console.log('setRank 실행!!!');
const { topUsers, topGroups } = data;
if (topUsers && topGroups) {
setUserRanking(topUsers);
Expand All @@ -63,12 +55,10 @@ export default function RankingPage() {
// 카테고리별 탑텐 요청하는 함수.. 카테고리 바뀔때만 함수 재정의(useCallback)
const getCategory = useCallback(async () => {
// 바뀐 카테고리에 해당하는 랭킹 데이터 요청
console.log('카테고리 바뀔 때 마다 다시 정의하는 getCategory 함수 실행!!');
setIsLoading(true);
if (category !== '인기 있는 카테고리') {
try {
const res = await API.get(`/ranking?category=${category}`);
console.log('카테고리 바뀐 후 랭킹 데이터 :: ', res.data);
if (res.data) {
setRank(res.data);
setIsLoading(false);
Expand Down
1 change: 0 additions & 1 deletion src/pages/StudyPage/MyGroup/MyGoal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ export default function MyGoal() {
} else {
alert('상태 메세지를 작성해주세요!');
}
// console.log(inputMsg);
}
};

Expand Down
1 change: 0 additions & 1 deletion src/pages/ZoomPage/Zoom/Profile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ interface Props {
}

export default function Profile({ user }: Props) {
console.log('렌더링');
return (
<>
<div className="w-16 h-16 rounded-full overflow-hidden relative inset-2/4 -translate-x-2/4 -translate-y-2/4">
Expand Down
1 change: 0 additions & 1 deletion src/pages/ZoomPage/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ export default function ZoomPage() {
setUsers(users);
});
socket.on('updateUser', (users: GetUser[]) => {
console.log(users, 'updateUser');
setUsers(users);
});
socket.on('leaveRoom', (users: GetUser[]) => {
Expand Down

0 comments on commit 50ee983

Please sign in to comment.