From 8989c6911b37fda8d77d9950bf9239a5641c1105 Mon Sep 17 00:00:00 2001
From: godhyzzang <109357302+godhyzzang@users.noreply.github.com>
Date: Mon, 16 Dec 2024 18:02:54 +0900
Subject: [PATCH 1/4] fix : change router.push to router.replace

---
 src/app/(default)/mypage/layout.tsx       | 2 +-
 src/app/(fullscreen)/login/page.tsx       | 2 +-
 src/app/not-found.tsx                     | 2 +-
 src/components/common/PointCover.tsx      | 2 +-
 src/components/common/SearchComponent.tsx | 2 +-
 src/components/layout/MobileSearch.tsx    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/app/(default)/mypage/layout.tsx b/src/app/(default)/mypage/layout.tsx
index f259380..196c48a 100644
--- a/src/app/(default)/mypage/layout.tsx
+++ b/src/app/(default)/mypage/layout.tsx
@@ -31,7 +31,7 @@ export default function MyPageLayout({
   const isLogin = isLoginData?.data;
   const router = useRouter();
   if (!isLogin) {
-    router.push('/login');
+    router.replace('/login');
   }
 
   return (
diff --git a/src/app/(fullscreen)/login/page.tsx b/src/app/(fullscreen)/login/page.tsx
index 69ebdd2..7ef74d3 100644
--- a/src/app/(fullscreen)/login/page.tsx
+++ b/src/app/(fullscreen)/login/page.tsx
@@ -32,7 +32,7 @@ function Login() {
     console.log(`Redirecting to ${provider} OAuth login...`);
     const returnUrl = searchParams.get('returnUrl');
 
-    router.push(
+    router.replace(
       `${BASE_URL}/oauth2/authorization/${provider}${
         returnUrl ? `?returnUrl=${encodeURIComponent(returnUrl)}` : ''
       }`,
diff --git a/src/app/not-found.tsx b/src/app/not-found.tsx
index e8d8644..d98a192 100644
--- a/src/app/not-found.tsx
+++ b/src/app/not-found.tsx
@@ -28,7 +28,7 @@ export default function NotFoundPage() {
             </Button>
             <Button
               className="bg-white text-purple-600 hover:bg-white/90 px-8 py-3 text-lg font-semibold rounded-full transition-all duration-300 ease-in-out transform hover:scale-105 mt-6"
-              onClick={() => router.push('/')}
+              onClick={() => router.replace('/')}
             >
               홈으로 가기
             </Button>
diff --git a/src/components/common/PointCover.tsx b/src/components/common/PointCover.tsx
index 09ca9fb..45cd45d 100644
--- a/src/components/common/PointCover.tsx
+++ b/src/components/common/PointCover.tsx
@@ -64,7 +64,7 @@ export default function PointCover({ data, children }: PointCoverProps) {
       const success = await reducePointMutation.mutateAsync(contentId);
       if (success) {
         setIsConfirmed(true);
-        router.push(
+        router.replace(
           data.contentType === 'READING'
             ? `/learn/reading/detail/${data.contentId}`
             : `/learn/listening/detail/${data.contentId}`,
diff --git a/src/components/common/SearchComponent.tsx b/src/components/common/SearchComponent.tsx
index 2e189aa..53d0749 100644
--- a/src/components/common/SearchComponent.tsx
+++ b/src/components/common/SearchComponent.tsx
@@ -28,7 +28,7 @@ export default function SearchComponent() {
         return;
       }
 
-      router.push(`/search?q=${encodeURIComponent(query)}`);
+      router.replace(`/search?q=${encodeURIComponent(query)}`);
     }
   };
 
diff --git a/src/components/layout/MobileSearch.tsx b/src/components/layout/MobileSearch.tsx
index bd2255e..62473f4 100644
--- a/src/components/layout/MobileSearch.tsx
+++ b/src/components/layout/MobileSearch.tsx
@@ -42,7 +42,7 @@ export default function MobileSearch({ isOpen, setIsOpen }: MobileSearchProps) {
         return;
       }
 
-      router.push(`/search?q=${encodeURIComponent(query)}`);
+      router.replace(`/search?q=${encodeURIComponent(query)}`);
       setIsOpen(false);
     }
   };

From 5bc6bf42ba842f86dacef001ff56ce7b2895096f Mon Sep 17 00:00:00 2001
From: godhyzzang <109357302+godhyzzang@users.noreply.github.com>
Date: Mon, 16 Dec 2024 18:03:08 +0900
Subject: [PATCH 2/4] =?UTF-8?q?fix=20:=20floating=20button=2020px=EC=94=A9?=
 =?UTF-8?q?=20=EC=98=AC=EB=A6=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../(default)/learn/listening/detail/ListeningDetailClient.tsx  | 2 +-
 src/app/(default)/learn/reading/detail/ReadingDetailClient.tsx  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/(default)/learn/listening/detail/ListeningDetailClient.tsx b/src/app/(default)/learn/listening/detail/ListeningDetailClient.tsx
index 1329a26..d2a78fd 100644
--- a/src/app/(default)/learn/listening/detail/ListeningDetailClient.tsx
+++ b/src/app/(default)/learn/listening/detail/ListeningDetailClient.tsx
@@ -346,7 +346,7 @@ export default function ListeningDetailClient({
         onScrapToggle={handleScrapToggle}
       />
 
-      <div className="fixed right-4 bottom-20 md:bottom-4">
+      <div className="fixed right-4 bottom-25 md:bottom-10">
         <Button
           variant="default"
           size="icon"
diff --git a/src/app/(default)/learn/reading/detail/ReadingDetailClient.tsx b/src/app/(default)/learn/reading/detail/ReadingDetailClient.tsx
index d979ab2..4f8fee7 100644
--- a/src/app/(default)/learn/reading/detail/ReadingDetailClient.tsx
+++ b/src/app/(default)/learn/reading/detail/ReadingDetailClient.tsx
@@ -159,7 +159,7 @@ export default function ReadingDetailClient({
         missionStatus={missionStatus?.data}
       />
 
-      <div className="fixed right-4 bottom-20 md:bottom-4">
+      <div className="fixed right-4 bottom-25 md:bottom-10">
         <Button
           variant="default"
           size="icon"

From 598faf0c332aceec9d4c98ad74a3975c85d06fed Mon Sep 17 00:00:00 2001
From: godhyzzang <109357302+godhyzzang@users.noreply.github.com>
Date: Mon, 16 Dec 2024 18:07:40 +0900
Subject: [PATCH 3/4] =?UTF-8?q?fix=20:=20md=EC=9D=BC=EB=95=8C=EB=8A=94=202?=
 =?UTF-8?q?0pt=EC=94=A9=20=EC=95=88=20=EC=98=AC=EB=A0=A4=EB=8F=84=20?=
 =?UTF-8?q?=EB=90=98=EA=B8=B0=20=EB=95=8C=EB=AC=B8=EC=97=90=20=EC=82=AD?=
 =?UTF-8?q?=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../(default)/learn/listening/detail/ListeningDetailClient.tsx  | 2 +-
 src/app/(default)/learn/reading/detail/ReadingDetailClient.tsx  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/(default)/learn/listening/detail/ListeningDetailClient.tsx b/src/app/(default)/learn/listening/detail/ListeningDetailClient.tsx
index d2a78fd..2e5d032 100644
--- a/src/app/(default)/learn/listening/detail/ListeningDetailClient.tsx
+++ b/src/app/(default)/learn/listening/detail/ListeningDetailClient.tsx
@@ -346,7 +346,7 @@ export default function ListeningDetailClient({
         onScrapToggle={handleScrapToggle}
       />
 
-      <div className="fixed right-4 bottom-25 md:bottom-10">
+      <div className="fixed right-4 bottom-25 md:bottom-4">
         <Button
           variant="default"
           size="icon"
diff --git a/src/app/(default)/learn/reading/detail/ReadingDetailClient.tsx b/src/app/(default)/learn/reading/detail/ReadingDetailClient.tsx
index 4f8fee7..cb5847a 100644
--- a/src/app/(default)/learn/reading/detail/ReadingDetailClient.tsx
+++ b/src/app/(default)/learn/reading/detail/ReadingDetailClient.tsx
@@ -159,7 +159,7 @@ export default function ReadingDetailClient({
         missionStatus={missionStatus?.data}
       />
 
-      <div className="fixed right-4 bottom-25 md:bottom-10">
+      <div className="fixed right-4 bottom-25 md:bottom-4">
         <Button
           variant="default"
           size="icon"

From 00b9f896e3cba7223e0d83a75c5f2e776e83873c Mon Sep 17 00:00:00 2001
From: godhyzzang <109357302+godhyzzang@users.noreply.github.com>
Date: Mon, 16 Dec 2024 18:12:25 +0900
Subject: [PATCH 4/4] =?UTF-8?q?Revert=20"fix=20:=20change=20router.push=20?=
 =?UTF-8?q?to=20router.replace"=20=ED=8F=AC=EC=9D=B8=ED=8A=B8=EC=BB=A4?=
 =?UTF-8?q?=EB=B2=84,=20=EC=84=9C=EC=B9=98=EC=BB=B4=ED=8F=AC=EB=84=8C?=
 =?UTF-8?q?=ED=8A=B8=EB=8A=94=20=EB=8B=A4=EC=8B=9C=20router.push=EB=A1=9C?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/PointCover.tsx      | 2 +-
 src/components/common/SearchComponent.tsx | 2 +-
 src/components/layout/MobileSearch.tsx    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/common/PointCover.tsx b/src/components/common/PointCover.tsx
index 45cd45d..09ca9fb 100644
--- a/src/components/common/PointCover.tsx
+++ b/src/components/common/PointCover.tsx
@@ -64,7 +64,7 @@ export default function PointCover({ data, children }: PointCoverProps) {
       const success = await reducePointMutation.mutateAsync(contentId);
       if (success) {
         setIsConfirmed(true);
-        router.replace(
+        router.push(
           data.contentType === 'READING'
             ? `/learn/reading/detail/${data.contentId}`
             : `/learn/listening/detail/${data.contentId}`,
diff --git a/src/components/common/SearchComponent.tsx b/src/components/common/SearchComponent.tsx
index 53d0749..2e189aa 100644
--- a/src/components/common/SearchComponent.tsx
+++ b/src/components/common/SearchComponent.tsx
@@ -28,7 +28,7 @@ export default function SearchComponent() {
         return;
       }
 
-      router.replace(`/search?q=${encodeURIComponent(query)}`);
+      router.push(`/search?q=${encodeURIComponent(query)}`);
     }
   };
 
diff --git a/src/components/layout/MobileSearch.tsx b/src/components/layout/MobileSearch.tsx
index 62473f4..bd2255e 100644
--- a/src/components/layout/MobileSearch.tsx
+++ b/src/components/layout/MobileSearch.tsx
@@ -42,7 +42,7 @@ export default function MobileSearch({ isOpen, setIsOpen }: MobileSearchProps) {
         return;
       }
 
-      router.replace(`/search?q=${encodeURIComponent(query)}`);
+      router.push(`/search?q=${encodeURIComponent(query)}`);
       setIsOpen(false);
     }
   };