릴리즈 dev-> main

src/app/(main)/community/[category]/[id]/page.tsx

@@ -19,20 +19,21 @@ import ReportSubmittedModal from '@/components/community/ReportSubmittedModal';
 import useBest3TipPosts from '@/lib/hooks/useBest3TipPosts';
 import useGetCommunityPost from '@/lib/hooks/useGetCommunityPost';
 import { certificateIdAtom } from '@/recoil/atom';
-import { boardTypeInitAtom, boardTypeStateAtom, selectedReplyParentNameAtom } from '@/recoil/community/atom';
+import { boardTypeInitAtom, boardTypeStateAtom, selectedAnswerUserIdAtom } from '@/recoil/community/atom';
 import { BoardType } from '@/types/community/type';
 
 const CommunityDetailPage = () => {
   const router = useRouter();
   const params = useParams();
   const certificateId = useRecoilValue(certificateIdAtom);
-  const userId = Cookies.get('userId');
+  const loginUserId = Cookies.get('userId');
   //커뮤니티 포스트에 해당하는 데이터를 가져옴
   const { communityPostData, isLoading, isError, communityPostDataMutate } = useGetCommunityPost(params.id);
   const [isQuestionModalOpen, setIsQuestionModalOpen] = useState(false);
   const [isPostOptionModalOpen, setPostIsOptionModalOpen] = useState(false);
   const [isCommentOptionModalOpen, setCommentIsOptionModalOpen] = useState(false);
   const [selectedCommentId, setSelectedCommentId] = useState(0);
+  const [selectedAnswerUserId, setSelectedAnswerUserId] = useRecoilState(selectedAnswerUserIdAtom);
   const [isClickEditPost, setIsClickEditPost] = useState(false);
   const [isReportSubmittedModalOpen, setIsReportSubmittedModalOpen] = useState(false);
   const { bestTipPosts } = useBest3TipPosts(certificateId);
@@ -136,14 +137,19 @@ const CommunityDetailPage = () => {
       )}
       {isCommentOptionModalOpen && (
         <CommentOptionModal
-          commentId={selectedCommentId}
+          selectedCommentId={selectedCommentId}
+          loginUserId={loginUserId}
+          writerUserId={selectedAnswerUserId}
+          setSelectedAnswerUserId={setSelectedAnswerUserId}
           setIsReportSubmittedModalOpen={setIsReportSubmittedModalOpen}
           setCommentIsOptionModal={setCommentIsOptionModalOpen}
           communityPostDataMutate={communityPostDataMutate}
         />
       )}
       {isPostOptionModalOpen && (
         <PostOptionModal
+          loginUserId={loginUserId}
+          writerUserId={postData.user.userId}
           communityId={params.category}
           postId={postData.postId}
           setPostIsOptionModal={setPostIsOptionModalOpen}
@@ -187,8 +193,11 @@ const CommunityDetailPage = () => {
                 setPostIsOptionModalOpen(true);
               }}
               profileUrl={postData.user.profileImage}
-              isWriter={parseInt(userId as string) === postData.user.userId}
-              createdTime={postData.dateTime.createdAt}
+              createdTime={
+                postData.dateTime.createdAt === postData.dateTime.modifiedAt
+                  ? postData.dateTime.createdAt
+                  : postData.dateTime.modifiedAt
+              }
               nickName={postData.user.nickname}
             />
             <CommunityPost

src/app/(main)/community/[category]/page.tsx

@@ -57,13 +57,13 @@ export default function CommunityCategoryPage() {
   const [isClickedWriteButton, setIsClickedWriteButton] = useState(false);
   const router = useRouter();
   //해설 게시글 검색
-  const [searchValue, setSearchValue] = useRecoilState<number>(commentarySearchQuestionSequence);
-  const debouncedValue = useDebounce<number>(searchValue, 100);
+  const [searchValue, setSearchValue] = useRecoilState<number | undefined>(commentarySearchQuestionSequence);
+  const debouncedValue = useDebounce<number | undefined>(searchValue, 100);
   const { commentarySearchResults } = useGetCommentarySearchResults(
     certificateId,
     selectedCommentaryYearFilterContent,
     selectedCommentaryRoundFilterContent,
-    searchValue,
+    searchValue as number,
   );
   const [isModalOpen, setIsModalOpen] = useState<boolean>(true);
   const { reviewWriteAccess } = useCheckReviewWriteAccess(certificateId);
@@ -199,7 +199,7 @@ export default function CommunityCategoryPage() {
             boardType={boardType}
             setSearchValue={setSearchValue}
             searchValue={searchValue}
-            debouncedValue={debouncedValue}
+            debouncedValue={debouncedValue as number}
           />
         ) : boardType === 'TIP' ? (
           <NormalAndTipBoardList boardType={boardType} init={boardTypeInit} />

src/app/(main)/exam/wrong/page.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import React, { useCallback, useEffect } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import { useInView } from 'react-intersection-observer';
 
 import Header from '@/components/common/Header';
@@ -13,6 +13,7 @@ import { ReviewIncorrectAnswers, ReviewIncorrectAnswersContent } from '@/types/g
 const IncorrectQuestion = () => {
   const [ref, inView] = useInView();
   const { incorrectQuestions, setSize, mutate, isLoading } = useAllIncorrectQuestions();
+  const [openCardId, setOpenCardId] = useState<number | null>(null); // ✅ 현재 열려있는 카드 ID
 
   const getMoreItem = useCallback(async () => {
     if (incorrectQuestions) {
@@ -39,6 +40,12 @@ const IncorrectQuestion = () => {
                   return (
                     <div key={index} ref={ref}>
                       <IncorrectQuestionCard
+                        isOpen={openCardId === wrongQuestion.userAnswerId}
+                        onToggle={() =>
+                          setOpenCardId((prev) =>
+                            prev === wrongQuestion.userAnswerId ? null : wrongQuestion.userAnswerId,
+                          )
+                        }
                         incorrectQuestionsMutate={mutate}
                         userAnswerId={wrongQuestion.userAnswerId}
                         selectOptionSeq={wrongQuestion.selectOptionSeq}

src/app/(main)/home/goal-setting/page.tsx

@@ -2,7 +2,7 @@
 
 import { useRouter } from 'next/navigation';
 import * as React from 'react';
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 import { useRecoilState, useRecoilValue } from 'recoil';
 import { useSWRConfig } from 'swr';
 
@@ -32,6 +32,7 @@ const GoalSetting = () => {
   const { userGoals } = useGetUserGoals(certificateId);
   const { mutate } = useSWRConfig();
   const router = useRouter();
+
   /**
    * 최근 목표ID를 불러오는 함수
    */
@@ -42,9 +43,11 @@ const GoalSetting = () => {
     return null; // 또는 적절한 기본값/오류 처리
   };
   // 기존에 설정한 목표를 불러오는 데이터 패칭
-  const { goalSettingData, isLoading, isError } = useGetGoalSettingData(getLastGoalId() || 0);
+  const { goalSettingData } = useGetGoalSettingData(getLastGoalId() || 0);
   const [goalData, setGoalData] = useRecoilState(goalSettingState);
   const [isResetButtonClick, setIsResetButtonClick] = useState(false);
+  const [isTrigger, setIsTrigger] = useState(true);
+  const [isGoalDataReady, setIsGoalDataReady] = useState(false);
 
   /**
    * Recoil 상태를 초기화하는 함수
@@ -107,13 +110,15 @@ const GoalSetting = () => {
       if (response) {
         const initialState = initializeGoalSettingState(response.result);
         setGoalData(initialState);
+        setIsGoalDataReady(true); // 🔥 렌더링 트리거
+        setIsTrigger(false);
       } else {
-        // 에러 처리를 수행할 수 있습니다.
-        console.error('Failed to fetch goal setting data');
+        console.error('목표 데이터를 불러오지 못했습니다.');
+        setIsTrigger(false);
       }
     } catch (error) {
-      // 네트워크 오류 또는 다른 예외에 대한 처리를 수행할 수 있습니다.
-      console.error('Error fetching goal setting data:', error);
+      console.error('목표 데이터 로딩 실패:', error);
+      setIsTrigger(false);
     }
   };
 
@@ -123,10 +128,11 @@ const GoalSetting = () => {
   const resetData = () => {
     const resetState = resetGoalSettingState();
     setGoalData(resetState);
+    setIsGoalDataReady(true); // 🔥 이게 있어야 새 목표도 바로 렌더됨
   };
 
   return (
-    <div className={'min-h-screen'}>
+    <>
       {isSettingNewGoalModalOpen && userGoals ? (
         <SettingNewGoalModal
           isFirstGoalSetting={userGoals.length === 0} //새로 생성된 목표가 없을 경우
@@ -137,47 +143,54 @@ const GoalSetting = () => {
           setIsSettingNewModal={setIsSettingNewGoalModalOpen}
         />
       ) : null}
-      <Header
-        headerType={'dynamic'}
-        title={'목표설정'}
-        rightElement={
-          isResetButtonClick ? (
-            <Button
-              onClick={async () => {
-                await postGoalSettingData(goalData, selectedCertificationId).then((r) => {
-                  console.log('목표 저장 성공~r', r);
-                });
-                await mutate(`/certificates/${certificateId}/goals`);
-                setIsResetButtonClick(false);
-                router.push('/home');
-              }}
-              className={' w-fit'}>
-              저장
-            </Button>
-          ) : (
-            <Button
-              onClick={() => {
-                putGoalSettingData(goalData, getLastGoalId() || 0).then((r) => {
-                  console.log('목표 수정 성공', r);
-                  router.push('/home');
-                });
-              }}
-              className={'w-fit'}>
-              수정
-            </Button>
-          )
-        }></Header>
-      <div className="flex flex-col gap-y-8 mx-5 mb-8">
-        {/*자격증 선택*/}
-        {isResetButtonClick ? <SelectCertification /> : null}
-        {/*목표 점수 설정*/}
-        <SetGoalScore />
-        {/*자격증 준비기간 설정*/}
-        <PreparationPeriodSetting />
-        {/*매일 목표 설정*/}
-        <SetDailyGoals />
-      </div>
-    </div>
+      {!isGoalDataReady ? (
+        <></>
+      ) : (
+        <div className={''}>
+          <Header
+            className={'fixed'}
+            headerType={'dynamic'}
+            title={'목표설정'}
+            rightElement={
+              isResetButtonClick ? (
+                <Button
+                  onClick={async () => {
+                    await postGoalSettingData(goalData, selectedCertificationId).then((r) => {
+                      console.log('목표 저장 성공~r', r);
+                    });
+                    await mutate(`/certificates/${certificateId}/goals`);
+                    setIsResetButtonClick(false);
+                    router.push('/home');
+                  }}
+                  className={' w-fit'}>
+                  저장
+                </Button>
+              ) : (
+                <Button
+                  onClick={() => {
+                    putGoalSettingData(goalData, getLastGoalId() || 0).then((r) => {
+                      console.log('목표 수정 성공', r, goalData);
+                      router.push('/home');
+                    });
+                  }}
+                  className={'w-fit'}>
+                  수정
+                </Button>
+              )
+            }></Header>
+          <div className="flex flex-col gap-y-8 pt-20 mx-5 mb-8">
+            {/*자격증 선택*/}
+            {isResetButtonClick ? <SelectCertification /> : null}
+            {/*목표 점수 설정*/}
+            <SetGoalScore />
+            {/*자격증 준비기간 설정*/}
+            <PreparationPeriodSetting />
+            {/*매일 목표 설정*/}
+            <SetDailyGoals />
+          </div>
+        </div>
+      )}
+    </>
   );
 };
 export default GoalSetting;

src/app/(main)/home/page.tsx

@@ -58,18 +58,19 @@ function HomeComponents() {
   useEffect(() => {
     const existingAccessToken = Cookies.get('accessToken');
     const existingRefreshToken = Cookies.get('refreshToken');
-    if (existingAccessToken && existingRefreshToken) {
-      setIsCookieSet(true);
-      return;
-    }
 
-    // 쿠키가 없고 URL에서 토큰이 있으면 세팅
+    // ✅ 쿼리에 토큰이 있으면 무조건 쿠키 갱신
     if (accessToken && refreshToken) {
       Cookies.set('accessToken', accessToken, { expires: Date.now() + 604800000 });
       Cookies.set('refreshToken', refreshToken, { expires: Date.now() + 604800000 });
       setIsCookieSet(true);
+      return;
+    }
+
+    // ✅ 쿼리 없지만 쿠키 있으면 그대로 진행
+    if (existingAccessToken && existingRefreshToken) {
+      setIsCookieSet(true);
     } else {
-      // 둘 다 없으면 그래도 isCookieSet은 true로 둬야 UI 진행됨
       setIsCookieSet(false);
     }
   }, [accessToken, refreshToken]);
@@ -150,7 +151,7 @@ function HomeComponents() {
   };
 
   useEffect(() => {
-    if (goalSettingStatus) {
+    if (goalSettingStatus && !goalSettingStatus.result) {
       setIsGoalSettingStatusModalOpen(!goalSettingStatus.result);
     }
   }, [goalSettingStatus]);

src/app/(main)/layout.tsx

@@ -1,10 +1,23 @@
 'use client';
 
-import React from 'react';
+import React, { useState } from 'react';
+import { useRecoilState } from 'recoil';
 
-export default function layout({ children }: { children: React.ReactNode }) {
+import AccumulatedTime from '@/components/stopwatch/AccumulatedTime';
+import StopwatchAlert from '@/components/stopwatch/StopwatchAlert';
+import { onModalAtom } from '@/recoil/stopwatch/atom';
+
+export default function Layout({ children }: { children: React.ReactNode }) {
+  const [onModal, setOnModal] = useRecoilState<boolean>(onModalAtom); //기록하기 알림창 onoff조절
+  const [onAccumulatedModal, setOnAccumulatedModal] = useState<boolean>(false); //기록완료 알림창 onoff조절
   return (
     <>
+      {onModal ? ( //기록하기 알림창 열림OnOff
+        <StopwatchAlert setOnAccumulatedModal={setOnAccumulatedModal} setOnModal={setOnModal} />
+      ) : null}
+      {onAccumulatedModal ? ( //기록완료 알림창OnOff
+        <AccumulatedTime setOnAccumulatedModal={setOnAccumulatedModal} />
+      ) : null}
       <div>{children}</div>
     </>
   );