Skip to content

Fix: 몇몇 cursor pointer 추가, 뒤로가기 로직 수정 #547

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

Merged
mayrang merged 1 commit into from
May 28, 2025
Merged

Fix: 몇몇 cursor pointer 추가, 뒤로가기 로직 수정 #547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions src/components/designSystem/tag/SearchFilterTag.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ const SearchFilterTagContainer = styled.button<{ isCreateTrip: boolean }>`
align-items: center;
box-sizing: border-box;
gap: 8px;
cursor: pointer;
transition:
width,
background-color 0.3s ease-in-out;
Expand Down
18 changes: 9 additions & 9 deletions src/hooks/useHeaderNavigation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,14 +392,7 @@ export const useHeaderNavigation = () => {
// 상대방 프로필 화면의 여행 뱃지 화면
condition: () => checkRoute.exact(ROUTES.USER_PROFILE_BADGE),
action: () => {
const profilePath = localStorage.getItem("profilePath");
if (profilePath) {
router.push(profilePath);
} else {
router.back();
}
localStorage.removeItem("profilePath");

router.back();
if (userProfileUserId !== userId) {
// 마이페이지가 아닌 페이지에서 접속 했을시, 뒤로 가기 해도 프로필 overlay화면
setTimeout(() => setProfileShow(true), 100);
Expand All @@ -410,7 +403,14 @@ export const useHeaderNavigation = () => {
// 상대방 프로필 화면의 여행 로그 화면,
condition: () => checkRoute.exact(ROUTES.USER_TRAVEL_LOG),
action: () => {
router.back();
const profilePath = localStorage.getItem("profilePath");
if (profilePath) {
router.push(profilePath);
} else {
router.back();
}
localStorage.removeItem("profilePath");

console.log(userProfileUserId);
if (userProfileUserId !== userId) {
setTimeout(() => setProfileShow(true), 100);
Expand Down
1 change: 1 addition & 0 deletions src/page/Home/Home.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ const Alarm = styled.div`
width: 48px;
height: 48px;
display: flex;
cursor: pointer;
align-items: center;
justify-content: center;
`;
Expand Down
12 changes: 3 additions & 9 deletions src/page/TripDetail/TripDetail.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,13 +562,7 @@ export default function TripDetail() {
<CommentWrapper>
<IconContainer onClick={commentClickHandler}>
{isCommentUpdated ? (
<svg
width="28"
height="28"
viewBox="0 0 28 28"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clipPath="url(#clip0_5570_2993)">
<path
d="M25 18.6667C25 19.315 24.7425 19.9367 24.284 20.3952C23.8256 20.8536 23.2039 21.1111 22.5556 21.1111H7.88889L3 26V6.44444C3 5.79614 3.25754 5.17438 3.71596 4.71596C4.17438 4.25754 4.79614 4 5.44444 4H22.5556C23.2039 4 23.8256 4.25754 24.284 4.71596C24.7425 5.17438 25 5.79614 25 6.44444V18.6667Z"
Expand Down Expand Up @@ -669,8 +663,7 @@ const BottomContainer = styled.div<{
topModalHeight: number;
isMapFull: boolean;
}>`
padding-top: ${(props) =>
`${props.isMapFull ? 32 : props.topModalHeight + 32}px`};
padding-top: ${(props) => `${props.isMapFull ? 32 : props.topModalHeight + 32}px`};
min-height: 100svh;
transition: padding-top 0.3s ease-out;
overscroll-behavior: none;
Expand Down Expand Up @@ -835,6 +828,7 @@ const PlaceIconContainer = styled.div`
const InfoContainer = styled.div`
padding: 11px 0;
padding-left: 8px;
cursor: pointer;
display: flex;
align-items: center;
justify-content: space-between;
Expand Down