From a21cf9741306584985489dc72a11af5662002295 Mon Sep 17 00:00:00 2001 From: Suhyeon Jeon Date: Sun, 2 Mar 2025 03:15:59 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EA=B2=B0=EC=A0=9C=20flow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/favicon.png | Bin 0 -> 8110 bytes src/api/useGetAddress.ts | 3 - src/api/usePostLogout.ts | 3 - src/app/favicon.ico | Bin 25931 -> 0 bytes src/app/layout.tsx | 3 + .../address/_components/AddressOption.tsx | 20 ++-- src/app/pay/_components/OrderInfo.tsx | 95 +++++++++++------- src/app/pay/fail/_components/PayFail.tsx | 2 +- .../pay/success/_components/PaySuccess.tsx | 10 +- .../detail/[id]/_components/OrderButton.tsx | 20 ++-- .../[id]/_components/StoreOrderDetail.tsx | 25 +++-- src/assets/images/Pay200_Logo.png | Bin 15484 -> 0 bytes src/assets/images/Toss_Logo.png | Bin 22820 -> 0 bytes src/components/CommonLayout.tsx | 57 ++--------- src/components/Confirm.tsx | 2 +- src/components/Navigation.tsx | 19 +--- src/components/UpDownBtn.tsx | 45 +++++++-- src/components/button.tsx | 2 +- src/models/auth.ts | 7 ++ src/store/addressStore.ts | 16 --- src/store/geoLocation.ts | 12 ++- src/store/user.ts | 7 ++ 22 files changed, 186 insertions(+), 162 deletions(-) create mode 100644 public/favicon.png delete mode 100644 src/app/favicon.ico delete mode 100644 src/assets/images/Pay200_Logo.png delete mode 100644 src/assets/images/Toss_Logo.png delete mode 100644 src/store/addressStore.ts diff --git a/public/favicon.png b/public/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..eafe4a4a97601d8e084fde179887749721c7c52a GIT binary patch literal 8110 zcmc(E_aj`-_x{}7W%bod^cF-XMBh~+glI_+b)^xJ5M8v@qeKs)u8`;@L3GxOh!VX- zbU_fkx8URbPkg^W+?n&kojZ5VnRA|J<_R~@yG2QMg$w{dsja19blDUB_mB`@wnmc< z$jc6LF}kG&N_*K>0N}LK)=<6YX|Z8qMQv5a!*<&Nmbq}t<1!JzA(Z{>F=NkA}nZWS>CJX1bP)-SW=q+(FcX(24JD8&!&P@)pafpLXd*puV3;c>0A zMBXjDx4_GkodWix2SVeFk2b1oZ_@f+Nm|8m5TiJW^R3Nj+n zTFsE|CbphgA&T9a=gS{4W<^r#KZ1%Tp7-)KGaU|e_MLNCR0@NOCEP} z#EZ(;=NS3$5%|)+|D3y1Mg@Wyk+hInPrFANR)Tkau4qdX}#;K%=7HEaX1EZH#7q{|Ba}b z1F0_FVVi3U(q`kXXOlifp~xA$U|#_uzVI=p>0iL5cBC_OAn zm@)Np!N`B8bNjEx(p>`o1f)~ri60--AQC& zyg5^>M~+07GsMYws9!uQVcD!VXUz$tY`T-R8kyJPO<}xZaG6T3_u+ z88SAkz{|3dE(WfaD7VZ1Cwxo&;%PX`#rU--)zT@-?1r#n{<(z_*%HiA70oLaHpQl^ zQm=c7gsn%6Z(LZtSD&e2iyQF>WZI}Gd(>Sb&6P;`ar>=-I5UaCOFCS<1rTKW^_Al$ zxp>SFyL36(NUT?nJw1b$+CC8B6+|(a$B9N}8zr7R{!LQ7fI||CF{=FZ*Hno8N4hd;0`^ zA~~_z3zch4)dd`?3sc(tqiE}N6R#KlZc!$1jxY2aln|a)}FXj2ktJP7fBLC7mMQ(Z4Q3l@&un)e=$1SW>bRw}U zSmv3s2>;k@wqOMnvVx~Cby>#i!hSHs<{P$|ED)dJzcwoVA!d0i)bLP_T7}kHy%Oo> zY?*KJgUCz1JH*BA;yrvlV;j@f6_NU+^Fa6-OKe|f$m?H018=W$Ch@_kRgV@`C1lH@ zFGN4mf*4hW?=Y~bLb6Vm2lhh753I;Rv4-dI)^e|X`prTkroZnHm?zI^YoJHMAzmi% z$|BY>ld93w5VL_c(-*H47ee7awHm2DAW05E*aM7^=@Kni7lCa>sDlo;DG|;^dXlVf zow(`Lo0HjJlG8Pczg|kMkr9_++6}uNUP9}0`I_r(!^?K>%QCbl!Sj40tjSOBSN(E$ zRSDWGfnG~sL^b~qhU+ys&Od_VHrazQ3(y+a`rJyLZ)2TrtVHk-rg3kDn?ksuf#@mKPx z%Tna*Yp3fv!Aq7a`6Ve`E;)hm(8m!|K_)6!^;BUg1dtsOys^gu=6K&UNKu@42)~Ht zBOU1^zgHaHUsX0SGqIIl--(>%XHvp2v2x7vhRG9-Wg(|8CLB>r92zjYFH0=ZRr zA1~dj2gUJFRX2S{l|qe(oXRU0NP8`_ z-8}j4_o%hM-3)rCe=g6R1u#pC^UCCjK?cb}u_ExT;EEh-df4JLlea($Fnyhn({_&s z)$i@cqAh_$*RbEz|4Pi3eq*PrJx0jH2=D%y-g&B2Qh((26xttbWsrm6%LuEuLbz@R zFgpz26M_TvpwHWG!Az)wam~r(KE96qvf%OUmfSGa%LNVzCm_qo2;E|yxG#W&Q}gjL z$?{BbxjYPgFE6Wd6w@ACB^mS1dun0ioz8`rtZ zj&shr!H&oRU^U@UvBEm==I{@UERRJbExC($+yE= zmg>5e+9~S~^}|x(+HxQv0&?04O3^&SFHCWIGuX|uegkqx%9xQlgA-A~Ck$^|$4)pk zGS}%Z{=SbKVonxpzr;S?h0$sO8Prx7a%{nYL2Lcx0KE7WDeiy~!c%wHP~rE)iGadI z#WQ{$aSNv8_2b{%CtaFB!r88=4(r0K9ByU+d-wCgmv@ih_*;1YZCK@E&WnR-{SlT0 zh4t*c6sUiRDdAo`ia`EN9@7wKDu}d4U2a$3uv5S^2C$#WIj|TZ4h*^ag{y4kjSao{ zUp4(Ak7Dh=28^%%O5tR7%C3^Sd6~I)dj06L`~bb`h3D1E`-fi7STnnm?7xPNdmE?1 z%eU&5uf@`#oaDW54JmY=nq^2+S0J`xm}NibZDgc8K}S7f5sds*V=3R-)Gp@;J@0hs zx8h`S`O#E@;h3FtHz@Pb1X#H{fkKGFb!pJ#3#Wk*I!(B{5SXCtk?uDlEF0#h(NmJd z1y&~cQ+c^ww7MMFoYwnXJHQz7?8`>h^nXAKLWIt1)R5DCAr731|4yrd#-F|D7q)&S zszsQ$Wub%TRuJydWvLqeybKvZ!0c?M37QkwiT0YoS-(J!ixYqBvFk{t(Ao9H5s7&L zVNjfjSZ`$MjaE-UF57V-_U-!`mb96GuMSZ;!RCd= zsM`+!+gNBv!g>qpoY7^nshGeQ{L+VRZ9zd>nKt9!lm25W2(L5wMHqVj8C}zc+9V=F zDV#dpGyZ1hEm`{X_uf;L27%tbrdxN66+SwEWuxY;ADOcgBGXFqH^`*AdFKzr6V7`K zI01&6dL7<&94XO!r#SLVQkfw0F$}XeXTH9E3tyJ;`(Y$0?ak`bVLO=H?C%tD+A{A% zS5V1B+&Z?E3h;^VpXSL1z8DTQ*g{fb&R?BgJWw9(R%aI*s4+!e9MSMdmr>|3Yy1?D zX{K@B7}I!OIeZXL4&1{1CY7@xPsoy=k9KaxR;ZqKm^DcwnKb4;*#WPVGRo)h!pFuy zQZX(L?$$3=ZtwQU_>M-%0-Qi;Cq6~?=q&Qd%vdJLougt(;|ii-6@BRQ#?QeBd|4XR zSx@IVikF|os3*ywG&6Z`q55%M0_w6Hh_BLkeM!qE%7;%n!+xR&UeJo zobnr`QDV9BsR#8|=!`h{V&M{Z#>nt$l1TR<1O}SycT2-Q&yCEseM!3SP|YJvX}y9j z+FR@!Y#Ts59@PtLvj5=Us#VATXH5rhq2uWPtJFxTXpg$D zZKdSFiqCS{9h36Y&!k<5Q*TY7RlPq59|g?BpTdMZloF?hxJMfJ3Yt$8M(I!KaKD{MLXIVx zeCbZiFNkNV8C+pf{1L^0_w!-3JtSIgih%x#mRM<2KhF~?6$kFJF}y?rhyiU=hOTQWtq-@U znH~+a#Y}I!XW+`1xMI{8P1w%6)qH?$+E*3~eW`};xdIk8UH9q{=8e2n3+dD{epm8R zpR8_cm>i%1{}t{>c?N>chz1GtNiEG#N=cEfwNlqB2azfc;sQS=Z$}4hNjh^)^msNR z`Mm8&_3gePd(KtW@?Gy`@~{BMi}q84_y*I(Auf+Juu>f9>-aCXb{5PA-dxtVpnA0H z9X%cDd`KEAR;N&qwOjF#Y{wnxfw5MEw+rk71($D><~$X zdc1^-UcZJUa&8U7os?hh--K$e%5lst#~Cqud5TAgn-DzxuO3C;iEeeV_)*WjWk+4vO}jVMT1$(n8`7e65e)tDe!yo_ z0=XOq1N~Ec&p-X=`64i<&D6f1!FlsmK$J5ibK$CUiAv67zzg>Yq6~ za+8sslSG$zl1m0I>5KXt1Y10DrNen-hz1>`q^N-?4@TH~pmbFYk2k>Udt5T7yF@r4 z2`e{dScW(tiC9lNqX+*aEl*3N35~HhGFfU6eW{q6Yd{7a?gv;b;Vh$EP5FNO)x)S}wU!QosA8zgqxf z?^hz;WdF2pRE}CK`18gyW=AyS=M+|P_w%>66$V#L6I5cIZ{hA2Uy&mjgn=dx@}mi9 zY{Nx*j?U^2`Mv^*f)T7%vIX+-5S5+8^lP8fY6-?@aIx)j=r677cur@J+3-V;p~sI8 zzKefslrUliB_!?M6*djBD=~Lt_58@OPw$Alrmy?m8SAZwC>k0)w8b8UzUyD2iac*i zRO1pSTjA$L8chpoiI$3=TUIbp)(T5Mfo73kTT>L-(%t=5JP>-67iF*WNKK@;Wa^2H zrnR{867^H+6-{1gORJc}9?iYLTmSTOrZ~}O;lHeh_VR*-2?p*KzIqGl1xTTmNG)n$x}F*opLaeJCU+rT|%q2`e<75 z6C>DDkI6t|(grEVny1dH{T_s3nzxl3RdNF=2-h+mez#C6>aO;MpACq09)BTLjlB;U zW%;YyYbDPf-_XC!4myrd>jCFZ-dh=HzTP7p-4rF&b>mp1F0zY#^SzBZEt^pAxt;A+ z)~KS{pUPq52k%l4n&I1`IssjI3bc!htwJz>BtxnCe?cF8@@R~4>rSPSAva3njum6I zxf-l3v=`DiGK6h#ZqB(QW^$q@9%3fSZH;Ed$B-VC=MsZBHD+PXpzU_v&a6G>cie~G z6vbAVjhwypHf)K@oJW-7M~s;BjW+L=!S>j@q&xi~SX){5N5Q4tBr2e?xZ07tQac%j z^r$Q4nt*lgXL)fisJh_D?mM72mZ3}9??W4PgX17k;Uk1q?Zd^6l@zi!|N12rGeBHn|4Q@qDxM zM%%Y4kpH|z`M9X^pu5k*AaWcBbb(cgT6!7nxDf7nxp=3jkC9)X6+(g^-;{Vh~fT7Uhz{rY&NMrZ)m`C+t!pN zTR>kP%Fa#se!jMM{W`S;u!B216f5^g%h1zs7N{Z*%j(EwGF08M^D z#OvuL?pQ!jKK;Itm5s)5aDgHW4D9O3NF$lA#bZ4LFV7T*9C()8f$%L*fmLDxD2Y9J zk3Tc~LQpRhp^O8BhUMsHI&cXClYGD_%yI`DBDs+H?=UC{0l_*a3@s(2?+BVBG}6iu~tm(zLjWDCJ&u~?1o7lQb+Hl8Lb_l`LcH z3y|7IRQ+`!*I)Zrx*$!@pP_dQ`>#*QwAZJ|KK%UgxC}rf8-YCoNd&r}b~11oukRZdiSStD z*!(VMTP#wG9#r^jKw|V91ZA>Im$1iDYXR(Z(GLXJ_=P6H)x%%}G#x#xhXRMJxw!x~ z46rZ^XZyYv$-O+5F|>(i7NS{(?thM$Bwb6Y-T2Y0V-(m(Mvnl3$fIO1dq}-(4B-^l z;*mAdTpV16KxuWJT1%)Gy8QkadJ!lAfK$UGAi^01t{6rSBLx-+tcCfEV{m{P{#7_> zfDa0kz}`}G$0{OXkzBwh6Op6mQm$x{(v8bx5QUwO>dvxohGD+Iu5X9{ryi062O`d& z#AExB&v}$-T&=qEk+F~U+tSo}9D{n1Pbm&cDf8l2i256t#`^QpZ#(ZF&z8d2CyCDc zMhOQ!rPtc-+vrBLH}W!ho_e|N21eZ{v~iTW&)m1MCpP^)hq3mbqGz!H(QLp!7rpf@ zt+Y3x=s&x`2^7%@dbV(^nKVZ@{;My_&qe)WD(S)CgF4ZrP$5ir)AZl}KJCrIsKpTe z$K2Ss@9j_SX8RXrT0#z6*YVHv1&oT7&0|q2xs0*RKh4fGes*2s>Zj9r|lgAM`AqW!kg z`Y-7gBHX<%^8#CvJ-DEH<+}#|0$H4_T*@b`VPAyX#M}QSm@%g}%;}uh1^2G0h=TMf zlC=PtKl;39_W~&iaY3`F{e4>w>Mq2p6l{5492aj>M!pE4{V7%IgzzDaFMBfo{b0lP z-z#VIT~kiRjkgfv)Uw{v6T889LP!mg-(J;IV0W05!oL<}MadW6w!*o7w#o31w`s@S z76?*4f(&X4TcNrO&vJ;%cVUx=GnxF~TF$D`v!41MP#%DSvPBMUOGLs$A)h^|BVLm< zZ+MfStE&5k8=)$JZl3f7mBJB-t-ts!y4C56a|-C0^S*a>beC{mg^x<$#RF5(rS zxch?$W?-85LoM6--B3$=+4kZ@);&5OU`Jnxkjoa>8c_sGo$1cFhZh_<0UNxK4DYt@ z9NWJM6z;SRgoMQx#S}YZ&o+@e#NPEZ%b4y02sEx7IKVZn<0mUrEC1V$c}jTE2YtW) zNn=Thx(FX2#*N- znFV_~MWsPoL$B3tT}mrqFJ@2{QjMHh)7=iRB%CSZdRFO@=@Yh16j_-iyDd%+y|qPw z))&#$or?Y?mGxUwM#R%w9-37i{wfW#t#qk%q! z;<_D?#RZ9zJ?v10?O{?XNW^S)|0L{X6F%vG$ZYB1>BdA(69}D{<9XluuIih((j2BXqO;H6;fKp#m;p?+hT8O4qhyTr&e+RkE7LDTOo z(vN@PT9BZmN=?>?IM_s3rBf7}BMhQvbNk0wJ-|s6yfEvLRVX{NC4G!y6(soH!i@Wx z97TgXt7(0|lJp~QF9}}O{1L>m1hd?QkxS#ukhPb*@>JC;K*V4kCPD30TMmoumIyQcSmU2oWiF{w$2}8yZmfOkT$&3 zYA{W-NXcLhF`GN|!Ljyg1};5f;9~bzczexSGzPzDIIca@On&r_a#m;Xd)Z~K8FC5g z^33;&AlW>O_J}Zba>r5m959C?egz#)5dD=_L0VnHz*8gP&htOl=lH!~EH$a5{X&`% zjw1%!{2mag+ZwImZ-x$OdIk*??{DuNgWVnFVuL1^m#Rmw&F^GmM2o+uG#$9?P%qa|)s&cWN_OSMY zOT)3YYzw{6N)cWxUV)ZkPO938e M-_+A6Rl^4UA0E1>kN^Mx literal 0 HcmV?d00001 diff --git a/src/api/useGetAddress.ts b/src/api/useGetAddress.ts index e0fae927..9b1e7791 100644 --- a/src/api/useGetAddress.ts +++ b/src/api/useGetAddress.ts @@ -1,5 +1,4 @@ import { api } from '@/lib/api' -import addressStore from '@/store/addressStore' import memberStore from '@/store/user' import { useQuery, useQueryClient } from '@tanstack/react-query' @@ -24,13 +23,11 @@ export interface AddressResponseData { const useGetAddress = () => { const qc = useQueryClient() const { member } = memberStore() - const { setAddress } = addressStore() const { data: address, isSuccess } = useQuery({ queryKey: ['address'], queryFn: async () => { const response = await api.get(`members/address`) - setAddress(response) return response }, diff --git a/src/api/usePostLogout.ts b/src/api/usePostLogout.ts index 83731642..4e61236c 100644 --- a/src/api/usePostLogout.ts +++ b/src/api/usePostLogout.ts @@ -1,6 +1,5 @@ import { useLocalStorage } from '@/hooks/useLocalStorage' import { api } from '@/lib/api' -import addressStore from '@/store/addressStore' import memberStore from '@/store/user' import { useMutation, useQueryClient } from '@tanstack/react-query' @@ -9,7 +8,6 @@ const usePostLogout = () => { const accessToken = useLocalStorage('accessToken') const refreshToken = useLocalStorage('refreshToken') const { resetMember } = memberStore() - const { resetAddress } = addressStore() return useMutation({ mutationFn: async () => @@ -21,7 +19,6 @@ const usePostLogout = () => { accessToken.resetValue() refreshToken.resetValue() resetMember() - resetAddress() queryClient.removeQueries({ queryKey: ['member'] }) queryClient.removeQueries({ queryKey: ['favorites'] }) queryClient.removeQueries({ queryKey: ['carts'] }) diff --git a/src/app/favicon.ico b/src/app/favicon.ico deleted file mode 100644 index 718d6fea4835ec2d246af9800eddb7ffb276240c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 25931 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 LrJugUA?W`A8`#=m diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 758967da..cc5afa57 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -13,6 +13,9 @@ import './globals.css' export const metadata: Metadata = { title: '개발의민족', description: '개발의민족', + icons: { + icon: '/favicon.png', + }, } export const viewport = { diff --git a/src/app/mypage/address/_components/AddressOption.tsx b/src/app/mypage/address/_components/AddressOption.tsx index d17b2eab..1d5f3590 100644 --- a/src/app/mypage/address/_components/AddressOption.tsx +++ b/src/app/mypage/address/_components/AddressOption.tsx @@ -3,6 +3,7 @@ import useDeleteAddress from '@/api/useDeleteAddress' import useGetAddress, { AddressResponseData } from '@/api/useGetAddress' import useGetAddressToGeolocation from '@/api/useGetAddressToGeolocation' +import useGetMember from '@/api/useGetMember' import { AddressType } from '@/api/usePostAddress' import usePostDefaultAddress from '@/api/usePostDefaultAddress' import AddressSearchModal from '@/app/mypage/address/_components/AddressSearchModal' @@ -15,9 +16,7 @@ import { useToast } from '@/hooks/useToast' import { cn } from '@/lib/utils' import { modalStore } from '@/store/modal' import memberStore from '@/store/user' -import { ROUTE_PATHS } from '@/utils/routes' import { useQueryClient } from '@tanstack/react-query' -import { useRouter } from 'next/navigation' import { useState } from 'react' import DaumPostcode from 'react-daum-postcode' import AddressDetail, { AddressData } from '../detail/_components/AddressDetail' @@ -26,7 +25,7 @@ const AddressOption = () => { const [word, setWord] = useState('') const [popup, setPopup] = useState(false) - const { member } = memberStore() + const { member, setMember } = memberStore() const { showModal, hideModal } = modalStore() const { mutate: deleteAddress, isPending: isPendingDeleting } = useDeleteAddress() @@ -34,9 +33,9 @@ const AddressOption = () => { usePostDefaultAddress() const { address } = useGetAddress() const { mutate: addressToGeolocation } = useGetAddressToGeolocation() + const { refetch: refetchMember } = useGetMember() const { toast } = useToast() - const router = useRouter() const queryClient = useQueryClient() @@ -88,14 +87,23 @@ const AddressOption = () => { const handleClickSetDefaultAddress = (id: number | undefined) => { if (!id || isPendingSettingDefaultAddress) return if (id === address?.defaultAddress?.id) { - router.push(ROUTE_PATHS.HOME) return } setDefaultAddress(id, { onSuccess: () => { - router.push(ROUTE_PATHS.HOME) + refetchMember().then((res) => { + if (res.data) { + setMember(res.data) + } + }) + queryClient.invalidateQueries({ queryKey: ['address'] }) + + toast({ + title: '기본 주소가 변경되었습니다.', + position: 'center', + }) }, }) } diff --git a/src/app/pay/_components/OrderInfo.tsx b/src/app/pay/_components/OrderInfo.tsx index 68f99439..693da1bc 100644 --- a/src/app/pay/_components/OrderInfo.tsx +++ b/src/app/pay/_components/OrderInfo.tsx @@ -8,6 +8,7 @@ import usePostOrderPay, { OrderPay, OrderPayResponse, OrderPayType } from '@/api import MenuItem from '@/app/pay/_components/MenuItem' import Alert from '@/components/Alert' import { Button } from '@/components/button' +import Confirm from '@/components/Confirm' import Icon from '@/components/Icon' import Separator from '@/components/Separator' import { Checkbox } from '@/components/shadcn/checkbox' @@ -15,7 +16,6 @@ import { Label } from '@/components/shadcn/label' import useBottomSheet from '@/hooks/useBottomSheet' import { useToast } from '@/hooks/useToast' import { cn } from '@/lib/utils' -import addressStore from '@/store/addressStore' import { modalStore } from '@/store/modal' import memberStore from '@/store/user' import { ROUTE_PATHS } from '@/utils/routes' @@ -41,7 +41,6 @@ const OrderInfo = () => { const { member } = memberStore() const { showModal } = modalStore() - const { address } = addressStore() // const { payments, setPayments } = successPaymentStore() const { BottomSheet, hide } = useBottomSheet() @@ -49,13 +48,28 @@ const OrderInfo = () => { const handleEmptyCart = () => { if (!cartsState) return - const cartIds = cartsState.orderMenus.map((menu) => menu.cartId) - deleteCarts( - { cartIds }, - { - onSuccess: () => setCartsState(undefined), - } - ) + + showModal({ + content: ( + { + const cartIds = cartsState.orderMenus.map((menu) => menu.cartId) + deleteCarts( + { cartIds }, + { + onSuccess: () => { + resetCarts() + setCartsState(undefined) + }, + } + ) + }} + /> + ), + }) } const handleIncreaseQuantity = (cartId: number) => { const updateCartsState = (newQuantity: number) => { @@ -138,7 +152,7 @@ const OrderInfo = () => { } const handleOrderPay = async () => { - if (!cartsState || !member || !address) { + if (!cartsState || !member) { showModal({ content: ( { const orderData: OrderPay = { storeId: cartsState.storeId, - roadAddress: address?.defaultAddress?.roadAddress || '', - jibunAddress: address?.defaultAddress?.jibunAddress || '', - detailAddress: address?.defaultAddress?.detailAddress || '', + roadAddress: member.address.roadAddress || '', + jibunAddress: member.address.jibunAddress || '', + detailAddress: member.address.detailAddress || '', excludingSpoonAndFork: isExcludingSpoon, orderType: 'DELIVERY', // paymentType, @@ -228,6 +242,11 @@ const OrderInfo = () => { return } + // 결제 시작 전 현재 URL을 히스토리에 추가 + if (window.history && window.history.pushState) { + window.history.pushState(null, '', window.location.href) + } + if (paymentType === OrderPayType.PAY200) { // SDK 초기화 const requestPayment = pay200SDK({ @@ -264,9 +283,9 @@ const OrderInfo = () => { // customerMobilePhone: "01012341234", card: { useEscrow: false, - flowMode: 'DIRECT', - // flowMode: 'DEFAULT', - cardCompany: 'TOSSBANK', + flowMode: 'DEFAULT', + // flowMode: 'DIRECT', + // cardCompany: 'TOSSBANK', useCardPoint: false, useAppCardOnly: false, }, @@ -316,7 +335,7 @@ const OrderInfo = () => { } return ( -
+
@@ -333,16 +352,14 @@ const OrderInfo = () => {
- {`${address?.defaultAddress?.roadAddress} ${address?.defaultAddress?.detailAddress}`} + {`${member?.address.roadAddress} ${member?.address.detailAddress}`}
(으)로 배달
-
- [지번] {address?.defaultAddress?.jibunAddress} -
+
[지번] {member?.address.jibunAddress}
@@ -443,22 +460,28 @@ const OrderInfo = () => { {(totalMenuPrice + deliveryPrice).toLocaleString()}원
- {isUnderMinOrder && ( -

- {(storeDetail.minimumOrderAmount - totalMenuPrice).toLocaleString()}원 더 담으면 배달 - 가능해요 + + {/* 배달비 무료 조건 추가 */} +

+

+ {isUnderMinOrder + ? `${(storeDetail.minimumOrderAmount - totalMenuPrice).toLocaleString()}원 더 담으면 배달 가능해요` + : '배달비 무료!'}

- )} - + +
) } diff --git a/src/app/pay/fail/_components/PayFail.tsx b/src/app/pay/fail/_components/PayFail.tsx index 4118f054..5d138c94 100644 --- a/src/app/pay/fail/_components/PayFail.tsx +++ b/src/app/pay/fail/_components/PayFail.tsx @@ -19,7 +19,7 @@ const PayFail = () => { useEffect(() => { if (timer <= 0) { - router.push(ROUTE_PATHS.PAY) + router.replace(ROUTE_PATHS.PAY) } }, [timer]) diff --git a/src/app/pay/success/_components/PaySuccess.tsx b/src/app/pay/success/_components/PaySuccess.tsx index ae3ad583..12ecacce 100644 --- a/src/app/pay/success/_components/PaySuccess.tsx +++ b/src/app/pay/success/_components/PaySuccess.tsx @@ -21,6 +21,14 @@ const PaySuccess = () => { const { mutate: payment } = usePostPayment() useEffect(() => { + // 브라우저 히스토리 조작 + if (window.history && window.history.pushState) { + window.history.pushState(null, '', window.location.href) + window.onpopstate = () => { + router.replace(ROUTE_PATHS.HOME) + } + } + if (orderId && paymentKey && amount) { payment( { @@ -71,7 +79,7 @@ const PaySuccess = () => { title="결제 실패" message="결제 중 오류가 발생했습니다." onClick={() => { - router.push(ROUTE_PATHS.PAY) + router.replace(ROUTE_PATHS.PAY) }} /> ), diff --git a/src/app/store/detail/[id]/_components/OrderButton.tsx b/src/app/store/detail/[id]/_components/OrderButton.tsx index 9291201f..46a1f914 100644 --- a/src/app/store/detail/[id]/_components/OrderButton.tsx +++ b/src/app/store/detail/[id]/_components/OrderButton.tsx @@ -30,20 +30,18 @@ export const OrderButton = ({ minimumOrderAmount }: { minimumOrderAmount: number } return ( -
- {isUnderMinOrder && ( -

- {(minimumOrderAmount - totalPrice).toLocaleString()}원 더 담으면 배달 가능해요 -

- )} -
diff --git a/src/app/store/detail/[id]/_components/StoreOrderDetail.tsx b/src/app/store/detail/[id]/_components/StoreOrderDetail.tsx index f3bffd31..d80c3e9b 100644 --- a/src/app/store/detail/[id]/_components/StoreOrderDetail.tsx +++ b/src/app/store/detail/[id]/_components/StoreOrderDetail.tsx @@ -10,6 +10,7 @@ import Confirm from '@/components/Confirm' import Icon from '@/components/Icon' import { Skeleton } from '@/components/shadcn/skeleton' import LoginModal from '@/components/shared/LoginModal' +import UpDownBtn from '@/components/UpDownBtn' import { useLocalStorage } from '@/hooks/useLocalStorage' import { useThrottle } from '@/hooks/useThrottle' import { toast } from '@/hooks/useToast' @@ -20,7 +21,6 @@ import { orderDetailStore } from '@/store/orderDetail' import { COLORS } from '@/styles/color' import { motion } from 'motion/react' import Image from 'next/image' -import { useRouter } from 'next/navigation' import { useCallback, useEffect, useRef, useState } from 'react' import { createPortal } from 'react-dom' import MenuOption from './MenuOption' @@ -43,6 +43,7 @@ const StoreOrderDetail = ({ minimumOrderAmount }: { minimumOrderAmount: number } const [isTextOverflow, setIsTextOverflow] = useState(false) const [isExpanded, setIsExpanded] = useState(false) const [price, setPrice] = useState(0) + const [quantity, setQuantity] = useState(1) const [isHeaderOpaque, setIsHeaderOpaque] = useState(false) const [selectedOptions, setSelectedOptions] = useState>({}) const [isValid, setIsValid] = useState(false) @@ -52,8 +53,6 @@ const StoreOrderDetail = ({ minimumOrderAmount }: { minimumOrderAmount: number } orderDetail?.menuId ?? '' ) - const router = useRouter() - const onChangeOption = ( id: string, action: 'add' | 'remove' | 'change', @@ -120,7 +119,7 @@ const StoreOrderDetail = ({ minimumOrderAmount }: { minimumOrderAmount: number } storeId: orderDetail.storeId.toString(), orderMenu: { menuId: storeMenuOptions.menuId, - quantity: 1, + quantity, orderMenuOptionGroups: Object.entries(selectedOptions).map(([groupId, group]) => { return { id: groupId, @@ -388,15 +387,19 @@ const StoreOrderDetail = ({ minimumOrderAmount }: { minimumOrderAmount: number } delay: 0.2, }} > -

+

{minimumOrderAmount.toLocaleString()}원부터 주문 가능해요

- +
+ + +
, document.body diff --git a/src/assets/images/Pay200_Logo.png b/src/assets/images/Pay200_Logo.png deleted file mode 100644 index 12389e9432fc225c24142a9a3f8c25e0733da6ea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15484 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 BW;6f* diff --git a/src/assets/images/Toss_Logo.png b/src/assets/images/Toss_Logo.png deleted file mode 100644 index 697043c612c60b162ea2dc5139a6c0b2238b39b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22820 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 { const { refetch } = useGetMember() const { mutate: logout } = usePostLogout() - const { address } = useGetAddress() - const { mutate: getGeolocationToAddress } = useGetGeolocationToAddress() - - const { member, setMember } = memberStore() - const { - setCoordinates, - setAddress, - address: addressStoreAddress, - setError, - setIsLoading, - } = useGeoLocationStore() + + const { setMember } = memberStore() + const { setCoordinates, setError, setIsLoading } = useGeoLocationStore() const { isGlobalLoading, setIsGlobalLoading } = globalLoaderStore() useEffect(() => { @@ -82,12 +72,13 @@ const CommonLayout = ({ children }: CommonLayoutProps) => { useEffect(() => { if (!isMounted) return - + setIsGlobalLoading(false) const requestGeolocation = async () => { try { const permissionStatus = await navigator.permissions.query({ name: 'geolocation' }) if (permissionStatus.state === 'denied') { + setIsGlobalLoading(false) setError( '위치 정보가 차단되어 있습니다.\n 브라우저 설정에서 위치 정보 접근을 허용해주세요.' ) @@ -102,41 +93,9 @@ const CommonLayout = ({ children }: CommonLayoutProps) => { longitude: position.coords.longitude, } - console.log(process.env.NEXT_PUBLIC_KAKAO_API_KEY) - - if (!addressStoreAddress || !member) { - getGeolocationToAddress( - { - latitude: coords.latitude.toString(), - longitude: coords.longitude.toString(), - }, - { - onSuccess: (data) => { - const address = data.documents[0] - - setAddress({ - addressName: address.address.address_name, - sido: address.address.region_1depth_name, - sigungu: address.address.region_2depth_name, - roadAddress: address.road_address?.address_name || '', - jibunAddress: address.address.address_name, - }) - }, - onError: (error) => { - console.log(error) - }, - onSettled: () => { - setCoordinates(coords) - setIsLoading(false) - setIsGlobalLoading(false) - }, - } - ) - } else { - setCoordinates(coords) - setIsLoading(false) - setIsGlobalLoading(false) - } + setCoordinates(coords) + setIsLoading(false) + setIsGlobalLoading(false) }, (error) => { console.log('위치 정보 에러:', error) diff --git a/src/components/Confirm.tsx b/src/components/Confirm.tsx index 616c2dab..748508f0 100644 --- a/src/components/Confirm.tsx +++ b/src/components/Confirm.tsx @@ -31,7 +31,7 @@ const Confirm = ({ } return ( -
+
{title}
diff --git a/src/components/Navigation.tsx b/src/components/Navigation.tsx index 123b7c80..8e2ea179 100644 --- a/src/components/Navigation.tsx +++ b/src/components/Navigation.tsx @@ -1,14 +1,12 @@ 'use client' import { cn } from '@/lib/utils' -import addressStore from '@/store/addressStore' import { useGeoLocationStore } from '@/store/geoLocation' import { modalStore } from '@/store/modal' import memberStore from '@/store/user' import { ROUTE_PATHS } from '@/utils/routes' import { useRouter } from 'next/navigation' import Icon from './Icon' -import LoginModal from './shared/LoginModal' export interface NavigationProps { hasBackButton?: boolean @@ -32,7 +30,6 @@ const Navigation = ({ const router = useRouter() const { address } = useGeoLocationStore() const { member } = memberStore() - const { address: addressStoreAddress } = addressStore() const { showModal } = modalStore() return ( @@ -68,21 +65,13 @@ const Navigation = ({ onClick={() => { if (useAddress && member) { router.push(ROUTE_PATHS.ADDRESS) - } else { - showModal({ - content: , - useAnimation: true, - }) } }} > - {useAddress - ? addressStoreAddress - ? addressStoreAddress.defaultAddress?.roadAddress || - addressStoreAddress.defaultAddress?.jibunAddress + - ' ' + - addressStoreAddress.defaultAddress?.detailAddress - : address?.roadAddress || address?.jibunAddress + {useAddress && member + ? `${member.address.roadAddress || member.address.jibunAddress} ${ + member.address.detailAddress + }` : title} {useAddress && member && } diff --git a/src/components/UpDownBtn.tsx b/src/components/UpDownBtn.tsx index b9f1b591..8ec22388 100644 --- a/src/components/UpDownBtn.tsx +++ b/src/components/UpDownBtn.tsx @@ -1,19 +1,52 @@ 'use client' import Icon from '@/components/Icon' -interface UpDownProps { +import { cn } from '@/lib/utils' +import { cva, VariantProps } from 'class-variance-authority' + +const upDownBtnVariants = cva( + 'flex flex-row items-center rounded-lg border border-solid border-gray-300 px-2', + { + variants: { + size: { + sm: 'h-8', + md: 'h-12', + }, + }, + defaultVariants: { + size: 'sm', + }, + } +) + +interface UpDownProps extends VariantProps { value: number onChange: (value: number) => void } -const UpDownBtn = ({ value = 0, onChange }: UpDownProps) => { +const UpDownBtn = ({ value = 0, onChange, size = 'sm' }: UpDownProps) => { return ( -
+
-
{value}
+
+ {value} +
) diff --git a/src/components/button.tsx b/src/components/button.tsx index 0c0a43f5..1d0ebede 100644 --- a/src/components/button.tsx +++ b/src/components/button.tsx @@ -15,7 +15,7 @@ const buttonVariants = cva( size: { default: 'rounded-md text-base h-12', - s: 'rounded text-sm h-10', + s: 'rounded-lg text-sm h-12', m: 'rounded-md text-lg font-semibold h-14', }, diff --git a/src/models/auth.ts b/src/models/auth.ts index 968602c5..eb494ea1 100644 --- a/src/models/auth.ts +++ b/src/models/auth.ts @@ -38,4 +38,11 @@ export interface Member { id: number signname: string nickname: string + address: { + roadAddress: string + jibunAddress: string + detailAddress: string + latitude: number + longitude: number + } } diff --git a/src/store/addressStore.ts b/src/store/addressStore.ts deleted file mode 100644 index 1216d0fa..00000000 --- a/src/store/addressStore.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { AddressResponseData } from '@/api/useGetAddress' -import { create } from 'zustand' - -interface AddressStore { - address: AddressResponseData | null - setAddress: (address: AddressResponseData) => void - resetAddress: () => void -} - -const addressStore = create((set) => ({ - address: null, - setAddress: (address) => set({ address }), - resetAddress: () => set({ address: null }), -})) - -export default addressStore diff --git a/src/store/geoLocation.ts b/src/store/geoLocation.ts index f3e92c09..2e083eae 100644 --- a/src/store/geoLocation.ts +++ b/src/store/geoLocation.ts @@ -11,6 +11,7 @@ interface Address { sido: string // 시/도 sigungu: string // 시/군/구 addressName: string // 주소 + detailAddress: string // 상세 주소 } interface GeoLocationStore { @@ -27,8 +28,15 @@ interface GeoLocationStore { } export const useGeoLocationStore = create((set) => ({ - coordinates: { latitude: 37.5177, longitude: 127.0473 }, - address: null, + coordinates: { latitude: 37.4955498697675, longitude: 127.029293901519 }, + address: { + roadAddress: '서울특별시 강남구 강남대로 364', + jibunAddress: '서울 강남구 역삼동 826-21', + sido: '서울특별시', + sigungu: '강남구', + addressName: '역삼동', + detailAddress: '미왕빌딩 10층 10C', + }, isLoading: true, error: null, diff --git a/src/store/user.ts b/src/store/user.ts index c9dd85fb..16a9c7c6 100644 --- a/src/store/user.ts +++ b/src/store/user.ts @@ -13,6 +13,13 @@ const memberStore = create((set) => ({ set({ member: { ...member, + address: member.address || { + roadAddress: '', + jibunAddress: '', + detailAddress: '', + latitude: 0, + longitude: 0, + }, }, }), resetMember: () => set({ member: null }),