Skip to content

Fix/수정버튼 간헐적으로 표시되는 문제#181 #182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Han-Joon-Hyeok merged 2 commits into from
Feb 3, 2025
Merged

Fix/수정버튼 간헐적으로 표시되는 문제#181 #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6cb6df5
fix: 하위 컴포넌트에서 게시물 조회하는 로직이 중복되어서 제거 #181
Han-Joon-Hyeok Feb 3, 2025
56ea359
feat: 하위 컴포넌트로 isLoading Prop 전달 #181
Han-Joon-Hyeok Feb 3, 2025
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 src/app/challenges/[challengeId]/main/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ const Page = ({
contentDTO={announcement}
key={announcement.id}
challengeId={challengeId}
isLoading={isLoading}
/>
))}
</div>
Expand Down
28 changes: 3 additions & 25 deletions src/app/components/postItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,36 +24,14 @@ import PencilSquareIcon from "./icons/pencilSquareIcon";
interface PostsFeedProps {
challengeId: string;
contentDTO: ContentDTO;
isLoading: boolean;
}

const PostItem = ({ challengeId, contentDTO }: PostsFeedProps) => {
const PostItem = ({ challengeId, contentDTO, isLoading }: PostsFeedProps) => {
const [isModalOpen, setIsModalOpen] = useState(false);
const [isPostAuthor, setIsPostAuthor] = useState(false);
const [isLoading, setIsLoading] = useState(true);
const setToastPopup = useSetRecoilState(toastPopupAtom);
const router = useRouter();

useEffect(() => {
const getPostInfo = async () => {
try {
const res = await apiManager.get(`/posts/${contentDTO.id}`);
const data: ContentDTO = res.data.data;
setIsPostAuthor(data.isPostAuthor);
} catch (error) {
console.error("Failed to fetch post info:", error);
setToastPopup((prev) => ({
// @ts-ignore
message: error.data.message,
top: false,
success: true,
}));
} finally {
setIsLoading(false);
}
};
getPostInfo();
}, [contentDTO.id, setToastPopup]);

const handleDeletePost = async () => {
try {
const res = await apiManager.delete(
Expand Down Expand Up @@ -109,7 +87,7 @@ const PostItem = ({ challengeId, contentDTO }: PostsFeedProps) => {
{isLoading ? (
<div className="bg-gray-400 rounded-lg size-6 animate-pulse" />
) : (
isPostAuthor && (
contentDTO.isPostAuthor && (
<Link
href={`/challenges/${challengeId}/posts/${contentDTO.id}/edit`}
>
Expand Down
16 changes: 13 additions & 3 deletions src/app/components/postsFeed.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export default function PostsFeed({ id, isAnnouncements }: PostsFeedProps) {
};
getPosts();

const { data, error, fetchNextPage, isFetchingNextPage, status } =
const { data, error, isLoading, fetchNextPage, isFetchingNextPage, status } =
useInfiniteQuery<ChallengeContentResponseDTO, AxiosError>(
["feedPosts", id],
getPosts,
Expand Down Expand Up @@ -68,7 +68,12 @@ export default function PostsFeed({ id, isAnnouncements }: PostsFeedProps) {
<>
<div className="mb-2 font-medium text-slate-500">공지사항</div>
{announcements.content.map((post) => (
<PostItem contentDTO={post} challengeId={id} key={post.id} />
<PostItem
contentDTO={post}
challengeId={id}
key={post.id}
isLoading={isLoading}
/>
))}
</>
)}
Expand All @@ -90,7 +95,12 @@ export default function PostsFeed({ id, isAnnouncements }: PostsFeedProps) {
<div key={index} className="flex flex-col gap-3 pb-3">
{posts?.content?.length > 0 &&
posts.content.map((post) => (
<PostItem contentDTO={post} challengeId={id} key={post.id} />
<PostItem
contentDTO={post}
challengeId={id}
key={post.id}
isLoading={isLoading}
/>
))}
</div>
))}
Expand Down