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
6 changes: 0 additions & 6 deletions src/apis/unreadLetters.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
import client from './client';

export interface UnreadLetters {
data: number;
message: string;
timestamp: string;
}

export const getUnreadLettersCount = async (): Promise<UnreadLetters> => {
try {
const response = await client.get('/api/letters/unread/count');
Expand Down
17 changes: 15 additions & 2 deletions src/pages/Home/components/GoToLetterBox.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,24 @@
import { useState, useEffect } from 'react';
import { Link } from 'react-router';

import { getUnreadLettersCount } from '@/apis/unreadLetters';
import goToLetterBoxNewLetters from '@/assets/images/go-to-letter-box-new-letters.png';
import goToLetterBox from '@/assets/images/go-to-letter-box.png';
import { useIncomingLettersStore } from '@/stores/incomingLettersStore';

const GoToLetterBox = () => {
const arrivedCount = useIncomingLettersStore((state) => state.arrivedCount);
const [arrivedCount, setArrivedCount] = useState<number>(0);

useEffect(() => {
const fetchUnreadCount = async () => {
try {
const result = await getUnreadLettersCount();
setArrivedCount(result.data);
} catch (error) {
console.error('❌ 안 읽은 편지 개수를 불러오는 데 실패했습니다:', error);
}
};
fetchUnreadCount();
}, []);

return (
<div className="absolute bottom-15 left-5 z-9 flex">
Expand Down
4 changes: 2 additions & 2 deletions src/pages/Home/components/HomeRight.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { getUnreadLettersCount } from '@/apis/unreadLetters';
import FloatingLetters from './FloatingLetters';
import GoToLetterBoard from './GoToLetterBoard';
import GoToLetterBox from './GoToLetterBox';
import NewLetterModal from './NewLetterModal';
import UnreadLetterModal from './UnreadLetterModal';

const HomeRight = () => {
const [arrivedCount, setArrivedCount] = useState<number>(0);
Expand All @@ -27,7 +27,7 @@ const HomeRight = () => {
{arrivedCount !== 0 && <FloatingLetters />}
<GoToLetterBox />
<GoToLetterBoard />
{arrivedCount !== 0 && <NewLetterModal />}
{arrivedCount !== 0 && <UnreadLetterModal />}
</div>
);
};
Expand Down
12 changes: 1 addition & 11 deletions src/pages/Home/components/ShowIncomingLettersModal.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React, { useEffect } from 'react';
import { useNavigate } from 'react-router';

import ModalBackgroundWrapper from '@/components/ModalBackgroundWrapper';
import ModalOverlay from '@/components/ModalOverlay';
Expand All @@ -11,19 +10,11 @@ interface ShowIncomingLettersModalProps {
}

const ShowIncomingLettersModal = ({ onClose }: ShowIncomingLettersModalProps) => {
const navigate = useNavigate();

const handleNavigation = (incomingId: number) => {
navigate(`/board/letter/${incomingId}`, {
state: { isShareLetterPreview: false },
});
};

const { data, fetchIncomingLetters } = useIncomingLettersStore();

useEffect(() => {
fetchIncomingLetters();
}, []);
}, [fetchIncomingLetters]);

return (
<ModalOverlay closeOnOutsideClick onClose={onClose}>
Expand All @@ -42,7 +33,6 @@ const ShowIncomingLettersModal = ({ onClose }: ShowIncomingLettersModalProps) =>
<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={letter.letterId}
onClick={() => handleNavigation(letter.letterId)}
>
<p className="truncate">{letter.title}</p>
<p>{letter.remainingTime}</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useEffect, useState } from 'react';

import { getUnreadLettersCount } from '@/apis/unreadLetters';

const NewLetterModal = () => {
const UnreadLetterModal = () => {
const [arrivedCount, setArrivedCount] = useState<number>(0);

useEffect(() => {
Expand All @@ -24,4 +24,4 @@ const NewLetterModal = () => {
);
};

export default NewLetterModal;
export default UnreadLetterModal;
4 changes: 4 additions & 0 deletions src/types/unreadLetters.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
interface UnreadLetters {
data: number;
message: string;
}