From 6b51b97faa9a306e4b2b6815f304eb4c30c03b51 Mon Sep 17 00:00:00 2001 From: lucywalt Date: Tue, 1 Apr 2025 14:20:58 -0700 Subject: [PATCH 1/4] Changed home to jsx --- frontend/react-app/src/pages/{Home.js => Home.jsx} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename frontend/react-app/src/pages/{Home.js => Home.jsx} (100%) diff --git a/frontend/react-app/src/pages/Home.js b/frontend/react-app/src/pages/Home.jsx similarity index 100% rename from frontend/react-app/src/pages/Home.js rename to frontend/react-app/src/pages/Home.jsx From 634ebbf88d2f27c0820445d45dd30605ec7fb535 Mon Sep 17 00:00:00 2001 From: lucywalt Date: Tue, 1 Apr 2025 14:52:28 -0700 Subject: [PATCH 2/4] Fixed header spacing --- frontend/react-app/src/components/Header.jsx | 7 +++++-- frontend/react-app/src/css/Header.css | 5 ++--- frontend/react-app/src/css/MyTasks.css | 4 ++++ frontend/react-app/src/pages/Home.jsx | 2 -- frontend/react-app/src/pages/MyTasks.jsx | 5 +++-- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/frontend/react-app/src/components/Header.jsx b/frontend/react-app/src/components/Header.jsx index ec1f1d2..c31818a 100644 --- a/frontend/react-app/src/components/Header.jsx +++ b/frontend/react-app/src/components/Header.jsx @@ -2,8 +2,9 @@ import {useCookies} from 'react-cookie' function Header(){ const [cookies] = useCookies(['userInfo']) return( - -

+ +
+

+
+ ); } export default Header \ No newline at end of file diff --git a/frontend/react-app/src/css/Header.css b/frontend/react-app/src/css/Header.css index c10ca26..8c8aa4a 100644 --- a/frontend/react-app/src/css/Header.css +++ b/frontend/react-app/src/css/Header.css @@ -7,15 +7,13 @@ h1.inner-header{ margin: 0; font-family: Calibri; width: 100%; - margin-left: 5%; - margin-right: 5%; + padding-left: 5%; height: auto; min-height: 10%; background-color: #3b3355; display: flex; align-items: center; justify-content: space-between; - } li{ @@ -33,3 +31,4 @@ li.logo a{ font-size: calc(30%+2vw); color: #fefcfd; } + diff --git a/frontend/react-app/src/css/MyTasks.css b/frontend/react-app/src/css/MyTasks.css index 1fb7a6d..c474f7a 100644 --- a/frontend/react-app/src/css/MyTasks.css +++ b/frontend/react-app/src/css/MyTasks.css @@ -41,3 +41,7 @@ div.flexbox{ cursor: pointer; border-radius: 10px; } + + .pageContainer { + width: 100%; + } \ No newline at end of file diff --git a/frontend/react-app/src/pages/Home.jsx b/frontend/react-app/src/pages/Home.jsx index 5cdf98d..f5b9d3f 100644 --- a/frontend/react-app/src/pages/Home.jsx +++ b/frontend/react-app/src/pages/Home.jsx @@ -19,8 +19,6 @@ function setUpDataTasksToDo(obj){ team: taskItem.team, dueDate: taskItem.dueDate - - }] } diff --git a/frontend/react-app/src/pages/MyTasks.jsx b/frontend/react-app/src/pages/MyTasks.jsx index b928d72..c019a05 100644 --- a/frontend/react-app/src/pages/MyTasks.jsx +++ b/frontend/react-app/src/pages/MyTasks.jsx @@ -1,7 +1,8 @@ import TaskList from "../components/TaskList"; import Header from "../components/Header"; -import "../css/MyTasks.css" -import fakeData from "../FakeData/fakeTaskData.json" +import "../css/MyTasks.css"; +import "../css/Header.css"; +import fakeData from "../FakeData/fakeTaskData.json"; import { Link } from 'react-router-dom'; import { getAssignedTasks } from "../api/teamMemberApi"; import { useCookies } from 'react-cookie'; From e5ca2ba89ce21463b83382156461b03375c32b5b Mon Sep 17 00:00:00 2001 From: lucywalt Date: Tue, 1 Apr 2025 14:59:22 -0700 Subject: [PATCH 3/4] Imported logo --- frontend/react-app/src/css/Header.css | 2 +- .../react-app/src/icons/taskboard_checks.png | Bin 0 -> 20681 bytes frontend/react-app/src/pages/Login.jsx | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 frontend/react-app/src/icons/taskboard_checks.png diff --git a/frontend/react-app/src/css/Header.css b/frontend/react-app/src/css/Header.css index 8c8aa4a..2657bec 100644 --- a/frontend/react-app/src/css/Header.css +++ b/frontend/react-app/src/css/Header.css @@ -7,7 +7,7 @@ h1.inner-header{ margin: 0; font-family: Calibri; width: 100%; - padding-left: 5%; + padding: 1% 5%;; height: auto; min-height: 10%; background-color: #3b3355; diff --git a/frontend/react-app/src/icons/taskboard_checks.png b/frontend/react-app/src/icons/taskboard_checks.png new file mode 100644 index 0000000000000000000000000000000000000000..4a585be9adb0574666a070b3f3ea7ebd011bb3b0 GIT binary patch literal 20681 zcmeFZcT`hfw>BCANK={$N|z$Nh|)Um zy|+L}zK#Cg_nh;n0Ba z|6GGWsyMX&zShOz_>VGS4j{aL%9sM5S3g$3FV4R|akFs#DGfZ!0{^Qt7?g$kAJ;%> z5Wz=vDd2<1{fUVu2t@kr>K7-0o0Jv=!VPlJH}*2tP#3pxbK$eLb$e>Z=jY;nRSP8P zCk|Y?*m+qq`MEf|dW!o=G5;wc4qRV7=4WR5Q^dK=S(=!M ziAmDK_L;cuW2Jwp19wu)&%M0d#rgSteSP_SAM&|**z-RS6BFYX5absW{aB%l>aC2q4YS;Ryo41z~GxJqP|Ni+qPFtIQ_v7yE;ryo; zTN{2mXFC@=S1(Wg2Ye6s|GRo#4$uB$gsz_dhyxG||J64@HG%)Onu@!Z%_BfkihjU& z{+S;zP@6yfdV1ON|EB`{f&v1fyaIx}f@1vto*yuLNn0CnF9$DYyFY^a_k8|HP|n%w zzdpSxeL#GJ^oL%{?i(X%XxVD zx_LP1|5=a!t1$nMMgM8;uVDX^zW&_|e-;7Q4bsGt{Qurr(!@n8&YwUaS&+(OIekBz z?KuJ~y7Bb0eUYYOgZkz94}tCYGe2+5d?OVWCNCnAx+hEdJbtgg|0WU*YCLF+Bn-R%?HL9@N_#Cr(<_jEdANkrpI@-cH(zgU-|exvqUu? zw=Oh0s6My{2Z0Hh{^!sC$l(87dO%Nnhn~+G2TUkxX@x)d004=Z&qlQH&Km^QCL5!IIvGW|P2Em2aByEmC!w(SiV55(uJU$pEJ za=2Vsg;W3LOqg z@H;|t(cMN)Y1kRXR4T%>POD~gmt&L0WY5{gSgO)v|FZ^t={F=H(;^)X7=*03&8C=T z5ki8rkQzol%+T)nqHg%)7_nYqyBCx_eAe~e2vgNE2j0I2OiP|=T!t!AHY=J?RL5!{ zZIfi9nug)w^(9MAm|@DMwiCzFMaa3UmV1V5%1SpWPBfwX)-?P04nT8ClexRMC8HM{-l6TPF z4a<}-Ur^$eeDv-X5~=59-=&akn+FF6QbgUiOlA2?yYb}nC%*^)knW~?X4H3Yf; zGGQ4IKH2$M!#eur9t@BCtri@_B+Wh{&om1D5rHDXnw>N-c6rH(cR?66(;nJ>`;rEg z5JpV2iw8x3z`~SFpb8xu?OS-_lpn>g)9krnw(i;ANJ#m!iax7!r5OhRCD{Ad~@T}37b9H<&(9i5r*I&A{A z*@*0710yB}nV-oV~a-GoJtNUxRb;p|d~q9cXLC`8zXgTU#8myZoT#t@lL0udkU_;@`mUNt2}8f}ye%NsZQ?K1Z!72C1FEEX>x12yf(rw z`fyNN?hUotGm#q6Sqt;j&5i5tSD6-(Jvuw4pPy zC60irU5#zJLcjMNc=b7ZVxyCtFd?Y%+K*|%9Ce_QT@7o5EE@c_&r(_kwUOveq>0rd{XTsjqrhn*0d{xG8;(p7Jah&TNFQ49 zIaP!v!Ias`4cNqi^<=q+Z{gPGE!9SJ0v=K$CHgmU%&w|5`g73zwUvbwOrR$pxC@#8 z*i9=ZpqiNo*&E>GxKbw}K%EL-uo(c?zyoJqS&-G{>L>TV7A8jt7`RYb&ig;dExZ(% zq4S*NEz+x+ppY>@Gje_;=u=$PB(JCiW>K0N_Vurkj;6r@!^ghFa{V1d9Tl*%ybrZS z|MsKHA`AMX?0*K)HUSKx&Xs{U>`yWi$)`5EB#T6g;g1h{v{$V<9uceC-MXtJ$|6_kP$1Xys5R#6 z#x#e+p$_VoSjIbWvZ|1(S*EtM!CgoFK&~bNpP;j?>f>Y%5`X4s2SC>9^&nKf!Qxl{ zNsSmyj1uZMq~yAgf#7L=Ey(tnNJ#Xj2wx2rbjqMT=GS%-WcGPISeF4$mkn44E|Zbk z4{gVjkX;#Vibl)UEl8ZaMx91G$6I=Q!=C4TH+vx_N7S5Y*Y612TeJk!=d_Mj=w?VV zu*)>=evr}W`FM>GY(Z{JFWeVs*nIG{$>L|I0fl=!pbyz8;a`7n3)l~&$#VQ$+RPI? zesLT@HyKr5Qetn01NB?XOd9xj^d(@cvcg48rTyRMNOgHzUvU|ier+q#t{j#DRa5Dv zW3AvQZe2@cQ_Cpy)=uW+0zUxM@hN5H%Q(D&bYG}WWV!VN1&pSn5JCL7zS>uVkY1w_ zzq%hdxw&r%zp=FqJvUb`S;oVGnn3FKkC@XDH%)u3?H-NML9CY;kBM?gxy8OKW+?!Y zBy})ed=&Ej#};Ex^n`PMLh6CIVq5cpmH%3*CMWO8X1f$jDyj>aH6ry)5Lp+NQp&RVTj6fqQ zCPGmQK)u&_pP&phEfz^Uj1bjXvP>G_n;wA-7q%$}%(QsA_kl$cG^NxGgG=vg9iUXj z517gDn86-;@UWG65IR^%_H6SBPHS7FvoJ9|MFF8b-VB3>!1aLjNSpSE zH!H007rstttDB|srqfOkcA&&`7Z9uM(NE!Qu*XuS^<7?2a-e0~?n7li1{_c)F&>?n z2XO`!&gi4#1zB=4lDpKbCu zM6z*25sV3+XPvEI3_MZA@VX_C!FUd}Snm|b*x*a=)c}@Lat>{8Xc;UJ+LK>w8?3vk z?~93j(=&-xu@zKT*j*907cGXPV89mRFGo4^qiOxQ$-c5+c{FS$fHjIJgbJ7{6|rR( z*<&)Dv#`E^=Yke`*1zv2+r4w^O(ZmCvZCn@BDg6X6fN7G-yowLZxU2Zb$t`o@GE|e3(6F%XG`OzWwr`|J8(#S%UFxw^Ob48-r41Yja{sBUX=%y zj9S={*&tTxRY=ubKIN2fw+kgh;`O_~Zm6vGuM)DdSY6ws6}}%M`*q=x^#C1#Hrq}8 zcH+Fjd{tBES*$^WdEF^{vJ!J@R5WAG>jR7Z9!OoU3jE?`cf1REg{;+OEE|6UYiwi? zvZ>bx`lo}VcMFVaf;WVH-vM%0qZxVW7*WOa;c@Jc)*)?5S7?5nzt}sMsaqkh@t29= zwyl8yqSAVC(hs7Ea1=ppNleVzxBO#55OI|K4@)8zSQ~j~?nOty9YSHiz;4F<6rR#J zUc$EbM%bI9jg{zN4a~=ta}shzw_TeY`G{%swgOy!oP!4Vc+Ce zs!z?XWBssX>@@agh6crx$BRwxoO9}9mavr7TwwTPoT&jpV9vc9DjY;1L#Y{T1Aq&VEbwka87Ew#nV>yFB1pwaL%J>NK#Nn|NG zZ$+vT8uKyXtkx&BoHt9)#`ooD`Ozn;gPp_S27rJJRbnG=gHPE~yQ=QSF=~hIt5>a8 zNP$c7`xsT=DC5mR$^c)Oyjdj$n3EhB6%LomeV#qeyZEBqze8FMk?i*)F}OjUcOcr zQ@fyO__<+fSMb_(+)?iCldmW+0o%(o1mM&z)E96;lDv+H%GC*f$^$j2`epBZ#@k7h z%6+|i{Z2xpDW>N$HLbj333?f$E={J$za#{Bnq$3HFcOqgXE$43xo?%_Z1}Q-l$v2H z-_8wVijYTyt*`FzYsgqiuyd}4~fR}F|V`M6$V zN0$y6cF&gdtwDlX6r-t1?G=<5fRlKVqQXwFcoFhrsHPHs$yRs|e zs2YH%3pgIVVVGo&agkzmF!jFE{{A-w$oSLR%SV7mIP}&~zdaO3Het-E5f3M|v;bo7 z(3k9~@xmpNi?pi@V!v70M-Tp$HDzqH%MWQen|iN5`2=I35ht10Q<53rkn|4J#>X4; z%VX^m=Y6~_4sE74=W%Fw2EUxF1{cW}+isEoE$u--Pwq1BIjxXyJZ8u?mA+xbpq#YDR=uVlXOf!u?K8C~zQVX^U>|O|5`PNoJ zvhnz~IWyBjZkjRd z6^AL;W%-h5fEMTKd_DU4lfIV6FwTdknG^Nw1mU1a2jWaiV*T?DofK{~19o$lRSFY+%5Sy8e1%Q>Mftl$pUr(HsSR9y?GVzx#?!0-8`$z zkId-g-Rd~g!4SKIUE{>Q%%sn5F({wp2IV(Q0%Ce_Ms@o-+FV!OA;|njYMFBaBeKbM zb$Mb!x>-$EwpC9q*)7giIv&+2=&L2DBCO1`1Sr{EH!!i)r#3bm|^E_jQxp~hOuvh zNg@;Of!xQNz8$?Aj?qZtJNzyPfo{~It>xRGKu0@HdX8SEvW%JO-i{NQiQQ!ArUT!& zzVkafhRG~s;G+1+d&$Xy92NDSwk1GiN zd$$7|!S0Y$U6#LK<0(Lpd}Doz|MzZ|9ngwa;asJ^=;GTgCeT}zZ^VD^z5sMV8`MSh z!(XiNmQxl)9{2Y4-#hnAz}#I-$J6{pIOKW&IJ!^4{g;nilm?8;X)ULa{9jy^2cQ&n zX2UVBV=W*Kv@-@mt)P!Ga!{_Z)iID9q#nQ zNE0Rs3}&JV77wMpM-^GdeO;v>w*_dTqaV@&44Mb9rMgj-Lf}$7Dp&;sdTF#<)RPJWrnY}nOK_k7wrh<*+`AckdBGj* zL>R%i2&_rfMWRFkCY8Q{PF<)$i=2;=`7j#E_yvEMuBflE6XOTA5`ano;s5|f=KOm* zC%VVmGG&HlCrKi^XPr7W^n`1u58h#8B;3B=D)Ec2HrK=z@~~G?Ww`Cz^TGgnB_tl8baK)@UY})l-}6g2?@u)wALVyT99U4_$%1j; z(mUoIFhWM|jBn`8UrDU+mQ~+_gvOk0nh@NT5fq|T;B!k{;bkDB(a+vhKpKcOj;n^OoZWz-H z5U{TRrD1UPDxyQcgVT01leYD>BoTbGLw8Q@PS7357=ZL{Y|r!uoi!FZeqChPr+zPV z#Sf8OF~YK}M83pp5{E5co<^O|XBr9#KY9cVX|4?s$#U(4=Me&Sf%@Uk5?CM$&wjCk zrqbcY+v093kA%*I#wrqx^>p|wV|n!=y*?IhJxmqHCP<8nVD~f&_->J|EgdCl2u2Jc zL-pXyq5#>c|+566k})tu~xy^BJ}i8A;cd$~z!Q%BU*lC^G& zODr0-^JE_6win_@P!qB;0Sg17NzE~mCF|g~tTrl5B-qg(pD47P^B7ZHx>lsp5m*@f zT`ZAWiGY^Be7YF3KDj$KITrfL&{s){*rRWE)+6IZ_wpwdUyO&byg~1i@1LqRYGEb~ z_Wd)dq(b@=VP`h9ou5p;X?o}%>Op-&GB^y2R33KGwQ;FxPo#OhW4 z-cGZ0j55+vbN8v2dN0o@2-w$X6)5eBOFoE+HGOY4(bY&xy58`_*~t!DeYs$HSvcPy zuB-%RXngiQMXE4!B{N6)`YITt%fCN=y$b^5`1U}22-b&z!Sv-Ws7%tg60yW7Uw`NIBEr^1^c zum0Xzr^8pjrt`d?eLt!^y>XzO)`{I~71uXqfx<4*5oPI-md7JP2Y2Sff@_-{1}%Jl zzf%vW7Rf!t9t?+K=szdnfD4q_j<;bwP%AF2%~X*@o_rQa9K6z>a&1Pp6Bm;;-QV4Dq6q6?cfY zL}Y0LWitpCGR;akHPBsJTnD}^hq|~Fz3a!(2uuU+oAOi{h-L_x!(w1?P*1}Rs zJZ9yzn4nxrc}^hkOVx%ZY-Rj-W6DlK{`aVixQykDUKZLGda^J-Q|#6B;GPvb;3rAc zhIaOT-mS$RG`{kvf^>FZ(kZ*2*^S@W7+z@34n94h$}MMjE5y4Hqz~Pu=I%YAE8dup zOeA*-KTF)C!9$0hA0*ry|L{=R6bO*au0+7RbI`Wh2Ng%G-_IO>m|6f{vFC&ik>;t# zovdQ7lFX-ozjX^YE(i^7S|K=SaZ$EgLpWVvN<9S(3^bldVJ=R`cUR^w2~>+r`6B~P zcTTc5enHB4rW&!2ebvejlO(|&KEI`sG@^@dDHVoLW#R`nR|&HYvQ(@Z%f}P&>#=LI zPdX*0y`_)NE5pl)XiEmpNc)sMl~6pcq78jJjj*H&-$H#M?|a8BNWnwhm5XqsN)dSKq}*L5__KC-xWQ(@ zJP@J=4yNR`iNx{G+N9Kgqw9y;Sa=o;k*$RVCVq1?VH6zKJ{I2M zHHgAEes3RdQoS&~j4Rm{_3bFJ-q`8wEW8H|H#?{~P|W;nZV;Vh=RI7?!|YH?(KSF^ zfRW;nLDXpQH7jO00n@QKe7b#$_-H*N|NNF&APSm2%ef1K%zV!9lOw<}aIE&iL}B+Y zrMT-E5^k;?@g;i)V#RB@2Wazlnmnp#=JPr1bYBIm6u+}S9>e++>m?EqncXMfyO381 zpf30X{bJQ2s83n-7{2s2Q6Tp1ZSboAWMOX}nVuQMe8!7GR>IdzgCi9nUNRDBN$6wZ zkn(vAu=TL8YrRvLL?29}6}1*!7DMZ^&ooj@-sy+|_TF7RNQ2{VcQMG*R5~+;av7Vd z@-`DFaZvpLLvB?y`h=I2?Jx(#0?Kgq2{bf?-1o)&oaa(w$a`vlWGpOfb=iqM4jUV} z5k{cub#EbX^91e9@bJfp!9uftBaH;BRMc_0WQoyUuaPEK;zi%?`>`0r$;~x`k9x3i ze+4LY#JUsWs}A!ZV7C1*+*bVXcevr>#}7k=q6W;2A5G0A6&8-V1v?l_3q}jL=(`=K zYnf-=&nY~dRNS?UE_F?R=(wmbsWFf!)qCTBA`G|0QIBLKhTmjvsP#>4eLwxpX4Ge$ zqWZM@_Sf(^JW)KWda8Xt|09z_$QS44X}>J<(m9i-$B~U|ruE2jy%d2j#?alH$inW9 zk!mF4>1=uy`LGXEUQqsDE-M3`Lc$KMT3 zx}B3=KL#W+jwHB)FZ??P>N)%U&`0m{Z`eKhkx73<5V(w7j%3uGz5EfbgyM^rf)x)s zt(WxhC}eSiUtnz3RAWmvALB?!U4L@X!lngAPq-Nsk}c;*kz6=$rYL0?OEkhN&rh4| z3lEh}D*5K{^kO}6;#)r)48J#JtIzzvouJ83O^!UNd{yXo_&oTBjro+%k#oUA;YfD3 z;=}P@vNB@H2AO+F+)?1V^=}<;=V^g;J}Mm9#_ujEnR8%Je@^-MWc`Unt>OY*mu4KN z%--CXUS{&A)d)tb{FgdZc)x+u@2zq-?xs5_oPcJk&|s`%1M73a^*0R+|n_CpYbGp~Tplb8T>sOR`N@J3f;t2&>sAwTyHXnjN+WMTgkopwhzdmvK70L80FKKJjZA3dBtk% znRfo?tZxBVGRF*nmvg_DlcM3R4FfF)?&hj8K5bu!unzQc33>h!2V!Hyx3t03ttm4Q z6ZS>2X3yNa15{0sQfdj6#h{Ns+}kPo?7Bg<$K%t>j4)lNWO+ zd(`Cyrg$J`09GRLJfoBhzFSyqEL-bf@$|L=|8e zMsD96?`OPQcz$~n)w%fe0g%0*4}khlHoDU8{^oQ!rH0?gi!L=|#vmV2Q z-h=3URhjs=L{}B6feNW+lM3FWMo8X|kDf>!PlXeQ6TcL)C~PFXv&{EOFjhbwib_#Y zg}8QIu>fDL!am!)Tb1V)(%#XgM|*Y+-|^e0{TNsZBwz?M_m^|@r;T=}0iBMETmI@1 z8_aOH5r9ORrw{nb>Vw}7l_NY}3>?Ks(XPZC@Ya(~q+hNd;-!+^TDIG)zGN@%bj!#) zn!5%hm4I-{3Ef{*8<|eq9H%{~L!2)JBF`6Mm5C4)Ps0M-W*!(A=q=pBIa{%UVdqhf zWs*I<1FwS}d%A+tws$Lc3C0ycIJtzNGpa9!vYB1JqY+^5?_>8IdojATh&sa@H9?#81x+@m` zFRg=v1hAlJeklj%U+O0D3hODU$p58dM3n&{iMc4M{1ajZ;^=LHs+4~zmNqe9R}DCD ztNs(6wgYYxbz;f?HZ%b2YIjXD9o@gI56?{?{u~ke`br+aazz5mD zp7k#~1NX%9qx$o$xHc0H84IaUsDbD#`pi00@}0n8zWq~)1(Lb#@uAWg-OFSi&|$Eq~KoO+8kUJ84_Fv|X-;f~9BrKgbi9MWB z`*C+v>BMmEz?4eaaETv~PP8uI4#gkDeo4afLL!vJvH4V`H~8ngzQuFq&z+}o6@PBz z+Z;bVebd9WIacqQLG@9xCcmeDHPfcaG6*=DI4P{Q91{kQkh z5i+E&+KOD1ab*JSY>XKN|7_WjD;HnW<-j8szJs3J7B9;%ubCK2N9aCF(%gr6&taz7 zXh|DKLREnS0SYMi){Jm`9}c+j5Nmb%;`p1VQ=c7e)RT8jfTPD{I2l^S3McGEfk_J< zC_V<^)C0=%C6}#Gc^V&>Nw8Mod6G=|gCsZAlEcY2iN9W!loIsz_7rc9S`r8X#dnF_ zCt`eOGE&&@4UM68`3x2=4jtFgQL3sI3x`nyttCaRWp$s{RomC1{DEWsDsO`V9zPsg zVTNC_gHBEFQ`#Y2n{c~+EZ>#^DBFoMwW^&S&K$}u+8S1Tf@T@tGK+V*^@1NxNC2RA zrW-&R2if~1zJzHz=!JUQpE9bsjsV=4Ymjn}C*%i8tNivSXU>r>#w4 z=*5mW`lJK)b3#y4Ci}DES=st$bb!*XrGVIReEP#{r8u&7_fCJc3g${+>qQuL4!kkx zF{ta_%dOn(x6`F^l*irTL#JtLoWo* zWP!`70?Vu0qxRd7=rxVTIJu+#CwJq!p`WVI(zm0h_z8wfGc+gOr0ndSj*)DBbt{pv zU4H=M44QKBR5F-_9gDG)ZlIku6pEG~mvR*r+(^hQi8G_5G5F2=>Uz<-*tf6W0U(n( z*tMzi@nM#hjw_s7d<3LPr2@EMtQt?ig_HuhBu??95MPWkmu8WaGWYlk|DZAkzTE{W ztsA?O8n;)Una}_;hb+us!vM|%(=Mkb0V6W+k$zyWpX`O{@J41j?|IZTE43gFKbkhX z!lo9Cb|r#JKG*4hS)s;*@rNYpb}80G*Sr6qN~$fq5k7xMPw z|IU^{p@ErJ0fwttDraJf7ilz6R4*-=gQ@Wf6F2t}tT~qTS8!3VDJ#i>MWsrJD+sk# zA3u4%UA8pk+ee>$|N462fhXmK>SP+t3AUbk(qtZ`7SrqIGJTl&C`fzoWzGq@qY7)u zmCeN8T5WcD((jTh$Tfn%|3K|SF_h$W-Lw+*n@g2_6xeO-+Z;gn@XDh;s zL8csj*3>xA(e#AWr~;YhT8jmrdezWn+aFEqk^nXD7Q0B&E|n`s*!c zWtz3eA2x6sT6W1G#;J0^A$swoldWG`iC&H1V2(fx);O>& zy1C?{-s+Jz#_km2IUoS-TX;VJnaq~HWk{e_EKx+6Ib&?q`RlzBRLubhfwEf7MP;Nr zDw?EmGF@Dp8#~x(w9I#mv!m0ci(5#9Osg!S-)iai9pNqn50YYk`-V1a7TE;2t(k)r)^Hzw{{oV|O zPzNT)V-pd;`soXk8THS`0%mbs%Y5}LNL2F{UB<~rK?tShRaW2wkvi2FS%Jm4O24JP zxf8sDK)e3dG#E74V%xPLL^~ais_}4vL+g0717n!EU0!~uWrr*;&SVo-xVTj`YbD!l zfxM%oxhN6yPGdP#%X{gXcT%e1ep|l!S)6?*_?^Y0xfcOEa!l4Z3O>$(x0VZBQF6V( zoY=+yEdlbq@gP*syM}Wmd6{#yWoOvt$!FlmI8;_jgdGER9c#P0H%XDzdRf_u`}=3e zcU4!+&1oau+eo5V`rIz$I(hU-(Osb|4v8sRgWT+rh2kF|E3$?* z-VM$yS8~NI8N_|!8XI?E>1SV$eXIes(6F#^|NiV!UuIJrrc#8?3s=f%K8#{o?wZFY zAk%ZTuJt9*vW`D`WNLLwB@JOn@_L07J`QPq`n0n3_~A{k&rQJa%$a^$S{bfaPY)cB z6$-E#Ci+ydy2F`wH{KIm1(@sO46H_VXp+nqch%7cSp993GK}r$UMy!vpc=V=KGgX< zI*X3DAZaCE%j2zO@?dYqv6figYFv@r>hH|cOw#BL$dzkcLFqVC2 z-Rhkum{~R%YbKH7`|B4YY=;H^U@Oc@B=XX}Rgpuk37n=e%NKqs9sh6-##P(eODZ&( zq(+~VI)@%CPAv{TN+NSy(U#?xh%e5)9{K{Em(0S&*z9^R)ZP-?R1Z^2A!;5n5?PbL zWe~M2)p9Mds9WE2^@n~I9y8uf$_Mqt#dZkFXW2tT-Z&W3g4wj6`noV9OCD7!IVMnF zUsl^Q6%9ngA1qy?M&3r+7dJbbG1x&(mCAP_<5Lmyw<}iaN1OWP`fK6Avu=Z~Vpl{l zUo<;76n1bB)=AUx%uQmg>!)kCMzvC!pZl-nU&&kO+BedL>VtE(e*VS_U(>?bZ`_$- ziqcGsM09JHXDgE&btkx{dbMncqE;Sj5aGoJ3+B>qDkc9Dne|ru;6*;9HQcPKqKJxkD3jwtW3(mTQf08 zK6=R6JF)B=ckdRc1SZ@t2)^w5W!HF^6xTEo@D(z>sTvCS@jxmYXz)?3CwI{+czX-U zSdz4GXpA`|FcQ&ABXuqA%tme&v$Ef;I$z1P2(DLlR6_1LVjKkrFdb>B(kp~}^i@QV=QaRz;^V&Q@@DPcDqwtj zIPP>GY4HI1q$Mpm^JUXwvH=M{o#nw^XFhP;o^uAN1A>Fk;GNldnuP~sNsAK>`H}=Z z{}tb?mQOkn20kh^DorV(wiNySGka1i#v1!IPkGNYL16tV%;W||9NLGTnO{yRQf6jO(jNZPeS(vMfjtNv;u)!IpE^Fyg6{rif}r)%S? z?X~V`C#ff_Xf}L`(vVO)K?7UKh;B`JSMVy%?nHNMprB#Mhf$~bdYl`sefdyO$O%VW2{&F*P{8@}&1g)R=9uIlzy#naC(G{jFw-=WE zB5vaK7tzvNC<#ojEIyF`>ch?i z2GWuxWtJ3{CJ_+#j?Pps$H+^Ocvh{d(?vsPl$DEzao;DjeuiJM4tpt}NiqM@?-B*& zUXd~hioV_zKVulxqRLgdoyO}F*vCGN#HkX1py8gWJNJeVfvu9dZ877YhX`4@_iC)~ z__C)G&PYH2kbtbeC$uIjn?YC5NWEN8$nug)vIJ!*cm5D+FC&g69Xh*%gC_~7<6?5& z$uq^{IJ`^g(6g4Q^D!DA1buUnwQa!5I1~U(fGYhf3!VfR9}u`4063mMuNV9Q^n8GF zx;u2}^8N+o;s7XLQxCKI^WA?W-v7nuYk+yodPtx6H`!tlz^tGoVV?27*dKUp0Sy1Y z-RYtUh|k5i$c_xhAM|NNi*2kr7^sTxl?kz!$s$ci z*H`9tOkq%-tu~9?01yIjGUh*Wqf`cV*i*o_`$qXx3~X_$fb7lqgY`WKb`fq`<6*yY zqQI_cI4QIy2YSda(d%oti%#p!Pd7kUI@lNDNF5jmw8ebkqpTJO19_kT*M`Ha!bDC{ zP)Jh9OVBeuNbOb>Y`wChx_%be4To9V`YU?3h#Q+)oMHxIZF+?n1{#qE``?k*H*<+S ztC@@Ur~wf_2?sSXI9T7m$xk>o7B=>59gR5bJne;HSA7<`8?|ND(Sw9lH*%{0ueAkY zQeD0`3_+OHy?_)JIXyoDQ+NZYnD)w7EqK83-V;AX9DBL4u`g4?2dVlc8$*W~{E#h- zAv;avrjCfSO@s*tmbZF_HoMCMVo89bC~I3u0pa3IRkA)^?YjBbP<* zK(=iie1488CEy;jLBPtNPUUr2Fr2uVVS7?S-4k-UulSuD09r9wj4UtF0Ki>@?4rEP zxbeZh6!v*Ee1Tn09+z;qdk@fR^0!y?t1Fk`<1Exb@cC$&?t-kZq!0M@sd3*fhV#bF%+jz7rOb;gPXI$dnX2!Qu1 zc-mCp!mf1hpD_a6!@kt3L#qo9WgJbABwrcEHX)g5|M zuif^F->`Nooc-l?{LZ&-ZD65h%L>Z0Slqnydsu3Ke%LI7{JBY0w_!5yDp4CQa5^zO zw=Mek<%)CJtzzde?sHm`@{eqq1SzT*XGhlbFfLZmgNRpAj@eRqsMG{C$(7Ws3(PIX}f8=J|PYRS3u{1B{J* zlXj6X_`Fk;2m22FWOKo2{fXXzLNVi3^|SmPv{4eG`uOAQa_95_R?oBZY^T9FXsBoa z0ptK|OBwpR&t;6P5U6tb_FT}6I`6zxXPGVHCJsxr?%!K)qDuL(e%_5Ny?@Vb%Cek# zO1dicu5@~sml^#u4*nLd?L$k$r!-R}FKfh}-D<#j(Z!lU}6GOy>L#eN=l%o1*y$(*ysAucKf4?uFWn;dinX%$hP>=wCDGuPlM3Yi9^1G4hfV7 z$r%|~_-e7Nv$b=cg@pd75a)>MhN4t)-f;`9b#g^`8B%*r~k)6l47+UL>w%!N{Y_Uu~uD&T#dKrvPOiPtaO zWb{7;U#!+OW@2qd2R5dMK;6YneeH%VF+oh}hNpPN&fgv8qOm3b0}$kZfD!2az<0Sx=iLGoUKksm%`0%CWr@+g4BB6PMOm{JDI;>9gWFa< zOa0|o!k|p!;z)Z7@z#;qMa}hr*>ocEgPJ5+k0$k#B9hz}?_@0$vL)@x<)!wKryYa5 z3%AQeO&~w(4krx~Ao?&Dg#zp$x6g{y!KN>%>$FkX5qYo?JH0coMPbGk)==bbaf8jg z@q$#6Sv9hJv(C0d?)a-jQ&G<0F1On{x@mfG-3)Otz>;7CJN_|IyWSg{M*bE8oQ1*M z6Y6no)>9n`Qm|UDC5rXaem~c!q$bDBVI0WCN)K-8NrE>gVL`kn$wbcstlQ=QENmqZ z!@m1bV%qmK*WMl=yU+xrS? zXwdBD4@|GobKV$>X;GTp1h??l8;`VuX4b>gZK zIpV{5#FTx>{p4?fci+fo-U^LyXzN%kcu@tLcw5LXXsmY;NFVjCT!`%M2C)LiUBFL( zLUi&?G==sd4jv{&^o|5#fc@7<;tPv)wnJB}f6_hhP0=zb40XX_=l+@h$rn0-!=U!U&?KQ5G`|XfRx>)Ax zAkcNytN#V?otOyBm7)aJ1URgmLkME#_rQW%`~q}pN-WbtfG<#caBOY{0eO*;@~9>$ zR+(VZMD{UdA$7ssc|@weA>%tCfJeFt#PrjA+x*ViLsrCqKeeBRVx&&M!+EuXMZIq+ zu4mNa7G~60h?c_M2<+jRJ4^~hC3Wv(W(O@lpQ1_h0xl+b8m5MCP=CB-=aZ zu=Ld`w}#{_$Z_}5NP{LPlcMb^W_~BJ$}HTkS#ktbOmP{m-&T*1zU2yC%EWVsI1Y>? zYu!cmMs~N!&zG?nT&)6ReU4-RIMLavko@)+`AeUIuVN}j=^}kb9#1{zD&N!4f7`Tz zcL#$n+|s2?`^B3OtxsPO;mi;TfUTPD@B4&!EVI^|*q`btT=-P)sr!!p^sFg5En`XW zfSiLrOCBQtId!mh6UQx6Ldinh`$-+1`UelAdK%QnVfX+IcT2D1 zionE#R*;w1F#tYasJk_22mzePEi1gX$kN~Yf*N-x)aJzP^-tmk%L_{jooZI5MlpIF zn8riKAr=|lK+G_NwLVY78lLaoERhjF*kx$!1c; zMlvLvj_=2Ez3I)$M_)+mY$}dOK~?hj>;-zM6V+ro$oSGm+)mCgie4Cr zUW1Q0`g9JW85`*KYzH2Oi%j+^gqTXpc< zbAo~K*p8OmhKopp;*?Nr1*pOoU6~`{st@->u8)P?XU;cNf+*fWsV8Oxz$=3L4%T^( zi@U^mVcBK!@ltaIL7L?=%@%6%8fG=lFs@glYIaR|VN^;7E*M%91ZU~!oA=9nxQzXr zk1=b<%K}k+T3#dhz2!!tLW*_cZrQODD{o6iYSMG&bP;Q|W(lSKBnnF9?+H%&1`{u^ zn{kiKMt+&-9Pz##@ zJDQaDH8@W`Y^0N7yECMv74HhkBpb>e56Hi$NsO8azBPBRuEc9Y(aSzx#<9ue=-g%0 zp~>a&WIKOozH!(=8R43$Wot6?XnIg(W5`EQB`ZBDCH4a;v3L*rff$U!Jr zWzQ>JP4SuK+ANYXN_Rd=DEat6?*@K;KRaB0G|zqiS#Ji+_3!~K&LM{lrU~B|< z#$SrW=8Tfpm=;G5Sqb;7X~+Ac|ERAl1cM6;N6k{-mT?xJL)kV0-W>ifXr6glJleH$|;Wq zgPvFL68H-=kd@PSIX3&i3&VFtssrTxKL?KXq3Kt?!c@!IY_Ja#QAUECvK$ZxIE3(3W+)uvwmJ}?_QooSU;?=7R(B)XDk!IJ$va&Lg z^m*f06hQFsY7PL9g$wYY^}AzTd+<^Qh@vA=1O7|#lEITBF~FI-0K~2uGCyWZz@TxA z;@Eg0Rw5u6rUV4T1behr-w{8;$7uoR6T|iVJv%dZO~7Sm1nBA0!M1Ja%~~r704g(4 z0L?!h`}ujxn;A(X%IEh@mFlkE z?=HD=!*t_nM);Uc@wH#s7FfCtW$%~@@Uh1fzRu=coXwhpE6>vL-4(fmlRr%4MEK*0y)a{*we`ywPs|AlOm5E zop&6J8TspHNE&q!Zb}dh+!;kKTaf%XO@C093GlV!qoH%dcgDZ~(BcR1^~L?qa0?(z zw7sspWa&SzU2CGh0tlx?QZT=NeQF_ zS-@eNnr?F8Jz5|uiX4(y&KGj@1;DFA->5_>18-04y#!84YE!XR@v?9?p$R}a!$?ZJ z{ZO2(ir`Si_2`HWeDzVDc&@FuhOS=*pU!}Et4i5I9vbI6Ke{80tlt^o-ND&YRqHIs zM>Fa7aA|!r{s8=Ei$&*<-651j6HY0Q6bs1EQCyPuF8-d{Z4C3_3TZjLwu@k zWyT~BJPtHiv%kz90rIPwnklbA3q0zHeItmC>U(zKv=1c8h^ou_o?-7D{;&0x{Nu~s zDIz{y5V*S4+O$%VcZOc-e(z^HjrgZnY5?a+I4qnO#C5Ga|1whNbG`TR^PTnQGR(a| q12UlD+fiaP3
- logo + logo

Our site name

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum condimentum nulla pharetra, ultrices mauris ut, pharetra massa. Morbi sodales in metus in porta. Morbi vel semper ligula, at dignissim eros. Aenean sollicitudin, diam et cursus elementum, elit dui viverra leo, et commodo tortor urna et dolor
From d486c458b4642692e0df05c26abda8c9cdcc94f7 Mon Sep 17 00:00:00 2001 From: lucywalt Date: Tue, 1 Apr 2025 18:22:20 -0700 Subject: [PATCH 4/4] Added logo to login --- frontend/react-app/src/login.css | 24 +++++++++++++++++++----- frontend/react-app/src/pages/Login.jsx | 9 ++++++--- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/frontend/react-app/src/login.css b/frontend/react-app/src/login.css index 62f7411..6c3b884 100644 --- a/frontend/react-app/src/login.css +++ b/frontend/react-app/src/login.css @@ -19,11 +19,6 @@ color:#25274D; } -#siteName h1 { - font-size: 2em; - text-align: left; -} - #siteName img { width: 200px; height: 200px; @@ -90,3 +85,22 @@ background-color: #25274D; cursor: pointer; } + + +#logoBox { + display: flex; + flex-direction: row; + align-items: center; +} + +#logoBox h1 { + font-weight: bold; + font-size: 3em; + /* background-color: red; */ + gap: 0px; +} + +#logoBox img { + margin: 0; + /* background-color: red; */ +} \ No newline at end of file diff --git a/frontend/react-app/src/pages/Login.jsx b/frontend/react-app/src/pages/Login.jsx index 8b50a6e..a694225 100644 --- a/frontend/react-app/src/pages/Login.jsx +++ b/frontend/react-app/src/pages/Login.jsx @@ -1,15 +1,18 @@ import React from 'react'; import LoginForm from '../components/LoginForm'; import '../login.css'; +import logo from '../icons/taskboard_checks.png'; function Login(){ return (
- logo -

Our site name

- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum condimentum nulla pharetra, ultrices mauris ut, pharetra massa. Morbi sodales in metus in porta. Morbi vel semper ligula, at dignissim eros. Aenean sollicitudin, diam et cursus elementum, elit dui viverra leo, et commodo tortor urna et dolor +
+ logo +

Taskly

+
+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum condimentum nulla pharetra, ultrices mauris ut, pharetra massa. Morbi sodales in metus in porta. Morbi vel semper ligula, at dignissim eros. Aenean sollicitudin, diam et cursus elementum, elit dui viverra leo, et commodo tortor urna et dolor