Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
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
14 changes: 14 additions & 0 deletions package-lock.json

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

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"tailwind-merge": "^3.3.1",
"tailwindcss-animate": "^1.0.7",
"use-sync-external-store": "^1.5.0",
"vaul": "^1.1.2",
"zod": "^4.0.5",
"zustand": "^5.0.5"
},
Expand Down
83 changes: 47 additions & 36 deletions src/components/Modal/DeleteModal/DeleteModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ import { useMutation, useQueryClient } from '@tanstack/react-query';
import { AxiosError } from 'axios';

import { deleteReview, deleteWine, DeleteResponse } from '@/api/delete';
import BasicBottomSheet from '@/components/common/BottomSheet/BasicBottomSheet';
import BasicModal from '@/components/common/Modal/BasicModal';
import { Button } from '@/components/ui/button';
import { useMediaQuery } from '@/hooks/useMediaQuery';

interface DeleteModalProps {
type: 'wine' | 'review';
Expand All @@ -14,6 +16,7 @@ interface DeleteModalProps {

const DeleteModal = ({ type, id, showDeleteModal, setShowDeleteModal }: DeleteModalProps) => {
const queryClient = useQueryClient();
const isDesktop = useMediaQuery('(min-width: 640px)');

const deleteWineMutation = useMutation<DeleteResponse, AxiosError, number>({
mutationFn: (id) => deleteWine(id),
Expand Down Expand Up @@ -51,44 +54,52 @@ const DeleteModal = ({ type, id, showDeleteModal, setShowDeleteModal }: DeleteMo
}
};

return (
<div>
<BasicModal
type='register'
title=''
open={showDeleteModal}
onOpenChange={(isOpen: boolean) => setShowDeleteModal(isOpen)}
showCloseButton={false}
buttons={
<div className='flex w-full gap-2'>
<Button
onClick={() => setShowDeleteModal(false)}
type='button'
variant='onlyCancel'
size='xl'
width='full'
fontSize='lg'
>
์ทจ์†Œ
</Button>
<Button
onClick={handleDelete}
type='button'
variant='purpleDark'
size='xl'
width='full'
fontSize='lg'
>
์‚ญ์ œ
</Button>
</div>
}
const buttons = (
<div className='flex w-full gap-2'>
<Button
onClick={() => setShowDeleteModal(false)}
type='button'
variant='onlyCancel'
size='xl'
width='full'
fontSize='lg'
>
<span className='flex justify-center mb-8 custom-text-2lg-bold md:custom-text-xl-bold'>
์ •๋ง๋กœ ์‚ญ์ œํ•˜์‹œ๊ฒ ์Šต๋‹ˆ๊นŒ?
</span>
</BasicModal>
์ทจ์†Œ
</Button>
<Button
onClick={handleDelete}
type='button'
variant='purpleDark'
size='xl'
width='full'
fontSize='lg'
>
์‚ญ์ œ
</Button>
</div>
);

return isDesktop ? (
<BasicModal
type='register'
title=''
open={showDeleteModal}
onOpenChange={(isOpen: boolean) => setShowDeleteModal(isOpen)}
showCloseButton={false}
>
<span className='flex justify-center mb-8 custom-text-2lg-bold md:custom-text-xl-bold'>
์ •๋ง๋กœ ์‚ญ์ œํ•˜์‹œ๊ฒ ์Šต๋‹ˆ๊นŒ?
</span>
{buttons}
</BasicModal>
) : (
<BasicBottomSheet
open={showDeleteModal}
onOpenChange={setShowDeleteModal}
title='์ •๋ง๋กœ ์‚ญ์ œํ•˜์‹œ๊ฒ ์Šต๋‹ˆ๊นŒ?'
>
{buttons}
</BasicBottomSheet>
);
};
export default DeleteModal;
89 changes: 56 additions & 33 deletions src/components/Modal/FilterModal/FilterModal.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import React from 'react';

import BasicBottomSheet from '@/components/common/BottomSheet/BasicBottomSheet';
import WineTypeFilter from '@/components/common/Filter/WineTypeFilter';
import BasicModal from '@/components/common/Modal/BasicModal';
import { Button } from '@/components/ui/button';
import { useMediaQuery } from '@/hooks/useMediaQuery';
import useFilterStore from '@/stores/filterStore';

const FilterModal = ({
Expand All @@ -13,47 +15,68 @@ const FilterModal = ({
onOpenChange: (isOpen: boolean) => void;
}) => {
const reset = useFilterStore((state) => state.reset);
const isDesktop = useMediaQuery('(min-width: 640px)');

const handleApplyFilter = (e: React.FormEvent) => {
e.preventDefault();
onOpenChange(false); // ํ•„ํ„ฐ ์ ์šฉ ํ›„ ๋ชจ๋‹ฌ์„ close
};

const renderButton = (
<div className='flex gap-2'>
<Button
onClick={reset}
variant='purpleLight'
size='xl'
className='w-[96px] md:w-[96px]'
fontSize='lg'
>
์ดˆ๊ธฐํ™”
</Button>
<Button
type='button'
onClick={handleApplyFilter}
variant='purpleDark'
size='xl'
className='w-[223px] md:w-[223px]'
fontSize='lg'
>
ํ•„ํ„ฐ ์ ์šฉํ•˜๊ธฐ
</Button>
</div>
);

const renderForm = (
<form onSubmit={handleApplyFilter}>
<WineTypeFilter className='mt-[20px] mb-[25px] ' showBorder={true} hasMargin={false} />
</form>
);

return (
<div>
<BasicModal
type='filter'
title='ํ•„ํ„ฐ'
open={open}
onOpenChange={onOpenChange}
buttons={
<div className='flex gap-2'>
<Button
onClick={reset}
variant='purpleLight'
size='xl'
className='w-[96px] md:w-[96px]'
fontSize='lg'
>
์ดˆ๊ธฐํ™”
</Button>
<Button
type='button'
onClick={handleApplyFilter}
variant='purpleDark'
size='xl'
className='w-[223px] md:w-[223px]'
fontSize='lg'
>
ํ•„ํ„ฐ ์ ์šฉํ•˜๊ธฐ
</Button>
</div>
}
>
<form onSubmit={handleApplyFilter}>
<WineTypeFilter className='mt-[20px] mb-[25px] ' showBorder={true} hasMargin={false} />
</form>
</BasicModal>
{isDesktop ? (
<BasicModal
type='filter'
title='ํ•„ํ„ฐ'
open={open}
onOpenChange={onOpenChange}
buttons={renderButton}
>
{renderForm}
</BasicModal>
) : (
<div>
<BasicBottomSheet
title='ํ•„ํ„ฐ'
open={open}
onOpenChange={onOpenChange}
buttons={renderButton}
contentLayer='flex items-center w-auto'
>
{renderForm}
</BasicBottomSheet>
</div>
)}
</div>
);
};
Expand Down
Loading