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
8 changes: 2 additions & 6 deletions src/apis/draftLetters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,19 @@ import client from './client';

export interface DraftLetter {
letterId: number;
writerId: number;
matchingId: number;
receiverId: number;
parentLetterId: number;
zipCode: string;
title: string;
content: string;
category: string;
paperType: string;
fontType: string;
deliveryStartedAt: string;
deliveryCompletedAt: string;
matched: boolean;
}

export const getDraftLetters = async (): Promise<DraftLetter[]> => {
try {
const { data } = await client.get('/api/letters?status=draft', {});
const { data } = await client.get('/api/letters?status=draft');
console.log('임시저장된 편지 데이터', data);
return data.data;
} catch (error) {
Expand Down
1 change: 1 addition & 0 deletions src/pages/Home/components/RandomCheer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ const RandomCheer = () => {
src={randomCheerBird}
alt="random cheer bird"
className="h-[26.5px] w-[21px] opacity-80"
onClick={() => setRandomCheer(getRandomCheer())}
/>
</div>
);
Expand Down
24 changes: 13 additions & 11 deletions src/pages/Home/components/ShowDraftModal.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import DeleteOutlineRoundedIcon from '@mui/icons-material/DeleteOutlineRounded';
import React, { useEffect, useState } from 'react';
// import { useNavigate } from 'react-router';
import { useNavigate } from 'react-router';

import { DraftLetter, getDraftLetters, deleteDraftLetters } from '@/apis/draftLetters';
import ModalBackgroundWrapper from '@/components/ModalBackgroundWrapper';
Expand All @@ -14,13 +14,13 @@ interface ShowDraftModalProps {
const ShowDraftModal = ({ onClose }: ShowDraftModalProps) => {
const [draftLetters, setDraftLetters] = useState<DraftLetter[]>([]);

// const navigate = useNavigate();
const navigate = useNavigate();

// const handleNavigation = (incomingId: number) => {
// navigate(`/board/letter/${incomingId}`, {
// state: { isShareLetterPreview: false },
// });
// };
const handleNavigation = (draft: DraftLetter) => {
navigate(`/board/letter/${draft.letterId}?isDraft=true`, {
state: { draft: draft, isDraft: true },
});
};
Comment on lines +19 to +23
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

임시저장 편지 location state 데이터✅


const handleGetDraftLetters = () => {
getDraftLetters()
Expand Down Expand Up @@ -57,21 +57,23 @@ const ShowDraftModal = ({ onClose }: ShowDraftModalProps) => {
<ModalBackgroundWrapper className="relative overflow-hidden rounded-lg p-5">
<div className="flex flex-col gap-1">
<p className="body-sb text-gray-80">임시저장 편지</p>
<p className="caption-r text-black">로그아웃 시 임시 저장된 편지는 사라집니다</p>
</div>
<div className="mt-6 flex max-h-60 min-h-auto w-[251px] flex-col gap-[10px] overflow-y-scroll [&::-webkit-scrollbar]:hidden">
{draftLetters.length > 0 ? (
{draftLetters.length > 0 ? (
draftLetters.map((draft) => (
<div
className="text-gray-80 body-m flex h-10 w-full items-center justify-between gap-1 rounded-lg bg-white p-3"
key={draft.letterId}
// onClick={() => handleNavigation(draft.letterId)}
onClick={() => handleNavigation(draft)}
>
<p className="truncate">{draft.title}</p>
<div
className="text-gray-20 active:text-gray-600"
tabIndex={0}
onClick={() => handleDeleteDraftLetters(draft.letterId)}
onClick={(e) => {
e.stopPropagation();
handleDeleteDraftLetters(draft.letterId);
}}
>
<DeleteOutlineRoundedIcon />
</div>
Expand Down