Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix : ios mobile pb-20에 맞춰서 플로팅버튼 위치를 20px씩 올리기, fix : router.push를 router.replace로 변경하여 뒤로가기 불가능하도록 변경 #423

Merged
merged 4 commits into from
Dec 16, 2024
Merged

fix : ios mobile pb-20에 맞춰서 플로팅버튼 위치를 20px씩 올리기, fix : router.push를 router.replace로 변경하여 뒤로가기 불가능하도록 변경 #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8989c69
fix : change router.push to router.replace
godhyzzang Dec 16, 2024
5bc6bf4
fix : floating button 20px씩 올림
godhyzzang Dec 16, 2024
598faf0
fix : md일때는 20pt씩 안 올려도 되기 때문에 삭제
godhyzzang Dec 16, 2024
00b9f89
Revert "fix : change router.push to router.replace"
godhyzzang Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/app/(default)/learn/listening/detail/ListeningDetailClient.tsx
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion src/app/(default)/learn/reading/detail/ReadingDetailClient.tsx
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading