Skip to content

merge to main #303

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.

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
merged 1 commit into from
May 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/MainDashBoard/components/editModeModal/AddKrModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ const AddKrModal = ({ modalRef, objInfo, krIdx, mutateFcn }: IAddKrModalProps) =
type="button"
$isActiveSave={isActiveSave}
onClick={handleClickConfirmAddBtn}
className="addKR_edit"
>
추가하기
</StAddKrConfirmAddBtn>
Expand Down
2 changes: 1 addition & 1 deletion src/MainDashBoard/components/sideSheet/KRPeriodSelect.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const KRPeriodSelect = ({
};

return (
<StKRPeriodContainer>
<StKRPeriodContainer className="alter_duration">
<ConfigProvider
theme={{
token: {
Expand Down
7 changes: 6 additions & 1 deletion src/MainDashBoard/components/sideSheet/KrStatus.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,12 @@ const KrStatus = ({ krStatus, keyResultId }: { krStatus: string; keyResultId: nu
{isDrop && (
<StStatusContainer>
{KR_STATUS.filter(({ label }) => label !== krStatusLabel).map(({ icon, label }) => (
<StStateContainer key={label} type="button" onClick={() => handleKrStatus(label)}>
<StStateContainer
key={label}
type="button"
onClick={() => handleKrStatus(label)}
className="alter_state"
>
<KrStatusItem icon={icon} label={label} />
</StStateContainer>
))}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,12 @@ export const 진척정도입력하기 = ({
</article>
<footer css={enterFooterStyles}>
<StCnclBtn onClick={onCancel}>취소</StCnclBtn>
<StEnterBtn1 isActiveBtn={isActiveBtn} disabled={!isActiveBtn} onClick={submitCheckIn}>
<StEnterBtn1
isActiveBtn={isActiveBtn}
disabled={!isActiveBtn}
onClick={submitCheckIn}
className="check_record"
>
체크인 완료
</StEnterBtn1>
</footer>
Expand Down Expand Up @@ -299,7 +304,12 @@ export const KR수정하기 = ({
</article>
<footer css={enterFooterStyles}>
<StCnclBtn onClick={onCancel}>취소</StCnclBtn>
<StEnterBtn1 isActiveBtn={isActiveBtn} disabled={!isActiveBtn} onClick={submitCheckIn}>
<StEnterBtn1
isActiveBtn={isActiveBtn}
disabled={!isActiveBtn}
onClick={submitCheckIn}
className="check_adjust"
>
체크인 완료
</StEnterBtn1>
</footer>
Expand Down
2 changes: 2 additions & 0 deletions src/MainDashBoard/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ const MainDashBoard = () => {
**/
// step 0 - SELECT METHOD 관련 handler
const handleClickMethodBtn = (e: React.MouseEvent<HTMLButtonElement>) => {
localStorage.setItem('selectedMethod', e.currentTarget.id);

setSelectedMethod(e.currentTarget.id);
navigate('/add-okr', { state: { selectedMethod: e.currentTarget.id } });
};
Expand Down
2 changes: 1 addition & 1 deletion src/Onboarding/components/frame/Frame1.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const Frame1 = () => {
))}
</StRollingTextBox>
<StMainText>{CONTENTS[0].title}</StMainText>
<StCtaLink to={APPLY_CBT_TALLY_LINK} target="_blank" className="tally-link-button">
<StCtaLink to={APPLY_CBT_TALLY_LINK} target="_blank" className="click_service">
베타테스트 신청
</StCtaLink>
<div css={imgContainer}>
Expand Down
4 changes: 3 additions & 1 deletion src/Onboarding/components/layout/OnboardingFooter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ const OnboardingFooter = () => {
height={25}
loading="lazy"
/>
<StFooterText to="./team-moonshot">TEAM moonshot</StFooterText>
<StFooterText to="./team-moonshot" className="click_team">
TEAM moonshot
</StFooterText>
<StFooterUserInfoTerm
to="https://moonshot-.notion.site/moonshot-1-0-0cdb3499765349e9aba64474fbba933e"
target="_blank"
Expand Down
2 changes: 1 addition & 1 deletion src/Onboarding/components/layout/OnboardingHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const OnboardingHeader = () => {
</li>
))}
<li>
<StCTALink to={APPLY_CBT_TALLY_LINK} target="_blank" className="tally-link-button">
<StCTALink to={APPLY_CBT_TALLY_LINK} target="_blank" className="click_service">
베타테스트 신청
</StCTALink>
</li>
Expand Down
14 changes: 13 additions & 1 deletion src/PreviewOkr/PreviewOkr.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -167,7 +174,12 @@ const PreviewOkr = ({ selectedMethod, setStep, objInfo, krListInfo }: IPreviewOk
<StPrevBtn type="button" onClick={handleClickPrevBtn}>
이전으로
</StPrevBtn>
<StSaveBtn type="button" onClick={handleClickSaveOkrBtn} $isActiveSave={isActiveSave}>
<StSaveBtn
type="button"
onClick={handleClickSaveOkrBtn}
$isActiveSave={isActiveSave}
className={classNameForGA}
>
저장하기
</StSaveBtn>
</StBtnWrapper>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -41,7 +44,9 @@ const ConfirmModalTemplate = ({
{cancelState.text}
</StCancelBtn>

<StConfirmBtn onClick={handleClickConfirm}>{confirmState.text}</StConfirmBtn>
<StConfirmBtn onClick={handleClickConfirm} className={classNameForGA}>
{confirmState.text}
</StConfirmBtn>
</div>
</StConfirmModalTemplateWrapper>
);
Expand Down