From 8d814abdf667865dade49694026f1f6b6ed681e7 Mon Sep 17 00:00:00 2001 From: Shim MunSeong Date: Fri, 17 Jan 2025 20:22:35 +0900 Subject: [PATCH 1/7] =?UTF-8?q?fix:=20=EC=B6=9C=EC=97=B0=EC=A7=84=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=ED=8E=B8=EC=A7=91=20=ED=8C=9D=EC=97=85?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=ED=8C=80=EC=9B=90=20=EC=82=AD=EC=A0=9C=20?= =?UTF-8?q?=ED=9B=84=20=ED=8C=80=EC=9B=90=20=EC=B6=94=EA=B0=80=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=EC=9D=84=20=EB=88=84=EB=A5=B4=EB=A9=B4=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C=ED=96=88=EB=8D=98=20=ED=8C=80=EC=9B=90=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=EA=B0=80=20=EC=9E=85=EB=A0=A5=EB=90=9C=20=EC=B1=84?= =?UTF-8?q?=EB=A1=9C=20=EB=85=B8=EC=B6=9C=EB=90=98=EB=8A=94=20=EB=AC=B8?= =?UTF-8?q?=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/ShowCastInfoFormDialogContent/index.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/admin/src/components/ShowCastInfoFormDialogContent/index.tsx b/apps/admin/src/components/ShowCastInfoFormDialogContent/index.tsx index 556faab3..bb847a7d 100644 --- a/apps/admin/src/components/ShowCastInfoFormDialogContent/index.tsx +++ b/apps/admin/src/components/ShowCastInfoFormDialogContent/index.tsx @@ -201,8 +201,8 @@ const ShowCastInfoFormDialogContent = ({ prevShowCastInfo, onDelete, onSave }: P } catch { toast.error( '불티에 회원으로 등록된 식별 코드로만 등록이 가능합니다.' + - '\n' + - '식별 코드를 확인 후 다시 시도해 주세요.', + '\n' + + '식별 코드를 확인 후 다시 시도해 주세요.', ); } finally { setIsMemberFieldBlurred((prev) => { @@ -262,7 +262,7 @@ const ShowCastInfoFormDialogContent = ({ prevShowCastInfo, onDelete, onSave }: P { - append({ id: -Math.floor(Math.random() * 1000000) }); + append({ id: -Math.floor(Math.random() * 1000000), userCode: '', userNickname: '', roleName: '', userImgPath: '' }); setIsMemberFieldBlurred((prev) => [...prev, { userCode: false, roleName: false }]); }} > From eff3797e69e8f908154407a1bc5f75192d587d87 Mon Sep 17 00:00:00 2001 From: Shim MunSeong Date: Fri, 17 Jan 2025 20:25:28 +0900 Subject: [PATCH 2/7] =?UTF-8?q?fix:=20=EB=AA=A8=EB=B0=94=EC=9D=BC=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=ED=8C=80=20=EC=88=9C=EC=84=9C=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=20=ED=95=B8=EB=93=A4=EC=9D=B4=20=EB=85=B8=EC=B6=9C=EB=90=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ShowCastInfo/ShowCastInfo.styles.ts | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/apps/admin/src/components/ShowCastInfo/ShowCastInfo.styles.ts b/apps/admin/src/components/ShowCastInfo/ShowCastInfo.styles.ts index 4f66ab39..27206353 100644 --- a/apps/admin/src/components/ShowCastInfo/ShowCastInfo.styles.ts +++ b/apps/admin/src/components/ShowCastInfo/ShowCastInfo.styles.ts @@ -37,17 +37,13 @@ const HeaderNameWrapper = styled.div` `; const Handle = styled.button` - display: none; - - ${mq_lg} { - display: inline-flex; - align-items: center; - justify-content: center; - color: ${({ theme }) => theme.palette.grey.g40}; - cursor: grab; - user-select: none; - user-zoom: none; - } + display: inline-flex; + align-items: center; + justify-content: center; + color: ${({ theme }) => theme.palette.grey.g40}; + cursor: grab; + user-select: none; + user-zoom: none; `; const Name = styled.span` From 5c21dfd96259fb22ebc3d7af1f634e171fd02c11 Mon Sep 17 00:00:00 2001 From: Shim MunSeong Date: Fri, 17 Jan 2025 20:30:21 +0900 Subject: [PATCH 3/7] =?UTF-8?q?fix:=20=EA=B3=B5=EC=97=B0=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C=20=ED=9B=84,=20=EA=B3=B5=EC=97=B0=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=ED=8C=9D=EC=97=85=20=EB=8B=AB=EA=B8=B0=20=EB=B0=8F?= =?UTF-8?q?=20=EC=A3=BC=EC=B5=9C=EC=9E=90=20=ED=99=88=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EC=9D=B4=EB=8F=99=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/ShowDeleteDialogContent/index.tsx | 11 ++++++++++- apps/admin/src/components/ShowDetailLayout/index.tsx | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/apps/admin/src/components/ShowDeleteDialogContent/index.tsx b/apps/admin/src/components/ShowDeleteDialogContent/index.tsx index a9486e34..1c6eaeae 100644 --- a/apps/admin/src/components/ShowDeleteDialogContent/index.tsx +++ b/apps/admin/src/components/ShowDeleteDialogContent/index.tsx @@ -1,12 +1,17 @@ import { useDeleteShow, useShowDetail } from '@boolti/api'; import ShowDeleteForm from '../ShowDeleteForm'; import { useToast } from '@boolti/ui'; +import { useNavigate } from 'react-router-dom' +import { PATH } from '~/constants/routes'; interface ShowDeleteDialogContentProps { showId: number; + onDeleteShow?: () => void; } -const ShowDeleteDialogContent: React.FC = ({ showId }) => { +const ShowDeleteDialogContent: React.FC = ({ showId, onDeleteShow }) => { + const navigate = useNavigate() + const { data: show } = useShowDetail(showId); const deleteShowMutation = useDeleteShow(); @@ -18,9 +23,13 @@ const ShowDeleteDialogContent: React.FC = ({ showI { + if (deleteShowMutation.isLoading) return + try { await deleteShowMutation.mutateAsync(showId); toast.success('공연을 삭제했습니다.'); + navigate(PATH.HOME) + onDeleteShow?.() } catch (_) { toast.error('공연을 삭제하지 못했습니다. 잠시 후 다시 시도해주세요.'); } diff --git a/apps/admin/src/components/ShowDetailLayout/index.tsx b/apps/admin/src/components/ShowDetailLayout/index.tsx index 3e484514..2298877a 100644 --- a/apps/admin/src/components/ShowDetailLayout/index.tsx +++ b/apps/admin/src/components/ShowDetailLayout/index.tsx @@ -252,7 +252,7 @@ const ShowDetailLayout = ({ children }: ShowDetailLayoutProps) => { }, deleteShow: { title: '공연 삭제', - children: () => , + children: () => , }, }, }); From fefe56f93253ad4d0263cf81521e765cd3487e27 Mon Sep 17 00:00:00 2001 From: Shim MunSeong Date: Fri, 17 Jan 2025 23:27:48 +0900 Subject: [PATCH 4/7] =?UTF-8?q?fix:=20=EB=8F=84=EC=9A=B0=EB=AF=B8=20?= =?UTF-8?q?=EA=B6=8C=ED=95=9C=20=EB=B3=80=EA=B2=BD=20=EC=8B=9C=20=EC=95=88?= =?UTF-8?q?=EB=82=B4=20=EB=A9=94=EC=8B=9C=EC=A7=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ShowSettingDialogContent/components/HostList/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/admin/src/components/ShowSettingDialogContent/components/HostList/index.tsx b/apps/admin/src/components/ShowSettingDialogContent/components/HostList/index.tsx index 113c381e..573d7417 100644 --- a/apps/admin/src/components/ShowSettingDialogContent/components/HostList/index.tsx +++ b/apps/admin/src/components/ShowSettingDialogContent/components/HostList/index.tsx @@ -46,7 +46,7 @@ const HostList = ({ showId, onCloseDialog }: HostListProps) => { const confirmText = type === HostType.MANAGER ? `${hostName}의 권한을 관리자로 수정하시겠어요?${'\n'}관리자는 권한 편집이 가능하며, 정산 관리 페이지 이외의 모든 페이지 접근이 가능합니다.` - : `${hostName}의 권한을 도우미로 수정하시겠어요?${'\n'}도우미는 권한 편집이 불가하며, 방문자/입장 관리 페이지만 접근이 가능합니다.`; + : `${hostName}의 권한을 도우미로 수정하시겠어요?${'\n'}도우미는 권한 편집이 불가하며, 방문자 관리 페이지만 접근이 가능합니다.`; const result = await confirm(confirmText, { cancel: '취소하기', confirm: '수정하기', From 1b7afb36ea0a4fba60fe9d891ab881631173ed91 Mon Sep 17 00:00:00 2001 From: Shim MunSeong Date: Fri, 17 Jan 2025 23:38:10 +0900 Subject: [PATCH 5/7] =?UTF-8?q?fix:=20=EA=B4=80=EB=A6=AC=20=EA=B7=B8?= =?UTF-8?q?=EB=A3=B9=20=ED=8C=9D=EC=97=85=20=EB=82=B4=20=EA=B6=8C=ED=95=9C?= =?UTF-8?q?=20=EC=84=A4=EC=A0=95=20=EB=93=9C=EB=A1=AD=EB=8B=A4=EC=9A=B4?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EB=93=9C=EB=A1=AD=EB=8B=A4=EC=9A=B4=20?= =?UTF-8?q?=EC=99=B8=20=EC=98=81=EC=97=AD=20=ED=81=B4=EB=A6=AD=20=EC=8B=9C?= =?UTF-8?q?=20=EB=8B=AB=ED=9E=88=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/HostListItem/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/admin/src/components/ShowSettingDialogContent/components/HostListItem/index.tsx b/apps/admin/src/components/ShowSettingDialogContent/components/HostListItem/index.tsx index 00d278f9..5d5a9489 100644 --- a/apps/admin/src/components/ShowSettingDialogContent/components/HostListItem/index.tsx +++ b/apps/admin/src/components/ShowSettingDialogContent/components/HostListItem/index.tsx @@ -23,7 +23,7 @@ const dropdownItems: HostTypeInfo[] = [ ]; const HostListItem = ({ host, onEdit, onDelete }: HostListItemProps) => { - const { isOpen, toggleDropdown } = useDropdown(); + const { isOpen, dropdownRef, toggleDropdown } = useDropdown(); const [myHostInfo] = useAtom(myHostInfoAtom); const getHostTypeName = (type: HostType) => { @@ -65,7 +65,7 @@ const HostListItem = ({ host, onEdit, onDelete }: HostListItemProps) => { {host.hostName} {host.self && (나)} - + { if (host.type === HostType.MAIN || myHostInfo?.type === HostType.SUPPORTER) return; From 7222c45b8ec77018eccb9a05ba45589e0098cea4 Mon Sep 17 00:00:00 2001 From: Shim MunSeong Date: Fri, 17 Jan 2025 23:41:31 +0900 Subject: [PATCH 6/7] =?UTF-8?q?fix:=20=EC=A3=BC=EC=B5=9C=EC=9E=90=EC=9D=BC?= =?UTF-8?q?=20=EB=95=8C=EB=A7=8C=20=EC=A0=95=EC=82=B0=20=EA=B4=80=EB=A6=AC?= =?UTF-8?q?=20=ED=83=AD=20=EC=83=81=EB=8B=A8=EC=97=90=20=ED=88=B4=ED=8C=81?= =?UTF-8?q?=EC=9D=B4=20=EB=85=B8=EC=B6=9C=EB=90=98=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/admin/src/components/ShowDetailLayout/index.tsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/admin/src/components/ShowDetailLayout/index.tsx b/apps/admin/src/components/ShowDetailLayout/index.tsx index 2298877a..699fe7b2 100644 --- a/apps/admin/src/components/ShowDetailLayout/index.tsx +++ b/apps/admin/src/components/ShowDetailLayout/index.tsx @@ -85,6 +85,7 @@ const tooltipStyle = { const TabItem = ({ type }: TabItemProps) => { const params = useParams<{ showId: string }>(); const showId = Number(params!.showId); + const [myHostInfo] = useAtom(myHostInfoAtom); const { data: settlementInfo } = useShowSettlementInfo(showId); const { data: lastSettlementEvent } = useShowLastSettlementEvent(showId); @@ -99,6 +100,8 @@ const TabItem = ({ type }: TabItemProps) => { settlementInfo?.settlementBankAccountPhotoFile === null; const isTooltipVisible = (() => { + if (myHostInfo?.type !== HostType.MAIN) return false; + if ( lastSettlementEvent?.settlementEventType === 'REQUEST' || lastSettlementEvent?.settlementEventType === 'DONE' || From 20220560fda73ee5db46f7e95fe3a334da8358f5 Mon Sep 17 00:00:00 2001 From: Shim MunSeong Date: Fri, 17 Jan 2025 23:44:20 +0900 Subject: [PATCH 7/7] =?UTF-8?q?fix:=20=EA=B3=B5=EC=97=B0=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=EB=8B=A4=EC=9D=B4=EC=96=BC=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EA=B0=80=20=EC=97=B4=EB=A0=B8=EC=9D=84=20=EB=95=8C,=20body=20?= =?UTF-8?q?=EC=98=81=EC=97=AD=EC=9D=B4=20=EC=8A=A4=ED=81=AC=EB=A1=A4?= =?UTF-8?q?=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/admin/src/components/ShowDeleteDialogContent/index.tsx | 3 +++ apps/admin/src/components/ShowSettingDialogContent/index.tsx | 3 +++ 2 files changed, 6 insertions(+) diff --git a/apps/admin/src/components/ShowDeleteDialogContent/index.tsx b/apps/admin/src/components/ShowDeleteDialogContent/index.tsx index 1c6eaeae..c9289533 100644 --- a/apps/admin/src/components/ShowDeleteDialogContent/index.tsx +++ b/apps/admin/src/components/ShowDeleteDialogContent/index.tsx @@ -3,6 +3,7 @@ import ShowDeleteForm from '../ShowDeleteForm'; import { useToast } from '@boolti/ui'; import { useNavigate } from 'react-router-dom' import { PATH } from '~/constants/routes'; +import { useBodyScrollLock } from '~/hooks/useBodyScrollLock'; interface ShowDeleteDialogContentProps { showId: number; @@ -17,6 +18,8 @@ const ShowDeleteDialogContent: React.FC = ({ showI const toast = useToast(); + useBodyScrollLock(); + if (!show) return; return ( diff --git a/apps/admin/src/components/ShowSettingDialogContent/index.tsx b/apps/admin/src/components/ShowSettingDialogContent/index.tsx index bd0bf35b..8ec295bc 100644 --- a/apps/admin/src/components/ShowSettingDialogContent/index.tsx +++ b/apps/admin/src/components/ShowSettingDialogContent/index.tsx @@ -6,6 +6,7 @@ import { ChevronRightIcon } from '@boolti/icon'; import { myHostInfoAtom } from '../ShowDetailLayout'; import { useAtom } from 'jotai'; import { HostType } from '@boolti/api/src/types/host'; +import { useBodyScrollLock } from '~/hooks/useBodyScrollLock'; interface ShowSettingDialogContentProps { showId: number; @@ -30,6 +31,8 @@ const ShowSettingDialogContent = ({ const [myHostInfo] = useAtom(myHostInfoAtom); + useBodyScrollLock(); + return (