From d7714c2484a359b51fdefb6307773538edc24080 Mon Sep 17 00:00:00 2001 From: gs0428 Date: Tue, 20 Feb 2024 22:40:48 +0900 Subject: [PATCH 1/4] =?UTF-8?q?hotfix-082:=20=EC=B9=B4=ED=85=8C=EA=B3=A0?= =?UTF-8?q?=EB=A6=AC=20=EC=83=9D=EC=84=B1=20=EC=8B=9C=20=EC=9D=B4=EB=A6=84?= =?UTF-8?q?=20=EC=95=88=20=EB=9C=A8=EB=8A=94=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/modals/AddCategoryModal.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/modals/AddCategoryModal.tsx b/src/components/modals/AddCategoryModal.tsx index fccc42f..3353c08 100644 --- a/src/components/modals/AddCategoryModal.tsx +++ b/src/components/modals/AddCategoryModal.tsx @@ -47,7 +47,6 @@ const AddCategoryModal = ({ isTopCategoryModalOpen ? setIsTopCategoryModalOpen(false) : setIsSubCategoryModalOpen(false); - setCategoryName(''); }; const [topCategoryModalRef] = useOutsideClick(onCloseModal); From eb629317e5dc9b6630b17a072fa7c8a3d34b530a Mon Sep 17 00:00:00 2001 From: gs0428 Date: Tue, 20 Feb 2024 22:44:09 +0900 Subject: [PATCH 2/4] =?UTF-8?q?hotfix-082:=20=ED=99=88=20=ED=99=94?= =?UTF-8?q?=EB=A9=B4=EC=97=90=EC=84=9C=20=EC=B9=B4=ED=85=8C=EA=B3=A0?= =?UTF-8?q?=EB=A6=AC=20=EC=84=A0=ED=83=9D=20=EC=8B=9C=20=ED=8F=B4=EB=8D=94?= =?UTF-8?q?=20=EC=83=89=EC=83=81=20=EB=B3=80=ED=95=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 --- src/styles/category/Card.style.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/styles/category/Card.style.ts b/src/styles/category/Card.style.ts index eba2049..39802a5 100644 --- a/src/styles/category/Card.style.ts +++ b/src/styles/category/Card.style.ts @@ -47,6 +47,10 @@ export const DropdownWrap = styled.div` fill: ${(props) => props.theme.color.gray400}; } } + + &.changed { + background-color: ${theme.color.green400}; + } } `; From 0bd2807be1a7cc680e84d68582fc892a7b81a88c Mon Sep 17 00:00:00 2001 From: gs0428 Date: Tue, 20 Feb 2024 22:50:36 +0900 Subject: [PATCH 3/4] =?UTF-8?q?hotfix-082:=20=EC=95=8C=EB=9E=8C=EC=9D=84?= =?UTF-8?q?=20=EC=9D=BD=EC=97=88=EB=8D=94=EB=9D=BC=EB=8F=84=20=EC=9A=94?= =?UTF-8?q?=EC=95=BD=20=ED=8E=98=EC=9D=B4=EC=A7=80=EB=A1=9C=20=EC=9D=B4?= =?UTF-8?q?=EB=8F=99=20=EA=B0=80=EB=8A=A5=ED=95=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 --- .../layout/header/alarm/AlarmItem.tsx | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/components/layout/header/alarm/AlarmItem.tsx b/src/components/layout/header/alarm/AlarmItem.tsx index f59d184..0e122f4 100644 --- a/src/components/layout/header/alarm/AlarmItem.tsx +++ b/src/components/layout/header/alarm/AlarmItem.tsx @@ -72,18 +72,23 @@ const AlarmItem = ({ const handleClick = async () => { if (alarm.type === 'notice') { navigate('/guide'); - onClose(); } - if (alarm.type === 'video' && !alarm.is_confirm && alarm.alarm_id !== 999) { - try { - await confirmSelectAlarmAPI({ alarms: [alarm.alarm_id] }); - onRefresh(); - navigate(`/summary/${alarm.video_id}`); - onClose(); - } catch (e) { - console.error(e); + if ( + alarm.type === 'video' && + alarm.state !== 'fail' && + alarm.alarm_id !== 999 + ) { + if (!alarm.is_confirm) { + try { + await confirmSelectAlarmAPI({ alarms: [alarm.alarm_id] }); + onRefresh(); + } catch (e) { + console.error(e); + } } + navigate(`/summary/${alarm.video_id}`); } + onClose(); }; const handleClickRemoveButton: React.MouseEventHandler = ( From e802532f8038caaeb951798f1fd281aba8466944 Mon Sep 17 00:00:00 2001 From: gs0428 Date: Tue, 20 Feb 2024 22:59:57 +0900 Subject: [PATCH 4/4] =?UTF-8?q?hotfix-082:=20=EC=95=8C=EB=9E=8C=20?= =?UTF-8?q?=ED=81=B4=EB=A6=AD=20=EC=8B=9C=20=EC=9D=BD=EB=8A=94=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layout/header/alarm/AlarmItem.tsx | 18 +++++++++--------- .../layout/header/alarm/AlarmItem.style.ts | 1 + 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/components/layout/header/alarm/AlarmItem.tsx b/src/components/layout/header/alarm/AlarmItem.tsx index 0e122f4..83b66dd 100644 --- a/src/components/layout/header/alarm/AlarmItem.tsx +++ b/src/components/layout/header/alarm/AlarmItem.tsx @@ -70,22 +70,22 @@ const AlarmItem = ({ }; const handleClick = async () => { + if (!alarm.is_confirm) { + try { + await confirmSelectAlarmAPI({ alarms: [alarm.alarm_id] }); + onRefresh(); + } catch (e) { + console.error(e); + } + } if (alarm.type === 'notice') { navigate('/guide'); } if ( alarm.type === 'video' && - alarm.state !== 'fail' && + alarm.state === 'success' && alarm.alarm_id !== 999 ) { - if (!alarm.is_confirm) { - try { - await confirmSelectAlarmAPI({ alarms: [alarm.alarm_id] }); - onRefresh(); - } catch (e) { - console.error(e); - } - } navigate(`/summary/${alarm.video_id}`); } onClose(); diff --git a/src/styles/layout/header/alarm/AlarmItem.style.ts b/src/styles/layout/header/alarm/AlarmItem.style.ts index eb4e232..7b31746 100644 --- a/src/styles/layout/header/alarm/AlarmItem.style.ts +++ b/src/styles/layout/header/alarm/AlarmItem.style.ts @@ -2,6 +2,7 @@ import theme from '@/styles/theme'; import styled from 'styled-components'; export const Container = styled.div` + cursor: pointer !important; padding: 28px 0; display: flex; flex-direction: column;