Skip to content

Commit

Permalink
Merge pull request #423 from Kernel360/422-fix-fix-floating-button-lo…
Browse files Browse the repository at this point in the history
…cation-on-ios-mobile-change-routerpush-to-routerreplace

fix : ios mobile pb-20에 맞춰서 플로팅버튼 위치를 20px씩 올리기, fix : router.push를 router.replace로 변경하여 뒤로가기 불가능하도록 변경
  • Loading branch information
smosco authored Dec 16, 2024
2 parents 142df21 + 00b9f89 commit 8c35fb0
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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-4">
<Button
variant="default"
size="icon"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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-4">
<Button
variant="default"
size="icon"
Expand Down
2 changes: 1 addition & 1 deletion src/app/(default)/mypage/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export default function MyPageLayout({
const isLogin = isLoginData?.data;
const router = useRouter();
if (!isLogin) {
router.push('/login');
router.replace('/login');
}

return (
Expand Down
2 changes: 1 addition & 1 deletion src/app/(fullscreen)/login/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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)}` : ''
}`,
Expand Down
2 changes: 1 addition & 1 deletion src/app/not-found.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 8c35fb0

Please sign in to comment.