Skip to content

Commit 4335033

Browse files
authored
Merge pull request #81 from ASAP-Lettering/fix/#72
[Fix] 편지 이동 시 유저명이 아닌 senderName 적용되게 수정
2 parents 6425556 + 0004155 commit 4335033

3 files changed

Lines changed: 15 additions & 9 deletions

File tree

src/app/planet/move/page.tsx

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,14 @@ import {
1616
import Image from "next/image";
1717
import { getSpaceList } from "@/api/planet/space/space";
1818
import { useToast } from "@/hooks/useToast";
19-
import { userState } from "@/recoil/userStore";
20-
import { useRecoilValue } from "recoil";
2119

2220
const PlanetMovePage = () => {
2321
const router = useRouter();
2422
const { showToast } = useToast();
2523
const searchParams = useSearchParams();
2624
const letterId = searchParams.get("letter");
25+
const senderName = searchParams.get("senderName");
2726

28-
const { name } = useRecoilValue(userState);
2927
const [planets, setPlanets] = useState<Planet[]>();
3028
const [checkedPlanet, setCheckedPlanet] = useState<string>("");
3129
const [checkedIndep, setCheckedIndep] = useState<boolean>(false);
@@ -69,7 +67,7 @@ const PlanetMovePage = () => {
6967
console.log("편지 다른 행성 이동 성공");
7068

7169
showToast(
72-
`${name} 님의 편지가 ${checkePlanetName} 행성으로 이동했어요`,
70+
`${senderName} 님의 편지가 ${checkePlanetName} 행성으로 이동했어요`,
7371
{
7472
icon: true,
7573
iconType: "info",
@@ -79,7 +77,7 @@ const PlanetMovePage = () => {
7977
);
8078
} else {
8179
showToast(
82-
`${name} 님의 편지가 ${checkePlanetName} 궤도로 이동했어요`,
80+
`${senderName} 님의 편지가 ${checkePlanetName} 궤도로 이동했어요`,
8381
{
8482
icon: true,
8583
iconType: "info",
@@ -109,7 +107,7 @@ const PlanetMovePage = () => {
109107
<Layout>
110108
<NavigatorBar title="편지 이동하기" cancel={false} />
111109
<Container>
112-
<Label>{name}의 편지를 어디로 이동할까요?</Label>
110+
<Label>{senderName}의 편지를 어디로 이동할까요?</Label>
113111
<Divider />
114112
<PlanetBoxList>
115113
{planets?.map((item, index) => (

src/app/planet/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,7 @@ const BottomWrapper = styled.div`
684684
bottom: 0px;
685685
left: 50%;
686686
transform: translateX(-50%);
687-
z-index: 1000;
687+
z-index: 20;
688688
`;
689689

690690
/* 로딩 */

src/components/common/Planet.tsx

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ const Planet = (props: PlanetProps) => {
4747
const [hold, setHold] = useState<boolean>(false);
4848
const [confirmDeleteModal, setConfirmDeleteModal] = useState<boolean>(false);
4949
const [orbitId, setOrbitId] = useState<string>("");
50+
const [senderName, setSenderName] = useState<string>("");
5051
const type = getCookie("letter-tagtype"); // 편지 태그 - 이름(1) / 이름과날짜(2) 구분용
5152

5253
const radius = 150; // Orbit들이 배치될 원의 반지름
@@ -59,8 +60,15 @@ const Planet = (props: PlanetProps) => {
5960
router.push(`/letter/${id}`);
6061
};
6162

63+
const findSenderName = (orbitId: string, orbits?: Orbit[]) => {
64+
const orbit = orbits?.find((orbit) => orbit.letterId === orbitId);
65+
return orbit ? orbit.senderName : undefined;
66+
};
67+
6268
const handleShowHold = (orbitId: string) => {
69+
const senderName = findSenderName(orbitId, orbits);
6370
setOrbitId(orbitId);
71+
setSenderName(senderName ?? "");
6472
setHold(!hold);
6573
};
6674

@@ -70,7 +78,7 @@ const Planet = (props: PlanetProps) => {
7078

7179
const handleMoveButtonClick = (e: React.MouseEvent<HTMLButtonElement>) => {
7280
e.stopPropagation();
73-
router.push(`/planet/move?letter=${orbitId}`);
81+
router.push(`/planet/move?letter=${orbitId}&senderName=${senderName}`);
7482
};
7583

7684
const handleDeleteButtonClick = (e: React.MouseEvent<HTMLButtonElement>) => {
@@ -287,5 +295,5 @@ const Overlay = styled.div`
287295
align-items: center;
288296
justify-content: center;
289297
gap: 15px;
290-
z-index: 20;
298+
z-index: 100;
291299
`;

0 commit comments

Comments
 (0)