Merge branch 'main' of github.com-A:YAPP-Github/24th-Web-Team-1-FE in…

…to develop

src/app/problem/page.tsx

@@ -2,8 +2,10 @@
 
 import { useProblemIdsViewModel } from "@common/models/useProblemIdsViewModel";
 import { getProblemsQueryOptions } from "@problem/remotes/getProblemsQueryOptions";
+import { IS_EXIST_PROBLEMS } from "@shared/constants/middlewareConstant";
 import { postLogMutationOptions } from "@shared/remotes/postLogMutationOptions";
 import { useMutation, useQuery } from "@tanstack/react-query";
+import { setCookie } from "cookies-next";
 import { useRouter, useSearchParams } from "next/navigation";
 import { useEffect } from "react";
 
@@ -28,6 +30,7 @@ export default function ProblemPage() {
           problemIds: problemData.problemIds,
           articleId,
         });
+        setCookie(IS_EXIST_PROBLEMS, "true");
         postLog({ from: "email", to: "solveProblem" });
         push(`/problem/${problemData.problemIds[currentIdx]}`);
       }

src/middleware.ts

@@ -33,10 +33,9 @@ export default async function middleware(req: NextRequest) {
   const articleId = searchParams.get("articleId");
   const workbookId = searchParams.get("workbookId");
   const fromEmail = searchParams.get(LOG_PARAMS.FROM_EMAIL);
-
   if (pathname === "/") {
     return NextResponse.redirect(
-      "https://fewletter.notion.site/FEW-a87459feb21246b0bc63c68ef6140645"
+      "https://fewletter.notion.site/FEW-a87459feb21246b0bc63c68ef6140645",
     );
   }
 
@@ -92,7 +91,7 @@ export default async function middleware(req: NextRequest) {
       return undefined;
     }
   }
-  if (pathname.includes("/problem")) {
+  if (pathname.includes("/problem") && !articleId) {
     /** problme url 진입시 전역상태 없으면 들어올 수 없게 방어하는 로직 */
     const isProblemIds = req.cookies.get(IS_EXIST_PROBLEMS)?.value === "true";
 
@@ -114,6 +113,6 @@ export const config = {
     "/workbook/:path*",
     "/problem/:path*",
     "/article/:path*",
-    "/"
+    "/",
   ],
 };

src/problem/components/AnswerChoiceButton/index.tsx

@@ -90,7 +90,7 @@ export default function AnswerChoiceButton({
       )}
       onClick={onClickAnswerChoice}
     >
-      <span className="sub2-bold max-w-[247px] whitespace-normal">
+      <span className="sub2-bold max-w-[247px] whitespace-normal text-left">
         {content}
       </span>
 

src/problem/components/AnswerSubmitButton/index.tsx

@@ -48,8 +48,10 @@ export default function AnswerSubmitButton() {
     }
     if (problemAnswerInfo[0] && !isExistNextProblem()) {
       push("/");
-      clearProblem();
-      deleteCookie(IS_EXIST_PROBLEMS);
+      setTimeout(() => {
+        clearProblem();
+        deleteCookie(IS_EXIST_PROBLEMS);
+      }, 2000);
     }
   };
   const isPostAnswerSuccess = problemAnswerInfo[0];