Skip to content

Feat: 개발 QA 1차(삭제하기 모달 추가) #121

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
jjangminii merged 4 commits into from
Sep 19, 2025
Merged

Feat: 개발 QA 1차(삭제하기 모달 추가) #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c653ca9
feat: 북마크 삭제시 모달 추가
jjangminii Sep 19, 2025
74b6f69
feat: 리마인드 삭제시 모달 추가
jjangminii Sep 19, 2025
46e384b
chore: 멘트 수정
jjangminii Sep 19, 2025
cddc137
feat: bg 컬러 수정
jjangminii Sep 19, 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
56 changes: 45 additions & 11 deletions apps/client/src/pages/myBookmark/MyBookmark.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Badge, Card } from '@pinback/design-system/ui';
import { Badge, Card, PopupContainer } from '@pinback/design-system/ui';
import { useState } from 'react';
import {
useGetBookmarkArticles,
Expand All @@ -25,6 +25,9 @@ const MyBookmark = () => {
const [activeBadge, setActiveBadge] = useState<'all' | 'notRead'>('all');
const [isEditOpen, setIsEditOpen] = useState(false);

const [isDeleteOpen, setIsDeleteOpen] = useState(false);
const [deleteTargetId, setDeleteTargetId] = useState<number | null>(null);

const [searchParams] = useSearchParams();
const queryClient = useQueryClient();
const category = searchParams.get('category');
Expand Down Expand Up @@ -59,17 +62,16 @@ const MyBookmark = () => {
const handleDeleteArticle = (id: number) => {
deleteArticle(id, {
onSuccess: () => {
queryClient.invalidateQueries({
queryKey: ['bookmarkReadArticles'],
});
queryClient.invalidateQueries({
queryKey: ['bookmarkUnreadArticles'],
});
// TODO: 쿼리키 팩토리 패턴 적용
queryClient.invalidateQueries({ queryKey: ['bookmarkReadArticles'] });
queryClient.invalidateQueries({ queryKey: ['bookmarkUnreadArticles'] });
queryClient.invalidateQueries({
queryKey: ['categoryBookmarkArticles'],
});

close();
queryClient.invalidateQueries({ queryKey: ['arcons'] });
setIsDeleteOpen(false);
setDeleteTargetId(null);
closeMenu();
},
onError: (error) => {
console.error('아티클 삭제 실패:', error);
Expand Down Expand Up @@ -181,15 +183,47 @@ const MyBookmark = () => {
closeMenu();
}}
onDelete={(articleId) => {
handleDeleteArticle(articleId);
setDeleteTargetId(articleId);
setIsDeleteOpen(true);
closeMenu();
}}
onClose={closeMenu}
/>

{/* 삭제 확인 모달 */}
{isDeleteOpen && (
<div className="fixed inset-0" aria-modal="true" role="dialog">
<div
className="absolute inset-0"
onClick={() => setIsDeleteOpen(false)}
/>
<div className="absolute inset-0 z-[100] flex items-center justify-center p-4">
<PopupContainer
isOpen
type="subtext"
title="정말 삭제하시겠어요?"
subtext="저장된 내용이 모두 사라지게 돼요."
left="취소"
right="삭제"
onLeftClick={() => setIsDeleteOpen(false)}
onRightClick={() => {
if (deleteTargetId != null) {
handleDeleteArticle(deleteTargetId);
} else {
setIsDeleteOpen(false);
}
}}
onClose={() => setIsDeleteOpen(false)}
/>
</div>
</div>
)}

{/* 편집 모달 */}
{isEditOpen && (
<div className="fixed inset-0 z-[1000]" aria-modal="true" role="dialog">
<div
className="absolute inset-0 bg-black/60 backdrop-blur-[2px]"
className="absolute inset-0 bg-black/60"
onClick={() => setIsEditOpen(false)}
/>
<div className="absolute inset-0 flex items-center justify-center p-4">
Expand Down
41 changes: 39 additions & 2 deletions apps/client/src/pages/remind/Remind.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useState } from 'react';
import { Badge, Card } from '@pinback/design-system/ui';
import { Badge, Card, PopupContainer } from '@pinback/design-system/ui';
import CardEditModal from '@shared/components/cardEditModal/CardEditModal';
import OptionsMenuPortal from '@shared/components/sidebar/OptionsMenuPortal';
import { useAnchoredMenu } from '@shared/hooks/useAnchoredMenu';
Expand All @@ -20,6 +20,9 @@ import NoRemindArticles from './components/noRemindArticles/NoRemindArticles';
const Remind = () => {
const [isEditOpen, setIsEditOpen] = useState(false);
const [activeBadge, setActiveBadge] = useState<'read' | 'notRead'>('notRead');
const [isDeleteOpen, setIsDeleteOpen] = useState(false);
const [deleteTargetId, setDeleteTargetId] = useState<number | null>(null);

const formattedDate = formatLocalDateTime();

const queryClient = useQueryClient();
Expand Down Expand Up @@ -50,6 +53,10 @@ const Remind = () => {
deleteArticle(id, {
onSuccess: () => {
queryClient.invalidateQueries({ queryKey: ['remindArticles'] });
queryClient.invalidateQueries({ queryKey: ['arcons'] });
setIsDeleteOpen(false);
setDeleteTargetId(null);
closeMenu();
close();
},
onError: (error) => {
Expand Down Expand Up @@ -143,11 +150,41 @@ const Remind = () => {
closeMenu();
}}
onDelete={(articleId) => {
handleDeleteArticle(articleId);
setDeleteTargetId(articleId);
setIsDeleteOpen(true);
closeMenu();
}}
onClose={closeMenu}
/>

{isDeleteOpen && (
<div className="fixed inset-0" aria-modal="true" role="dialog">
<div
className="absolute inset-0"
onClick={() => setIsDeleteOpen(false)}
/>
<div className="absolute inset-0 z-[100] flex items-center justify-center p-4">
<PopupContainer
isOpen
type="subtext"
title="정말 삭제하시겠어요?"
subtext="저장된 내용이 모두 사라지게 돼요."
left="취소"
right="삭제"
onLeftClick={() => setIsDeleteOpen(false)}
onRightClick={() => {
if (deleteTargetId != null) {
handleDeleteArticle(deleteTargetId);
} else {
setIsDeleteOpen(false);
}
}}
onClose={() => setIsDeleteOpen(false)}
/>
</div>
</div>
)}

{isEditOpen && (
<div className="fixed inset-0 z-[1000]" aria-modal="true" role="dialog">
<div
Expand Down
Loading