From 3b3fe85c46e0c841666390a930c5e871db7c1bcc Mon Sep 17 00:00:00 2001 From: Eric Truong Date: Wed, 25 May 2022 18:43:21 +0000 Subject: [PATCH 1/4] Removed the Superhero Name part --- client/src/components/Home.js | 2 -- client/src/components/SuperheroName.js | 19 ------------------- 2 files changed, 21 deletions(-) delete mode 100644 client/src/components/SuperheroName.js diff --git a/client/src/components/Home.js b/client/src/components/Home.js index e9e90c7..67114d1 100644 --- a/client/src/components/Home.js +++ b/client/src/components/Home.js @@ -1,5 +1,4 @@ import Header from "./Header" -import SuperheroName from "./SuperheroName" import SendFiles from "./SendFiles" import "../styles/button.css"; import "../styles/containers.css"; @@ -250,7 +249,6 @@ class Home extends React.Component { return (
{this.state.appState == "Choosing" &&
} - {this.state.appState == "Choosing" && } {(this.state.appState == "Choosing" || this.state.appState == "ReadyToSend") && { - return ( -
-
- Superhero Name

- -
-
- ) -} - -export default SuperheroName From 1fad314d95fc07621b42cce257fec5b794da421a Mon Sep 17 00:00:00 2001 From: Eric Truong Date: Wed, 25 May 2022 19:33:31 +0000 Subject: [PATCH 2/4] Changed some padding and used a Royalty-Free image for fist bump. https://favpng.com/png_view/black-power-symbol-raised-fist-vector-graphics-fist-bump-stock-photography-illustration-royalty-free-png/NNCbgRGV --- client/src/assets/FistsBumping2.png | Bin 0 -> 18962 bytes client/src/components/WaitForBumpReceiver.js | 2 +- client/src/components/WaitForBumpSender.js | 2 +- client/src/styles/containers.css | 3 ++- client/src/styles/waitforbump.css | 1 - 5 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 client/src/assets/FistsBumping2.png diff --git a/client/src/assets/FistsBumping2.png b/client/src/assets/FistsBumping2.png new file mode 100644 index 0000000000000000000000000000000000000000..6afc744d63e0edcd63dc52cfb6cc93c85c0737c9 GIT binary patch literal 18962 zcmb4qWkA#K_x6yEAxKF}iXhz`(jg5}6Qpw}H9%TGQc^%V1eNaCh>-$P(lrK3NllOz zc|QC8UOun>yy3pjeV@9{b9CX*F%I0NJ3=SJ_G+m z4RlS^G`w|z<^Sn#Sy_M=P@wQNdTI1dd$^Ry7zg3g}j;@)MGQ` z1%I@S2WqqDZ>iwI0V(*3iKfwkx}J`;w7TB`t@yXBZUU$LxrTu_Xj0EJyewenxIpy> z5A*9y-D!O;C8Q z2$B@^ypjq5!jJ+hHoxUHVH{AG7>o*pZizmsf0o~fMuO(sH%x;4(nuX)XSILH2+ z8-VO3uie9u^Ws07;|iSJT2x-!XC~F?3`e}I3uwPNVL8D&dU5n9@d~umlD;x8@{J0S zyP8r<9R6h~KBUw%aGMzACF!@FRgJUK;4}bbXKeiToBaCgz|l}4$ViQN1AK(#^a~=5UXC(ur|h?wVK5)!)k;N-cemHEdKsv zqu=$@mg8~Zq2&WyUN{3N^b_6n)3)RH^pODzedGdRAW&Fd!fWnR`pDL0-1~`m)QL>! z#YpUF1$A-|PHl_vTZ0d5F!<_#E$4%xmIv>q&n|oreTOfE?orge=kfE7V?`|f8|V$h zMUP1JTco(IM+G#)0Yix8_nHrjen&|z%af_!8J{&%N#d4RHq}B^`IG8X;FN$2P{6 z#2oy}cs=ZYH!3yU+^V(n=g$!$`62j{4d6`ShAE89BG7#YJ@((ZzTzNjsTt}kGPuQt zpXu~Y*u`swXJy9(bun2l)z48;E`ra^flbJFqpx(SBEK7u9 zzzMke771VU;U^B?2oaIYlzf2^I8&b-QVsWR5qYx7+)}F3!Kbu-`a1zPQf9&+Py?Z9 z`7LpK4rFRY&84-Igh-i-A}u5=QRY@g2QAmbP=cVIp$kGvqrWI$ryo8Ab3QkGA>P zOL^nb^2tv;G{LIgp8^H;#y6<%dP~t+h9YR%&FF(vlmV-(-^} z^uWsQhADfH&1jQ`92Ff!V9UZ`v^g8Ho7-9b8UjWq>lBSt!mZ(WSNx#1$}Oo(^RuvR zMj%IP^}L2z)2INf_BSrwO;a$6e>|8qd}!w0<^)6>mSv#tg$wH!ADO-Jy8g5a?TF4g z_35ck?<~9enEG&x`A;+uf=Y9Lo9Ys0RKSlSob2xmrN?drN4?6pLKQ3}$Jzu(wt(#! zGjS9b|3-2S;9MlQ|N(EbRi?@*^_{#E%NVYgYmH z%yM77?=se|F9`k4j{u6tPJWyj@HOPIIDpTVe?~1L*Bawb&JaFq^HcD+690&(;VE9v zD)*J<8YKei2h?L1d^*C{@=^%6pCYi4X}-V7BIN=~ahs|^Sn$HkgX6_eud@tNKjZUXI2S^95g?G8qi*I+`+Zo!+G%zEq8jmp6XrhEDSb!Dl}erp(Jh9RPl@pzO|J;dry!J%L=_B^$s0FRHaZlpNhs3E4bl{htc1P0jJuU6j)`P)Z^PKDW$(cj#)j zQD|ZsPI2BWFZ8@Cs;dsrNfwx!_;7+=1%UOQFl*wiJxAO0qrQR=8kpa6TYop*Xdvpt z;o;;)nXQ)!A~wJ^On9luraZih8jkhJruX@nd>#qMhAF)GZ|ho?#hUPFP#HIz5L~QL z4XlB#3D>akM&zoB%5AHi)d& zbwQXY5TcxC$@v8m-T>&%+x212uAYvQ3IZMfhITD802a*cu~~!@-m3RU{NPIvDV9s#a1eaj&{b&0H zEV#Q3TH&-b^(BEiOoEgiCvBzk7$2%KqEI;DvaT^+YMG_Dh9_%;;f}@W9)YErBzjo) zlPnS!MZYVw(**Ib?gNZG0@X;4crLAo!vm3|v~;Px%T(F~N{UqS+SI6Y+ddtjMt8}B z_@VE4Zsh@wkI5KIR31QQ++p-$pbLjd_rOtJ!#9l}V1Rs|z_Cv4w?vuDeSHBIj3NM;e|y1yG}2pndRGPTRas&-3U9z@ zciu?}CAUR#&K{RH#F+V00Iq4j8Sx(#SFz1vL|j01J7qJ+gAFl8eL6h!K#Ejuf%X

#cGlfY5`p-_QWRstdiHiY300yy0Xg48(Z&s3l z_T&5JQ1b8`;ab=$i%l~kRrk++!TYnz`uzTIMy24bWA^ms|BlcMI(;#AS-r9y&VE4n zk44hrPzOe^)kXp!wZ|gqaSHpX;QfNxxHm8ExO{g#dM|ls0OP=dMb98X=1&5}V3W4x zF0b;Lh$|1}EOr28h)l(fRoVu%{D+migvbIf2Cc?e@>Y0c6p3cOczNrKj9i&7t8D{lY-0YI+P?7ykh3lRGbh7B-2G# zd^GRJhN1*zPi`ny^aw&?U75o-G@fi7F$c2n*(nSm)A$MtB$QmfP^)Hl+$4n5W-| z(M5I!VX74zCy;EGT$@?&A;Up-14?UT>#6(Ktks05aZ`o2(@_6g&Bc(4{J0wF4ZoVk z({q{JKy}$Ah@9+*TcQC34F*H8>s6t+n9Ext*MR{vq z41ZhWTlfY37hn)Fg|x|7#a~?vDf?@r@TgVcAxBh<@F?uuHJrhGUBJ|6n$Ca zvj1^4S+dTlk8s`OTdvc2#8Mqn!&$Y!mk`{TBkC|(a@I!7C}SBK0vGn0)B+#z z-#{4=J4JRp;yVO{Qj(P)-_f@&%PIoFl#%PAJZ-L{eEawMW&RD#RdJtLW|Hw{g>TEID0@=DG`1^v6hYF<4z>JU3+g2W z)fTJG{KU1pkgx{;cU;FPQbg|Y`=wJas;PfB=pnLy z{#VlHv+rlSqtqCc9p2qv;pV}BR4`1N(#a{r<^_CO=dF|p<^e~9ct{cKfq z#Nr&GpUNNcy8(3n8e;cR6kM;O96GpLBwD5wt-pD3oKXB|Kl3_oeVr&wcpiguM9MV? zHvJ;{VLc|9aIq;KT4l4%*Wn*E*W$*S$3*6iiL1sC!G64QU+q)FHJ%R=mvDhi*V|WW z8(YP9a}!po$P#)JK|h%sOp$rS^Ucf<=P~#kct0LH{`M`AAvZ6HG6nL^4R>O(cDCxu zgQ=JC*PNzUA3JJUcjTihUKyi#0J_~kOb}AJJ1^$%F*lav6(eorWc>pyxDIX+hu{Cl zBc1)EPf4l6LJzNC`gqQT$9BlcWY0?65(0OD5krN(47dP5_fot}oPp)0{-a3oVx1x*g_(;+H98=gEvCKD(uUHrXnKfHy*<^eH(GkH*|N@( zSnYm=Q>z|VoXWZLJjtTSW_~h$LE;A zt#_GGR)Tcl%gdrFZYJ&@dC54cqC!8bNjV^QzMoRUo+6AL+X(uT^_Z>1pB|gVnoHgJ zK0pckXOB|0##slC5Xo(ms6{VS3oEA&njJh6Biy*Ck;T~^S-5#sRji$t%=y5EE@B&z zVH%Iaunukju7CHgc6n5=Nnc6{6G%95*m!0`kx~=aZi2ZNOtnAXQu2V6q;em3U2!cx11RQU_THJrAO~2q>;VWRDLC zRCY)BnTv~UrTVicPe_O~!^k4GTcn8i9y|yM0+a9W zB)jpNH4SvT8hHoNLk`3`i$L`M%&Fe8$zcWv5>FmrD(1SRwgTi42Mr$l|otmi=L><{vLPRg0Z+@VrW zH|a>A%`&)x)~%GVWYeJb^RAQP43+h2rggBYs8~&cis#XN*(4=)5-8h)5S)l@81Y)d z--q{ub2z0)1Z7*?7rv}#9%ew69kY5X zl}cHOI}^X>sec7+@gT02$N;pMtnLOmKNsLZxQHPlTnJvTZ+{4#H-_oC@IR2BKHT6_ zYzuSa={AH-IVj0Yk+nH}DnB%Wjk!F;UVePv?K7MjB5O&EHIxve{YxNvo1KBj$rq7z`KC8=f$ou_3AD&m=6Pf+frI9$71tVoE+TGg^tSY)7pJQ&B@2e}SP7 zKHvneu#g*HCiY$rWw4lE`&|jj}O9Y!FFe0 zL4AGfa9f3xG#3S%)F7e~~3_=q&kWmV#MeUa7FuPv0;L#V!4Bmb$t zB;$y5Awc{YZuLDIR$mvV4t+_3vuk-2_^H>$uhHov=BfV+3Fv=bh#V!#8s7E>r;_0_ z2|mE0tl5lcf1Fn3+WwkN{+nyrF#{D4s?iX2$gPr8A|?Ge4f!nyKd$M`tAcm+>NHuFdMsZpe*II8A#SSr!USa=RSrbdl# zNM_QCv7nU1a3Le`?KiKeqR+#If6njIiZfw3Cbq%$Zj*MnwVlEYw;#uK{z@_t+ZXRTgOOe)ge5$dz^4d*r~YbOuV_I6?uEU;O@?YY zzkA^1_gwX}iP0h?_rw$Lh;>*Ka@)svA4Z%UZy=X)Rh3y!YZO8(&NlF7wd&KqZiDPjHz zGY;?h!*EOKADnBgY!y-<9=3cO>G<%$p_ZC2cxpZIMU40*?Udq`3g*hi?UR>BAMM5$Y8+KY`8B$!4Jl2Ff3`p z<`R8y$#m9)g>&4cdR*+^b|oRSPVoM6k^F;vpgEPkuxMdW_JGM&XTqG97k!5}Ucpn)Y zJDm9Q)SHju{2DFNPR#*3nq2ZZ&3w<*mm0CnLx8+qiGU`0PBNvS%&*o#lz6qrA?}<< zboNb2WtOaLsuT#XWc^RftDzB2TYtpkl`vi&&d-HflrdKUBk(pY{sAILW`yM|Hx$)a z9dm~Qaj1>RJXdM{^8=|EIsZJa^>|`aA`Oo5(!gBt{WdE=7?&lHjSE*QSK|e?2FaF` zYd&Oo&A5-lAgWdt70|NweLF}mbtT&U+mDd(&0>#QVs0pB02@0cLfh)_?x*0$bLvI& zD0?l@9t6SB)IW_lbN;|#o1M2GaJIx@r8n=T&Al23Q{j_#cZU@#Wnd43HR2>kGyQ&f zc1INquWwg-V-63PxghO7XBP@VsQqs%;>RR}M;@#^zq_XBL#&UyNqHEs!e0bX`y)U& zy~t1=L1&aqPMXkx46X~vfQ4!890=48ho?Y9k$D8rh9R)7+cUd(>i%_op_BQ!2aE_L z%e>%9iaqgp&E^T{-~PA12Q|Y4P`F1);80Nvjm)ogZ)fNhG(b-R_AWu2AR+BM`?tWK zyl24sLPNKhFGxn(EV8s4W%FO`rLhBdFyg#Sw1K8ktu`w(v`+81SZSjAx5>R*=QblA z&7$>2;k~{4M>iFv&W!hJdZZ!a4ScedNa zjlgekk$embfHo7Wipa4N!ox@W1|a4KdcY3pRb*eaS6 z5J_9i`*z9>yCJ7f*nsxq1e_95L5S`fy+EUvlNDr#uoK$9(;cLR5{9BTyp= zcbsiWWVasWAYcYlDk3B2Hx}dL4Ags}`*f+{)}lLjDXsvXTI3M#^pO+V6pNpeOt2@4 zyq1gW6er3lu@D~4-M51y>Rp#_G~r2svF8jhN#!Bxu@NoQILq8{BEzo}E+*^cugL*a z4!ToSML*>i`d&~x!Yri-W)q>366M&xW*-QPX!Nz@rcB1?skZ+mxKE6#o}2;E>oryU zdZJJ&PO_S&sqrU8kX~9Ck@(u55g3PiA<>%cbEyUE5m*I^5tvN zKV{#|L5I|EAW7LYuKTYO8>09piGF&K;T@%eebbdS-=1;$d{sJaygL-w) z_boa)V`}`O(`(`V{pSVnkggXF>f>hWk#t69{)9=Fq7$yA2Ym@X^Olk4yXp*w54irE zA#YC=qxkE?ULKC;pt)d%x%C+;eH&WDaKuwa&!kjzNLLIxI=j@L6QpVHR01HD^2eGw6WL%YgkpV!H6LTten5%LAhau#S{m$ znajaP6#H4}0kFd%9Hb7W#Jc*VvGLsOr_*C;!u6_z9h|3;}|VMtVF0=O2nu6scmr9w&jWK zNWj9&MJ{AQ1G7Yx6>6(o-0S11&P*y6|CT`siesCVJc7XYK=xro5EBo9;tJ$Ynqhy!p_&PfW7trey!Q@*3f~=PXN}oJ5lDm zz$wF;{&NB(sSOuFtpIpQf+Lr6S5YEJn~4WzOJYf{1Ndrz!ZleWoj@idA~4=R!5cHqCHF6v2r^TR zMvoaoYbAbioi&M5Ab2c?k-_k4T`5?Ae<61iI$A@G5IPS*XJ~^iZkY#hsEoJEi z;|aUyGy@SNqpEG!VNJZzhLaf)3?CK7Y7C71nC*Bi^;1pVf1U_JUDd|OBjB25Q!f2w z{qFxHO|tX-yq!Lfov)95Bk4AI_usEq_EH?=?OevC<2nOM8Sc-P`8U<47xB|P5fAl* zJ-N(*zFC|S;QM`+Q=V`(x`Z%!Zj^e%giQFt#n+j7?u1ls%H4N({;YbN5okqGzOK~s zN{Pki9eQACef-c@uT?N5PU$wrhg?Kslgo_j00LFwm1WiI39f6)P^qm= znRo=AAW5@irAxp;wa19Q`8!R zYwEn~uTKp?Jl~LBKa9_xycN8>pUw9LD;e}?{r&m6I9Trz?kL8IOxO@}nqerA;_n*f z!)E~4N4;&UUcF9U95xFoPQC`ZHlw`tu4z)t-{x|72*k6hzVsbhZA$%`SW@6$een8J zT7e}l(Eh$>90LDF+T#S7OjnM#IADeuwpMXm(AwzBOrK?yGAu1Pqw?!I&(aT@@w1b$ zI+1T&ZcPGkCOhV*1!L@mdpX3Fv-dmFLVr zD&-#FpXi%GiNJhr6eaV7iE=Lw3Mh`IatR_y-^sw=5~td~szX5!<3lJAliwFj#h+_X zE}>fP<^Gk!jpYIQUUY#m?L6Ug!kOZ%S;O7p+U*$$0KlfRvBsXu zT(b^et4*_%W+`m-r)8m|ALiTitgqjNk84QU^kD@Y`5_wSi|5P|cN>KX-vfn15Di0$ zeEefPb+71FV+*imSU)TZZ2ZAk{26H#e)kvvx=lzuICaO%Y%zQ0d|n2t#U!-=7L$BE zuYLgER&f~C!Km0sErF?nCZeDE3jK^_reY+5yk#uye0Ef`k}|}zI{ET3Mm7qqW|({i z5(v4aNFLEaQCJ+`L!{7_tj6WWD$4Q*1_t1d$71Q2&%e1Y7va%fJUlT&6M{p9Ot`}d zPdahW(rY}NAP=d3mycGXXMiWc1#5{K57Po3-?TVK(xJfqxLJnQbTX@~3f}RN=;$U2 zPvV<){D&Q-(FL6|h3$C26O|^U*E)I$oWHLReUZA#iREn&JRJWhY=4zh<(Cje^tx;A zAF%IjWoHl#KK{?KykX!=i1_-`!w$y_Kl9%Yec&(;B!b}8wLE!-QSguTv}SQXJ^u&U zC4%Hpw2V}CqeJu|h0Kmn?lWNQ!R8jBk6{y{PVlD?mZ}l1zc<8?ui9sf@(AZ&s|o>I zA_|~Lx-Sf};k#1X7Qu+KayYM>@<%`JQF;CvgF?P1ALDlx1GX1dtC;fu?^I0 z_^Et@vSc9+j+vVC)B5t*IALtgb%GhNT7!1}*Zc{vAEdSLSp`Q$vZf`Jtu#qb2j?`=(bx8e2`u9(B8e{Qj1=pyMHKY1j0HSmEC zC!SV(PF&6=f_$x$#5>}bxebdq9?mW8ilabye>?or@3!&Sz)y>c(E})->jADOV*U&D z8U3^gnj;k*Z55S6iI5y7XDLyC7a7LCtgl8` zR%ZS;Fx*ur5FdeW&9!hn1bY82wB~ynFBVaGAj;M`M8q@|VjD zL(u66vrr!k3J|Bs0q`H+bZeMnC1H~PAsd$3cnrG3W4ep*9l>(n1 zRpLgY2P_bo51|yzlFxrMjF!$hf;}I=eoKZyhu5eD#KX30ljbd=h8C_uMJNz&o$TkS zYCKT0JZsTWi${0w) z{bS<>4>t6dq;7GDA#dvILzs%&tmD5=A(Fen+L&H^xYpZD)Yz5~Jn_fRE2I*J{q5q} z)NpY0pg;@cwKiXH*6P6xCE{&aeTZ0w4clly`a!nOg$^+7^L~noeiHvHH1z9G^T{N? z0r0@`ttHm7Pn;ng5w_6=W2HornoFGFhJfjGq_vHoJi@Bf-~HvZ_}l8t)Q!70ferRD z`2p^$692a?c^s5aFdI^}IY>lIi2TEfSqg*{a$83v0DLQi**65vcxrQA66SKH6oA#G z@dT4!=F)fL-;aYuMToRAMbZtmjgiTWoc$pingQ+-b>|?{0`y1EN?0Q4H1Hu90vW|R zCrI=IV5jEkN;JD*;P_OJlpXe47{?*F!@APzQvQ6=1w zbhSo{uDTuqNUY@=`#tm@C362yX$X267NcA7-hz!I) z{nnY8dx;=SKTo-GUi7sVz~4ClhnztgPu`5j2rtVz74ZR{bAJpl%-4FF=KT2H0ZSW_1Pi3_Y6Z|u%|y5mAvG6 z7|#hczmjX=ktqnj*a$Y?nQFMMX>j8S;xPaon-q8+&yyT&+c;nM6pIHk5;)mbmihF? zR?~J5#_=8exNqY8Mk%qPU1|sn(J68@#V8epTh?^;iT+7$o%L^4XkF;=kj?Jnn@B8m zf5vmvfqGGCb*;o_LBZk3ig=0ob8F4$ycy%U-_S^_aTLZ!ckGlZ(r4!1M60#Tjw|b) z>Wc_NBflgKyXHL(x{hJYeB!pS+rQCy`6o+-x6@{{vp`wTsYx9DGANF_;YmzrV0#y1 zn~eZxkS_ZA?H;N4>~WB*S3}4K!kfCY(@vM1rR1K}7jBA9oiBvfJ#X?J%pFc>sboDp zs=4OcSfGAg{7Q*2SdzczhHKbUydtUAG;5cKw6ysahJ&L6Ihr0ZvX`_=-Bfo}Po;Yt zcq0hAt&FjqNHdzf(}#JW`+9g!uxyLzz|N=)%u4X=nAg!{Np(^1vBj1qsdiyVjl`(? zcvD7PZXn4@iXI zSiY7OCbf7V{?5w%`4-cuB%e~BGtPGHzz|JGbBnmsd&HN9ufa4KW85Qwr=H&uV`oef z_BoYuU8<2cp(oinZv|XacJd=+rYxh5wEN(~gdPiTYtybvl+#?Qm2C~Bwp{o}xLiC4 z=|Jmtx~cu$eP7${q#rfT#@)>;HVC1w?K7+E`?Yh}N6Rr{B3skZlbMlX^!}zsSr;0a zCz&3yxDcIXo-nquXTw#w{es1B5>MDYhk9aYb z$=pmp|7bL9waDJ{RfZQ^-Y4--F8g&=4Ie>Vk#KkITOy8T0?Jb6MvL%Z9d2jC?=NFi z`W{ICrEkzpn!Ajg8AK^2zVN)Q?~W17voR+B_#qH{$H=LXYK;hTW3%<>ir@tv<6>_4 z1MS1fI!nx%SVp_K58)$!N(2sVl<|d1O9$^Vp$sEt*cE*ICQ|UeLRIr8V=Gea;DisBZ>1}D?QuJJ}Aht3MG_Ubb3miIcTq=e4CrBRnt(AwJY zgcKRvAM+CI_3_c%z(WJO7qs%?aCa~8pNn<6NJ&);xBooC?G8#BpP1W;vdQjgvVLVs z>y2_moCV%&o{i6E@}LP`yzFc>1Da6Ulroup@H}Rs|8czK62srmW10{qWm$_iXit($ z`OFz7PQm0Kpy<#Cv-MCZBa_@zgw$I!_@%?en5JTmC|__N*QC@NG?+>gKe0RG`vOj$ zT_52D)ViAzF{GC`{E`#wkLSaP8Ccz^g7Z}Nx3Ix(K5@eh`7AJz9Iud-^qS0>s*+b8 zlA|9c!rG9ISqT&9O}v4qssjOr5irjqm^kid!Jp^8f}Z32F>UazVH?*3g)H;yB33)x9y^p_L%{4?|* zmEjloZC5LI2V5P)QflRR@m}_d5&Z*y-#U5)R}0gnZMj$|^(2v1s`YHtiBc8QrT(iy zUPI>(`{8fmDRwCDM(dvnuLH#ry5w)%T6JGXQ`ZZ72Lz@PdTbCSR8+*M3LQW9iTRpE zr@rS6TK5oFueo6XZ@wJ-%P<$qVtesXxqhxk4ps5xgNI<#x+eaHDFd}Tn9s}PbwOZV zx53MvQO+sts2A0CJPw=#dmsJW1;ic)Q~rpwTPJn|-p`B=v=41!o`t-*pHdnW!%l@(Uh82KR^Ia}L3Q=Kj)iPr6P0ejL8(Pb#P3TT6TMOzbPu zbNA6U#~;PtnFM^h`?8GVqn}w3v9HaeT-@5UJ~&E#U+{jCXVy?{_JiM(sv}%)=U$i8 zy9(l`zweTpN6?-43Q}|th5dfBg$lFZueK4$r0aMC^)O9QiPEfRbA+!nWmFX%_X^{# zlCQt9)Vw(I*!h+i97eQS*}?1}!~MHrT*X4L%QW>`{BW&8XXnse+JREF=uU0_%F-au z?*e=4*n{a#Q&iQXt1pbWG%y+`i9b#mu-oqex!%u53HRID|CRhGqsEwy`)TVThYW;* z*5k^{{r`o=-jkTa^DpU0*`)eHTAOZhMM5H!uKSB=AbTuv`5}40u91!Ht`*Vc`u5OF zg1&JZmmH~$WK6P`D7ZO#Q#8=LKK9nSrlchJ`9X}a*CGD6P2sR?uA%FKc9VeI$jqeI z*0Y_J(`q~{CH;l^k+snmRh7Ui>aiIp-FsU)ZmP4Qcy_2HYk2={ulJn@Ev3z_+v&q4FMYTv zb#XM_za#vr?U|R^4mIZlq_|uG`d3KaWK?Lj;=Z#3(UPXe3JW8Of=`F=b&$;4n6oVZ za}BXfb;tX!3tsjy>YGvJ2a|cq7>8xW6CUXsRWRnfqd#_o**A&O(I$V=YtCN?&K+QN zFh59L+Ec`rdttH!DH&j#~nii(2v1k*9rl@*33br&(q^oTI96o>QDkS@o?EI0*>lCjt-V6hO zn;)mw9WW6_DY3qHJH{fF8})SSuf?TS#7)?4HOQu+zvmC8|2gpYckkD# zR;zh^_%m;7o&_^S)7!jd9V62_+&}QGjoxr{k+?cdyf}PuJM#FJ5JWOnF1Bs>DPby< zzxhGZMhD&h=?9em|K;$?45K6R60Jwg zUr~&cgCwR1L)P6}?GLn`n*zH@f*Zj@|GDMtE@48@UP6cAfe*@naCPAzi!3}b-%n$~ z?qPPx;SLk1s*1Q{^kFNX=f`U)Tim*q^ud1l)s}`LN;`chl@c+5y!YbhrvMBC9W$uv z6LApd{)U?c>uItbZaA4qPzhh?%(C^LyL|*8dd;9i6MqXCLV3Sept`g{_Z5Mbx9RiL zQMloL)?!|Ft@;nNrr*5kwghExxvr46yk(qLBx3~q>~)_3HhV>M)L}71MMUL>n^4M% zPgxh=yUalupXS@Xx4vE0uI-QlU3liJXLhN1C?DOI0DX;fHCeankD6yf;q++lZnwsx z*bhs&*{PU&I!c@pq$N9>%m3SqTNaJB9?yMvtLqDTzA5MO^)G=^tt8g*cA4X=&J~JN z3Smc(gy@bR*I(YC+DBhi3G2GJU5e2S4nfI)PU|tNn1ihQ+cd0GgYS}Xi<5W;WnKDk zJ@JBG9d4QMTgSA}(65HLIXfT`X0iQq?<4@4HEqRh8F~PfBW+g_(R{JQaR$J!P)S}v z-78TsKbne0|0yQNLdGdj{EX)urXUJpEPi5%T172_47iu8)~o+COis84(gQxVE2|k$ z+Ljf^>YW_rWJ)X>X5iZDxj^m^YuOgAQrSM%SL_za z3R(B`QvFpD!X6jb(U!W;AxC#Di$i9G@Xi4 z>0)q1@bQAeFZmebCkt9$mpa%DiwRv*>a)%+) z6bgazZ~%s~e(8}w;bog#fFb#4z))yzfh@l(Hbw8!BIT%G-~Xq&pi+In2$}cv$sgr> zF#>vRu6=dc5Hs%@(X>C79!HK=r{CR93n29{#pq#Uk_1c%R)u*rrt?n#>6@#884!F8 zn7P2$zd=$dIxKz_Q+Ku+T(EA0w9*PQ&nom0zZ(HwJ$Oyb=Yw+;m70lfM9m)KTw2gHC$XM;wcPoYo!qnH6* zRONupx*sLt3D!_vZJ}Z{hD9E))(_CblX7`xjVRyps?oC~13{So(m)s$yw)s#?gc7< zw8Y*uk85EL(-u?-(Xboq?*)7?&s6N@s;F3ck>GHv{`l1b2+g%_9qO}&*pJ}9C+Y}V zsVUSM8$&i;Rslc2!xh?7AgwJ#H>walI#8MVU|>g7E2YC{QqR zGuP{0Q$Sgn+s`cna^BlE`dkxv{wqM^t)8zfgie0ettPTHPyy^r#hg7eX-qT9gqZ6G zrbaByd~~Y}DXJqbM+DTxYyEp}DEH(%p^v~;L8Dy&A%Xb&Ffq&=0$|-{p_mm9r`kFE ztB*&{7``jE9X)S{nH#%oCJBeauPNF)NFlPLC%6wmh&>c(t#}yH{l9e656zegqN#&B zOtHzoiz28dk23!U4cV&0$^NSKN>OM}1ZIx)-u>eXNK)NKj-WOZl=T=yKFhBXcS^4bLkUfPXdLAJ4i;iNV==qL`JtVKNF#$Tkjo1*@Nl;6J1?jm@oFS}Q3XC$v z*178i5AemrR>3N7phE82DZTDq(EIl{u)Wp96FvV|fp(4y$nEu#p&?1_4>U8j$QX-Q zq3D2fM#NknA^{Z2_EWiU<3gur>!SJP0_fX|`RRk?zUo*DQKxdUua!fO5M5CLn%EE@ z=Hb#n){yQt*iG$$RZ*|I^E^@(i?aSsDoL&QJd$yL3=b3Gy|?{+<1ay?fj$K2hM&f* z&zQ#oF-uxly^xA$(eokyW1IJcX+248ejZ^hKeoXt-`fI7pQBf~oJK$^FH<8A0s_uS ziFDe|se5GC=O#XG-EOr~)*Ls)k(U|jAYN@L!aUc3Ok*t(z3w=Jv;kORT#ADtC(#@+o@$!_SbEbG20|U`myH*^xqv(9N{x#{>_0uiDGR zC*37UgG218n2B6@yw;mp9>S`%fY2{A_#;Sb{cdlQPi!^;OFeh9zDCanmBkI1VhOVT z>1(v48OD+lXvJ^j#iX^&D)>jd^>O4ykIvfd>wfYA%-y;n#01820*Lfm35V{Cc}T`91(?zDTHu@2$G5dhHw}ny2B9=sSe_q45%>(0)mo7 zv>u4`EuH?iZ@&HBzVE%?_x)zxzW2)^bxL}Temwx9M)dbUpTz~#{e4+M{RR#4}kL^MMBR7fxxX*oyYH+Ws z`9X;Gz&S5$hMf|2HXiz@%4%aaN&pZVB)(BFh}HJy{2ctoEc3(B3GsBUg+6E7nBs%; z35*@qM&CyGBD?ehDjrh2y^aHpC@pHj*tvB(3c*6W9Z;1Ew7b59!XBWTY*wIEV!mGK z3h)(oG~$6e=BP=c8(3`yE%^=`*#S%ujunRp)yHnLk%MuiA}R>I)%xO`=6KwvyyHb6 zLzdL|CpZN$m!gsQ$h~N{XZ!kY2fs-5vMG5Sq6727#MmI0du0?F+HbAvn>r2SGzx zt$jI21NAdoTj&5!*3evVW@H>5doA#Y#@JE1OE)qCUrU;vi`rjWE`y`~=e^v1R&W5QIz*`#IHLL5ss_y zQYTm1Wk$Zj-oF-g*@M~OGrNHU8tzNPow!f-RqiRZWFvC!#eSGvJ!2>E*oO_SrcSmG zo9~(o1E=!it##@7d9K2KN-#qy3NzdJ`3#ACDKMWX5hVzD;tj#%8t+>U!=71M`%H(^ z<3IWj^({wd?Z*5VKaEjAa+G&+t$3Ru!egqXp)gC^Z@RByc-XipVH2R2Xj`9Rs<$^; zl3H?M!$p!#DmNonrIu9U&xv(t9pU5l_o6n8t((0vQJom#HFui9l2PcW_!`N5+cV9t z=?Eio%q@9H+3oXWW}V^83M9iv2EPlx85JJ{`1W16Im?mn6K_bEU#=?iL@L-R9($Zt z3ZE zHl!jnMb%9Bn5HR^V}qM{82h2j9(cFcwYWtMDaBrhlN_Bp0DWzl6V+nuJ8j`<8e_|} zEqvQy;bn|nSU|hb{{3f;q**e|uaU=;d4vC#^`DtmDk0(gBk@ISu)rIUkMoiaIUAz` zX{Qp;pBVp?#e1w>mZJ@T+=Ip&2Mw0+IS+!}d0VpwTN0;1F@DMMJ*nLI)nX)+KC~$z zSFcombP@J8n$yw9{T8~S=^f-EE^$?0wPU6>*ZY-vh_=Z0iID^Ru<+ALQMBVplY)Wb zYZ3R3%>Uf#ApkE+?#t|T(V4vUpvPu$iGWu@LFAi2BMgwv*8N0XC+PnEiQFjUV8Gwz zDSMK8oH9f`&b{;e@(oCicf<7Y^^2Zdf90xDQTvvn8vFyb#UTRiT_7|Q`(<&!WKZnK zs485UlBs2RIa!Zv&Yho|iDKUN>7A`Q^oNhp8L5igx-|kDYy=~qL>7~6t60m>$Y5Y9 zeN&u8k$P#LIkCb_6$86-|LU8)WkhbSj~{+&2Te_s?G-vePk{`Oo&@xDsAqs^PgH1D z@kKhgSYNge*vkL6Ig)Vs9sx<0M}Vfx41QTCbl3s+;ShE6N}jo=g*wE}KQGhu^1V5Q zCZoHfGI`gEnEvQ)>6ejozU-e-MBq?)49S5Q?&!&uY#Sj3g*brHV-+_&;UUw@-@ Date: Wed, 25 May 2022 19:41:50 +0000 Subject: [PATCH 3/4] Fist-bump image has a tiny bit of top padding: --- client/src/styles/waitforbump.css | 1 + 1 file changed, 1 insertion(+) diff --git a/client/src/styles/waitforbump.css b/client/src/styles/waitforbump.css index f7eb494..fe25797 100644 --- a/client/src/styles/waitforbump.css +++ b/client/src/styles/waitforbump.css @@ -35,6 +35,7 @@ .test-button { font-size: 23px; border: none; + padding-top: 3%; font-weight: 800; max-width: auto; min-width: auto; From 7b97005c32ea83a92db066d0393a7e9451b702c9 Mon Sep 17 00:00:00 2001 From: Eric Truong Date: Wed, 25 May 2022 20:08:09 +0000 Subject: [PATCH 4/4] Added a spinner to the sender to show that the bump actually happened --- client/src/components/Home.js | 8 +++++-- client/src/components/WaitForBumpSender.js | 26 ++++++++++++++-------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/client/src/components/Home.js b/client/src/components/Home.js index 67114d1..1896e73 100644 --- a/client/src/components/Home.js +++ b/client/src/components/Home.js @@ -174,7 +174,10 @@ class Home extends React.Component { date: sensorData.date, } - APIsend(clientData); + // Enable Spinner while we wait for the APIsend + this.setState({showSpinner: true}) + setTimeout(() => {this.setState({showSpinner: false})}, 1000) + APIsend(clientData) // Update Upload Speed this.senderInterval = setInterval(() => { @@ -271,7 +274,8 @@ class Home extends React.Component { + senderLocationArr = {this.state.locationArr} + showSpinner={this.state.showSpinner} /> )} {this.state.appState == "Choosing" && !this.state.showSpinner && ( diff --git a/client/src/components/WaitForBumpSender.js b/client/src/components/WaitForBumpSender.js index d2692f9..f95d2e7 100644 --- a/client/src/components/WaitForBumpSender.js +++ b/client/src/components/WaitForBumpSender.js @@ -43,16 +43,23 @@ class WaitForBumpSender extends React.Component { render(){ return (

- + { + !this.props.showSpinner && +
+ -

-
- FIST BUMP THE DEVICES -
- TO INITIATE TRANSFER! -

+

+
+ FIST BUMP THE DEVICES +
+ TO INITIATE TRANSFER! +

+
+ } + +
)} @@ -63,6 +70,7 @@ WaitForBumpSender.propTypes = { bumpCallback: PropTypes.func, senderLocationArr: PropTypes.array, senderAccPermission: PropTypes.bool, + showSpinner: PropTypes.bool, }; export default WaitForBumpSender