From 42bf6db71cfc073e13cb16ac00ac39401269c433 Mon Sep 17 00:00:00 2001 From: Subhajit Ghosh <99127578+subhajit20@users.noreply.github.com> Date: Mon, 18 Sep 2023 06:12:59 +0000 Subject: [PATCH 01/31] Converted all the css to tailwind css of ErrorDisplay page --- components/ErrorDisplay/ErrorDisplay.js | 12 ++++--- .../ErrorDisplay/ErrorDisplay.module.css | 34 ------------------ .../__snapshots__/ErrorDisplay.test.js.snap | 36 ++++++++++++++++--- tailwind.config.js | 6 ++++ 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/components/ErrorDisplay/ErrorDisplay.js b/components/ErrorDisplay/ErrorDisplay.js index 135c9f5a0..411c83a85 100644 --- a/components/ErrorDisplay/ErrorDisplay.js +++ b/components/ErrorDisplay/ErrorDisplay.js @@ -21,11 +21,13 @@ function ErrorDisplay({ statusCode }) { -
-
-
-

{statusCode || 'Oh no'}!

-

+

+
+
+

{statusCode || 'Oh no'}!

+

We're so ashamed. You definitely weren't supposed to see this...

diff --git a/components/ErrorDisplay/ErrorDisplay.module.css b/components/ErrorDisplay/ErrorDisplay.module.css index 88a04a57a..d1cf91ee8 100644 --- a/components/ErrorDisplay/ErrorDisplay.module.css +++ b/components/ErrorDisplay/ErrorDisplay.module.css @@ -1,37 +1,3 @@ -.ErrorDisplay { - background: #121212; - height: 100%; - width: 100%; -} - .ErrorDisplay .bg { - align-items: center; - background-image: url("/static/images/TankFlip.gif"); - background-size: cover; - background-position-x: center; - color: white; - display: flex; - flex-direction: column; - justify-content: center; - width: 100%; height: calc(100vh - 390px); } - -@media screen and (--medium-viewport) { - .ErrorDisplay .bg { - height: 100vh; - } -} - -.textContainer { - text-align: center; - margin: 1rem auto; -} - -.title { - font-size: 4rem; -} - -.paragraph { - font-size: 1.4rem; -} diff --git a/components/ErrorDisplay/__tests__/__snapshots__/ErrorDisplay.test.js.snap b/components/ErrorDisplay/__tests__/__snapshots__/ErrorDisplay.test.js.snap index e45ca9d64..0ed365849 100644 --- a/components/ErrorDisplay/__tests__/__snapshots__/ErrorDisplay.test.js.snap +++ b/components/ErrorDisplay/__tests__/__snapshots__/ErrorDisplay.test.js.snap @@ -1,23 +1,49 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP +exports[`ErrorDisplay should render with just Received props 1`] = ` +
+
+
+

+ 404 + ! +

+

+ We're so ashamed. You definitely weren't supposed to see this... +

+
+
+
+`; + exports[`ErrorDisplay should render with just required props 1`] = `

404 !

We're so ashamed. You definitely weren't supposed to see this...

diff --git a/tailwind.config.js b/tailwind.config.js index 6723d5942..255270922 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -9,6 +9,12 @@ module.exports = { './src/**/*.{js,ts,jsx,tsx,mdx}', ], theme: { + screens: { + sm: '576px', + md: '768px', + lg: '992px', + xl: '1200px', + }, extend: {}, }, plugins: [], From 827b21d24dded3a2904b6f3fcc4ece9fa34ab824 Mon Sep 17 00:00:00 2001 From: Subhajit Ghosh <99127578+subhajit20@users.noreply.github.com> Date: Mon, 18 Sep 2023 06:21:30 +0000 Subject: [PATCH 02/31] Converted all the css to tailwind css of ErrorDisplay page --- .../__snapshots__/ErrorDisplay.test.js.snap | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/components/ErrorDisplay/__tests__/__snapshots__/ErrorDisplay.test.js.snap b/components/ErrorDisplay/__tests__/__snapshots__/ErrorDisplay.test.js.snap index 0ed365849..c7526f17c 100644 --- a/components/ErrorDisplay/__tests__/__snapshots__/ErrorDisplay.test.js.snap +++ b/components/ErrorDisplay/__tests__/__snapshots__/ErrorDisplay.test.js.snap @@ -1,31 +1,5 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`ErrorDisplay should render with just Received props 1`] = ` -
-
-
-

- 404 - ! -

-

- We're so ashamed. You definitely weren't supposed to see this... -

-
-
-
-`; - exports[`ErrorDisplay should render with just required props 1`] = `
Date: Mon, 18 Sep 2023 06:50:49 +0000 Subject: [PATCH 03/31] Converted all css to tailwind css --- components/ErrorDisplay/ErrorDisplay.js | 11 ++++++----- components/ErrorDisplay/ErrorDisplay.module.css | 3 --- .../__tests__/__snapshots__/ErrorDisplay.test.js.snap | 8 ++++---- tailwind.config.js | 4 ++++ 4 files changed, 14 insertions(+), 12 deletions(-) delete mode 100644 components/ErrorDisplay/ErrorDisplay.module.css diff --git a/components/ErrorDisplay/ErrorDisplay.js b/components/ErrorDisplay/ErrorDisplay.js index 411c83a85..3947b1de7 100644 --- a/components/ErrorDisplay/ErrorDisplay.js +++ b/components/ErrorDisplay/ErrorDisplay.js @@ -1,7 +1,6 @@ import { useEffect } from 'react'; import { number } from 'prop-types'; import Head from 'components/head'; -import styles from './ErrorDisplay.module.css'; ErrorDisplay.propTypes = { statusCode: number }; @@ -21,13 +20,15 @@ function ErrorDisplay({ statusCode }) { -
+
-

{statusCode || 'Oh no'}!

-

+

{statusCode || 'Oh no'}!

+

We're so ashamed. You definitely weren't supposed to see this...

diff --git a/components/ErrorDisplay/ErrorDisplay.module.css b/components/ErrorDisplay/ErrorDisplay.module.css deleted file mode 100644 index d1cf91ee8..000000000 --- a/components/ErrorDisplay/ErrorDisplay.module.css +++ /dev/null @@ -1,3 +0,0 @@ -.ErrorDisplay .bg { - height: calc(100vh - 390px); -} diff --git a/components/ErrorDisplay/__tests__/__snapshots__/ErrorDisplay.test.js.snap b/components/ErrorDisplay/__tests__/__snapshots__/ErrorDisplay.test.js.snap index c7526f17c..68d2bae32 100644 --- a/components/ErrorDisplay/__tests__/__snapshots__/ErrorDisplay.test.js.snap +++ b/components/ErrorDisplay/__tests__/__snapshots__/ErrorDisplay.test.js.snap @@ -2,22 +2,22 @@ exports[`ErrorDisplay should render with just required props 1`] = `

404 !

We're so ashamed. You definitely weren't supposed to see this...

diff --git a/tailwind.config.js b/tailwind.config.js index 255270922..70ab870b5 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -15,6 +15,10 @@ module.exports = { lg: '992px', xl: '1200px', }, + colors: { + themeGray: '#121212', + white: '#FFFFFF', + }, extend: {}, }, plugins: [], From 23a6499970b3038ec15724eaf6dbb913de507f55 Mon Sep 17 00:00:00 2001 From: Subhajit Ghosh <99127578+subhajit20@users.noreply.github.com> Date: Mon, 18 Sep 2023 14:52:21 +0000 Subject: [PATCH 04/31] Replace all styling with Tailwind --- .lintstagedrc | 10 ++-------- components/ErrorDisplay/ErrorDisplay.js | 6 +++--- .../__snapshots__/ErrorDisplay.test.js.snap | 6 +++--- cypress/downloads/downloads.html | Bin 45085 -> 6 bytes tailwind.config.js | 8 ++++---- 5 files changed, 12 insertions(+), 18 deletions(-) diff --git a/.lintstagedrc b/.lintstagedrc index 8d79dfc0a..90027c770 100644 --- a/.lintstagedrc +++ b/.lintstagedrc @@ -1,10 +1,4 @@ { - "*.js": [ - "prettier --write", - "eslint --fix", - ], - "*.css": [ - "prettier --write", - "stylelint --fix", - ] + "*.js": ["prettier --write", "eslint --fix"], + "*.css": ["prettier --write", "stylelint --fix"] } diff --git a/components/ErrorDisplay/ErrorDisplay.js b/components/ErrorDisplay/ErrorDisplay.js index 3947b1de7..728aff959 100644 --- a/components/ErrorDisplay/ErrorDisplay.js +++ b/components/ErrorDisplay/ErrorDisplay.js @@ -23,12 +23,12 @@ function ErrorDisplay({ statusCode }) {
-

{statusCode || 'Oh no'}!

-

+

{statusCode || 'Oh no'}!

+

We're so ashamed. You definitely weren't supposed to see this...

diff --git a/components/ErrorDisplay/__tests__/__snapshots__/ErrorDisplay.test.js.snap b/components/ErrorDisplay/__tests__/__snapshots__/ErrorDisplay.test.js.snap index 68d2bae32..9589e2054 100644 --- a/components/ErrorDisplay/__tests__/__snapshots__/ErrorDisplay.test.js.snap +++ b/components/ErrorDisplay/__tests__/__snapshots__/ErrorDisplay.test.js.snap @@ -5,19 +5,19 @@ exports[`ErrorDisplay should render with just required props 1`] = ` className="bg-themeGray w-full h-full" >

404 !

We're so ashamed. You definitely weren't supposed to see this...

diff --git a/cypress/downloads/downloads.html b/cypress/downloads/downloads.html index 27610fe289fcc2b3c7bba5d8301d99ffa240e049..18d3040b4695e5d1cc0444139ff9b7b41672b535 100644 GIT binary patch literal 6 NcmZ=RGBRQ20ssX@0Vx0g literal 45085 zcmZ^JLyRyCtnJvgZQHhO+qP}n_RKf7ZQHhO-hcDn=H@nO(lkxlo+hV@R@jM&1sDJT zKokT30I3=Rstkl72#AOQ77UUqOd{+J77!2+6aY8~2p-@+KNL_95FkK17Z%ftdN(Cy z#r~os*z^^vzAA+zyPel^(A_nY_Dvi&N|rE{{EAKh}gF!u#A-SIY0jAFN)23|H22pQt=z0Pg(3io)vrrzA)^f6(Kk&Iex42 z1SsZ=b{EkRRJ6F~7t|B44JBPNZ-R|ZN)t!|%XvZSoFXBK=`ru+_PcN-V;8AO#;edD z?oOKYyLO2U&2vse;!z;`-wEV10+^?NED8y`R1m5-nTksOhWZ;Vua&v8_WSHTS(5<$ ze3KPPWH`(T^&;Y`r?robUhIRkEv1eoFs8@zjjz10hS}a0WZJVJt1~wHF#-qjjD2+J zSGCL*9)*K;7)YL;Y4LbaO~~+3eic8NMlURvAI%Wu$&)Z{mEC0BYq5mIXK+;7AI~z9 z+!`nYT}bTohr7KY8{A_9bR{{NXY{~L`Lc_|Xv!BAy8zaY;ipUCQ``Lexfsy9rlRWk z*XL~k%o9&+3+~J8k1Zi6on9cZ*)+Kr5kfC&I*yGCNChXmDzn)~Kd!ng$W&Pwrml>8 z@8>XO2D(Rr|0QM4jD#nF*7(ne&8}fDrIa7}pJ$-`m7MYj@jMM1y2uHqs;oNLnGGMT zgJFZZ_;GBw9_Ew`P4$G(=`vs?kwdR$FywH1Kr+uuZazE^FdzURQUFM^i#voi2UTM3 zS?AT*n#kE(zza&VaKBCEi9WHaE{1QZ52eDD8A?(iYSFbyt&|QN@Ft(o89i`DP-whr z?5~9BzkHhjOynr0Lzj{*ovl%$8{ZM-88Eii)Oin?1* z+c+g!LfL9RCgI{=7EyM2#=CP0U*(8BI6F-9TCXlNN6(wogu=rL*qCQX=>47N0pXaX z1#WwZE4Zd4=bAG#s%z!n_YzZh=vgRG`$R|7%foeWg30(-)=wfyElZCD{?Q-~md7ZM z9d61gIY`#ljM>a*hjbE?Snv)?^O@dRPHlU~xoOG;whH|PG$%!aZ`W=^LGkfFbhlBn zCiuR}UES$CAK1*@&Z*f({6>mmvIS*O*uh|^SO08QRMD$5U4+(ZY0G0jvd}vhcgmYKb2uCcQ zCif!AFdI5*6E%|hmV5?*TMg<8fI_d1Mvy}*so~n#&Qqun9K4}@HCZ=^2R?mPAw|>z z^nkxP3y6Q;*NPQxt{7fY+E?`0pww&d_d+lh7O6`hL<(x42JcT#Zd8{o&*-(8-H;wn zyljE&1=qPoqIkD$NI>Npi8Ce}NUu;y@GtFe%|%_!?$p9T4Y$W33 z1r@Q{l%&ZZm7eGC@8_K5;h<@wp5t#FUkLTO0*WRY#tx-A9@a{N77F&Jb`EC#|D3F( z%pD-(RIAj?%h2+&Pyth*1jjy4%1X{Y%F;;6NYY55E*%~inHicI8|$1L9qpbV86+4g z<}*2#<)njC{qqLoll}b$^i!_78+t42?d!Y2fB*{8;1DA=N94)>)mr+W{@>le{J(DK zT+D1NT})-xz%}F#zBqngcfId=(iQKV`BNo|D2k^WlWCd%p(Hg^3NcA5p)7uF%ZG#% z2`Y&xQA!aa#{PZy^zB{!eRbDex#l|apLNf9-9F`2#5;^3y2B` z3WQlFBOn~Cg0{E*wWKOL=?Ux;mP@E82x#p4`wQWq$3dLktgo*({AsJ7ddxiMvy(c! zHfR14`YE4!$i3zqP2j4Z`p3}@*vh}x`L5M%AT*k8h1FQE*1>G_I!O;_#bSdXb-0Cb z=R=Q$84oTTR5+M$5ak@;00sie!I$Sgr74e49^@R6IJh~fIhZ+O#DR*365r?l38XP*3hKyE_)PAjbijXLNng%}USm&a%ppk*769B9B6z zfH<2u`f%X=7XcmzIu=koptvvbeP-zN>j2-BzcgZb!s2MfshZ=Rqa=q&p6(o%JRx~H z>{!IX&6&+%n4=)aV2(Bxel(Cd?zpev0Ki{rBgaG@hdi<|u`vvJ6yg-b*~Gzz13xPg2Rs&J+`q6-;XuLxl*7MW^uLo2 zxn>HGk!K>0MIK%sgZ$~st@#YQwHFN%yU;O?3VB+CopF+gM#6|v>loGARj!-34%hl81;iNl#=AV)MuVHQdb!yMNf*__&(+#H@f3VAB>zi}jS zUgXHkTF!FLiptTQVUIb(y-^0)1CkJni-z>lxymywIVZ?!(GmV8a2Qx=Aha*pG4nv+)?}s?9 zI8D*>R$DjU1*?)a{`+U@`w`>m_-T99!SqJl$2>t4J-%sek z*Zf7jSwMMf{HS-2SO$e}`H%FW+dSO=)UB^kuNx2ekNnG`PrU!zoqhKb`Bk4bZSem7 z8~KwQH11#@@P0)uVn4%t31V_Gz0%}b#gfA^I=t8tWAzgMM(WTf6UN?zN17?c&G792 zgj44)KtCx@c1!ebPV120%0^4#Uy27}-3uHI;l&O zA{r`}sq8YR>S6Z@mB_;%+T5FPnX)5Rk}$n^jAOxi^+BxRv=cl*Z`=PM2jAb>g>AMh z<)VmzN({kup8((%AmT=rSm{;N@o|BEnb;NjguX4DsdA^#RFqRDuALXI^QDLZLx9i6 zc=v69QQNI0KiZ~GEKiPGplr~#Xe%XQbr$I?WpW(Y4Z!?O_m=#7NGomS|VrpV2yh=e|%_3gj}$JIn(Cn2t(BF?pNMQ zto398zSiDrpf|cRI?tfoN!W^`gD)cRDu$wL*8ueN>rq&!lV;tL+uugv)XHK=t)eYH z-=~w{g-6-%d^&F}c!&7?dV{L+Y8fx|w||%~N`HWARVK*!~)~o+CLLj!4|2JpF3X{9nq2l)q$W z!!Z-Z_3zZRAGr|hD+O}mDm%tYNqT031Cz2MrLWa@ql!F#c}pI?e7wDCBi^xaa%jmY~IAYQaCy+aW0# z@Fs4U2Uv^KN(!ok?mVY)?;j-Xl)56DIs{h1#fsw@jIJ+I=X%yG$(Kd) za=pr<#OQU$hn>CYr*1yqa)!6_`_CCSTbHY|q?krRnOOx4j+krJDr|HH-$LEiv8G?^@ z?qrId1XiS*(bJYF7gu|{>iLdX`K&U;4LxEGmJ0xrHuZh}z~Tf#(n`@P^H{R#T3v6Pt39ZmZ8CsIsnHrM!4L2 zqBb-lyFGhJZj_cw{{gd2UILK3F^i?@Dsn6FBlL5~NRgr-1QA2>&a_K|6zbi0Qu;H5gBnZ9`GW7h73Qhs)B^@h4-603Gj zv+sqwHrh6Li{+up>M&5qnjY|4oTJNcCE9mh_V6z5LjnC}bSB6Uw8k*DDVtpe=%X}* zCNC@IpUAfn{uS$?nYv}?>THxA=RMqT(U9QzrFi|%H%b`Fv_r=ed`7c!3&@xxza!T$vB{^a)?WpxRDJj{08wo7i3f$4^Kfo{=EE7p;I( z#aY>2a1GMF%z`7_FeucU_LAc4RG7#RM@YWuZvtc| zw?u>ml^RfcSjop5H7D7lKP>qcjNO@+z_Ger4h_=c^R`%=$e>b+#)C>VF1JJug z4&dkeMX-&xIgG1dAd>lAfRxy7hl5@d6gCHP2fe%!@&?NpXpr~!OT zOb2Im0Pn*`5~h6{p{QQc{vg-V`&|aGNl?)9hgET#H81}nj!g*c=p)Qv4CHEM2C-cQ z3f#_f5jEdQ;R)?4!bSr+zaQ41)3ut2_AjoYwfo?Q9mM|pQ4VCpKj3!F4OEvRHba|g zyv$(+lR^s?X5A&wEff`rMRnG!)^;4S=E;F-LGkWomdxw54;Z|o5sHl$jI!PQc-J$O zhq+=7nO|4jHSk`uYGYc71xx9}(UXg2JVLj=Mnp?CGy-_`8KN(C^ur*@%jSZK+}8qR zMtyf&dk*TvT=U+?oOqm(8$T|Sx@y?gu?vJDV)BeDF@DVEtysy)v}dVKdQa@ue9KQq ztTj2VfUO?0qn_`kZw`2GDq125uUhy(&?*H`VskUCS0^uekvy+$*I*-RMkCx>psZD3 z8$&Mm*P1-IEfZ74MWrmwj20YmT;>7RdF)A4Y_kGp) zUce=dI{Aw#>VnnyTYJir&gDmDNIInwEUZ>8rOtzN20RM_c z_6Kk4Jib)9NhIYDa(z<9L0Ybm8|}f~{IrsXR(`5mt?(cS3-?)3MJ1P!pN`W(u_O)eE4Jqeuq_!BKT ziKVqddoDhUFBDGPb6`0gQ18U_&E+Fg>Y4o%Jb2V5(I6=1qrI~VH5yV6!X(9>?v=&3 zMN^V|pFS#Y%ZA+;9SNdjIo}N} z;AG@KAqUF%9i&=d?E8kTHm%XXtz#D*Hv+wIpgjknz$E687NAz0Hc9J|Z%1&aTrSoN zP-f_M;H`PZ2tW5lw-0wB#LkKWY1Kj3>~GHT@u%bxxgzX?i5TloK$5LcCL$~;luL*4 z))%Y;g=fa1AH{SQeILN2TZajJgUb)n#{12mgre! z9^g+_Oc>;X=(Nmc#>>6| zbmQT24&0L+?^lSawTcaO4SBqU@1c=b5~IBc#U1sG*=ca>jBQy*B2{NNJSNrzcduYH z=*Z$vOTpf0ov~5aIp!mwJ?=GEb3#Ta5XZzvS$rCxa_Nsi685G_ur(R@gUyA+q<~g? zp2J~|xLO&N6S~oMg0Qr`9llrm74$Mf)AY6KZJLNvd1$3#wy_-scBL8qs&MCQny5C8 zIbwf(^aeC)Tt|caysuM~$m)#3*T2~9i!Q&3*eoV+abm6jzohFN!>ajod>6;>Bo>H{ z_V|LsFE-klRl|Pawx?{e@WS)6ObMv2z=mJ@#&nLzIj%k-NOWRG!{DQi=X1R{e7>o9 zu&&MF&6XL+%V@*ga~D<49ca5~Hvmn*kTQ1Agx_bHA=7wh26p%Vtq&P#W=AsVR*;GZ zOV2XnnKiW6sfFTjv%(}@sSvcm8Q#H5I%L-fh7`rjKLya*)h-tOnDMsnJTOm*U@~sF z8)@9@MNXYTE{*<>u_UaNp2W4)>r5n7$*Y!ta%VXxe~V)LZ9^tc&NY##mk*MfdNOf) zb6)Yug{OrOxY5}JsG>G%yg$%g@p%A|`CNus`^h5Y`lXIlua@Ad`oP4kl1Co7PSjzp z?N{U@LS0fXwGabkv~#Z5`cg!%qH8@2ak3f_qJZL^u@6SlrJ=jpGq*?a_g~fHijtQY zEXMD&*AS(rADs&gx$y%(==T}aMp4dqS&8-?vl=}paMfX#(Rt{J&Y0E7+%#<^J_oK9*hVBLLR*>POzku$Ukq8Gh zKyxPS$6*hLS~Pz1ZWlU0`1#v}2HYyCNcjW|P^VbVy}CsB5(%qO)&$Vw8{IcwgMX76 z4vAR46pn~X@7^yW3f7TG zEdlK^nnkygrqX6Z>dlE*9%dRNc;xKA#lk;?KJufqrWfV^P9#mzo;?)b%9&~BknwVz zO2wbnga#ODQiV%m7~IK}l>Zr0S?w9mRJ~2_?s~P8nZS^g;N1A>4cX>L8<;qf+U0Ts zj@>8^m`iD$c{Y1_Ba5WTdA(f3-3Y=(2bLpRlF%k&t z{k?+73hr!vYG;|yF_Ab~Qz=fG0jH@@GiH`+b^KwQF4KlsaxFxj7*Kt6nTnL*F)kW- z%g6*SrCfY=DW(pL)V&t_#h+*D0`%>fG%=ux-i3!h>@_CeSD2NjaAYRlJsBKcwu` zZ$KMXmoe6&HfxeLD`9ZoT~CO@gjXPOW4rv&Ubsl-D&P_efUx0&U^yap>3KB8=d%~P zS+7&*5Xhv-AQzG6{Q|~!z1-K{!_}z#Ln^8I-cU;@I_Yy`kZW|UU*?ae>??#t2b!_C z6?Hwm;uKoVhDvTDRyLT(acy^hC+M;+!%obeNT~MLe^}x&=AwIo?TvNr4@wprn5iT0!4?bv%FEDF@;JwA}Pmih}?j`+GXc`E)mD`2k z6Xwjw*Z}RU3fA~r&FWns7Z~ZQ|Apfh5N*UQX2CNyJJoLgZpH6b(Gya5L1dv+A@{Cj zE3WW>=Go^g_$Nw_cAPoDNRGIyo>nwHrIi;vCz}9?P>6%+AfUoJD$0cv z>q}2)HjNI47b|{2on_M4z=nEV(QjWKqPWQkx~tDSWZj5N(h??H(X)ghlP1bk+;S;G z-x%NL^dpqyD;55&+(4E)6Q;6qi#qD-zRznT1=`gZZxdC<2uTFbXi*Ks#&_qC+3NRg}e=?^(iitG$0`z43UD3jQL%^zheY&ELtmZ-^sG`pq@6jvjmcC zThk*kjE8YkZ_1-g|k^PS@L^u9+@Prso;u{!Bk+L(S($54WGu@2F33$dBj` zSU!>Li?tY%JuMtJFPhlTJmXjxj^!>53KHTWtS|bzQYVLoa3bJJE7)QXUbV=oI*zN& zs9sJj(=K-b3f6j9LT6ps2Nwsv%2oC{5R_8G!WF^UL~DTQJIY%BA0zj>7Z8VjL&5LR zuFJ%+T5~*qz(8VF3DX1qab@b^{1Qt7tb0)lD&f1e5Nx*hAs=^Mox~YmFA%8oX}x5W zwt@74d+%*m3q!^anEi#z zs@$r$Ay13eJHTUKxKW7||1ElY*w}2*b-gbia-SDMS>Dy?VPDkq;)Kfj2QgeYoa3H! zvd*@L7V*>(yTP_Bzs_A^L{?XxfK3dmE{9&$EgfFi-PYN`bj`nu!Y?Kf;WK14 z-kLyd^y7&GK7O3}&cFtEV+9GdfH(^4CP~3jld0&F_bUs+)@%QNRim0_@&;9_{sI{FRlj?l)BCr5u$x?he>>4i#_9%9HoRYauh7bE z({QUlO$6AyWJ)#MOfK1F=u7QJ$l5Dr;%OuQ-7mV|2IGU3C0|G_&u!Gn*i~a549D^2 zD>lI2Zdn7TQ}8(Yh61;7>1C73hmBXOm)^C`DN$0e6i!OX9k)w&9ImgdeHNP`;ovfp z=J3lOu!UkDu6)I@boZ3_EcDH>-MOGhYCs1HdjXI-w9Qb@$ym zbBlPAg>6F7w)U+gUAGU8A&C?(4>h5c6B>-Exc>VUw&n8%ED61wP+N9T%_UyK_BTDU z*=1CcCw}~pJGs>o?i*?n_6ClteG&F#WK|{;Un|tuLIJba#T*9oR(ZfO4^!v*}e}!*$6g%%y!G&Zv37V85 z%!#ps_As^$x=l#`oAAsFtFeQ-Bhr^p`;S4RHTONR)j-#>m=JRt$x;c?6LA&Lw+df;)PYldtJ2HA8sm-{9mZ~ zw!u7xcKv*rZZlacS~H}wjUYW8#kjR{kNzjtm+QT6E}33KS+qTwkthb&Rwb=qxayhU zkyE4Qa{>IznE22hpp%%ad0-tE-5|VYHL|L*Fck&^W@>IF(6^&BgE2Md$0fGNpI_n3 zUN1UY*|M-ky4`Y_DU zL&b)U9+anaF+2!`YFD=n%p)*`86ttxgtSg|(n;I%TM%9^Z-r}`iBP=%!k|_nW&F|! zU-kSW*iW$+k`IVjC>WC!_wZ*vXLCeGk7*-5s(@bi5lMM4mmt=%n+)_$xL-da7+!Gd zB;8B0k|VN{C3RP@r=P2XdKg=IGSAfKP< zG}|@w!&aEDBUb}(X?BrkcGc8^qj%>HWW!MwA6)o>kM1s>|=zwPT=S_Esm*pb=N)CGt)eX%eFOLj9{_#~a|Y z`yHa_6#Mc*_oP@3M1O&QLEF?gK6hfMtm}eCwBZ6yGAT=}#G$GsQ^<*@@{0aS99h1S zQMAOX4qJ(6tJ+JDlwL;Oy{P4w^D?FCotBZ+|6osLdAWhQLhOznlTV?u-nEU;ucK2-*Qkv*#IbMtdG-j*Zsc@FO+T^CYKDF3nom(p0(R4KdzFXeF^Uj;RBm+KZE-SWIDkvXEBm>#V!q6{g`f>TEg$CNEtr;K+5zn=&W7i zjbCg`*3HaSX=+hPpkXmbpPaa=-)$sJ*&&qq^1!yLA&;w7VQ!hm_iME0qdQ-!SgxrU zHrS`f=guPAA1hce$~G73^u_|*y_tz?k|5MPHOJ>Jf`{V7SWN2(9+Fjw;7@x-axc&q za4?aJbGgl97zX zQ0%Z1rhmp2&1V|$`19fNM4Ku~_94rH|D1Cj%GjlKkEHU7!(_$x{jVOF?!WPJ8>Et+{rqS|dA(S%4h(rI_HXj@*}$4({;eaRpDs$-WPe zhqf6XleY_@J5Q)WTKir0ucbdc%LcH05O9VF!tOXYIP!~uA)LqNN|g`W_HRv_FjXbT zw?=2*ua2?dbTE$Fot^?y`3jXdjc0UfNj;`ttQyavQfs(cqjv2KW}!iL%&Q{PABF0w zFLa26W}%KJcv(^tC7FN>$wD=2s{#L2&w<~eqAi!{rMg%)4JI#^M?CHb8;~w^ZztF#ikD%J9azL*ZyH-E!$%y^aOwf5{1WmLRSLl*QKZR^= ztc|B*R!_H3GS0;;SzQdsC{+p0J0y$XmfE<<|IUm^m9OtE0EdOgR>C*Ot+`K<;t^Y+GOA=MwOl?5-Dlf>Nol}Je9&KI12W;gCt z$Uv0eigX0uGv3T9zV_>}B&oX~1N-)a5M;e{xxHkJp9wK($qjh< z#*irTcHA81QurVfV2AM4Dx&K#)|+%=B@C$WW#{?8PJA?L|FX{xS_=# ze1=Uod_KTZP**uAr~~#!V6t_T>Yi+3x=p5zYF2p>TjJ zA(}X!J5$hA0of|*IdAG#*4-h_#xQ24126&Tn^4sY9(+bMKQ4s7%h8!6Tp@l<^SYmM zD6#snp@gzWCDz5acEH9`e2A&cAY2Q2%&Pa;D+zR30JNf2Btyp6J5y`5F|ySjQs|?K zndR|IjqUgWR8jsjgtZ!Bb7Pj_ayC}+XUe(Fpc^4X`M8|%hMJM9+K>MOkrZWHVL~Uz zGOIdxxr*b0C2fL)jYv$cW3XtVXCVBkw~n(q6B8;@WGxQ_)$(dM9jWheAHm=l&kv*R zE7x(`iXp#@+cf|0l@Vm3Rj6uG-bT_oq^SpKI^muCH|zVI>A{>zWhj=Au}P&u@W`1$ zw-Nw8)T3F31pA7NY`?qi$3ta2Oa{R=tj>E>;5>%^OVW;~!;CS%?B}(RRUc)177D$+ zdnR6%o*#xA7di3lM(70YxWG}J_xU8JNNnYh#5j$uA)W^)=q|rd>X7U5RVn)v=5J`J zse9kj8s6_7EofvRvfZZ=nVVWYwL^zQZ1x&u=-QUoq4^U9Ejz{_{04|h0|{n9TO{&t zNmFIZ80UjkH!ZFy9`py$TdUm_ah6@ZbW3kKJdA~#qNfb*>v43c9+ZqkQ8A1THP-aY zg?Yg?60Sv?EeOg>%H#c;$D>&!UJS=Bj4n5_nZ5}{&68eiPqXuQEd2zd-2i+x)v1JX zi~oKUi-h1b22e*{GyV#7<^0uxR!vGSto_3_6nR1DSxc5l%!DgZJj*D-?G&marfz8M zOn*oQnDujX45_Xrf09O?nQUi>U-JyfcX63SIxIh1Ved)%gLw{5$Se%{qK2hBn%^(5 z)NJfwrd-kmFa*KX99@ZADNfGZzDd!@e8cwu*5(k0kc&I3aSEr6G4)RGFqrnqvrHCf zn0ydylbupw>)XU7wV8nW2`4flh8A@to!k^MaX#fI_+pWv#1&0z*e?_HVen!yxl=Fr^jO)V2+55q_pG6IagJGS7s^PqQdM0($@W zWF*E*8PND$2j2YsJHXeQUC=Wb#Pens2rmk)`74(ib9oA^NBPG=DuwBBjD=9_9j42< z6v%hAMy$XTx%JL>P9uz@zvuaa#UvP|X3Itn-4i0s7G{w=D{4>k$^FyCNSsz;4k4V9 zF4E(lN5r4X4f7E_h2V`(-JpaWn+`K~Ozn|qA%%3XN~p#HeXoD!e2IC**rq~mB{gG# z9i54!$jg-31Mrcl`Lt({u{fw?*-P(wJ`Tj0X_5Wraxh&JAH2R*zMxjy7fMAcr=ZO*@QmtklSysK%7r}>K(tWY z^%GJtDehXxY$Z@%=`cr@XD}AyieyT_ULK{ZDZ70HQuun5X0>aiM-85~GFp4;DC(;O zvX-~^FB@c&BFl~H-8v54=Q@iYJ~+8n-|?*UwPJz#!5ox)m}He339@_27+*h5Dn^~? zS>kx&cNc&Kyki-iU(15C*LXVa|4}<{3K=#k%|+t9p~@0~3~CCg|LJWw`O@0a^X)^o zL?%kihi?KRCzY6;t#5Fs>o1It-W-;?C33b2CDWcWxW!tpXnc;>@5Izgz2T<)J^m^o zThyRJ^L&!ccB!nKon60xB;B7d{eDODi3j^cCPj@FtPzsZ^VFu`=u{gR>dWbqn%-`p zFMrm84_fpR&CtTGGsyL*v{7^gLo9c-NEXod!oe8w>gkCikM|E>GR2i-?+rD-Or#&aSu!85}mM{i}hfTp>|`hH*FW|Qs`^$eDK^QlE|YO_Y%Kmh>i4Gv1F-# z{TJoqCJ0ER`8gnpt8%$)e%*l~F@0MltI{${U3|~SC0Pg!Dp4zz*s@g|OytTtcz!s0 zVEhG14o@lQ>kc9zBW$eAU|}DCwWiuXmH5uii-kV#_<@cAPJ-iu{uoiLh4n=$zX5c` zq|g4O&*!%OCP4P&OTvozHa37tfyvwAnZJzyaH~yR~N|AkI zlGf|OUvb#toV@&mTR&^zD^?+qGd&cXz6Vc^_4$#y2*x%eg>xJIsPdk?3mQ zVgWp9J}~aL{P*uzsGa(XKvb=*IIO|DgVEbuibS*Nzr0V3YxUGYV?x44uMV!gwe2Vp z%<;v~s=&tJN#O2EMcfJ`N+C4+#L~-=RENoPbRQ05kura?gN!za>nb)wqmhzGVqRNz9^uqSGLA@IEsRg>0pL| z4{Dey)uD}?N`fNSaM#mO1X_FLOT~%(K_Z|~{mX=&4VdKolKq%X(QZ8dl1RVF_qye z@Rw1RM@O$D2)PAPXJdO|z~HZgxb$!3ZKqEGHa0 zhG=L9x5Cc?8E>u8&_vtr)iM&4qx}=AyG<_KjoQ}8Y1=8Xaz)OE14%-!eKy24A+X5x ziqx5&Dwuo59fNQkzC-;u&^;WG7Uu&%-Gf{}KrW9KUKg-J{njY{z~|r2f!vE8e-OHa zH9XRiD#@=N_jjywex41X<4TND_tm*59=N#wbPp8g$&GNMf#>UH0~qq7GG>!qn&6}u zQI)S4p2>H%uC5>LNgA4;!LneZ@#+gw3yU%E?`dh{Wf^4bxdf9 zgP3bdCv4-3J^61@CJtxO3*y1pPsE~^7LsNv+&=W*2U%v_rU);fu*X;P1M3A@^ayw;6z{$tedzBLa5_E{ALIbl;Rj!08*mLCZ5BvJg z7N}a%Z|4segj$|KSYsk>Lfj}(s3i$HT?6fVP`RT4GZot< zvS&J1*3%pIlubY>0^aMCs`z|09h?NI&U$4aC$eIr;R4agdckc&v&e! zujKg=p@h!TRlS`ve$17!adq$b(x+{@2iU_|#&SJy^+FnKg~u6(M(U%)H0who02X5NS@LRkr7b)8qSXllwFH283EyCSAQ~#e1ISE-NZv*c!Kd;$5%+-$1@k2<7}XO_ z{ec`-$P{Qm-J35C6=Kkn4ACRG$I!;Thr$de*ax%i_|~jR1-Z6Ip6|!?Er|G|(0C4w zmOuVoBv^tp(%r$Hb_nv!Vu-AEz)q80aR{N20NuXGTXF@jc9@vhME|icS3;>Xx}G$b z;*9?fLc3I!*4vz5q;45O?7?wzC^ZF-3yE@RY-LRsEL_i?K>TTMQ2$gI!GEs?wM;)@ zc@uapgC*z$ndEY0u-M66v&z&{9nJ2~grawHGdDg7#L=z6?2Ltj2~(Qw^UuKLuYQ!UZ_5MJ2vv)RVY<0pziJ=}A=M1xa3NVQ(Ayl6}WBg6{!b*MA4T~@R z5%%^O8Mu@@u9+M*U%u!|=!TjD`ZrvF% z18u#A(HShN>TH{cL<}DyAQHZ3To8t8);~`jG zkx2o>cn5vi2B|h zf=fD}TpC0oFSp>uQCoh~S6%R6A9n<@j8LQbUSNMtr5|=133E;bKSp=QFahwVOi)g6x^-r@d(b|0D5 zru9e%kosZUR+?EZ#ULtm>q}?f`TZE*L)gqsnJXPAV4=&E6BcY;C$UTo?Rir$`LSke z>9Rxkb;y~)j9kZ>Pr^QEUs!AU_e1g7CzkJ(sSIz=rUrgu4RG1b7S~BUPX^-Fvecs@$$lhLZKfu`@ z<*AtL`r%len2k67yA4&PXPHD}hPwjjLb|f7$@P6noSjXuP3d}}>K{SF-jSTB_*+ne zwKwk_o`@>m6^rD&(vHec#OFLWkzD+u5jqXL9YQUPX6}%jS)tC zR@SbmUZG1w`3%VKq7Ah=I_X-~lEiQ-gC8ZQ2piv95^CXNl&ag`S+w1QR zPD@Bjf$F{R)WBX&sfEpJPrdLg2*qxmIBc5*R^oJM!UJFQ?gne~5 z0c({%1M?duPUu~ZI5n9ge-j%XN3|4P>|o1%K;nz>+B=?5*7bdK8zoW7E0qgE&lyS9 z-+XT(mLZ@%Mlmx&=SxyAm7NGnU>d?VBP|OkTjhLR%hjJxXob#Be=Ax|-MD|Z2lxJa z(S-TDl^acsV+fztANoS~QlTQqz`_0l*-)gVa`(pB6eTUX>*rqnJdp?r&Fe4LcKzPD|1JQZR^=Y)Zcrt?E(Sr_PzsbYe<|1%N`9AZ3)U@= zJTyZsJY$p0a`NNRWwoV0mk8QXHtf(to9lBn?DAR}C6^Ayi^_MJOZF4SOnnrJ(S^ntam$ySRhC-z40| zXzPggeXAWVA{7b4+7mXHfB3@StzjtqiSGlfW-5_7(z#{-DuDY{Nr!{`WvkW9{o!hxFN4x5VreH;f?YpnzbbT zAk^%dgis@2Wro{szdFhW>_#G$aE-@ADy8Xke7k41O#sT z{Hk|STYAi`lIH_imHf5Nd3gJ*n9X%^mR{WZL9v8KAP6pIUtddnQ?V&>{=hDqVUh+P z4aapb!6>A3b-FK6LWTxTByfo2li8ijt5)6bk+)Ln7_KtDe4wZ zUgaoyjP%{Ck?eJ*kuWMbOY++bCp*(js5vy-Y?X~k^U@9x#(zA~Gbms2BAXz?K4};V ztxGr~lwG~lNa8N~>FBzurNTTVRzu$S{04EkEw^$+oa_eP-h^0;sY84ol4 zNQNH@!pNzOD>btNVNca+0sC>4MJn*n-Vh&wCV|9iY_9>&{Ok~W<*8aW9DpP|ZRmPg zt-H4x?4OW-;2S0FAhAUE{!FH(}9Kzf|KrTH)E93j2Z)`N=-kw&k@ z0A!htY@2W%Uk_q<^#PrjlpU(}(=U;Y|5%U$2=tQsp8>gzZU2p**}m@+uCrw-(1$A% z{-s?G5GJ9!j^a7Ib1PL6s4*Ig^Cp5=oeQCLpIkwz(;0)Y5Y@I{wJ4ft$Rq#H*PwS< z8|)KZH|SV8Tr+VPe4g3b!CSVl#R{ox7>MXZv708)j$(bWU<8$pH@K@^Z4q zNZ2y=VgxQ3%c~gCwqkzt)-kqYwlnDN_Tsn%ZB@T2Css(TYrqm>PxTeEa(yI18PTOt z^K&}SN98UMdTgJeRwPBo_dE6W>1741^ytzmv*i0#GODv>Cjlq6Cls~t&A4OmoJT5! zp_CMPolQ9&WoJe3RBVgnI+)_U#acjg*cAiu7ml5WV=AwznZVh_%Y!m(SVq2To&i~{ zfH4$k#PlfjboR%N$Nmn2-lwq?I{L#wf&_N&x<6{{7cImMLLvS2prYDzUT0o!h;ArN z1!Y8$Z64Te>H;C*j-$u?R_v$PR>B_g+~Lm_{QjzBty#WDXq}5DK5rY!k-`k*=|bPm zew!Ww5xZ>Rno8>dcP6X_wUvBYKIX_e1np&A)nwNvNlGXtN|cSN#P;491>p-?Rl=2( zVQp(OZ7``hU4g3wKA7iCKzvqBEh#D=2MRYHUaVgD+7pCt`(EaJ`mKY~7p01t&WH}J z{NOH9(XEzc!9sS-!ky~+IS!}SWj)wF40>k|H9r0=6FHqN@OAg3m(OiM3>+DRX`oZo&zJaw}yz`~Mfa4wJchv_b`x3hW z%Lm%5TKqu5#>sh^5?B*4`oWmB@p_LKz@nRkqO~vBF<7c)_#g;TIcIq9hozMBHOa(` zXOPO*5J-+4v4C6J@5pL8_`QNKr%D+4{z_rZJV}krEG4YrDG+86QxCXMo38+9_z%OS zft1_NcnGI8vch=;TTgMVuq~=<;a3okr4|=hxI3p(?17G+xgLiy9nEm;4I#^lR$45i z9+ac}Q|2J6CIia@a|*3xfH*mnL2M>~rpA$oET6d0$pYi=0z(=sPsW_h_MO<3^~(4I zkT8>Oe}cs{5~;})Eyf-BRQ}E#92)y^q~@{Yu`XE6sq`R6Ut`d7>#yIhZ$H)jD|WO1%8NAlN+$VKBOv3?QhB$Z*V z`Jq(*4X9G2S0Gdpd$1OYo5jL^xmlU2pz0sBM&uj4%md9=#ju%F+rf(dEcah+j;3eU za0Z)+o-B%7(4m{A67$!0?YrNIRN58AQhNygTaPNQPyvDUz# zEf({-_EPfbvE)zceP(oz!3A{p;9d8Q7%TJ&q%+j|MpxS_+dNlfuX?|bLa|ONA~GqL z5$%JG2@VnduGP~6r(8U_Ix&a**aA%2VXxoc&~r?v=j{H_O8dz%d$V%|b227`G#c0| zPPBriGdeOgOo5g7r57O}+(;h!8KCoimMs_6Gn8pWwz9Gp3MOFas3(*0$VHW&j_|8MBrk-0+4_`U_}+X5%3SfGd&jb&H=z#$gZt3IbO?@fbF^uwKnqeL zVg5~Sj+ZM)%YV$oz;{tlz4(RFL+%=gkVgxTf#Ay%T zFmbhpbW_6-X5(i~Tm>#PWxh4NrYDALoFz$-)eR7gUCNgmmY}x%E6}~#kxJ&Q!ZQl8 zG~>B2Nz^ZZ&#AgZ^1CT%^t!;72fbzdKFd+Tga04J=HbrO`^Is5uk5||E@ger{Rky} zsc34_(9+bRg(3}PB%@HWD$)}9ocn2zQ8bWEBrByd8XA6n|G+utI`{p&->=tou2YJh zFNMhT4M`9)OM-maV1iE*IP}QZ7Et}022AIFG<&TbEx%<)bpD)x$1k@tUBU~em}?6- zXb-`c@(8GV@em$ws)g20e^zFV998&l2Gxky z6Og4#rDVv@fcJ1^85ic|9E0he=NZF$|3RN#8@OE-rL-NnD;E7@&%_?Y8}qH`0Gq(f zd_3i?i>A?Kqq#Wajw)H_C=E(`Mwl}Eh(pzz;pihJl14JwxzE(e!IjH^XSfE1dUwFi zkXC56*vMTN{(v3i4Z-DVvq;=2TQWX80P&vDkZybqp9cK{tD#U#Gf>5NA5U1jd<2-Uv_cT04LT!1ycloccVnZoR4 zeoeZnJPIrWV{yZ{0KJ;E1N#aTVEdAjpu0*8bM;>1!szD^nbHlLqdXYPqwQ?bleHML z*_m{7S%A!?Cb;zE2ySW7CebTTvZoana8i7npjNq+tG!i*+IJIb8ri|Vbu*;r%1_~p zP(GTxcoo^{s74}&mr+?m2@ENF54)3O=&`AL?9crU|JK_uP;m;BY^`a`+RG4sx(y=& z%;``@2J0Og108w>I6i!vbrX%kFwJ{MF))eNZheIa7?2NZmQ2CCw#QY^X48r-6~Eh5;;(n zvILc?W{|Zrn~;-YMt2+%C9i~ju_Ey?4?0l(0O_C4O#p$n@;|Cp>n3-Z^ z+lV@OvLXU^TO*2V7Qxe;CPbcE*wBg6JIrL094g=b z0&hW?29B!0&KE@tcWVaBe9ucO{i8sp>=XOe@gyFcr4R0g2KYe#5v0vJi+faWv)|hZ z(OPN9emmrf5w4$bc2fdcOwD`eejhsYoR_@WU5WBn7QyKKX8a|2h28fzA7)G}gt7(m ziCISx6F)9R_IDT%v*1Y-eVK_=@F`}#Hls}|a*=0=D-LbfC*n5@Sc&-z*8fbxy$|b{ znbJ?N1~%i^zG|4Qq(ZZEr_p~~RWWz3J#HGWN1HEufRjUT@ToPa36i4^rgpt-T?L3H z+mfCI5->3~0P9QD$zFxo7)oHt3luOoi%QF!I(ozS%Jc{)`!M9wn*J%)ojW<<>EWzW#&K$9{CNx+U$) z6UHY_Vd$n}hT7{U&@ulSb7QKv9yc9e_-swc@=i69vfv`#*JwhUD;3&RNrsD+}$tVscWCb6K=@RSLP9|x`9d{}L2iba-680gjy)~hOT z%=ZrF1zp5l*Yqf#w*~QaABXyhSiC0Q$gZEuWrleyaBzPygzB_`*T^fhPXCBI3)(Ov z(U3M*nUU#dCh(7|9TD!?fnQpp@kxgop(o;)|Ez<6=XeWBKIDUkY2DcSnS+aaI1m`y zjwjZY!{rI&rX-2p;s^hd z0~!BIcTjvl5LVt7N1vTyRM2D-E1}m5=W;T@VuK;RQ`pKl{py7|3iolS$&IT1ECml& z9SjI=V_mCwX{HhnJ$$>88B837Ro84V=F(Ge51&b%-5^ByVNW&nAj;Uz8;WZSLc(HPR@i6`P z7~9>GhpDwC;O!?*+AtR^+>X^6#eWm$abdfK|j@G zZgq?UQ46;q`VYV2(pPgqIra(6k$R5TyXFyUHHXYPY zd)3JKk8jw5Q|Fk!GdF-5XBPDk5+qlOBuUt)5WPUmNWo7IJ*j3%d84mEic>5~9?gc8 zF}1jHZV4{`rbjAWyP=?7mip#DgqXnhVAG$?-1#F#II4v(D*Oekqxk5T@j6z*Ih^~u zesdWak4n`eu_dbF-nJ<%GQjA9W)P`p=%|KjSAR(GB=Wwj4?MF($Q3 zjQ+=`GnG}oU~n@YL@id($^WVtQGYus&6L0oX)$^~!H(D|t*4VEF7VJ|C7w3srLGG_ z>G!2V)MvmM%}RtYy?rgd(EAD>|9(foP$BZ|F$XJ~GI7<%ot)SqYid{f8y`vVg2Z<& zzV&9b(`Tq9$$EGUuLm39W#tvJohlTJmaP+7RCIYlvF!pX0KVq zEutG@{B&SFLy^nL0+;gpsQb>A+~0Z%%y|bO++%Eo;CU0TE;ZXuVJO#bMZ8n!HEF{ys+G!MzlA;s@q0n zUS|&2rx?>)mw%(%2Q{cjkS2GklxVn*0bMxjCFY4qksX;yxW$%-@PrJ(*v?nzZevTg zEq=*Fb@=1F)J`TW2XUdeEKQzxgIAZwu}domJTjj~7Az74H+5b*8o!7Mey|4R-I8## zpCN4xdWo-;exbu^SE`a93NDj`NENICtB(;_d?X8Hmo8;5F=8a_*k`sVLV=#(zraK; zx`tYlx4`vCEOYC|HQXaRi%MU0ER7Uei}79qs58Yyu|^rVQkjSBcZ`5zk#%@_`5Wv| zP$9ij`|osEgwvHEgY;fJ?)yCrZ^oLFUw1-be2E5B#|x7KSADTpz8+^zn$z`#RS?9E zz@MYt5J4qr>3Tz0IBgW`s-ido$>EsMq(gV6#4;_6G`%=G9{yW(8VXu7!G7Nav$*yF zct`M4_o^zi|E))r{qoRL$dK}Rw3a$~oPyaA4ot}V8s^Q#L^$OJ+~C#H1R7G&P^kyL zxT?@YJe{oCg>`r(UWdrEiO|n_^Xa0I`7jouN#)eVX=MIcxEuseF(qxXg%hbr~E4&zLG#%+0OHw#r3ugy(!JhR-be+}| zM|e-8uV&w5o^&}vv%D}gaH`nA%h_0>+>8Q`M&MwEGO_OvA%Rs%4-TY>DYm87QQ^P#b%2S)@StLtlSy6?)fwt=o<Fxx5LNu{Ou8>*<5>w+lEyoiWKa7IP7%CQ*Zz*Rwz8zb zmt|%K0;*06S)hkzb2PQP3nGd`IO-YDE<&4D1Gz$_YqCTUx97gnRMS2%ZY9 zcYL&$z^7Gtcxd%nuBKZt%q@~4HJ?5(VN=gP=+Fl1tS*2|EN^KI77T>7ggZ@Hj=BE_gNw?mPct(gqIq{<36{@$X{hcpB5b^$~3CR!vSrr6?3xE8rkE z9}n!*rHvXYIJ`IsU+COnzNPnJZEYr`F1rlgg)bqp#TqY&Z-YmEQcR_kyKjC8n6`dIL6wNs&wL`ibhE4>-OXm=fxJK}cTt!2 zDr7;GTQxQ<9EFO+HrQU*3RmBb!qW?FAZ&dX_p5$_$TK?R>2@{jNVX(--X>IFkOR@W z{a9_n$2_u%LEZ3M;I}Cmht;Q%V{MO0@s}Ar@=}7LnIm~=txlee$dLrWI@nq>2+cnZ zpyCHRD*mz_z48iR#{m(To*+SMSOw$b%iR`8;^r0!JANQ zxjMYc;iZE$>g1%pCQXkqX3w3~WS(6g1Ubb&__Cv)>lx}q(+-D0asC7}*8IR9y^rwJ zzA84!PtK9Y_%le|E`+z;o$$BV2XddK;|2NaoZeq1@R!uWX`M*6 zT{p%XNs#L~T{ynfktF@1sOS5aHP|Wv=MK#xpB78gSuHp4mghO>{5gh~xMuX#b{96r zT7_21zlOWtZb7{N{nCe*rO|7yGWoE8mnceF(*x6tv2TVPxhpz|_I173D|M17^SKQx z2hO0vf^mH8FpV~Sy2d6>^_M2I6wc?XQu$qr7|S)<^oqVD?H)2@qhVbkfM zoKjpa=nYxH+Ei&vCbTL~2VssGXy(c?2aKz6p?M#7zjx)s>0#2eIbCq7TlZRUG<0CIt{6#WDi7b8J z4ojELqS-_IBxX#7y6^u4DhI5&LopWYp{+CMA^lyrW!Q*@u6~6F`K_s@=^31Tio(6r z9c)(m0M|iOnx<_~18xU^;ktGBz_tsXTBwmgjv&#QsY!iC{Mhu4PpGBl2Cf!PBRl5j z?DK2TB_jgq`USAz#up@CE0O=db<`t>%bxB12{*q8(b|_%M7D4>^ce)upQ=1$SoJiN za*`S2y;r8rwlw;`ESFSwHI@&_bD?23`;8vOi^^@JCv22g!W^K`$#fxLN@!|VfRB9bR;jxT|^lf=~D`z|M z?lGiZ?*xeN=@zJ6_!OG6&FIPnx4Gu`%b~}?fEZg5xW++}sQalAiHRWS6<>v6GeqI@ zVC<9ak{vEhmpk-uvQk9A$Gaac zTo{8x#qR9!z&p%kSt+_YeIcCiH6vg5dqKK(2u@V-(8dIYeXO5^&rJ()GiN5TitR;R z@iLHlAxr)0ezbtR#r%F@W>EeZwUZNoXLyev@zlzfj-r{=h ziNiyF`*8D;G2FCYluooLQSG*7&{Uk-IYCppwyF-g&+dh5MX4-FkH_HI!=TN4!eC1w z>bFjf91fUExxVtG!!r%;e(XRd{~TQWT93ZFWr)S)5PZB?2841YNbBmi*pnhmq&KJ& zDkDdN0%eH6rg#*!-Tnp8x;K(>ZlO&0<{H>|Q-+F_J%Y~H zLr|7-0}sz$PR&29#hY7%;DWO-$qUiMu#i-&F_R~}hU-8|deD6QFx9}T&RXfY*m=1xZngiKWHP{OXBv3v!^(O^KWs3w_(V80dCE^P*@|c1pFI&;n0bH5W~~JtRpwL zYlc|(RlnO>;Nar|vW|Gs(&yT<>)ixvEMBC`%B8U&y%G7Vi$fQE zu>+G@o`ApgZRp5}LYK3>7!`LK71Fw4Xo)49-`fbBy=m|!-JG~rYtXQt$liFy!#e$b z2lvNgP$Je5&kHINfmt&^QF}e3raIZ+x8z4oULR#S2Z({;u54eb` zG#N@`eVfc_#@}jo_v{(eci(&XlV?oJjMr07%L)|kJr6Exf{5+zR^09&Oq_yvX~zEb z?ENfh`fcI~yR+;o4my>yy-N-=Z|6MX+{;zRo9lUq<=HrVBuAj*u`XR(OdY#)#L2rw zyU_9XE9A|M!wq$&^t#3iT*cNlOqc(HEm11LuF zJ!Ed1k^>13n2RDFV5Kg~WJQ!Sw#`uhe`b+=F1&PTt1`#a$$*mL-NeCqKkRS!#_uhK ztaEJ%M()rc_^uJpi*&#PeFGvPYD?BHjlh@%pRuc1oEp6-VR88r=DPe{=FNj4My{?8 z&K~{_*X0W^H^G5;?=~cR^&Q~H`V6Q#CrCF7?t$%-&g_Yq=kT?w4E0_ljO~JVVSzUv z#r2o4smzgB^O`VA+6vg-z8dZ+zaNeU20G9-O^ZsesD{DF&G5l@5!qE`Nj7(M;Kc$@ z3@PA)J-jPX?D!=3I@aUN1_3&1nSi_eWr=?6bLL!Z7<)F&8V>1;Q%$XOT;=DGEZibqWQ_)LQ&Sb`6pC;-vJSq>tLVKAiH=*343W`jGHChi@eIGaavM6 zT;BZ>O;h-pACc3@9j8*~YwuAf0<86V0zb`?P)<5VLB}v+@Uq`#8%4G3;VYV}L7*8#Kh$VC}S8GN_HhfIbYZHW5fPqcLbe`rWEcxOGQ0INY#`dqzLgqeEKp_2 zMgMWLSJdDUI^|gJN@4#WWqhi5gFR+DS^C8&5KA{H(AwwG@b&Oll+p}T#gf37=FAp}xfz5TTOzPnIp+=duyDsp=DHQ)SXF zZHWdq=fF}PL9#nYo!SP(qmrW{cGp{>$)(xoqG3*!33!5+nhp)SAqaERwMfj#$CzlV zNtL>@LFo@ay>KUm9r90so#9U8#Dho7v37mBT>dEXJm7$lQ5KWWl_GZEgkihPS`Zf0 zBwNkY>Hgd^_)u7q9&9a#6(d7TM}ZY(QYTRBqZx`t!bU^W-1Utr8`7d&^)=y&~19NSxwyZI~r&#GJL4XP6r{Ft1h;2Y*OXuc&r- zVCIJcf(^J)){JB>7o~AImm&RMFK4v45VoNJHBD@UyUQ=KMWSY;#z>5~S%{F(sg7vk zl_wwP3SR>W}k`|cWdD?mu1k~SqSXQ z86@$E5Y4=s1!{w$G@yMyWN`N4{f`Imo8Np4Q+UIWsdv2OsTx(uSw*IAs>j5Ivq)7d z4;k>5qQ}G~iLpx`&JH)F!r!t%D|Qk6a+wG1H>rWs@ogMm{jp-?Qi z4Nl6nl;+u3k`vu4;L>Ix!s}56jtPOVqx%fHz8Hp{n|C3Lo5((zbi{}(V_@wZiQ9rM z&|V}-oDyzB_u+f2J@H1@2gRtjekJBR7r}zg^)x~E39OD-Nc#DO$wgL|-tp>%9y0|J zcu1UlJQxp2hwh`A%R@GC*(9s)>`ZvdTiN9z|FAA{08@3eX~qHzT)9gbL)H#UE#XL+{;0NEx`wsE6Bya$)lDRBS6dCnpwE%N-B8kt<5h?A#3K(72hIC@7Gr1TWomc$`E z6>mmXh`W?lPmjYYh1F=kEf52`-hi!g546=~a}1Pt$vVq%c&sVO5)ldHxNYGyG`@!o z58X+=ojjPTzQa8gpJ8`t7IX7W9eh3^Lpmg{KwtP0CggP!sL!^ctPvlX!H$FYzdAI~ zmnOC66o@-77ZWv1h*eM{X1I>AYldc!OOZBoWB6jSJNXZrBK{ZdpB+ZqGshq--GKH7 z&ZfSZdDxrygt@#e3J(6RVpP4qgY(}>PLk6F>}ZxF{aiWXyHO0|@gsVC>2cIjF{g8i z2bhTY!w@mHlKJvXgY1#kBgYeB;G_6ibZgDU8y_#ij{puXonpT=0k`0SQUv_I{1>;R z24lI!1<>P|vo3eG!%&75U2}9Eo2mbaGajlA9HR`VkIh0wsoUI086zS)@RM!eoy0jd zmT*Tkm#y3@N+h1xp}@Z$yp;#Iaf=Gck5VUkh6=EB*E2X)b_9NP{=sB3eUdRZ6t^sw zLwb1{MhAXVn%<08QHhA7ghdtvM=sl1Emfv{4Dtz zI7pB5}CGk{Kb=j=YrqD@{>1e(FlkV(ZGGXs`1NtE)$HKp`v0bIzYY;J_H?}IXVGA43(@l}a zPE4H{;)>1o19LoW>}(>ur*c6 zuYsXO4aoQ1h_n}*PkF>##vjsPUAG|KIQ$&Pw{oWV@B?T?2vSKsLprNu7bqq=uqAc8 z)Zv64NzSWb_BQ-vR==1@Z>`>e1}{IOU;ke$^Js+SpY%zL-b`xe6$$fh%8=E@8GtEC z?ED*(aO02!ji}uY7gx8kkHy}AyYVz4(K5vvCJm6|EkFw*&oQPS6sWZ1SNzvHhw-=n zj?Zc)@q|DETjKr^j$S*34XSSVx2lx!8JlD;bbUc?qB0p(zPX!0Q%-`e^v;8cma8C~R>~CJIL0>XJ;l}eKk=1H8av&i0<~Z| z@!vePYZ9TjY@I#5xAG+WDj*J4|D9soRY^?uj>~X=G!|bj`h~xj6k)Jc7dKf?f+Vc7 zCr$l-z&Pv$2*gOzkH1t&UfDNDj?Oq(JH294y%--0A& z!XHTX^&V`xu1X^7R%7d~Via(TMXeky8o|p?ADU0?hCB~#*eHr6KkC>h8!jZi-++&k z?8s6RWwQ0xb~yZE5^qOMgJW85bc4+}bV+rfk3lC)hAWdbM%7@ywhgrxIO4B%AUkt6 z<35f$-FEyGhAm6QTp9~SO1i}5MJ|xnn#6XNHgSq?1c87!+#y>u)z{XvKW`g*dPWfb zXU0SP!56M+K4pK$-@ttJLfm^@g7THO>)6i zgSMq9Ko$LkS3mF(5@0|D^L6ODy=o+)hM!)Ilc5JaBAL+p$*leR9 ztZ5uj-ybhXdUULeYHGC6xj%Fb5 z#YC|3sDwSal2kro7>U3;X8ZC%JmSy@OujPB&m70wZPUoI_CY8McPEnbl}Nq6CvjWJ zLp6SevUb_`5oX1Mfivqci+PCG``dAbeH1u*Jciwl1&kw~EWNW?j4s}F0Y#nCS=!=_ z&)eRxb~VZH?cZK%^;?xnF~4E#6G7KajYyW?z>8r*LsLsAIy1cwA>=Po!qqkvC1jkXu-eKBiXWc0nJKHWT8lcb2XDsZNgEv?m&$ zoasydQ1&5RJvCne#I;gnXT1v^ke0(Nn^qjVe2YzX_5uBim3S_98~T>cA-^am~6Y0$`@uZuvdj%P))*) zOQTHnVi6i5I-9)Rb%m4gRgRWyuVm2pF`jU?z{dOcxEofML8wtCj6B-Scx&^L+E{gJ zG}X87qa)z%W^{CXJ3Z9N zWd&(6=;A`M>b3vSRrvv?dwEb5uVz%% zyNph;8dPM*JrLYdjXK-pXw#NIut{VD>z1{n*eVYY@vZ~^`GyZ~w=c*4_NY;-h0)BJ zvl3)_K{a??(;`nZc&Lf+QA|uYj`u(5(KUS0nD3Q{1%aA`FEb6Z>t2Ixw<|e%JsnI2H+WqkNmp9SXjKH?NBIr`hGNtXO*vX}XkWnIxXJqD}ZR#U1PBNh4{ff|c zekP54Ye`@0T4CL>TJ$n8pnaBoXfKinLm^Fqz&!$dVw+Z>8VmrlUUfKn_!C`(JMq-hzN(l?76Bx$?i}l<4^kl zR%p|?caO1eTr_EPuMUari3CxLix|BBHfV6QY442P4D;~~E@1lLmA?sf<4Is;&MVU- zi|JHj;w}cHCIeOu;N8VKrD>VVaCoyXuCy9q&g{3L@5;VnKGj68!cXA!;R}d&$)S`A zheRnHfGlZMqWQ6j@!DC6BT8}Ta6y#Xp6R8t&2v{hTLA!I)?v7EvTPPhnb@HP;MX|bN+K6hLb$7(l-S>hCeg6 zFpd3cwiJeX^a)RDDZD-=M}I4F(B9-McjC}V_=w6Yj-^T-g1u24>#70XyuvF?hoRpgu=I@T&k_){=}f18=gN!3kWn zQ-~zKzQEq}P$M?}2{6_qM$bk+V~tK+!zXzs;6vqHl+`H4UcRmP;!r$X@Nt6qJ9y}& zojNr4;$t*dpGjsdQl!(LzeSBy73PJfCW&AA8AX0*k`)KvG3@#-aNVv7VprXWhma>b zIn|x^>)yllE(y|ls~JY})<7APh=$=Oz}SY1CA0Pd$D|G~*&34kzF?Hzww$i>)g+ZS zw7_vt4Jw5NQA4H#_|r|P;kD-wWf_UBUuKdgcb1U_>RQzLzdjf}^%Wn9J%3pxzh8JWv5L*j=l<38F zuqjf%;G3HY@o$Vpd3heZBKZR^9C-*O(eLmPxy1RRxtwJFEN1&>6+rRl51{Y=1K;+p z#RaCf80VAis3Yb^M;fKc#$(R-EUF5_Pw)_R-D22tBmzra8-NVFbCCLHLe{Rx0`=R4 z%=N*O5Y}J7IMr6M_up7jonj4Es6>l43(?$wGC2E9k7V64 zrAu-$aB-vzHLJUfmX`0~%e#86bXqRR#H!J(d$p)y^#kV_6gYC~q*4C217x{q!@s^$ z@U-d_)HRzChnPpu8_7rCCQhRUA-Z@#om`W)Hf6ZnbO;rfD^bI99I|u~KUp%ziPc=Y8`nE#;ZRyMOx*jx6bT*z zs}m`(@P;-CS^tMgAM`|#$71B7jtrT;ON%c0sY-rL<%MJe3lI0+#xmR}@_Q1d4Vkkj$Z-Q0vqV#TU+jRmES<$d|7` z+LUPX+91d|Ye+`zfc~%Hh#m;I7%Qa;*yQ}br*mKv#>m2z-T{C@WIFQH|XH-hq-<;cO+?ldw6F(DiLS zRz2^>-a;QZziKv7Ye4w)9^tQo2zhlf8>+uJq3mcryI5bC7S>&ct~@1hb(JK&E`M=+ z-wm*GG{A{vvr+u>Q7lm8BjcB+xJLIp^WXV=_Q^>x=B(>!X!#w*VDEfr^7+J_;nmAH z)z`5YlZIbw)$m}#N%o~!9=mI)Gm))c3_l;2;`Li{Bt%@3KJ<;nVCaK>PBz@y{s0TT zT=8iuFNyV(qaP?A7<_yLKLjlCo{9lUb-Kd*|NGSvQ6U;jEs1K11teJRTZI^sxDuUKWABec>1pFH_p<$&gsW{yNAHpl) zg`_;~jeQ6ip;ypHCKl`*4#Gu#XQK6O80I$b#SqR2UQ3lH;!={Nj|w}y`+g68g=C<1 zyeinW+f%t2rI6|=PG&nB;7vJR&c`*sp?H-zDLNoPrZcD6#uhW$IyH+KLAOe2>TC== z$^%>4FM(EYAg*kVhlY|GxHYpD7Tiz)qo^^I@Drh%VSwp$zX*c-F2H>4!1JGb;MW1f z1+wzQH_(O68tKOBVgo4N(u#)&QwkDQ;wp)k3!8Go!##I)<7`1Cl1ig&)KZRt(2 zkIy3Wr@LX;O=UV`a|#^b{fm89Ujc8@Ef{&L4cGR^;>A2mh=%RVsZIOATxH-q6{83bW13n4FWMGv=}NA>9}{bduSPua4l&^Z6V_SBBnN)WpX0xe$&p!7sxR z>`_%qIuh3p!h+H0d*Ubavwk6&BlezY99+*X!Y_*KGcJ;xeu^APXv><^QlALo&+NAzz7%I#; z2qo64bSOKHeHlFu^aUFj&nN+M+<7iEUW@>j{vZ$-5#XpU%>?U9u7o`O1evCduvu*y zd9->zlO}4%J`S~_4bIUJ5wRGn|DAN~=FuQUt6ga4z6q%MW=XH~$6#+!EADwXh;lh1 z^!GBz>YxL-doDK?GhvNE!>FlV#I&mNP&b+mHihCTi zX^C7UI@$9>!Q3!>+LnYDDp%pP=3mT`N-glnJA`LvC{y`C9=fZw7ZtRpQ?IE^>N;nE zw;r0qmCRmHeft=EE}dsqzg_|FD|>;f4OFe|N~yfJAST&c;*Gz(;F>a*7Cp2Nk%#HqSwxeO|D5+ZDW~dKw06?529|Emo8*plp*WdACWGmYglZ za`R;7iDn(7W;ddHXeC}WyoqMJL-B~}U$9C%#a{B@-s3uqikU03 zD9RG{AD_X@*lP*Pi|lFtRx_d^JBnpKO<-H7Oh1(&6IL+BoLT6_=$-h52P+?NGzY8z z@9aXe?oH@GAEHM0D7Ph>g_%Py0OX%xeEK2S@y1ft=n8Q9EqS$fr9H#Vt!BbAzXwIVrLOX_;X2zbnf4S-? zsFTfZihGUAj9BPjaffMd@PlwyE7GuAgSO-!XB}s$(i5+5V9bC8`+ashoN+q^!|gQ? zQz%4l&-;N*TvPJ&+)fzg{Qn{SlDTYV#9b+8QhAF!uQGM<#{8y+(6F1&P0z%JwG1+ zA$fDuIG7HfTg2(&j}(tj#zD-zMewjrfO?ECz}s#-Bqc%>Yp@@@2OOwQK^k!4{Mqk* z;$($?6iE6#WmR&nGMoRKPU2D(NS<>8T62LBO52QA%e~0VtHLD6$^ye&HKRTM)DN$@$TvmxJ$hNE?dh`n;tpR5i3faA|lwImRC{7jLV82Ov58BCd8&gmDDS0 z6P-0-G-O3N@QI30bA}fU+&8eP?-tU-_jzdcwIDco>=|SZ{9?W5j$@_bUl1OTh64{y z!rrkk>}$zE=}}{nk!VJKYbU_mrdTAV8O)51ez<(x7!LkOgkxU%bkWssXz2O^3}*a= zz}Ox}NmPtpz5NEw&R@l^?`ML#sy9xonn_n%n$u%(M`3mO5LzevLV2}|Y(kAHZLc+k z<*s7z=z;*bz3dql=?`;$J>CzCA`0o)DGM>57Bue`==AzK=t9ZCN9@(A;9EGZTpttTPRDLjl zpff@6$eI^2I}U=g<40U^{}IwgUe4opPWbj|CKx-c!*<1+s2I0^N^c8gvIdGU|7r|= zk{p3i`J?P5a|ik|Pzcv;+=B_5SnSS@z?$3AtUwio2DovFL>kdBmqp{BNIwi-&u0 z_6r%3wZt29PI8%?3}F)2DhoTS97+AgTxhhiBy+<#xM{r!Q_VAz4%g0O;p!Z2iE{l? ziJAB<#+A;_$aH*|7Xs01qu3%hZSJoQm#JPa2mQ)l@J9X>9;`ltPJKBJ%T{R8*RNWj zHA{sme0YXC>cZK$YoY9XVGi;+ih$G)8(Q%wij7X}MUR4JHf>Knw68Fr{Th(dF9tFx-FTy=>CAAFySP8+E&< zO<1lb8FLpU_NC(FxkMbkbc$l`eLMk&d>=F7y#FvorJ5C4a0cq{rJ-K82D$V&0@Hk_ z*e>!4#{J5|*<+b#@J*ljT)zlX^(p6fS1rfm!4G_R*n=FnAb<;>*P}OAjWi2Q$5qn{ zF`7q*#GEuBYul6qx+eSEBS;Xf1|;?UyaQ7>}DUVRYXOeY>Zyt$?d%# z4D*Du@ruV9`X_504(8NC8NG$d&aU`H#~uIpt5dQ0=Jd#KI~@OU6++!Fpwy!IZ0|}H zlDT6p4H-;AA3ar4Ag7BZ6-IRKyj5^tWi#wzS7X3eIXYI|k0&yeA>E*r4Kw}(URvtp z(}o=o{oNUs{XWB}(C?@&%|ZU%mk`@OaD^5pz@P0lj8ugeF{@2vg{;kBG^rgUKSg4s z?OUeAJ^(*ic0t}qCn`?wWkkjfz!MC>H@f2}?e`Kz4^H5J(&jW<%AA~d(GRDuZ=)Ui zQ(*NjFWPGugGGxpXyo5>kY;-h%3bVTo1BpAY$e8wslZp^2h&-ZBZtK0pJSRfOH#}f(-I`5HLb-VKoGmqS5+w<7?Vx{I ziOMJ|(%&lHG~t>hCfQbio!2{DAr=ND+n2(`qDoY0y2x$N^Ml1f()8Oq9^$-Rgf`5d zNsl}~&Pr7N<;0&of`!X}u=6e+g(YK0U`LN3vArNloUA4wX+nf-v#(>jb-%OQp9#_O zwr+N#2LYSdF*d(@8mX9&q_x4loF*@8Y9%dAnb(R`^rsKn+!?|37WJ?vwE$Q4sF7<= z8}QT@32IRyPu<-GLHw95(NC+zdLIt(&P#yT8?DHhT5+~2JrpuSPk~O&E3VrXQQ|uH zJgRNgCH1GaFtZwjXhx(wxsjj`o_B{Z;noxG6M@okUeEh_UJp8GrgS7xz6kNdVlJV->cj0 z;W}66InQ~_T=#3Px#pZM8=oQFF4}kv7y-6SH^AZj9C4GNt0MbqCH%F6HM}C!!)Ol% z+d7wneetc}+CTvw2Cym%v-=S)h4*Ac|No0ffhbieFV&{tN>m1 zTf%uEH&N@!6(Id3gSrj-2KuhHL2EWvqvy{Yn3Qufa`X2M1K@NXFb^KUK75#o_TT*o zTG!r1X_jr-_r=-lw{0vk%r633?}dy{v=?+RXn_YUu))6gIygSY6B(Uwht^T2k*1nC zZvD^zzlk-*{x3?vu*GF;t!s@)dFd)PY1Jig$l@z_+f569-_Rax3|GhJmR&~r!%v|g zH$^<*B?EoFyRdGfblCPI+T)vU5$^WSkATqXBzVkmDF~S}AG{f@%d}aW$~-=s4R)uP z!I1Lv%!;tfXj_{aFn!hsv~Wp(@Yj|yB$%`ve7$uK1U9)3z}r^1$+%y302*)t4i zJl4U9Zx4db>6SR)>NaGTX$Adf^kiGEO~#hm>0tKb_V94h8>Crz5{WL9qeMXjy80lC zZQj!Zl^t3LmfcPU=bdJXYz@ya)B3v#H?7QLcS9xE*ToR-7;^xGh!k+rk5;(I*9VXI zKA1^!DHj$6S};Gx4nU~^b3k!>4`{n0gEbu&3HmQHWLIyCLV}?SQH9qtpp;_(Hb#_# zMLJ#ZkIApW_=F=MPO%R>Sa=p0gmr-@-LHca9qhrXZwBzuCpEA(a{-#JxD6FQevc~b zwc&IB&gi761~fd_4&vMQ!58n*AfSJD*lwH?%px=^`T#IQ7~-uB%RdfmA9NVS4SfYviVMJoySKqrU3~>m98L5m4#^^c zMS{D#+v1uK971rn;O-t=7Kh*t3GVK)xC8Icx5GExvFP-D+V>&tuKt+8WW#cCXbsHz2m{>iE+gkM>$aZY7&jsdOhI*a4dzb4MhYb6TQTV9~a9r*_U zpWcW}pumRuzWY0=IYb#L(hwdv1Un4a7)VpV@DuJsAfLE)x-YPPhWj$Qs;u$$U61DCii`~?^-2dmV;k^ z8M#VuK0&p|w1z_H7f22hB@^36kiufTe*k1&F=Q{jA1i_q^e{OOZifM>M?JIR?n zuJf981W|=(e}y31zULC@t|2EHO_)`i%!@hG%Zf@X#7o08vPZejvq{9B$PFRqxFwpM z{CjMT6EB2X@X2KZ1<>UEs3tT(hQv9jlh zIh*zSYwxcEc6C4aC=1e;zRYh%)Xg5Gj`}=dk2HI|b*$eZBsu8D_QA|XQWnt)c@u-S z@vl{*t_F(infpVWt)82(=FfyAn98hGKdyg2S zog48efC|eVxSO2%k^8zMpGw`0k`qIpCZfN=4{Sz{_BRo|?<3-3U4so(-YvGAMNr(= za1E}a_xPM*AVnNmI{IZ4P$;hqG=BWJp|&*rX)e)kfOwj8*_2X$lR0A@!Ank)>}rrm zWx7_D)9Ly(y3r5mpnILADhf%fWh(tsg;mLk*VmV>7p6E|LFil9cwv8wf9dnhoADrR>t^s z9$R14e@V+|xw!Lp`s93m=>KqpuDqLR6qmkjrWad zXZOe07S3Lrcr^uBu(2Wgavcv)UwT|R%=!+RIp3AyQGl<4gZctYbka~--h)HSWz08= zSM}QX)`5V;JT{~LZs>eQb;#le64R~u# zk!HHhpJD}sOW**4Do)$OAcopG=-t26%aDKF)rA8hV()KjNIl&~k!$94xSoL8Nv*{! zpS#Ry?=OD_qf$&1?hMsZx#tMag-~ zX@}-}GlI3ew8_-P5z3%yVXP8|8^y|^n~fjG3Su3CzEmudiRk~u>p92YP_5!26R8u_ zYro+zOYlMpyWs-{Mjr(?Kx@PInkF|L3Mu&1=R>ri7fBr|tlrh7h-;~42prE<2;_v! z{fAy_@V(CN4O?E;wGvyu%+;?#U4austu9Ug;8ShE8*kRb{u9d;=&y)c*x%W{Grq#5 zNFtNnx7s-!Y5>+Eoc+V>=})(PpSG)hBH5AaA>@9fEGVw%8qD5u>JdwWehp_J zADcwIpn$HTc|qkg!N#IHT=_by{nw}38-tU=-d!H}x-f0`XTo2s&baJLYV zM&6_7(4s@&x4{P_T#e>jA_B`~*Bt!Ad2affL)tTQ<82Q%D)ve?=XhI=qH88A;}3m? ztNDN2TJxEjN&q!q-o;GKeYiZz0e-Tw<)I?AzD5vug?l81Vu zEUKuXlec;|g1sK!Oh48mxH~(5S#{DwPEx{>aQ(ws!{LKlaLi)n=5s|j+9pscrN>6dF4Z$&?ysr2H&392UAz)sPFXZ5JkhpY{l#M+)sg(* zk}1~Clk$hmD*p4*Wr!w#kR~^^$GPI|cWcqOVQsMiQ#Usm|Db9fd)su(jfdvGyHHB; z)FpB&veyt_AGvLUD)>dQ3H zzm62v=+|F$3f=$c)-3#1hZ5Z>@bWl>bo7= zA#Mj|^sbWL^aH_XhE8t#mWUJ?uVVMBa~TrW%wmj<1P8l)J!OAPP_NfL<4(lY5E2g` z_BBm96bT18BC6J`qr2o^)#av>A29pA{cQ9#9uNymYCPuI7F~U7hs}-3K)6yj_RY-X zy>6V9%>hjKpN@LHA>zv8CVRu@j|{L@Qji#Hr0(+kJCTL={q3<$rr+;$(7sO&&ygSX zwQAVm-#~~8(u|NiIS*0&j;7>%rrb?|h2-KMddM|^0h0$tTF}p<)U#ax;+k_Wq3svB z0Rk_wLfCJ_TZ3;5U91LFEFg301HDyXOZMY8m(E&bP|->wFnQ29h2JgkT6J7fEa6GzIqv1rcHB+NZ33PsyPR$uaJ>45G(a$W3%2{z zcV1U&66J%yrI(4R-v?TYZ_*bb=!Dr>s8y zL4EFS!ZoDG`ISv@IO+GG z!HJ*C`!7XS2=mP>b1;rPwOhkCS^#2cJme7Jec&`ih=` zexiyQOC6alp^$yBiA`^=M0g`kG0WHq(DQ40?|u3&ie)`thBn(!vO6Jb-~uUXX66wA zjeHHY%1*x+dwj)aU|8Gaq@VsQ=L6TMt7Gg_(O-D{)aSaFB*HV;GUcd4HiEcuO#(R6 zBl2Tdk@E?gVcR5WA+Ob6_{VM<&!TjZ6OSb#?bG~F(-qppl_6Xs;p!+Q>7~#p)b+Et zEUY1R&W6GWRW~I)_aOkDU~#lItE9!M&%hpe)fh%{E>VgI4^<==?Kc>Gl>{ph>-SCExc^w9i_j9^PY`Fe=~{><=I z!p*hve;XgAFgRkoq$?HTrIfT9Wb-xO_BFCu3aLyG+|=DbkU8J?Kdjb-E#kgi=2OGs zz`Bv7&_S1)A(i^_ryA{P*&Yq}TYeCwlG9{Sly?8;HRe&iQN$L^!^OHd-eyrzXZe>* zn%H3@<(+&r>e~x_vpse|@U#_O10Ks@US6x3jSbGN^Mx@+*FQAqr0bB=wLpIwYgr*7 zE!XH1S=cvu-oEKZnYldmtYBL~!u;h&>}poeA@EFRsNn&D^di@{F^X&yj@x($>67m! zuh(_(l2w*-tu1OMbmo0cX8!2cX+g7>gEaz$+m($?w1Bfd#O}=se}XTW5c7}ycE5? z_FH%xX%vN^v|1ylwDN_Q;p6v7f(eU-A}T3&Uq#YovrZnuMI*_v>y&;5FvabCHhzis zUmUXKVv05zN%m2(8KCR2X+_DZm-*QcLTnscUHCpKkAp6eH}$yhm|YFajjd3dX9} zO$`g|uMgjt`1X@~CQGB_kTl^pabJdm?>S_ur?sfw1p$u#S|nKKsVNxkkZ)WD2A&zU zGVV{I5!jDMY|>i#n0(4ZfJm&zUK$aHnJ#IXmM>!n&3aR|H59!+_IDv)hF*NTkU4U8 z875z_?WZwaU%OIl)+1Pdu0R*d&Oz_^(J3cNR$H_zjny?~fUa|!FaM;X53B2(wh6c( z9%%Lw;G!JF4vPezOQl`_+l9ekTjJ95QnGr=a~5vd7Lo)gI(MnxC!E`LmH+My=B8 zgTD;6eYIh-0`#wr`&>SDSV^|vuW7jWs zASYMb-LV_knPhJ&9;D@an2{8+emf*_>K@9r{onvP?6!4LPt6uk=MdR~oK_^;>++DzL(ziM77s;1CZr>u1%g`*F!ig%O^00_Dx0V2863Ss5YsYnCIfeq7z% z+q%_xF5k5i5|M6yibMPCIDCNso-B8@MP5m9yHDr$!VP zDdkE(Nvvx7X1iOkaX5idmjmf9@7nmJG5bvSehgy+5b2stF#=Y;y<{3uL}B(mzPFv>IlZ~cocnm2?5jO5$BikgadkghzrRdghiqUCDqqTM-IHHii z6wZl9Hazwqt|sBFa29{tJ;{PPkv%Q@lwTVPMC(GUW(#w!@1%aTs|1o2&SFY{DkBKl z+o$j8eWWda&q%g;aDQoQ$5$rAFEYBAF2VtP4*dz9k%BLlasB?v(_uA-`#vuRi=Cn! zW-w4;H?70~vm(kdW%=gk$BAA{grlG-W)xB>2sX3O!9K|-2_g7y{ii&;rcQN19>dy5 zTiV-)V)VcsBg^hu~c=&_ql7 zUr6Ywe|^19uow-QCXYgUgN|bv+25LEdFP^v_I@sG8csP&hZCF3rBS!#Yxse>hLCys zhzUh&B%w031*8|TeMOyC-UTuYG4W0lC(ng%o5k5tx*4yBttq84D@TK4o^I6ke#w6G zWR=YAhkkR3ZN(sPlUAQge4Bck@$R9A0%J++H-rI(&E*K$E1KQuSiZL4T$ba`5#DJ+ z02`Aa0k_gJd%mC)i9DF0k_UPIwfrU6nNqNF2xC%}>8m(c>9<~#7y5bUwO}ko5VZ8w zt6><|Yg>%z9p$n$x)>_CY|p_3{KrlA=I8*!#@gZ7r^!U*iiS>6feyD&cEcBh$4#fV zX*^5CB*i_FO`?dm->~{13HaQ9d9+-HC|Uak34WWbcC*Jp3g6#mjN9WU`;kXGb$LQfuornGFkyNL$Y5#&tXuB>en4oG#7#AZ~;~>yLSR9b~W^rkG zdXRtlXm(O^;Cz~cvI|p>Q2eYwcpDDiEZ`UQ+3>4{n+Mt%JgU`^( z+l}&gp63BSX+B`@OU`073HS-}()o)u8d(xGj`O5_`0Jieuoj2#JR!n;!y6eU*X%ZX zz+YJPOq$M(k;S+M7a)iuv7#dR3XMHJ%8A=&xc|29jHzG_+IyWAYy0tGicc=J6{-=j#eD%G!N(~iF z&&PtP3M%;_U+pP`8*z(9qS&gwdP0JNacj2B7J_<0(as{(KTpKn;})i?CHwlbwy zLxCTsX@s=Qg7TKm9C7g;y7?YAwW0$`fAgBg3%GHhJdx7>YBv})f-8qR zj5iFVe@Bly#gL`YlxV{|_pyku#6Bp$CvYT>drotZ5fT}x>t=)DE-a5Sg?hiOtrQX= znYQpN=XpKRCcZ_oE@Z!}rR_PoKWWY&np+le+p9&EJ$l{t4GNn&k~$@gVNpXmQa^PO zU6Hu#y{u|~?Ip?Bj+0zA-P*72+th#K1EK<>c6_OO8Iw%P}32ly5TSIWpo`#Y}spz1r1T?2n z#6+V&gQ#BkmRS{Fbz7=L>hk9sW>voI(a6!{iY#|6ivP{xd-gU>(Wl6p28RZ#NXMc| zT>k&EkY$33Hf1|xy%gc@MPF!i#t{Sc^;yL|L#;Ztz+tE*!l94(&CPWBf+x!yg!#{* zagv)H_l6JI(3d%V)=U=kWd;s{$8rlAc5kUjbi+FP16Q21$&l z40no(M4m6*=JKI;b@$5>rGe3)yUTieQ*BE03Lg6lIi&`Xsv6$y?5)L0g7DgD)IF|l z3eV4le53&I>NJDznP|SRp?E?zJ0H|uFDR(!T6U`P_KEPOZlZYQtEe)I(KYPF`fNTDMG8;(KpdWnr zb&B5+zqi5(aUz@|Qa$u43S8B`cwjGuyYL0_T!|KBL2E~_T^=nCyzr6$NxWBd|Ge=2 zy21?f_JGA0pf8=;nWLG7c-B609${IE7DIE3KmMQ`mxGZscN3`@196b@b&;jSF4)66A~8> zSA}qMn@5`iq6v7mEKEVOH$*ld`d&>nIS~1uK(O5lQDAR4pD{u;H2Xf>_1N{uC|#D5P&G96K7jTW-gruRSfobpanJdG z@XGvvQp2UNcm;BX25fmd>E(&u6!l*C)tA%<{1Yd#`hoUB z^3#r|!|3xyZVKRQcCG*xZw`nOTKuVsdHW&w8Yhrbj&CvSRULzYp~P)BM#B*NuT2+L zMz+oQ>$Mg>ieKkz&7!YX5l8_0;zX<8_hZO7m25$;u5qhI?w6Bsvc(g<@^nGA7<)5Z zNe)$R+Lu*iX@k!F=AfJjUd8Z_m)*k>cioqT@R}x&p!MYcIMXrv3Nh`Ro3Ig&O&4$c z-a?FGZ8~%Ui{w;x!tLUiqWRGX1%0SK;Xl|U`P$Q=vF!0)1@QD7oT6jbE|fX%hmLbu zoo#R3kLJg(ZrMGu9^GVtJBG5rO|8;;>*?uxH6higy%BA`OCqEl+C)*OPYWv9~tG})}O!so_GO*ON>X5B;`ku#5%{y zLsbsE12)sKP$4@aC2`{_p)GuQz29TLrj*sj(^{M*4n)ac^D6;YBKQmInGYCDT37-Xt%=mJuQ?ObxBv2ndcfDTkt zfA9$24BbeODg96wvQuBXGf^Do))LHfJ(OK*xp#J87hL})r?46az`<^e&LyKDBqpIG z29hfnLB63x%F4@)C`3S>dc<8;S@IsqRw*>@o<8J6cRj-A%|^b-qe6z`qhp9kiH*IS zjC3Hg#SI?Lb^$eb9*I+I@LP831f}Ho_K5@Ag z+E>ss0QmJy?;%wFz~A|9-rK)K@h)@fyTr)p;O9IX{XohVka*i;8N@Qc`7lQuPrR+( zg&JTq=- z!|aVP&YK~|J!TF*Ar}8n{*#&i%(tY?6{j2p!Ul^6WMGji02m{>0z_`;)AQn;2% z|J=mmT45x(h*oa7*wDOMplZLVDHad@q?G>N&f**0Kr29CZS-$A?Bf>N>r_Vkik+E- z0U7tOg2oe^jz*!y$?8MBma{arQcZk+GApOjp=<-&)V3)zlfo+r%X%y=vebjo^5GDN zIsK>GcHQ=hWV*p&;{vx%I{ir_;uv>kY_{D z)1qpn$X$}f8cCfoVlo<@QHV!3G3!nd!Q;BawM~OoU^+d-d~k<1cCAx{FH=J!jM>hY zNS$$yDOcBkNq-inuoq3)`ywh61XlFt`_OP1opzjUtHE~H==#Og5i>o+NuQHGm}ovo?7D5bFWK|zWvZDXtueMt0+z*Sy|~Ot&=?OsePVZ+!`MrH ztu4sS{u%c}a%pVP*!2_&bNb}VYlCFW>$dwQezi6>u*L70{@CDrZ8l#HJvv2t55efQ zP6@u!AmFu^W+l_f4jNNk<9Mqw^_VNR^O_Lt(=D>*h&&dy^P!=w!IGXm0eRl%&l2Z!P8P}A`^ts(y>ZD~qvdMT z9yKlz^y`NPoiw@$^5@Q4MofDmOYaBqX2^d0CHV79LR}G*tJJ~vO58C0@$BIUCD4tC z09foPlF-#Wyo{)wo(Y|ZeP`AX^JJ?Tzec?w7Z`&zp1pm6+oHI7w-f8JO-!kc$8Wbg z`lr1ZIGr6uSvzj)(5d80^NFxC{!Uk-;9ET1C_(Zia zJI}0#PIoqLdtZln(E~;^?S+sxgQflcI*D%n6ratKU4z@X0&d5Pl8;tHh zxNv9R#&29mmkq=t$#;W#yI+4^?74lL$~`b zzZNZwIwJ;+hI&FKFxp^9 zJ*TA27Ht(g^JLJs& zCN9Hk^gpp@T#W=oQMEg|z{0ycV&&VZ@5)7!BcRD=YbkL-%&S%$lCFQZ{M#RAZb`j0 z%^15K;qee~b!z@5=guu|5OY~S^k>p#W1I9MIDVmB^I7AOoNygnNOH@ZUP9FUQI~U3 zBLHYjUG8K+vLeXA6X*%QtxrBLHeiN;-DIAGCT`Vz7_SGP{_-%MIE4eE2=Qa+Zzs|lf83LM z)7!F^Ybt0a{NyKc=MNwhMNpF4Lb)^GK{z2m=cqp7_nv;DJ zA_|@xSulH+IH3tfwXKQg_egg$qwi)x1_^&;sWp7!Z1T!o&zC>$Y`R9}&lfXt(RsbC z{-;?sETJ4Ewx=k0N`KI!G)AzqczB-(@0UK~%=a+^=DZ_jNGB`iZfU|1h8CBezn=wJzAA@rZ{E9PXi=OHkE{tfs*GTC-$NRVLVG1R z(^y`gJwXYndzpz!xs3mq-jr1ZEzHbk?F!4DyWbM|9N;OZjTb9i_}^vtkl9eMrIiy* z!QfZW9hV{>t-!^ZVxn><7fA9tI)qM+}P_+4GbG==QlxtHtO^W~+h3*;Xl zJwDah-bu}+nX=}qi>4BvYyStG$AwZ{S*0CYsf(@$FP{VK3@UvVRktk2)kE*NrdL~F zQu)iF%>|g*r4&<|7 zOJN=js@VqZ1#-es&!AA=t+7IRw@jsNMH*qDbqh)>_$tnl(+Hi6{{5riiGp?!l(o~?g_eF;_8|+VCKy`UJ~}K#2@5EhuXGQp`j0qfLsfs{;}Ikb|T* zub1gon{~-dL{a2PLQM%B!&k@OLii^FLLwR>f|?Q{5G7INRsL7|Us&HbHUIzs diff --git a/tailwind.config.js b/tailwind.config.js index 70ab870b5..18de77267 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -15,11 +15,11 @@ module.exports = { lg: '992px', xl: '1200px', }, - colors: { - themeGray: '#121212', - white: '#FFFFFF', + extend: { + colors: { + themeGray: '#121212', + }, }, - extend: {}, }, plugins: [], important: '#__next', From 1055b07749e1d21135f4f9a1404bf6a93780081d Mon Sep 17 00:00:00 2001 From: Subhajit Ghosh <99127578+subhajit20@users.noreply.github.com> Date: Mon, 18 Sep 2023 15:07:37 +0000 Subject: [PATCH 05/31] Replace all styling with Tailwind --- .gitignore | 1 + components/ErrorDisplay/ErrorDisplay.js | 4 ++-- .../__tests__/__snapshots__/ErrorDisplay.test.js.snap | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 454f55e4f..986900664 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ package-lock.json # Cypress local support artifacts cypress/screenshots cypress/videos +cypress/downloads/downloads.html # Logs logs diff --git a/components/ErrorDisplay/ErrorDisplay.js b/components/ErrorDisplay/ErrorDisplay.js index 728aff959..ea234e614 100644 --- a/components/ErrorDisplay/ErrorDisplay.js +++ b/components/ErrorDisplay/ErrorDisplay.js @@ -23,10 +23,10 @@ function ErrorDisplay({ statusCode }) {
-
+

{statusCode || 'Oh no'}!

We're so ashamed. You definitely weren't supposed to see this... diff --git a/components/ErrorDisplay/__tests__/__snapshots__/ErrorDisplay.test.js.snap b/components/ErrorDisplay/__tests__/__snapshots__/ErrorDisplay.test.js.snap index 9589e2054..a8e5cb3b7 100644 --- a/components/ErrorDisplay/__tests__/__snapshots__/ErrorDisplay.test.js.snap +++ b/components/ErrorDisplay/__tests__/__snapshots__/ErrorDisplay.test.js.snap @@ -5,10 +5,10 @@ exports[`ErrorDisplay should render with just required props 1`] = ` className="bg-themeGray w-full h-full" >

Date: Tue, 19 Sep 2023 04:44:01 +0000 Subject: [PATCH 06/31] Converted all the css into tailwind css of Badge component --- components/Badge/Badge.js | 12 ++++++++---- components/Badge/Badge.module.css | 13 ------------- .../__tests__/__snapshots__/Badge.test.js.snap | 8 ++++---- 3 files changed, 12 insertions(+), 21 deletions(-) diff --git a/components/Badge/Badge.js b/components/Badge/Badge.js index 5558d5d71..d3994fa31 100644 --- a/components/Badge/Badge.js +++ b/components/Badge/Badge.js @@ -1,6 +1,5 @@ import { bool, element, oneOfType, string } from 'prop-types'; import classNames from 'classnames'; -import styles from './Badge.module.css'; Badge.propTypes = { className: string, @@ -16,15 +15,20 @@ Badge.defaultProps = { function Badge({ className, icon, isImageFirst, label }) { return ( -
+
{isImageFirst ? ( <> {icon} -
{label}
+
{label}
) : ( <> -
{label}
+
{label}
{icon} )} diff --git a/components/Badge/Badge.module.css b/components/Badge/Badge.module.css index 60bc15962..09e047d15 100644 --- a/components/Badge/Badge.module.css +++ b/components/Badge/Badge.module.css @@ -1,19 +1,6 @@ -.Badge { - display: flex; - flex-direction: column; - justify-content: flex-start; - align-items: center; - margin: 1rem; -} - .Badge > img, .Badge > svg { fill: currentcolor; height: 100px; margin: 1rem 0; } - -.label { - text-align: center; - white-space: nowrap; -} diff --git a/components/Badge/__tests__/__snapshots__/Badge.test.js.snap b/components/Badge/__tests__/__snapshots__/Badge.test.js.snap index 0943d6712..d374183c9 100644 --- a/components/Badge/__tests__/__snapshots__/Badge.test.js.snap +++ b/components/Badge/__tests__/__snapshots__/Badge.test.js.snap @@ -2,11 +2,11 @@ exports[`Badge should render with many props assigned 1`] = `
Badge Icon
@@ -15,11 +15,11 @@ exports[`Badge should render with many props assigned 1`] = ` exports[`Badge should render with required props 1`] = `
Testing
From 46f136de3dd0aef837c5158f93adde3d4d6cc3c5 Mon Sep 17 00:00:00 2001 From: Subhajit Ghosh Date: Tue, 19 Sep 2023 16:39:43 +0000 Subject: [PATCH 07/31] Converted all the css into Tailwind css of Badge component --- components/Badge/Badge.js | 2 +- components/Badge/Badge.module.css | 6 ------ components/Badge/__tests__/__snapshots__/Badge.test.js.snap | 4 ++-- 3 files changed, 3 insertions(+), 9 deletions(-) delete mode 100644 components/Badge/Badge.module.css diff --git a/components/Badge/Badge.js b/components/Badge/Badge.js index d3994fa31..360a1fd33 100644 --- a/components/Badge/Badge.js +++ b/components/Badge/Badge.js @@ -17,7 +17,7 @@ function Badge({ className, icon, isImageFirst, label }) { return (
img>svg]:fill-current [&>img>svg]:my-4 [&>img>svg]:mx-0 [&>img>svg]:h-24', className, )} > diff --git a/components/Badge/Badge.module.css b/components/Badge/Badge.module.css deleted file mode 100644 index 09e047d15..000000000 --- a/components/Badge/Badge.module.css +++ /dev/null @@ -1,6 +0,0 @@ -.Badge > img, -.Badge > svg { - fill: currentcolor; - height: 100px; - margin: 1rem 0; -} diff --git a/components/Badge/__tests__/__snapshots__/Badge.test.js.snap b/components/Badge/__tests__/__snapshots__/Badge.test.js.snap index d374183c9..7db17ae8a 100644 --- a/components/Badge/__tests__/__snapshots__/Badge.test.js.snap +++ b/components/Badge/__tests__/__snapshots__/Badge.test.js.snap @@ -2,7 +2,7 @@ exports[`Badge should render with many props assigned 1`] = `
Date: Tue, 19 Sep 2023 22:22:40 +0530 Subject: [PATCH 08/31] Update components/Badge/Badge.js Co-authored-by: Kyle Holmberg --- components/Badge/Badge.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/Badge/Badge.js b/components/Badge/Badge.js index 360a1fd33..e8318f403 100644 --- a/components/Badge/Badge.js +++ b/components/Badge/Badge.js @@ -17,7 +17,7 @@ function Badge({ className, icon, isImageFirst, label }) { return (
img>svg]:fill-current [&>img>svg]:my-4 [&>img>svg]:mx-0 [&>img>svg]:h-24', + 'flex flex-col justify-items-center place-content-start m-2 [&>img>svg]:fill-current [&>img>svg]:my-4 [&>img]:mx-0 [&>img]:h-24' [&>svg]:mx-0 [&>svg]:h-24', className, )} > From e67dbca02d0fb3c2f69f282171222e889167948e Mon Sep 17 00:00:00 2001 From: Subhajit Ghosh Date: Tue, 19 Sep 2023 17:07:08 +0000 Subject: [PATCH 09/31] Fixed syntax error --- components/Badge/Badge.js | 2 +- components/Badge/__tests__/__snapshots__/Badge.test.js.snap | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/Badge/Badge.js b/components/Badge/Badge.js index e8318f403..f7340a063 100644 --- a/components/Badge/Badge.js +++ b/components/Badge/Badge.js @@ -17,7 +17,7 @@ function Badge({ className, icon, isImageFirst, label }) { return (
img>svg]:fill-current [&>img>svg]:my-4 [&>img]:mx-0 [&>img]:h-24' [&>svg]:mx-0 [&>svg]:h-24', + 'flex flex-col justify-items-center place-content-start m-2 [&>img>svg]:fill-current [&>img>svg]:my-4 [&>img]:mx-0 [&>img]:h-24 [&>svg]:mx-0 [&>svg]:h-24', className, )} > diff --git a/components/Badge/__tests__/__snapshots__/Badge.test.js.snap b/components/Badge/__tests__/__snapshots__/Badge.test.js.snap index 7db17ae8a..b1f44c037 100644 --- a/components/Badge/__tests__/__snapshots__/Badge.test.js.snap +++ b/components/Badge/__tests__/__snapshots__/Badge.test.js.snap @@ -2,7 +2,7 @@ exports[`Badge should render with many props assigned 1`] = `
Date: Wed, 20 Sep 2023 16:47:42 +0300 Subject: [PATCH 10/31] resolve styling problems --- .storybook/preview.js | 2 +- components/Badge/Badge.js | 12 +++- .../__snapshots__/Badge.test.js.snap | 4 +- .../Cards/SchoolCard/SchoolCard.module.css | 70 +++++++++---------- styles/get_involved.module.css | 24 +++---- 5 files changed, 61 insertions(+), 51 deletions(-) diff --git a/.storybook/preview.js b/.storybook/preview.js index fe6ecba18..d3e5f9115 100644 --- a/.storybook/preview.js +++ b/.storybook/preview.js @@ -4,7 +4,7 @@ import * as viewports from '@storybook/addon-viewport'; export const decorators = [ Story => ( -
+
), diff --git a/components/Badge/Badge.js b/components/Badge/Badge.js index f7340a063..95bb7b59a 100644 --- a/components/Badge/Badge.js +++ b/components/Badge/Badge.js @@ -17,7 +17,17 @@ function Badge({ className, icon, isImageFirst, label }) { return (
img>svg]:fill-current [&>img>svg]:my-4 [&>img]:mx-0 [&>img]:h-24 [&>svg]:mx-0 [&>svg]:h-24', + 'flex', + 'flex-col', + 'justify-items-center', + 'place-content-start', + 'm-2', + '[&>svg]:fill-current', + '[&>svg]:my-4', + '[&>img]:mx-0', + '[&>img]:h-24', + '[&>svg]:mx-0', + '[&>svg]:h-24', className, )} > diff --git a/components/Badge/__tests__/__snapshots__/Badge.test.js.snap b/components/Badge/__tests__/__snapshots__/Badge.test.js.snap index b1f44c037..a0b07efb1 100644 --- a/components/Badge/__tests__/__snapshots__/Badge.test.js.snap +++ b/components/Badge/__tests__/__snapshots__/Badge.test.js.snap @@ -2,7 +2,7 @@ exports[`Badge should render with many props assigned 1`] = `
* { +:global(#__next) .cardBrand > * { vertical-align: middle; } -.SchoolCard, -.cardBlock { +:global(#__next) .SchoolCard, +:global(#__next) .cardBlock { box-sizing: border-box; } -.cardBlock { +:global(#__next) .cardBlock { border-top: 1px solid var(--gray); display: flex; padding: 1rem 0.75rem; width: 100%; } -.cardBlockTitle { +:global(#__next) .cardBlockTitle { font-weight: bold; display: block; margin-right: auto; @@ -121,11 +121,11 @@ color: var(--secondary); } -.cardBlockValue { +:global(#__next) .cardBlockValue { font-weight: normal; } -.SchoolCard .modalToggler { +:global(#__next) .modalToggler { min-width: auto; text-transform: none; padding: 2px 6px 0; @@ -136,19 +136,19 @@ border: 2px solid var(--gray); } -.SchoolCard .modalToggler:hover { +:global(#__next) .modalToggler:hover { background-color: transparent; color: var(--secondary); border-color: var(--gray); } @media screen and (--large-viewport) { - .SchoolCard .modalToggler { + :global(#__next) .modalToggler { margin-top: -5px; } } -.badgeGroup { +:global(#__next) .badgeGroup { display: grid; padding: 0.75rem 0; width: 100%; @@ -157,44 +157,44 @@ align-items: center; } -.active figcaption::after, -.inactive figcaption::after { +:global(#__next) .active figcaption::after, +:global(#__next) .inactive figcaption::after { position: absolute; top: -0.75rem; right: 1rem; width: 1.25rem; } -.active figcaption::after { +:global(#__next) .active figcaption::after { stroke: var(--successDeep); content: url("/static/images/icons/Custom/check-circle.svg"); } -.inactive figcaption::after { +:global(#__next) .inactive figcaption::after { stroke: var(--errorDeep); content: url("/static/images/icons/Custom/x-circle.svg"); } -.badgeGroupItem.inactive { +:global(#__next) .badgeGroupItem.inactive { opacity: 0.75; } -.badgeGroupItem.inactive figcaption::after { +:global(#__next) .badgeGroupItem.inactive figcaption::after { opacity: 1; } -.badgeGroupItem { +:global(#__next) .badgeGroupItem { margin: 0.75rem 0; position: relative; width: 95px; font-size: 15px; } -.badgeGroupItem svg { +:global(#__next) .badgeGroupItem svg { height: 32px; margin: 0; } -.badgeGroupItem figcaption { +:global(#__next) .badgeGroupItem figcaption { margin-top: 10px; } diff --git a/styles/get_involved.module.css b/styles/get_involved.module.css index 93acba8b4..d9f3524e8 100644 --- a/styles/get_involved.module.css +++ b/styles/get_involved.module.css @@ -1,4 +1,4 @@ -.GetInvolved .ctaContainer { +:global(#__next) .GetInvolved .ctaContainer { display: flex; width: 100%; max-width: var(--typicalMaxWidth); @@ -6,55 +6,55 @@ flex-wrap: wrap; } -.GetInvolved .ctaContainer > * { +:global(#__next) .GetInvolved .ctaContainer > * { margin-top: 1rem; } -.GetInvolved .topMargin { +:global(#__next) .GetInvolved .topMargin { margin-top: 1rem; } -.GetInvolved .extraTopMargin { +:global(#__next) .GetInvolved .extraTopMargin { margin-top: 2rem; } -.GetInvolved .image { +:global(#__next) .GetInvolved .image { margin: 2rem; max-width: 500px; } -.GetInvolved .cta { +:global(#__next) .GetInvolved .cta { display: flex; flex-direction: column; } -.GetInvolved .centeredText { +:global(#__next) .GetInvolved .centeredText { text-align: center; } -.GetInvolved .image img { +:global(#__next) .GetInvolved .image img { max-width: 100%; opacity: 0; transition: opacity 1s; } -.GetInvolved .showImage img { +:global(#__next) .GetInvolved .showImage img { opacity: 1; } -.GetInvolved .badgeGroupings { +:global(#__next) .GetInvolved .badgeGroupings { display: flex; flex-wrap: wrap; justify-content: center; margin-top: -1rem; } -.GetInvolved .badge { +:global(#__next) .GetInvolved .badge { margin: 1rem 4rem; } @media screen and (--medium-viewport) { - .GetInvolved .heroBannerMobilePositioning { + :global(#__next) .GetInvolved .heroBannerMobilePositioning { background-position: 60% center; } } From 44f4e1b4829d45f0aae232b0d2b6a9cada0065a6 Mon Sep 17 00:00:00 2001 From: Subhajit Ghosh Date: Thu, 21 Sep 2023 17:07:15 +0000 Subject: [PATCH 11/31] Convert all the css into tailwind css of SocialMedia component --- .gitpod.yml | 9 +++++++++ components/SocialMedia/SocialMedia.js | 13 ++++++------- components/SocialMedia/SocialMedia.module.css | 5 ----- .../SocialMediaContainer/SocialMediaContainer.js | 3 +-- .../SocialMediaContainer.module.css | 6 ------ .../__snapshots__/SocialMediaContainer.test.js.snap | 2 +- .../SocialMedia/SocialMediaItem/SocialMediaItem.js | 3 +-- .../SocialMediaItem/SocialMediaItem.module.css | 8 -------- .../__snapshots__/SocialMediaItem.test.js.snap | 2 +- .../__snapshots__/SocialMedia.test.js.snap | 12 ++++++------ 10 files changed, 25 insertions(+), 38 deletions(-) create mode 100644 .gitpod.yml delete mode 100644 components/SocialMedia/SocialMedia.module.css delete mode 100644 components/SocialMedia/SocialMediaContainer/SocialMediaContainer.module.css delete mode 100644 components/SocialMedia/SocialMediaItem/SocialMediaItem.module.css diff --git a/.gitpod.yml b/.gitpod.yml new file mode 100644 index 000000000..9d32f661b --- /dev/null +++ b/.gitpod.yml @@ -0,0 +1,9 @@ +# This configuration file was automatically generated by Gitpod. +# Please adjust to your needs (see https://www.gitpod.io/docs/introduction/learn-gitpod/gitpod-yaml) +# and commit this file to your remote git repository to share the goodness with others. + +# Learn more from ready-to-use templates: https://www.gitpod.io/docs/introduction/getting-started/quickstart + +tasks: + - init: yarn install && yarn run build + command: yarn run start diff --git a/components/SocialMedia/SocialMedia.js b/components/SocialMedia/SocialMedia.js index e4325ec8e..7798e3116 100644 --- a/components/SocialMedia/SocialMedia.js +++ b/components/SocialMedia/SocialMedia.js @@ -6,7 +6,6 @@ import YouTubeLogo from 'static/images/icons/youtube_logo.svg'; import LinkedInLogo from 'static/images/icons/linkedin_logo_circle.svg'; import SocialMediaContainer from './SocialMediaContainer/SocialMediaContainer'; import SocialMediaItem from './SocialMediaItem/SocialMediaItem'; -import styles from './SocialMedia.module.css'; function SocialMedia() { return ( @@ -14,32 +13,32 @@ function SocialMedia() { } + svg={} /> } + svg={} /> } + svg={} /> } + svg={} /> } + svg={} /> } + svg={} /> ); diff --git a/components/SocialMedia/SocialMedia.module.css b/components/SocialMedia/SocialMedia.module.css deleted file mode 100644 index 597b08726..000000000 --- a/components/SocialMedia/SocialMedia.module.css +++ /dev/null @@ -1,5 +0,0 @@ -.logo { - fill: var(--white); - height: 26px; - width: 26px; -} diff --git a/components/SocialMedia/SocialMediaContainer/SocialMediaContainer.js b/components/SocialMedia/SocialMediaContainer/SocialMediaContainer.js index 8475e3d6a..7d576a44e 100644 --- a/components/SocialMedia/SocialMediaContainer/SocialMediaContainer.js +++ b/components/SocialMedia/SocialMediaContainer/SocialMediaContainer.js @@ -1,10 +1,9 @@ import { arrayOf, element } from 'prop-types'; -import styles from './SocialMediaContainer.module.css'; SocialMediaContainer.propTypes = { children: arrayOf(element).isRequired }; function SocialMediaContainer({ children }) { - return
{children}
; + return
{children}
; } export default SocialMediaContainer; diff --git a/components/SocialMedia/SocialMediaContainer/SocialMediaContainer.module.css b/components/SocialMedia/SocialMediaContainer/SocialMediaContainer.module.css deleted file mode 100644 index 007509383..000000000 --- a/components/SocialMedia/SocialMediaContainer/SocialMediaContainer.module.css +++ /dev/null @@ -1,6 +0,0 @@ -.SocialMediaContainer { - display: flex; - flex-direction: row; - justify-content: space-around; - align-items: center; -} diff --git a/components/SocialMedia/SocialMediaContainer/__tests__/__snapshots__/SocialMediaContainer.test.js.snap b/components/SocialMedia/SocialMediaContainer/__tests__/__snapshots__/SocialMediaContainer.test.js.snap index 6a16c16d3..9e7eeff50 100644 --- a/components/SocialMedia/SocialMediaContainer/__tests__/__snapshots__/SocialMediaContainer.test.js.snap +++ b/components/SocialMedia/SocialMediaContainer/__tests__/__snapshots__/SocialMediaContainer.test.js.snap @@ -2,7 +2,7 @@ exports[`SocialMediaContainer should render with required props 1`] = `
Testing 1 diff --git a/components/SocialMedia/SocialMediaItem/SocialMediaItem.js b/components/SocialMedia/SocialMediaItem/SocialMediaItem.js index 599c395b4..e4a2ecb2e 100644 --- a/components/SocialMedia/SocialMediaItem/SocialMediaItem.js +++ b/components/SocialMedia/SocialMediaItem/SocialMediaItem.js @@ -1,7 +1,6 @@ import { node, string } from 'prop-types'; import OutboundLink from 'components/OutboundLink/OutboundLink'; import ScreenReaderOnly from 'components/ScreenReaderOnly/ScreenReaderOnly'; -import styles from './SocialMediaItem.module.css'; SocialMediaItem.propTypes = { name: string.isRequired, @@ -11,7 +10,7 @@ SocialMediaItem.propTypes = { function SocialMediaItem({ name, href, svg }) { return ( -
+
} /> @@ -16,7 +16,7 @@ exports[`SocialMedia should render with no props passed passed 1`] = ` name="Twitter" svg={ } /> @@ -25,7 +25,7 @@ exports[`SocialMedia should render with no props passed passed 1`] = ` name="Instagram" svg={ } /> @@ -34,7 +34,7 @@ exports[`SocialMedia should render with no props passed passed 1`] = ` name="YouTube" svg={ } /> @@ -43,7 +43,7 @@ exports[`SocialMedia should render with no props passed passed 1`] = ` name="LinkedIn" svg={ } /> @@ -52,7 +52,7 @@ exports[`SocialMedia should render with no props passed passed 1`] = ` name="GitHub" svg={ } /> From 1339530fb6e58d93bb82905a193634065ea046d5 Mon Sep 17 00:00:00 2001 From: Subhajit Ghosh Date: Thu, 21 Sep 2023 17:10:52 +0000 Subject: [PATCH 12/31] Convert all the css into tailwind css of SocialMedia component --- .gitpod.yml | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 .gitpod.yml diff --git a/.gitpod.yml b/.gitpod.yml deleted file mode 100644 index 9d32f661b..000000000 --- a/.gitpod.yml +++ /dev/null @@ -1,9 +0,0 @@ -# This configuration file was automatically generated by Gitpod. -# Please adjust to your needs (see https://www.gitpod.io/docs/introduction/learn-gitpod/gitpod-yaml) -# and commit this file to your remote git repository to share the goodness with others. - -# Learn more from ready-to-use templates: https://www.gitpod.io/docs/introduction/getting-started/quickstart - -tasks: - - init: yarn install && yarn run build - command: yarn run start From 116d86b3a2ab70230bfc6016cd00f256f3fb0422 Mon Sep 17 00:00:00 2001 From: Subhajit Ghosh <99127578+subhajit20@users.noreply.github.com> Date: Fri, 22 Sep 2023 08:11:15 +0530 Subject: [PATCH 13/31] Update components/SocialMedia/SocialMediaItem/SocialMediaItem.js Co-authored-by: Kyle Holmberg --- components/SocialMedia/SocialMediaItem/SocialMediaItem.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/SocialMedia/SocialMediaItem/SocialMediaItem.js b/components/SocialMedia/SocialMediaItem/SocialMediaItem.js index e4a2ecb2e..0f2643372 100644 --- a/components/SocialMedia/SocialMediaItem/SocialMediaItem.js +++ b/components/SocialMedia/SocialMediaItem/SocialMediaItem.js @@ -10,7 +10,7 @@ SocialMediaItem.propTypes = { function SocialMediaItem({ name, href, svg }) { return ( -
+
Date: Fri, 22 Sep 2023 04:28:51 +0000 Subject: [PATCH 14/31] Convert all the css into tailwind css of SocialMedia component --- .../__tests__/__snapshots__/SocialMediaItem.test.js.snap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/SocialMedia/SocialMediaItem/__tests__/__snapshots__/SocialMediaItem.test.js.snap b/components/SocialMedia/SocialMediaItem/__tests__/__snapshots__/SocialMediaItem.test.js.snap index 47fb81dee..ab8b7d4bb 100644 --- a/components/SocialMedia/SocialMediaItem/__tests__/__snapshots__/SocialMediaItem.test.js.snap +++ b/components/SocialMedia/SocialMediaItem/__tests__/__snapshots__/SocialMediaItem.test.js.snap @@ -2,7 +2,7 @@ exports[`SocialMediaItem should render with required props 1`] = `
Date: Sat, 23 Sep 2023 04:35:44 +0000 Subject: [PATCH 15/31] Converted all the css into tailwind css of Modal component --- components/Modal/Modal.js | 10 ++++++---- components/Modal/Modal.module.css | 18 ------------------ .../__tests__/__snapshots__/Modal.test.js.snap | 4 ++-- tailwind.config.js | 2 ++ 4 files changed, 10 insertions(+), 24 deletions(-) diff --git a/components/Modal/Modal.js b/components/Modal/Modal.js index 9b8372686..19b2a6bb2 100644 --- a/components/Modal/Modal.js +++ b/components/Modal/Modal.js @@ -2,10 +2,8 @@ import { node, string, bool, func } from 'prop-types'; import classNames from 'classnames'; import * as Dialog from '@radix-ui/react-dialog'; import { gtag } from 'common/utils/thirdParty/gtag'; -import CardStyles from 'components/Cards/Card/Card.module.css'; import CloseButton from 'components/Buttons/CloseButton/CloseButton'; import { MODAL_CONTENT, MODAL_OVERLAY } from 'common/constants/testIDs'; -import ModalStyles from './Modal.module.css'; Modal.propTypes = { children: node.isRequired, @@ -41,7 +39,7 @@ function Modal({ @@ -50,7 +48,11 @@ function Modal({
{children} diff --git a/components/Modal/Modal.module.css b/components/Modal/Modal.module.css index d80683e4b..245e48228 100644 --- a/components/Modal/Modal.module.css +++ b/components/Modal/Modal.module.css @@ -2,24 +2,6 @@ position: relative; } -.overlay { - background-color: rgba(255, 255, 255, 0.5); - position: fixed; - inset: 0; -} - -.modalContent { - position: fixed; - align-items: center; - justify-content: center; - overflow: hidden; - width: 80%; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); - z-index: 2; -} - .scrollableContainer { margin-top: 2.5rem; overflow: auto; diff --git a/components/Modal/__tests__/__snapshots__/Modal.test.js.snap b/components/Modal/__tests__/__snapshots__/Modal.test.js.snap index b2fa59f04..c87b4ba13 100644 --- a/components/Modal/__tests__/__snapshots__/Modal.test.js.snap +++ b/components/Modal/__tests__/__snapshots__/Modal.test.js.snap @@ -17,7 +17,7 @@ exports[`Modal should render with many props assigned 1`] = ` />