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
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"gsap": "^3.12.7",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-intersection-observer": "^9.15.1",
Copy link
Collaborator

Choose a reason for hiding this comment

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

이게 탄스택 쿼리의 무한스크롤인가용?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

이건 뷰에 특정 컴포넌트가 있는지 없는지 확인을 쉽게 하게 해주는 라이브러리입니다! 이걸 적용해서 스크롤 됐을떄 마지막 요소가 뷰에 있는지 확인하고, 있으면 다음 페이지 api 요청을 하는 로직입니다!

"react-router": "^7.1.5",
"swiper": "^11.2.4",
"tailwind-merge": "^3.0.1",
Expand Down
18 changes: 18 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions src/apis/mailBox.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ export const getMailbox = async () => {
}
};

export const getMailboxDetail = async (id: number) => {
export const getMailboxDetail = async (id: number, pageParam: number) => {
try {
const response = await client.get(`/api/mailbox/${id}`);
const response = await client.get(`/api/mailbox/${id}?page=${pageParam}&size=20`);
// const response = await client.get(`/api/mailbox/${id}`);

if (!response) throw new Error('error while fetching mailbox detail data');
return response.data;
} catch (error) {
Expand Down
34 changes: 19 additions & 15 deletions src/components/LetterWrapper.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { forwardRef } from 'react';
import { twMerge } from 'tailwind-merge';

interface LetterWrapperProps {
Expand All @@ -7,20 +8,23 @@ interface LetterWrapperProps {
onClick?: (e: React.MouseEvent<HTMLElement>) => void;
}

const LetterWrapper = ({ isSender = false, className, children, onClick }: LetterWrapperProps) => {
return (
<article
className={twMerge(
'relative flex overflow-hidden rounded-sm p-4',
isSender ? 'letter-sender-bg' : 'letter-receiver-bg',
className,
)}
onClick={onClick}
>
<div className="z-10 w-full">{children}</div>
<div className="absolute inset-0 z-0 bg-white/50 blur-xl" />
</article>
);
};
const LetterWrapper = forwardRef<HTMLDivElement, LetterWrapperProps>(
Copy link
Collaborator

Choose a reason for hiding this comment

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

forwardRef는 처음 보는데 부모 컴포넌트에서 자식 컴포넌트의 ref객체를 사용하기 위해 쓰는건가용??

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

맞아요!

({ isSender = false, className, children, onClick }, ref) => {
return (
<article
className={twMerge(
'relative flex overflow-hidden rounded-sm p-4',
isSender ? 'letter-sender-bg' : 'letter-receiver-bg',
className,
)}
onClick={onClick}
ref={ref}
>
<div className="z-10 w-full">{children}</div>
<div className="absolute inset-0 z-0 bg-white/50 blur-xl" />
</article>
);
},
);

export default LetterWrapper;
9 changes: 5 additions & 4 deletions src/pages/LetterBox/components/LetterBoxItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,15 @@ const LetterBoxItem = ({
className="flex h-fit w-fit flex-col items-center"
onClick={() => handleClickItem(boxId)}
>
<div className="text-gray-70 flex h-25 w-20 flex-col gap-1.5 bg-linear-to-b from-[#D5B695] to-[#B3895D] p-1.5">
<div className="text-gray-70 window-bg flex h-25 w-20 flex-col gap-1.5 bg-linear-to-b p-1.5">
<p
className={twMerge(
'body-m from-white px-1',
isClosed
? 'bg-[repeating-linear-gradient(#D9D9D9,#D9D9D9_17px,#C2C2C2_17px,#C2C2C2_23px)]'
: 'bg-linear-to-b',
isChecked ? 'to-[#FFF5ED]' : 'to-[#FFF4F2]',
: isChecked
? 'window-top-checked'
: 'window-top-unChecked',
)}
>
{zipCode}
Expand All @@ -48,7 +49,7 @@ const LetterBoxItem = ({
<div
className={twMerge(
'flex grow flex-col bg-linear-to-b',
isChecked ? 'from-[#FFF7E3] to-[#FFE197]' : 'from-[#FFF4F2] to-[#FFE6E3]',
isChecked ? 'window-bottom-checked' : 'window-bottom-unChecked',
)}
>
<p className="body-r mt-auto mr-[1px] text-right">{letterCount}통</p>
Expand Down
50 changes: 31 additions & 19 deletions src/pages/LetterBox/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { useEffect, useState } from 'react';
import { useQuery } from '@tanstack/react-query';
import { useNavigate } from 'react-router';

import { getMailbox } from '@/apis/mailBox';
import DoorImg from '@/assets/images/door.png';
Expand All @@ -13,25 +14,34 @@ interface LetterBoxData {
oppositeZipCode: string;
active: boolean;
oppositeRead: boolean;
// totalLetters: number;
letterCount: number;
}

const fetchMailLists = async () => {
const response = await getMailbox();
if (!response) throw new Error();
const data: LetterBoxData[] = response.data;
// 정렬?
return data;
};

const LetterBoxPage = () => {
const [letterBox, setLetterBox] = useState<LetterBoxData[]>([]);
const {
data: letterBox = [],
isLoading,
isError,
} = useQuery({
queryKey: ['mailbox'],
queryFn: fetchMailLists,
staleTime: 1000 * 60 * 5,
gcTime: 1000 * 60 * 10,
});

const navigate = useNavigate();

const fetchMailLists = async () => {
try {
const response = await getMailbox();
if (!response) throw new Error();
const data: LetterBoxData[] = response.data;
// 정렬?
setLetterBox(data);
} catch (error) {
console.error(error);
}
};
useEffect(() => {
fetchMailLists();
}, []);
if (isError) {
navigate('/NotFound');
}

return (
<main className="flex grow flex-col items-center px-5 pt-20">
Expand All @@ -42,14 +52,16 @@ const LetterBoxPage = () => {
</p>
<section className="letter-box-bg flex grow flex-col items-center px-4 pt-5">
<div className="flex w-full flex-col gap-5">
{letterBox.length > 0 ? (
{isLoading ? (
<p className="body-m text-gray-60 text-center">로딩중..</p>
) : letterBox.length > 0 ? (
chunkBox(
letterBox.map((data: LetterBoxData, index) => (
<LetterBoxItem
boxId={data.letterMatchingId}
key={index}
zipCode={data.oppositeZipCode}
letterCount={90}
letterCount={data.letterCount}
isChecked={data.oppositeRead}
isClosed={data.active}
/>
Expand Down
34 changes: 18 additions & 16 deletions src/pages/LetterBoxDetail/components/LetterPreview.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { forwardRef } from 'react';
import { useNavigate } from 'react-router';

import LetterWrapper from '@/components/LetterWrapper';
import formatDate from '@/utils/formatDate';

interface LetterPreviewProps {
id: number;
Expand All @@ -13,18 +15,18 @@ interface LetterPreviewProps {
isClosed: boolean;
zipCode: string;
}
const LetterPreview = ({
id,
date,
title,
isSend,
checked,
isShareMode = false,
onToggle,
isClosed,
zipCode,
}: LetterPreviewProps) => {
// 차단된 편지인경우 편지 보내기 disable
const LetterPreview = forwardRef<HTMLDivElement, LetterPreviewProps>((props, ref) => {
const {
id,
date,
title,
isSend,
checked,
isShareMode = false,
onToggle,
isClosed,
zipCode,
} = props;
const navigate = useNavigate();

const handleItemClick = (id: number) => {
Expand All @@ -39,9 +41,9 @@ const LetterPreview = ({

if (isShareMode)
return (
<LetterWrapper isSender={isSend}>
<LetterWrapper isSender={isSend} ref={ref}>
<div className="mb-3 flex items-center justify-between">
<p className="body-r text-gray-80">{date}</p>
<p className="body-r text-gray-80">{formatDate(date)}</p>
<label htmlFor={`${id}`} className="relative">
<input
id={`${id}`}
Expand All @@ -58,11 +60,11 @@ const LetterPreview = ({
);

return (
<LetterWrapper isSender={isSend} onClick={() => handleItemClick(id)}>
<LetterWrapper isSender={isSend} onClick={() => handleItemClick(id)} ref={ref}>
<p className="body-r text-gray-80 mb-3">{date}</p>
<p className="body-m text-gray-80 line-clamp-1 break-all">{title}</p>
</LetterWrapper>
);
};
});

export default LetterPreview;
Loading