From 45d93479dd1cb81e006bfdef1aadd3679c39226e Mon Sep 17 00:00:00 2001
From: DeveloperRyou <DeveloperRyou@gmail.com>
Date: Mon, 10 Jun 2024 22:53:46 +0900
Subject: [PATCH 1/3] =?UTF-8?q?FIX:=20=EC=A7=81=EC=9B=90=EC=B4=88=EB=8C=80?=
 =?UTF-8?q?=20=EB=A7=81=ED=81=AC=20=EB=B3=B5=EC=82=AC=EA=B8=B0=EB=8A=A5=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/manage/confirm.tsx    | 23 +++++------------------
 src/screen/manage/ShareLink.tsx | 20 +++++++++++---------
 2 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/src/pages/manage/confirm.tsx b/src/pages/manage/confirm.tsx
index edec2e0..9aad33f 100644
--- a/src/pages/manage/confirm.tsx
+++ b/src/pages/manage/confirm.tsx
@@ -1,21 +1,10 @@
-import React, { useState } from "react";
-import { useRouter } from "next/router";
-import FlexBox from "@modules/layout/FlexBox";
-import TopTitle from "@modules/layout/TopTitle";
-import TextButton from "@modules/components/button/TextButton";
 import ConfirmEmployee from "@/screen/manage/ConfirmEmployee";
 import ShareLink from "@/screen/manage/ShareLink";
-import { InviteSchedule, inviteScheduleInit } from "@/data/inviteSchedule";
-
-function setSelectedPostion(arg0: string) {
-  console.log(arg0);
-  throw new Error("Function not implemented.");
-}
-
-function setInviteSchedule(inviteSchedule: InviteSchedule) {
-  console.log(inviteSchedule);
-  throw new Error("Function not implemented.");
-}
+import TextButton from "@modules/components/button/TextButton";
+import FlexBox from "@modules/layout/FlexBox";
+import TopTitle from "@modules/layout/TopTitle";
+import { useRouter } from "next/router";
+import { useState } from "react";
 
 type View = "confirm" | "share";
 
@@ -28,8 +17,6 @@ export default function Home() {
   };
 
   const handleShiftButton = () => {
-    setSelectedPostion("");
-    setInviteSchedule(inviteScheduleInit);
     router.push("/manage");
   };
 
diff --git a/src/screen/manage/ShareLink.tsx b/src/screen/manage/ShareLink.tsx
index 8fb784f..4c579fc 100644
--- a/src/screen/manage/ShareLink.tsx
+++ b/src/screen/manage/ShareLink.tsx
@@ -21,14 +21,16 @@ interface InviteDataType {
 }
 
 function ShareLink() {
+  const [inviteId, setInviteId] = useState<string>("");
   const [linkCopied, setLinkCopied] = useState(false);
   const [inviteSchedule] = useAtom(inviteScheduleAtom);
   const [selectedPosition] = useAtom(selectedPositionAtom);
   const [storeId] = useAtom(storeIdAtom);
 
-  const inviteId = createRandomString(8);
-  const handleCopyLink = (id: string) => {
-    const link = `${window.location.origin}/id?=${id}`;
+  if (!inviteId) setInviteId(createRandomString(8));
+
+  const handleCopyLink = () => {
+    const link = `${window.location.origin}/?id=${inviteId}`;
     copy(
       link,
       () => {
@@ -40,7 +42,7 @@ function ShareLink() {
     );
   };
 
-  const sendInviteToDB = async (id: string) => {
+  const sendInviteToDB = async () => {
     const inviteData: InviteDataType = {
       storeId,
       position: selectedPosition,
@@ -48,19 +50,19 @@ function ShareLink() {
       createdAt: dayjs().format("YYYY-MM-DD HH:mm:ss"),
     };
     const data = {
-      id,
+      id: inviteId,
       inviteData,
     };
     try {
       await axios.post("/api/dynamoDB", data);
-      handleCopyLink(inviteId);
+      handleCopyLink();
     } catch (error) {
-      console.error("Failed to create invite:", error);
+      alert("초대링크 생성에 실패했습니다.");
     }
   };
 
   useEffect(() => {
-    sendInviteToDB(inviteId);
+    sendInviteToDB();
   }, []);
 
   return (
@@ -84,7 +86,7 @@ function ShareLink() {
           <div className="B1-medium text-Gray5 mt-4">
             링크복사가 안되었나요?
           </div>
-          <button onClick={() => handleCopyLink(inviteId)} type="button">
+          <button onClick={() => handleCopyLink()} type="button">
             <FlexBox direction="row">
               <div className="B4-regular text-Gray4 underline">링크 복사</div>
               <div className="B4-regular text-Gray4">하기</div>

From fba4c0064fa39500655affeebaf66bb532417a7a Mon Sep 17 00:00:00 2001
From: DeveloperRyou <DeveloperRyou@gmail.com>
Date: Thu, 20 Jun 2024 20:03:52 +0900
Subject: [PATCH 2/3] =?UTF-8?q?FIX:=20kakao=20app=20login=20=EC=8B=A4?=
 =?UTF-8?q?=ED=8C=A8=EC=8B=9C=20REST=20login=20=EC=A0=9C=EA=B3=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../buttonwrapper/KakaoLoginButtonWrapper.tsx | 22 +++++++++++++++++--
 src/pages/oauth/kakao.tsx                     |  2 +-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/assist/buttonwrapper/KakaoLoginButtonWrapper.tsx b/src/assist/buttonwrapper/KakaoLoginButtonWrapper.tsx
index 449e133..add0f65 100644
--- a/src/assist/buttonwrapper/KakaoLoginButtonWrapper.tsx
+++ b/src/assist/buttonwrapper/KakaoLoginButtonWrapper.tsx
@@ -1,24 +1,42 @@
 import { createRandomString } from "@/libs/createRandomId";
 import LoginButton from "@modules/components/button/LoginButton";
 import FlexBox from "@modules/layout/FlexBox";
+import { useRouter } from "next/router";
+import { useState } from "react";
 
 function KakaoLoginButtonWrapper() {
+  const { push } = useRouter();
+  const [clickedNumber, setClickedNumber] = useState(0);
+  const redirectUri = `${window.location.origin}/oauth/kakao`;
   const kakaoSDKLogin = () => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const kakao = (window as any).Kakao;
     if (!kakao?.isInitialized()) {
       kakao?.init(process.env.NEXT_PUBLIC_KAKAO_JS_KEY);
     }
-    const redirectUri = `${window.location.origin}/oauth/kakao`;
     kakao?.Auth?.authorize({
       redirectUri,
       state: createRandomString(32),
     });
   };
+  const kakaoRESTLogin = () => {
+    push(
+      `https://kauth.kakao.com/oauth/authorize?redirect_uri=${redirectUri}&client_id=${process.env.NEXT_PUBLIC_KAKAO_REST_KEY}&response_type=code`,
+    );
+  };
+
   return (
     <FlexBox className="px-4 w-full justify-center">
       <div className="w-full max-w-[360px]">
-        <LoginButton type="kakao" onClick={kakaoSDKLogin} />
+        <LoginButton
+          type="kakao"
+          onClick={() => {
+            alert(clickedNumber);
+            if (clickedNumber === 0) kakaoSDKLogin();
+            else kakaoRESTLogin();
+            setClickedNumber(clickedNumber + 1);
+          }}
+        />
       </div>
     </FlexBox>
   );
diff --git a/src/pages/oauth/kakao.tsx b/src/pages/oauth/kakao.tsx
index c2f8244..0e0651d 100644
--- a/src/pages/oauth/kakao.tsx
+++ b/src/pages/oauth/kakao.tsx
@@ -9,7 +9,7 @@ export default function Kakao() {
   const { mutate: postKakaoLoginMutate } = useKakaoLogin();
 
   useEffect(() => {
-    if (code && state) {
+    if (code) {
       postKakaoLoginMutate({
         data: {
           code,

From f61925b414c40043966e78227120b907ba078171 Mon Sep 17 00:00:00 2001
From: DeveloperRyou <DeveloperRyou@gmail.com>
Date: Thu, 20 Jun 2024 20:04:11 +0900
Subject: [PATCH 3/3] =?UTF-8?q?FIX:=20alert=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assist/buttonwrapper/KakaoLoginButtonWrapper.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/assist/buttonwrapper/KakaoLoginButtonWrapper.tsx b/src/assist/buttonwrapper/KakaoLoginButtonWrapper.tsx
index add0f65..aaac3ee 100644
--- a/src/assist/buttonwrapper/KakaoLoginButtonWrapper.tsx
+++ b/src/assist/buttonwrapper/KakaoLoginButtonWrapper.tsx
@@ -31,7 +31,6 @@ function KakaoLoginButtonWrapper() {
         <LoginButton
           type="kakao"
           onClick={() => {
-            alert(clickedNumber);
             if (clickedNumber === 0) kakaoSDKLogin();
             else kakaoRESTLogin();
             setClickedNumber(clickedNumber + 1);