From 3d9aeba78c36d2a37b4065b7dfe5d94d5a5fd889 Mon Sep 17 00:00:00 2001
From: darkdulgi <daniel99285@gmail.com>
Date: Mon, 19 Aug 2024 10:27:52 +0900
Subject: [PATCH 1/2] =?UTF-8?q?[fix]=20=EC=A0=95=EB=8B=B5=EC=B0=BD=20?=
 =?UTF-8?q?=EC=98=A4=ED=94=88=EC=83=81=ED=83=9C=20=EC=95=84=EB=8B=90=20?=
 =?UTF-8?q?=EB=95=8C=20tab=EC=9C=BC=EB=A1=9C=20=EB=B2=84=ED=8A=BC=20?=
 =?UTF-8?q?=EC=84=A0=ED=83=9D=20=EB=B6=88=EA=B0=80=EB=8A=A5=ED=95=98?=
 =?UTF-8?q?=EA=B2=8C=20=ED=95=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../features/interactions/modal/InteractionAnswer.jsx         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/mainPage/features/interactions/modal/InteractionAnswer.jsx b/src/mainPage/features/interactions/modal/InteractionAnswer.jsx
index b341a41b..f8e7e4c6 100644
--- a/src/mainPage/features/interactions/modal/InteractionAnswer.jsx
+++ b/src/mainPage/features/interactions/modal/InteractionAnswer.jsx
@@ -58,6 +58,7 @@ export default function InteractionAnswer({ isAnswerUp, setIsAnswerUp, answer, c
       </span>
 
       <button
+        tabIndex={!isAnswerUp && -1}
         onClick={() => setIsAnswerUp(false)}
         className="absolute top-5 xl:top-10 left-5 xl:left-10 p-1 xl:p-3 bg-neutral-800 rounded-full"
       >
@@ -98,6 +99,7 @@ export default function InteractionAnswer({ isAnswerUp, setIsAnswerUp, answer, c
                 </div>
 
                 <Button
+                  tabIndex={!isAnswerUp && -1}
                   onClick={onClickWrite}
                   styleType="filled"
                   backdrop="dark"
@@ -108,6 +110,7 @@ export default function InteractionAnswer({ isAnswerUp, setIsAnswerUp, answer, c
               </div>
 
               <Button
+                tabIndex={!isAnswerUp && -1}
                 onClick={onClickShare}
                 styleType="ghost"
                 backdrop="dark"
@@ -119,6 +122,7 @@ export default function InteractionAnswer({ isAnswerUp, setIsAnswerUp, answer, c
           </>
         ) : (
           <Button
+            tabIndex={!isAnswerUp && -1}
             onClick={() => openModal(authModal)}
             styleType="filled"
             backdrop="dark"

From 513980865cf7396f88db160871434de5a978cb2f Mon Sep 17 00:00:00 2001
From: darkdulgi <daniel99285@gmail.com>
Date: Mon, 19 Aug 2024 14:18:10 +0900
Subject: [PATCH 2/2] =?UTF-8?q?[feat]=20=EB=8B=A8=EC=B6=95=20url=20?=
 =?UTF-8?q?=EB=B3=B5=EC=82=AC=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mainPage/features/interactions/mock.js    |  5 +++++
 .../interactions/modal/InteractionAnswer.jsx  | 21 ++++++++-----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/mainPage/features/interactions/mock.js b/src/mainPage/features/interactions/mock.js
index 7d06621d..2d94f56c 100644
--- a/src/mainPage/features/interactions/mock.js
+++ b/src/mainPage/features/interactions/mock.js
@@ -9,6 +9,11 @@ const handlers = [
     HttpResponse.json(eventParticipationDate),
   ),
   http.post("/api/v1/event/draw/:eventId/participation", () => HttpResponse.json(true)),
+  http.post("/api/v1/url/shorten", () =>
+    HttpResponse.json({
+      shortUrl: "o1PiWwlZZU",
+    }),
+  ),
 ];
 
 export default handlers;
diff --git a/src/mainPage/features/interactions/modal/InteractionAnswer.jsx b/src/mainPage/features/interactions/modal/InteractionAnswer.jsx
index f8e7e4c6..e8d9c997 100644
--- a/src/mainPage/features/interactions/modal/InteractionAnswer.jsx
+++ b/src/mainPage/features/interactions/modal/InteractionAnswer.jsx
@@ -29,20 +29,17 @@ export default function InteractionAnswer({ isAnswerUp, setIsAnswerUp, answer, c
 
   function onClickShare() {
     setIsAniPlaying(true);
-
-    // 단축 URL 받아오는 요청. 추후 수정 필요
     fetchServer(
-      `/api/v1/url/shorten?originalUrl=https%3A%2F%2Fsofteer-awesome-orange.vercel.app%2F&userId=1`,
+      `/api/v1/url/shorten?originalUrl=https%3A%2F%2Fsofteer-awesome-orange.vercel.app%2F`,
       {
         method: "POST",
       },
     )
-      .then((res) => {
-        console.log(res);
-        navigator.clipboard.writeText("https://youtu.be/KMU0tzLwhbE");
+      .then(({ shortUrl }) => {
+        navigator.clipboard.writeText(`http://softeerorange.store/api/v1/url/${shortUrl}`);
       })
-      .catch((e) => {
-        console.log(e);
+      .catch(() => {
+        navigator.clipboard.writeText("https://softeer-awesome-orange.vercel.app/");
       });
   }
 
@@ -58,7 +55,7 @@ export default function InteractionAnswer({ isAnswerUp, setIsAnswerUp, answer, c
       </span>
 
       <button
-        tabIndex={!isAnswerUp && -1}
+        tabIndex={isAnswerUp ? undefined : -1}
         onClick={() => setIsAnswerUp(false)}
         className="absolute top-5 xl:top-10 left-5 xl:left-10 p-1 xl:p-3 bg-neutral-800 rounded-full"
       >
@@ -99,7 +96,7 @@ export default function InteractionAnswer({ isAnswerUp, setIsAnswerUp, answer, c
                 </div>
 
                 <Button
-                  tabIndex={!isAnswerUp && -1}
+                  tabIndex={isAnswerUp ? undefined : -1}
                   onClick={onClickWrite}
                   styleType="filled"
                   backdrop="dark"
@@ -110,7 +107,7 @@ export default function InteractionAnswer({ isAnswerUp, setIsAnswerUp, answer, c
               </div>
 
               <Button
-                tabIndex={!isAnswerUp && -1}
+                tabIndex={isAnswerUp ? undefined : -1}
                 onClick={onClickShare}
                 styleType="ghost"
                 backdrop="dark"
@@ -122,7 +119,7 @@ export default function InteractionAnswer({ isAnswerUp, setIsAnswerUp, answer, c
           </>
         ) : (
           <Button
-            tabIndex={!isAnswerUp && -1}
+            tabIndex={isAnswerUp ? undefined : -1}
             onClick={() => openModal(authModal)}
             styleType="filled"
             backdrop="dark"