From e7b26cd6d050b3d44006ae116842bab505e7ae01 Mon Sep 17 00:00:00 2001 From: Eonseok Jeon <121864459+eonseok-jeon@users.noreply.github.com> Date: Fri, 31 May 2024 22:42:19 +0900 Subject: [PATCH] =?UTF-8?q?[Feat]=20GA=20tag=20class=20=EC=B6=94=EA=B0=80?= =?UTF-8?q?=20(merge=20into=20develop)=20(#302)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: GA 이벤트 탐지를 위한 class name 추가 * chore: class name 수정 * feat: kr/task 삭제에 따른 class name 분기 처리 * feat: 가이드/직접 선택에 따른 class name 분기 처리 --- .../components/editModeModal/AddKrModal.tsx | 1 + .../components/sideSheet/KRPeriodSelect.tsx | 2 +- .../components/sideSheet/KrStatus.tsx | 7 ++++++- .../sideSheet/krCheckIn/KrCheckInInputs.tsx | 14 ++++++++++++-- src/MainDashBoard/index.tsx | 2 ++ src/Onboarding/components/frame/Frame1.tsx | 2 +- .../components/layout/OnboardingFooter.tsx | 4 +++- .../components/layout/OnboardingHeader.tsx | 2 +- src/PreviewOkr/PreviewOkr.tsx | 14 +++++++++++++- .../Modal/template/ConfirmModalTemplate.tsx | 7 ++++++- 10 files changed, 46 insertions(+), 9 deletions(-) diff --git a/src/MainDashBoard/components/editModeModal/AddKrModal.tsx b/src/MainDashBoard/components/editModeModal/AddKrModal.tsx index 8a66a988..5b95502e 100644 --- a/src/MainDashBoard/components/editModeModal/AddKrModal.tsx +++ b/src/MainDashBoard/components/editModeModal/AddKrModal.tsx @@ -165,6 +165,7 @@ const AddKrModal = ({ modalRef, objInfo, krIdx, mutateFcn }: IAddKrModalProps) = type="button" $isActiveSave={isActiveSave} onClick={handleClickConfirmAddBtn} + className="addKR_edit" > 추가하기 diff --git a/src/MainDashBoard/components/sideSheet/KRPeriodSelect.tsx b/src/MainDashBoard/components/sideSheet/KRPeriodSelect.tsx index 0ab82426..4c69c0e3 100644 --- a/src/MainDashBoard/components/sideSheet/KRPeriodSelect.tsx +++ b/src/MainDashBoard/components/sideSheet/KRPeriodSelect.tsx @@ -56,7 +56,7 @@ const KRPeriodSelect = ({ }; return ( - + {KR_STATUS.filter(({ label }) => label !== krStatusLabel).map(({ icon, label }) => ( - handleKrStatus(label)}> + handleKrStatus(label)} + className="alter_state" + > ))} diff --git a/src/MainDashBoard/components/sideSheet/krCheckIn/KrCheckInInputs.tsx b/src/MainDashBoard/components/sideSheet/krCheckIn/KrCheckInInputs.tsx index c6ba189e..84a144b8 100644 --- a/src/MainDashBoard/components/sideSheet/krCheckIn/KrCheckInInputs.tsx +++ b/src/MainDashBoard/components/sideSheet/krCheckIn/KrCheckInInputs.tsx @@ -178,7 +178,12 @@ export const 진척정도입력하기 = ({
취소 - + 체크인 완료
@@ -299,7 +304,12 @@ export const KR수정하기 = ({
취소 - + 체크인 완료
diff --git a/src/MainDashBoard/index.tsx b/src/MainDashBoard/index.tsx index 0f943733..3ee32543 100644 --- a/src/MainDashBoard/index.tsx +++ b/src/MainDashBoard/index.tsx @@ -70,6 +70,8 @@ const MainDashBoard = () => { **/ // step 0 - SELECT METHOD 관련 handler const handleClickMethodBtn = (e: React.MouseEvent) => { + localStorage.setItem('selectedMethod', e.currentTarget.id); + setSelectedMethod(e.currentTarget.id); navigate('/add-okr', { state: { selectedMethod: e.currentTarget.id } }); }; diff --git a/src/Onboarding/components/frame/Frame1.tsx b/src/Onboarding/components/frame/Frame1.tsx index 19fa2fbf..a8d9c60e 100644 --- a/src/Onboarding/components/frame/Frame1.tsx +++ b/src/Onboarding/components/frame/Frame1.tsx @@ -39,7 +39,7 @@ const Frame1 = () => { ))} {CONTENTS[0].title} - + 베타테스트 신청
diff --git a/src/Onboarding/components/layout/OnboardingFooter.tsx b/src/Onboarding/components/layout/OnboardingFooter.tsx index b86847dd..4823e4d5 100644 --- a/src/Onboarding/components/layout/OnboardingFooter.tsx +++ b/src/Onboarding/components/layout/OnboardingFooter.tsx @@ -15,7 +15,9 @@ const OnboardingFooter = () => { height={25} loading="lazy" /> - TEAM moonshot + + TEAM moonshot + { ))}
  • - + 베타테스트 신청
  • diff --git a/src/PreviewOkr/PreviewOkr.tsx b/src/PreviewOkr/PreviewOkr.tsx index 1983d6a9..9dc0b458 100644 --- a/src/PreviewOkr/PreviewOkr.tsx +++ b/src/PreviewOkr/PreviewOkr.tsx @@ -28,6 +28,13 @@ interface IPreviewOkrProps { //TODO: PreviewOkr이 AddOkr에 병합 되었으므로, 폴더 구조 변동 필요 const PreviewOkr = ({ selectedMethod, setStep, objInfo, krListInfo }: IPreviewOkrProps) => { + const selectedMethodId = localStorage.getItem('selectedMethod'); + const classNameForGA = + selectedMethodId === '직접 설정하기' + ? 'addOKR_brief' + : selectedMethodId === '가이드에 따라 설정하기' + ? 'addOKR_guide' + : ''; // const location = useLocation(); const navigate = useNavigate(); @@ -167,7 +174,12 @@ const PreviewOkr = ({ selectedMethod, setStep, objInfo, krListInfo }: IPreviewOk 이전으로 - + 저장하기 diff --git a/src/common/components/Modal/template/ConfirmModalTemplate.tsx b/src/common/components/Modal/template/ConfirmModalTemplate.tsx index 2d59a7af..08145662 100644 --- a/src/common/components/Modal/template/ConfirmModalTemplate.tsx +++ b/src/common/components/Modal/template/ConfirmModalTemplate.tsx @@ -17,6 +17,9 @@ const ConfirmModalTemplate = ({ cancelState, confirmState, }: IConfirmModalTemplateProps) => { + const classNameForGA = + title === 'KR 삭제하기' ? 'delKR_edit' : title === 'Task 삭제하기' ? 'deltask_edit' : ''; + // cancel function const handleClickCancel = () => { cancelState.onClick && cancelState.onClick(); @@ -41,7 +44,9 @@ const ConfirmModalTemplate = ({ {cancelState.text} - {confirmState.text} + + {confirmState.text} +
    );