Merge branch 'main' into others/토너먼트-브라켓-및-스와이퍼-로딩-컴포넌트-적용-#1203

42organization · Jan 4, 2024 · 5fe846c · 5fe846c
2 parents 745930d + 20e97ed
commit 5fe846c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 24 deletions.
diff --git a/components/admin/tournament/TournamentEdit.tsx b/components/admin/tournament/TournamentEdit.tsx
@@ -98,10 +98,6 @@ export default function TournamentEdit({
 
   const postHandler = async () => {
     try {
-      console.log('startTime : ', tournamentEditInfo.startTime);
-      console.log('endTime : ', tournamentEditInfo.endTime);
-      console.log('startTime Date : ', new Date(tournamentEditInfo.startTime));
-      console.log('endTime Date : ', new Date(tournamentEditInfo.endTime));
       await instanceInManage.post(`/tournaments`, {
         title: tournamentEditInfo.title,
         contents: tournamentEditInfo.contents,

diff --git a/components/modal/admin/AdminFeedbackCheckModal.tsx b/components/modal/admin/AdminFeedbackCheckModal.tsx
@@ -24,19 +24,21 @@ export default function AdminFeedbackCheck({
       await instanceInManage.patch(`/feedback/${id}`, {
         isSolved: isSolved,
       });
-      await instanceInManage.post(`/notifications`, {
-        intraId,
-        message: isSolved
-          ? '피드백을 검토중입니다.'
-          : '피드백이 반영되었습니다.',
-        // sendMail: isSend, todo: 슬랙으로 보내는 것으로 변경
-      });
-      setSnackBar({
-        toastName: 'noti user',
-        severity: 'success',
-        message: `알림이 성공적으로 전송되었습니다!`,
-        clicked: true,
-      });
+      if (isSend) {
+        await instanceInManage.post(`/notifications`, {
+          intraId,
+          message: isSolved
+            ? '피드백을 검토중입니다.'
+            : '피드백이 반영되었습니다.',
+          // sendMail: isSend, todo: 슬랙으로 보내는 것으로 변경
+        });
+        setSnackBar({
+          toastName: 'noti user',
+          severity: 'success',
+          message: `알림이 성공적으로 전송되었습니다!`,
+          clicked: true,
+        });
+      }
       setModal({ modalName: null });
     } catch (e) {
       console.error('SW03');

diff --git a/components/rank/RankList.tsx b/components/rank/RankList.tsx
@@ -25,7 +25,7 @@ export default function RankList({ season }: RankListProps) {
   const makePath = (): string => {
     const modeQuery = Mode === 'RANK' ? 'ranks/single' : 'exp';
     const seasonQuery = Mode === 'RANK' ? `&season=${season}` : '';
-    return `pingpong/${modeQuery}?page=${page}&size=20${seasonQuery}`;
+    return `pingpong/v2/${modeQuery}?page=${page}&size=20${seasonQuery}`;
   };
 
   useRankList({

diff --git a/hooks/tournament/useTournamentEditInfo.ts b/hooks/tournament/useTournamentEditInfo.ts
@@ -17,12 +17,7 @@ function useTournamentEditInfo() {
   // change
   const inputChangeHandler = (event: React.ChangeEvent<HTMLInputElement>) => {
     const { name, value } = event.target;
-    if (name === 'startTime' || name === 'endTime') {
-      setTournamentEditInfo((prev) => ({
-        ...prev,
-        [name]: value.slice(0, -2) + '00',
-      }));
-    } else setTournamentEditInfo((prev) => ({ ...prev, [name]: value }));
+    setTournamentEditInfo((prev) => ({ ...prev, [name]: value }));
   };
 
   const selectChangeHandler = (event: React.ChangeEvent<HTMLSelectElement>) => {