Skip to content

Commit ec74048

Browse files
authored
Merge pull request #200 from DevKor-github/fix/pick-page
feat: toast:
2 parents 934a0e9 + 028fde2 commit ec74048

File tree

5 files changed

+13
-9
lines changed

5 files changed

+13
-9
lines changed

โ€Žsrc/features/my/components/MyTrade/index.tsxโ€Ž

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { cx } from '@styled-system/css';
22
import * as s from './style.css';
33
import { Link } from 'react-router';
44
import { usePostLogout } from '../../apis/usePostLogout';
5+
import { useToast } from '@/common/hooks/useToast';
56

67
interface MenuProps {
78
Title: string;
@@ -11,6 +12,7 @@ interface MenuProps {
1112

1213
const Menu = ({ Title, Icon, Addr }: MenuProps) => {
1314
const { mutate: postLogout } = usePostLogout();
15+
const { openToast } = useToast();
1416

1517
if (Title !== '๋กœ๊ทธ์•„์›ƒ') {
1618
return (
@@ -28,7 +30,11 @@ const Menu = ({ Title, Icon, Addr }: MenuProps) => {
2830
<button
2931
className={s.GoMenu}
3032
onClick={() => {
31-
postLogout();
33+
postLogout(undefined, {
34+
onSuccess: () => {
35+
openToast({ message: '๋กœ๊ทธ์•„์›ƒ ์™„๋ฃŒ!' });
36+
},
37+
});
3238
}}
3339
>
3440
<div className={s.MenuContent}>

โ€Žsrc/features/pickList/components/Btn/index.tsxโ€Ž

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,14 @@ const Btn = ({ type, isReviewed, chatRoomId, appointmentId, nickname }: BtnProps
3030
return;
3131
}
3232
if (type === 'review') {
33-
// ๋ฆฌ๋ทฐ ์ž‘์„ฑ ์ „์ผ ๋•Œ,
3433
if (!isReviewed) {
35-
alert('๋ฆฌ๋ทฐ ์ž‘์„ฑ ํŽ˜์ด์ง€๋กœ ์—ฐ๊ฒฐ');
3634
navigate(`/review/${appointmentId}`, {
3735
state: {
3836
nickname: nickname,
3937
},
4038
});
4139
return;
4240
}
43-
// ๋ฆฌ๋ทฐ ์ž‘์„ฑ ์™„๋ฃŒ ๋™์ž‘
44-
alert('๋ฆฌ๋ทฐ ์ž‘์„ฑ ์™„๋ฃŒ');
4541
}
4642
};
4743

โ€Žsrc/features/pickList/components/PickItemList/style.css.tsโ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ export const Footer = css({
7474
alignItems: 'center',
7575
justifyContent: 'flex-end',
7676
width: 'full',
77-
gap: '0.25rem',
77+
gap: '0.375rem',
7878
});
7979

8080
export const Btn = cva({

โ€Žsrc/pages/PickPage/index.tsxโ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ const PickPage = () => {
3838
<MainTopBar />
3939
<div className={s.Section}>
4040
<div className={s.Type({ active: subject === 'OWNER' })} onClick={() => handleTabClick('OWNER')}>
41-
๋‚ด ๊ฒŒ์‹œ๋ฌผ
41+
๋ฐ›์€ PICK
4242
{subject === 'OWNER' && <motion.div layoutId="underline" className={s.Underline} />}
4343
</div>
4444

4545
<div className={s.Type({ active: subject === 'REQUESTER' })} onClick={() => handleTabClick('REQUESTER')}>
46-
๋‹ค๋ฅธ ๊ฒŒ์‹œ๋ฌผ
46+
๋ณด๋‚ธ PICK
4747
{subject === 'REQUESTER' && <motion.div layoutId="underline" className={s.Underline} />}
4848
</div>
4949
</div>

โ€Žsrc/pages/ReviewPage/index.tsxโ€Ž

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ import { useState } from 'react';
66
import Btn from '@/common/components/Button';
77
import { usePostReview } from '@/features/review/apis/usePostReview';
88
import ReviewContent from '@/features/review/components/reviewContent';
9+
import { useToast } from '@/common/hooks/useToast';
910

1011
const Review = () => {
1112
const navigate = useNavigate();
1213
const location = useLocation();
14+
const { openToast } = useToast();
1315

1416
const { mutate: postReview } = usePostReview();
1517
const { appointmentId } = useParams();
@@ -34,11 +36,11 @@ const Review = () => {
3436
},
3537
{
3638
onSuccess: () => {
39+
openToast({ message: 'ํ›„๊ธฐ ์ž‘์„ฑ ์™„๋ฃŒ!' });
3740
navigate(-1);
3841
},
3942
},
4043
);
41-
alert('ํ›„๊ธฐ ์ž‘์„ฑ ์™„๋ฃŒ');
4244
}
4345
};
4446

0 commit comments

Comments
ย (0)