From a7a211e226adeb52fbe258fd7b54bf190ddf65ad Mon Sep 17 00:00:00 2001 From: Emma-Hyejin Date: Mon, 15 Jan 2024 01:10:47 +0900 Subject: [PATCH 1/2] =?UTF-8?q?Feat:=20=EB=A7=88=EC=9D=B4=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EB=A0=88=EC=9D=B4=EC=95=84=EC=9B=83=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/header/Topnav.tsx | 2 +- src/components/mineItems/LikeForum.tsx | 73 ++++++++++++++---- src/components/mineItems/LikeItem.tsx | 100 +++++++++++++------------ src/components/mypage/EditProfile.tsx | 6 +- src/components/mypage/Mine.tsx | 2 +- 5 files changed, 120 insertions(+), 63 deletions(-) diff --git a/src/components/header/Topnav.tsx b/src/components/header/Topnav.tsx index 79f73ae..f211159 100644 --- a/src/components/header/Topnav.tsx +++ b/src/components/header/Topnav.tsx @@ -9,7 +9,7 @@ interface navSelectType { const Topnav = ({ trip }: navSelectType) => { //console.log(trip); const navStyle = - "px-1 md:px-7 py-2 font-medium md:font-semibold text-BASIC_WHITE hover:text-MAIN_COLOR dark:text-BASIC_BLACK dark:hover:text-MAIN_COLOR"; + "px-1 md:px-4 py-2 font-medium md:font-semibold text-BASIC_WHITE hover:text-MAIN_COLOR dark:text-BASIC_BLACK dark:hover:text-MAIN_COLOR"; const navContainer = "px-2 flex justify-between md:justify-end w-full bg-BASIC_BLACK dark:bg-LIGHT_GRAY_COLOR"; const setCode = useSetRecoilState(menuSelector); diff --git a/src/components/mineItems/LikeForum.tsx b/src/components/mineItems/LikeForum.tsx index b440386..3949da4 100644 --- a/src/components/mineItems/LikeForum.tsx +++ b/src/components/mineItems/LikeForum.tsx @@ -1,24 +1,71 @@ +import Close from "@/assets/svg/Close"; import Category from "@/common/category/Category"; +import useFormatDate from "@/hooks/useFormatDate"; import { LikeForumProps } from "@/types/myProfile"; +import { useMutation, useQueryClient } from "@tanstack/react-query"; +import axios from "axios"; import { Link } from "react-router-dom"; const LikeForum = ({ data }: LikeForumProps) => { console.log(data); - //gap-3 + const formattedDate = useFormatDate(data && data.createdAt); + const queryClient = useQueryClient(); + const BASE_URL = import.meta.env.VITE_BASE_URL; + const ACCESS_TOKEN = window.localStorage.getItem("access_token"); + + const handleDeleteMine = useMutation({ + mutationFn: (interestArticleId: number) => { + return axios.delete( + `${BASE_URL}/api/interest-articles/${interestArticleId}`, + { + headers: { + accessToken: `Bearer ${ACCESS_TOKEN}`, + }, + }, + ); + }, + onSettled: () => queryClient.invalidateQueries({ queryKey: ["mineDatas"] }), + }); + + const DeleteMineClick = async (interestArticleId: number) => { + try { + await handleDeleteMine.mutateAsync(interestArticleId); + } catch (err) { + throw new Error(`내 아이템 삭제 ${err}`); + } + }; + return ( -
- -
-
- -
+
+
+ +
+
+ +
-
{data.createdAt}
-
-
- {data.title} -
- +
{formattedDate}
+
+
+ {data.title} +
+ +
+
+ +
); }; diff --git a/src/components/mineItems/LikeItem.tsx b/src/components/mineItems/LikeItem.tsx index ec2206f..f1a5f3f 100644 --- a/src/components/mineItems/LikeItem.tsx +++ b/src/components/mineItems/LikeItem.tsx @@ -1,64 +1,70 @@ import Close from "@/assets/svg/Close"; import { LikeMerchanProps } from "@/types/myProfile"; import { useNavigate } from "react-router-dom"; -// import { useMutation } from "@tanstack/react-query"; -// import axios from "axios"; +import { useMutation } from "@tanstack/react-query"; +import axios from "axios"; const Likeitem = ({ data }: LikeMerchanProps) => { const navigation = useNavigate(); - // const BASE_URL = import.meta.env.VITE_BASE_URL; - // const ACCESS_TOKEN = window.localStorage.getItem("access_token"); + const BASE_URL = import.meta.env.VITE_BASE_URL; + const ACCESS_TOKEN = window.localStorage.getItem("access_token"); - // const handleDeleteMine = useMutation({ - // mutationFn: (interesItemId: number) => { - // return axios.delete(`${BASE_URL}/api/interest-items/${interesItemId}`, { - // headers: { - // accessToken: `Bearer ${ACCESS_TOKEN}`, - // }, - // }); - // }, - // }); + const handleDeleteMine = useMutation({ + mutationFn: (interesItemId: number) => { + return axios.delete(`${BASE_URL}/api/interest-items/${interesItemId}`, { + headers: { + accessToken: `Bearer ${ACCESS_TOKEN}`, + }, + }); + }, + }); - // const DeleteMineClick = async (interesItemId: number) => { - // try { - // await handleDeleteMine.mutateAsync(interesItemId); - // } catch (err) { - // throw new Error(`내 아이템 삭제 ${err}`); - // } - // }; + const DeleteMineClick = async (interesItemId: number) => { + try { + await handleDeleteMine.mutateAsync(interesItemId); + } catch (err) { + throw new Error(`내 아이템 삭제 ${err}`); + } + }; console.log(data); return ( -
navigation(`/products/detail/${data && data.id}`)} - > - -
-
+
+
navigation(`/products/detail/${data && data.id}`)} + > + + +
- {data.title.slice(0, 28)}.. + {data.title.slice(0, 30)}.. +
+
+ {data.shopName} +
+
+ {String(data.minPrice).replace(/\B(?=(\d{3})+(?!\d))/g, ",")}원
-
+
-
- {data.shopName} -
-
{data.maxPrice}
+
+
); diff --git a/src/components/mypage/EditProfile.tsx b/src/components/mypage/EditProfile.tsx index c16ee5b..8eeacb6 100644 --- a/src/components/mypage/EditProfile.tsx +++ b/src/components/mypage/EditProfile.tsx @@ -1,5 +1,5 @@ import MyPageModal from "@/components/modal/MypageModal"; -import { useState } from "react"; +import { useEffect, useState } from "react"; // import Temp from "@/assets/img/temp.png"; import Setting from "@/assets/svg/Setting"; import { MyDataProps } from "@/types/myProfile"; @@ -23,6 +23,10 @@ const EditProfile = ({ data }: MyDataProps) => { setActiveBtn(item); }; + useEffect(() => { + setSelectedTab("likeMerchan"); + }, []); + //style const summaryTitle = "mr-1.5 sm:mx-5 text-[11px] sm:text-sm rounded-lg bg-zinc-200 p-1 sm:bg-inherit"; diff --git a/src/components/mypage/Mine.tsx b/src/components/mypage/Mine.tsx index e219aad..10bfc86 100644 --- a/src/components/mypage/Mine.tsx +++ b/src/components/mypage/Mine.tsx @@ -32,7 +32,7 @@ const Mine = () => { ); //Tab 변경에 따른 데이터 컴포넌트 const [mineContent, setMineContent] = useState(); - + console.log(selectedTab); const getMineDatas = async () => { try { let URL; From dd759fe88b7bc53bfcb595dc29d958af2f886a31 Mon Sep 17 00:00:00 2001 From: Emma-Hyejin Date: Mon, 15 Jan 2024 01:21:17 +0900 Subject: [PATCH 2/2] =?UTF-8?q?Fix:=20=EC=B9=B4=EC=B9=B4=EC=98=A4=20?= =?UTF-8?q?=EB=A7=81=ED=81=AC=20=EC=8D=B8=EB=84=A4=EC=9D=BC=20=EC=9D=B4?= =?UTF-8?q?=EB=AF=B8=EC=A7=80=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 8 ++++---- src/assets/img/LogoThumbnail.png | Bin 6485 -> 9550 bytes 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index e94f4d9..a839047 100644 --- a/index.html +++ b/index.html @@ -5,10 +5,10 @@ - - - - + + + + TRIPTRIP diff --git a/src/assets/img/LogoThumbnail.png b/src/assets/img/LogoThumbnail.png index 98efe1dd6049b60af7f047ac6a61ba972b23dcee..06226879da60ed7cb6547aadb6bf66b454ecd505 100644 GIT binary patch literal 9550 zcmeI1hgVbG)~`392PIN01VxJVMFj)}1gQ!luY!WK&?7`aYCwcg0zo;5N{ONrr3nZq zRS2O45)?@2h!8qK5_$`vBm_dZ@tk|dxc7eNeBb#4-i)!6>^b(BW9{EsbFR7O^V00D zk+6`Y5C8zexBk3g4gdlt0D$lHzQ6G-)@S#q@_zRF{%PwE0HDLaFFxQy+EJd7&)?ig zA1LXPn&aK&A7mOm1bIyzOjXE=@>JzLoa( zJ%?mc1^0j5BV^oeZnIB0H>y%wbLqkUs4iu#J0lg>aOssJSz52JS=2s#`s2reA$?&CF=doAB{9 zl=w{}BV#@Qczw-)H^4KeB6#1e`%VDBwafhbc;;AupJzV(m-#PE{#p?KVKn#`5eRx3 z8`T#9xoCi2IeIH(n;HP$$=z&3bMN`i`#J)5GxC7@{Yyb1M#$MbbaRwjx;RWgFx%`x zlU6uwE2!D{V%&Jh?)I~{jRAZb?1~7W<7s>)GYGlRwV8?|NTXOa-Nddjoig{Y=b4LR zvT52SpoUh+QE6$#y#S`9v{Y%CvzqR=z%~00MxV~i&T4u)tt|rKm2XfpC^V6|Gox=%^ft?&kM;d%yB2zF5*Kj z-M**cnySx)o)7h6vG9lCbjcU2x|xBgw$)tNMsh)wuR3eJ}h> z{J8_`B&s}AoJ9$RDPip&500D#L4~^>>WAr#JI;U--G;vrf$416kjIjwJ97T_A zN!XUz$1>Wg%$&TnWI3Z|k78}gFApadzrsTBmqkQk_h5K4o}$MaujIxCvsqCcrKwr6 zy|hW9>)3FI!lj|uxbp{{5U_eZg32u&;-jR z7R@R)J@fC5*}Js#?Ilmv1 z6)<3A-ALpv*_TtXDp$rCL+3<9Z;r>y!B~;wac|O1o3f9_@9n(PlQPCU?|K{_7UEXN z9-zpi9Ua(vpL_5c;PGQ<=vb~!H?gFQX=DB%@%gf7y zzT@iDQh2?ZZVjW%rgC%jk%xy8V&Wz8-F2tMB%%x5R5sod9NV-F=dRhL>A2NKC9UF^ z@{p3){{H^|?J8;?-~3njIKFySKsH8YJlLSfq0ic>p+vjns{E5^IzgVY@l4H+J(UbW zaw+wpwCBftUW~vAI<>X6&xR&yfezWfWeN11B+$5cV+iRmYxJ0o;LRM3elwZ6x;cN; zF?BrSLpAl4`~_VEjTq-gi&G~mR*h!2q(9^Z2PX>zzLu`bnGiMHCGDQ^sb4x=wk1rD zC8ncE?Kq*H`mgd^g3sGVj{Kp?J`$4~wAw01Tg%*aNb@89tX`@d$u2HdObPq#=pzW+ z;5Yo$*?_YovHU{TZ8xLJ)lgNf>YYTTd^<@`BBp0(=-^C7s88LJ_ds*PS>tClGrTw$ z-XjJ8Cyv3c0YJoqfBxs&0|0;C1b7ud0&n{MUo-LcY(t%@vO_E>Q22&{!AZMRp`Jcv zJTc&lCQ+B-T9zLr;H$qB)^ zSp#1_lY@5-?50NZcZxcT(*wIXO+$Rz~hOxs@^>}iYY5Z zoOxc35|uUxN7CrsS%z#OBf1y0PNG8fojTpiJGLu{m~$o7BdFqt7E_dD}hgkv0!35~g))K5^`_`61=F6vtS6Ix&dw_4vwW`k{oIAi#n-ZQ09itQ0B|dcu((F}TiLU1@PYw%G+WLy|e6trd2<|06wRqfhX;lpKwfMaJ zGN`N^r`QFhfEOTGQo^FAVkcJp=1i%-GDwQI_GoXs1z~HL$g+>cCn>?ruU12STPo{M zGm^)LB_kU*iq%r-IXKMu^1(MtRbqt_Rn1ZITGZ@Cn-R$|+yYH)?jJ`-z!a}K|baF<`3GNgFzd4K!{bMGTv17RLTY}y1{dudpkU%w3 z!SZy_+)#{*H&}V?8NoWZT3SZFIYVLJ(xBcUy^#6)+E|2g_{KwdT3W7=;A@ESIXC!Q|d88_*i@iq&gIuA-%9_*y-0g9AE8gXjC-ovH#wllf;dq;($mx58Z$)Qab{jSwS2A6T z&#`pCWk_cW2R|Q(L+CvOyDMCcUBg{`|McaGhH9E~jBIB(v(AlV3Qb=HcXPB;8;rR8LtG?C)Ciq;FwrbwOFf ze78o}HTfgLmt#})@aajG=yB%5lMk+QsJX_l0E8zQoatZ+)|BbuC*_SrG8z@bhH7N5 z#=oJKjT;FJZC_P(*xgnMIx$Y)M2sBP5n$}dg<$#<_3Iw*BvdoMmndAr?rA`ti2&B_ zQtU2S7ty=8FI$GM|55v(bJ=rw`FI?hL&^x6Z53dY$S1oYsEfc@R`rV%jGW54Pk!4}yzDSfYyl%TK(Qo;fH;t4eZQ`dehCL^>_U+~IR{kad zy@fa<#5$?DP>Y(3@qANdeaCGZpSAfmG~u=FYO@QSscN98Ayj8iQP6k|>KwOQK#N8ia@@Er zav&}-rhE9fst_r@M&o+UP|U8^zo>As9+MbTm3=t%@MXnbHKvU&~{VnHap004?>KUT8 z&U$0^Ddkh%e*~Y{**YCcEpy!AQ_kG?58v;UpPs30A6GYv)k1B0)$G$HPpP~f+kRVr zP|jWBNttR@)y~?&SMTv3m!L}NF3EXHp8MIO0yxtz_xC6thFyyYc6T>|X~To<+0&sl zOifkF$x>sGFwJ7+rtaSPKNn?F!U11OoG1Hx|I0Z~Grn0g8=&nmgn-jZu)6 z)OuWPnDrWQN%EzDLG!95UL2|tI;;mDmX#=;f1x5#bpv74d(Y^}dfB^ET04VS)Mpp_ zTe>F*^$)kgR8362q@gOmhMfws-v9SIaZxrk=LjWlq29=C0o!jG-A-h64N3CkTS??h z{x%I#;t)6)LR_rcn2ctR!s9`kdyTJxxZe>`CwxB=Ch;*ak&`X(tvI|L7q*6!h1x5um1gkEK^FVRcK|R8g2pi8VvkM)y>dRKBO1C_3IMf zWYFIlB;-d+;2rTxamk7=lhd&GkxOWe%atw_HnH`#_eZ`K>*1L>Zs-pa?zOPafyrv_ zu-edC8=SMbEn!48a;IYM*v7PWvUD8%tV-Eh`0fKJdBFyqEqtU&Mt5L^vGv|Zd zDoAj=N9U)8&__G(84JG3AQNb7N#mq#civiLv0yo!P;zc|0O%0-z3EKFVAQZ(qr#r| z5}#q!a2EJ#Oj+Hv`-(T+W~YDt>^mAWoUfNx7ciNY>+Q#`HDpXF90^;R$as~zn4=|1 zT!4Q4gp9|2K~x8WKij2d7s6^;d6z;>KfuP0c{7G%aI_@U@Ik#n^Q+2ZnNc`|Lz%W~ z0$oKf^EReu8YB~l=#aW7lA5Jt8QhuZj@JWY(YwRA6Ckb9FfMfyIz9@N*oXmKG5D%=H`eLOKG&l(Ors0|7JjoV|m_bnYNN|yWB43D_pDG<(7Q?Wv^SB z8bZISt0DYp{RLR5J}onx@Au=e@YSuDhItH@RelbkFjW1vY zC^=cH?OSSJ{xNXbHP<;i)&A^;Q_ORZsx8k^a=~(c(49cV3sJA$NY;9gKl!GirH9Yp zoYn4Gbr?*-pV0F!&fepOh1DEq2&)o_H}J|eH1q!bGo z|8%oAji!*%|2{@u^hLMCO{p)=ehEJny8E^4dsiyeBwVf=C+@jCfXO5?G8CMC9ElT7 zM0wMD`T08z^Y8QhQ0O3qF7*k2JS{w2i}>7@BTVYcRl)Z4g@QNI5OlMt{*<~1xcdh- zMrl=U`fE*deqpGPi z_IjBG{7Lup)?s!~j2&x0PaA9>dO_B+CKV#Ab-Y_^E@`m@dxU;f*&Lf{)%ea|zVpX} zdj(bR^W!^y_}{Od50OnT4$l=>i_Elca4*hkL)V1Z>$#5NiDTZwI!Ej?zl`$#BvYj1 zC9qQCU7o&=3P$aa8%EvMiXm&qn(RDnlER7LG|f^&?Dg4PNfLFkSQZ-kDSsZ=j6bj9 zPEHjtrmf9eqw4+^yg<^^qu4VTl||wOxz|Dal=V`cOK8;RN>T4=R>U{1i;Bj9X%oeQ z)Iw4EOYWOC#26$%-EHrb6!>lK{ORv&(QDRE>F~K2!7D67H6j#>W+@cFglqr3KVs47= zsZnL;a|_TW7dO{%E9hmZ7vC0b5VA+(GZ$ykOWV=qxMi3XS`FH~ouHO}FXlNT0Fb}X z;R5RJ(#ye_&T^y!B$Qur6U z8l8#ymQXz(>=>W}&nxi>5Y;cOtqt;Po54CpbB1-`w)S;1Q-!=ra;;)SRm$|OU1zam z?uSTM{E%UxCN;U#;b4qbs=$3+-T}_F{aygv+Y?sQE=2KEa*%=)+dtueS`+7S{<;Ap zcDS8M75)0tp6sA->&+`2h3BDex`d>nz4OB$97b$Vx*cqNan_jBd&nv*CWi%W#6D`n zoAN4Ogaa!<#pU`)hs6njG>_liiB3xs8OOJf@jz#Li$GRLutSZHa~y(f93VTenZ7F| z(1YFznHqq5d%Q624{Tz$V?I9lMtuaoihqWfK5IFB@kd7mUB27#DB&@=&8AOxt)`RP z(0Y0xOZm%Q?*fjdg8dIErPlb3SBu^6iAZ2A1>o04bgnAc7(w#M2wmmNU{ktm+jmm- z=jI~Oyv&M5j!y%|HD}r%6nB!* zVG#PGb&>e~BiCFl3+9Y_byEm*UY2ov3cvnDRlE%bS#3y0fb4$`CG35jXEQ`T1gxd= zdJsA9aU`i=ZTLjc#Bf(Ns(0O@U|L0GXDtuExV)YHRwc6MlSQk&50`|xisATWDI*jQ zemRm?ln_4j9z@NO6R~vQFj{pY85>5-CU~8TRobTKz=+X8OEmicq7{TYXX}Yd-sECM>6)8A{>^b=Joj1r| zO4qe&Cnw`{SnCjoCUMcxoWXE8FB-W`d)isA5-*`7GvIDHr>p+Z>=yU^3SZhXZ@W=d zkKuz6zpu;=Xu_`h2YX#N@}DZvF=ZYgI*QWcCVCEQbkV**OmCw;-%!$=dbrxoECAKg zIO5(`nM|xK{bfE=#Cptix~dlMp9YO&^SSbRoo0pRJA0q#TFn@U4)rTfRs zMzX?1Q<#0LXcd#FbDU|3tg}3H9k}}r;7_9nVOTI9qKHj!`*+n1cQ;QMhx*VsCntBc zY;jais!FdKr!C`LE0NJz&U&!t>CnXyGy+9fd3KgT#ejK^Y%VmZ%gnu$)eAWBKsci2 zWCYOd>~Ho0GB|bCQC92Dg*=Mcj)RTnz92X&=dsfWE=xXAw@kd=XoV4 zZ#!9js^Lc#Wxm7Vpm6*JE1CR*!np+jJM+uas|OyEy*f(1)$0u*I(%Hi$A#3wy{QLP zocOx0^Y;IcLi5i_+iL^&b~`PRVAstz!$Uuh64-5OJ?0M&eCIyxsiuu*#6`*>S@o)6 zh!TUlW#6kT)0%Hsrm;s?eQY3^gwGx^ed_9qanYHYzUvZhg8@5{+gRSa^E$TI;#_kq z7k%I_5YYO|!>RJSn>%w|k$$Yk(7Qnm{u>)-?iSmAofp1ArhIT=LKVNQDk|}kCm7;n z%lWlpGs^g-!Y~m5-<2}1>P^+qcMF?hi;^m8TDyB&PR?c`+aqk?iUDSju?Hl|PIl1AC9kTIR+ zHdJDPp2&(64_@Wh=#!1+YZ*=ktW>+eWVB%LKw>+sqd8GfUo<|6I=!6{Px;n!EM{$0 ze=hfnd@4lm*Y{g5PLL@JAte2dzDf(vjG8CjZgtBE9)+JIsG+H$G^jc&j<9S(ix9Gi z{ADuZdSKtmXzvjqzbv5LjwYR~B##<>J?`H+Ur!y}tbUD2#u^%1EbYAyv;Gsml-r(- zY(!Gsn_b?K>?YNwr)=AA7F!2miS|yls)26BQbsPu=ZQoS@gkb|`Y+#0ns$;jDp|U$ z0#l=%cNVIHOF=WvUAd8^3XYLbmBmyV;)S+(;bbTB#}v6zPNplmsX|S?sdmcyjXA=| zqHd$P-6iPB;tG3uH>q4*IrDsQbM|yCll2S>$}TQ*)?S~Qfu!w|8Om%FtUS9 zLZ&B4D8w0h$3>H}q}nbde`mc+Cl!+*MlAU=GZSFMwsj zxs&wt@1J(~wUdwVs3H~+0DxPw&whi>|BN5X{pKdXM=%dO%6%%WQgUMTLtp7}W@YyR z9iPqvzcd#ACt$)4pVO@1LB>U!Wb_S^t;CHlzU!rE{gd1Bp2ETZHy+^w zEO<kn6ulecrtul`*DH$OwQU~w#J+QERy9}$3Zjwxzd#gFMpc_$a! zBG6LpF8Ko#HHhq%zISvM-3-BBSgvPLfQVLJtJrm&j`oRdo+*-rvsxY-83g}g_Ym|~ zlhFSPhy264?>j~N%BJJvJCy3Ru2Lzk-IscmS5t3f528^UF^raC)SIZ+F0pb6`oZGs zNV5=wtV=GfZI7Up7y6ypZ5kTNhXCdG0DpsXSbdmZduL{R{6e@Emk}z;LkTbvb8u|b zQRMh(9HI%I9}bovup-MC?U`}U%ZjdkGE+bh+YDOpE+=K=)m)uFiGjLwl)x2Lzx6q( z542Un$7M=!+|xaE%x5;x3(cakVcOv=QC+a8H$`T~0TK3K=oAw^o)Gn_YY<6t%hAw2 z8m5&IJ0=>gelt+_V2q0fSXJE+W`KA4^JJxNy$Xfn2^R%YOaQ)*MHr0A?a+)kN7z!? zrypR6U5XrRWaXLy%G>_Ps-bSVS=oP!KS0NlyPpUAAN=u8<=bj;I9OxY_zMDlqknUf zNOBpXwLQa_5lu-YRVyzhKmGbK}3YCz%WOV&7Nrc5KW>q*S5DPHgRpXh_fv5To@tS+l#FnN7u2VW+GK6X`wG zYmA^^$jMrXK*QYzv*6V4H)aZ5%8r=ovL7J1Ynd@BT{eiL1%-W>|HVP2z08j~BKtk~KFZ!3p`f60^nbBWp`h^OUUDD8&F+>0VeqtI z@93iIZFsQOD_v6oi&^KS@mAfUny5*$Z^@4b2pTlXma zN0npxPmbxOe|Pf-g)1Xhq)yU8VZOFfs$h)wVc_q5DONxKo-YuNZEY4Mk+&{wjgKxa zMu7I+7|v6;|JYUGr-KI+{`eRErQrXnf?Mc7h?5f?4}9iaPA2}s8XJH!SQGLu@Y;g@NKw@a*R*hJ#a=d$YhHv-F_wELjCOMjr99s{MkZTpV8P?Wy%Z8DVv!Cd_P|va zob}#iQIe-)B=c$$@ME_X#rL^iJP$34{RY?hx7q;cB9*6@t`4%R*RjUYTYW8yzrQmy z5NjN8tSNTz-YPj`BbY?b=lb2)tdOtPbUmsFLU?cbRend!os#+eGt8J6nu_5Fr((9q znUCyb+<$J&9UoY=Qjb3PvxVUV2-ZF-?LylV-mF zFj4sa?|aw%Kt%&nF*5^BNO6&hpvXN-07VDFTZ85*N|t*QK{)G#rc=IaDh7VxvU`oY z*fikGi#}YUKZob5%upmfD^J>bS`Hdh%1UTXIf#jMJ^VTPge58JciK#9{f>7+%oMnm zu@5*ISXHAon4XU;D9EQ{0-@6b$robb#<*HserT~Fxj0;t-tm$lG~5-WtHB-V@ zH2@*mNQhiT4sOVz+h&}*(mz-Trd-e zPB!k?-W0D}fQ5r0e_%Z<6)%lRHWY&dV6?ip9kzLMj)3yC$!3EU#|NmLbH8%4*em^IP!0A zetUKKdXo5=*Tl(2S8M0$hnAcjvUuK$pkL$yO^EQ6C|@sEHZ|BVJwsdg`}F?Q-G%s{ z)(zW3YMLaX>sS?5Sx6;Ao;VdM`PE7q!B37fzIfo)oUW{qI<`z?M5L_Y&S0I;%e&Jp zl~+5quj;dh;d`~n+|ejJmR&HuwU#dzQ4%cEc>Pp>S@vps&i;Ua1036`rJc@|0Y&)CN#lvsd$UQ zO>e<`Oxz7Slpz^@vu=2HcLz+bg!4bfRXmRZg}+(K&id0jk^cZWJ(5rw|2-zw_zUG( z)q9tauDJ`dOpd?#klt$~Vn=Trt;H{Bn*um3 zs(Sy`O>%6wZ}6q6V3609nZ@c^c|Vfk-~Yr1intbbv1?yQbS#?hLS}r|m_+^Z(RC0R zG{Y$E=H!_OLB7<`=g6^DICc52h9Kq*|H1CF)vArgfuUE6=(NMr^=xHPwaDKdp6Oii zd{N7#sP$Uw+qM135P!OH>%&^Wxxx1Eic=3S06l5IzZ#p8={t2IEz2z781Pl(nAPjs zb`pShnIq?XJZtXIm)dcs;jjfqytJn?CvS*!xxG1=^l9sb|sG;{q^ib zPx_jPKvx85zI2RGUTQq~wIR;Ne}o9C(*bRk&}iXD8Qo11?)VMV#k6nLX}!#P0IvDL z1DeA^D=Y{t=?IDJBZen0)93)m(?2C2`4JP^~ zSnevlP+oH!^V!v^Y@GbaX1cV_WuU35RBiS`O^v3fKi(~)IcP3QvMs9-$oYRGH$Qk$ zzw#T))EOb#<3l4ogE3#WBO^2(`ofz*yE-&xQRq`?~x*Un8| zDckh%7el0&j7xfcL#W|)XrVSu@>ymEa$084vtUq5Rhu-@_kNGmddO3RBs%bmB zozfqB49qVGH4qgS45Hk^6KW26I_a$!^zSbn=CMgIEz$ZXa^b0oj*xQxbXLpc)C?xl z=w&s@3+KZjdJA)xYz)J#ZS_s@7J`#R(%5kxJ9gH6gB!2g&lL7aODLr&(7*P_t+6;)MiTMnQ3y5+EvUh)s$W3=4iz9W8EMFC+PH`MPGsq`)K@|}!Cphq8U z%r_pHmmvr?Z%!yB_v?6ihTG3C-!Oz}y|c$OYQ+wBht#1EXrUz>@~P0n{o9>eC36i% z?@#D1*Zxmz$CGSwGs!%K7`|kckB0DJ#=q zBt+BsZjnR0a{%qkT{|E#XY zwG1th-^_;!V+QeVjtQGNwf#OLpX-h|@q!Vk0EgB7UJKW-?`=$& z7cBq!Vu;d4vtj3x{tnf{r_FJ)Zy)+ht(cO<2B$g8_FRMoyE+L)?cy(r_d1^=U}wkg z?dtX!U-S9<@QJe0V>1Tut+&MiB=5U@&C?-x2FG8+5w3-e5VtSsC}wg4ICrsh!gs3+ zdyavFxQ46wX3`uh{ZglLP;h*+U)d{2>u*eIyPxXLW?xlLPA6VBm^rnx;Tv>RP;=Bh z$MaAg_Cs=L@AAdAp%-zq8~p6)+-yx%a-6wm3xOXtt{lnD zHXq`&$Gxjy7q-I_b=QXw^@4ALzMh|>@kRsXd1}w`(}~hSCy)4niKd{R;_K8Z8hz+F z?Iu^b&7n&(+fGQ)p6}u>i*MHtC19n2$q(o~Js^v3pgqa3s#?cB}U;S!3|0njC*YR~W# zshG>k{BaQ13bz}*HbPoNF$?rD{b zAVCB`2gZ-q!}Mwz$<==Jnl4R-H5qNXQCi^*ZCZ4=a5DMZ@XPfNv^=O|T_tUELkRe4 z5Z^Byupx*c}BjjOIR!5w?ZBaoMkb(m4Pwd zjGUwc@>#%=gS2TQ^kzd8QDBRL6u-@RCYwx7<~*^1aU{pe#Jq)4t3v7vc5aU40}6&@686pyP|1bXNRdAUyc_p*0q#Q2&W?H zv(qU@X{obuddB*v*_}Zjk{nk_1hN$_!=MW5CN=sh$=dQf=X?v z+#KjA%eRUFjJI;ufI_)@^mi=>nEb5%R#aa7ftc{)@*duX$ zsN($XjgPv)vy7yW%IKdOip9}Y_e7VWb?pp%6jXTE(DrNPX%Buxqf=1_V(q@neqxHY9TO#A%8?P$WcVP}Cj)j$n!Nhgq;wCrc)$V0+zKfA=ucIy&9 zm(Miya5!N`Z`gNz;~Lj=NH7}xVrMQPINI=7j#LXpmpV>U!Qn3T~CaO{n15f51t z;gmYE3i8$2Dozf&=HeyLQ)4Vk2;BUds+HELD$#|EAkCnd==@Dt@BkUPA+9E~>+n-cY9u^(rTRe^mI&ugUa$IHC z2tP&E2Xjbrqy68;z??(FHITh_Z8a*s<&g*dI!YD|3XlpolBl|dA z_U!?3j`e_#7)7%n6PG?G+X5|1qIBB+sB)mb?*#LJKHjghFI1{env){=F+sVkSQkuF zP?Se~gkOL+zvnh(6^O&osX?B*O zHj&f4pLgU?M`aVTtsFM}D~jL$sj@^>z|rRB-&XP^Qin{Kf-MTVeTdw_(ByC$Pep9h z#Qln_pi0M6Ef{6mqvNY9;_)6i&9jH`eBwGTTmDX|Bnsla^s#m#`sKr`L+H&fgZ(a_ z6w{2#;gqt z#F8>UHSc@gDoc7o$mO)2su~Yl;pTxWfzQF^)t()7p!gHxu-SXOXZ1u$%8`eMGK`Ji z^@G=}wgvl~S&d@Tjd`K0%XCa<^EKBr!#}b#0I-^*@TX2o>7b#nwk&m48 zIQ{wQ+;z5gp}jgma;cFV?anIIGI%;)ors$eZ;p8syeKAzhd-n(jS-6-l%q`;=SMHK zN`tM;Fq%cK&5vt(rYu@(0VuJcBWLSu!tOWBdatsJe=I(DBVlVo1I2>bvkfksEdXS> z#=dW+qa!>=NgW%Zf>|e8jnm^3~_DPRIoWZE4rE zCCV&@Q{$IOnP)#o*c?3s!h4AAJ$2u}u!qeJOdaGOMV2iVyrz!WkhurK#hreHod#mH z!Qe6$nCzQ^iJlha600DoUT-At+F-uK#x`DPTE$WqDbfL#`1gF+oX<1?hHi@@&Nm&E zvUAfAZ7?Q2s?22T*XLYHxE@L{-KGHr3VB#L4%&Q_v()w%^FDe`ng3UEl$_cdZx&($ zN#O1zBMSbE9!DpmL$bz>@4XfkbZfH78EX?r@DOzS5r{@JJaLW|TUb~O)@cEJm0|4| zgU0X_p^m<1=U|>ys<_>Dqoo10_TgcWh{|T|)ym*)FH=GRB%wK`He3JNrpSLm ze?zDVBgXGU)fKSK`9Y;x*kMLY&DDf>pIl&CAeS(G$p4%LJNzM3OcN3n@0qpXs z484tjguN{