Skip to content
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

펫 drop 확인창 추가 #255

Merged
merged 4 commits into from
Dec 25, 2024
Merged
Show file tree
Hide file tree
Changes from 3 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
8 changes: 7 additions & 1 deletion apps/web/messages/en_US.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@
"sell": "Sell",
"pet-list": "Pet list",
"merge": "Merge",
"prepare": "Prepare"
"prepare": "Prepare",
"confirm": "Confirm",
"close": "Close",
"processing": "Processing..."
},
"Gotcha": {
"pet-gotcha-desc": "Draw a S+ Grade pet for 1,000 points",
Expand Down Expand Up @@ -67,6 +70,9 @@
"merge": "Merge",
"edit-product": "Edit Product",
"buy-error-not-login": "Please sign in to use this feature.",
"sell-confirm": "Are you sure you want to sell?",
"sell-confirm-description": "After selling, the pet will disappear.",
"sell-confirm-checkbox": "Do not show this message again",
"Background": {
"buy-success": "Background purchased successfully",
"buy-fail": "Failed to purchase background",
Expand Down
9 changes: 8 additions & 1 deletion apps/web/messages/ko_KR.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@
"pet-list": "펫 목록",
"sell": "판매",
"merge": "합치기",
"prepare": "준비중"
"prepare": "준비중",
"confirm": "확인",
"close": "닫기",
"processing": "처리중..."
},
"HomePage": {
"title": "Hello world!",
Expand Down Expand Up @@ -68,6 +71,9 @@
"prepare": "준비중",
"merge": "펫 합치기",
"edit-product": "펫 경매 수정",
"sell-confirm": "정말로 판매하시겠습니까?",
"sell-confirm-description": "판매 후 펫은 사라집니다.",
"sell-confirm-checkbox": "메시지 다시 보지 않기",
"Background": {
"buy-success": "배경 구매 완료!",
"buy-fail": "배경 구매에 실패했습니다.",
Expand Down Expand Up @@ -105,6 +111,7 @@
"invalid-size-error": "유효하지 않은 사이즈",
"farm-type-select-pet": "Farm Type에 사용할 펫을 선택해주세요.",
"line-type-select-pet": "Line Type에 사용할 펫을 선택해주세요.",

"Merge": {
"merge": "합치기",
"merge-result": "합치기 결과",
Expand Down
244 changes: 244 additions & 0 deletions apps/web/src/app/[locale]/mypage/my-pet/SelectedPetTable.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,244 @@
'use client';

import { useCallback, useState } from 'react';
import Image from 'next/image';
import { useTranslations } from 'next-intl';
import { css, cx } from '_panda/css';
import { Flex } from '_panda/jsx';
import { flex } from '_panda/patterns';
import { dropPet, type Persona } from '@gitanimals/api';
import { userQueries } from '@gitanimals/react-query';
import { Button, Checkbox, Dialog, Label } from '@gitanimals/ui-panda';
import { snakeToTitleCase } from '@gitanimals/util-common';
import { useMutation, useQueryClient } from '@tanstack/react-query';
import { toast } from 'sonner';

import { ANIMAL_TIER_TEXT_MAP, getAnimalTierInfo } from '@/utils/animals';
import { getPersonaImage } from '@/utils/image';

import { tableCss } from '../../shop/AuctionSection/table.styles';

import { MergePersona } from './(merge)';

interface SelectedPetTableProps {
currentPersona: Persona | null;
reset: () => void;
}

export function SelectedPetTable({ currentPersona, reset }: SelectedPetTableProps) {
const queryClient = useQueryClient();
const t = useTranslations('Shop');
const [isMergeOpen, setIsMergeOpen] = useState(false);
const [sellPersonaId, setSellPersonaId] = useState<string | null>(null);
const { setDoNotShowAgain, isChecked: isDoNotShowAgain } = useDoNotShowAgain();

const { mutate: dropPetMutation } = useMutation({
mutationFn: (personaId: string) => dropPet({ personaId }),
onSuccess: (data) => {
toast.success((t('pet-sold') as string).replace('[money]', data.givenPoint.toString()));
queryClient.invalidateQueries({ queryKey: userQueries.allKey() });
setSellPersonaId(null);
reset();
},
onError: () => {
toast.error(t('sell-product-fail'));
},
});

const onSellClick = async () => {
if (!currentPersona) return;
if (isDoNotShowAgain) {
dropPetMutation(currentPersona.id);
} else {
setSellPersonaId(currentPersona.id);
}
};

const onSellAction = async (isDoNotShowAgain: boolean) => {
if (!sellPersonaId) return;
dropPetMutation(sellPersonaId);
if (isDoNotShowAgain) {
setDoNotShowAgain(true);
}
};

return (
<div className={tableCss}>
<div className={theadCss}>
<span>{t('pet')}</span>
<span>{t('name')}</span>
<span>{t('grade')}</span>
<span>{t('level')}</span>
<span></span>
</div>

<div className={cx(rowStyle, 'row')}>
{currentPersona && (
<>
<div>
<Image src={getPersonaImage(currentPersona.type)} alt={currentPersona.type} width={60} height={67} />
</div>
<div>{snakeToTitleCase(currentPersona.type)}</div>
<div>{ANIMAL_TIER_TEXT_MAP[getAnimalTierInfo(Number(currentPersona.dropRate.replace('%', '')))]}</div>
<div>{currentPersona.level}</div>
<div className={flex({ gap: '8px' })}>
<Button variant="secondary" onClick={onSellClick}>
100P {t('sell')}
</Button>
<Button variant="secondary" onClick={() => setIsMergeOpen(true)}>
{t('merge')}
</Button>
</div>
</>
)}
</div>

{currentPersona && (
<MergePersona
key={currentPersona.id}
isOpen={isMergeOpen}
onClose={() => setIsMergeOpen(false)}
targetPersona={currentPersona}
/>
)}
<SellConfirmDialog
isOpen={Boolean(sellPersonaId)}
onConfirm={onSellAction}
onClose={() => setSellPersonaId(null)}
/>
</div>
);
}

const theadCss = css({
display: 'grid',
gridTemplateColumns: '1fr 2.5fr 1fr 1fr 5.7fr',
gap: '16px',
padding: '4px 32px',
borderRadius: '12px',
backgroundColor: 'white_50',
alignItems: 'center',

height: '46px',
textStyle: 'glyph18.bold',
color: 'white_100',

'& > span:nth-child(1)': {
textAlign: 'center',
},

marginBottom: '4px',

_mobile: {
fontSize: '16px',
},
});

const rowStyle = css({
width: '100%',
height: '80px',
backgroundColor: 'white_10',
borderRadius: '12px',

display: 'grid',
gridTemplateColumns: '1fr 2.5fr 1fr 1fr 5.7fr',
alignItems: 'center',
padding: '0 32px',
gap: '16px',

textStyle: 'glyph20.regular',
color: 'white.white_100',

'& button': {
color: 'black.black',
width: '100%',
paddingX: '6px',
},

'& *': {
overflow: 'hidden',
textOverflow: 'ellipsis',
},

_mobile: {
fontSize: '16px',
},
});

const DO_NOT_SHOW_AGAIN_KEY = '@gitanimals/do-not-show-again';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

저희 스토리지 키 모아둔 상수 객체가 있었던 거 같기도 하고 ㅋㅋㅋ


const useDoNotShowAgain = () => {
const [isChecked, setIsChecked] = useState(() => {
if (typeof window === 'undefined') return false;
return localStorage.getItem(DO_NOT_SHOW_AGAIN_KEY) === 'true';
});

const setDoNotShowAgain = useCallback((value: boolean) => {
setIsChecked(value);
if (typeof window === 'undefined') return;
localStorage.setItem(DO_NOT_SHOW_AGAIN_KEY, value.toString());
}, []);

return {
isChecked,
setDoNotShowAgain,
};
};

function SellConfirmDialog({
onConfirm,
onClose,
isOpen,
}: {
onConfirm: (isDoNotShowAgain: boolean) => Promise<void>;
onClose: () => void;
isOpen: boolean;
}) {
const [isLoading, setIsLoading] = useState(false);
const t = useTranslations();
const [isDoNotShowAgain, setIsDoNotShowAgain] = useState(false);
console.log('isDoNotShowAgain: ', isDoNotShowAgain);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

로그 남아있어용


const confirmDialog = async () => {
if (isLoading) return;

setIsLoading(true);
await onConfirm(isDoNotShowAgain);
setIsLoading(false);

onClose();
};

return (
<Dialog open={isOpen} onOpenChange={onClose}>
<Dialog.Content>
<Dialog.Title>{t('Shop.sell-confirm')}</Dialog.Title>
<Dialog.Description className={descriptionStyle}>
<p>{t('Shop.sell-confirm-description')}</p>
</Dialog.Description>
<Flex alignItems="center" justifyContent="space-between" width="100%">
<Flex alignItems="center" gap="2">
<Checkbox id="do-not-show-again" onClick={() => setIsDoNotShowAgain(!isDoNotShowAgain)} />
<Label htmlFor="do-not-show-again" whiteSpace="nowrap">
{t('Shop.sell-confirm-checkbox')}
</Label>
</Flex>
<Flex gap="8px" justifyContent="flex-end" width="100%">
<Button onClick={onClose} variant="secondary" size="m">
{t('Common.close')}
</Button>
<Button onClick={confirmDialog} variant="primary" size="m" disabled={isLoading}>
{isLoading ? t('Common.processing') : t('Common.confirm')}
</Button>
</Flex>
</Flex>
</Dialog.Content>
</Dialog>
);
}

const descriptionStyle = css({
textAlign: 'left',
color: 'white.white_75',
width: '100%',
});
Loading
Loading