Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 11 additions & 4 deletions src/app/planet/move/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,23 @@ import Image from 'next/image';
import { getSpaceList } from '@/api/planet/space/space';
import { useToast } from '@/hooks/useToast';
import { Planet } from '@/types/planet';
import { useRecoilValue } from 'recoil';
import { spaceState } from '@/recoil/spaceStore';
import { getSpaceId } from '@/utils/storage';

const PlanetMovePage = () => {
const router = useRouter();
const { showToast } = useToast();
const searchParams = useSearchParams();
const letterId = searchParams.get('letter');
const senderName = searchParams.get('senderName');
const viewSpaceId = useRecoilValue(spaceState);
const mainSpaceId = getSpaceId();

const [planets, setPlanets] = useState<Planet[]>();
const [checkedPlanet, setCheckedPlanet] = useState<string>('');
const [checkedPlanet, setCheckedPlanet] = useState<string>(
viewSpaceId || mainSpaceId
);
const [checkedIndep, setCheckedIndep] = useState<boolean>(false);
const [checkePlanetName, setCheckedPlanetName] = useState<string>('');

Expand All @@ -35,7 +42,6 @@ const PlanetMovePage = () => {
const response = await getSpaceList();
console.log('전체 스페이스 목록 조회 성공:', response.data);
setPlanets(response.data.spaces);
setCheckedPlanet(response.data.spaces[0].spaceId);
} catch (error) {
console.error('전체 스페이스 목록 조회 실패:', error);
}
Expand Down Expand Up @@ -116,7 +122,7 @@ const PlanetMovePage = () => {
planetName={item.spaceName}
count={item.letterCount}
checked={checkedPlanet}
current={index === 0}
current={item.spaceId === (viewSpaceId || mainSpaceId)}
onClick={() => {
handleChangeChecked(item);
}}
Expand Down Expand Up @@ -149,7 +155,8 @@ const PlanetMovePage = () => {
text="이동하기"
disabled={
(checkedPlanet === '' && checkedIndep === false) ||
checkedPlanet === planets?.[0]?.spaceId
checkedPlanet === planets?.[0]?.spaceId ||
checkedPlanet === (viewSpaceId || mainSpaceId)
}
onClick={handleMovePlanet}
/>
Expand Down
25 changes: 12 additions & 13 deletions src/app/planet/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,21 @@ import Tag from '@/components/common/Tag';
import { theme } from '@/styles/theme';
import Pagination from '@/components/common/Pagination';
import { useRouter } from 'next/navigation';
import { useRecoilState, useRecoilValue, useSetRecoilState } from 'recoil';
import { useRecoilState, useRecoilValue } from 'recoil';
import { getMainId, getSpaceInfo, putSpace } from '@/api/planet/space/space';
import {
getOrbitLetter,
getPlanetLetterList,
putLetterToIndep,
putLetterToPlanet
} from '@/api/planet/letter/spaceLetter';
import Loader from '@/components/common/Loader';
import { SpaceInfo } from '@/types/space';
import {
getAccessToken,
getCookie,
getInitUserToast,
getOnboarding,
setCookie,
setInitUserToast
setInitUserToast,
setSpaceId
} from '@/utils/storage';
import { getLetterCount } from '@/api/letter/letter';
import PlanetSlide from '@/components/planet/PlanetSlide';
Expand Down Expand Up @@ -158,6 +156,7 @@ const PlanetPage = () => {
const response = await getMainId();
console.log('메인 ID 조회 성공:', response.data);
if (!viewSpaceId) {
setSpaceId(response.data.spaceId);
setSpaceInfo({
spaceId: response.data.spaceId,
spaceName: response.data.spaceName,
Expand Down Expand Up @@ -531,14 +530,14 @@ const PlanetPage = () => {
onOrbitTouch={handleTagTouch}
/>
</BottomWrapper>
{/* {showTooltip && ( */}
<Tooltip
message={`먼저 편지를 보관한 후, 행성으로 끌어 당겨보세요`}
close={true}
bottom="230px"
onClose={() => setShowTooltip(false)}
/>
{/* )} */}
{showTooltip && (
<Tooltip
message={`먼저 편지를 보관한 후, 행성으로 끌어 당겨보세요`}
close={true}
bottom="230px"
onClose={() => setShowTooltip(false)}
/>
)}
</Container>
</>
)}
Expand Down