From 4fea2ccf61cfa7bd8aaf04225b1feb137d1cfb7d Mon Sep 17 00:00:00 2001 From: Stas Date: Tue, 17 Dec 2024 17:38:21 +0300 Subject: [PATCH 01/10] =?UTF-8?q?=D1=80=D0=B5=D0=B4=D0=B0=D0=BA=D1=82?= =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=81=D0=BE?= =?UTF-8?q?=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=B2=20=D0=BB?= =?UTF-8?q?=D0=B8=D1=87=D0=BD=D0=BE=D0=BC=20=D1=87=D0=B0=D1=82=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ChatMessage/api/MessageHandler.ts | 7 ++++-- .../MessageMenu/ui/MessageMenu.handlebars | 24 ++++++++++--------- source/widgets/MessageMenu/ui/MessageMenu.ts | 10 ++++---- .../widgets/NewsBlock/ui/NewsBlock.handlebars | 6 ----- 4 files changed, 23 insertions(+), 24 deletions(-) diff --git a/source/entities/ChatMessage/api/MessageHandler.ts b/source/entities/ChatMessage/api/MessageHandler.ts index 141673ec..03525056 100644 --- a/source/entities/ChatMessage/api/MessageHandler.ts +++ b/source/entities/ChatMessage/api/MessageHandler.ts @@ -1,4 +1,3 @@ -import { UserStorage } from "@/entities/User"; import { MessageMenu } from "@/widgets/MessageMenu/ui/MessageMenu"; import { TChatMessage } from "../model/type"; import { ChatStorage } from "@/entities/Chat/lib/ChatStore"; @@ -19,15 +18,19 @@ export const messageHandler = (messageId : string, messages : TChatMessage[], ch const messageText = message.querySelector("#message-text-content")!.innerHTML; const menu = message.querySelector("#menu-context")!; const messageMenu = new MessageMenu(menu); + console.log(message) if (messageText) { if (pickedMessage?.chatId === ChatStorage.getCurrentBranchId()) { messageMenu.render(pickedMessage, messageId, messageText, event.x-100, event.y-25, chatMessageObject, true); return; } - messageMenu.render(pickedMessage, messageId, messageText, event.x-100, event.y-25, chatMessageObject, false); + messageMenu.render(pickedMessage, messageId, messageText, event.x-100, event.y-25, chatMessageObject, false, true); } + else { + messageMenu.render(pickedMessage, messageId, messageText, event.x-100, event.y-25, chatMessageObject, false, false); + } } }; diff --git a/source/widgets/MessageMenu/ui/MessageMenu.handlebars b/source/widgets/MessageMenu/ui/MessageMenu.handlebars index 264e2fed..f65fef22 100644 --- a/source/widgets/MessageMenu/ui/MessageMenu.handlebars +++ b/source/widgets/MessageMenu/ui/MessageMenu.handlebars @@ -1,20 +1,22 @@
- {{#if notPersonalChat}} - {{#if notBranch}} -
- ... - Ветка + {{#if noSticker}} + {{#if notPersonalChat}} + {{#if notBranch}} +
+ ... + Ветка +
+ {{/if}} + {{/if}} + {{#if thisUser}} +
+ ... + Изменить
{{/if}} {{/if}} {{#if thisUser}} -
- ... - Изменить -
- {{/if}} - {{#if thisUser}}
... Удалить diff --git a/source/widgets/MessageMenu/ui/MessageMenu.ts b/source/widgets/MessageMenu/ui/MessageMenu.ts index 53f3ee94..277a70f0 100644 --- a/source/widgets/MessageMenu/ui/MessageMenu.ts +++ b/source/widgets/MessageMenu/ui/MessageMenu.ts @@ -13,18 +13,18 @@ export class MessageMenu { this.#parent = parent; } - render(message : TChatMessage, messageId : string, messageText : string, x : number, y : number, chatMessageObject : ChatMessage, branch : boolean = false) { + render(message : TChatMessage, messageId : string, messageText : string, x : number, y : number, chatMessageObject : ChatMessage, branch : boolean = false, noSticker : boolean = true) { let thisUser = true; if (message.authorID !== UserStorage.getUser().id) { thisUser = false; + if (ChatStorage.getChat().chatType === "personal") { + return; + } } const notBranch = !branch; const notPersonalChat = true; - if (ChatStorage.getChat().chatType === "personal") { - return; - } - this.#parent.innerHTML = MessageMenuTemplate({x, y, notBranch, thisUser, notPersonalChat}); + this.#parent.innerHTML = MessageMenuTemplate({x, y, notBranch, thisUser, notPersonalChat, noSticker}); const deleteButton = this.#parent.querySelector("#delete-message")!; const handleDelete = async () => { diff --git a/source/widgets/NewsBlock/ui/NewsBlock.handlebars b/source/widgets/NewsBlock/ui/NewsBlock.handlebars index b6e305b2..8cf3ac5b 100644 --- a/source/widgets/NewsBlock/ui/NewsBlock.handlebars +++ b/source/widgets/NewsBlock/ui/NewsBlock.handlebars @@ -18,12 +18,6 @@ Теперь в меню для сообщения можно перейти в ветки. - Date: Fri, 20 Dec 2024 22:05:03 +0300 Subject: [PATCH 02/10] =?UTF-8?q?=D0=9F=D0=BE=D1=84=D0=B8=D0=BA=D1=81?= =?UTF-8?q?=D0=B8=D0=BB=20=D1=86=D0=B2=D0=B5=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/app/ui/index.scss | 10 +++++----- source/widgets/Chat/ui/Chat.scss | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/source/app/ui/index.scss b/source/app/ui/index.scss index 8fda282b..405adfc8 100644 --- a/source/app/ui/index.scss +++ b/source/app/ui/index.scss @@ -5,11 +5,11 @@ body { } :root { - --background: #090707; - --background-shadow-50: #0c0f15; - --primary: #101723; - --primary-shadow-15: #0e141e; - --primary-shadow-25: #0a0e16; + --background: #0f0f0f; + --background-shadow-50: #0D131D; + --primary: #172132; + --primary-shadow-15: #121A27; + --primary-shadow-25: #0C121D; --secondary: #4f82bf; --accent: #afcbee; diff --git a/source/widgets/Chat/ui/Chat.scss b/source/widgets/Chat/ui/Chat.scss index b0478770..4e5e201f 100644 --- a/source/widgets/Chat/ui/Chat.scss +++ b/source/widgets/Chat/ui/Chat.scss @@ -262,7 +262,7 @@ textarea { right: 0; bottom: 45px; - background: var(--text-over-primary-shadow-30); + background: var(--primary-shadow-15); border-radius: 10px; padding: 10px; @@ -299,6 +299,8 @@ textarea { width: 100%; min-width: 100%; height: 100%; + + color: $text-over-primary; } .emoji-list { display: flex; From 0188308b20eaae3845520d228e9a627f79340352 Mon Sep 17 00:00:00 2001 From: Vladimir Svetlakov Date: Fri, 20 Dec 2024 23:18:44 +0300 Subject: [PATCH 03/10] =?UTF-8?q?=D0=9F=D0=BE=D1=84=D0=B8=D0=BA=D1=81?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=BE=D1=82=D1=81=D1=82=D1=83=D0=BF=D1=8B=20?= =?UTF-8?q?=D0=B2=20=D1=87=D0=B0=D1=82=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/entities/ChatMessage/ui/ChatMessage.scss | 4 +++- source/shared/api/ws.ts | 1 + source/widgets/Chat/ui/Chat.scss | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/source/entities/ChatMessage/ui/ChatMessage.scss b/source/entities/ChatMessage/ui/ChatMessage.scss index 86d510e9..0b7ab238 100644 --- a/source/entities/ChatMessage/ui/ChatMessage.scss +++ b/source/entities/ChatMessage/ui/ChatMessage.scss @@ -38,6 +38,7 @@ $messages-container-width: 700px; &__username { @include font-settings("Inter", 400, 14px, $secondary); + margin-bottom: 2px; overflow: hidden; text-overflow: ellipsis; @@ -157,7 +158,6 @@ $messages-container-width: 700px; } &__avatar { width: 40px; - height: 40px; display: flex; align-items: flex-end; @@ -165,6 +165,8 @@ $messages-container-width: 700px; padding: 0px 5px; &__img { + position: absolute; + width: 40px; height: 40px; border-radius: 100%; diff --git a/source/shared/api/ws.ts b/source/shared/api/ws.ts index 549df1cb..c58f3c3d 100644 --- a/source/shared/api/ws.ts +++ b/source/shared/api/ws.ts @@ -25,6 +25,7 @@ class wsConnection { this.ws.onmessage = (event: MessageEvent) => { try { const res = JSON.parse(event.data); + console.log('ws', res); if (res.messageType === "error") { return; diff --git a/source/widgets/Chat/ui/Chat.scss b/source/widgets/Chat/ui/Chat.scss index 4e5e201f..81a4fdfe 100644 --- a/source/widgets/Chat/ui/Chat.scss +++ b/source/widgets/Chat/ui/Chat.scss @@ -114,6 +114,7 @@ textarea { } .messages { + padding-block: 40px; width: 100%; max-width: $messages-container-max-width; flex: 1; From ee2845887f3ca120d83147c0b2f5e96a702a3f37 Mon Sep 17 00:00:00 2001 From: Vladimir Svetlakov Date: Sat, 21 Dec 2024 01:19:42 +0300 Subject: [PATCH 04/10] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=BE=D1=82=D1=81=D1=82=D1=83=D0=BF=D1=8B=20?= =?UTF-8?q?=D0=B2=20=D0=B8=D0=BD=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=86=D0=B8?= =?UTF-8?q?=D0=B8=20=D0=BE=20=D1=87=D0=B0=D1=82=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/pages/MainPage/ui/MainPage.scss | 1 + source/shared/styles/styles.scss | 2 ++ source/widgets/ChatInfo/ui/ChatInfo.scss | 3 +++ source/widgets/GroupChatInfo/ui/GroupChatInfo.scss | 13 ++++++++----- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/source/pages/MainPage/ui/MainPage.scss b/source/pages/MainPage/ui/MainPage.scss index df30dc68..a2d3c1d6 100644 --- a/source/pages/MainPage/ui/MainPage.scss +++ b/source/pages/MainPage/ui/MainPage.scss @@ -133,6 +133,7 @@ body#main { display: flex; flex-direction: column; + gap: 10px; } @media screen and (max-width: 950px) { diff --git a/source/shared/styles/styles.scss b/source/shared/styles/styles.scss index cc969d00..cb655f7c 100644 --- a/source/shared/styles/styles.scss +++ b/source/shared/styles/styles.scss @@ -110,11 +110,13 @@ $chat-padding-top: var(--chat-padding-top); padding-top: $chat-padding-top; padding-right: 20px; max-width: $main-page-right-column-width; + min-width: $main-page-right-column-width; background: $primary; @media screen and (max-width: 950px) { padding-left: 20px; + min-width: unset; max-width: unset; } } diff --git a/source/widgets/ChatInfo/ui/ChatInfo.scss b/source/widgets/ChatInfo/ui/ChatInfo.scss index 1f03f155..9047cf55 100644 --- a/source/widgets/ChatInfo/ui/ChatInfo.scss +++ b/source/widgets/ChatInfo/ui/ChatInfo.scss @@ -9,6 +9,7 @@ $delete-button-color: var(--delete-button-color); .chat-info-column{ flex: 1; + min-height: 0; display: flex; flex-direction: column; @@ -43,6 +44,7 @@ $delete-button-color: var(--delete-button-color); color: $text-over-secondary; font-family: var(--main-font-family); font-size: 20px; + line-break: anywhere; } &__span-online-status { @@ -86,6 +88,7 @@ $delete-button-color: var(--delete-button-color); font-size: var(--base-font-size); font-family: var(--main-font-family); color: $text-over-secondary; + line-break: anywhere; } } diff --git a/source/widgets/GroupChatInfo/ui/GroupChatInfo.scss b/source/widgets/GroupChatInfo/ui/GroupChatInfo.scss index 96def528..783c5b48 100644 --- a/source/widgets/GroupChatInfo/ui/GroupChatInfo.scss +++ b/source/widgets/GroupChatInfo/ui/GroupChatInfo.scss @@ -28,8 +28,8 @@ $scroll-bar-color: var(--scroll-bar-color); .group-info-close-button-img { position: absolute; - top: 15px; - left: 15px; + top: 0; + left: 0; width: 24px; height: 24px; @@ -47,8 +47,8 @@ $scroll-bar-color: var(--scroll-bar-color); .group-update-image__img { position: absolute; - top: 20px; - right: 20px; + top: 0; + right: 0; width: 15px; height: 15px; @@ -56,6 +56,8 @@ $scroll-bar-color: var(--scroll-bar-color); } .group-info-header { + padding: 20px; + border-radius: 25px; background-color: $secondary; @@ -88,7 +90,7 @@ $scroll-bar-color: var(--scroll-bar-color); } .group-content { - margin: 10px 0 0 10px; + margin: 10px 0; flex: 1; min-height: 0; @@ -295,5 +297,6 @@ $scroll-bar-color: var(--scroll-bar-color); } .group-notifications { + align-self: normal; margin-bottom: 15px; } \ No newline at end of file From dc44b5a781e864af2df6655b27bd0688b0dcef92 Mon Sep 17 00:00:00 2001 From: Stas Date: Sat, 21 Dec 2024 02:00:15 +0300 Subject: [PATCH 05/10] =?UTF-8?q?=D0=BD=D0=B5=20=D1=82=D0=B5=D0=BA=D1=83?= =?UTF-8?q?=D1=82=20=D0=B2=D0=B5=D1=82=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/image/start-branch.png | Bin 0 -> 77682 bytes source/entities/ChatMessage/ui/ChatMessage.ts | 4 ++++ 2 files changed, 4 insertions(+) create mode 100644 public/assets/image/start-branch.png diff --git a/public/assets/image/start-branch.png b/public/assets/image/start-branch.png new file mode 100644 index 0000000000000000000000000000000000000000..9c8a930e0bdf7a5584b8774ab8d049dff33a4105 GIT binary patch literal 77682 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 JzF>0y{{ZB2ar^)P literal 0 HcmV?d00001 diff --git a/source/entities/ChatMessage/ui/ChatMessage.ts b/source/entities/ChatMessage/ui/ChatMessage.ts index 0697e25b..5f00b91a 100644 --- a/source/entities/ChatMessage/ui/ChatMessage.ts +++ b/source/entities/ChatMessage/ui/ChatMessage.ts @@ -132,6 +132,10 @@ export class ChatMessage { } } async renderNewMessage(message: TChatMessage, chatIsNotBranch = true) { + if (message.chatId !== ChatStorage.getChat().chatId && ChatStorage.getCurrentBranchId() !== message.chatId) { + console.log("sam") + return; + } const placeholder= this.#parent.querySelector('#msg-placeholder'); if(placeholder) { placeholder.remove(); From 5716d119238435f330417eba0ae1b5f8204e1b02 Mon Sep 17 00:00:00 2001 From: Stas Date: Sat, 21 Dec 2024 02:35:00 +0300 Subject: [PATCH 06/10] =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D1=81=D1=82=D0=B8=D0=BA=D0=B5=D1=80=D0=BE=D0=B2?= =?UTF-8?q?,=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2,=20=D0=BE=D1=82=D0=BF?= =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20=D0=B1=D0=B5=D0=B7=20=D1=81?= =?UTF-8?q?=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D0=B9=20payload?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/image/start-branch.png | Bin 77682 -> 65901 bytes .../ChatMessage/api/MessageHandler.ts | 18 ++++++------ source/entities/ChatMessage/ui/ChatMessage.ts | 10 +++---- source/widgets/Chat/ui/Chat.ts | 2 +- .../MessageMenu/ui/MessageMenu.handlebars | 26 ++++++++++-------- source/widgets/MessageMenu/ui/MessageMenu.ts | 3 +- .../widgets/NewsBlock/ui/NewsBlock.handlebars | 2 +- 7 files changed, 33 insertions(+), 28 deletions(-) diff --git a/public/assets/image/start-branch.png b/public/assets/image/start-branch.png index 9c8a930e0bdf7a5584b8774ab8d049dff33a4105..8f3e4ce1a228e0e1f26b43f56cb2ed0c9e440b6a 100644 GIT binary patch literal 65901 zcmeFa1yqz<|29lJG=g+mfHWfAAfnPDB@NQu%`mj2MJO%O-5rt&5=zIA64E_Ge>a}P z^FN*k`PO>Z_q}Vq>mAm@+1_*Sy7skywSR73D9TIYVo_irAtB*DdU*c{64DhEBqVfM z5C-r>XhDk#2?l=nWYgD(!&=~YFE^izmOzqzJB?#S0aYco#_5Y zw3mbu*mQLu9tlFaw`8c|tr09tmCi*zxZ1=@D?aLq_lpV{_v+OZ6$e{=wcXyJRIf2l z3QqFEPGCt~r~D3U<9CrVlYWG>@@HZoRekV$Wcd)u(9#~uuOF8{4`&C7n9SDA%|O-B z5zU9k^`xe*2DvUp+v%;@ami`JdwSiM?WjmE0{Oy|+B*Z_1W2y86Lwi?n1Bj7iXPw%qkH9>o_R2lvTRe*a<56tc_k`iA^k1=+7^$eCCDKQRc_(`_82^_^^)kuY}a+? zF6Ln6h*qNQY2T-dvp;8!7G0$hUG+(LS)RSZugAHM!~;UZp$lNemBr8y8=lad#4fld z{K*IV79A?cC-pTs)vH_US3en2F`|JbZXvlz&Z7LNLs3N9FObZgSp6WDmwCBRO-k~VAwL!x>l8rI}j(_zwO|;hd;2;>;Ugc9F|z28w^Qk>NadIbZ=~Y zUx<;5E6CO?nX~-D(+T%MXw$Xo(Un?|3po(mVFXFb@v zDg9FUv)f11s&JwE?k|TvGhCC*%H%N*dzN}rk-kHs`J1aF%6o{sIQBOKN6c!HJPDUn zr^P!vH{7XL@9QQXlQll&)c%U&&=N~V8QS!u&{5X6tL<@-eJ)l`E5)=|eTb7m-LQ0g zaGxE<8c5BSG0|sx;||=?le3;?^2N|JD_rI1`a}@;W-sUg+7(|?h$NZJXFA#2ZwWdu z$1sC1O{PlvrCgqOM8nq;fv>D_H_F%KRncW zB9i4_8c`b8f4^E{>4ul0k_xAaof4+%Bc-cZ*RtN`tUTdQv6q^A*I`nOF%q&O6>($x zOWzlnFJqs>f5`k`+cF8EZw;K0e39{7X*u{k(e-{_K_+FcFS<9|EW-@nl(v7-T;80D zyMC0a4696_jMYZ1y79WLIy~3oxz)vl)w<3akJ2vFPm5Nmw1=^WwqE6M$Ai0`%3i#O&Ij-I?T)jL zX!bSX+s74$qJ|?y#p*R0?5Odmw~&KSCravuONJRxiyB`xesA2P%S-l8-WA99?egRD zweUTZ7?&{ikH@*~9~i`jU-yM`euHlyzMdnpP(z<}x__f`V|P08#>&lGSHlf^IrR-y zBdSQvi0_2tMxrRiXGST(QmsB@+@}q{-gdwJX^T)eHMt;HId=pN?;UHk@fx@fJZ;m3 z$dc$IX4i|Q7qdh;M3W5Y^mz}Ls00mGa*Igc;Jyj?f_vxV+m^ShcaCR$+wy3JxF@VU zzrZPpEa_$AY`s5Bx5U3_XUI~Rkr#-4{7~*OH0mILvNdmJFT?ITQ{REB13>m35- zLz;*q)gm-BDng2~9S6n+-l!(AyRc4{1{Oc4PIs_s84YxbUXIQ?EEaJ%-VN~ysf&6L z70NVeGi6g*{0(flNdc^To@hPGyw>68mCR&%i#5h+xtUf)0IKjy{r zr!^J%ETr!7c}a0j|6uyNz(;F$ZCx*8FB3_7$@W);H@m_o!h<3OsG)XWSJYeW5@ux- z6y>iak(n}CE{Wa|8S!A6?Vp{0)a9ZODeRSZJ3Z}K7XHq`#IGmO+Ng{tVVmD&rFLll zCTT3`5_`37u7!hz;8D%kde9hjY?;kX%e->Mt*Xe-vHbs#ZMP7X(1-I_<5&7gR3UyiS$Tjc=8w|PtOQXdRSvmTAG<L8|++%ZC z*`_AE!UMGm71bc$pZS!yQBSh3581U273tYsB*#k8)G+0h(;tD1d%5;#Cq$|%SLf#O z#8{8Okv{{#yu8T66}Z+7$@K@WNFU6QT0Br3`!iE`D%IYsGaEhdKlJGm*X^_KYi!_b zP23Ku1&g4*%Vvh}AF*GV^wiY2%Do486d^|HkBsHykeGln2nh|D0tp=`Ap^f6$dvyn zKR{+gLjCm|@I`{mkkI~qM;`b*`*{icp4Iv56ZLf<(iPxugut(BGRpbeS5T5s&&%kt zz;{UE%94*B0iVi-_C`k54yHDaj7i^NzynO%hZ+t@NF=w084icSByje!xHtCj6pJ4iyV0zlEq$Wfop)ymS^LBLh`#;-R7fb!X6_8WA+UU9S# zzM(FsNGEAyZ$!t##=*vMLj;SCj!ww_xv{{L`w#xE4*X5{hN+{YtpGc_i;D}J3m2P> zy$L%fKR-V^$6fZjcUgfqSRLG~9rayVtsQRu)yR1}_l+D3?agc*&1|gc&f3*CuyJw} zzH#HMqyPN;HBKW}v;XPI+TrhM0TX0D`-Yv9jf4F^Z39(>&YlV=nz4}xKF}2qtx3*my_@!;)sssK5SC!!psi}L!MfEm85~GPS@U*fn`HiX}HCmg7j~##SW31sXz$U${aLCTKKpBD}p zr3}UHT`wOOhgDCbyk8^0x11GBbxdUG$n4|i3x8tUFC4=ZAmt*u{t&Oj$n6YAGPDR9 z;k#i6D}9eK`0V3#^RHhrPGpo>`rg3|o5eox_uj!lmw26CeFDC%5{0J4jxe!+^JTgS zO2~_wy{hl74p*E$pWT_3I~%g}QxnvPK1%M(VKhRqQ`JkVH*C<=JESWtrqy%eNxm(v z$-}2}|Dt~W9=)Cx`V3*pfCePW3$;DH6dOg_>%@#~cR#quEvWi(c%&gB#~A*=VpHcR zWC9h{jFH<$d{XW*U(QWBB1ng2BOfzIH{ObM7B)&3#tK`U`(<6x=Qa*^V^I+SD?lzn ztIsp#PtBI};F3ut$Du@NK#nnFNhCC3#^}-FQ<*(MYI_(|6I}{Q;g_P1$=aJSc`K?8 zh2iI5J5cfSRa%vD462d52TWHl+2wQ`)95oa5U(q;6M6Xg7!W`v(L9KNS8C!uy>!*| zW-xcCH_8C6=*CcIVnCwNSHC|(zl_fsAV(LsUULF66Vx^h2-c+}bi-~L@c~$&mS#2j zZl3&jKNw$*)iZgRco_(vA0;cC z76gcR2~IK;S}pxF$;rhM5X$gg#=dlv2_Q$4q{i~B^f;p(K%_ctQAGYh3H-HkKsR|d zr@g=iNpQ}x$~Lw7_omlAJ_-<1(63ekbFdnIoBScHd(f!pop| z`ASSPsn_Q99f4KF+o1R&LbQmr($_(ku@&_ER_~xHCQ8Oisic*%ys+Q3LggFym=~+H zUo-l_&};KOOJMaaU7<3~|7+yvqH!Kj!HWg{zW!!vu ziw-0^(-(VLSBWUTjY92G1(&VYEld!~8~8o?OBUy41~B9vyKl^wjrkGK*DaCoOM(3V z1Rlr>R*r>u2mb*z&9apTwQL>C1+~wFStDGaUJ9Fw%;0Ni-g802q)e$ir!I=n((!2XwERw6q-NpgU0)$!Ca@RnpRQKyR&OG>&G1!zP^po$FjA-e_jAR zPs~yQB+HcrHBN#RZgIULwiS5n48O=E6n@ikclXB|1)2!Hqr$?$XBL6)jNfz0^3T0Z zv6-ybhi_cf9|i{osOh?~#=CCanNE+hHrthsS&uV*Z`Oo6q^qoBQ*j(Iy}zK#Sdj2X z>egva9ctPT3uvO0j+}s7>pnoW9J)2Ur0t-xrRr>@renGC3e`gvzK!@3;0&smPwj~W z7_=UqZVC4Gi`TCNNaFJsdbS2qT8-XJkCf*gcshOL(36kh<8`oe=Wz1dmqPvKrf=<3 zl-(i=;}O|m+sCsJ!t_VBFzwF0P}U+@C+&%?K%zfUCRq)urI$_q^AcliXbD`$doHS| zo4ESDHeBT$^)Rz6u(VyIYCX zbf}$&?PAuRT0Jw#ubRin$*X>>t{*VhJQK=FF`wX)$N_cii*k|!Bh+0(O>y3+Ud`>#P zw^G>btl#K^>}2H)K6p1hC5e|)Gvs=8OxJ79NWYah#>TUM&3$L_+jOih4P}Jr^bhBr z@jpsm_ZYDfVdQogPF;Zk*)TvN_`0R$z+9X7&wC$M@NHY8j( zJ_RxTJeHd7QwXZaS;qL|;?t>=8r9BCmxLTHR+2Ae^}FzCVeBvqv5)_pCJ)Hr}h>YE)Pq?Om?dgbaPRc zirl+)C~>YXQuL%!U~Ij1n>{noXU?zX&B^g$kQ52cwdhQ=2)lw$42hn_ge)h_wWlYC z)b(!Z?~HMd4|fYhX!*^byDsOYP!HyL^;XzSa%?w3=JHOx;QH_>Km4X!Z*V|dvZ9i1 zV0iF!)NR#C<^oEE^!Mi39CI;;T+S*k@6FON-wb`7I+_BXVxQ(5WoW$95B%AD3zgn% zFSFUhreRwizEaX7;Hh({*KsEUM@B8$MLV~+!jP(`Vbab74r|cO&-?z<4d-p>)|$t9 z;B>R}wHUd`GWjID(|fhBi9+XH^9BbK9;s%y$GfcJ6)Pnj@ND=@Y3HmjHXA{-mi-Hk zL(7tYN};tn*aUO!+7r2pZJ)3Nu@X9Ki2xrdg}B|6j6g^o8z{_=j}0Zo1RxSYNwtW+r?{2TR$LoPz{b zEzp*x9w}mMn=!yM=~-giG9469HUGXuyG|+fK|lsmi9|!iZh1nW?{aR5YUNUhOy{0S zl7scI&8c6Qzuvn<|xa6K?M{5HmihJ)R#>ET&N>0)iJ0zM*+Zcx~5HW+`8Cw4$3m1%9oG{$6hpq^AFVRMU`t{3Y{-TKM2 z4LB#MNZm{P&8dLisaI1E)2F8{kB`Qq)U-?3K31;|Qa0OnvTE`){CM5j#8$Jaq~qea z^@Aw#sfizPPbA+K>GWIO<8*g7Xqj37x2kTQ>oo)0vSGr`dkI$X7Q<64hp*q<2*|t= zJ?1y7=hO{dYd(LF33zo=Iyy<&V{1at<{oa2`SQKQB*(3SCM8kP^iAho0gSStlerFp z)Asxv!uCyHQEf8s(jgJK9Pe4m<-kt%x=hc#Acr3O!xaxPH|WZbDw9MI>Xq)NUi}Gl z8v&#`I5O-t1|@1L>sD2BB-6QE@;M&$v)wfTo$L+80C$Q8hlX%sbe)wdWP|X$1U=Ue z$5djfSVsjfwp$yAG4Ekd8sKpjJ)RW_AYy(iyMI#00}3;RV#2GH8H|wV?~kR$=rE1j z9kR|zw`$08^$4iB3G*;`9NAXbS{l*oDCu}^rWN+zWxf_OFq;5w;ATRH0KIR#bD{D&NYuSm7w?ZsB{ z!hFjs+i!=uTlkTyAs-3BkFpZFjG3#-tF56o&YPTo2H=G9OtWV0=f|I3eC88&zBcK ze8Wgi*Yo7((%t+r-ON-v+f-a$5cs6eZO*cJl!rQ@o%6lRi8wVIbW}+YcCisTg$)55 zSR(gFy=`{EBVstH7BUKP#KSp$jeNEV=w7-)1xdaX>)dhZr0WaMoS{w&wlkZC(cs#j z>6%R>n%2Vd&;-ZtkD7XUby-ng^UYdEkId(LsI7i2)pnWWir*X49b#?OP^+4r31Ke4 z6I`j3X@;`1&9c<<#TAr$Zhc{x_9s%nBh|HcBNK2mRd*gq%P~CIS4~Fp5$G<@g2M8ZAGHjUX|^< z#=_g7)-R8l^T>EkyDLIFdzA=W;R;|vJR!ZwVjZCuhcm4jFI`j)z7^;;6n=X^>2K(5 z_f#8Bepn4?-Ix@MOrMpYxc6P{dO z1=oe93nlUK>_+;_%gaAJa|+`*XyB}$LuI(w#p=xxvo1jn?cUqbfYgbA!ca$)$kcJ{ zSBo+Ne2Uin!26+v3p6z`y0bBUkusxwxz6m>ZNh5?WP3ZxlG#bbNnRVDuFP#k+cX@@ z8%@@8b%_sZg`Smj>C4NbLu}&DoRg=Yj~K;ZR-CS;Z>*ZNLvIqHi{v1IGr)cYfr<;ZGut)l5Y$ z1j_MDWWu`w`DE5-LfKgh+V_6E%b>+B`6}cvVmbQLgbkKwf%7rs@#)cmpMJt_y^2+qEu>;`rH&X>y0hFkre$>MFv4*@Kc48YcT zoVlkCm2F+?p0LD$pBbIDJDi5b5E3uT+#$;cdb5^|fR#v}TlhWp7(dj7xP2cmhK1mb zbxxnAnWDVNX~8pJK0J<97uSm)fUT1zWyL|&oU`q}vw%EJ7MJG;KiCD%x|9zyjk_;f zm31w3v)BA+Dg>;KDA)`vVp8|wFfC*a`$sv8sZ|f<;ozI-E5vAnVb4tfIB@|uL$9mi zl!SaAxEm`~7ZDNe(au``qj(xn)mf@G<6!oQFpoLb`j%oN^FuC9B1{&nD5lVI@69??^YS{1dKL@*}-O9!A6ud-GBD4r=6(y<$9 z)vwzfyi;HpTRC}hB?=JI6k{zLwvYglyl#UPMo{fKtxKR3iB6>_G^e2c*$Am^m9qy< zG_kq-9(197I`bwz`}&dV`f-!ng07+tDFYM}h1O#yg=0v|fkdv!*N+6-rjEO`*4mlS zMAv$6RjxzYj=akcpFg)YQC)m$Kuw2YP{$*$n6^0(m)Rt5Buu*uV& z!ifXQGkekw{8@j!UZZ;^j0=>JWH*@Z1ije%hU}q)m#i6t$9DdBLJBlnwp=JK{=(>?wL=9qfJhBR!Te9ri(lC84KFyo)^%rUX9>C$SnSu z8i|LQQ@~HZ!Aw(oxVP+dc+w?!n!EwH^Td&HG>1DsiD+oI6l1;iMmiT-b3Yr4Pd#Fw zA$1;cYcICe+H;(iiUFe0H5 zPRg3~dKtcxVcqD+S?^FzTeglC5Xvk|9iL_aBj?xJ`S%vh)-|hIW>I67P5CHPGPc>K;~O4( zYp3k)PROLu6pO=ClT~7?^5Gf5>G+a1b>Z!=CHnisYOFLa?(t{N%9}`0ikYnpsTZFn z9Q))nyJzBtRCQ-oz>I!x{` z3~76)s2lEb9!^rb^?#fGq3o?)zt!C^NfG_b{L7Ym5A7;78@w-8!+6dQPo4rsx{~}1 zx|(!46Kgy3s3E&%XrNV;NhXJ_`ZH-~NZUp>Pkf%$mrI~k;XME27x zMv;ed>$9K!TGawm!MWAMT%as3FY*&!xGgXEwjh{`Y*x1I%36&e4#hoV)fuLod~zDF z!Pl)cBR_hE?QTH@*A0kAr!AZ6i%-J`ljDp+o5KxFR1RO2tW;PW4*Ht$aIa8T>O$kn zPfqrxtCwvuYlc>CbnAt3jfB`APOgLEEUVq@G+Znlt#MEc=SJVXOMMWI)hEkaxJEr| z|BVdoWO{tNS>%wW_h$|;xfk~9Eo&H%NFjk+E$ixU;b0O#krm9`btFbRS*vKk8?!EP z(m0JIJ>owyE%55FxL6<1^}0ja=z7B%2gzX_JyqLZwT+PIAn zPoUl3(K}AA8MdSCef?D2b~Hb`wt)!2)lvBS>SaEnEqF(wt(uOTQzhUNFC`A>eC24~ znQmQ3VzX)0@USx;5tP(rHd(`^K5$moOOfgnNJwbu@tV(S&nA(o<2$rZ2_P+4%Nk|@ zh3!&!%@SswIomO(gUzp`kM6BhtjB72G*EeJ@$FR-g+}HJIx~QBwT z;SWL)Jy=ZT*#Ge+271&3K2g>vcUBD6H&&{~La8{JP@UeHOnUYdUqNK|sk+%5_azV_ zd!Ut1l)4%gV52Cb)V(c7hqnmqt&Z{5?lkpXXZxh_mh8Ki*Q$+wMiLFtIB^d}Bm<2o z-%7Q`F;3ID6gJPLpfFia@a!l6hEEO6*Ri`97^EP)`7qY9_)CbUes7bEKj2lB)aqDQ z88ur~OsMNb(g;`IHMDJ(_xpO&+gW`W+`w+^(5ko!h<~Dp{kft!L34$fl{$1%tz>uR zdXH07JUq^LmJYl2q<;Oe5At@kbLo^#AFpa$WaroGA%0jQ7&05i+Zt1l-gNg(L!4>I!V`Zq8;! z;mEwEYV?)5I#;V2!_$-FWYJGi@lg7G(e+Q zvY4uk$qdx#3F-crXy~r@F2F+3y!xYThB^WFGu*TM`(tMRIGft~wVMVHiDOK|WaxO9 z?aIdiwL>%$SzF#BJQb~Boi?gD=QciOwZRTn(rJGKSZSF9Rpjwg?L?- zDDw5zM$0TC)!+=L+iTa=DPJF-`6=7o4YtA8bq!y9n(pG&QNs|}+=rDh7*J*&70e2{G3OPV74PhYJedegTYGEmiBPH2G(s)Z%}&*6I{cg zwAo7d@EFR8;mldd+!1F}M@&Ld>S{N#Hk?4m5z#s;*~S8+(EYAKYn)&dz2Rz9)ptWE zbQfRX2gCGEUr$KJz}*zTMrNiGF&E&RV`jF~5HO8$UC-lVmPDry1~t|-=S2MG{MZ$` zkDE1|05vi>N9E8psouqXalqV>j^MP)QH!ROvFZw>idFkrCAZ+-d%D6XWF6+o0ZYZU zg}OH3-jJS971^0iFFe}n4EPle*d_CObvyc*NbTOJg%iwz zJ<;=Mn&WV#B&K3!E6n6+^r6tq=cFJ7QEHvKhW;lqsxkUn&!+=A-8mgK?dAsJx}Ru) zk9V7lVzkr;!x`-6$Gi_|pF(8{s*|*h+Gg3kz3)3ERgm2!x!uhcR)QnQRAjA%b+3EP zoCRM5uBh$-wc(ktcBxydwg_ToZ}_-&l62y!G;G*II|N-eeW0gwXHAK;J*)g)cm23| z&U&CYHY?fQh(|$n??!jc8r~_q{kTkSxjRPN_$R@k##?D-k0q#UAL~G;3=`MBK_jJ% z77Z8M8x74w*R3q`WVbK3V*-XIU2n<)2VwevPoebAsmetg1n(AH58Njq<4WJ8Cb|nc znmj!rosai`^jeY_0UM0WyFE?Y0*q}J*;LuGLae4uZC$rpzEl&V?flO6z$_y$fN54y zb0*QB|2U4R%*#RkLaR#)9Z&d2V|9KjxSIm?6V>BxujP)6Av6eW?WA{B%U|bqg2wyp z`Gw|5F4r)uE5D^r=hv)f<-Lcx&3bzp_I;|1U#yNAQL?N0+})w&&_zz;y?9dXlbK2D z*P?E2@{+ix`kC*xuV^AA&xmX42X}z4kg{prO%Cq~Uf$u#KBN1FP_nyig+)b{RRcWJ z1-ujet~F}{-653!31Xd{H?hUJrlbWIPTWY*Ns2*F|({P1yJC>Mvzw zSRd5x8RMvVJGb;S7l60NM#toO6pp*@=pU|@n;qnC8f)=50xGt5x;Ub2cNV8r@YLI4 zHIKlr2M}l`w*!q8g!fHjjppBVn%j|o3t-|Rm;|35Z|T^52ZX?&*UGmb37n^)geFh$ zo;`m-aNO=fKql(&{SgBuxMnxK5N;4kqP@67X42I<@~$iTU4o*xp4I_38}gXaPiq3Q zF`N2*!$>%9{`2gmJoYi;Tz;~wbE3lH@n5$N{XG^L!NueXy|)Qe9Z72p6u z7KJ1%Tz~3m-&b{^juXBww@{lPS5|19$DA_onyblrg^xCFPGdM7Y>a_h;+&aL$7EeO%1ehtV2J4MW7nW=R@kWVwGxE-j>6=Y}yJn$we5^0onasAf z%m=H*R$VU7fzO3kTCPlpo+$0RF0b3@YO9vlezPS6>v9TdS>$nd_LyZ7&OG^esN&sV z_vPsya>m-^k~u+PHt&X0Gz~$ql1Xi<6>4Y@^v6_%>TT`c6K1!eQm5?;c0h0$Uxuy7 zRo(u}?d%e?Nzdgxj*o=B!iOsktcSzEK?o~LJ=|bmj^5C9XLwfO=}GW9CJ?%Dj2FGR zCRw@F!5k<>s!=(*KBNo2DRlJt=5$IB4Ibxn%CW6B3-*9J>9HRy%Rd{)xKxuGXxO17 z^#dn4CHPmm?;6kRxzrTTMQi$(bo1rq>eSpbbt{>_6==}OT4AYPdAE5steG0Uw*#=nf6UX;6b%%c(VOjx<6hg{|x>)|`_(1JO;;*Pn-f%1i<> zIPBjO53``f4|82>H)=tL%zjAkQhPG>g@FdMq=(0N|BD}UXUNIP4p+%hzHcK-kW|Kn zUY!`75?v5dz6RYskVO($nV_x!q#h*l7#xhGuvfJ%R}2q}Wt*~~?vi*;08!CjRJU7|B8#e3iEwmhrZ}L0)Hg0Au zLr1W3OTS}H&r=rIj5bII36ZGk8m^}I*jMehZ=Vv7XgaBCQ)wRwSE*vm1`e?C|+Y*MlZE9r0-xhZJZ;OZ85uuR~M$|o?`bZRs zU9(baShMc=DTxioJTGZ;VZQvfjLOsy^@82NAc_YvUTMUl>OVcyQ#v$IKR@7k}pX|5+gy$1EEoxAUW@}y4#a6 zf>unQLK!ZU_P@sW8A#%FD#|S%Wzya&1DzVQ7L6zJ)N}F9{HyXk z(9YYlUO8;pEov#Qy+lo7;(BVSi~JYw$6s@V(4%xUH3IG`_tAb+Xk35dMg3ldmjMtixj>dYQq5fYCz`rhhvztX(VT0^#?*+CcSJb0hSlTnE=@n zD9&)n4Be|6;~l!M&U{a1xeFX0)1X^IbBVL+_TW%=uL zq{s+}5D@)Q#en{gWzphYP`rB}|AU3^8poGR4-haOC|(D9>!k*9Kr%AzrOC+8&$4ap z)g3QQMt%=u_I4>)TzvlV*GMz~QBgugl5lA{9fWGdD=3S;T5bz-2`GdiPU=Lz*U1+ksM93b5XujC2 zMrf`-L|71t9bxzUA!>8x4VvLBmGvY|_ zLJJEGgoyVb;ys9X&%fm*!X-txq!$Xz|BGGH#?um$_IpT395~JJ5*mMMH+M3zv@e2v zX#S1!CYN1vtM^0<6z>_D`af~d|90x`Azv@t*SI9fl_2&S0Sd$94C94X|KAPDiGeJ= z2QSM>q(}E}{8GVpsq;icfD)Hca3E0u}@;=jJyemV0508UYIemcI}{9Eejo7AW|dt zNgfFa$?4I3@uxrl{D0di0E8Wl2I%+n6e$^n;rud!l@U(7Cb4Uh;u81eBs-5IA6dU_ z>ymtLrKVflmKF(HIP`G6FxYm^-=nC;ZBOXDFb;BVKf{_T+*fgnC}s?q+T&e%K3rAMIBlK9d-3wnwa>}=Q@W* zsNzMn&kX_|WXY-dg-dT*d(ub{n=5r`4gB2b#5aK7ua)GL#T> zIo~+HZA}DSF4)h&R!7hUL6^U^4+No%F4V&aW%Mr<^Os;n(B(X|_q)Y}pbLU7=Zrv@ zy5~szZhas;qjTT)H|qmI7X)3-4^&?w9O>U>#@{;y5qJ5`uSL)W5vKdM*MbPsU2K^n zqPiDb=7^~7zjx3tGXy~w1YOR}bHtg^ITF8FABZ!f3vE<11YHnxIk(IaC(`Fg{H{(A zC(^%((sPgybU8-?K^H{6%Y|W5F+{%0g$^!)E(p4u+oOnlmvbb3S0{*kmkTX(1YHnx zIk&eE2@K~*{H9JIi1ern!=wnhAn0;_Y>!A_I7i}lb%Mxu`Aw9bgM^^VIT8rEAo5*) zcT~=UgNS^Wb0mJVJ`i+4(B(V`hRAn0N8)#Nf=FPv*fK}tyZk0f&p|@aeIT3Nsm4MoP@siNF5kL{@_xwuLw%D&3Bf0fPaw@l}Z zdv9E<6D`A3`CA&z0e9 zV3B<`YRDcI2xW{pT?m*~^+UbI&w0(=SHMhRWL){7?#UYeup57Eaj{O6(0N(>9))UQ z7B@rHPITehXN_coKqxs)xmSVLEn~&B(D|kpU#Om1k)>Ar>vk~+6R1VSSJ@k!FaS|0 z97F?peMUrpR!;we|7-y2boppPaQ{$$A8jH0_YD7vCXKQYG&eqS(K0vE8~gJ1mY9!N z2GFlyfJz#mxHID$k=v7O1baK|vS0kml*xQ8Hcr1Yt*fn+Hh53+3?Mm75K7z=yGWpj zel=Lrcg^AJ2>Q=(>;EzhM;SKY2}7edO1+*x2JTx+{s62&h<$b#P%(;lc)K|xh;tS% z(=yHc=D!9DdiqGOdnc$l>2xENsVtrR3`s^(0<`GRN&t5;2wDW+{uYPc=XCU?SNZ?l zEnA`IPhZ>hJkru*^xJ13{@yd6@r+!GbWdVb-czgpSS^1SAWWFKnl(J*ZcuU+b2+ZF zr;2QJAQni=SjX+xt;fpFe2yPMw`fJ`^&K)ImQ$3XpFeqh?& zb}G!k<9~{JMPY#3ySZiefrjmYVpZ_jjepl3iV>(Mf9WOu{bjLaNuU+HBDb^UA-+n0 zrs}VB8)$Bk3aGhInH_c3=|5V}O!T2EbRT>MTvjMn1r)Vf&MpGPx&=(7_xU2$?=RE! zUI$tU8m>JXN(ev;=B7+SpgG3~pr(V?z~g^yi>C^}7=K>q^LVg$qd`Q~SP;Ge_EW&n^&EQ|g(@*ouK zd*uIxyCVSC@O2*cv!UELqZdcEKhRvlO*+sDm0B6$xd{E6Bm=;HQSEsq13>i~pU@!a z?{T!R|7$1$09-2saWQ8@xe6d8MWzC*JER+c-#H@Z*}u2v60k3FO!966$i2k|p>#@} zT{4&~28;?tF7Ur-N)5o}9Ncv_l+0iNp&MaLK>uP3XS=dpCGVe$2~0w47eH>HWRMVm zsskMjGI!(b?m;_B5vvm`Dlfry96h&?bpxdpI_978$7?_y7*RCPHS15;2SAaH1ep0InrY(M zx>w()!*HMEvzjbjg$?FoGw8az#2wgmW7Y(DwMEKy%6k~uRjy`L?49hY>_Z)9-J>y0zFXY-ZSE}Ix0Y&ocma3h%5uc z(l#kDIzwbp0C+w$V)5>8KK7CWSad6@FaX0G1*%)dy?Ju>8X@pnOrgcwU&B`i_}5C5 z?DjXLVgbM)h%r>C&+1$U>RgHb0MyAW2ap(@89ftpkQ<<<%pj_|FO7v=nV<9r-j_`e z?ArwKk`$QQ!6h+vFooUy3$3+5GBFKf&qpTe+yjx1c^)U##r4-147{iBY>lgP-vfs4x=}gn$j)*f z^Uf+Xr~iKG>ZD6*FT+n0p&7DSbxnalycK2lTF3n*<921HAO61}>px>mAbp=A0FpC+ zoi(qKfUJ+0FhIs-v-0p?GU_g*8wbS@?lNCg_mYhoo4p|?XX25P=_P*s3{%b64vvm&SJ{)ScQOgZr$|q%BMJN(2P5K64)<+O`}xg^YNajK=aNWogTBJ< zbT0((3Q^6oxH5nRg+(nRIj46FU97M5&SSTUZN$L3Kn-pibKh5ib(`&IvFH)LhqKh+ zEoF=YVL$n1I6dbk)2z|HPJ%b?^mH_`^2SEVsIOURTt?m1$zG3DbJDgLZ5O79PfdG-KT@q(jaMNZyrrpJ z4zXDB4vAkO4X8BX;8@KFTas zF6HZuG}d;zpfKFj2RIKyqYFSs?!`AO4q65(W67fR+TpW_^Z0jzWLY6GUJoO7j^^MRA8Z*!MIb$u8$a# zGGWYH2JcuH!!pQIz2;XBpp7q$Tj~R=9l`9{XbFE}{ z?M^{}=IcDU?RM@3s@E80n-fG}x0_nWp&46|ecMOQMVv>%bHyGMQFgx!F;IUsu%`x1 zhT*_YD+Y?6OHyrsomK}F*G|!q&XfQf`j)t!G;)Vuqq@R4&rT+$X5ggA&STg4G^z0H z?jVWKNgd+u`U41t5zjqP*mYG)u*6nfWzLDAxvPoMtj*k9MV#l4s-b4s>GnGeug|)U z8FUJRYO9aoL+B zD**r$R+GMMl`z-?mZ8>KW>EYF@#_G)qb}r3oOjh3YMR@+EsQBhdoHm?!-Z^b^tRZU zsl9qzc!k%~l5q~#gZ8eD&ObC4OHSz3HY%v`?su48v>KS1e2RT0scHTizA$aBs(&lz zkW=9L=BQKX3gZ#=@%1-u!`Wuel-AzX$i*7XK!GF@O-A47ue##O9WW|?q|jd0;q#_` z_9EEhiuAWBl4hxea5g%N+N$4?^H%UWuP95N`z~GaUGIr8Q?)XES=Hy0-dory`^+vG zNGrOb#vGXL;s;Fn+3Ong_5mjWG{*I>Ljn-ePva>z>!=V3MUQ=ZR`D zvCV8zL^=OB4Hi9+miob33H_pSVNL>pYh>j1bYQ>8Uq!{Gk9_^(nOR(M`_kZ2L}}V+ zT%;g3Rp)4qa{sq`w86%MLgBGtapfp^l~E5T7t%=Tz!xh&YA^>rW2~5T?YQzl0{tXh zIH6KFHHK`dGv9np>cs?11>rSqT-lNw5-~r{FHVu)QOIf;n0jnA=6@fJTvW77iQl%I zn;6hRKoN;EFOx*Y*Ma3x{g9e15(Z;n>A~Vh;J~J)B$PVWP3cFrXZ999O$FY!qh6~t zMO-wFV&PLFF~vnr?MiWab)QxPy4!WQ+m+Mo*N)Qh7aEjZ!Z+CN4Ddv1R$Qu8qTK(^%6gSz~7PM*JJWrT2vgOTG0yay2uEHR{R_ zceLc4@QZjH2vf!lW$*ihNop12W{Z0Dbv#aOOKi+st9e$6LVmE=PFZC~W_aQ^R$o(( zsE;lE?B|}@KQzRJ{CO{npJBDKA1sq&O`bh>fplWIthiwcg383Xn?4}afK=^LS7kjC zaLUET_u}y z?uAG<8>>shq&+gLNAKjQz*N4+d_p>xhdE$mjKkDF9W6x@1o396j0Yt!{m%LP>xr_w zr!Oj3$o!TAJDjYk?9m7Eg3koUcfB_H0%FP6<%>@g#D7ztw{ znc4aEMN+?1hk@)SB4I>4OR~d0D@6hkUYR!gnR0zpNt|PPpcB5>1LDAgiup13?strj zS!n^=Z-+}!2aSt;hyAd@+)3V+{ckT{pRVB5}rOVcO!9GZs`C zP@16$6wZ@n!wV`|G;oEkF^8E_z}rJUL%y1G*%w-|h4HarF--@_p0v=!i?X>^C&y)S z-X{(X@4;PRbf25il{4NXafPKm;q9WElSSS?qgM>;oBA56ZL+J!uf$Iy-F2RfuV=GD@}#AD6aZ@VFL}ae)lN2hPMF>>4|E`J+zV2 zD_RgnODMYDR87X*v#XF?5|8#AP@`?^7rQwBvgZOz9;rH4>f2}P8n=>^7l26Dm(;e7 zTVQ`WSe6hHYyn^dIOfHdOGS@glAQ!dQ^|kOG7rw^|7yHx){^9^Grqal?d^G48OBl^ zNzjI>URVm;dBa$#*P%J}uKSg)Z1hlmHWoF&g;!j~d}wkhdc)WqITNZ=TNqU;t6j4T ztsf~+VTU|0Lhn3hx;bZYRBpiC*1KJVqYr&f)^OVXiCZ)CdNVy|r%=(Y@jH{M{x)X0 z-$D`CrA(=)pl24mF5(`2Q;fEWiBr^WxLg4Ui1AlHH$lm#9lS*>XL9j_w-@4oaYkN2 zO2bsxHUh(;e4fDwUa-EijgPACC4?5Ku+#k0Fk&IYP+h1v5^Q}HG1|fh0 znJzcb^H|S@gc}S0G38}`2A1@p_#A~e)9$1c)dgrxEt(wXoj zW~GyDt7qh}rxr*}YHK=p`OTJC*odN-+4-o?W$x6tXk`6YrPQ8>@FVmsEbmNK&c??h zXE3izT#|xBoL2H5CrJQ(rKbl>_M+nZ0Lw_FM9yPAC>c=0n z7S(pEC;lyuBk{w&Bss1uQ!|i>k(Gvjf9)#@>Q&B8qLTm&Ufc^m;eQieKWkE2sb9;( zLp9o-O}=T6xfMef$cd;DkJ-Xe;aHgKWR()BE;_YIYva_fCLahe16KMKTuI}9yB!Z(LNH00NQdnKX^R;pl=C@*|TBaNay|+l?fFi z(pd%vQrlHPN;w|V;Y1-nD48A4*oYBTcQ2nG*&Ri^X|WY%r|{Nnp7bt#=o+Y9WrTAY zRR z86tvitcnL0Y)e5o)?oAAyvQ@rx8zcPDhea-xE`1$swi4!tfWJ42v!H`8{}C*A*9I4XFh2v9c`V^|P!!1frERxiuB&^d zuiQ?@UUG^ZZ%@r(i<$J=+0X%Oqp9Hz*@c1MCsh{?-nztc!qz;qA~tqUTv{6JNb(mg za&i+n_CCxm375sxG{*(j3!8eu7eNJatvabV!}}Vu+CC9eYsF8Oey^dbsG>U2@Z5ny z9gC#ktSAi*^?D)J+9FJAkbM$`UBy&XFFSNof+)52$LJdZ(RbRY-V0?syEyGe4jU0Q zS_F#;!W|^-Es@2_GVg-bKj4*lPpgqQr4eUVk)>iq3I*iv)G7n!UEi z=!_Kdl_HM7$dlV~u|4n5H2oolDtxhM!89RrPC!My0OVA()Dzc~r29Glr|B|>v_xI; z*l~*xF-2~9Sad!khC!}UDjRq4Hxq3SqG`=1!l&l<>}vcxK{-<#Da@|+!2?gy8+56Z zF3=-1hsq!GRE$g*$8ZYO-{`js2;d=vC4IX$v0ZDp<>=?#!CG-pBI|=n1WqbU=z=(8 zjiBLtGe7Jx@Y2ap@iN#WvIpo5qSxtCSHr;>{*H$t(M7D`Ds39bj=s?H3UpQi9;gE^ zoyxj?0BnTH0M{saCb0TcDBvMGIZyq0#})iIW-ku;rDdx3Di*y`Hb@BgO4NC;2XEw^ z0mY>Av=P*3Cj!)5y#EUnCzfB21l~~bOz{A$SXdcUfM+#c*5croZ=EU|(+b~tWTk!T zydU&$%XF2lf_5|L!XBtP|CI|I76G1DG>Wu5Kmd&Ge^BzhY2Y_nZomj^)#C$YR&!So z&kBrd!P6eGURU;^;)y^sCTi^MV5EWK0UrxFs6yGyGDR6B8}^L~x@=e3J*hLF0UDDQ zebI@uR~<=G{bSCKwTFPC2m2oE1%$MCe%-vDZ3--3r_CuE0Zt=5w6{G=t@ZgcbpCNxK|SOL3&qvc8sIhZMICZwa{)q_~Hc56TPbblDaKg|EZgL;XhU zZ7=held~0SmlX}UW67=1Ee1%iY)(c(UH54qo(@dk=4IypWDabPzXbTTtPY@n-DY4p z{}ht|G#Ulo$^UX^Ko*k0G8HR}I;b0duN=DNydJ;;^2TPUG0Frdr=wN|6RWoG4+s2T zns}xJGXDs$Eb8m90gWeXu-jhIBJWSQ{B`{y(6CnAy+5V1JGgMQe3F*TG>hAA$s|MPSmti{* z?dc9fTy4z$<%0j(lLpH8-c!PNu$aPl2WG=AAl;@wz_qD$yE2ehI2#r>JBhF+ukXwp zJMy<7V6;*c&w)VHOP!=5BF7aSS+Ih01wCY|kAbnMdniqq*ET-(Sz-`gi z*AcMfcl^@cwh?QCfbU)Y6(OQVxXPQo;o&ly0{g4EZeKf{u_@iw!ON0^GXW(^ZD=Zqd;l?q}2fohrWOEw?+JMfOw=rsQ!m5k@A3pz=;1l00;m~G% zrM1`WUqR%9ni2lGi)(m^V8ihb5L$-dkFn~{wzcX^lMgU^PN{lwzh5KK*>xf47VkWd0aXuSM!#^ck>2xPEd>>u*G?y7eB<2`=I@&5CUtiG zUK`8an|tPI4jjDW?QL!7=0+bN>$OpWE!ly6W#Rq;ypE!j#~!tMQbR`*9CS7;siyA1 z(q0-b5#5uui~+}o#M4F|+a8on77yHgzVup<6i1O>P%DR5QtvU9C>9rHniB>RM$dKx zblZNGV)Ej?rjBH@w%ccQoK`JiM=lgXx~)=~vA5^E!0E~}exPnP1#U#E7H`WpSE-=) z))KDzyE#UJVMVQ!M%OiH9quV>_4}Z(Skc{KkvQ%Sq9OU)9qzRAy<%4%hu$@29%MUT z)+=EB;+ZIm_O+#yOQlM(S=>zzx?&nx_B`y`HF)#7&h7ipbTzql!UTiF=o60Ck5;N@ zvCW)6XL&8Y#SV4bHR}wgX|%*G)QdIw>BE#}`hcKh`fDc_g~m zjB^*e@L|JyU80hT66WJl#iyS0$&U#?t^P7wc>k=SAk*$^V>S%q&%PR`BEXQoufDms znDaVs_6vM&3}w5~#^^ZUGQ9i=b2FMj$naxwxFFQ2@~ipM-3q~~-dsrF@xwY9bLZj( z_GTV@tY0bLd==4a{)Am<2zS^6C-z7`yo!Bp;I6^g(D>lmnAgQbuUnjQCrzKSmF>Ae zBfE=!kKhAw7OkBoYF&M1{meNW${zxlj|kH33P^dzedy_t>3tt;4jrdQoIgV2tv*Ei z4NH5CW;sVaYjA8=%P^K_$4!O2Xt@VeU&C$h_y^`?x3WB~}Vr3!Z*)P%Hlvi;Gn+Z$y9wqRafwQIh=Gi0O^{>GxSb z3V(Dze{6t!PY$&G`mV2blj)n1lV0enp8vxUzaw|kN_-r+MbEE%62)@}SaFlj99amsCTFkdoT z`{*awQe$G*`6#;g6t>@U39q>G_;tMaI#x&miAbB_7!@imLASv^B3-cXM{H!=~a^z0W zPVao(Lr#dJFw&@K)6vmsl*4Xm(@ZS}L{Oei$BVQ3D;VrJ>v{iJB**cy<{p9-h4&SF zTlNI(eos?yM@6E7&x;PRm;R#~$0Nqtn?m&}?Afs0FPT7hy_4x*1lrz|F=mquMBY5s zMaLT8b7xOHt=)%YQV4wszZH%!xejnc_YsIxpnIN4#K_yne94;Iu{k9$4kegS?MF z>b-Zddx#Kj+I5MZ@h(@O`a#Xlf?6Uk_I}yjv-{z0yRWFWi(VQ>_PYnmUSL}~d6XUX zNb1q!VBSaY;A6pjl{J5nat!!>v(G@4)F`HhY1#F$W!oLo#LEhtN!D1+;E4wl z!xN0{k{OE*Ph_%Wx_HdP@H_{2G^8O8^NuYt8V;AhBMuTBy{X=oD6_|JY>@}vRCS){ z=ziyJI(eEe#jFYM#_y-%$Gg4=mqN%Uq^G0~y?g#vN<01hXpv63 zM4BVAt{K;C@eZ!G7(_azY@-~Ns0Mv%iR?RoU0nGzzrMh*lDYz4$eBc(xp|PD`!?@M zxwmpf&_}%8ywwMFWP0trs^5FQB%hkTReCG+6YHK5oBKR?-YOp4scwfhP#e_A`jGWW zSxYTXBY?tad%U!0MX(c~5hem)KhV!c=O`Bs)~{;8Gv(E9VZHz2e6 zZk$S7&&y*kxnibe%Ax0SZ<@X_%gVDa7(+>;5824K=2g#zAHauzBf;qEckL5cbeQ|I z1=>lUNeHhWZ@Bg=?J%6OSu8S%$kB76$I;`0Vwyz(VP{Dl`7JiiFU{}4x(H+22g13r z_a9!_oV`^vdZ+pOy8$`AjPR2+v^6|64|R%l_UT;ISbEgDZLMfUl+A+mG<*o*fyZzKeWahoh3ip&rak=82gM|zb9K?#C z+$%ytla%?R_%rw;`Q>7|>+MIZN91+y+69arYP3ld!1iKiv8-O}!^E)!BDSsso{zKt zFy@>hu=;ZKj$gr&+sYYVeLuNXkCm8Zm-TmR{L5xbbL)kxsy6uCJmV4*NxFEtBRd|_ z^`Wp`sIFslxfM?;S}Mqb$mILU3+LGG;_gY^b-cTJzV|%ne*7Mh`#}#S*s!&yN4}qJ zk1snF@!sT?_(0qDqVEd>5kgbKNA`u;G@ZU>V;GL%0v`|!$%>%89{)D-`eKUn>+}l( zVTY?P)EHDMh4FDKN)^b2^UH}sjCxC!0+v!|JlUPt-|WT(PXrIKXR`MnV>pVuJaI_T zdMYcI>p9Ew2emAsZ(dZsAd0RJ-K|FQcgplR`_?Y;vO68sio4_gdZ02sxaL@f?x2ps z%d3~QuM#3x9`IHn2g&I!Ehk!6yqx-Y`k2d95eLdOz6u*3_KG4sFB8HlemZ7jdr3FV z3givSc_MBu=^J?<7A-pI=V3q&p9+kB6OYB5z+_-FE||V{x?Xqtd2Q=a&qsWfB7+U0 zmimUe$D^F88zSGLWA~%?U#Z10^fAkdS8_3N6-e@+?Fp};scS9Fwhgw!wpN^ToK{Qj z-*Oxge8$hp-uPv#wuIF^s=H7JIk{+72753P^6@}~QMidoVMy*fxAva)=Y~m=p5p!a zL3x*o(_qe(-9heAlTpakJQdjbLP$UeHu6&B;}iYRuh62rW`qs#=#aK;oQg9iqzo-` zThk)a{l>E4V8>mgZlMUoaXoC=Y{BCb(YB|Yw3j&6%Uyy>?M^B7iEhqLm9Y=YPqSNG zB1A9JlfZA?vj}-co>08Xd)?yc<&Cy=IoA6E_9~y1jNzXrt_|N>8E8>>1M#u2@&ozV zsk^GzJbf>W3+oGe7@@#NaH*d%u5w8j($u}C!;y5*{)E$ns;CMceqyL?XygjcQ#V4{ z4=IwCx~{bp1GBr=m$Lt#r%zQELci?$ULLnRg+IU6(L7@i`-#rxCXN|GeRK@QeLcoXLOE$S=_aF zb=t945^-}rd4jD(mF!XM$&Wa=^qzRVH>D)PJHkq-7CxJrxg<&iFH5!BwG$)=H9mLY z5~>1=rIQbqsz&>ssmf5Ye8H=;O;#HS^g#xizTz@xQUnR{U1E_i zx|k}kM`dd5^IF%6=y)rtQNR32S=PG4B6`MbsSr+wp`)|TzAr{OP;pbewRMLVmX5~s z42@fnYD%d76y;mcadMU`{RX??)V|>nRyFZ8M8x<5gq+-tu0j?_d2-o`7tL!hO(mSx zt?lhA*&?Io(_*%l?ym;m&RMm(wpNs%u1cJHSc*`gi+Lxuw7e$C*zap*vQLH#L=+*m z##cbv+B7GC?OinVJ9uaqfUOb~D!2Qm}zKOWe8*wYHV;a=x>99vUSt1z^+J z*6o&{m$MTDrr@P4^kWYNV0-gpNg=@>ySOFCj;nLrS1OHMMvUhX4qaZ2i>FFuqDJ21QwUaz8FE1~7>Wt)>GvdG=;xKQB+bu6~ z2u%2|ll*g@3$`#DSMVJ-Fcc!VdEQ&rP@7EdB!e$EN_&Dojd}|IV5U(~aqd z7+@j~fiLJ90Dl3RZT`@067Be3e>b;dP8@Q3Y)(U?MswxDIRmd9Qv}Zdz8hG^@BK&L z(7bw^PxFdh;gQ?<;ByXReB&3@oW67H+nXwSLg?*f$*WI=EPQfa?QYp0a{NAz!qr_z z4%f!P2KuI)NDWa=9v;sdy+;W0qxJPMt1%*oZzZGgL6W$Vt~b|q?G;oDpxHr7|Hq9c z1_mDbSc~sSuOnOR@z=p8Xlb=ocm4Ssf1lpXWJe$<+E0c*bjz!4?irYtwAEn#I#F>} zfEuc$w4%=}q4?bl zb70$H6FDx6+A+zYRFzfP?gpgXw9-pW1l57xt0sFv!HJvuIoV@~-4+XkF#R)VsdTHW494m|TF@M>DGh(fw^()gi z#I}JTaQv!ZTxtx+k^C~FQF_&sZ@+z-t?e zF#0h`mG;1qQPdf6$)0A(>ho@q2KI_*oQ-vR&*uI9jwR{-wC2;ta~=V||8@=jrV($bCVOSq5I;R+3i;f|t8w z(rHUc^=M8hY`0dW-d7kjv^m{K7OjsDL{#{?Z@06)*r@}rK#zg7!C<@D+ADZUhL%McezDO~s&Jh1 zLEuPbWA&w#ls~T0e`haQnBJ$p?O01vM-+$-*SLsVlg>kf%;1uv+XAnaY@GZ`V?I6u zDh>Q+sZ`P@4q$UAuT6iw;XZ}nZEvt(*PC@|I5{!(MsypCw75*q3B_aEUaUzcutP#w z@nW((xaI!KQxf7bimwvXOSU(KwBoy@=j%aWkY*z&>7s3j8tmgzu1S=9!5ELb1W=ST|Uvze|Rd6Un+9r2rHXz~29QVTI6B~Wz&ypt9e%wAnp zIg`|(d_{Qs3#LV?MOgZ!Xf*b@L#>#BNn1VAqX6?IJeS_T-4)etn(mgKAG?9qMD?wU z0i3?VF2oRP^4etjkn{fniw8i<6M-Q0f;FdBz1`B{ay>6DCTvTQ1`c}&9)C3%jKMef z9;g=j$CUkPfXNwZu(}3AT3lnbf4sPy;;V6)iR}k8b|}yZgO6FMSEw>(fi+;izu7%h zeVgxj+F09m7Yd*WY}jZ2ncN&N!sGL8vDxXRO*X?Z?L!pssM5Xb+b_+gP&KTdG%twq zh4%STKiPs9P3djtS1lPv&jXrZS4OFZX?~ir0^*>!*Z3mbb_Q*eOcubZ%yGiwV_-v| zz>!juWckCLZ~qrt-N1Qy)s8%+>1oBjbTru3$p@&VGfU4uidmVjW9d27 zbI2r_n-&)zvOU#BcHIsH^^4NtFeo*t)ujJrRC)|Nd1|nNUiRBk(hRZk`wnbpY3Z-- zf6Hs%VCw_AlJn{PwzL0@0W_fq&psUYO0=my`0cjV@megPmZW{?wwWia-O((qeE09-RMP}@in>3)9Rg#5fr-lSOXdFSd8#P?8N8&=;>3Xz)s3^4BKQ;5m)GW= z>#B?=?<=7=)5j7hd@DP*0l~r`SwmfYKB*jWvY_jAZrAI_mna)^7u7pD^th!)o_md_ zMh~e%5!J~gT{7%A*R9s!iw8jdOW@~+UDuwwZrgDGoKoD=` zAy~bNwy2);TwAMdjfKg3dEu!|VUwn+)7pqDC!-^6a+EzIQlm{za9Vo3dI>G_7MoOz z;8T>a^jl~@7_%;0LH8-B%6rsm?{qn3Lz*(!13}%GDxC{QyZHNd?VFjc6LxfG-0~g+ z8}^S8N<5uPn}c%KX6ravmp4`gD(i$bs^g&HA{{0wU1LfgC^n$|i_OI@%0^KRa39YW->l z-QZxk<$hJ=iLs?ARHMSYavHd@M!?f;Y6WL879Wy2ud!DTC&{{OVNwRk-nCU+l})eWI{JFrJI#4lNuD^6DzTeweJut2=3-ETXcpG-Q0|Rh7-h`@7My+sq_b z{K?09f@hBiD9*V+H0Ua(YA8bWdhJyOYm=@jE~~6(PwS-?&GkbgdHB7)ekfWjTb(4k zFIID(X!2dDtvOMbD(esCJK)g4EY*4zEZT9v&@^@CiN(fQZLrF8uar%zwrt`%J3cvx z@7mX|lseES%kH$*dZoGg8RR-SSX&l<+|c~i@=HJRpnKYM(NK05sHC>8u>gGP*w*%> z`*2gbZc>-cqQzuGz3)PM=U{alWc<7HO3Q`!KNg)CG{H%<+frX?K^y;4S82J8gGj*M z0+@wZLNL}eB0RovOglNK<3>K#OE;aa*$~oMA&BaS;v;z*6ozy$>!O*BE6o}LRSaB~ zhdRyS7PjSI*i@EIahl%=G=|`9ZTkJlA&1p>8tEeabiRzpLuK7E4RLMp7-)ajv69Ba zj0n|{7&}t8atJHG_qXOQSkC(3f?VHm1#N*XO>*)ldcF5W>mEJT`!!ESmDrhXEC5UD z?KdG&;TXeVF{@=)r$VCaQx)Fm-RwuJtt2thmT=-iHIA_11>D!;yEWvX*w(>B+YJNf zg7Kp+<04!-GrL4TE3G|B5qc1di#%XtepsUT>zeWHrw?H1rSmOyxg*_^7n|KC@=ZwE za^}35$N~paw@>6^A6#|y@lE4iSfiiIMv~;%dy#vSVX0yN+WX%(nhb6d(H)@+omO(4 z@wD~%2L@Uj_cWq)Gq3hLz3ysIoIbcd8Yd@LsR3ApxdsX>lzZ+rP-$S)6=DM-}pyg+C(&hVm4GdJIqC#z2JBeF716!8oDh5oL0Hy$J5n~$_W7DYY5g|VsFD%!_ELnQc$kN?C8wm`&2pD)) z_%0#EL4FG&<7i3$vd7viSIr3jps?`tSSPr(;3SNT|ld<|pe`X!E4?f~w4%GE-#1QcT&j(wr7+7-hMVeWpo0 zqH;uC?(zJ|_GhxpI#SnaA_T0QV+T>=GSL)b$Ym+xI5G90J>h`Cs&}U>Jgb{1i=Mc$ zI$drx?=&0jiq09ETjsKSq&Qt#GWNo}{~bQI-!ZGq^km-mkGWq17*3SS&jReILN%%g z=&CHZWrnUUOmdaj#z`9WH!4n-@fw-C+V^7G%R^_SE(6@PNR9=q5lHB!4lD0I1kI+Ihr zQC+Q_;1R#U;seZ4oV6~_F=rhf>P5!rz{A1vO?$ZQk2YoOK9WAt4PHKzPVV#U_jdFp zI*N5d<~q!vHSaQWEDn0K>p)!J*EJ|s#n{EiIx3GT_D4LHC_B;_bs|E^7jY8XrWZ-( zI0-3P*Fg(9MVWvyoFIynwYeI=AmTs{;i2W`pfm8CA_8^2>y1Uw+ee6tHR}!E%T8;H@07x}6$SnNYbGnvyA zA7^?J`C->WT*)^HFc>tc&eq3OCxLP!#u7ccxR;HE#y~T z89F0;E#xb|(aPxWH>{X+0*1)*e|d5z03TH6qkNLPhv}~+T8b~wX>|0+E>W3bzmj&sy0MPl+C_#oUm-| zt8g*h87ul(D-bl)qL++smI$ly*g|6y*~fa)b$wTRRyDdy@=TBF#B*?2dbyO&jKsC4 zwWt7#s>j$hxC%DZ@7Yi1LZSQQ>P*Nzqs|yR{s1kK>{N##5FZY#_OI$3Li9GHYjk)! zB~VjW^%n$gGO;0i$0+TjWxQQd)yK!Ip%E%8Z#z29e$})|yLo5e0oNDMPy+Yd;bK1WPjS* zM@iV}4RbT>7o=SOUdL>V4{{PSniSFAX`F7TyJJw_6nO4lN611) z!WwjCd}oC6Mq|-J2YFr5Cr%*w0W&DckK9EuTLp4N4F-yHfZDE3(osz5X>5rf0N8uU zjNKq@u0eS;^h@Xmx85Sao}qK6{TVMYO%*#X6Rwm8uagNSg}7hu-*| zm@c2r?oD+>VlDRw%s3&5Et(RcIN5byCbw>l*$}6D-Bw9=eCMa|C=VS?MpgN>beHaN zJ6U-5$|RB(Y-l@VYu#GA*bBFc_g^u2O4ii!14C=+*wzfQN*a&`Ne)B@?i& zlqhB4AUhSG-D1h~D&K!p*BH5~SaFT|FfB$jV1SZ7fdSZwCU znlUglcKeNQ@70GMeL}>Skf4Z?Gvsx{x*brab2-I>dEMw7?1oRgTZ<^#XXxGn$|N%^ z`i3}@bh(PxdJ#ERjK_)}Ts;witF^^ESsrN~8=j-{=V;TJ{W9ia>{*$~EL59>mL?`GQlchw`Avr* z`2!$(t4tlUpTa|XAmu1+G0PDNlF)&`5iZHssn?_uqM}rtP17EplJZM0w_J6j!!EYhQ#YMZVsJ+^e#CGeEu-AHYX_!$v(7Ldp@^@-|rM4%wL)JpRVB- zIJQnuG);CPgmJ&%phHpM|PG9JC)&I!?(RehZh>|%F{A*G+P!KJy!T($+OAZ^6D zI>R>fS=e81QfJ4KUR~B+Fn4>}u-Ph+{n$FW6EotNhl4M6!II3)Gy_MT9KI(Ocsn-L zM10c~JLNZno@$w$&|W;R4G)1}+CAJQ9gCeDVSyl@V-YG!Cl~o!oqGJpgmRKz-Z)Itp6<_avwd_$MWAN2M-L>S zgbakpVT#kmik*fYwt%Y)zgOmW6B0Gj11)DCO$Vk9RXy~T=2#a&AiJ%O9x*sHv%`b^kXr~YbHP0=NA} zrId};u(;y(Ts2hfq=WNYdF2N&!8ezrD4{!;C5&5_8axr3RLT$sQ>yaWY|v|KV?%@A z^f#_$q+!n_`OoG$7!l`Eqb=aNeBqqlQ*~=x&+un`oJx+NU+= zdQpv!_&i=JrJQIHbLBIT+8{U6Z-DN%+rrrDIsI~b7i^W_Hh zG+DCHsmgqweYT5$kU7_yEWVHmn zbUGpE1@co`LPu2E2Z*WN>UZJrcW`gO{h}I`#67yf54)8inBjtxr5hk*U++27=(Uw{ ztAt6NI-&I8r+T~X`Qm&6xgP9gf zuk&w_5^j99naTcmgN&S_K_(Z3 z?7jCc%ilk-iNQV7l!YH(r7Vv;W_(Csx7wH;t!qz%=`OVg%fvzhp!>Zy~@hS8noPtAfB-X|U6wy6mZ)7RN> zUTFI=T7|$KDf4UkrY7ELat*WcrOxIaOPQtOQ1Y~|szmY9vmfi@+I!1nlj(#*@LtIi zQnz^fGciNu7Ewtuy=}SRORoVdOu_4`E00I>RsG5g zpv~S3EBx@OnXcO?@w{Z1IhORXAgyi!f+e!Lj3#(?V$%RIiS^W51Rj>hBwxvHNgQB$|zLD?+vh?$=ro13S$(Y3RxHQejmWWSbGdPRIEdO>7zqDaJ zD=$(^FZ$j?Cyof!jmE1zos2n2%-${h5ilG|O)LKFX-{ofqec8;>sa`=JO zLWjk%oh+tea&0;O>pd@}GbUAFq+4+Y^s!a}91mhdi?nRxkjEbCS($UTYQFVu(~Wqf zj&QrY;8=Am$#?(blLZFDK#*2_Pg-9bXY6PmW$N?53)c4bs(x$5%w}$7kFi&9bvhS+ zCv#5OeB`nJxc6f zp5{uz5m%S6(*pZ9WoyA6_VJRn_2Nv|NsB`AP9t+~_bJr$22vU8(H9SE;La(HPr9hk zzs6ki^0bY^sI-c`_U3w(F4HiJD7l&}KUXhRqyC8$c9F~C4f%jXZ4~d>uRZ<9HZvya zbhIY%)uAm-9uMPR!J(1Fy$(w;AYYNtE4(oxcdY8Zq0Wgqi!O!}w74med=3z)q(3my z$eko_r&ah0wDO^Byn51A^;yYuuBSPiuz)EjFwmnZ-0+#~knkogkBZen4S6TTQJAqo z%_{gb)=D|`yA;kx3nh>_yuR38*VbJxR5F2pAE zB+j;IN@}d=i!Yof<>!DkZKD%BL)(q4kRGOH(echJQr|a|I1Y|`LfBN--n%wN(c-{F zy;bWi(h|uQv|)5O>AKT6kEt)V*9xo$eI{AID8J^8l@BM~0BgTAVKM7=g)Hhlx_VsJ zdWn5AosQPfT|EaW9Umda`j-xdh*bjql2aK@<{6m9O0(^D-Z6p8!K~`8A*+J&V^U z7c*Fms^Y}wrDis^Y&C5k$|$p|v%Z;$KgQOk zi*E57MBgHI;ji$I@TQ~FtHTnR`!(5fy3fU?pwWKly?BCueQr(7mGV_TrTMRZxl?B} zJ4sL0f>fo1NF|F6FX1GN199BW>#=xY7-NvKv7_VoSH^w{;%R4xg{B_H$N-@Yok{d^DWypU3y?w4YvkVuu@;O{KpDNj|R$sN+3U2cU? zpDOOLY!X=yi#r2VGlXev)^m=0?yN0Y?fIPplhD%Z>2m#U(}Y61xXEk- z$F=3=nkqmg^Np`A5PJ$c%J5Cd!41Zs_6c#mHzM%X7HpU%)0dV-t@0gul1*B0*|cHb zoD%XE^W-&h&va$+Buj?)a?euYLb&AeB*SSSb>(P*P+G`8JDdKTuEDg1i&0zsLkX!^ zv7j6Dg=W5r>ry39&#)*_B1jQRgs<8$#)4zMN%KnKWV55ha*B_V`$o-xyFjI?NhL^& zTez~NY*E*C=CnU#pZ2)*O^VATEz#SYJ@~5Sa=OQI01-L?lj>#85V{cBX;F@W#rt;)ICiGr`-TGY6>a1l&Js;pqx@_4 zrmJ#m)=u(uTwUpl1HGC6^sJ-v0;}HFvx70mQaq;YX@{Ln zUwaarK+c+one-%N3Sy)6%d<+)K5rviZ$esQ6Fv~sI@1qS>Wuwx=Qe97zBYON(bc(IxoO;Sqqj`*ZiR+81kE9x7OT(;?DRGDDp9F$5 z=%4YqL}V{Xx&Gs^NX;ti^R1UxAEj|WxhNtY;j@you~%{Gy#*;>7Z8GIMx=mb+0wK* z{9V>_Ux1jG?703s%Jqzz~OEgV=7R(c#ZolDwNAI||Zh`NF zYn{Y%_#2KUg6pKS%S1+c4R(=`G^x2tAr|yVxHJVaR=$2L@oZ8vQaF6gBz`5mHQip9 z1>8X(;Aiv2a@N|-Dc+-$)cwV&+>v3LXH=(qQLeXaCMd)!>6N)P>#t`rB8S{4agb7p zO<`f)4=7VJ6CYWenzQ+433aJ`cZ~*9BTw{v94BS*lYkr~c5rEJt|6RQK=276x1Dks ztTcu!N1CC1iP7b2!$s4HJvJ2qJ1}q}pe|ghB8^770n6LEcm*CKky|;4nPffty~L$9 zHF~)FU8GE>xpGh8Tz9V)K{dhS(jouK>+Sjz{spp4T7ff2IV;twvgF#ON5T;yx~hDN zRqOhf{ap*zAVb`kaXBkPOWUv|Ak}1~SYEFtCC(5}Zpbn+Ww+PSjP_}Kvqgo^RPy`t zPyPnA((jCv7TQ`}K848{Wm-%~t(&cQvMLBJYAyDwo+On}0?o}l-_>6O2xbylR2u~}b0J=ti3n*$`mRi^Q`Z6k)U^~hOgZrd0UYWd_o@#9cC!%}jWROnp zKXeXFh)F`b%`?(dOn!nJSv0m> z6Na;8h#fBvZtpl~fY+5;RI@SwrYcQ8JyH{E*Rn-#Hj=B$F-Q3|#doel;vmorvow^E zeqclZ{akVRCc51)80vKDh@8X9;=GZiw@hb8!U>=&Vfhn9@vQ#_N>u$-W)7wx@6Ci= zl3z!*rxAw(KWs{}c=%{0v&4Hfa}RtK#@3=I1U4&*c$5+$Uv>k22{6KBmrDg!xAUAd zz2|V(bK7NmYG94ZR$eB>2vgQVqnuj!c}~mk7wt@~-3yh;A!ZN^vZ}RpPsu>zniS_t z#D-`C!Et(B2*>1{aR@el-37=BG$xS0-eaq25--Rup@%xs;@nWupJsrZ(`SO`x6ek_ zgax@r9M!2UZZY`YTE1)J&&L&)b3zkE4WG=Ghxb9LIOhqEf;`1=hcR?Hvbq3{<2>=iqee z-DTf7p@&CY1{g-=9D=`umIJvRy_k!!lS{8#x&ig!|Ft4KiDg zHEBCezfJjAKfyBjAXcvTj{a2MB!9bp@$jfGo?`;2pQPs<0mJH=(qddUt9mXg+;&yy zP78sdnh0p8XM$ZKX0st99E-~60r&cdIGe|jzpYJ*M0XINxqUM21rwflyJ_V(7M)E6 zFa?k22C7(=Ym4O+q-FQJ#{Ao3Llm#$o+KdO#r}}r!z&wUX}i=KF&fpXJwRx}6^1hk z_!RYxM;0hT%jFF%++A;$jf2dp=|1si!Tp(1p~VB;qU3BX&4Dx#7XYx18K97L@6~ekto75myLC~KE{cC za9Ajn7WRCYP-cScP>JhPebASgldJRi6_8}k;VkU;u_3Ae@)F%)nPZsa+4NLmft0g_ z`wYnv@DOsiUvTpAQ9k~m0AlwvOPW-kT|GaMC$ zYETmA+hB;eOR4@yYmXmed#*) zr&Eo`@G7CAZkmn~<*|O9`AUu&ksM{>B~xc|?-Zzx0xD!5SiZBc&qvYH-}|=G;@TY2 zw7Ou-WMzJwPg5LiKvw3=CLr3(pck1cS~il2EVo-NBjgBP7LYOb4&MD251W&|?HAJq zsLIv*;o;g_3*8sw$wLd(pL@~T(eXHUP-H%0OplJSI^Y54X1e>JKo~!t!1{E`K^5x@ z!*(Yhj7V7zoDnW_?~nOIlR;qi@%K&V>GIa>Mtf7Rlnq7~lJ}^cckO+1IQNgvnIK5P z70B3&O!JoN12QnVF`-TNP6>_h+bD1@eVRrX#W)+Uhv+J=Yh|HGotfn0w__*56A zLt8Zbe5Uv413xr&YrdG5Qak+NA%Ad5&wD?@H!(%hTdQ*a&E}}^GQZUkh|j=9L|CUK zT)DG@PmC5vTIx`OMRQzURZ~%13x4T6664qy9Tlss+2HX|sA-B7S}V0hv=&1P!^s#G zxc4PSMv7!MJ~ce3g%Z>V_f73?%SZxe;1fLia`TEoLxD-~jR!?56OO!c?maevph7=) z{!+2s^$L?&E)Do}JAKTt>E;!n+*1u0x$Y6avvn($w79%)VVZw73xq2-*B3g&(4D4I zi=S<(LxblizPHw<5tKT#=Ox?kUl**AGM%4UWPnQAro6oBo!EQN?b^j;{JAF(siEDQ zZ9di={-|oeuXB}5mFm|^HTKHi|3|vPoGmcGeSd-0p#J=PfSS?1F+9p{3R465tFdUD zSlA!D+2&Cl&KKvH6a~z$u}TnYf)f6nLWg)^FJ}a0F4zIxg8=$G*Tv=;zU+PJT!0@O zrYH$ueHPv+`gY&;Y;W%j2ST)V;&ezDEiQY>P>KD|^XzspFrS6c2Pg6am6QhMzRhC9 zFi=e0?9MY^&3~I!I%{N;!czWJ9MSWnWc{(^hT?`t)eTGm$#S2)$D-WWvgW=nhdSKQ zN9KkcMGqz^Pl9u!*GkNQ`)Y}U&5HIj+h~(CvKM8g^YKjgB(eYaS#4+zL}hI}J*oO0 zo3eRH;TCyJ!6pL3PFC|X1q9IK=Yse3k(>RRyxHZVmOjhF=5UQ0dXI_+t(ezTApZRQd45)rtZqM;rEWP~Xp2+FEzE6!>UQvVL;pXXt(;QPMf z$x5KJs{O%1pchezyfn0#-l_)Dih7Ij9num7W3O{b#rLc?mRAc$=D)}{-hMT*(0b*q zXp_@|qo>eTrv<{tKv4!mQ8^Oda*YguZr5Tne% zKUk}O#-i3kKa%K}y;%d?EG2$qZgtJ4td1d0ucS0b-js3%%R$zP#^fB!$2y@MQ@Z6Z zZNl-w#7Gl^%_b6{pYd8RrQ*GlKx2@TY9rD*ScEfa@Y(n+UG2aTj+`5G|6Jt{0|3I~ zH!+c7$b4(ykukd%+mV9)+kX~+LDL+Q=Uo8W^*3_Zg?Jt zL|uc`irN7u-*7TVth1axt-X&30?Y=^@@0+4AEWvocQnRN3&wW^(nW_3M_I^nn%o`$ zdjDSG*fwTrYz8;mQ;sEio#^vlC35Cal-hdF0JrdRuy;ThaDp~KTHYn3EW1~5JA?BB zFD))waN0<~4!S&L+0_~+ROg%`RH1g}8)JQn-YbKd~9wcr6k< zZS;8UZlqmAp6))*lL~q@r3_RFnlDyvm68RvOE=pjTm&DFm(>sPCq_YR>6k+3BwSgSA@QvUXfI`FNY}x2K3o zpa|VAQl77d(k$a-yZC3n^#icvAqKs-n07<6$`%00a6Uy@f6rL~1^)`xq7*e0-Cn}o zKP-=bR*stIzPI;d%^>`ml2`-cQ;jemu?ET<1KP((VXwVMYT*4p$XL44~%$!{;ll>yw|=2c*=zc%HEEqYRS*(>0=Y)m|!8n;iL#RZ3qn1^;;$z@OPjh3yZp{r`hXYoC3?>CS*F z&gEg-uWmu$`Bh~f@)tt>x#XC+Yug*K3xFjEUJCkiHveyXoNTO?Y%-M+y{)y_&p;n5 zGRPad?M~Lf)p8>&{|v<6*6%9EUi+v=Q2T9n3IVQGrQ)-DI~RNWIxuXZvRB*h#JSg= zb9HPR-6N=$Oa+Mw5|v5R3Jn#SUl$8ChT4)5RA{Ks{FW4;CMABe z9zV4Q6&fluzh&8|S-#)Q$4`4og@y{vzai|84Qkr_H|z1UI75Yo3eB&Jg<5Rck`YvB zsL=dYyrotYezP7wwFea%Dl|W1*uV5SwW9DlBL8xP3Jn#SU(+1aio(yJ{%6GU10yOl zRA_!(EdPfUg(doNdK#L8eOE4=Goad?U!kNfF6!d?l@b4ki;KFTeua;^pr{M#S4L15 z)Rv5(LPLe-XA^&)bg)!tsL=eDl&99ee={FH?I{%+Dm4ElTz_m(>)*dw zkDrM)Dl}AReqAio`uCQMph821hT0nNm(rqEGJnQrKegu%$NGN}n(y~UcF@pJC{*Tu<=+B*J3j5$nvDwdu^4QB4?PHBVCk(AGZ}6*Z`7rel;kXu9G3QIL zblDXv$ENz5Z}?SN-Ur@7@Cds7YjpuIAOc3)Uh({nb5fOZ+rAs1f^)BQVT9P$<_8!U z@QMNM!MJVT7JL(U`$A96_HQbk^pLP;iu{N*%|WJs-YGa zwoJNGX+x#W?+8#!nOkajYAN$~1^d$tQE5Y^&2N%5klHx$i*En9Sa$8DHctE(jbD5a zl{UXC*q>IHN*gL|enWuTZ}W@w_{9rT`)#%i{iw8|(&qOx8nxf%HwF72V?yn>`JFBQ zsuU`1sI>VF0cyX^zpLYaY*71cep9eN4GWbv|AQ_6suU`1sI>W)41aG>`)&TC(0-){ zwcqAv)`&`*zYw4{PW*JWzbzbUzs+w7_CNSgX+x#Wug-p3O{8Rz%ir~h?Q z50G|8u<&2k|I0|fjPwghzufH?C;cMse@;|{enq!mDZsBh=~puOE1CS2asSJC;@7d{ z*V*mY0r&qw6`+obTgvlxjEp%-(y@UD-sf5#_@`+xtGKv$ouGSu*j+U-=(HyGVv1^8 ziblTp3Ntq0#&}>s3S~)DMMo~j{rCQ=+ezY_kM#tfP~l9B>5Zl_tz@eI2VvSD*B|6@g72m_^FMFc|W#YE*n-}7SR+-!?dXA0UWr17T#wU++x@BevDC_%N%!ylWm%BSOw7q(jo|~es>#IX7bi;@IRXRad?fV?QY1!Y| zoWP`p@|Hb;n4#oaQTlQ%>V~VPF%jSk;TRK85}=QhtUUrv^rh3IXJsm%arynTby#if z8h;8=Gu89AA2a1A3@1D`U*yi?rfcqdjXe;LJ1Y%lLEAxjDUPB^0~9EvRSta2AkF4s z7vnl8Rj8BwlaG-v$Gxq<<}eWlmdkS;$+3uOZ56<_$6oqD^B?BlzDmb1a+DorG3T+y z8}O{O#V_>7M~LpaowkmiM!=ITjy!UvrHj>oCidLZo(o`P|FAda4f;>`z^w+$)7Mmf zJnkeK@0v^SxflZ>P9bKsEvbUTf#A#e@Do6=sO0VC_jfVPnt7HM+4+g!(f`$CM(QC; zQpfCIMtohFHx2YhsUOZ)|4j&U=aKblI32^iizd-N7J+1o%1SZy!k<_WlSAv)Ql)Sr z#!J0=^|ds3{{D;5#9L3FNwU$>IdRDj#zfR;lncg^WLbXH-4B}ewuWTS;AY@rZI@>Y zZk7oEx*t#JQQIqo;Y8kQK=EFBjLrT>(HT)nJQl`|8b1}iTA)^wc;4SxFlfh5dLL<= zpWm3Pt<|0#(9xgyVbz13mIhss7QH{Y@x#SIB3D9;TD2VbNpJquv;$$(Vw2R^-faw4|@4Qji|O6SyB5>D-A{xC>q=fW>){3D9%)GF&3UP3i*$({9xc6 zv>uEMGE3pz5?};;cPU{9d7qFLH!>P^56&&;ZT7#3G8ZvoFFJVc=>I0FYDo;f)`e%5 z7TEa{KhZiagvsob# zsFK7>{fM?5w2{E>S6Ih^H$?yxJhQ--11KH8JE9NaDoV&zw&0EY$qp~>Ww#nTl4DFu zw|D@I6nAcjKocctb^kZiz0Jf|vjdkc`UjUK0M!s8-M{Ui-9-ho*&!Bx8sz4#P|pUg z+7D9L5eU2R_6tR2;*v{#jYB2R+OH7p`U=i@FNgEi^sdB}Ek7Thl{xc#VT0UO#I-pS zI{#sxSevcLUrTy)NCc`9kgTs@fin4GKY}XO=Qy6bTj<@1Y-a{3d!+RN<8x> zRxKsq?8n%IGwwuKHk+8P!{wZO4Yub}$DgmGcE3_@C4I_*&sA9dUrC5gnD3PI?kK4V zMZf*Zv&dH9IPuuD?}*@*1r|U`N8=vQAm;!Q%EyyIJ7DL{L30s=_?^>E%QOh(oJ(J* zl0MrH>O9z*byoNrGOW1Rt%~$zg`tV1bab&Trw4FRG)NYtsm8`7?layuE-~wTwF2}S zka{tm2Y=|>ofGQ7Z5?bp5A2|Qd>F9%tDaN3v~(Lc202rW_6M@`r)!et?|${GLhpt8`${psBP_=$Z2Wg>?5!F&v{$DZW$BTuZeZxmA8YqYpHQ7 z-MRc4QCr^vC)caT7d__m*VC(cpI2M^YC-tQY}5&3t^}j9qjx?Rl+O9o2C=gF?`BQc zkJc%X^1zj`W|>a5lFStI#awCw+1QkKyD8zUc+^qN99c>IXG~R|CM=IGrRE^e)%@X)*lTiE&3Nucohj#6zkj`tBfirVST2)hF9cmVBO%;f|r#2pj%)_ zLhES)k~SFpOf=x5XSF9o_zrld1#U;w4u)lw#B=vPB;H+qCm&$CCvNZ25FR7x`|JXq z_in}bV3USoe;TJ*d9>>0EGUs<(&h&B`JK`^qY8Mj-T@S@d;lFW=>`THWZXHGAb2C` z9`WYW2d@ZQ^@YjUvL&Vd+0-KPxQ3FI6L=iaUApE@AUX{Au-O z(}x~2FSKhu?i3LjS{N))NO%ujA~Y&cHex-j{q*fIDAxtTOg_OA&RxEe>qHz9@hydX zl(TaB48J`ceK9IWPf!Emt6`DI>;I8?!1wp#eqnp`O03LfN!adG^t}sT1GWq`zBrCG zT?SFb5TJ3MJmE$fN-De058gP(ZizQiFbdt?=xj9Wkas_atB?gx(g5K=cE#k09) zo(!Sn*FNBT)9pG`>F`-X-1m#0g?GlUgzhscw3HQP)WqivHgXO<4|bTq%)EyYI76@A z&+0nu#-HAPKhpNh12koDY~Je4Vy?FVWg$9B*Ci^ae52f~uIz68F6S#PlQ-#6B(|9th6v1@H0 z3meLPe5tl$#39G~J!aDxQgWnXcCryKCS%IQgKK)<=ba!3(0hKk6<$z2<#Fd?X^ z&CNy$7OXn=tx-ORW7+M_z_#?_k>DJi2K3gd$y$Hm9$2J{2#t3UR62XVkL6y^E&)d! z3%;g@BM~K$DlCW4rE429(8?KMm4K{pbcrj`-KjD5?pQ#Um<%uk6*fL@J6qg+4Gh<( zZ3WVOZp0MfV-6qlKEKh}<>c?Qc1t=E-r37Klo_0@207km?3!AQ7`Quu!$t>j4f7#3 z+jwi+BB!qq=AW63TCA@Plnd?|ptSTYngo(HT|ki-#QIrs~v7?Zbw(A6ja04>*whFZXw4;RFi5fHRTGXBJ!j#8yEM! zRI0pV_qv?Fn1{3VvabJJg&irqUM#yp!oUN6|GLknx4j3XZgI_G=G4jOD^dPU(L>q; z<;PE4RT|RsxYJv3q(3@eo}j%RGVWx=V@27jhVW&Vm98ib=U=ivEi;o4;)Al@mrnb( z35|~;g%J2=U3;?ok7QSEPG>Pk=)|BOa9<_J+ue4*xOlv`-}Rt=m3W^ML3_v+Qk{RV zU(mJC7d;)}a|1#m$JN$`NoY3Q!@X`y?<`t>Op2`<7wf*areJ@EZ|8cjlB_h@%i}QP zDM%DuEJ&BBAtO-=z~}KfhfC^yP&61So?WJ+rK5icLV@4aSKZXGg-qF>#_E^gZsBsX z8txo@qCN~K8X|B`#?A{DW-lI~KYD-5d(vJtvDDOBu(rf_NF_WnRH`FW@pd^(Q0cU| z5=p)rw(EXBBTYVSi(v$3po7O`NG|EAV=}s);@Vm<-<%+6#9UAGLjX$s@ z$%x-_TB`mYp`oUL?s;viLO^iD?E`R3NEYD`!VFU3h=SINd@MaWo zs}U_`6wYL-DovIRHcsgTk5<_bk8jp+76!9~bML|-R*D(d>>r{0UZ`q%* z=*VqrdXJsczfriiz(CL!Z>fqG(ZxFs+)qxflu_eyp>)Q*Fo#+7asfTQs%1R3ZDX-fB@`k%Q#t*hZM0rJ zE+VqlIsF38Ngky6R3C+!G60j9CWM3olK^L3t$Hm2JT#GNl6cwLuO9jb)OdF+I*<>t zuu&F0bI_>3fs|^E-kRheDk5kI_n%5(71b!)Yo#kgxO)&H zT{hma@Y`JNO`MoCB3owe-RGW9?OOH=i-nB|FK34a$IP^wR8U5oV~S;&%db0v1od&& z^SwPWO{3@oR-t@Kua;kbcB{0=xwnOB;L2eV+~{%{Re6e#AkSwOQ0l!BShy&Q+36d- z!36J#5A3kAdf{xFkQWw}NvW;`N>gWYLp_aWTM36XS8rQRpkMao%zb~c>P z^-0mWNzY4rbx&r*_%k*#wdZUR)vlo09zPxyMVIuppWhC2Am7S&9B=&q0^Kt(v_#Au zg__U+Fzv>ed2&+y(@GB63tbv-M1)784z|$th~N4HR;prA$r(FJ5((uOSWS@oZRYvR zJ6VsoERgxs*1pdZZX+``&khq{5zwX8M^NcNwE_15wYHdX(g!YW+ZIo%h&d<@J{PkM(NPU zs=>0E!^HI>i^AYzC$V8CeGtV4C9dR@_gky;XqBj^!B;W_s=ZdPO}Z$Qx*@!LbS`4+ z1hnf@>l`=7k7n3U^DDB-*B^=@Axq@Ay*cWmFWIW4J^~xBr;+&_ zHtC!;_d9`K%i^zSfXteTD@+MB>cz_ogOh?K7$&Tj#?c^mfc%mV8ZoK!h0Z4FY<9Mk z4BORBtyb>Khi)gz)|*A!S;8?`G$M#aU_VaM*7G4rxLz~Nb@YQgCdAbH@U0^o$$|s8 zNlPPnudpU)e*T%r(Q)!bk(pq})S!L&;TiJOq(u6iuB@fh=qy$OX=7j-*WM1z$0(F2EgGzvNrx#BL9)QFEWJ&ne_&>kAd4#NDk=b*F7A=j-HRhHx(@MoSb`FMfPS<2N zUTIvsCV|-`3a3Qg|Kt?6#!K+Iy)f0b)Bp&b@l^2@;>D1aLZk(Y!T?c_6y%et8Pe$z zRstKYN!5+gwU6TM2s9jBTy)S>E;VjNq=}}5pllwK+yp8bigbRvYoJIfw-r3;hD{!r zqmSi1W6x$xT8|%U-Hp;f2|}1RlZku@MsCEztppyfkFUM-HD{+33-T+aZLw9O=F&BJ zLF%f(=(35j`J0Qc2MmjN`CAo7F$J5&jYiL_GxNDDd*6P`eb~X)2gV%r2Q`g7z#cw+ zQ-6ZoCk1$r)ObtUmuwume zr_TiTYBqH-%itfCX~y5Z{P{HFMww>^eXNAnyVfE8oW7)~Ro}xXx_^#Vl9IKd|=&!Lgk}15whjOvt()Er)4Ml&glpLe7O^LIq86CrN78pACD8|zu>A@-d z491K{^oxh3aR9S9FTT1q6il!;?&R`Mb)ZaTmyw+7D`g?;tz55!Gq|kkn@VaHPfOqm z3)1ax)~BNv{iz+{Ee4h8b$~$dQ3ji6*<2ya2A`b%L(>c4+daM(aB@EYUPbBWkohn7kWA>j?m=OQ`esFVWiK z0I_i_SUJY{OM&ki z6Ji`AhtdmquaJ(`>qMe8l{ycG0rtL6tdhNY@a)SQL`+h1jfh0~>w89|9Jn%lwC>?3 zNMxL4;(C{<#RHgtT(Zpj5~s!Y63gm|=hBjocoRX+?WE=1?H^nljc60lOCT5dNBFs2 zu;!CGvHA9Fb{4NjwD_KWFH)Nb5^vL&NmEoz+fs69jogUHUXX4W6-LO(wl0*h#x-5! zM}#T4r_Q&+W}ihhxG7DG&%T?htB&WTAiD9^mEY*ak(vw2yIs-%xghW?#UoQ=5 zmrvS-ZBo5U8+X=@#kXSOY0cwiKWdy21Yn?Ob%C(MN-a%4v_5tD%Ums3Vh(M~i^itL zV2Fa4;Q|-2Ipp1SmYQJ>*!ejr7X#UqfmKGwI`h#_FyvUZppk>`UnFF%~>A z%frKrpK9qoiYkbA(VE6R8w~^$f>>xM4&cn_iY{lyH?ZuHnowNLJr18qbB!}TN|L9X z=^4+HS20iY7*%JkF?P6h(}ncV%w@W&aoobVfUr7gscY)ri*9EVJR|Ep)KS~UnVr|7 z*hopLUME$|57wB&l^4(Tm0WSM*y~-jZeAWxLIB6C>x&4tBc!K*V5Bi2Xw)0>M4M5@ zXlG&G%p)-ZGYnTEl+dN9A#Xo$_p=h#EiKq9)M%CDCHGW}dLRH?aZu9)ALufK9`Mk_ zv-Uj%q>Et&Ml*sgGl0`WAUHjkd`v3-a(Wn}aMSOi!O?Hz2o~h=DSXUHni4^A$+&m7P^2JC~GYa%IDAJJl(6don zdE4v76@WUhi5l?Dg4v*IA0PKO7F&&#DH;rd=O}|uyyJ_e9?s$^364s5rPN53zNBT_ zMx*3-{z`tUdW405XB8&a#>w2xZT_D~{2zk;0-%tj=AvyL*|BG)pGcB7Z^1u`l*2i{U z*nDo?#R1!xEwr7cgyb0-?}}aM$x-sQac@_16U#ap(!CPOjZxfOdz7oc*RNif0Cfh@ zV5maOUTjwNmP5rY^L|ztSSC)3Nr<4I`)bZ~Pp{8)cXTy@clc3@r97x8@KwdnoG-m& zPMT`(_1ZXu3GsOkQk=L^;n1O^=svCP+#{-1)loA!a*i|ePD}Hj+cRozaT!J%$#2&N z59*urPjL=OL|5kI8P`mJEu7~A{*UHpwWDKTQP_bTdmE?i@H=(8TZHGElv5vo^H9=q zjnoG(G%TAjBcgI=xzl@2ukngXAJj)p5wTu@%SsSEkN29f37fr@wUlzZ2n3?YK#+KJ zQ)iK(!xLIOA)|E;m*-# z7pfT4aY3XvhRLqSd=O{42IPHJtzFFQu!}1lBhslT`E^X&Xp|Yx)U$z#Gw(SgjVg+}RT84-(LZ`1S{}J?HGD6?Kr?s~(S0b<| z?C{pd(xtqQc@37-nBm?zq+K)AXsL&{!8QqJ*BCynAUQ;6erhen=QX95jVtCgZ+JaM zJtucC20c|euRkY?xV_c@>o=~-+{oH2|ATXj;48r3TQc`&`k9kojzcuadd{2WHr8t> zLVQn&gvkgMMMw~Yce~pkftr|5Q~oY*Pu{OtE*I^B^Q(x6$k=`LcXT#ROeQrll{7^7 z4v#~ZG|?x$ZOm^PX zeR*dedX?6*%L^KRO6>gZcJhH4Y_MLyBF|7k2Y$61b%H4}I zo@Z(4%0S;{=0J4)*Qg0VuxoFOq=ow$$Y+@xbu1O^%YCoOZl${Iw|Wq`UAbGnVY0HA zT04MP8%j{BCxbh!E(2Fl)`&a5PYA;W_@PQ`JA z+!aw@a}{@cTF`0Zv@l-ybKEt*oJz@mou(6sAT(84PO5&_%twqJ;_JOJO=MQn&198! z72ryllRP?`o9_c_r`Ootfx!JYOGo~=yAr0<`^5CD70_b&254VtpC|4Uk~9I2+-V_N z$?)}{0X2EcJaf*)du;-X8W>W<+h?OFIQ5}-0nKt9$G*7DR9ZrlO0z4p#fLeJ+`iJxv7khEiYtt>3+^ zWg-KuE$k%Y))INo0r;_cYT*JwJ-y49vN5tBO9y~WlQuQ@ZujqlXvM)bAa0Esk07J@wZb8tf z1&5yIq85&#mR@T;&TG?L<9Mqureb+(fI_|6k zlka9%qsJa)(7$H?02=qtn9DT)v|fTf9-1|&-VXNu1<$^3+xOSK5zLu-8)h*+b?4Nx z2UkE>_&?-x8~w?`7)H7es20-D?B-Yf{rnB_-1#cr8h)5zEKw3PqG^x@ zz)?$cr=QXw4>8TWL4V90$Sme^w5tCS_x=Nbn33;q9z=+_`v8vuK<&wtCRBp@jnKFE z9vJa%F}N2RJAPOL4YGnRN`azPGTRhf8_OBIbnrd`#M~ztphF8o!~+z|Adi#ycvjb_FA2Fbvs_geAD9Gd~JeAE`~40|o= zwq0ZT`xXf8L3$J$b5cC|C2FEt;+7_iP(aAB2LROU?Ir;0`&CUoR-UBCf7u*zUj(eo$ear>~8c)&Uob2E7;j} zlKi?#!VWf$OLx@i*LC@{@$mY!PJX*Edt3eSDA}p>;pIb$szETH@Qz{%%*AmseGC`d zeCD;MxIRj!;f1Nl>>ly>LgS*-vszl?9C_-SXn3bxMov?4=hH5ODE&gE47@aUS|5F- zI2Cjo52cLZ0!Cy4jp`H2%iMh54f^8%IR+Z@XNa3#Uf+!V;~cPc zVA26kPnOXC2Fu@l-x**e&Wlp1__HT`+tCYP60@Qr{ZC#x`c5N>rBuu-Zs8LCP23AG zDIh_>|9d0*??m(s%YA?f#}a%U01N!1R*4ue>4Ik1yY2q{k4_1$SlI&-bVgSfQ)>tR z^e8PWFzH2V!{Cop`qvd1@cvDH>G%Nl-~NX1SOJ)XX*a$5Q)RYS8mkZJp>K&W`=uQA z4_fWl1F>OZQcCvU_O}Hf<<8tXarNKC{elzb|6e#k?Go30kH-51Kd>vwq5(gu7d3v* JzF>0y{{ZB2ar^)P diff --git a/source/entities/ChatMessage/api/MessageHandler.ts b/source/entities/ChatMessage/api/MessageHandler.ts index 03525056..d50e38a9 100644 --- a/source/entities/ChatMessage/api/MessageHandler.ts +++ b/source/entities/ChatMessage/api/MessageHandler.ts @@ -5,9 +5,9 @@ import { ChatMessage } from "../ui/ChatMessage"; export const messageHandler = (messageId : string, messages : TChatMessage[], chatMessageObject : ChatMessage) => { const message = document.getElementById(messageId)!; - if(messages.find(messageItem => messageItem.messageId === messageId)?.message_type === "sticker") { - return; - } + // if(messages.find(messageItem => messageItem.messageId === messageId)?.message_type === "sticker") { + // return; + // } const handleMessageClick = (event : MouseEvent) => { const pickedMessage = messages.find((elem) => { @@ -15,7 +15,8 @@ export const messageHandler = (messageId : string, messages : TChatMessage[], ch }); if (message) { - const messageText = message.querySelector("#message-text-content")!.innerHTML; + const messageTxt = message.querySelector("#message-text-content")!; + const messageText = messageTxt ? message.querySelector("#message-text-content")!.textContent : ""; const menu = message.querySelector("#menu-context")!; const messageMenu = new MessageMenu(menu); console.log(message) @@ -27,10 +28,11 @@ export const messageHandler = (messageId : string, messages : TChatMessage[], ch messageMenu.render(pickedMessage, messageId, messageText, event.x-100, event.y-25, chatMessageObject, false, true); - } - else { - messageMenu.render(pickedMessage, messageId, messageText, event.x-100, event.y-25, chatMessageObject, false, false); - } + } + else { + console.log("я стикер") + messageMenu.render(pickedMessage, messageId, messageText, event.x-100, event.y-25, chatMessageObject, false, false); + } } }; diff --git a/source/entities/ChatMessage/ui/ChatMessage.ts b/source/entities/ChatMessage/ui/ChatMessage.ts index 5f00b91a..647c0552 100644 --- a/source/entities/ChatMessage/ui/ChatMessage.ts +++ b/source/entities/ChatMessage/ui/ChatMessage.ts @@ -10,7 +10,7 @@ import { serverHost } from "@/app/config"; import { ChatStorage } from "@/entities/Chat/lib/ChatStore"; import { API } from "@/shared/api/api"; import { MessageMenu } from "@/widgets/MessageMenu/ui/MessageMenu.ts"; -import { ChatMessagesResponse, createBranchResponse, EmptyRequest } from "@/shared/api/types"; +import { ChatMessagesResponse} from "@/shared/api/types"; import { messageHandler } from "../api/MessageHandler"; import { formatBytes } from "@/shared/helpers/formatBytes"; import { InfoMessage } from "@/entities/InfoMessage/ui/InfoMessage"; @@ -121,7 +121,6 @@ export class ChatMessage { redactedMessage.classList.remove("hidden"); } } - const currentMessageId = this.#parent.lastElementChild!.id; messageHandler(currentMessageId, messages, this); } @@ -133,14 +132,13 @@ export class ChatMessage { } async renderNewMessage(message: TChatMessage, chatIsNotBranch = true) { if (message.chatId !== ChatStorage.getChat().chatId && ChatStorage.getCurrentBranchId() !== message.chatId) { - console.log("sam") return; } const placeholder= this.#parent.querySelector('#msg-placeholder'); if(placeholder) { placeholder.remove(); } - if (message.text || message.sticker) { + if (message.text || message.sticker || message.files || message.photos) { if ( this.#newestMessage?.last && this.#newestMessage.authorID === message.authorID @@ -210,7 +208,6 @@ export class ChatMessage { const newMessageElement = document.getElementById(message.messageId)!; const handleMessageClick = (event : MouseEvent) => { - const messageId = newMessageElement.id; const messageInChat = document.getElementById(messageId)!; if (message) { @@ -225,6 +222,9 @@ export class ChatMessage { } messageMenu.render(message, messageId, messageText, event.x-100, event.y-25, this, false); } + else { + messageMenu.render(message, messageId, "", event.x-100, event.y-25, this, false); + } } }; diff --git a/source/widgets/Chat/ui/Chat.ts b/source/widgets/Chat/ui/Chat.ts index 524934d4..6271d8c7 100644 --- a/source/widgets/Chat/ui/Chat.ts +++ b/source/widgets/Chat/ui/Chat.ts @@ -270,7 +270,7 @@ export class Chat { const messageText = textArea.value.trim(); textArea.value = ""; - if (messageText) { + if (messageText || this.#files.length || this.#photos.length) { if (textArea.classList.contains('edit')) { const messageId = textArea.classList[2]!; diff --git a/source/widgets/MessageMenu/ui/MessageMenu.handlebars b/source/widgets/MessageMenu/ui/MessageMenu.handlebars index f65fef22..2d7a014d 100644 --- a/source/widgets/MessageMenu/ui/MessageMenu.handlebars +++ b/source/widgets/MessageMenu/ui/MessageMenu.handlebars @@ -1,20 +1,22 @@
- {{#if noSticker}} - {{#if notPersonalChat}} - {{#if notBranch}} -
- ... - Ветка + {{#if messageIsNoSticker}} + {{#if noSticker}} + {{#if notPersonalChat}} + {{#if notBranch}} +
+ ... + Ветка +
+ {{/if}} + {{/if}} + {{#if thisUser}} +
+ ... + Изменить
{{/if}} {{/if}} - {{#if thisUser}} -
- ... - Изменить -
- {{/if}} {{/if}} {{#if thisUser}}
diff --git a/source/widgets/MessageMenu/ui/MessageMenu.ts b/source/widgets/MessageMenu/ui/MessageMenu.ts index 277a70f0..ea37fa46 100644 --- a/source/widgets/MessageMenu/ui/MessageMenu.ts +++ b/source/widgets/MessageMenu/ui/MessageMenu.ts @@ -24,7 +24,8 @@ export class MessageMenu { } const notBranch = !branch; const notPersonalChat = true; - this.#parent.innerHTML = MessageMenuTemplate({x, y, notBranch, thisUser, notPersonalChat, noSticker}); + const messageIsNoSticker = message.sticker ? false : true; + this.#parent.innerHTML = MessageMenuTemplate({x, y, notBranch, thisUser, notPersonalChat, noSticker, messageIsNoSticker}); const deleteButton = this.#parent.querySelector("#delete-message")!; const handleDelete = async () => { diff --git a/source/widgets/NewsBlock/ui/NewsBlock.handlebars b/source/widgets/NewsBlock/ui/NewsBlock.handlebars index 8cf3ac5b..e1724d73 100644 --- a/source/widgets/NewsBlock/ui/NewsBlock.handlebars +++ b/source/widgets/NewsBlock/ui/NewsBlock.handlebars @@ -20,7 +20,7 @@
From d8d25025283b98b3ab4c3ceddd5501d3f0368f82 Mon Sep 17 00:00:00 2001 From: Stas Date: Sat, 21 Dec 2024 02:36:20 +0300 Subject: [PATCH 07/10] =?UTF-8?q?=D1=83=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BB?= =?UTF-8?q?=D0=BE=D0=B3=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/entities/ChatCard/ui/ChatCard.ts | 2 -- source/entities/ChatMessage/api/MessageHandler.ts | 2 -- source/entities/ChatMessage/ui/ChatMessage.ts | 2 -- source/entities/SearchedMessageCard/ui/SearchedMessageCard.ts | 2 -- source/pages/MainPage/ui/handlers.ts | 3 --- 5 files changed, 11 deletions(-) diff --git a/source/entities/ChatCard/ui/ChatCard.ts b/source/entities/ChatCard/ui/ChatCard.ts index a840958f..e7e7356b 100644 --- a/source/entities/ChatCard/ui/ChatCard.ts +++ b/source/entities/ChatCard/ui/ChatCard.ts @@ -18,7 +18,6 @@ export class ChatCard { async render(chat: TChat, notificate = false, notificationChat : TChat | null = null) { - console.log(chat); if (notificationChat) { chat = notificationChat; } @@ -42,7 +41,6 @@ export class ChatCard { avatar, }), ); - console.log(chat.lastMessage.text) this.#parent.lastElementChild!.addEventListener("click", (e) => { e.preventDefault(); diff --git a/source/entities/ChatMessage/api/MessageHandler.ts b/source/entities/ChatMessage/api/MessageHandler.ts index d50e38a9..b0909ae3 100644 --- a/source/entities/ChatMessage/api/MessageHandler.ts +++ b/source/entities/ChatMessage/api/MessageHandler.ts @@ -19,7 +19,6 @@ export const messageHandler = (messageId : string, messages : TChatMessage[], ch const messageText = messageTxt ? message.querySelector("#message-text-content")!.textContent : ""; const menu = message.querySelector("#menu-context")!; const messageMenu = new MessageMenu(menu); - console.log(message) if (messageText) { if (pickedMessage?.chatId === ChatStorage.getCurrentBranchId()) { messageMenu.render(pickedMessage, messageId, messageText, event.x-100, event.y-25, chatMessageObject, true); @@ -30,7 +29,6 @@ export const messageHandler = (messageId : string, messages : TChatMessage[], ch } else { - console.log("я стикер") messageMenu.render(pickedMessage, messageId, messageText, event.x-100, event.y-25, chatMessageObject, false, false); } } diff --git a/source/entities/ChatMessage/ui/ChatMessage.ts b/source/entities/ChatMessage/ui/ChatMessage.ts index 647c0552..664cdecd 100644 --- a/source/entities/ChatMessage/ui/ChatMessage.ts +++ b/source/entities/ChatMessage/ui/ChatMessage.ts @@ -49,7 +49,6 @@ export class ChatMessage { } async renderMessages(messages: TChatMessage[], chatIsNotBranch = true) { - console.log(messages); if ( this.#parent.innerHTML && this.#oldestMessage?.first && @@ -215,7 +214,6 @@ export class ChatMessage { const messageText = messageInChat.querySelector("#message-text-content")?.textContent; const messageMenu = new MessageMenu(menu); if (messageText) { - console.log("hihihi") if (ChatStorage.getCurrentBranchId()) { messageMenu.render(message, messageId, messageText, event.x-100, event.y-25, this, true); return; diff --git a/source/entities/SearchedMessageCard/ui/SearchedMessageCard.ts b/source/entities/SearchedMessageCard/ui/SearchedMessageCard.ts index 7dfb60ef..a58dde1b 100644 --- a/source/entities/SearchedMessageCard/ui/SearchedMessageCard.ts +++ b/source/entities/SearchedMessageCard/ui/SearchedMessageCard.ts @@ -14,7 +14,6 @@ export class SearchedMessageCard{ } render(message : TChatMessage, avatar : string, person : string, chatMessages : HTMLElement, Message : ChatMessage) { - console.log(ChatStorage.getCurrentBranchId()) message.datetime = getTimeString(message.datetime); avatar = avatar ? serverHost + avatar : "/assets/image/default-avatar.svg"; @@ -57,7 +56,6 @@ export class SearchedMessageCard{ } message = document.querySelector("#chat-branch")!.querySelector("#chat__messages")!.querySelector(`[id='${messageId}']`)!; - console.log(message, messageId) message.scrollIntoView({ block: "center", behavior: "smooth" }); } diff --git a/source/pages/MainPage/ui/handlers.ts b/source/pages/MainPage/ui/handlers.ts index 3a8a75a0..5aa25bb4 100644 --- a/source/pages/MainPage/ui/handlers.ts +++ b/source/pages/MainPage/ui/handlers.ts @@ -25,8 +25,6 @@ export const renderMessage = async (message: TMessageWS) => { if (!message.text) { message.text = "file"; } - console.log(message) - console.log(message.text) const notificationChat : TChat = { chatId: message.chatId, lastMessage: message, @@ -36,7 +34,6 @@ export const renderMessage = async (message: TMessageWS) => { }; if (newChatResponse && newChatResponse.send_notifications) { - console.log(message) chatCard.render(notificationChat, true, newChatResponse); UserNotification.show(); } From 8b707cd06ee35189ffd7b967ebe9459b1ed29a82 Mon Sep 17 00:00:00 2001 From: Stas Date: Sat, 21 Dec 2024 03:18:54 +0300 Subject: [PATCH 08/10] =?UTF-8?q?=D1=83=D0=B2=D0=B5=D0=B4=D0=BC=D0=BE?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BA?= =?UTF-8?q?=D0=BB=D1=8E=D1=87=D0=B0=D1=8E=D1=82=D1=81=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/widgets/ChatInfo/ui/ChatInfo.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/widgets/ChatInfo/ui/ChatInfo.ts b/source/widgets/ChatInfo/ui/ChatInfo.ts index 772e2948..4ffcbce5 100644 --- a/source/widgets/ChatInfo/ui/ChatInfo.ts +++ b/source/widgets/ChatInfo/ui/ChatInfo.ts @@ -98,7 +98,8 @@ export class ChatInfo { const handleNotification = async () => { - await API.post(`/chat/${ChatStorage.getChat().chatId}/notifications/${!notificationCheckbox.checked}`, {}); + const responseNotification : boolean = await API.post(`/chat/${ChatStorage.getChat().chatId}/notifications/${!notificationCheckbox.checked}`, {}); + ChatStorage.getChat().send_notifications = responseNotification; }; notificationToggle.addEventListener("click", handleNotification); From da7417b50a7c019dc9b3c1227f24fd37cab72449 Mon Sep 17 00:00:00 2001 From: Vladimir Svetlakov Date: Sat, 21 Dec 2024 03:29:24 +0300 Subject: [PATCH 09/10] =?UTF-8?q?=D0=9F=D0=BE=D1=84=D0=B8=D0=BA=D1=81?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=B3=D0=BB=D0=B0=D0=B7=D0=B8=D0=BA=20=D0=BD?= =?UTF-8?q?=D0=B0=20=D0=BC=D0=BE=D0=B1=D0=B8=D0=BB=D1=8C=D0=BD=D1=8B=D1=85?= =?UTF-8?q?=20=D1=83=D1=81=D1=82=D1=80=D0=BE=D0=B9=D1=81=D1=82=D0=B2=D0=B0?= =?UTF-8?q?=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/widgets/SignUp/ui/signUpForm.scss | 2 +- source/widgets/loginForm/ui/loginForm.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/widgets/SignUp/ui/signUpForm.scss b/source/widgets/SignUp/ui/signUpForm.scss index e2a8d7cc..ebfae969 100644 --- a/source/widgets/SignUp/ui/signUpForm.scss +++ b/source/widgets/SignUp/ui/signUpForm.scss @@ -113,7 +113,7 @@ body#signup { } .signup-password-eye { - margin-right: 0; + margin-right: 40; } .auth-form-user-password__img-pass_show { diff --git a/source/widgets/loginForm/ui/loginForm.scss b/source/widgets/loginForm/ui/loginForm.scss index 1d13210d..91f768b5 100644 --- a/source/widgets/loginForm/ui/loginForm.scss +++ b/source/widgets/loginForm/ui/loginForm.scss @@ -44,7 +44,7 @@ body#login { .login-page { .password-visibility-toggle { - right: 10px; + right: 20px; } } From 5424a7fc4b6a1a83018c0fcccc9a4df0430a9d99 Mon Sep 17 00:00:00 2001 From: Vladimir Svetlakov Date: Sat, 21 Dec 2024 03:37:57 +0300 Subject: [PATCH 10/10] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BE=D1=82=D1=81=D1=82=D1=83=D0=BF=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=BF=D0=B0=D0=BF=D0=B0=20=D1=8D=D0=BC=D0=BE=D0=B4=D0=B7=D0=B8?= =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D0=BC=D0=B0=D0=BB=D0=B5=D0=BD=D1=8C?= =?UTF-8?q?=D0=BA=D0=B8=D1=85=20=D1=8D=D0=BA=D1=80=D0=B0=D0=BD=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/widgets/Chat/ui/Chat.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/widgets/Chat/ui/Chat.scss b/source/widgets/Chat/ui/Chat.scss index 81a4fdfe..e6a48a49 100644 --- a/source/widgets/Chat/ui/Chat.scss +++ b/source/widgets/Chat/ui/Chat.scss @@ -260,7 +260,7 @@ textarea { position: absolute; width: 305px; height: 400px; - right: 0; + right: -50px; bottom: 45px; background: var(--primary-shadow-15);