From 98ab2e476c91b972f9c5ea1c32fe5c3083860702 Mon Sep 17 00:00:00 2001 From: Lucas Ryan Date: Thu, 18 Feb 2021 03:44:32 -0800 Subject: [PATCH 01/54] Added the second screen w/stylesheets and js --- public/css/club.css | 67 ++++++++++++++++++++++++++++++++ public/images/abagail.png | Bin 0 -> 2847 bytes public/images/arrowright.png | Bin 0 -> 808 bytes public/images/back.jpg | Bin 0 -> 1125 bytes public/images/discord.png | Bin 0 -> 785 bytes public/images/facebook.png | Bin 0 -> 871 bytes public/images/heart.jpg | Bin 0 -> 2758 bytes public/images/heart.png | Bin 0 -> 726 bytes public/images/instagram.png | Bin 0 -> 1027 bytes public/images/katarina.png | Bin 0 -> 2754 bytes public/images/seeall.png | Bin 0 -> 1153 bytes public/images/tyler.png | Bin 0 -> 2611 bytes routes/club.js | 8 ++++ views/club.handlebars | 72 +++++++++++++++++++++++++++++++++++ views/index.handlebars | 20 ++++++++-- 15 files changed, 164 insertions(+), 3 deletions(-) create mode 100644 public/css/club.css create mode 100644 public/images/abagail.png create mode 100644 public/images/arrowright.png create mode 100644 public/images/back.jpg create mode 100644 public/images/discord.png create mode 100644 public/images/facebook.png create mode 100644 public/images/heart.jpg create mode 100644 public/images/heart.png create mode 100644 public/images/instagram.png create mode 100644 public/images/katarina.png create mode 100644 public/images/seeall.png create mode 100644 public/images/tyler.png create mode 100644 routes/club.js create mode 100644 views/club.handlebars diff --git a/public/css/club.css b/public/css/club.css new file mode 100644 index 000000000..bc1eabd7f --- /dev/null +++ b/public/css/club.css @@ -0,0 +1,67 @@ +.head{ + display: flex; + justify-content: space-between; + align-items: center; + margin: 30px; +} + +.phone{ + display: flex; + justify-content: space-between; + margin:auto; + margin-top: 100px; + max-width: 500px; + height: 800px; + background-color: white; + border-style:solid; + } +.gallery{ + width: 80%; + height: 20%; + background-color: white; + text-align: center; + font-size: 48px; + margin: auto; + border-style: dashed; +} + +.description{ + width: 80%; + height: 8%; + margin: auto; + margin-top: 2%; +} + +.events{ + width: 80%; + height: 16%; + margin: auto; + margin-top: 2%; +} + +.board{ + width: 80%; + height: 16%; + margin: auto; + margin-top: 2%; +} + +.social{ + width: 80%; + height: 16%; + margin: auto; + margin-top: 2%; +} +.con{ + margin: auto; + display: flex; + justify-content: space-evenly; + align-items: center; +} +.e{ + margin: auto; + border-style: solid; + height: 100px; + width: 40%; + text-align: center; +} \ No newline at end of file diff --git a/public/images/abagail.png b/public/images/abagail.png new file mode 100644 index 0000000000000000000000000000000000000000..c9b55831e78a5c5c29c0bc5cade5e2b1574ec952 GIT binary patch literal 2847 zcmV+)3*hvLP)Q-}tZV8+_bMCA8-7`*Eii_nsckWrPF%FCqv`^^Vm2=m2HR5d=YU@A>%|)9Dn;pKH32Mdn)SaE3ZM?(h^v5t}vsn@z-*e9v&W*6v z>Q6)H+=K$SzrRm}rZD3w7z$uC8YM#61_j3VuCK2*gsIR!n} zjW!qT#djf^JHsB^$wYu`)O|A7mKG{3OvYn}J=>5@X)l8G5+Gq!-c`+-LI>z&*_R+6 zeLDx|XLWmfyXpeQ!}xYJF&62$N9c%qHp)J*ePX5_A0Jm;pu?Rq?V?4djrVAo>ngn~ zg;yn0RjFEN%$E#*Le%7sg8PAULs!agR+O?hD@$^v6{ZU`9*wsw%op>Ab+xXQ*dieg zTmzh#t$c~&IJx=?zbYD!#_I#~=i2)KHOG*7LJVEPA~$Tn?*Q}3{Gvv+&J*J3cM%|A zb0F2aa;CFFi~<%*6ybM*)jC|aT_Gxv72=?-7S?H_s?by$EcvdKc`L-Q2`#MJTUJGd zSa&o~M;omWZ<=Te-QYaA&gXMtYpE%Nubr<7G$7D5O~2o# zAWJWBu{xi%G0$bSV3nq8gYkHrROdEkSJK9MwGqR%svR|)n$kqCZ((?CX(6FJ;AxbY zY+H7$gSL%LFPrMHrmZy`v57wV2yxb?0abS_lwC~Pg)V~mtoisNtCb5MAuifpmD4>m zbp@#cR1xB;3+f88D*-B4Z|gfOArcj&?|O)i2fGp=@e$&Q2oYUzd3l*!U8hsp z&-wXzGW&7W3|+z9x+uAm_z!dl=ebqvjGWU_h+SERs?d7JLUgBWm1S77yxICxQscuR z_0AkVaa##wV`kNXH`Ca}j@vTGTK3FGh>vaTR#s-85F1yXNjy+C!zsrNTU| z;ywMKXWKU`hYr)NJv#GKlvk|V)BqKk!GtmTzO;q_kx9e=9WnlFV@0t8 zR5CJDCHYjhscj(pMrL9A`{wzh3v!Aaw>VI^kh5rO?Y9oBzS0A8K3v<@xi=$C~quRx)&Tda^%R7BS(%LIdbI4kt6#h!u#{Gc(1FSO?OB?e<(6<(cC{U zF2rsEq@UmNcO!cdN#0%@P1wFDb0X25Tw{5EWbSp&pP9cStSu$fgb?rl^A7LP3iF(K z#`mc)%n;2}aVE@D=YER+vD~NC=Gr_{KWe?%#T2P2>=)KYQ$3ilZwk`WI9W|(#A9*U zbFV^q&IH<$ryw59I}@a4tx?90Zea_sUIXsS-}IwZm{rx+$jbNQOxQtAdRiwy+D!xvL83HfN#-J zo5+OEks3*36o20qBmLH6E`FJjiQGSxE1xY3{QqVAgz)ED!uW!9)z;b&Ak{$C@Bl4h z+r$WIBdrXO{~yV0^!JRs>rBtw#2aC~j6ipZmfJ+tMD0*4 zy1sEMiQ#XpGCfHgp%zdZsR^-pPXFA-yFi*j7(WqGt)0U^qd$-q0{#Cj_y0rM=4nqq z#evcHxUUOPe5M^unXsBb_Cwz|jWz&XUaL}R&cPaiL`k`!5HvP_Y7GStFXNgTrqkQUgF zEnybjf5xT|`A%Qn$zq?y<{q^;%!D0D8a3bg{+lLhRlYG1u-c8~_mz1TAf51s*tC+U z!JvnNQrp6*gr^3BQxlhNg0gYVOk6Xhvz{T+lZhX&u3prBz_}oCiE8hbK-?O3$ZTs2c$EXY#75#7(=8M8EYZZ zur&M&q*j|i?)T*HzPxMa_z}{)tA9oPZd1kAk&fRU8Q>>exG1eN$zklYWm+#K8Y3x;0Q#IVJ+O-QS#HA#RB^`3!V9n&_pZ*60=`27WG&k)(MWz5Ws(`P)tTBr z&1DC{YQkaDi(LOgJ?0XoT4WfWw#AHhDQO<#{R!>rS@Bbrdjggw(AbuYt53%?! xlh*%`YWq(#Kv6r=hV`T<%(8LyD?Tgr{{K=^>|^99aGwAG002ovPDHLkV1o80b;SSx literal 0 HcmV?d00001 diff --git a/public/images/arrowright.png b/public/images/arrowright.png new file mode 100644 index 0000000000000000000000000000000000000000..b90995e32920fea9bd7f7901d2508acbb819dffb GIT binary patch literal 808 zcmV+@1K0eCP)q)ofI30h0B=Axh&P}c&<)y7KsrIw3F1xw8#uc5Q)~zZSwFV<&bc86 zWa~Za=}DG!hd9iP=0=b5IhXHLtIWZu5WO1xF?vA+?huAHS{W@-8)o&-Xm9ktRn|K7 zAlF%Ee;NIj&q2wI-i&reYcbFVCHLCN{Z<$NjmG!|;<7;F%r_)}Px`x55Zm}uGO1?+ z{}%p)N^#RG%%r|I947}a=5nJo#^G7&pTiSg$P6<`XS+a#+K%3iC=8e_9LUf!v}SU_ zGp5B8YP+2JC9}{5(_{k&+c@$%dpiO)O7x{dQ|bp@Xw-I|B||-8#wJI6Xy@67ooX~L zjea6-h-#c^4fcf;tw2gql+m{Z?bYoswn*0(N~Cdwvxsf`i#_5#r8eb>Sl1Ha%;a8G zm};a8B~o@MM>thT-J|ZzuNWTA2y%o$yC3NUCsr>Q2Ragxx%e7fO$`4cV5;jt=^)<@ zPrGS<(>W4RBAp{juB&d4!YCj4WUlh#PtS`|D~CJfJ*LUNXZb3o9(t6YQaITGZxY$b zcI>`(RN0B)R1Fvy7uxU@{RdrTR9Gicw!}5K21^GD^k)HaTw|QM6BYU{PrK>J@oX>w zT@HjU$SIs;u`SZA@`YxgE;5|FPiUlnv-8bBUC`c7tLLmhBRhRK1Pbu{lhz#>HpUw{P2SttM zM8N_BkfCvgEu-KE!)A@ZvmK$QY}hhO9G|k`5uieJXq8nsf24?Sc0c4gFG8JY!w}G@ m4O3{0wiKwHIz3W!Kp^k(q&1Zvq8cCo0000Jq?U}9uuW@2GxWo2Ojs;&jfGq4D< z3Mm>ovIz$!vMUve7&T5@$f4}C@t|nX#SbdRNkvVZTw>x9l2WQ_>Kd9_CZ=ZQ7M51d zF0O9w9-dyoA)#U65s^{JDXD4c8JStdC8cHM6_r)ZEv;?s9i3g1CQq3GGAU*RJ2VdF$b$$4{OP zfBE|D`;VW$K>lK6V1@@7#A9gw0tNyj6AKG73p>bPj7;S~%q+;ls%Xe2joK-hYxmobG?0zWo#D*ZD%(!S32G>jXZ; zHF8?b@A{Lt&c?`f$qOkL;k#!x-ifhCgrJJ}lMEmuX?*|?S`{+9oD;bh|D{|r6TZRd(6s zl8PrgKWuMQoN}Y0GJmVt)jy$+82G>NEnsS}KNhVA3=|FVg{ExE!Kl85tiMjtHX#Xeo`WJnF9RD-4_Wx&4{r*o^|IeiOAO7}F za{e>y5dRah|Hc)@zjgl^j+fql{!iw!1N)!y*njm8&zms*-SqFe{3iZ4-+veV;rZDA z=Iw8v8taSyl>V50?47gmWOhA^=Gq_0QPGtTF59F&=q*1r>Gz>|CKse0d47o(cC zceBm4&E0dYKK(lOg84_+-?sV(P4~CB{}D?6$0z!?vnG1!(MS9}{~0!}@7(Ht%a6Z( z{}$eL6NP*qo<8gS&EfAt*X4)b_e_(DoOb(Aoypb$-IBBAr#63>-~Yhim7GjAZ_MjB R{tq|Uf3XEHIxzgd2>?~M(5nCd literal 0 HcmV?d00001 diff --git a/public/images/discord.png b/public/images/discord.png new file mode 100644 index 0000000000000000000000000000000000000000..5afa629b278ace7543bd9616f13c4c2e8e4ae5b6 GIT binary patch literal 785 zcmV+s1Md8ZP)&3rS7^P;>@wxlNo_#l$nO65|!k&1FVmlCM3ka`?p!gWR#@5u{{yVq@^4v!9@ z9-A29@lEPw2G#olVN#HR9RlV6fioExn#sV>Oa@9kNfnH^f*Hr6t$|GH45}{KfS1^v z)L*G1sS~LbEof>WgDO9M>qP!Rt>&rJPyKpU(UJbnrPNaDzm6p{KXe<7@GYWF_4g9} zdXDDMom=Ch78CF{4C*@S>P63KO(YfKeT z<%tv4K&c@y#Ge`Ba`;aS=jdPzWRB05jB7E>lR$!cTz8)J2ss-uP+g^;m~mAe9G|lc zxSqpn!?mpPzJPfa%TN!i^IXsWlF`Pt6i9R4dJ8)I=-2|$KXrHhG-wefVbla4?Z7ghD z`Ek!isg(Ew`;3%84P;7$W{v`1SJFr)9_!bs)-~+Oufbr)6!r89b^|+4Z7ppHFe_0o z2eHWr?S*6gV{QK3*_7Hi^-SFB5gIMi$=uLP28L!bFf?R$-kYZbG~03YMF#t! zfD!tqo))tcjDzn`NA^Sv4^lKM1^Uoj=d|X;AL`(XCa!y;kh+1YQlF)M)dkNg?*){J zIfmmNpHBi4wA}EFfx3z}7zE7w) literal 0 HcmV?d00001 diff --git a/public/images/facebook.png b/public/images/facebook.png new file mode 100644 index 0000000000000000000000000000000000000000..ae585386c4b0835d002484b85179940f0214a7f2 GIT binary patch literal 871 zcmV-t1DO1YP)`nLPpP)45(`Nhx4eEa zog%gM4SRECn$xjiMOKL9OzOn2#$OFqNpl8Nsy{%|u{LF(T}E@$ttDe;eOfjl%fMe;**rmw?|HF2ChZZZvPc zLt}}VRf>!HuMCgJ{GX!HCBv%K7}IQp!)@A-YW2l#=g{bq>|nOO!Z}NkQ!yiH!hPzmQr6PJv?@3zO}NQvSXW3H zPjD^)Z>*2hM9)nx`f+dG;|wk!_kc_}h4I&HZ3b{qD%V7jR`%(vs+a x6N9dfB!q>LB8&6f&@5CL^M9)-3v#FH?SJreE8cgp=<)yn002ovPDHLkV1g@Dn@<1$ literal 0 HcmV?d00001 diff --git a/public/images/heart.jpg b/public/images/heart.jpg new file mode 100644 index 0000000000000000000000000000000000000000..68c3ac9913a96dfdc29d0f0b6b4662b1ad1312bd GIT binary patch literal 2758 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 GpZpWNnJz;B literal 0 HcmV?d00001 diff --git a/public/images/heart.png b/public/images/heart.png new file mode 100644 index 0000000000000000000000000000000000000000..982cd0e253cf0122b5707f82d0043fc2488fb6e6 GIT binary patch literal 726 zcmV;{0xA88P)!vH>G7Lb^e^K}Kj%3N7bI{=w#_&z&w8FtXoR zl8pnnIrR40Tie^Mx6g@PhwFK7gfL9M_laNr-VOH&5zyf1Gr(H7JI!YJZ7@U3Ij|F{ z(}UrYzrRKLt>DQevZHB8(BPBs9Ex+ThJ)B&N)nPGoq*{~i&U0}IO)pXPWTNI{ygG4 z`Q{GtI`};rez~98;rDC`AlRqx05?T|nEN2!htlGMrVSgVVU94!L&y!`l}0Nx&9q~w zL5X<~bRlyDjMR$HN0bywXEAV$-{F}48Aw0QBP?6Qhmk~K_ zl!yyW6M_;oQr4&BgtVAp%9cDImgXrh{t1nI)`Tq)$0ud{UWM?uo+5{5;$3Kb#6FS6 z^}!-Ogd6{{PjcbfV-hkfU!hVVh5k?Vlgd_(eNn(sNo%FSo)TP|g=X4-kaiQ8nhNsx z$ZXiaW6!<;1UcNBkj5RhrGw`zjFid)&X@Crs4z3kugZft*5ySR$Ia(qf*e+SZLO93 zsEolHMkd-j?HWRC0(=h_e$d`&mlR?X;LHP!3)T~26VM_8Ua_@A=MHnEA%ia9iUd0c zn-I1$;wUV>lL#1b38^rT3M&a1aR~`s5N(IoiwGED#}`NEU_-L@w?zy%M;s#v^ z!G2b|`u3)@42CO>dE%EruRu}jKrF7m#VXHsIW~qDDO-qiu!r7mPF4uv{}$PDXEV5> zNGI%)wb=PdV+p%}%@Q~iEs=w_(pxi4crL9c{80$s)rqhmU(*SI1Cb2$VE_OC07*qo IM6N<$f*wgjEC2ui literal 0 HcmV?d00001 diff --git a/public/images/instagram.png b/public/images/instagram.png new file mode 100644 index 0000000000000000000000000000000000000000..5c614f3897b5257299ab74aa112b802bd0783a72 GIT binary patch literal 1027 zcmV+e1pNDnP)Ca3$alNC&tBCKZ^g08)XS3Lq6EUX1R9yt1By{mtya z$dbG(X;*963%IlFB=6*FC*mec<=PVQwA%m6?f1QtlXg9dqLaFle=`u$;}sEPoixBC z%G;y~G43ZYsnV`ea>_55vI_Q5Xwk2Cx#m-%`sWIEU#&X%F;=03eLbfL2tJTu1;$-r zYie8=8XP-WV;&SR8<%knxXL>`er9Y4@VZjjovwwU(p(XpoH5k-O|5ifDhNyq`BDvY z2;YGB`zwOExW}{z@H3Gsb(V%Y%O~&-R$*F9QC6KT+D~Wqms)j!T@vl&Qd{KoP zm_g(@BAf#LvqtrEgu!L@*Gbu9xZlK5-1;@00aE!6@$bD>Oy4z~Cbe2cvi=#pV~0}V z^PF1-2T2>*w+feYUbBz_Lu+GGo<~8mt?T|u7mVw2<_Pf1TgVDEb1}obDKXUfF31%~ zvu8XCE#^z<32->U#`)8$KHEw z)JEKAJXE2Cor@+ZP(R^O|Bq3@F##W&u{nwN*}cHLKaE=>0&2VmCQ)9O8V*5g0e5J9 x)8`2pK99tNa$O)E)j#D?90}!fzu@S*{{e4LVTfJiRK@@R002ovPDHLkV1hwi$k+e? literal 0 HcmV?d00001 diff --git a/public/images/katarina.png b/public/images/katarina.png new file mode 100644 index 0000000000000000000000000000000000000000..820618d5864d5e7ef0f220b3e1eabb475dd1deed GIT binary patch literal 2754 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 T+%}mf00000NkvXXu0mjfvsf2n literal 0 HcmV?d00001 diff --git a/public/images/tyler.png b/public/images/tyler.png new file mode 100644 index 0000000000000000000000000000000000000000..e9a9f9079bd3601877369ea71c3334d75f2b5621 GIT binary patch literal 2611 zcmV-33e5G1P)BJlQ=s&Kijx4LBm zzUTCj_3Fn}b#+&DNj{-&5t!6B=|cVPsU&#g6!Z4Uq-Wm7vZ(W1)xDRq92`fvT>e2LG--|sqhT5# zOBxD-%E-wB?z_FcP4Yp0`XK-)R}mJ_fdLBm0h03Y@Q~R+bR%<3?)kca1QC;-1x47H zwg-s4Av9@qe}BL8bOq=p!@-M1` zlCBYT42bd+-Kk91TwPrym29e$$^a?G!^-P|0+i3)e@q<#BrT&T%I#{pa^~6{#qJu? zwJ|!DfhBNBp7mBj5)^5j2KbUD0Uj92(Nl&Z@Ic^=tXd=i=yqjY!WCqaS`|LYn$=av z=AQN4-QBtipd6G}rVccCM4XUAjGzeX0Qv$IpUr0LE+A8dDtbzTO`s7uz@W*f1%jGX zyeXPK7_^J04q+8CzU3SbOd6Y~^=`dag|Y6FEv)}8AmvE8Re^S)eUx^=(#qx$H8e^u zaf#GL9LMh!=>k%Ylv@XApV7YoRhVOC5fz%kBQxaER{+|H_EJd~%pz*?RY(HRb-4=` zHrggC3P5iZ(N_YxV3_KeFz*_hs9{@aYNIonz?DwqcIP%;6BW9UrlzA%QwULQN7*u| z(nQ_5&`oB7nrxq*o~R4R1936R-rQgfq*zx4RMQN|gBYq^n=mebx}Tk$VL50=JVl~H z`Cb-K_lt`QkZ@z46QXWd?3}=O4`dCFd;~^RF&_M{v)YJd-6VpJ-|j7lBpBYZgiUx*mcmsOu+c0vNSOu3=WPLDtry1iD_| zhg}8{M)yPVf$4ObbUhzd1naz={yg^8MIfno;x0y04dmxbngH-Y8HVz_XvwDyL|3_9 zvXUu*FP}X7)MhqOOP@|QS=p_+08j>5xTxd9uM1v9TG>Rce6N;B%s^YRgd{AP`9vO3 z>n_litgc8BP#SX7JyC#=RoA~Q^QEpx0&JpAm?-KB*Vos{)+qYQ_gr3HCbN9gC8#SP z>W@@J;y3CLu*;hGsbGVFsIEK`dGM~x0g1S4vIM4S5}EC3fQAucnhv z)X_!cUKQ|K;nF5*=3`Y?hY}V=&nlLCtBq%HB)dfI~1d<71 zF0G3^6DDdq?1BhnZu~-C39?~D1+OL8wyl&I-yHJ0wTbFCH7@ZKVRzYK(Y^`F0?OsU zi`LzeBlI$3KVR!K&hB0y%a>tY7or>G;h~;&bTE&2nU1?ep;rkb>_Y#z0vfCpf0ejX zfUSU89#K)5H&R?1Ajo%YrfX=z%52R%{UqpNnI=m*a7=>gi(<+T9jLdAlxR<0TUo~i zRDgNbG(ku*uGjTv01y4^taSqJb`vT=Xm>wfZyxL$;*GGoA$QL!s(^R5u*8aY>DuTL zGBQdRWb#&25${qZtao8B?*sPQBTLgQ)j%Ru(EecjGXv{)=rL8KDeF~Pg#XO(nyMKI zYdP3H8nAu`2OWH5CWYqEBh>^n|EE*pHq=|Gr6XOQhw~qkVwb@WhX}-S@yp!*QVWDW zUnAQ$l-G1X4lwNM<)5y>6X_v2#PqYxrPywrkz*vUp}ATT-#6IW@cYi*M<>fSNn2$3 zdYRfMV5aawhj)@R##NnQhXD2Rb)~ncTw|E^)r>;}OfjBN-q9Wb=ljan+FBc+tMSMN z`>m4O#5W+y<3o}zWtJSwCr2~_%K3;*SFk=}a}ZKg1XOUYzxU)5*7vAB1VJ_eN=KO$ zmbcIyT*ZlkeB{T=W>|ki7xPX~7oToJBO;SRe7X&E+GnR5?};svFj({6%*vZG6yuIjd`&tDag5O6v7 zbO5MI)I$B9Qfj%wIE5h_@xG8I`!+&K4dNGdUVkB_GzaJLXe!1bv~etqzS|i1(fNzk@{W57p3$2 zlaUw7)&meED&j<3ubqL*1ySN$yWv9eypEBzk4A)4p0`UcrZ@p1ML$#-BijCV5Sw6U zugXG{A-;=@b1@(Pn^K8Dx}dGzEDBRk!P`8(k44{d<~o9wb4J zK|jc%WSgnQPtFVar0#dhQ7)tj3ct^F3puY9*RxIC3K3AX7;W_Z9=Sn}vM0f9@^e+U zOh9b$G@M4SeMUr7Gm!m=BaW!E0BY+Xd=~K+xdY}ln6%m>PRQrJ(;iW0dN88xzj7Os zyZ>A1kzY?ll@YlRb!X<{H2^Sog3X4BCgvkzV8)bAFvS4I@!zx|LXHz3kNKSba3`+8 zXbRVkE%kElRNW6mTt6uj^$RGK$bfb|4z=KF!YPwUOeDpQlfcrDHlOd199h%|B8Rlt^378aZej#`dn?j&XWXqy0GU$N}uSAHtq?jq(B;~_vJqQ%@geR zRsQFE-O9Q~_9LsDF>Pk%`d#3_%41C}QMcHdgzv$i>bID3u&YBy6ok#&uc1aS%MU zuJ;aKAKF4=Y>OQF0s02y#FRD`l4HN?7W2IU@AuWYM?Uw5^F5>LdZ(3s@NqO@+q!o_=}5Yyjp7ze`MjK~`r^-m4&cA`ijZfKSF!wytobVU+i2x!_#Yx8 Vr^GtUJo5km002ovPDHLkV1k9J+(7^U literal 0 HcmV?d00001 diff --git a/routes/club.js b/routes/club.js new file mode 100644 index 000000000..2e6681523 --- /dev/null +++ b/routes/club.js @@ -0,0 +1,8 @@ + +/* + * GET home page. + */ + +exports.view = function(req, res){ + res.render('club'); + }; \ No newline at end of file diff --git a/views/club.handlebars b/views/club.handlebars new file mode 100644 index 000000000..2fe8d6a61 --- /dev/null +++ b/views/club.handlebars @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + Club + + +
+
+
+ + + + + + +
+
+ VSA +
+
+ Here lies a description of the club +
+
+

Club Events

+
+
+ Bonfire +
+
+ GBM #1 +
+ +
+
+ +
+

Board Members

+
+ + + + +
+
+ + + +
+
+ + \ No newline at end of file diff --git a/views/index.handlebars b/views/index.handlebars index 7fef0f9e9..c4ee7ca7a 100644 --- a/views/index.handlebars +++ b/views/index.handlebars @@ -1,8 +1,22 @@ + + - Test Page + + + + + + + + + index -Begin here (or replace this with any static code already written). +
+
+ This is where +
+
- + \ No newline at end of file From f40730a25310f6237b4aa38dd61046a94b875113 Mon Sep 17 00:00:00 2001 From: Lucas Ryan Date: Thu, 18 Feb 2021 15:10:32 -0800 Subject: [PATCH 02/54] added both pages --- public/css/index.css | 104 +++++++++++++++++++++++++++++ public/images/filter.png | Bin 0 -> 492 bytes public/images/heart calendar.png | Bin 0 -> 737 bytes public/images/heart_outline.png | Bin 0 -> 740 bytes views/index.handlebars | 110 ++++++++++++++++++++++++++----- 5 files changed, 196 insertions(+), 18 deletions(-) create mode 100644 public/css/index.css create mode 100644 public/images/filter.png create mode 100644 public/images/heart calendar.png create mode 100644 public/images/heart_outline.png diff --git a/public/css/index.css b/public/css/index.css new file mode 100644 index 000000000..748c0941e --- /dev/null +++ b/public/css/index.css @@ -0,0 +1,104 @@ +body { + display: flex; + justify-content: center; + align-items: center; + background-color: gray; + height: 100vh; + font-family: Helvetica, Arial, sans-serif; + } + + .main { + display: flex; + flex-wrap: wrap; + flex-direction: column; + justify-content: space-between; + align-items: center; + width: 337px; + height: 600px; + background-color: white; + } + + header { + display: flex; + width: 100%; + height: 10%; + border: solid 1px; + } + + section { + display: flex; + width: 80%; + border: 1px solid; + height: 13%; + } + + h1 { + font-size: 24px; + } + + form { + width: 100%; + } + + input { + width: 90%; + } + + h2 { + margin-bottom: 5px; + } + + p { + font-size: 12px; + } + + .headerUnit { + display: flex; + justify-content: center; + align-items: center; + width: 40%; + border: solid 1px; + } + + #divImg { + display: flex; + justify-content: center; + align-items: center; + width: 20%; + } + + .longTitle { + text-align: center; + font-weight: normal; + } + + #formInput { + display: flex; + max-height: 30px; + width: 80%; + } + + #box1 { + width: 80%; + display: flex; + align-items: center; + } + + #box2 { + display: flex; + justify-content: center; + align-items: center; + width: 20%; + max-height: 60px; + } + + .sectionUnit { + width: 80%; + } + + .sectionUnit2 { + width: 20%; + display: flex; + justify-content: center; + align-items: center; + } \ No newline at end of file diff --git a/public/images/filter.png b/public/images/filter.png new file mode 100644 index 0000000000000000000000000000000000000000..4f2585765a56c1178206be62be01bf39851f5e93 GIT binary patch literal 492 zcmVzF zgD@C|AGH@=vOzOK-M|s*1TsRMpxvNedM6uHC+G-ugR+4-fhLE;kp!?Ie{jKb&euZ^ z3A_pKM?P}JAGr*{bSPw$^`BQ6KNE{j8LJ!hBjbhXajRm{apFV9JL9mVvRch|eQ?B> zTE@ZDA?g#EjC14Une+*>MfYHCHW0K$W~9Lsx9e-TG8!I;&)T@>^Q8_Oqr;YX2r94D z_d3~j+@Xuy5FUZ2?+bL1_k`s{PsZAkg}6u$d-TDtaYPV4v#m4M7M0meBOh_+k%1X& zOKx0v&u|3c2HMFE_skX~TB!<#n>+b3IyAEn=!1%0hzRU6+sxP)FZ@mfy5aMVHW`6m zCqpUtU!Xv@f)m%I;R{Dn33O%_=*uk7msy}Mu>=YNeG$eGs45&)P&A8zQMOVF+Do1J zt>IlDEC|Dr_NMxmg8Z%_Fz$hJug4?a=NoO6NDB-A5Tltg%>J~LQ0j^AY5 iF{0o4$muRtgYgSg56Z$0B&ys10000Jd;xX&#e2{~ z!&WlnPLy9-=E1-B2si#Jph#U7wP*qs`TVB>MoZLKyL+F1bFK1Mmtp{WjRq7() zKSCFw>zg4!JHOaJtSCZZ5ETkfHE{|2N3}jhol6gvVN8X>ASx7e-j83C|KLA=q49vj z+AjpOlW$p;OK6(*mMqIKpU-hRoi6uDl3+TWVm6y;^K7?U>~_14JWR_x%zK9-ilXOx ziIm+>iejkcd_I@b2<_*!5TcaEf6BAjY-;l`E=_Bzt`3bp2__FvVDuO(ku(dPftC zMHNK>m)P`*VL?me;Dt-ZWAlAhV^NdI1TGnkMzF!irPIa6aojJLE(Kw^T*3uh3$i{N zj3-~dy{;!QG`pFE=6gUNZpDe>-D-5L95lOuG(%z5gOo7kQ-5t6xKkH zJ5i4i)=-dJQN(tPF`of$MG=1DH+A<+$MlA{7j>ys&M$J!Rx60{clILu5_Ls4&K8SB z*@EvCMYwx(T`TgJ_bvH;Q5P#@H{;fq#rRPcXDte0pcM7v&iftVKSK48|M{kP%mGAS zcwzV3p~^`_00000NkvXXu0mjfcKAyV literal 0 HcmV?d00001 diff --git a/public/images/heart_outline.png b/public/images/heart_outline.png new file mode 100644 index 0000000000000000000000000000000000000000..d140899df566887ca181de4fc538e18c6ce8b948 GIT binary patch literal 740 zcmVK^_Qq0XbT@$3X5uVn5FD=6VSEL@*rNQ_Q>W&zK#`<|*bco{TwLBsXGg zEaWCUCzJ~b&u%Q_DkQ|LxLYB`_Fu?vA>kF}@=bX5i+>Cv_ArG&kY`!bXOLD)i}I-8 zSwng(%5N2de7d|0Gl`1~?q~K=;DDtVX`IowV>Q?wgM=NrZ)e$J+b%|syOg?rJ3&_7 zU^{%r=-_Qi<0)8SeJad&u>}A5eN8bw5o(tjV?0jQ5>qMle@7xGY$HY!VKEVlb;T?q zqDQ+C$tgw?aYiO;rIHKg^QQQ(kr}OJ_yU8F4llF~Rus`=l}cNri6Q8p7%UdXDwXs4 z6Ei&;=-*!~RzjPaLzBQUP&WEQPA>TDtaT0P2%rsWZXtt>An0QHal_U` + - - - - - + + + + COGS 120 - A5 Screen 1 + + + + + + + +
+ +
+
+

Clubs

+
+
+

Upcoming Events

+
+
+ +
+
+ +
+
+
+
+
+
+
+ +
+
+ +
+
+

Design Co.

+

pre-professional design org

+
+
+ +
+
+ +
+
+

arch@UCSD

+

CMAA org promoting architecture

+
+
+ +
+
+ +
+
+

KASA

+

Korean-American social club

+
+
+ +
+
+ - - - - index - - -
-
- This is where -
-
- +
+
+

VSA

+

Promoting Vietnamese culture

+
+
+ +
+
+ +
+
+

CASA

+

Chinese-American social club

+
+
+ +
+
+ +
+ + + + \ No newline at end of file From 1f9d29251d5435af1e2ff7f098f8ed53b3094d12 Mon Sep 17 00:00:00 2001 From: ck-ho <> Date: Thu, 18 Feb 2021 15:43:07 -0800 Subject: [PATCH 03/54] added club route --- app.js | 2 ++ public/css/index.css | 44 ++++++++++++++++++++++++++---------------- views/index.handlebars | 34 +++++++++++++++++--------------- 3 files changed, 47 insertions(+), 33 deletions(-) diff --git a/app.js b/app.js index edb9f73ea..4f74ee574 100644 --- a/app.js +++ b/app.js @@ -9,6 +9,7 @@ var path = require('path'); var handlebars = require('express3-handlebars') var index = require('./routes/index'); +var club = require('./routes/club') // Example route // var user = require('./routes/user'); @@ -35,6 +36,7 @@ if ('development' == app.get('env')) { } app.get('/', index.view); +app.get('/club', club.view); // Example route // app.get('/users', user.list); diff --git a/public/css/index.css b/public/css/index.css index 748c0941e..e11763640 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -6,7 +6,7 @@ body { height: 100vh; font-family: Helvetica, Arial, sans-serif; } - + .main { display: flex; flex-wrap: wrap; @@ -17,41 +17,51 @@ body { height: 600px; background-color: white; } - + header { display: flex; width: 100%; height: 10%; border: solid 1px; } - + section { display: flex; width: 80%; border: 1px solid; height: 13%; } - + h1 { font-size: 24px; } - + form { width: 100%; } - + input { width: 90%; } - + h2 { margin-bottom: 5px; } - + p { font-size: 12px; } - + + a { + text-decoration: none; + color: black; + padding: 0px; + margin: 0px; + display: block; + width: 100%; + height: 100%; + } + .headerUnit { display: flex; justify-content: center; @@ -59,31 +69,31 @@ body { width: 40%; border: solid 1px; } - + #divImg { display: flex; justify-content: center; align-items: center; width: 20%; } - + .longTitle { text-align: center; font-weight: normal; } - + #formInput { display: flex; max-height: 30px; width: 80%; } - + #box1 { width: 80%; display: flex; align-items: center; } - + #box2 { display: flex; justify-content: center; @@ -91,14 +101,14 @@ body { width: 20%; max-height: 60px; } - + .sectionUnit { width: 80%; } - + .sectionUnit2 { width: 20%; display: flex; justify-content: center; align-items: center; - } \ No newline at end of file + } diff --git a/views/index.handlebars b/views/index.handlebars index c3111492f..e7cc28a47 100644 --- a/views/index.handlebars +++ b/views/index.handlebars @@ -5,7 +5,7 @@ COGS 120 - A5 Screen 1 - + @@ -22,7 +22,7 @@

Upcoming Events

- +
@@ -33,7 +33,7 @@
- +
@@ -43,7 +43,7 @@

pre-professional design org

- +
@@ -53,7 +53,7 @@

CMAA org promoting architecture

- +
@@ -63,19 +63,21 @@

Korean-American social club

- +
- +
-
-

VSA

-

Promoting Vietnamese culture

-
-
- -
+ +
+

VSA

+

Promoting Vietnamese culture

+
+ +
+ +
@@ -84,7 +86,7 @@

Chinese-American social club

- +
@@ -93,4 +95,4 @@ - \ No newline at end of file + From 4d91c5eb716110dc5935e4d647b637549e193981 Mon Sep 17 00:00:00 2001 From: Lucas Ryan Date: Thu, 18 Feb 2021 16:05:04 -0800 Subject: [PATCH 04/54] Updated placeholder --- views/club.handlebars | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/views/club.handlebars b/views/club.handlebars index 2fe8d6a61..05609beca 100644 --- a/views/club.handlebars +++ b/views/club.handlebars @@ -32,7 +32,8 @@ VSA
- Here lies a description of the club + VSA is an Vietnamese culture org that celebrates inclusivity and community. + Join us for fun activities and social events. We hold GBMs every other week at Center Hall.

Club Events

From 6ed9a90b8d73965c877421407f6df2962fa6ef28 Mon Sep 17 00:00:00 2001 From: Lucas Ryan Date: Fri, 19 Feb 2021 13:22:13 -0800 Subject: [PATCH 05/54] added back button --- views/club.handlebars | 2 ++ 1 file changed, 2 insertions(+) diff --git a/views/club.handlebars b/views/club.handlebars index 05609beca..69ebe145d 100644 --- a/views/club.handlebars +++ b/views/club.handlebars @@ -18,12 +18,14 @@
+ + From 8176197f6cdcf326e3bca923cfa0d871142430eb Mon Sep 17 00:00:00 2001 From: Lucas Ryan Date: Fri, 19 Feb 2021 13:23:37 -0800 Subject: [PATCH 06/54] k --- public/css/club.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/public/css/club.css b/public/css/club.css index bc1eabd7f..f76a2e885 100644 --- a/public/css/club.css +++ b/public/css/club.css @@ -1,3 +1,6 @@ +.main{ + background-color: gray; +} .head{ display: flex; justify-content: space-between; From 49527008c65f8f87d9e2c15b40cf4dc817093b78 Mon Sep 17 00:00:00 2001 From: ck-ho <> Date: Sun, 21 Feb 2021 14:27:04 -0800 Subject: [PATCH 07/54] bigger margin --- public/css/index.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/css/index.css b/public/css/index.css index e11763640..acef63620 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -103,7 +103,7 @@ body { } .sectionUnit { - width: 80%; + width: 70%; } .sectionUnit2 { From a4bfaac0403f5f352378fc2937928f5419542b25 Mon Sep 17 00:00:00 2001 From: Lucas Ryan Date: Mon, 22 Feb 2021 18:16:00 -0800 Subject: [PATCH 08/54] Increased dimensions, made white --- public/css/club.css | 34 ++++++++++++++--------- public/css/index.css | 7 +++-- views/club.handlebars | 64 +++++++++++++++++++++++-------------------- 3 files changed, 59 insertions(+), 46 deletions(-) diff --git a/public/css/club.css b/public/css/club.css index f76a2e885..800d3443f 100644 --- a/public/css/club.css +++ b/public/css/club.css @@ -1,6 +1,24 @@ -.main{ - background-color: gray; -} +body { + display: flex; + justify-content: center; + align-items: center; + height: 100vh; + font-family: Helvetica, Arial, sans-serif; + background-color: whitesmoke; + } + +.main { + display: flex; + flex-wrap: wrap; + flex-direction: column; + justify-content: space-between; + align-items: center; + width: 505px; + height: 900px; + background-color: white; + border-style:solid; + } + .head{ display: flex; justify-content: space-between; @@ -8,16 +26,6 @@ margin: 30px; } -.phone{ - display: flex; - justify-content: space-between; - margin:auto; - margin-top: 100px; - max-width: 500px; - height: 800px; - background-color: white; - border-style:solid; - } .gallery{ width: 80%; height: 20%; diff --git a/public/css/index.css b/public/css/index.css index acef63620..70554ca77 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -2,7 +2,7 @@ body { display: flex; justify-content: center; align-items: center; - background-color: gray; + background-color: whitesmoke; height: 100vh; font-family: Helvetica, Arial, sans-serif; } @@ -13,9 +13,10 @@ body { flex-direction: column; justify-content: space-between; align-items: center; - width: 337px; - height: 600px; + width: 505px; + height: 900px; background-color: white; + border: solid; } header { diff --git a/views/club.handlebars b/views/club.handlebars index 69ebe145d..ea1552717 100644 --- a/views/club.handlebars +++ b/views/club.handlebars @@ -1,6 +1,7 @@ + @@ -8,68 +9,71 @@ - + Club + -
-
-
- - - - +
+
+ + + + - + -
-
+
+ +
VSA
-
+ +
VSA is an Vietnamese culture org that celebrates inclusivity and community. Join us for fun activities and social events. We hold GBMs every other week at Center Hall.
-
+ +

Club Events

-
-
+
+
Bonfire
-
+
GBM #1
- +

Board Members

-
- - - - +
+ + + +
-
+ \ No newline at end of file From 4052c53183d10186b5431b3288ab26fded773592 Mon Sep 17 00:00:00 2001 From: Lucas Ryan Date: Tue, 23 Feb 2021 03:24:21 -0800 Subject: [PATCH 09/54] added event page --- app.js | 4 +- public/css/event.css | 93 ++++++++++++++++++++++++++++++++++++++++++ routes/event.js | 3 ++ views/event.handlebars | 74 +++++++++++++++++++++++++++++++++ views/index.handlebars | 2 + 5 files changed, 175 insertions(+), 1 deletion(-) create mode 100644 public/css/event.css create mode 100644 routes/event.js create mode 100644 views/event.handlebars diff --git a/app.js b/app.js index 4f74ee574..428433b63 100644 --- a/app.js +++ b/app.js @@ -9,7 +9,8 @@ var path = require('path'); var handlebars = require('express3-handlebars') var index = require('./routes/index'); -var club = require('./routes/club') +var club = require('./routes/club'); +var event = require('./routes/event'); // Example route // var user = require('./routes/user'); @@ -37,6 +38,7 @@ if ('development' == app.get('env')) { app.get('/', index.view); app.get('/club', club.view); +app.get('/event', event.view); // Example route // app.get('/users', user.list); diff --git a/public/css/event.css b/public/css/event.css new file mode 100644 index 000000000..52f6fac97 --- /dev/null +++ b/public/css/event.css @@ -0,0 +1,93 @@ +body { + display: flex; + justify-content: center; + align-items: center; + height: 100vh; + font-family: Helvetica, Arial, sans-serif; + background-color: whitesmoke; + } + + section { + display: flex; + width: 80%; + border: 1px solid; + height: 20%; + margin: auto; + } +.main { + display: flex; + flex-wrap: wrap; + flex-direction: column; + align-items: center; + width: 505px; + height: 900px; + background-color: white; + border-style:solid; + } + h2 { + margin-bottom: 5px; + } + + p { + font-size: 12px; + } + + a { + text-decoration: none; + color: black; + padding: 0px; + margin: 0px; + display: block; + width: 100%; + height: 100%; + } + header { + display: flex; + width: 100%; + height: 10%; + border: solid 1px; + } + + .headerUnit { + display: flex; + justify-content: center; + align-items: center; + width: 40%; + border: solid 1px; + } + + #divImg { + display: flex; + justify-content: center; + align-items: center; + width: 20%; + } + + .longTitle { + text-align: center; + font-weight: normal; + } + + .sectionUnit { + margin: auto; + width: 70%; + } + + .sectionUnit2 { + margin: auto; + width: 20%; + display: flex; + justify-content: center; + align-items: center; + } + .org{ + margin-top: 0; + font-size: 18px; + font-style: italic; + } + .date{ + margin: auto; + } + .event-name{ + margin-top: auto; + } \ No newline at end of file diff --git a/routes/event.js b/routes/event.js new file mode 100644 index 000000000..18621a8a2 --- /dev/null +++ b/routes/event.js @@ -0,0 +1,3 @@ +exports.view = function(req, res){ + res.render('event'); + }; \ No newline at end of file diff --git a/views/event.handlebars b/views/event.handlebars new file mode 100644 index 000000000..15be0487c --- /dev/null +++ b/views/event.handlebars @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + Event + + + +
+
+ +
+

Clubs

+
+ +
+

Upcoming Events

+
+
+ +
+
+

1/20-1/27

+ +
+
+

1/21

+

GBM #1

+

Design Co

+

Cognitive Science Building

+
+
+ +
+
+
+
+

1/21

+

GBM #1

+

Design Co

+

Cognitive Science Building

+
+
+ +
+
+
+
+

1/21

+

GBM #1

+

Design Co

+

Cognitive Science Building

+
+
+ +
+
+

1/28 - 2/5

+ +
+ + + \ No newline at end of file diff --git a/views/index.handlebars b/views/index.handlebars index e7cc28a47..e58d8361d 100644 --- a/views/index.handlebars +++ b/views/index.handlebars @@ -19,7 +19,9 @@

Clubs

+

Upcoming Events

+
From 10b10782e056e9cba5ca67001e6aa8458fa98b0b Mon Sep 17 00:00:00 2001 From: Fernando Reyes Jr Date: Tue, 23 Feb 2021 16:19:32 -0800 Subject: [PATCH 10/54] added json and calendar --- public/json/boardMembers.json | 0 public/json/club.json | 50 +++++++++++++++++++++++++++++++++++ views/calendar.handlebars | 0 3 files changed, 50 insertions(+) create mode 100644 public/json/boardMembers.json create mode 100644 public/json/club.json create mode 100644 views/calendar.handlebars diff --git a/public/json/boardMembers.json b/public/json/boardMembers.json new file mode 100644 index 000000000..e69de29bb diff --git a/public/json/club.json b/public/json/club.json new file mode 100644 index 000000000..e7f37a9b5 --- /dev/null +++ b/public/json/club.json @@ -0,0 +1,50 @@ +[ + { + "id": "mus", + "name": "Musicians Club @ UCSD", + "description": "

Our purpose is to give an outlet for music lovers to share and express their passion for music, to allow musicians to collaborate and learn from one another, and to give musicians of all levels the experience of performing with others in front of an audience.

", + "image": "http://upload.wikimedia.org/wikipedia/commons/3/3b/Bowery_men_waiting_for_bread_in_bread_line,_New_York_City,_Bain_Collection.jpg" + }, + { + "id": "game", + "name": "Triton Gaming", + "description": "

Triton Gaming is a group of collegiate organizers that team up to create epic entertainment experiences for student gamers at the University of California, San Diego. Our organization is the product of several independent on-campus gaming organizations that each represent a different gaming genre and student community. Through Triton Gaming, our team strives to create an exciting, diverse, and all-inclusive gaming environment on campus through high-quality live events.

", + "image": "http://developertodesigner.files.wordpress.com/2012/11/observing.jpg" + }, + { + "id": "ACMH", + "name": "ACM Hack", + "description": "

ACM Hack aims to spread the knowledge of Software Engineering and general computing and help its members develop technical skills. ACM Hack also aims to foster an inclusive and open community within UC San Diego.

", + "image": "http://www.google.com/think/images/prototyping-for-success_articles_lg.jpg" + }, + { + "id": "astro", + "name": "Astronomy Club at UCSD", + "description": "

Astronomy Club at UCSD aims to promote the interest of astronomy and astrophysics among UCSD undergraduates. Our organization will focus on the exploration of the universe. We hope to help students, who are interested in astronomy, make observations, know each other and get more access to professional faculty.

", + "image": "http://searchwide.com/wp-content/uploads/2013/11/evaluation.jpg" + }, + { + "id": "beatz", + "name": "Beat @ UCSD", + "description": "

To provide a fun and lively atmosphere to continue our passion for a cappella music at the collegiate level; to immerse members into the a cappella community on-campus and beyond; to strengthen and improve vocal and musical ability; to provide entertaining performances; and to foster close-knit relationships within the group.

", + "image": "http://www.quality-wars.com/wp-content/uploads/Gantt-Chart-Example-2-NO-LETTERS1.jpg" + }, + { + "id": "artnmedia", + "name": "Digital Arts and Media", + "description": "

In the 21st century, social media advertising is vital to the success of cooperations. Many start-ups and fully developed companies are looking for media teams to help keep up with the booming industry that is social advertising. The purpose of Digital Arts and Media is to experience what it is like to be apart of a social media team and how to channel creative skills into a lucrative job.

", + "image": "http://regmedia.co.uk/2011/03/01/node_code.png" + }, + { + "id": "food", + "name": "Food Cooperative at UCSD", + "description": "

The Food Cooperative at UCSD is a collective running a store serving vegan food and products, with the interest in fostering social, political, economic, and ecological change.

", + "image": "http://torontopubliclibrary.typepad.com/.a/6a00e5509ea6a18834019b00ff4518970b-800wi" + }, + { + "id": "HSI", + "name": "Healthy Skin Initiative", + "description": "

Healthy Skin Initiative (HSI) strives to raise awareness about the importance of skin health in all populations, while also addressing the socioeconomic nuances of skincare. We aim to educate the UCSD student population about proper skincare use and debunk skincare myths due to the large amount of misinformation online. At the same time, we hope to cultivate an awareness of and appreciation for the intersections between skincare and racial bias amongst members. Our goals will be carried out through guest workshops facilitated with skincare professionals, informative infographics on social media and health-based initiatives in our community.

", + "image": "http://unbounce.com/photos/ab-testing.png" + } +] diff --git a/views/calendar.handlebars b/views/calendar.handlebars new file mode 100644 index 000000000..e69de29bb From e2493fefde9fdb2cb98709815767515d629d9e29 Mon Sep 17 00:00:00 2001 From: ck-ho <> Date: Thu, 25 Feb 2021 12:20:45 -0800 Subject: [PATCH 11/54] login 1 --- app.js | 4 ++- public/css/login.css | 58 ++++++++++++++++++++++++++++++++++++++++++ routes/login.js | 3 +++ views/index.handlebars | 2 +- views/login.handlebars | 31 ++++++++++++++++++++++ 5 files changed, 96 insertions(+), 2 deletions(-) create mode 100644 public/css/login.css create mode 100644 routes/login.js create mode 100644 views/login.handlebars diff --git a/app.js b/app.js index 4f74ee574..246e4d6b7 100644 --- a/app.js +++ b/app.js @@ -9,7 +9,8 @@ var path = require('path'); var handlebars = require('express3-handlebars') var index = require('./routes/index'); -var club = require('./routes/club') +var club = require('./routes/club'); +var login = require('./routes/login'); // Example route // var user = require('./routes/user'); @@ -37,6 +38,7 @@ if ('development' == app.get('env')) { app.get('/', index.view); app.get('/club', club.view); +app.get('/login', login.view); // Example route // app.get('/users', user.list); diff --git a/public/css/login.css b/public/css/login.css new file mode 100644 index 000000000..29ddeeace --- /dev/null +++ b/public/css/login.css @@ -0,0 +1,58 @@ +body { + display: flex; + justify-content: center; + align-items: center; + background-color: whitesmoke; + height: 100vh; + font-family: Helvetica, Arial, sans-serif; + } + + .main { + width: 505px; + height: 900px; + background-color: white; + border: solid; + } + + h1 { + font-size: 48px; + font-weight: bold; + width: 80%; + margin-left: 50px; + margin-top: 200px; + line-height: 1.2; + } + + form { + margin-left: 50px; + } + + input { + width: 300px; + height: 60px; + border: none; + border-bottom: solid black 1px; + } + + input::placeholder { + font-size: 16px; + } + + .button { + margin-left: 50px; + margin-top: 50px; + background-color: black; + color: white; + width: 90px; + height: 40px; + display: flex; + justify-content: center; + align-items: center; + } + + a { + text-decoration: none; + color: white; + padding: 0px; + margin: 0px; + } diff --git a/routes/login.js b/routes/login.js new file mode 100644 index 000000000..b51f60b16 --- /dev/null +++ b/routes/login.js @@ -0,0 +1,3 @@ +exports.view = function(req, res){ + res.render('login'); +}; diff --git a/views/index.handlebars b/views/index.handlebars index e7cc28a47..400115270 100644 --- a/views/index.handlebars +++ b/views/index.handlebars @@ -29,7 +29,7 @@
-
+
diff --git a/views/login.handlebars b/views/login.handlebars new file mode 100644 index 000000000..6348c58b8 --- /dev/null +++ b/views/login.handlebars @@ -0,0 +1,31 @@ + + + + + + + COGS 120 - A5 Screen 1 + + + + + + +
+ +

What's your .edu email?

+ +
+ +
+ + +
+

Enter

+
+ + +
+ + + From 73a12c8a96b28326253cef8351b83ce3b988b78b Mon Sep 17 00:00:00 2001 From: ck-ho <> Date: Thu, 25 Feb 2021 12:46:12 -0800 Subject: [PATCH 12/54] added JSON --- app.js | 3 -- public/json/club.json | 91 +++++++++++++++++++----------------------- routes/index.js | 9 ++--- views/index.handlebars | 15 ++++++- 4 files changed, 58 insertions(+), 60 deletions(-) diff --git a/app.js b/app.js index 5cc4523ad..e0e849d57 100644 --- a/app.js +++ b/app.js @@ -39,11 +39,8 @@ if ('development' == app.get('env')) { app.get('/', index.view); app.get('/club', club.view); -<<<<<<< HEAD app.get('/login', login.view); -======= app.get('/event', event.view); ->>>>>>> 10b10782e056e9cba5ca67001e6aa8458fa98b0b // Example route // app.get('/users', user.list); diff --git a/public/json/club.json b/public/json/club.json index e7f37a9b5..22cbd88fc 100644 --- a/public/json/club.json +++ b/public/json/club.json @@ -1,50 +1,41 @@ -[ - { - "id": "mus", - "name": "Musicians Club @ UCSD", - "description": "

Our purpose is to give an outlet for music lovers to share and express their passion for music, to allow musicians to collaborate and learn from one another, and to give musicians of all levels the experience of performing with others in front of an audience.

", - "image": "http://upload.wikimedia.org/wikipedia/commons/3/3b/Bowery_men_waiting_for_bread_in_bread_line,_New_York_City,_Bain_Collection.jpg" - }, - { - "id": "game", - "name": "Triton Gaming", - "description": "

Triton Gaming is a group of collegiate organizers that team up to create epic entertainment experiences for student gamers at the University of California, San Diego. Our organization is the product of several independent on-campus gaming organizations that each represent a different gaming genre and student community. Through Triton Gaming, our team strives to create an exciting, diverse, and all-inclusive gaming environment on campus through high-quality live events.

", - "image": "http://developertodesigner.files.wordpress.com/2012/11/observing.jpg" - }, - { - "id": "ACMH", - "name": "ACM Hack", - "description": "

ACM Hack aims to spread the knowledge of Software Engineering and general computing and help its members develop technical skills. ACM Hack also aims to foster an inclusive and open community within UC San Diego.

", - "image": "http://www.google.com/think/images/prototyping-for-success_articles_lg.jpg" - }, - { - "id": "astro", - "name": "Astronomy Club at UCSD", - "description": "

Astronomy Club at UCSD aims to promote the interest of astronomy and astrophysics among UCSD undergraduates. Our organization will focus on the exploration of the universe. We hope to help students, who are interested in astronomy, make observations, know each other and get more access to professional faculty.

", - "image": "http://searchwide.com/wp-content/uploads/2013/11/evaluation.jpg" - }, - { - "id": "beatz", - "name": "Beat @ UCSD", - "description": "

To provide a fun and lively atmosphere to continue our passion for a cappella music at the collegiate level; to immerse members into the a cappella community on-campus and beyond; to strengthen and improve vocal and musical ability; to provide entertaining performances; and to foster close-knit relationships within the group.

", - "image": "http://www.quality-wars.com/wp-content/uploads/Gantt-Chart-Example-2-NO-LETTERS1.jpg" - }, - { - "id": "artnmedia", - "name": "Digital Arts and Media", - "description": "

In the 21st century, social media advertising is vital to the success of cooperations. Many start-ups and fully developed companies are looking for media teams to help keep up with the booming industry that is social advertising. The purpose of Digital Arts and Media is to experience what it is like to be apart of a social media team and how to channel creative skills into a lucrative job.

", - "image": "http://regmedia.co.uk/2011/03/01/node_code.png" - }, - { - "id": "food", - "name": "Food Cooperative at UCSD", - "description": "

The Food Cooperative at UCSD is a collective running a store serving vegan food and products, with the interest in fostering social, political, economic, and ecological change.

", - "image": "http://torontopubliclibrary.typepad.com/.a/6a00e5509ea6a18834019b00ff4518970b-800wi" - }, - { - "id": "HSI", - "name": "Healthy Skin Initiative", - "description": "

Healthy Skin Initiative (HSI) strives to raise awareness about the importance of skin health in all populations, while also addressing the socioeconomic nuances of skincare. We aim to educate the UCSD student population about proper skincare use and debunk skincare myths due to the large amount of misinformation online. At the same time, we hope to cultivate an awareness of and appreciation for the intersections between skincare and racial bias amongst members. Our goals will be carried out through guest workshops facilitated with skincare professionals, informative infographics on social media and health-based initiatives in our community.

", - "image": "http://unbounce.com/photos/ab-testing.png" - } -] +{ + "club": + [ + { + "id": "mus", + "name": "Musicians Club @ UCSD", + "description": "

Our purpose is to give an outlet for music lovers to share and express their passion for music, to allow musicians to collaborate and learn from one another, and to give musicians of all levels the experience of performing with others in front of an audience.

", + "image": "http://upload.wikimedia.org/wikipedia/commons/3/3b/Bowery_men_waiting_for_bread_in_bread_line,_New_York_City,_Bain_Collection.jpg" + }, + { + "id": "ACMH", + "name": "ACM Hack", + "description": "

ACM Hack aims to spread the knowledge of Software Engineering and general computing and help its members develop technical skills. ACM Hack also aims to foster an inclusive and open community within UC San Diego.

", + "image": "http://www.google.com/think/images/prototyping-for-success_articles_lg.jpg" + }, + { + "id": "astro", + "name": "Astronomy Club at UCSD", + "description": "

Astronomy Club at UCSD aims to promote the interest of astronomy and astrophysics among UCSD undergraduates. Our organization will focus on the exploration of the universe. We hope to help students, who are interested in astronomy, make observations, know each other and get more access to professional faculty.

", + "image": "http://searchwide.com/wp-content/uploads/2013/11/evaluation.jpg" + }, + { + "id": "beatz", + "name": "Beat @ UCSD", + "description": "

To provide a fun and lively atmosphere to continue our passion for a cappella music at the collegiate level; to immerse members into the a cappella community on-campus and beyond; to strengthen and improve vocal and musical ability; to provide entertaining performances; and to foster close-knit relationships within the group.

", + "image": "http://www.quality-wars.com/wp-content/uploads/Gantt-Chart-Example-2-NO-LETTERS1.jpg" + }, + { + "id": "artnmedia", + "name": "Digital Arts and Media", + "description": "

In the 21st century, social media advertising is vital to the success of cooperations. Many start-ups and fully developed companies are looking for media teams to help keep up with the booming industry that is social advertising. The purpose of Digital Arts and Media is to experience what it is like to be apart of a social media team and how to channel creative skills into a lucrative job.

", + "image": "http://regmedia.co.uk/2011/03/01/node_code.png" + }, + { + "id": "food", + "name": "Food Cooperative at UCSD", + "description": "

The Food Cooperative at UCSD is a collective running a store serving vegan food and products, with the interest in fostering social, political, economic, and ecological change.

", + "image": "http://torontopubliclibrary.typepad.com/.a/6a00e5509ea6a18834019b00ff4518970b-800wi" + } + ] +} diff --git a/routes/index.js b/routes/index.js index 51466f4d5..4a7383c87 100644 --- a/routes/index.js +++ b/routes/index.js @@ -1,8 +1,5 @@ - -/* - * GET home page. - */ +var club = require("../public/json/club.json"); exports.view = function(req, res){ - res.render('index'); -}; \ No newline at end of file + res.render('index', club); +}; diff --git a/views/index.handlebars b/views/index.handlebars index 8a155a4e4..eb6dc29d7 100644 --- a/views/index.handlebars +++ b/views/index.handlebars @@ -39,7 +39,19 @@
-
+ {{#each club}} +
+
+

{{name}}

+

{{description}}

+
+
+ +
+
+ {{/each}} + +
From 3849b71952cdf2ee79ac6648ddbd7d2ee0cde2d6 Mon Sep 17 00:00:00 2001 From: Fernando Reyes Jr Date: Thu, 25 Feb 2021 13:55:49 -0800 Subject: [PATCH 13/54] added the saved events using json --- app.js | 2 ++ views/calendar.handlebars | 63 +++++++++++++++++++++++++++++++++++++++ views/index.handlebars | 9 ++++-- 3 files changed, 71 insertions(+), 3 deletions(-) diff --git a/app.js b/app.js index 428433b63..ecd9fff42 100644 --- a/app.js +++ b/app.js @@ -11,6 +11,7 @@ var handlebars = require('express3-handlebars') var index = require('./routes/index'); var club = require('./routes/club'); var event = require('./routes/event'); +var calendar = require('./routes/calendar'); // Example route // var user = require('./routes/user'); @@ -39,6 +40,7 @@ if ('development' == app.get('env')) { app.get('/', index.view); app.get('/club', club.view); app.get('/event', event.view); +app.get('/calendar', calendar.view); // Example route // app.get('/users', user.list); diff --git a/views/calendar.handlebars b/views/calendar.handlebars index e69de29bb..ebd6717a1 100644 --- a/views/calendar.handlebars +++ b/views/calendar.handlebars @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + Calendar + + + +
+
+ +
+

Clubs

+
+ +
+ +

Upcoming Events

+ +
+
+ + +
+
+ + {{#each savedEvent}} +

{{weekNum}}

+ {{#each events}} +
+
+ + +

{{clubEvent}}

+

{{clubName}}

+

{{location}}

+

{{date}}

+
+
+ +
+
+ {{/each}} + {{/each}} + +
+ + + + + \ No newline at end of file diff --git a/views/index.handlebars b/views/index.handlebars index e58d8361d..f6f94edb4 100644 --- a/views/index.handlebars +++ b/views/index.handlebars @@ -15,15 +15,18 @@
-
-

Clubs

-
+ +
+

Clubs

+
+

Upcoming Events
+
From ce89425c5e5f344e3d48ff49af09bc21eee3c26c Mon Sep 17 00:00:00 2001 From: Fernando Reyes Jr Date: Thu, 25 Feb 2021 16:05:57 -0800 Subject: [PATCH 14/54] added json and calendar --- public/css/calendar.css | 96 +++++++++++++++++++++ public/images/heart_fill.png | Bin 0 -> 541 bytes routes/calendar.js | 45 ++++++++++ views/index.handlebars | 158 +++++++++++++++++------------------ 4 files changed, 219 insertions(+), 80 deletions(-) create mode 100644 public/css/calendar.css create mode 100644 public/images/heart_fill.png create mode 100644 routes/calendar.js diff --git a/public/css/calendar.css b/public/css/calendar.css new file mode 100644 index 000000000..aa3e9b007 --- /dev/null +++ b/public/css/calendar.css @@ -0,0 +1,96 @@ +body { + display: flex; + justify-content: center; + align-items: center; + background-color: whitesmoke; + height: 100vh; + font-family: Helvetica, Arial, sans-serif; + } + + .main { + display: flex; + flex-wrap: wrap; + flex-direction: column; + justify-content: space-between; + align-items: center; + width: 505px; + height: 900px; + background-color: white; + border: solid; + } + + header { + display: flex; + width: 100%; + height: 10%; + border: solid 1px; + } + + section { + display: flex; + width: 80%; + border: 1px solid; + height: 18%; + } + + h2 { + font-size: 24px; + text-align: left; + padding:0%; + } + + h3 { + margin-bottom: 5px; + font-size: 24px; + } + + h4 { + margin-bottom: 5px; + font-size: 21px; + } + + p { + font-size: 12px; + } + + a { + text-decoration: none; + color: black; + padding: 0px; + margin: 0px; + display: block; + width: 100%; + height: 100%; + } + + .headerUnit { + display: flex; + justify-content: center; + align-items: center; + width: 40%; + border: solid 1px; + } + + #divImg { + display: flex; + justify-content: center; + align-items: center; + width: 20%; + } + + .longTitle { + text-align: center; + font-weight: normal; + } + + .sectionUnit { + width: 70%; + padding-bottom: 50%; + } + + .sectionUnit2 { + width: 20%; + display: flex; + justify-content: center; + align-items: center; + } diff --git a/public/images/heart_fill.png b/public/images/heart_fill.png new file mode 100644 index 0000000000000000000000000000000000000000..5adcce8fe6901579d3bf68afc46db36cb57b37e4 GIT binary patch literal 541 zcmV+&0^vC zgD?<=|D-Q{%m^MK8-xwg4blyo4af#`1G+(y36f4wHh>M%$G%Y?7?mOtFxc3~C;bu# z>Fi(UI~!P_o0Zf~YAqG0`;~f@DJ4>8sVnpdq_!%yP^w5&?32`|x*h~g_8@hW%6lqB zY1(vLQjGsbd$AudP}5M*5;suK#>CyBCx;OOHFcOEu5}ajL2bot<<-JqwzY4X5E!?1 zU5VohC4OQR~vx1nAiYOb}={<3&;HLIqrJ0!MgO f)VhS2V5j~C + + - - COGS 120 - A5 Screen 1 - - - + COGS 120 - A5 Screen 1 + + + - + -
+
-
- -
-

Clubs

-
- -
- +
+
+

Clubs

+
+
+

Upcoming Events

- -
-
- - -
-
- -
-
-
-
-
-
-
- -
+
+
+ +
+
-
-
-

Design Co.

-

pre-professional design org

-
-
- -
-
+
+
+
+
+
+
+
+ +
+
-
-
-

arch@UCSD

-

CMAA org promoting architecture

-
-
- -
-
+
+
+

Design Co.

+

pre-professional design org

+
+
+ +
+
-
-
-

KASA

-

Korean-American social club

-
-
- -
-
+
+
+

arch@UCSD

+

CMAA org promoting architecture

+
+
+ +
+
+
+
+

KASA

+

Korean-American social club

+
+
+ +
+
-
- -
-

VSA

-

Promoting Vietnamese culture

-
- -
- -
-
-
+
+
-

CASA

-

Chinese-American social club

+

VSA

+

Promoting Vietnamese culture

-
- -
-
+ +
+ +
+
-
+
+
+

CASA

+

Chinese-American social club

+
+
+ +
+
+ +
- + - + \ No newline at end of file From 8ab15080ebe2563bbf994fac6aea94977e5a1bf2 Mon Sep 17 00:00:00 2001 From: Lucas Ryan Date: Thu, 25 Feb 2021 16:10:37 -0800 Subject: [PATCH 15/54] fixed button, added modal --- public/css/event.css | 3 ++ views/club.handlebars | 83 ++++++++++++++++++++++++++++++++++++++++-- views/event.handlebars | 7 ++-- 3 files changed, 86 insertions(+), 7 deletions(-) diff --git a/public/css/event.css b/public/css/event.css index 52f6fac97..85c9825b5 100644 --- a/public/css/event.css +++ b/public/css/event.css @@ -52,6 +52,8 @@ body { display: flex; justify-content: center; align-items: center; + text-decoration: none; + text-align: center; width: 40%; border: solid 1px; } @@ -71,6 +73,7 @@ body { .sectionUnit { margin: auto; width: 70%; + } .sectionUnit2 { diff --git a/views/club.handlebars b/views/club.handlebars index ea1552717..36919d198 100644 --- a/views/club.handlebars +++ b/views/club.handlebars @@ -57,9 +57,15 @@

Board Members

- - - + + + + + + + + +
@@ -74,6 +80,75 @@
+ + + + + - \ No newline at end of file + + diff --git a/views/event.handlebars b/views/event.handlebars index 15be0487c..3b1638586 100644 --- a/views/event.handlebars +++ b/views/event.handlebars @@ -19,11 +19,12 @@
-
-

Clubs

+ +

Clubs

+
- +

Upcoming Events

From 6c5b23f7de4f091fd583730c7f47e3d9d8e38bf1 Mon Sep 17 00:00:00 2001 From: ck-ho <> Date: Thu, 25 Feb 2021 16:10:53 -0800 Subject: [PATCH 16/54] fixed link --- public/json/club.json | 12 ++++++------ views/index.handlebars | 10 ++++++---- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/public/json/club.json b/public/json/club.json index 22cbd88fc..a47fc1c6a 100644 --- a/public/json/club.json +++ b/public/json/club.json @@ -4,37 +4,37 @@ { "id": "mus", "name": "Musicians Club @ UCSD", - "description": "

Our purpose is to give an outlet for music lovers to share and express their passion for music, to allow musicians to collaborate and learn from one another, and to give musicians of all levels the experience of performing with others in front of an audience.

", + "description": "Our purpose is to give an outlet for music lovers to share and express their passion for music, to allow musicians to collaborate and learn from one another, and to give musicians of all levels the experience of performing with others in front of an audience.", "image": "http://upload.wikimedia.org/wikipedia/commons/3/3b/Bowery_men_waiting_for_bread_in_bread_line,_New_York_City,_Bain_Collection.jpg" }, { "id": "ACMH", "name": "ACM Hack", - "description": "

ACM Hack aims to spread the knowledge of Software Engineering and general computing and help its members develop technical skills. ACM Hack also aims to foster an inclusive and open community within UC San Diego.

", + "description": "ACM Hack aims to spread the knowledge of Software Engineering and general computing and help its members develop technical skills. ACM Hack also aims to foster an inclusive and open community within UC San Diego.", "image": "http://www.google.com/think/images/prototyping-for-success_articles_lg.jpg" }, { "id": "astro", "name": "Astronomy Club at UCSD", - "description": "

Astronomy Club at UCSD aims to promote the interest of astronomy and astrophysics among UCSD undergraduates. Our organization will focus on the exploration of the universe. We hope to help students, who are interested in astronomy, make observations, know each other and get more access to professional faculty.

", + "description": "Astronomy Club at UCSD aims to promote the interest of astronomy and astrophysics among UCSD undergraduates. Our organization will focus on the exploration of the universe. We hope to help students, who are interested in astronomy, make observations, know each other and get more access to professional faculty.", "image": "http://searchwide.com/wp-content/uploads/2013/11/evaluation.jpg" }, { "id": "beatz", "name": "Beat @ UCSD", - "description": "

To provide a fun and lively atmosphere to continue our passion for a cappella music at the collegiate level; to immerse members into the a cappella community on-campus and beyond; to strengthen and improve vocal and musical ability; to provide entertaining performances; and to foster close-knit relationships within the group.

", + "description": "To provide a fun and lively atmosphere to continue our passion for a cappella music at the collegiate level; to immerse members into the a cappella community on-campus and beyond; to strengthen and improve vocal and musical ability; to provide entertaining performances; and to foster close-knit relationships within the group.", "image": "http://www.quality-wars.com/wp-content/uploads/Gantt-Chart-Example-2-NO-LETTERS1.jpg" }, { "id": "artnmedia", "name": "Digital Arts and Media", - "description": "

In the 21st century, social media advertising is vital to the success of cooperations. Many start-ups and fully developed companies are looking for media teams to help keep up with the booming industry that is social advertising. The purpose of Digital Arts and Media is to experience what it is like to be apart of a social media team and how to channel creative skills into a lucrative job.

", + "description": "In the 21st century, social media advertising is vital to the success of cooperations. Many start-ups and fully developed companies are looking for media teams to help keep up with the booming industry that is social advertising. The purpose of Digital Arts and Media is to experience what it is like to be apart of a social media team and how to channel creative skills into a lucrative job.", "image": "http://regmedia.co.uk/2011/03/01/node_code.png" }, { "id": "food", "name": "Food Cooperative at UCSD", - "description": "

The Food Cooperative at UCSD is a collective running a store serving vegan food and products, with the interest in fostering social, political, economic, and ecological change.

", + "description": "The Food Cooperative at UCSD is a collective running a store serving vegan food and products, with the interest in fostering social, political, economic, and ecological change.", "image": "http://torontopubliclibrary.typepad.com/.a/6a00e5509ea6a18834019b00ff4518970b-800wi" } ] diff --git a/views/index.handlebars b/views/index.handlebars index eb6dc29d7..14ec949c9 100644 --- a/views/index.handlebars +++ b/views/index.handlebars @@ -41,10 +41,12 @@ {{#each club}}
-
-

{{name}}

-

{{description}}

-
+ +
+

{{name}}

+

{{description}}

+
+
From 4e7f7b03a68c368eccbf786f7607445ee851ff5d Mon Sep 17 00:00:00 2001 From: Fernando Reyes Jr Date: Thu, 25 Feb 2021 16:33:23 -0800 Subject: [PATCH 17/54] added diff club events --- routes/calendar.js | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/routes/calendar.js b/routes/calendar.js index 8f7420e5e..7c6648973 100644 --- a/routes/calendar.js +++ b/routes/calendar.js @@ -12,13 +12,13 @@ exports.view = function (req, res) { clubEvent: "Bonfire", clubName: "VSA", location: "Blacks Beach", - date: "02/29/21", + date: "02/27/21", }, { - clubEvent: "Bonfire", - clubName: "VSA", - location: "Blacks Beach", - date: "02/29/21", + clubEvent: "GBM #1", + clubName: "Astronomy Club at UCSD", + location: "Price Theater", + date: "02/27/21", }, ], }, @@ -28,15 +28,15 @@ exports.view = function (req, res) { events: [ { clubEvent: "Bonfire", - clubName: "VSA", - location: "Blacks Beach", - date: "02/29/21", + clubName: "Digital Arts and Media", + location: "Digital Media Library", + date: "03/2/21", }, { - clubEvent: "Bonfire", - clubName: "VSA", - location: "Blacks Beach", - date: "02/29/21", + clubEvent: "GBM $1", + clubName: "Food Cooperative at UCSD", + location: "Food Co-op room", + date: "03/6/21", }, ], }, From f5dfb6d6347b3b6d30d198f132504c1923d97e51 Mon Sep 17 00:00:00 2001 From: Lucas Ryan Date: Thu, 25 Feb 2021 18:29:02 -0800 Subject: [PATCH 18/54] fixed typo --- app.js | 1 + public/json/club.json | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/app.js b/app.js index 7808a3778..e1f5b255a 100644 --- a/app.js +++ b/app.js @@ -12,6 +12,7 @@ var index = require('./routes/index'); var club = require('./routes/club'); var event = require('./routes/event'); var calendar = require('./routes/calendar'); +var login = require('./routes/login'); // Example route // var user = require('./routes/user'); diff --git a/public/json/club.json b/public/json/club.json index 8550c483c..b0dfb6a4d 100644 --- a/public/json/club.json +++ b/public/json/club.json @@ -34,11 +34,7 @@ { "id": "food", "name": "Food Cooperative at UCSD", -<<<<<<< HEAD "description": "The Food Cooperative at UCSD is a collective running a store serving vegan food and products, with the interest in fostering social, political, economic, and ecological change.

", -======= - "description": "The Food Cooperative at UCSD is a collective running a store serving vegan food and products, with the interest in fostering social, political, economic, and ecological change.", ->>>>>>> 2a55509876d08b823d3b5fb190dc6a1837b60fde "image": "http://torontopubliclibrary.typepad.com/.a/6a00e5509ea6a18834019b00ff4518970b-800wi" } ] From 7ee5d3d5eaff8ec58da6113d7fc11d90b39bafc1 Mon Sep 17 00:00:00 2001 From: ck-ho <> Date: Thu, 25 Feb 2021 18:31:02 -0800 Subject: [PATCH 19/54] fixes --- app.js | 1 + public/json/club.json | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/app.js b/app.js index 7808a3778..e1f5b255a 100644 --- a/app.js +++ b/app.js @@ -12,6 +12,7 @@ var index = require('./routes/index'); var club = require('./routes/club'); var event = require('./routes/event'); var calendar = require('./routes/calendar'); +var login = require('./routes/login'); // Example route // var user = require('./routes/user'); diff --git a/public/json/club.json b/public/json/club.json index 8550c483c..a47fc1c6a 100644 --- a/public/json/club.json +++ b/public/json/club.json @@ -34,11 +34,7 @@ { "id": "food", "name": "Food Cooperative at UCSD", -<<<<<<< HEAD - "description": "The Food Cooperative at UCSD is a collective running a store serving vegan food and products, with the interest in fostering social, political, economic, and ecological change.

", -======= "description": "The Food Cooperative at UCSD is a collective running a store serving vegan food and products, with the interest in fostering social, political, economic, and ecological change.", ->>>>>>> 2a55509876d08b823d3b5fb190dc6a1837b60fde "image": "http://torontopubliclibrary.typepad.com/.a/6a00e5509ea6a18834019b00ff4518970b-800wi" } ] From d7e0a529e94a565168d810d33222dffe981e5fdc Mon Sep 17 00:00:00 2001 From: Lucas Ryan Date: Thu, 25 Feb 2021 18:32:05 -0800 Subject: [PATCH 20/54] framework for heart click --- public/images/pink_heart.png | Bin 0 -> 854 bytes public/js/event.js | 8 ++++++++ views/event.handlebars | 7 ++++--- 3 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 public/images/pink_heart.png create mode 100644 public/js/event.js diff --git a/public/images/pink_heart.png b/public/images/pink_heart.png new file mode 100644 index 0000000000000000000000000000000000000000..aec183483b71bb1a6270fc683a410e6b5ff80546 GIT binary patch literal 854 zcmV-c1F8IpP)vG z+CUJ7|5Yf!CEyNl2ZH1!Gk`+{h6(}|SX2;Ffk_3%CYih>fIFarsDtos&}R1pSTP8J zkS)&N3?Q9g(XYMR+uI`~!0zoC-W9IETms0IrnBWs@xk&Uo+6+-n$#vZ0RAv^5%495 zN@AxdO~t2+n8Fd;paB+-4>W1`yKE7532+K+Is6>C@uXW5QI1EytKYJCa(UVXFu8}1Hy35Cvxn1$Nw>n)5;mUnePH$ip+@Vpur$?mb$b!^A>+89(NAW8&>MeXFUBhloJSXSV*uSe)q|}NCi)Qy3Fcp6E3%H)4P78{HR2}t2i%BR#uu5eEZ zaXWiRq7Y-IeBYPS{}pn9`ZTJxlD@Uq3Q>}>CUWU!`-xEYUh2}w^iL13g^r0mMJRi9 zttgW6YkAefOOi0Kw{fr#g0W$#%rCVochxC?{=r?&7GrmPu#0P?p01(!#RBBFw!YBhm$dNqkLq9g_ZHg&XS+Cd#h=0cR%AdtbJj^jm&*kKTu>k2L!1O{0Q>fF#E gARGMI?y+y-AMo`p<|UT@iU0rr07*qoM6N<$f*m1(g8%>k literal 0 HcmV?d00001 diff --git a/public/js/event.js b/public/js/event.js new file mode 100644 index 000000000..54d01ae65 --- /dev/null +++ b/public/js/event.js @@ -0,0 +1,8 @@ +function clickHeart(){ + var img1 = "../images/heart_outline.png"; + var img2 = "../images/pink_heart.png"; + + var imgElement = document.getElementById('clickHeart'); + + imgElement.src = (imgElement.src === img1)? img2 : img1; +} \ No newline at end of file diff --git a/views/event.handlebars b/views/event.handlebars index 3b1638586..a9cb39eb3 100644 --- a/views/event.handlebars +++ b/views/event.handlebars @@ -12,6 +12,7 @@ + Event @@ -42,7 +43,7 @@

Cognitive Science Building

- +
@@ -53,7 +54,7 @@

Cognitive Science Building

- +
@@ -64,7 +65,7 @@

Cognitive Science Building

- +

1/28 - 2/5

From 8ba33c120411deb4eef7ed86053552607b886958 Mon Sep 17 00:00:00 2001 From: ck-ho <> Date: Thu, 25 Feb 2021 18:49:12 -0800 Subject: [PATCH 21/54] club description fix --- public/json/club.json | 12 ++++++------ views/index.handlebars | 5 ++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/public/json/club.json b/public/json/club.json index a47fc1c6a..d425136ec 100644 --- a/public/json/club.json +++ b/public/json/club.json @@ -4,37 +4,37 @@ { "id": "mus", "name": "Musicians Club @ UCSD", - "description": "Our purpose is to give an outlet for music lovers to share and express their passion for music, to allow musicians to collaborate and learn from one another, and to give musicians of all levels the experience of performing with others in front of an audience.", + "description": "Our purpose is to give an outlet for music lovers to share and express their passion for music.", "image": "http://upload.wikimedia.org/wikipedia/commons/3/3b/Bowery_men_waiting_for_bread_in_bread_line,_New_York_City,_Bain_Collection.jpg" }, { "id": "ACMH", "name": "ACM Hack", - "description": "ACM Hack aims to spread the knowledge of Software Engineering and general computing and help its members develop technical skills. ACM Hack also aims to foster an inclusive and open community within UC San Diego.", + "description": "ACM Hack aims to spread the knowledge of Software Engineering and general computing.", "image": "http://www.google.com/think/images/prototyping-for-success_articles_lg.jpg" }, { "id": "astro", "name": "Astronomy Club at UCSD", - "description": "Astronomy Club at UCSD aims to promote the interest of astronomy and astrophysics among UCSD undergraduates. Our organization will focus on the exploration of the universe. We hope to help students, who are interested in astronomy, make observations, know each other and get more access to professional faculty.", + "description": "Astronomy Club at UCSD aims to promote the interest of astronomy and astrophysics.", "image": "http://searchwide.com/wp-content/uploads/2013/11/evaluation.jpg" }, { "id": "beatz", "name": "Beat @ UCSD", - "description": "To provide a fun and lively atmosphere to continue our passion for a cappella music at the collegiate level; to immerse members into the a cappella community on-campus and beyond; to strengthen and improve vocal and musical ability; to provide entertaining performances; and to foster close-knit relationships within the group.", + "description": "To provide a fun and lively atmosphere to continue our passion for a cappella music.", "image": "http://www.quality-wars.com/wp-content/uploads/Gantt-Chart-Example-2-NO-LETTERS1.jpg" }, { "id": "artnmedia", "name": "Digital Arts and Media", - "description": "In the 21st century, social media advertising is vital to the success of cooperations. Many start-ups and fully developed companies are looking for media teams to help keep up with the booming industry that is social advertising. The purpose of Digital Arts and Media is to experience what it is like to be apart of a social media team and how to channel creative skills into a lucrative job.", + "description": "In the 21st century, social media advertising is vital to the success of cooperations.", "image": "http://regmedia.co.uk/2011/03/01/node_code.png" }, { "id": "food", "name": "Food Cooperative at UCSD", - "description": "The Food Cooperative at UCSD is a collective running a store serving vegan food and products, with the interest in fostering social, political, economic, and ecological change.", + "description": "A collective running a store serving vegan food and products.", "image": "http://torontopubliclibrary.typepad.com/.a/6a00e5509ea6a18834019b00ff4518970b-800wi" } ] diff --git a/views/index.handlebars b/views/index.handlebars index ff803b446..147d9afec 100644 --- a/views/index.handlebars +++ b/views/index.handlebars @@ -29,7 +29,6 @@
-<<<<<<< HEAD
@@ -40,7 +39,7 @@
-======= + {{#each club}}
@@ -124,4 +123,4 @@ - \ No newline at end of file + From dc7b031121cd39a321d4a7408e16ef6d22fc1471 Mon Sep 17 00:00:00 2001 From: Lucas Ryan Date: Thu, 25 Feb 2021 19:03:32 -0800 Subject: [PATCH 22/54] added first handler --- views/event.handlebars | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/views/event.handlebars b/views/event.handlebars index a9cb39eb3..012c3a4f9 100644 --- a/views/event.handlebars +++ b/views/event.handlebars @@ -12,12 +12,23 @@ - - + Event +
@@ -43,7 +54,7 @@

Cognitive Science Building

- +
@@ -54,7 +65,7 @@

Cognitive Science Building

- +
@@ -65,7 +76,7 @@

Cognitive Science Building

- +

1/28 - 2/5

From 07c347d253b2608fe46dad201f195983f866e116 Mon Sep 17 00:00:00 2001 From: Lucas Ryan Date: Thu, 25 Feb 2021 19:09:43 -0800 Subject: [PATCH 23/54] js file --- public/js/event.js | 14 ++++++++------ views/event.handlebars | 13 +------------ 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/public/js/event.js b/public/js/event.js index 54d01ae65..044853c36 100644 --- a/public/js/event.js +++ b/public/js/event.js @@ -1,8 +1,10 @@ -function clickHeart(){ - var img1 = "../images/heart_outline.png"; - var img2 = "../images/pink_heart.png"; - - var imgElement = document.getElementById('clickHeart'); +function clickHeart() { + var image = document.getElementById('clickHeart'); - imgElement.src = (imgElement.src === img1)? img2 : img1; + if (image.src.match("images/heart_outline.png")) { + image.src = "images/pink_heart.png"; + } + else { + image.src = "images/heart_outline.png"; + } } \ No newline at end of file diff --git a/views/event.handlebars b/views/event.handlebars index 012c3a4f9..bab0a3056 100644 --- a/views/event.handlebars +++ b/views/event.handlebars @@ -13,22 +13,11 @@ + Event -
From fc4f3b6048bf741322691353031d9eddeca5a268 Mon Sep 17 00:00:00 2001 From: Lucas Ryan Date: Thu, 25 Feb 2021 23:08:51 -0800 Subject: [PATCH 24/54] Added a shiton of hearts --- public/js/event.js | 22 ++++++++++++++++ public/js/index.js | 60 ++++++++++++++++++++++++++++++++++++++++++ public/json/club.json | 24 ++++++++++------- views/event.handlebars | 4 +-- views/index.handlebars | 4 ++- 5 files changed, 102 insertions(+), 12 deletions(-) create mode 100644 public/js/index.js diff --git a/public/js/event.js b/public/js/event.js index 044853c36..8ce34b3fd 100644 --- a/public/js/event.js +++ b/public/js/event.js @@ -1,6 +1,28 @@ function clickHeart() { var image = document.getElementById('clickHeart'); + if (image.src.match("images/heart_outline.png")) { + image.src = "images/pink_heart.png"; + } + else { + image.src = "images/heart_outline.png"; + } +} + +function clickHeart1() { + var image = document.getElementById('clickHeart1'); + + if (image.src.match("images/heart_outline.png")) { + image.src = "images/pink_heart.png"; + } + else { + image.src = "images/heart_outline.png"; + } +} + +function clickHeart2() { + var image = document.getElementById('clickHeart2'); + if (image.src.match("images/heart_outline.png")) { image.src = "images/pink_heart.png"; } diff --git a/public/js/index.js b/public/js/index.js new file mode 100644 index 000000000..d7cb8b2b9 --- /dev/null +++ b/public/js/index.js @@ -0,0 +1,60 @@ +function clubHeart() { + var image = document.getElementById('clubHeart'); + + if (image.src.match("images/heart_outline.png")) { + image.src = "images/pink_heart.png"; + } + else { + image.src = "images/heart_outline.png"; + } +} +function clubHeart1() { + var image = document.getElementById('clubHeart1'); + + if (image.src.match("images/heart_outline.png")) { + image.src = "images/pink_heart.png"; + } + else { + image.src = "images/heart_outline.png"; + } +} +function clubHeart2() { + var image = document.getElementById('clubHeart2'); + + if (image.src.match("images/heart_outline.png")) { + image.src = "images/pink_heart.png"; + } + else { + image.src = "images/heart_outline.png"; + } +} +function clubHeart3() { + var image = document.getElementById('clubHeart3'); + + if (image.src.match("images/heart_outline.png")) { + image.src = "images/pink_heart.png"; + } + else { + image.src = "images/heart_outline.png"; + } +} +function clubHeart4() { + var image = document.getElementById('clubHeart4'); + + if (image.src.match("images/heart_outline.png")) { + image.src = "images/pink_heart.png"; + } + else { + image.src = "images/heart_outline.png"; + } +} +function clubHeart5() { + var image = document.getElementById('clubHeart5'); + + if (image.src.match("images/heart_outline.png")) { + image.src = "images/pink_heart.png"; + } + else { + image.src = "images/heart_outline.png"; + } +} \ No newline at end of file diff --git a/public/json/club.json b/public/json/club.json index d425136ec..a16e6439d 100644 --- a/public/json/club.json +++ b/public/json/club.json @@ -5,37 +5,43 @@ "id": "mus", "name": "Musicians Club @ UCSD", "description": "Our purpose is to give an outlet for music lovers to share and express their passion for music.", - "image": "http://upload.wikimedia.org/wikipedia/commons/3/3b/Bowery_men_waiting_for_bread_in_bread_line,_New_York_City,_Bain_Collection.jpg" + "image": "http://upload.wikimedia.org/wikipedia/commons/3/3b/Bowery_men_waiting_for_bread_in_bread_line,_New_York_City,_Bain_Collection.jpg", + "idH": "clubHeart" }, { "id": "ACMH", "name": "ACM Hack", "description": "ACM Hack aims to spread the knowledge of Software Engineering and general computing.", - "image": "http://www.google.com/think/images/prototyping-for-success_articles_lg.jpg" + "image": "http://www.google.com/think/images/prototyping-for-success_articles_lg.jpg", + "idH": "clubHeart1" }, { "id": "astro", "name": "Astronomy Club at UCSD", "description": "Astronomy Club at UCSD aims to promote the interest of astronomy and astrophysics.", - "image": "http://searchwide.com/wp-content/uploads/2013/11/evaluation.jpg" + "image": "http://searchwide.com/wp-content/uploads/2013/11/evaluation.jpg", + "idH": "clubHeart2" }, { "id": "beatz", "name": "Beat @ UCSD", "description": "To provide a fun and lively atmosphere to continue our passion for a cappella music.", - "image": "http://www.quality-wars.com/wp-content/uploads/Gantt-Chart-Example-2-NO-LETTERS1.jpg" + "image": "http://www.quality-wars.com/wp-content/uploads/Gantt-Chart-Example-2-NO-LETTERS1.jpg", + "idH": "clubHeart3" }, { "id": "artnmedia", "name": "Digital Arts and Media", "description": "In the 21st century, social media advertising is vital to the success of cooperations.", - "image": "http://regmedia.co.uk/2011/03/01/node_code.png" + "image": "http://regmedia.co.uk/2011/03/01/node_code.png", + "idH": "clubHeart4" }, { - "id": "food", - "name": "Food Cooperative at UCSD", - "description": "A collective running a store serving vegan food and products.", - "image": "http://torontopubliclibrary.typepad.com/.a/6a00e5509ea6a18834019b00ff4518970b-800wi" + "id": "vsa", + "name": "Vietnamese Student Association", + "description": "VSA is an Vietnamese culture org that celebrates inclusivity and community.", + "image": "http://torontopubliclibrary.typepad.com/.a/6a00e5509ea6a18834019b00ff4518970b-800wi", + "idH": "clubHeart5" } ] } diff --git a/views/event.handlebars b/views/event.handlebars index bab0a3056..c170a5949 100644 --- a/views/event.handlebars +++ b/views/event.handlebars @@ -54,7 +54,7 @@

Cognitive Science Building

- +
@@ -65,7 +65,7 @@

Cognitive Science Building

- +

1/28 - 2/5

diff --git a/views/index.handlebars b/views/index.handlebars index 147d9afec..e01dc15f5 100644 --- a/views/index.handlebars +++ b/views/index.handlebars @@ -8,6 +8,8 @@ COGS 120 - A5 Screen 1 + + @@ -49,7 +51,7 @@
- +
{{/each}} From e4f03bddf7179f4fed1306623f8a9c0294126341 Mon Sep 17 00:00:00 2001 From: Lucas Ryan Date: Thu, 25 Feb 2021 23:17:34 -0800 Subject: [PATCH 25/54] Finishing touches on Club screen --- public/css/club.css | 3 +- views/club.handlebars | 164 +++++++++++++++++++++++------------------- 2 files changed, 94 insertions(+), 73 deletions(-) diff --git a/public/css/club.css b/public/css/club.css index 800d3443f..3443c8069 100644 --- a/public/css/club.css +++ b/public/css/club.css @@ -20,10 +20,11 @@ body { } .head{ + width: 100%; display: flex; justify-content: space-between; align-items: center; - margin: 30px; + padding: 30px; } .gallery{ diff --git a/views/club.handlebars b/views/club.handlebars index 36919d198..3359cbfe2 100644 --- a/views/club.handlebars +++ b/views/club.handlebars @@ -28,9 +28,24 @@ - + +
+
VSA @@ -57,13 +72,13 @@

Board Members

- + - + - + @@ -73,82 +88,87 @@
- - - - + + + + + \ No newline at end of file From be03fd534daccfe55ad8f02d906e8026822ebb6b Mon Sep 17 00:00:00 2001 From: Lucas Ryan Date: Fri, 26 Feb 2021 12:10:40 -0800 Subject: [PATCH 26/54] updates --- public/css/event.css | 2 +- public/css/index.css | 6 ++++-- public/js/event.js | 10 ++++++++++ public/json/club.json | 20 +++++++------------- views/calendar.handlebars | 10 ++++++---- views/event.handlebars | 34 ++++++++++++++++++++++------------ views/index.handlebars | 12 +++++++++--- 7 files changed, 59 insertions(+), 35 deletions(-) diff --git a/public/css/event.css b/public/css/event.css index 85c9825b5..5fe8c6e07 100644 --- a/public/css/event.css +++ b/public/css/event.css @@ -11,7 +11,7 @@ body { display: flex; width: 80%; border: 1px solid; - height: 20%; + height: 15%; margin: auto; } .main { diff --git a/public/css/index.css b/public/css/index.css index dce0952b1..6788739d1 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -56,8 +56,8 @@ body { a { text-decoration: none; color: black; - padding: 0px; - margin: 0px; + padding: auto; + margin: auto; display: block; width: 100%; height: 100%; @@ -75,7 +75,9 @@ body { display: flex; justify-content: center; align-items: center; + margin: auto; width: 20%; + margin-left: 30px; } .longTitle { diff --git a/public/js/event.js b/public/js/event.js index 8ce34b3fd..54aaa27e0 100644 --- a/public/js/event.js +++ b/public/js/event.js @@ -23,6 +23,16 @@ function clickHeart1() { function clickHeart2() { var image = document.getElementById('clickHeart2'); + if (image.src.match("images/heart_outline.png")) { + image.src = "images/pink_heart.png"; + } + else { + image.src = "images/heart_outline.png"; + } +} +function clickHeart3() { + var image = document.getElementById('clickHeart3'); + if (image.src.match("images/heart_outline.png")) { image.src = "images/pink_heart.png"; } diff --git a/public/json/club.json b/public/json/club.json index a16e6439d..92d5f1a02 100644 --- a/public/json/club.json +++ b/public/json/club.json @@ -1,17 +1,11 @@ { "club": [ + { - "id": "mus", - "name": "Musicians Club @ UCSD", - "description": "Our purpose is to give an outlet for music lovers to share and express their passion for music.", - "image": "http://upload.wikimedia.org/wikipedia/commons/3/3b/Bowery_men_waiting_for_bread_in_bread_line,_New_York_City,_Bain_Collection.jpg", - "idH": "clubHeart" - }, - { - "id": "ACMH", - "name": "ACM Hack", - "description": "ACM Hack aims to spread the knowledge of Software Engineering and general computing.", + "id": "ACM", + "name": "ACM UCSD", + "description": "ACM UC San Diego is a computing focused organization on campus.", "image": "http://www.google.com/think/images/prototyping-for-success_articles_lg.jpg", "idH": "clubHeart1" }, @@ -30,9 +24,9 @@ "idH": "clubHeart3" }, { - "id": "artnmedia", - "name": "Digital Arts and Media", - "description": "In the 21st century, social media advertising is vital to the success of cooperations.", + "id": "dsgn", + "name": "Design Co", + "description": "We’re a strong and scrappy design community at UC San Diego, bridging the gap between young designers and industry. ", "image": "http://regmedia.co.uk/2011/03/01/node_code.png", "idH": "clubHeart4" }, diff --git a/views/calendar.handlebars b/views/calendar.handlebars index ebd6717a1..d97a9ed5b 100644 --- a/views/calendar.handlebars +++ b/views/calendar.handlebars @@ -25,14 +25,16 @@

Clubs

+
-

Upcoming Events

- +
+
- + +
@@ -49,7 +51,7 @@

{{date}}

- +
{{/each}} diff --git a/views/event.handlebars b/views/event.handlebars index c170a5949..6d1f615d1 100644 --- a/views/event.handlebars +++ b/views/event.handlebars @@ -37,9 +37,9 @@
-

1/21

-

GBM #1

-

Design Co

+

1/21

+

GBM #1

+

ACM

Cognitive Science Building

@@ -48,10 +48,10 @@
-

1/21

-

GBM #1

+

1/24

+

Portofolio Review

Design Co

-

Cognitive Science Building

+

Rady's School of Management

@@ -59,17 +59,27 @@
-

1/21

-

GBM #1

-

Design Co

-

Cognitive Science Building

+

1/24

+

Bonfire

+

VSA

+

Geisel Loop (pickup)

-

1/28 - 2/5

- +

1/28 - 2/5

+
+
+

2/2

+

GBM #1

+

VSA

+

Geisel Loop (pickup)

+
+
+ +
+
diff --git a/views/index.handlebars b/views/index.handlebars index e01dc15f5..d4bc76285 100644 --- a/views/index.handlebars +++ b/views/index.handlebars @@ -19,16 +19,22 @@
+

Clubs

+

Upcoming Events
+
+ +
+
@@ -37,16 +43,16 @@
-
+
{{#each club}}
-

{{name}}

+

{{name}}

{{description}}

 From c3b4ecda59502fa924d95b7ffa74d0ef94501173 Mon Sep 17 00:00:00 2001 From: Fernando Reyes Jr Date: Fri, 26 Feb 2021 12:21:22 -0800 Subject: [PATCH 27/54] club json --- public/json/club.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/public/json/club.json b/public/json/club.json index 8550c483c..a47fc1c6a 100644 --- a/public/json/club.json +++ b/public/json/club.json @@ -34,11 +34,7 @@ { "id": "food", "name": "Food Cooperative at UCSD", -<<<<<<< HEAD - "description": "The Food Cooperative at UCSD is a collective running a store serving vegan food and products, with the interest in fostering social, political, economic, and ecological change.

", -======= "description": "The Food Cooperative at UCSD is a collective running a store serving vegan food and products, with the interest in fostering social, political, economic, and ecological change.", ->>>>>>> 2a55509876d08b823d3b5fb190dc6a1837b60fde "image": "http://torontopubliclibrary.typepad.com/.a/6a00e5509ea6a18834019b00ff4518970b-800wi" } ] From 99e79c6dadb520a52b71881aede7c593d26a35e1 Mon Sep 17 00:00:00 2001 From: Lucas Ryan Date: Fri, 26 Feb 2021 12:21:24 -0800 Subject: [PATCH 28/54] more updates --- public/css/calendar.css | 1 + public/css/event.css | 9 ++++----- public/css/index.css | 5 ----- views/calendar.handlebars | 11 ++++++----- views/event.handlebars | 4 ++++ 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/public/css/calendar.css b/public/css/calendar.css index aa3e9b007..c2a8d0903 100644 --- a/public/css/calendar.css +++ b/public/css/calendar.css @@ -31,6 +31,7 @@ body { width: 80%; border: 1px solid; height: 18%; + padding-left: 20px; } h2 { diff --git a/public/css/event.css b/public/css/event.css index 5fe8c6e07..75ddbb54a 100644 --- a/public/css/event.css +++ b/public/css/event.css @@ -35,12 +35,11 @@ body { a { text-decoration: none; color: black; - padding: 0px; - margin: 0px; - display: block; - width: 100%; - height: 100%; } + h1 { + font-size: 24px; + } + header { display: flex; width: 100%; diff --git a/public/css/index.css b/public/css/index.css index 6788739d1..ba8c93b67 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -56,11 +56,6 @@ body { a { text-decoration: none; color: black; - padding: auto; - margin: auto; - display: block; - width: 100%; - height: 100%; } .headerUnit { diff --git a/views/calendar.handlebars b/views/calendar.handlebars index d97a9ed5b..a61a2eb65 100644 --- a/views/calendar.handlebars +++ b/views/calendar.handlebars @@ -20,17 +20,18 @@
-
+

Clubs

-
- +
+
+

Upcoming Events

- +
- +
+

Upcoming Events

+
+ +

1/20-1/27

From 6d340c7c94d3152f641778a05bb20d3ab21a5bb6 Mon Sep 17 00:00:00 2001 From: Lucas Ryan Date: Fri, 26 Feb 2021 12:22:41 -0800 Subject: [PATCH 29/54] admendum --- public/css/index.css | 1 - 1 file changed, 1 deletion(-) diff --git a/public/css/index.css b/public/css/index.css index ba8c93b67..1cc3303b4 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -72,7 +72,6 @@ body { align-items: center; margin: auto; width: 20%; - margin-left: 30px; } .longTitle { From 77c799fce2b5124682e347aba14f2e47464fac86 Mon Sep 17 00:00:00 2001 From: ck-ho <> Date: Tue, 2 Mar 2021 10:35:46 -0800 Subject: [PATCH 30/54] responsive mode & google sign-in --- public/css/index.css | 10 +++++++--- public/css/login.css | 22 +++++++++++++++++----- public/json/club.json | 6 +++--- views/index.handlebars | 15 ++------------- views/login.handlebars | 7 +++++++ 5 files changed, 36 insertions(+), 24 deletions(-) diff --git a/public/css/index.css b/public/css/index.css index 1cc3303b4..5c5330991 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -5,6 +5,8 @@ body { background-color: whitesmoke; height: 100vh; font-family: Helvetica, Arial, sans-serif; + padding: 0; + margin: 0; } .main { @@ -13,10 +15,12 @@ body { flex-direction: column; justify-content: space-between; align-items: center; - width: 505px; - height: 900px; + width: 100%; + height: 812px; background-color: white; border: solid; + padding: 0; + margin: 0; } header { @@ -100,7 +104,7 @@ body { } .sectionUnit { - width: 70%; + width: 80%; } .sectionUnit2 { diff --git a/public/css/login.css b/public/css/login.css index 29ddeeace..3b2f2cbd5 100644 --- a/public/css/login.css +++ b/public/css/login.css @@ -5,26 +5,38 @@ body { background-color: whitesmoke; height: 100vh; font-family: Helvetica, Arial, sans-serif; + padding: 0; + margin: 0; } .main { - width: 505px; - height: 900px; + width: 100%; + height: 812px; background-color: white; border: solid; + padding: 0; + margin: 0; } h1 { font-size: 48px; font-weight: bold; width: 80%; - margin-left: 50px; + margin-left: 25px; margin-top: 200px; line-height: 1.2; } + h2 { + margin-left: 25px; + } + + .g-signin2 { + margin-left: 25px; + } + form { - margin-left: 50px; + margin-left: 25px; } input { @@ -39,7 +51,7 @@ body { } .button { - margin-left: 50px; + margin-left: 25px; margin-top: 50px; background-color: black; color: white; diff --git a/public/json/club.json b/public/json/club.json index 92d5f1a02..d7f257ae9 100644 --- a/public/json/club.json +++ b/public/json/club.json @@ -11,7 +11,7 @@ }, { "id": "astro", - "name": "Astronomy Club at UCSD", + "name": "Astronomy Club", "description": "Astronomy Club at UCSD aims to promote the interest of astronomy and astrophysics.", "image": "http://searchwide.com/wp-content/uploads/2013/11/evaluation.jpg", "idH": "clubHeart2" @@ -26,13 +26,13 @@ { "id": "dsgn", "name": "Design Co", - "description": "We’re a strong and scrappy design community at UC San Diego, bridging the gap between young designers and industry. ", + "description": "We’re a strong and scrappy design community, bridging the gap between designers and industry.", "image": "http://regmedia.co.uk/2011/03/01/node_code.png", "idH": "clubHeart4" }, { "id": "vsa", - "name": "Vietnamese Student Association", + "name": "VSA", "description": "VSA is an Vietnamese culture org that celebrates inclusivity and community.", "image": "http://torontopubliclibrary.typepad.com/.a/6a00e5509ea6a18834019b00ff4518970b-800wi", "idH": "clubHeart5" diff --git a/views/index.handlebars b/views/index.handlebars index d4bc76285..15754d08d 100644 --- a/views/index.handlebars +++ b/views/index.handlebars @@ -28,25 +28,14 @@

Upcoming Events

- + - - -
-
-
-
-
-
- -
+ {{#each club}}
diff --git a/views/login.handlebars b/views/login.handlebars index 6348c58b8..899ee144f 100644 --- a/views/login.handlebars +++ b/views/login.handlebars @@ -7,6 +7,8 @@ COGS 120 - A5 Screen 1 + + @@ -25,6 +27,11 @@
+

or

+ +
>
+
From 7fd4b6750c91ffae87af33a9db6f47bdb7e10705 Mon Sep 17 00:00:00 2001 From: Lucas Ryan Date: Tue, 2 Mar 2021 21:15:17 -0800 Subject: [PATCH 31/54] combined click functions --- public/js/event.js | 42 ++++----------------------- public/js/index.js | 60 ++++----------------------------------- views/calendar.handlebars | 3 +- views/event.handlebars | 8 +++--- views/index.handlebars | 5 ++-- 5 files changed, 19 insertions(+), 99 deletions(-) diff --git a/public/js/event.js b/public/js/event.js index 54aaa27e0..4782dbf44 100644 --- a/public/js/event.js +++ b/public/js/event.js @@ -1,42 +1,10 @@ -function clickHeart() { - var image = document.getElementById('clickHeart'); +function clickHeart(id) { + var image = document.getElementById(id); - if (image.src.match("images/heart_outline.png")) { - image.src = "images/pink_heart.png"; + if (image.src.match("../images/heart_outline.png")) { + image.src = "../images/pink_heart.png"; } else { - image.src = "images/heart_outline.png"; + image.src = "../images/heart_outline.png"; } } - -function clickHeart1() { - var image = document.getElementById('clickHeart1'); - - if (image.src.match("images/heart_outline.png")) { - image.src = "images/pink_heart.png"; - } - else { - image.src = "images/heart_outline.png"; - } -} - -function clickHeart2() { - var image = document.getElementById('clickHeart2'); - - if (image.src.match("images/heart_outline.png")) { - image.src = "images/pink_heart.png"; - } - else { - image.src = "images/heart_outline.png"; - } -} -function clickHeart3() { - var image = document.getElementById('clickHeart3'); - - if (image.src.match("images/heart_outline.png")) { - image.src = "images/pink_heart.png"; - } - else { - image.src = "images/heart_outline.png"; - } -} \ No newline at end of file diff --git a/public/js/index.js b/public/js/index.js index d7cb8b2b9..b16320e86 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -1,60 +1,10 @@ -function clubHeart() { - var image = document.getElementById('clubHeart'); +function clubHeart(id) { + var image = document.getElementById(id); - if (image.src.match("images/heart_outline.png")) { - image.src = "images/pink_heart.png"; + if (image.src.match("../images/heart_outline.png")) { + image.src = "../images/pink_heart.png"; } else { - image.src = "images/heart_outline.png"; + image.src = "../images/heart_outline.png"; } } -function clubHeart1() { - var image = document.getElementById('clubHeart1'); - - if (image.src.match("images/heart_outline.png")) { - image.src = "images/pink_heart.png"; - } - else { - image.src = "images/heart_outline.png"; - } -} -function clubHeart2() { - var image = document.getElementById('clubHeart2'); - - if (image.src.match("images/heart_outline.png")) { - image.src = "images/pink_heart.png"; - } - else { - image.src = "images/heart_outline.png"; - } -} -function clubHeart3() { - var image = document.getElementById('clubHeart3'); - - if (image.src.match("images/heart_outline.png")) { - image.src = "images/pink_heart.png"; - } - else { - image.src = "images/heart_outline.png"; - } -} -function clubHeart4() { - var image = document.getElementById('clubHeart4'); - - if (image.src.match("images/heart_outline.png")) { - image.src = "images/pink_heart.png"; - } - else { - image.src = "images/heart_outline.png"; - } -} -function clubHeart5() { - var image = document.getElementById('clubHeart5'); - - if (image.src.match("images/heart_outline.png")) { - image.src = "images/pink_heart.png"; - } - else { - image.src = "images/heart_outline.png"; - } -} \ No newline at end of file diff --git a/views/calendar.handlebars b/views/calendar.handlebars index a61a2eb65..f1cec00ee 100644 --- a/views/calendar.handlebars +++ b/views/calendar.handlebars @@ -13,6 +13,7 @@ + Calendar @@ -52,7 +53,7 @@

{{date}}

- +
{{/each}} diff --git a/views/event.handlebars b/views/event.handlebars index 2e711cd1c..379504a37 100644 --- a/views/event.handlebars +++ b/views/event.handlebars @@ -47,7 +47,7 @@

Cognitive Science Building

- +
@@ -58,7 +58,7 @@

Rady's School of Management

- +
@@ -69,7 +69,7 @@

Geisel Loop (pickup)

- +

1/28 - 2/5

@@ -81,7 +81,7 @@

Geisel Loop (pickup)

- +
diff --git a/views/index.handlebars b/views/index.handlebars index 15754d08d..6afe8e55f 100644 --- a/views/index.handlebars +++ b/views/index.handlebars @@ -9,7 +9,6 @@ - @@ -46,10 +45,12 @@
- +
{{/each}} + + + + + + + + \ No newline at end of file diff --git a/views/astro.handlebars b/views/astro.handlebars new file mode 100644 index 000000000..b73301599 --- /dev/null +++ b/views/astro.handlebars @@ -0,0 +1,173 @@ + + + + + + + + + + + + + + + + Club + + + +
+
+ + + + + + + + + +
+ + +
+ Astronomy Club +
+ +
+ The UCSD Astronomy Club is a student run organization whose purpose is to provide an informal meeting space for students and community members to share and engage in our mutual interest of astronomy! +
+ +
+

Club Events

+
+
+ Guest Speaker: NASA +
+
+ GBM #1 +
+ +
+
+ +
+

Board Members

+
+ + + + + + + + + + +
+
+ + + +
+ + + + + + + + \ No newline at end of file diff --git a/views/calendar.handlebars b/views/calendar.handlebars index 2901db77d..288c39d4b 100644 --- a/views/calendar.handlebars +++ b/views/calendar.handlebars @@ -42,7 +42,7 @@ {{#each saved_events}} -
+

{{month}}/{{day}}

{{clubEvent}}

@@ -51,7 +51,7 @@
- +
{{/each}} diff --git a/views/index.handlebars b/views/index.handlebars index 6afe8e55f..e7eebf3be 100644 --- a/views/index.handlebars +++ b/views/index.handlebars @@ -38,7 +38,7 @@ {{#each club}}
- +

{{name}}

{{description}}

From 299db8f6a37087454a43b235a5cf9172815dfb5d Mon Sep 17 00:00:00 2001 From: ck-ho <> Date: Thu, 4 Mar 2021 12:38:49 -0800 Subject: [PATCH 36/54] login new index --- app.js | 4 ++-- views/acm.handlebars | 6 +++--- views/astro.handlebars | 8 ++++---- views/calendar.handlebars | 8 ++++---- views/club.handlebars | 6 +++--- views/event.handlebars | 8 ++++---- views/index.handlebars | 2 +- views/login.handlebars | 4 ++-- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/app.js b/app.js index 0e6ef449d..b7b4204a6 100644 --- a/app.js +++ b/app.js @@ -40,9 +40,9 @@ if ('development' == app.get('env')) { app.use(express.errorHandler()); } -app.get('/', index.view); +app.get('/', login.view); app.get('/club', club.view); -app.get('/login', login.view); +app.get('/index', index.view); app.get('/event', event.view); app.get('/calendar', calendar.view); app.get('/astro', astro.view); diff --git a/views/acm.handlebars b/views/acm.handlebars index 8be2acb44..addbfdf20 100644 --- a/views/acm.handlebars +++ b/views/acm.handlebars @@ -19,7 +19,7 @@
- +
+ {{#each club}} +
+ +
+

{{name}}

+

{{description}}

+
+ +
+ +
+
+ {{/each}} + + + + + + + diff --git a/views/dsgn.handlebars b/views/dsgn.handlebars new file mode 100644 index 000000000..c02203717 --- /dev/null +++ b/views/dsgn.handlebars @@ -0,0 +1,173 @@ + + + + + + + + + + + + + + + + Club + + + +
+
+ + + + + + + + + +
+ + +
+ Design Co. +
+ +
+ We’re a strong and scrappy design community, bridging the gap between designers and industry. +
+ +
+

Club Events

+
+
+ Dco. Social @ Camellia Rd. +
+
+ GBM #3 +
+ +
+
+ +
+

Board Members

+
+ + + + + + + + + + +
+
+ + + +
+ + + + + + + + From 00ddc944dd2fc1b84451394b3ac633b2ae3e747a Mon Sep 17 00:00:00 2001 From: ck-ho <> Date: Fri, 5 Mar 2021 13:17:06 -0800 Subject: [PATCH 40/54] version fix --- app.js | 6 ----- public/css/login.css | 13 +++++----- public/json/club.json | 54 ------------------------------------------ views/index.handlebars | 6 ++--- 4 files changed, 9 insertions(+), 70 deletions(-) diff --git a/app.js b/app.js index b472cb9ed..b4c8e5807 100644 --- a/app.js +++ b/app.js @@ -15,12 +15,9 @@ var calendar = require('./routes/calendar'); var login = require('./routes/login'); var astro = require('./routes/astro'); var acm = require('./routes/acm'); -<<<<<<< HEAD var dsgn = require('./routes/dsgn'); var beatz = require('./routes/beatz'); -======= var upcomingEvents = require('./routes/upcomingEvents'); ->>>>>>> 6f07fb738aad88df965194d89c264eee1307bfb6 // Example route // var user = require('./routes/user'); @@ -53,12 +50,9 @@ app.get('/event', event.view); app.get('/calendar', calendar.view); app.get('/astro', astro.view); app.get('/acm', acm.view); -<<<<<<< HEAD app.get('/dsgn', dsgn.view); app.get('/beatz', beatz.view); -======= app.get('/saved', upcomingEvents.upload); ->>>>>>> 6f07fb738aad88df965194d89c264eee1307bfb6 // Example route // app.get('/users', user.list); diff --git a/public/css/login.css b/public/css/login.css index 3b2f2cbd5..1fcdeb771 100644 --- a/public/css/login.css +++ b/public/css/login.css @@ -3,7 +3,6 @@ body { justify-content: center; align-items: center; background-color: whitesmoke; - height: 100vh; font-family: Helvetica, Arial, sans-serif; padding: 0; margin: 0; @@ -19,24 +18,24 @@ body { } h1 { - font-size: 48px; + font-size: 36px; font-weight: bold; width: 80%; - margin-left: 25px; + margin-left: 20px; margin-top: 200px; line-height: 1.2; } h2 { - margin-left: 25px; + margin-left: 20px; } .g-signin2 { - margin-left: 25px; + margin-left: 20px; } form { - margin-left: 25px; + margin-left: 20px; } input { @@ -51,7 +50,7 @@ body { } .button { - margin-left: 25px; + margin-left: 20px; margin-top: 50px; background-color: black; color: white; diff --git a/public/json/club.json b/public/json/club.json index 82946199d..b066d8b1d 100644 --- a/public/json/club.json +++ b/public/json/club.json @@ -1,41 +1,5 @@ { "club": [ - { - "id": "ACM", - "name": "ACM UCSD", - "description": "ACM UC San Diego is a computing focused organization on campus.", - "image": "http://www.google.com/think/images/prototyping-for-success_articles_lg.jpg", - "idH": "clubHeart1" - }, - { - "id": "astro", - "name": "Astronomy Club", - "description": "Astronomy Club at UCSD aims to promote the interest of astronomy and astrophysics.", - "image": "http://searchwide.com/wp-content/uploads/2013/11/evaluation.jpg", - "idH": "clubHeart2" - }, - { - "id": "beatz", - "name": "Beat @ UCSD", - "description": "To provide a fun and lively atmosphere to continue our passion for a cappella music.", - "image": "http://www.quality-wars.com/wp-content/uploads/Gantt-Chart-Example-2-NO-LETTERS1.jpg", - "idH": "clubHeart3" - }, - { - "id": "dsgn", - "name": "Design Co", - "description": "We’re a strong and scrappy design community, bridging the gap between designers and industry.", - "image": "http://regmedia.co.uk/2011/03/01/node_code.png", - "idH": "clubHeart4" - }, - { - "id": "food", - "name": "Food Cooperative at UCSD", - "description": "The Food Cooperative at UCSD is a collective running a store serving vegan food and products, with the interest in fostering social, political, economic, and ecological change.", - "image": "http://torontopubliclibrary.typepad.com/.a/6a00e5509ea6a18834019b00ff4518970b-800wi" - }, - -<<<<<<< HEAD { "id": "ACM", "name": "ACM UCSD", @@ -59,7 +23,6 @@ "image": "http://www.quality-wars.com/wp-content/uploads/Gantt-Chart-Example-2-NO-LETTERS1.jpg", "idH": "clubHeart3", "link": "/beatz" - }, { "id": "dsgn", @@ -76,23 +39,6 @@ "image": "http://torontopubliclibrary.typepad.com/.a/6a00e5509ea6a18834019b00ff4518970b-800wi", "idH": "clubHeart5", "link": "/club" - } ] -======= - { - "id": "game", - "name": "Triton Gaming", - "description": "Triton Gaming is a group of collegiate organizers that team up to create epic entertainment experiences for student gamers at the University of California, San Diego.", - "image": "https://pbs.twimg.com/profile_images/1356821718279483393/yRq93Bcz_400x400.jpg" - }, - - { - "id": "ted", - "name": "TEDx@UCSD", - "description": "TEDxUCSD's mission is to bring together leading thinkers and doers to share ideas that matter in and to any discipline.", - "image": "https://ucsdnews.ucsd.edu/news_uploads/ucsd-tedx-720.jpg" - } - ] ->>>>>>> 6f07fb738aad88df965194d89c264eee1307bfb6 } diff --git a/views/index.handlebars b/views/index.handlebars index 4c1698e4d..6bb628c23 100644 --- a/views/index.handlebars +++ b/views/index.handlebars @@ -18,7 +18,7 @@
- +

Clubs
@@ -38,7 +38,7 @@ {{#each club}}
- +

{{name}}

{{description}}

@@ -121,4 +121,4 @@ - \ No newline at end of file + From 5992fcb3848ef4cb7f5c37c8b2c7453962fbf394 Mon Sep 17 00:00:00 2001 From: ck-ho <> Date: Fri, 5 Mar 2021 13:19:30 -0800 Subject: [PATCH 41/54] header link --- views/calendar.handlebars | 4 ++-- views/event.handlebars | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/views/calendar.handlebars b/views/calendar.handlebars index d83b3f389..e09ef28d3 100644 --- a/views/calendar.handlebars +++ b/views/calendar.handlebars @@ -24,7 +24,7 @@
- +

Clubs
@@ -61,4 +61,4 @@ - \ No newline at end of file + diff --git a/views/event.handlebars b/views/event.handlebars index 2044bb6de..621ba9caa 100644 --- a/views/event.handlebars +++ b/views/event.handlebars @@ -23,7 +23,7 @@
- +

Clubs
From 1f258db8696a84944a7976c2dce793ad17fb33d3 Mon Sep 17 00:00:00 2001 From: Lucas Ryan Date: Mon, 8 Mar 2021 15:02:00 -0800 Subject: [PATCH 42/54] Cleaned up header --- public/css/calendar.css | 14 +++++++------- public/css/event.css | 14 +++++++------- public/css/index.css | 9 +++++---- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/public/css/calendar.css b/public/css/calendar.css index 7ea8b5d3c..a35d116f0 100644 --- a/public/css/calendar.css +++ b/public/css/calendar.css @@ -20,9 +20,8 @@ section { flex-direction: column; align-items: center; width: 505px; - height: 900px; + height: 850px; background-color: white; - border-style: solid; } h2 { margin-bottom: 5px; @@ -36,15 +35,13 @@ a { text-decoration: none; color: black; } -h1 { - font-size: 24px; -} + header { display: flex; width: 100%; height: 10%; - border: solid 1px; + border-bottom: solid 1px; } .headerUnit { @@ -54,19 +51,22 @@ header { text-decoration: none; text-align: center; width: 33%; - border: solid 1px; + border-right-style: solid; + border-right-width: 1px; } #divImg { display: flex; justify-content: center; align-items: center; + margin: auto; width: 20%; } .longTitle { text-align: center; font-weight: normal; + font-size: 16px; } .sectionUnit { diff --git a/public/css/event.css b/public/css/event.css index 7ea8b5d3c..55a724d89 100644 --- a/public/css/event.css +++ b/public/css/event.css @@ -20,9 +20,9 @@ section { flex-direction: column; align-items: center; width: 505px; - height: 900px; + height: 850px; background-color: white; - border-style: solid; + overflow: visible; } h2 { margin-bottom: 5px; @@ -36,15 +36,12 @@ a { text-decoration: none; color: black; } -h1 { - font-size: 24px; -} header { display: flex; width: 100%; height: 10%; - border: solid 1px; + border-bottom: solid 1px; } .headerUnit { @@ -54,19 +51,22 @@ header { text-decoration: none; text-align: center; width: 33%; - border: solid 1px; + border-right-style: solid; + border-right-width: 1px; } #divImg { display: flex; justify-content: center; align-items: center; + margin: auto; width: 20%; } .longTitle { text-align: center; font-weight: normal; + font-size: 16px; } .sectionUnit { diff --git a/public/css/index.css b/public/css/index.css index 8b332ca0c..f42df2842 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -16,9 +16,8 @@ body { justify-content: space-between; align-items: center; width: 100%; - height: 812px; + height: 850px; background-color: white; - border: solid; padding: 0; margin: 0; } @@ -27,10 +26,11 @@ body { display: flex; width: 100%; height: 10%; - border: solid 1px; + border-bottom: solid 1px; } section { + margin: auto; display: flex; width: 80%; border: 1px solid; @@ -67,7 +67,7 @@ body { justify-content: center; align-items: center; width: 33%; - border: solid 1px; + border-right: solid 1px; } #divImg { @@ -81,6 +81,7 @@ body { .longTitle { text-align: center; font-weight: normal; + font-size: 16px; } #formInput { From d1b4c53c101b0023c83de6a652479d123a0cdab1 Mon Sep 17 00:00:00 2001 From: Lucas Ryan Date: Wed, 10 Mar 2021 17:00:28 -0800 Subject: [PATCH 43/54] finsished the add event --- app.js | 11 +++++++ public/js/addEvent.js | 52 ++++++-------------------------- public/js/delete.js | 14 +++------ public/json/calendar - Copy.json | 13 ++++++++ public/json/calendar.json | 3 +- public/json/up2u.json | 32 ++++++++++++++++++++ routes/calendar.js | 6 ++-- routes/event.js | 11 ++++++- views/calendar.handlebars | 5 ++- views/club.handlebars | 2 -- views/event.handlebars | 9 +++++- 11 files changed, 95 insertions(+), 63 deletions(-) create mode 100644 public/json/calendar - Copy.json create mode 100644 public/json/up2u.json diff --git a/app.js b/app.js index b4c8e5807..7273e8245 100644 --- a/app.js +++ b/app.js @@ -3,6 +3,7 @@ * Module dependencies. */ +const fs = require('fs') var express = require('express'); var http = require('http'); var path = require('path'); @@ -53,6 +54,16 @@ app.get('/acm', acm.view); app.get('/dsgn', dsgn.view); app.get('/beatz', beatz.view); app.get('/saved', upcomingEvents.upload); + +app.post('/addCalendar', function(req,res){ + var string = JSON.stringify(req.body) + fs.writeFile('public/json/calendar.json', string, (err) => { + if (err) { + throw err; + } + console.log("JSON data is saved."); +}); +}); // Example route // app.get('/users', user.list); diff --git a/public/js/addEvent.js b/public/js/addEvent.js index 9101e2a26..9f0bde70a 100644 --- a/public/js/addEvent.js +++ b/public/js/addEvent.js @@ -1,53 +1,21 @@ -var acmO = { - "clubEvent" : "GBM #1", - "clubName" : "ACM", - "location" : "Cognitive Science Building", - "month" : "1", - "day" : "21", - "id": "acm", -}; -var descoO = { - "clubEvent" : "Portfolio Review", - "clubName" : "Design Co.", - "location" : "Rady School of Management", - "month" : "1", - "day": "24", - "id" : "desco", -}; -var vsaO = { - "clubEvent" : "Bonfire", - "clubName" : "VSA", - "location": "Geisel Loop(pickup)", - "month" : "1", - "day": "24", - "id": "vsa", -}; -var tedO = { - "clubEvent" : "GBM #1", - "clubName" : "TED@UCSD", - "location" : "Center Hall", - "month" : "2", - "day" : "2", - "id" : "ted", -}; function addHeart(id) { var image = document.getElementById(id); if(image.src.match("../images/heart_outline.png")) { - image.src = "../images/pink_heart.png"; - - //$.get("http://localhost:3000/upcomingEvents", callback); - + for( var i = 0 ; i < events.length; i++){ + if(events[i].id === id){ + calendar.saved_events.push(events[i]); + } + } + var xhr = new XMLHttpRequest(); + xhr.open("POST", "/addCalendar", true); + xhr.setRequestHeader('Content-Type', 'application/json'); + xhr.send(JSON.stringify(calendar)); + image.src = "../images/pink_heart.png"; } else { image.src = "../images/heart_outline.png"; } } -/* -function callback(result){ - console.log(result); - -} -*/ \ No newline at end of file diff --git a/public/js/delete.js b/public/js/delete.js index 4ca88f61f..b42b3177c 100644 --- a/public/js/delete.js +++ b/public/js/delete.js @@ -1,13 +1,9 @@ -function search(idKey, myArray){ - for (var i=0; i < myArray.length; i++) { - if (myArray[i].id === idKey) { - return myArray[i]; - } - } -} function deleteHeart(dId) { - var image = document.getElementById(dId); - image.parentNode.parentNode.parentNode.removeChild(image.parentNode.parentNode); + + $("#"+dId).remove(); } + + + diff --git a/public/json/calendar - Copy.json b/public/json/calendar - Copy.json new file mode 100644 index 000000000..23c654581 --- /dev/null +++ b/public/json/calendar - Copy.json @@ -0,0 +1,13 @@ +{ + "saved_events": [ + { + "clubEvent": "Bonfire", + "clubName": "VSA", + "location": "Blacks Beach", + "month": "2", + "day": "27", + "id": "event1", + "dId": "bonfire" + } + ] +} diff --git a/public/json/calendar.json b/public/json/calendar.json index 23c654581..792c9465e 100644 --- a/public/json/calendar.json +++ b/public/json/calendar.json @@ -6,8 +6,7 @@ "location": "Blacks Beach", "month": "2", "day": "27", - "id": "event1", - "dId": "bonfire" + "id": "bonfire" } ] } diff --git a/public/json/up2u.json b/public/json/up2u.json new file mode 100644 index 000000000..2cabeffb0 --- /dev/null +++ b/public/json/up2u.json @@ -0,0 +1,32 @@ +{ + "acm":[ + { + "clubEvent": "GBM #1", + "clubName": "ACM", + "location": "Cognitive Science Building", + "month": "1", + "day": "21" + }], + "desco": [{ + "clubEvent": "Portfolio Review", + "clubName": "Design Co.", + "location": "Rady School of Management", + "month": "1", + "day": "24" + }], + "vsa": [{ + "clubEvent": "Bonfire", + "clubName": "VSA", + "location": "Geisel Loop(pickup)", + "month": "1", + "day": "24" + }], + "ted": [{ + "clubEvent": "GBM #1", + "clubName": "TED@UCSD", + "location": "Center Hall", + "month": "2", + "day": "2" + }] +} + \ No newline at end of file diff --git a/routes/calendar.js b/routes/calendar.js index 300f85088..a888029eb 100644 --- a/routes/calendar.js +++ b/routes/calendar.js @@ -1,8 +1,8 @@ /* * GET home page. */ -var event = require("../public/json/calendar.json"); - exports.view = function (req, res) { - res.render("calendar", event); + var fs = require('fs'); + var calendar = JSON.parse(fs.readFileSync('public/json/calendar.json', 'utf8')); + res.render("calendar", {'calendar': calendar}); }; diff --git a/routes/event.js b/routes/event.js index f184e43b8..d58d5cdf5 100644 --- a/routes/event.js +++ b/routes/event.js @@ -1,6 +1,15 @@ var upcoming = require("../public/json/upcoming.json"); +var calendar = require("../public/json/calendar.json"); +upcoming.string = JSON.stringify(upcoming); +calendar = JSON.stringify(calendar); exports.view = function(req, res){ - res.render('event', upcoming); + + + + + res.render('event', { + 'upcoming' : upcoming, 'calendar' : calendar + }); }; \ No newline at end of file diff --git a/views/calendar.handlebars b/views/calendar.handlebars index e09ef28d3..4c2ef10cb 100644 --- a/views/calendar.handlebars +++ b/views/calendar.handlebars @@ -12,7 +12,6 @@ - @@ -41,8 +40,8 @@
- {{#each saved_events}} -
+ {{#each calendar.saved_events}} +

{{month}}/{{day}}

{{clubEvent}}

diff --git a/views/club.handlebars b/views/club.handlebars index f876cd282..1c5752e68 100644 --- a/views/club.handlebars +++ b/views/club.handlebars @@ -65,7 +65,6 @@
GBM #1
-
@@ -81,7 +80,6 @@ -
diff --git a/views/event.handlebars b/views/event.handlebars index 621ba9caa..284b5c8fe 100644 --- a/views/event.handlebars +++ b/views/event.handlebars @@ -16,10 +16,17 @@ + Event +
@@ -40,7 +47,7 @@
- {{#each events}} + {{#each upcoming.events}}

{{month}}/{{day}}

From f1a0169dbb54e6954685e9137c64974b749d5961 Mon Sep 17 00:00:00 2001 From: ck-ho <> Date: Thu, 11 Mar 2021 19:22:57 -0800 Subject: [PATCH 44/54] css --- public/css/index.css | 2 ++ public/css/login.css | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/public/css/index.css b/public/css/index.css index f42df2842..6db0e9edf 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -34,7 +34,9 @@ body { display: flex; width: 80%; border: 1px solid; + border-radius: 10px; height: 13%; + padding-left: 5px; } h1 { diff --git a/public/css/login.css b/public/css/login.css index 1fcdeb771..8916e5506 100644 --- a/public/css/login.css +++ b/public/css/login.css @@ -11,8 +11,7 @@ body { .main { width: 100%; height: 812px; - background-color: white; - border: solid; + background-color: #0073d1; padding: 0; margin: 0; } From 7b0e4e8be3377c6f6670258c8e4d57073ff1459c Mon Sep 17 00:00:00 2001 From: Lucas Ryan Date: Fri, 12 Mar 2021 02:06:36 -0800 Subject: [PATCH 45/54] Images --- public/css/club.css | 6 +++++- public/json/calendar - Copy.json | 13 ------------- views/acm.handlebars | 4 +--- views/astro.handlebars | 4 +--- views/beatz.handlebars | 4 +--- views/club.handlebars | 2 +- views/dsgn.handlebars | 4 +--- 7 files changed, 10 insertions(+), 27 deletions(-) delete mode 100644 public/json/calendar - Copy.json diff --git a/public/css/club.css b/public/css/club.css index 3443c8069..3d4b7fe9d 100644 --- a/public/css/club.css +++ b/public/css/club.css @@ -34,7 +34,10 @@ body { text-align: center; font-size: 48px; margin: auto; - border-style: dashed; +} +.picture{ + height: 100%; + width: 100%; } .description{ @@ -76,4 +79,5 @@ body { height: 100px; width: 40%; text-align: center; + align-items:center; } \ No newline at end of file diff --git a/public/json/calendar - Copy.json b/public/json/calendar - Copy.json deleted file mode 100644 index 23c654581..000000000 --- a/public/json/calendar - Copy.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "saved_events": [ - { - "clubEvent": "Bonfire", - "clubName": "VSA", - "location": "Blacks Beach", - "month": "2", - "day": "27", - "id": "event1", - "dId": "bonfire" - } - ] -} diff --git a/views/acm.handlebars b/views/acm.handlebars index addbfdf20..70d204d58 100644 --- a/views/acm.handlebars +++ b/views/acm.handlebars @@ -48,7 +48,7 @@
- ACM +
@@ -64,7 +64,6 @@
GBM #1
-
@@ -80,7 +79,6 @@ -
diff --git a/views/astro.handlebars b/views/astro.handlebars index 6c7e036d8..0804cee80 100644 --- a/views/astro.handlebars +++ b/views/astro.handlebars @@ -48,7 +48,7 @@
- Astronomy Club +
@@ -64,7 +64,6 @@
GBM #1
-
@@ -80,7 +79,6 @@ - diff --git a/views/beatz.handlebars b/views/beatz.handlebars index abd99e50d..dc2c4f5b3 100644 --- a/views/beatz.handlebars +++ b/views/beatz.handlebars @@ -48,7 +48,7 @@
- Beat @ UCSD +
@@ -64,7 +64,6 @@
GBM #1
-
@@ -80,7 +79,6 @@ - diff --git a/views/club.handlebars b/views/club.handlebars index 1c5752e68..332effaa7 100644 --- a/views/club.handlebars +++ b/views/club.handlebars @@ -48,7 +48,7 @@
- VSA +
diff --git a/views/dsgn.handlebars b/views/dsgn.handlebars index c02203717..0073e772a 100644 --- a/views/dsgn.handlebars +++ b/views/dsgn.handlebars @@ -48,7 +48,7 @@
- Design Co. +
@@ -64,7 +64,6 @@
GBM #3
-
@@ -80,7 +79,6 @@ - From 442862f229038048ef2f6d2bcab6f75268ea254b Mon Sep 17 00:00:00 2001 From: Lucas Ryan Date: Fri, 12 Mar 2021 02:50:17 -0800 Subject: [PATCH 46/54] updated color --- views/login.handlebars | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/login.handlebars b/views/login.handlebars index 9c81416cc..5632789e8 100644 --- a/views/login.handlebars +++ b/views/login.handlebars @@ -15,7 +15,7 @@
-

What's your .edu email?

+

What's your .edu email?

From 963d80ce9a674bd9876e9455f58646089890991a Mon Sep 17 00:00:00 2001 From: Lucas Ryan Date: Fri, 12 Mar 2021 13:27:18 -0800 Subject: [PATCH 47/54] updated main club page --- public/css/club.css | 22 ++++++--- public/images/abagail.png | Bin 2847 -> 10851 bytes public/images/back_arrow.png | Bin 0 -> 817 bytes public/images/bone.png | Bin 0 -> 14454 bytes public/images/bonfire.jpg | Bin 0 -> 27474 bytes public/images/discord.png | Bin 785 -> 1259 bytes public/images/facebook.png | Bin 871 -> 1353 bytes public/images/gbm.png | Bin 0 -> 14712 bytes public/images/instagram.png | Bin 1027 -> 1606 bytes public/images/katarina.png | Bin 2754 -> 11308 bytes public/images/tyler.png | Bin 2611 -> 11469 bytes public/json/calendar.json | 13 +---- views/club.handlebars | 92 +++++++++++++++++------------------ 13 files changed, 62 insertions(+), 65 deletions(-) create mode 100644 public/images/back_arrow.png create mode 100644 public/images/bone.png create mode 100644 public/images/bonfire.jpg create mode 100644 public/images/gbm.png diff --git a/public/css/club.css b/public/css/club.css index 3d4b7fe9d..209f7e667 100644 --- a/public/css/club.css +++ b/public/css/club.css @@ -13,10 +13,9 @@ body { flex-direction: column; justify-content: space-between; align-items: center; - width: 505px; - height: 900px; - background-color: white; - border-style:solid; + width: 100%; + height: 850px; + background-color: #a8d9f0; } .head{ @@ -75,9 +74,20 @@ body { } .e{ margin: auto; - border-style: solid; height: 100px; width: 40%; text-align: center; align-items:center; -} \ No newline at end of file +} +.button{ + background-color: lightgray; + border-radius: 5px; +} +.event_img{ + width: 100%; + height: 100%; +} +.event_text{ + position: absolute; + color: white; +} diff --git a/public/images/abagail.png b/public/images/abagail.png index c9b55831e78a5c5c29c0bc5cade5e2b1574ec952..ce3e69c2d9d02039f364ce94f400365eb82ae0fa 100644 GIT binary patch literal 10851 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 delta 2790 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 IM6N<$f)WN88~^|S literal 0 HcmV?d00001 diff --git a/public/images/bonfire.jpg b/public/images/bonfire.jpg new file mode 100644 index 0000000000000000000000000000000000000000..2262e3d75177a3b120be4906a920fda2ad55441a GIT binary patch literal 27474 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 literal 0 HcmV?d00001 diff --git a/public/images/discord.png b/public/images/discord.png index 5afa629b278ace7543bd9616f13c4c2e8e4ae5b6..6db955cad342e76e282b5c30c7b6a2819a9cb9dc 100644 GIT binary patch delta 1190 zcmV;X1X=r$2I~osReuD4Nklhj7F22MED7wU3j9YVet$QmI#_ zw&pXS)Qyk+5PB9k-L_3^jRMeVb8MY{4xntAm>C7YMn;`oCp_=st%;pc7E%I3vyS!R zxG1IARDVEOE>3Ul=j*j88+~}7^*2jc&f8r9!hX5^^_y9J>KU)>o_3?MkxB4tG>9O(slE+TcXSpa z8A;gow(pghF4yH3tE+o6n5q5j8$A$fnt^J%y=Tf`5koUkEHXEQ&mLiXga*tsGT1>N zfq#7ljyU=IXJ!DAONi5-Gx=`tj|x`fxHb&tvd|f-vU_4opC=JH1Il%q{O951dk&(h zxw{r1TRW#bs@UR9cWAP1t;T;WTrT)rQ*02Cqk6q^khUoA9M>S?=+jWpu#h=Bdpb+N z_##B6d=Af@by#8!vd(A*qpVh1EF}y6ntx_3%$m44t4M0+*}e)9Fx&%J%jAXVr?_V9s7Nb$p0Rok}bcmM3%b#xj6;V;R7_A$+#CAmADhTRaJ*_SYGi`+ovqQjmci0_FgLGZ`3~ z$-vM|21-0h6^yuo8ONfnflTTQsxH}pm)M=uU#TOh6R8v}XlfvXDnEYfME*go=Bdk^au5)KcodjwLfcbQ_KEEuv2K_Y(bjj^@yvTjQe^6YwuAy@ILNBK^Y=x{4C*@S>P63KO(YfKeT<%tv4K&c@y#Ge`Ba`;aS=jdPzWRB05 zjB7E>lR$!cTz8)J2ss-uP+g^;m~mAe9G|lcxSqpn!+*7`^1gt17Ryi%tMgpX|B}(h zwiHi;+0?UCKjn-#-~5~b$KXN9%o%YD_*Jm3x~P!>f$mpkVY!~8+Bo%0-0Kk< zEz`-|&`bt~W->4|WPr8r+!NlLrvo(GarH$8`=Njl`lp^2vlEPi?@&kfL<|p7G%E%A z&|K%V=ENWB;EN`%d!mrKfvQrUrGC`~&noW)ltGC(hT|TePXZIP-0+Nnx{5a#1kC&6 upb+?KA~*!p;c&19-bqoKMnmLnrg{bX(nW&?M{)K50000AwX`vccwMBPA`Q+r?{7z_5+}D z>J8@;;2ay1u{{aNvE&ofd;t(&AT<|Erib{}-l|Tgcjwf^fL`8{1wmlTvL)HFe>03^ zX_5Bt-F^G^y)_{PidHrE9*b)X^ECl$h9KvZ12`WnNse4|K!514%WXM7UBP9$Y1cbQ z7(zm*xc{-VBcd$%xF&x&j8Bul>jjkUkF2;Kov3Gu}Bg&7T?TaPPv zY@r+0%e*meRVq@#1c)nmETP|R@7LtTyGWr0he3q;*-@p25gAFS*NWsGb8iez6NkCG zIZErAs09nwGk=T7eVYN1N}g!xt=1{(KP*HkRM>t|md5{0PFIi}R-_;Q{P|Zu(!YPc zZVoFvRH%+eFkT|N6r+d@73v$EDzZ=UvoC*m_upTy&j%G4XpFr6Pv#gigg6;upq@7S z-RmnufUUUu`nqrRV{E)><%>VJqeUhij(7yFe?TO>0#iA=3^ z{NyxB`Q8`r{vDxcPOPyS&CR3jzRHT>v{R^#eh)#=6sJQ z6=V#R-q@8_NEt&^-LR_pz_q{!@m-OUTPNMMCWhh=lR-2r1!jvIp?+(YkPeP?*E%MM z_{62#t$%tW)NjqSUR%NxAUwDkhMrJeG)rqn_8UjUNzw3xBWq;Url;QY@*YbTr8G9h z%C@7H-LRe&W!kCg+!?&X7!wWYY{~J^6G{eK<3B4L0!I=WbT^Z$jC^q=IUE}QxkaRg z1iyyh8^W|~gtx3T+Fg)hq(I!e2+wwlNROOqG=CbBM2bk)jUbf2K#HhFV@#UeHX9J! zH6wB-9^jfZ1S3L0dCWV6oSDFyGYjM*M*(M?+#(Wz#G`SYes`An;@yycmT=z1t1dlg z47$%Q$};np5rag8s>rjWy?-z!e)eo&2CcBYpO5P-nO^EHJn(Vb|3c@l`VJ-9x<5$fj^o0uP*H^+M?*B=7Qw0UY(aS{Tnoq$lURf%lOIJ)`j z>{e?k_ZHsl(qn`ynPvb-cbMJ1cu(lL{fngA-A9;FWcbzkrS|)VQd;&?TTIpgW`B&Z z9PGfDQOkbvc&5gy)HN&z8yXy2c0W8KM9+pz3$3HpHLOgiQ1zIWxVxEUv068+iyQ$m)AF}{gSlqPOM19Ep#o(Ap0S@he`YnCZXJmimo)|(9rz|nyQxs u^Y@Z7870=^i2K%*z)EukA5N0~k9M|F`2s(TQjJqxo8PgyrVgHq zjdrQlsaEE9N5F`Y`&3VeNgB7jeleXQwe<~qb7h*-v43GjR*2+G>cp_dUkz4C za|TqZKS0v4Hh8Sv3EkD=F>OtmoH7NHK&5en29m&~u|xw&Pc)?^6CmlCqB1iVCD#?% z>O|p}IMpw*W#3```L8HnLRKM5$B!o6T5Rz9=H(^cP#@JW?OJGXVx~;@G)Fbeqq4tB zfO&(LC*Ga7KgA*@BwXQ!IMrX;v*Yy3P*@^OHzs^+XNFje27MN37-Pq- z4>dZ%QH{ogjcsiTYcaYaY+S6x_ePh5jl!OlOfNDREwNkNON8RNaSAP(!sPUI3`WF$!SRc zgN4;pDos%qi@Q*qrE0TGgV|L?U=p8N_=H}fFVjjj+&?&k&o%Iu_n$(oI`mW2w6FzH z!>>@aUV+9Kq;hqZ^0@&>dWHJ>2gq^KRH+v!kKdJ}mg&n}%s9=@ytcesrKnsf zQlWo@nqC!u{Zz?O*CtHyY*UHM5WcTr`_)q%8*`GTN^OC%Q~*O{sNSf;x5z>2Ygph> z_!@ICEhFT4&;(){D6$!g#^d9@2K_bG zIE6ytr`!*J)`1x*qAy<1oGfT6nG=R%2eMRNfNAN+t&ZH=y&o-C6}|=E%OulX?$ee{ z^l6}{?|bAmtIv49T`zi;`V>B-qTX!EPeo73euRxbU8|R%Da!B*a@1(nDTxS#moNqM zQK?m^0F7bHRE#nm&BMa9;9GF?(oKJPcu#vCosQ=FE%LpeoIfMxL#d}n_-DHLzAw_z zYI>ANr7*y!Ll84J_A$^c_4N%v>WeTXeOTlger6=(EEI-lVPVeR-tBqN7WD;am|-wh zxy`p=)!t~-DGg_oC<%H#bM}Kxkp@$Ee)A``PKGI-Eeb;!_3N=zfB+5H`gA(|%#2Tw z_yxt%EPM(uMzut_Y(KTUCbj>=~ zN+|WTwOjZ+>8l0dfEI$u)8J|a=lOKAM#B7fc4&%V9a_Fo!!0<0eYp(1@uk;cA@jf) z%Jj|e-c5&&pKSZw4L^4|75e(ZzvoLOI(&SB9(?rij{B~lf&M=F#<#zZh|3kHGvTJl z(O^2K3F6o3lI`1R^Saga5I(#2(Z|{c2r^X>$*^y+urM1w`;H&{fabwmS6+B2)jfC7 zbGco4;dYGa#Ge zp%W9dVSF|H(Qm$uKK?gflq+a&d(Dk>-dS4^Y8sT18Ds!V^dJ`X#&^FDOi~W-yK?7t z8XF#<5C6sA(AqT{L{lVTqLRQbT1|)k;B9Z9D|Vhw|L1SMM0+1UAf_Q~7#lmSS(PWp zb;;8$`t$eyce?hCZ=n;%h<@)KZ=uir(>G}EV+Z8+0gU5y*T0Ca2QyxYKHv3`Kc*+Y zc^mcG*b0e8vSaXI<`S9o(=?|mH_^-bS#mK?v_vvAz4;X{5r+7~zxZp~@v1k`jqmwg z+WG1?2{XL!*WM_L8-5P$!2^%c4!qCT=IeivuKCqpr}MUMp|}6ie`&jq+q>WJYSBV7 zvnP$YYWd=5p1EPIFa$R@VU%dw_&7j;WvSO|l!h;I{@I<h*oHC+}Z<>BV&D*a*8!?8xgMyXi|J`LDg^&CZ5}%cfI}vy!BIHV9W$xX?V0TrNqQ)~%!Sx1L2$9yv-I z*R7#zo_7h&Efi^Peh#LtPwsy?wAAJsUPXWPm0Qdh)hW=LnYGaX!!|;ufGrWH^R%uP z{e+?qACrUoOm03)j_U3-iUe>dTC2$)JI>ikpMxsqR;yItaI$A_#<}H&S5xP>Rma~O z#>Z(R7~;$ScCzjDJ^KzoL(D@9y_H_@rgtI*QWc5JX8P&U^UtAA-uyLs_v?QVPHs)K zMFxOXtyyjx>xc2#*Is{Z`1gT3z8U_$`<9#O<2Uj3MY?_8*Nn`H`@PHST@3f_Jewp*p}tS*ef&J^PS9Pcy7 z4)*ucT(Kzcu}Nt(ni7e0ZMc8K_$qqeuf9?KWPjpy*Ii3@?b=I!_0@lg=7;;(hxq(0 z|4KLg?+?f`iWLKa-}u7IX#MIjy6b_5=v}XUC72|SXEqR_Y(x-oodFFgFueC_LPq2q?}G5N_3-W-U^%rV%Pg9BQ`ZNak? z-Ezlw=o1*rZ~V$@#Ahj&%k-LGcp-iHo43=E6H~Mv{V?H}AxcQG=d(zkmu6rFTe7hH z$SNT8ZJXB9L6{G27d+=2`g3RpAEt-}AO*xUl4KqGxje0zPPNJc=>XA zBwe**J6(VIB_hE=;|S$FAN^Cg-t_)Iq8Gm9UGn;$|K4v!W5NG}u=jJt68-5H{(*iI zOu=n@WQeYU{&m&ZSqr@Csq}p@9Nj z{k)686x(QUpdY@)#Z)Vo!!WWNJ(g=tII%vYSa$=!@RGxbs{7QkA($OSw?lef=f^g#@!yR-wj2)q=)O<~48zS(3Ruu$=`}DT@@(G_flUUtf4==Y^dUqy*Icp_PVGzN zdEdG30RU4*dAi92Rp3`-(-|=Z?0CAaLmSqO({I1&byR?V#1r_yZ@d#Ba9;ZTmH%=h z`Z-E>{_uX$7D<3)uBKD+DO{M??9iC_6RhInjspvq27^+f5cbz=6FRdNT9}7b@}*y9 z49y9?RI&|lGdRWRbTnZXy|@N|1T>)@-GoaCsAmC$uz-S1#K!TtTfQNSwh5j+FPO64 ze+g1(!Zk2l70zHP0@buNuDyRe(JHwjULsC^XR+T_7-bsUWWL% zgem;fglLL`ED)_1V|e2rHLzGJ!H#DN3!9`uazG|r<>&+L&;IuBfmPf<|M9s`(H|l# zy?ggVl!QHf$@4F#^R}Exx88O;DctV^3g-zG@;SO3W+iAZx$1dz{Z*II$3J&7`fZ87 z(n-WW{M27d|J=TP?=E40g#}|i8UTts47CAuo=f*Zn394S)vfB?4s-Fy;@Sj_Tl7 zdG*>N3#O5HY}Kp6z|3^q5_H;{mc&rCQa0+n<6R#bq&`1Gnc-n%E7KCPiV3leBaaun z`PT)&y6Gby2w!K(|BEktk^b`YUy`UsL+fy+>-@7e)7L-ok?_7lCr;AufATYkKE6(6 z^u_kSv$3Y&=iKt|-=TxYjsrqY3sPyC0wW<|2Bt+!1T&SP;^aw~1BaT5#D{qQ$3H24 z2RoTx_}V|qryML?5~h*y1i!^~7%Z8+JMx@qWevDARXLKYA`&y^Yq^G4$I!VvPpw+D zt4qTcy8$0d@!VC?&K$1~U-L40rkjFTu~XSBEtmjdiScuSCpS8Z1!z#ESn7Ho+iQ*_ zICMNdh1|jXbT~n=s|X(xg#nSsPXEjUGkA~&men%G<1Llm=4b<;7C*!EYx?H2I_EpG z$t=wreL@z!SezC6oJA@=kw{XpIv;k!&S-x1YI2eZJ85m^-($X_0Tb4$mucxr9ftT^ z2ouu%l9gS$v9@Xy4MXVVDu3`^GRHI=q}e-fwVJ|t=FEoyXAu|FInpQvFD`vQ?0jWz z9*Lv?XkC0WOY=O?LI;jso;`0)U2s8tj z(uEI@%4R~?mn*aQQW;<;tH)^^T=!rS4%_UkXu{4Y11u=dQ4BBz^%?fZvQ3lNdvPw8 zE!|S0Et;(IIfLAlWQwtSs?E;|L#*VGaz$4Q+Q)(K#O;|6NfilE>T@%;T6+0r7^p7J z)k_-Dw&)*pl+TQxr6;ZmYB)P)nhJfAF61ff#r z#T_p7-clFa(#G^j7O|e{AXw#ldS!HuZ()bB9+bny-wS8~LTJ@$8xOYzY;>#9Tp0nB z@oTEgvZH6gHSWhXbU3PAdhZMwtc9~NFnwN!H_u~fHcT-v=S_O0o6im(v>8+tC6Y;6 znQ#cP>kTnyQ9oEvFjZ}C7J_NU<@Z`J%FJ9hLbYU;w8iCcHaT@FS+)kkO9oinT-K`4 z?oBi*r^%ThZtn_EZMpSAP!NKCU1FqsVJGpX>oQ?)1zZyw6YWh$R-!PQpF}4 zqyBtov<$-PEc~?0$S`s{Az+z(?2?7MUZqCOqE)%7_bXK>P- zb`H-x3LLUt8%PajP6ydbvQRph!W|qUHNj>;t+6QMxvwTXvOA`F&y51k_0TC1nm_1^BT)VAGjCJaHZW;U7s~QX)A&&Q3OWQ|A*gVHL zr92v^2Q8G0vykabQpm&O;%$arqYP{X zvA*AsCo;mxxe$K|PsIcMnsAPdpV^&O>`T=l?E+F+Ca-gNxI(1DWdsSp>zRRJL0hA> zbBwkClwF;MPgkz>6!frwxtTu7tTMTyMNGl3FbA`ZzP(X`Tf;RXg{3vgZwPK^?>IV9d4Gze@d1)vZ9Zq*u6eVxu_DA|jhwzNnN z4bX=+t)Uy&4#VGZ@Yyugr{{(FxRz5wI50&Mc3UsgPaSlSvVm^C1sPw5Q}@QP#rUgm zxLHfAKsVOn>`zeVx`2Zf##fu15@1iv0`=0Moq!Q3*Mzu^c`3T&Z?5nWDF-)~kWrg2 zg?7td;xhekO14A|Ymb*3ktsM~p4SHHTfwbRKE}d8ixkyDdL>WNp}H9!o}HrV>?D;= zo`AR_cQKHm+)$xM;+VNtXXfau(2`Fk@}e1d5g0pQnc*TJmc~>fEv972`Ejxd{ziRv zMtqA!G-H8l7^bShapg$6St+il%|wf1-kihml@9x34awnWb!w7SYw10*OZ6(+y*MX- zCAv+fRgAzB&hNM8iip$UJZ4i%E;J{;n2{Q@^K>dL&=9@WqBfzn655Qbv#~9AI9y~~ z%{dqLs2Ls1p&&Q@qmzY<&PL8aFKEhm$X+>x*<+v{PU2WtZtpJ!hy zdI&I)vIUfQdjOje+^1_b>bc?G7Cw{67_hBbEmCV{wkvYmYipIN^3#bAlozNzF-zV; z1UCmIPJ=8H*}mJL`DPv zUw}ikUi=o87@lGtiMIJkAg9F&)$2v%J~Bw5H)Qu3A8k-?R(g^~mciQGH0Tm(6(1Uc zfiiQ0$!ApH18~xcdX#W3wrQ%2g^k6>g`Ueh)UzRcro+yI9WMCk-rqyxjGZR%7yMHC>R#p2#um_wb_ zGON!{O`>V#MU*i+l*%C{03H(0o9JUv zZ51|{wF3W4K&nNb<$4pBtgB8dHHkEsg&+i}apYPUj%PYSn{mG5 z>Ffe9D}u#KBk9yCKrJ4dCh`|^8gqEF?jaGAH}I~+wPr~)z^4>GA560j$eDLjt&~y` zp0gQGskJA ze1Ze6;LSyup;g9=iITit6e16i)VA>*}BlE zXWd?-z|n!sK^cDvFY(zG?5HIXS=0bkd&w4!46PHKV(!o($|dtu2XmN$pXC>iBLf2C zavp+_R@SOO$>I2V20Q6sD%N5?`~=p7r?de~u@KI}m(EB)&?*&Ir2V4CH$#|$%5DR5 zvpIk-;mwt4`HA9!vss^uYGRf@V43FgbEGsgPp3m<$V z7-B2p?WU+(E?{NE?Xqoa=#|&+pzqGt=>AGwo?RE7HflcJlHz18KL!Wbh~qac5q#>; z56VI%;Y50VorW@0MwWVO9FjH{N?|6m1s|X^H*ZW{r>5a( z20n$SPpz_EdV%27j!ziBPU}bd0Ym+nP;nqiF zCgD`A#|~HznK@RI3FU=PTQk&0fBD{5(e*nwgCP(pz?oHiu^EE5&cE+GZvz#P)`t5h zpjUDU7@f^lR4lV}3-~6R8I(PxBk&hq=S)$)%Ap+?#81(}#7QboPEamgKonB41n)J; z1e439hQ8VLRtC*@0hc2&SQQTEsVA@fQ^qD@!(;|!jHez530e~-!Lz5oE!(lASiv?( zy7*9yt+~iCZ9;7^zG3X=%7bI+Ou)v&XwlZSLv-sOy^*dxZ@p*;6`b|JNFS%6y}D?O zB#68Hj3GHvAPw@R#33`#O}uf~n8a&I3y^i0h+Mp@JDbQ-HkE_fam93O_DXa`vLTF> zPGxEC#4(HseZj%zb1s+$XTii>l+X2Kwz)E!9Y3x^bgEY1wP@C~ahMuAM^ z%p~qVwL>-7Asm3jed@KB)7GJcXa@u2z?a~{)O?>oC_P^iJnX0Z=!ps1_2i5sa9G7A zmyjsN{F`2&v6dJUqL2RmVTm+&GgrAXFBnGyA4zgSvBOFVpcS0aG#t-jc~-h|U{*eR zVumUldHJgQ{){-iIC~2;m}ygi;It$sK}(DqGN7%W^$Z?-a;i<3q8W##ttn=F-4Vhr zo&i_=G>=V^yKV%IXIWxpWS&GSxV)~Hqj-41FFk7=ox2|PoKZ?90v1TZST-3jMGg~_ zccFt(zq9W!z4@l^P}4W4Sc5Zr7`{u3p=RVZ<#n^YLA5UeAN&DqBn^Pdb(6AKHH4iN zIFJc0o5wh^xqfJgNvVR$!2vB*<^rN1V)5x7pq$;Ly|b}zm4jAwbBJ1i64w_>D=Glq z62O){#g4G(re{cFSny6+Xv@IiCe`eA_<&1SbF+c-x(|q@tAUhn;v{>lLzF1=%c64S zPV?w->TQgg2J>0b7%b8IAD^ayLXy^u*c^fOr2L#iQw@VWP$owo4qR#(ijlY;I7{Lv{j7ysZ%LZR>OBXd_`Z8Ue=U(A0HYIl3rX8}my~ zDQOI#F+B^1*a3_^+p|TGajAql>V{n;(M=*WQ+v|)8W zJ^y)ILJ6z^p!y=1GzPWO%2G1g;T3!7gR*T|UTayzEfX~zPcUzXM& zEZz;g;bd4-YHB^(tJqF$0FwFUG3ce<2lHZVK{{a>rf?*up%^n2DzwM_Y%ddIL*(Sr zQbk?kv~3TA)shu8MW*MaQ}o2c#{dvz>CLaYltu<~Cbq{QKYiDu^x<0{prSaSOZUfQ z4vOi!JdM&=__{U-D&LcE%)ZGWcfqI5UA3x@UcEj|gKNj>%LgBnkT9QNzhXwrm$rzf z5d=DA#!y^WF)@iyKE33&L0*n&n9J??1YI}MPd|iDRaiSrS6;YHe4TsuKM9TcnD`r~ z>VpRRXjf`MY2ng7g`y~$5Q?-HK1dNsrG_L}o?6Fd%+|n;Ceev+NXe37x-kUa30U^x z{v=H_e7fz#0?mD6FI};D6pN z8bDkLYX4JT`!;>-OSi-1w&+x}h3}sl7cI#YMmYpTHqND;wY>qhhzolUHzYGBVZ)+y zwK+%O%xsD#F_9u8l=yo`u8(#UQZ(DrbSH3!Y0&zK@9m?T?s84m)#lyX0c>sZFNXY- z^3Aw-$x;|sLQ=QUc-wI+{*)_g(FX@E)8h0xpVL{T(Tq#iuIY!m$xt2{&39a~neKbM zPR9`~R)bT>t>*g1!XJ19$k>=@J!vC24ZD+b*kgUm3I$ z-MYbsSKkCfi6vldYk4grC1~AnijGcK7NHozD7JiFHX%V9Tn&ck=ZdOiP6~<786TvV zZC^{DzGJtUw@%UD9-AXC3)RnHRl8gSq=*Z@Jjt~$q{1iLpTa#&18TAPa!ruOW&JID zIFoYeoiEt|G!`TD7-ddaCWkfz*SzCpm(iKyqx7y%e1(p4ZA%Y(YvkJsyxsw^r?o@O zacBhqQ%gZi85&_6@b1M(OYi8=To(Pv4;Q<=TSTwh3@;}7pf-lYk;oj>m zKAXPyfj7`bWUG5o1F}o(6vqCPm_oB{O=u~!F?9;mCM{xld=gMf0V15@-P>UI^ZHY; zG@9<8C`;{R9~`S3=9&f8)&Lr9}?buc+cg^R{ak;Xi-Sl|NY zRH#A1YUXDFu73{5A&0MZ=*N2}7ihlGibX2g5`@e|!Yk_Em=d!Xa*?gU|ktL z)lWM&44RF_kPx|CN8aZG91aV4EUYbZDTjvpVHV(IQYL9&aWG6Fqv#FSolpPt*|*U7 z=Zw?mzVcnM|3M!td27LZzkkU%!eM2fqq<%^*6_09SIbVN4E0o)LIodW zhJYmVgi=s>Sv)X{xUtZPm>`eebGQw@gk02{AcK zI|ZDDA$7+>VXMaIZSVL6Ag(#OXV*d6x^X>iUOyx?8r%m5wGGhY+6@JI{<^$wTmE)2hBkA{!Kl>K# ze_~4NJ0%xXiz@6V02to0=SjF2TJWTe!?~_Yz)ZuDSym?~k822X9fj*ViX8J0M%9Pc z(!wOlDgYfZ1*;lX{j7Qhz+ppH6|ox1w2bsSe&jKP473D8@FV)*MPIpkh|*ZiAJ5Fw z@k+}s9=O%2TOlHuy2L=@1L;o0q}x?-rg7wQ+b+u_i08+$NqNc(&R#9q5#t9$SAw@I z)+^G79B0H!mKB3U8lVxKwH}$xggC0Zb|0brj~u6Us|M&5*X^M3kpUXSylyym9HFHv zV>=hV#g%LF(4frdhB^7aU~Ep?rDF3imuu%5Xcxx{z(M$3zx?s9)BXF7im8Yr%-{On zBXrZh?5108e@M14v&mUXFc+^ng=vtNGJuq<%WjwR7?@z{j1 zooEg+4?9<7okC%pfF3Xzv&hE2=Tmpk?Yo|Y?-@m3mz=+j1`#5E_rAmQ<$v2lKY|b9 zl8PNmKs_}czh`&y@#izvn^@7OSnj=qw#1fmEX->RvRn$u8p$|x7?V0&tP{fkDc6^W zIdO(kszZt*waYBR*+srwpV}`?VPCS~$~b=`FbM;hr06mx8cTEn6iatPrWVTdyT}lK`P=58H3q`AZ5pFjU4Nda(eK@J zkg_6B)+B4{Y131;7JSTp35+ckS<)PsPnbAeg|9heP&ob=OG5#+`P|VQ4Z>z{L{)%< zU9m1LMB@7oBi;VwY}J0!n1;aFaXWB@U=wciv}iEF@rm+h;J;x6@7OU+gE@1w0o(mo zK5qkk{edGu|I9fNd0-B||K989Pd@oAnmV~a8%OhW(b;QAjjtkSxL^t68(KVikY2uN zke)!wjnA>-g*x+$F}iTa2I|W?bj{XrJ}OT>GX!{b75Y9r*9Zm}BA=$Bs(V&QSxDRf z>E@%sp4wnJ*v~9i8uZ8ia6dh9Y@UApf(?`eo%bJ`r6)>NT8GGE$5@{rizmz7PtZBl zZ&S5jL233%v=2CH4t1VMW9|(X4hz~3wY_}|62p0Uv6BFz(k4~KIgC=hNwe@PT+0bz zAQ58*75hyVJ3JoPzN4elWujM2vB>#jNxA`f3)0cXp^ZcR^zsYV(^r0YNcMrg^DS4? z3!V?)=S$zG*{L%9>Xln4H2|f#aV&gfl zj+cZK3`eiR{EvoFw)G~h(2&w$NKf`H6NYz$h&m#N5w@T}NK3xs=G*ttm+m+~=A>aB z6U^X1ADuarr}IGjz36YU+B8vF&eq!sOe z*Plz79pMXzGOAD&eDX^L*nJsjWx39T@vM#rh_e{X2^cK^U&7b4iA>sOWnA7Q^yROe zKPpb7VDT1+VmtYUD>u`f`;OC2pnxw0e9WjNd+g5vy#3>m^!-M1>pAN^)`%UX|EMuU>LgNuuwg+~;ZAp|9nqS>%VghDaWO`J% z$YvLuq9;J}G!|@KAw$m{D*z;%qxrfQj>1uzf*q!gZcplUOCE$@e-ro!L5qGj%b-HZ zwj)LxfM`5dG=w9CF#D%Uv`{x`T_>i-gU<&3KwKMyQw_91+wjZ{iFgg6mApWqXHrRe z)mDVQOhgu`Dq?CrS2!4dB1zAA@wudOIU&o*$s(=FDY|?cz^FB&V4#j_C>~?2Arzo~ z-XiJ7w3$6|2cfB&m^YyWHL(aj%{83(7XAnrifO{|9FJILF-XC8-s@N(OH)J>t)tDu zvMPc0!K;tXmZU^rbRb1LR}Ipx$$6TucJ5+VvKT=HypH`FZ}z};jvjm~jrPG>hbk`M z10(H*)A9)8E&!UAgFRgUCjVo^$~DgqrN?RW4OOHO?B9Wd7*WTwj7e5&C?dNlrmd*N zGLG4B1g0Fy(Dw0MG(9=3*0atY7VRvceYvc0AYriY`N1Rf_7`r2#mERy)u|<<6Hf8- zEc02bz%3I8j4k~|3v{B?q!~n6Dweck=TzSHb?8Kfk(cAx16REm-V+rHXrkylS(OTz z#(YIaFis<=en1@D^ziHgo#Xb=>TDL~yg+-9QkZLaX3d1bY_Tq>u*A@{>lxP=_9%kI zt(!>+S|4bA!RkIRgd+^`(D4PT+aea#3v9q<-32W3~LA3(VfEktA=RN3{oz|w=n9-UOr$4T8mtBaVT|Fwitf-2_)*yS&pn zxGZ25PYwmhWq^1xIK+@aN!14FwsW=}?`)&NKJ#TNvGMX21>SkB_`5t9<>Y-R!+jCCtkWpYW8G|k z{=2<1RBrmTzAs7Z`ZM(Xqh&iMOK=sW1tP+#HVOrPgSjsZumT4&#<+nQQabuv)RUH! z!s>ipLiu{DVa&XfhTli@@D!W(;Q4KoU(^gv5qQX|eYm35?O;dpN#Oi_lGUrX*r}{g zwb{-Pp#vFfZkzDo>GbkDJJ=nTs|EN$Dq%qQeU72y|lB(7y5vH7|kr)dQXYK7E%ZIpcv5WvI0 zUh?TW4In})WK4*hf*Rs{kTX)Cho%?67NpuKv)wa0tL{8vbDxx-j#(YkPDQ7;cWUP>FrxTJ$YR#Y&%&1uS z!&0Z_OSS|LQylGIBnQ%pRnnD)vF55v2^)X!R<%N{M-I}>_f1k0%(ZdTC}qKjS8jmq z1_HW@eHj%+aq-kXg+x~|4H!gbag7-;{I0ITO8itSY z+|>gD_JvSGAla7QW_)B+oYp!D6Rp^89LmuaK&b4*G@v#ghErLrH^YGh2fD|b+eQE_ zp{~gawuhlXRxspF-dWz6mJLmk9}(DIoO;i?QExt1RrTe`2N)G6BG)+t-`dTAmp?mC zy1%dOG1{tX%?FIs>ay{s^Ed^e(Oj7nB=P^<@i2Yw-~v>&OPe;Y1-w2;n-CiF*E-~2 znjGt>+mTV%MU@P(-&qa4Y&(?=-0_B}l=dOlbEwj!QKTN8JJv5|WvOo|>RQds3%Ge8 zO&bOb*S9c%N2kkxuX{KNpB4*PSE=lH?Ws&x4okPiF_OF4zJ=)IEYXG(Zyh)NYQq=` z45J@=Qk+Alue~Tm>@!S>n3o`89&(@kI7Me~5PH*6WFGd8cLb2g43324jXC<%za z3cSD%QA^zxGsPduXOr6^ktJJD3DWMgc5B_=i;x}(b^!+d7*WV1vZ-sbDPT>**0DAH z2OydCDQxj9=juoMXcPPhQQDZ?W5Cs?%1a+N+-qArXuaelgM2`Ar;7DMp=P-6XeES+ z)tT#LCcJOcpDWR#3ZX&dMlL;{)V8yzQ;wzDd1BVQ-WHMAa7cY%wzZD@h5!_c)27p_&>i&C9rwwl zb<`I{Q{p_$p6Mc;MEJcL5W{m2K%`>FOmVYp#HDN=owsTLkw%&f%;M7%nBg%3d-t`@=64EFH;OYUO^Iga}umcv@^IXFvAD+RNzYuiIh973R8$zI&)_ zPvJIWjx$%>voH{qnZJBtY>Z_zQS7{J^Qs&`7Z31MeBry%O}9NKzT*6u2GS9G;2&}% zc}4*^1|Rom@di=>Wp+tz*aC8=F} z==j96aeCxy3EBwM(HE((Opqu182p?)Q-~P&tDZ-OVJ3iR@^OTR4-=JpJLg&sSozUj zQU?!_I&#ufwJ^-h%=Y9Y(Vi!W7Urn|8+`ZOPtw(wZKl`0?Rw#spFF-GOC%Abcw%O zdf!1(j~_C}HbFa-hli=PP^34%?Hc(m(qI>{s+;fs*mbN#he|Dbf^f7TvUe0Jo3}Vf zwSGJvQSqNz%ymRRC)65k^rDqDgxsT4xQQxwF*GIiTcdez@BJr>vU&MTq}|UfA*}$w);t)wN-C^Y(eAP>4%fiAtKAKdu>wAgD?l42KRMd#yQgxq47D@ zCIg_ue*D<)QYm07uJuwaJqDsYLjjp<20}XB2L_sdZaT&L$34U|SBSpLLK9cEvICjRd zTC#cAF=N+$``r1pkYV@)8+%cdxfJ^1^6ZfU!R6U?k%R0>g_m#FC20IiIT%i|ThykF zrw~y-0LG{yk9E#)j481Y{6reD6gw|}tols3}e;Z9e;b#Kjl)|%smR5_~kK47=(U>B=K_>xleIGuCXHO(H zCrIJFDS$G2r)J4uaXtm`uoudOReLcmr#NGTzJYF2V_xi{XqSf!&g<}yq$Q9@ z8wJu}E1md@ShYEiVE=JsYMb`>;;|7sTKsqDD5;}UB2m$nf4eY`9wuks0SgFOg^fWa zJl|GQD+@s*Gr4g!tx^pd-*$!t_e@uE=2oRbU-|L0-~dgE7C7`DRI~_zmJ>~=jV2c9 zRZd7FUw|{e%_s4w-4P8I-=j!Fgr+uTVnW8`1KjKlroZ@_n5c8U)}RNcD-lynLv=hj z$=}DRY#Lg(b2d?I;i$v$v5e7XQaZJU4mmZhHH6XZz_kv3*R<$A6>-1cHd&)ZjvSkz zYQ=nyw=+H#o%qXYdH2I@NT8U(qsPgGb4fjXiHqhvrr8W-&R9zhvZox8n4>xjcs+;k z_r8g8B%u^VNJdapY;J*r8M`ko6fw=%9m)VqF^Oa;R($ z*cCWy|4ivaRnL4$eNg5W&s=a@cF4ZYVo1!aKfEJPWEs-et3$i!B<$s+?Q7PM}QbwfJm+mKSu{U#k(K5 z7MV*OI;!!{M!&`@s8|E}ZMUrmsGGI>kZSMtXYFT==>G$=_UA+?#=rIe0000qb7(`0#R3;QJ9B3igqqON zMHi}b$cL{$6e2|kLN`C%&3|nXFK)=k3Xjk_=6l@%$%Mv7aetjbXk7=rcYVwxe&L%$ z*fuoAP&A~!-~P6$TO}#|!%f6*=$sEj>>POZNDZpUDd#2qn=>Xf!cGzrP{?LE)X~kr zdA8i3``1HbZmSWqDLl??exso7e64Equy(DoIo`f~UuaqWL+=^pr_O70dq(nf#S8Wk z&jfZ*Osv!67k_=qPa9VBI-}czkF&q#q>MuVo!k8};eSqOba00)Lr2DGxyhyI(|CU@ zhf8aU95ci-qo@5{AS9si0Y6XBH}1X+rO!>+K~5^0r4oByD`Kn9X=-&q*$XVYWh$* zeMz_bN7xebXSzq(^QHQTP4F`7BMK*Yu=`BERZvfnHENm;u}!F{%!=*G6)nw{EDJrf z`gC5r3m{s~Lb?&hVBY47Z$czVZ!t8*z;xoZR<%X+i`^&f1?(bw+<6&~ZJa}H7ANd> zUmLxcq<<)cL$itlQ7sdG^Jg6Q?ku6ISiq*P!Py%xBTYDV2Bl6E+A_(+rRESaCU|Fd ze!5lw6RQQ5I;{LhWw}FtnRqiO-QkSJme#XhzD7v=Ao395QsbCL`;9zbzOY+rMM*J| z{_?D4=G%FNr{qhO^@w*Yj}utE2#rinTrU&4K!0oTOJO!^7jt4ck#*}^`V`ihg5_m& zZBp3`rPYK)FQ#lpM91i8PGwSwBZF!arx~#j^-&JOU70EWjJ3+-gbehcLS9|*@00%V z`ZcD!@GTujoKXj&L4AXNSHTlbX_cKhlQp?cFVdd}ciiu#^tVqUT2>HE;Z4ddfQuXmE#g5o$xY2 zU-RqPO;1;7gJkL|qD1gOV^Vn{78V;hV7JV>^6N{ko`o5lKC40)KXD0Uxt&Oe()gTx>*dR`l?Nkz8d5dnP0CbDNm2|8hny4LuT$AZKdRu~oqzW0 zp(Ay#4aujh%&|6-=@FaUy)!40t(LuONf0M_J^m}Vb0F2+mkulMDZ3~-@e{_`0I`D< z)g~zJofkPLbJLM~M}k5rgg|C*UQt@Hd6^OFH;hfz^SY`@jb?3L+jg5`6I?Q(@9XaC zF2Q=<*-WkMv<`V~yT5X)r3z+t@PBbuPHqCHL(*i-FUE2tZ}LDT80P^D4LN0Ut_bdz zBqifZi9_wSiMaafsCovb-d42pt|()={rM|AF(W6(MrC)BaDFoB#BIhdKuI~fv_@Hl z$V}PwXfma&U$Ft?1U5s$f_jZo%^azkD6Wdyww&+t>@sp`<#^7gJC)Z5#(#x&Q3jqx zk7t9L9;3WoIUb7l%v^fn5~yYmHN+0Wl)7DC5oq2;!Se2WpEnA~sy(n8m>zk=j{gl= z?LMs%z%S)+5qvv%Z;c>AQ)=5Ss->I4Vyh^vD0MFcaQWj9nbJYUurVa+r*!4L6W9=0 zaP36=>eDvGR delta 956 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 diff --git a/public/images/tyler.png b/public/images/tyler.png index e9a9f9079bd3601877369ea71c3334d75f2b5621..60dd51a1958854a2bd1bca2d9a058153f64e00ca 100644 GIT binary patch literal 11469 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 delta 2552 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 O0000 - @@ -46,57 +45,56 @@ +
+ +
-
- -
- -
- VSA is an Vietnamese culture org that celebrates inclusivity and community. - Join us for fun activities and social events. We hold GBMs every other week at Center Hall. -
+
+ VSA is an Vietnamese culture org that celebrates inclusivity and community. + Join us for fun activities and social events. We hold GBMs every other week at Center Hall. +
-
-

Club Events

-
-
- Bonfire -
-
- GBM #1 +
+

Club Events

+
+
+ +
+
+ +
-
-
-

Board Members

-
- - - - - - - - - +
+

Board Members

+
+ + + + + + + + + +
-
- @@ -169,4 +167,4 @@
- + \ No newline at end of file From 088e63ab72f1f9ca64972a0ebbecace439fa9e8c Mon Sep 17 00:00:00 2001 From: ck-ho <> Date: Fri, 12 Mar 2021 15:18:10 -0800 Subject: [PATCH 48/54] styling overhaul --- public/css/calendar.css | 23 ++++++++++++++++++++--- public/css/event.css | 29 +++++++++++++++++++++++++---- public/css/index.css | 17 +++++++++++++---- public/json/calendar.json | 2 +- views/calendar.handlebars | 4 ++++ views/event.handlebars | 4 ++++ views/index.handlebars | 7 ++++--- 7 files changed, 71 insertions(+), 15 deletions(-) diff --git a/public/css/calendar.css b/public/css/calendar.css index a35d116f0..c0f32b45b 100644 --- a/public/css/calendar.css +++ b/public/css/calendar.css @@ -10,9 +10,11 @@ body { section { display: flex; width: 80%; - border: 1px solid; + border: 0px solid; + border-radius: 10px; height: 15%; margin: auto; + background-color: white; } .main { display: flex; @@ -21,14 +23,23 @@ section { align-items: center; width: 505px; height: 850px; - background-color: white; + background-color: #f2f2f2; +} + +h1 { + font-size: 24px; + font-weight: bold; + color: black; + text-align: left; } + h2 { margin-bottom: 5px; } p { font-size: 12px; + margin-bottom: 3px; } a { @@ -42,6 +53,7 @@ header { width: 100%; height: 10%; border-bottom: solid 1px; + background-color: #0006b5; } .headerUnit { @@ -65,8 +77,9 @@ header { .longTitle { text-align: center; - font-weight: normal; + font-weight: bold; font-size: 16px; + color: white; } .sectionUnit { @@ -92,3 +105,7 @@ header { .event-name { margin-top: auto; } + +.label { + width: 80%; +} diff --git a/public/css/event.css b/public/css/event.css index 55a724d89..e6a9a691f 100644 --- a/public/css/event.css +++ b/public/css/event.css @@ -10,10 +10,14 @@ body { section { display: flex; width: 80%; - border: 1px solid; + border: 0px solid; + border-radius: 10px; height: 15%; - margin: auto; + margin-top: 20px; + margin-bottom: 20px; + background-color: white; } + .main { display: flex; flex-wrap: wrap; @@ -21,9 +25,17 @@ section { align-items: center; width: 505px; height: 850px; - background-color: white; + background-color: #f2f2f2; overflow: visible; } + +h1 { + font-size: 24px; + color: black; + font-weight: bold; + text-align: left; +} + h2 { margin-bottom: 5px; } @@ -42,6 +54,7 @@ header { width: 100%; height: 10%; border-bottom: solid 1px; + background-color: #0006b5; } .headerUnit { @@ -65,8 +78,9 @@ header { .longTitle { text-align: center; - font-weight: normal; + font-weight: bold; font-size: 16px; + color: white; } .sectionUnit { @@ -81,14 +95,21 @@ header { justify-content: center; align-items: center; } + .org { margin-top: 0; font-size: 18px; font-style: italic; } + .date { margin: auto; } + .event-name { margin-top: auto; } + +.label { + width: 80%; +} diff --git a/public/css/index.css b/public/css/index.css index 6db0e9edf..18ab7e62d 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -17,7 +17,7 @@ body { align-items: center; width: 100%; height: 850px; - background-color: white; + background-color: #f2f2f2; padding: 0; margin: 0; } @@ -27,16 +27,18 @@ body { width: 100%; height: 10%; border-bottom: solid 1px; + background-color: #0006b5; } section { margin: auto; display: flex; width: 80%; - border: 1px solid; + border: 0px solid; border-radius: 10px; height: 13%; - padding-left: 5px; + padding-left: 10px; + background-color: white; } h1 { @@ -82,8 +84,11 @@ body { .longTitle { text-align: center; - font-weight: normal; + font-weight: bold; font-size: 16px; + margin-top: 5px; + padding-top: 20px; + color: white; } #formInput { @@ -116,3 +121,7 @@ body { justify-content: center; align-items: center; } + + .label { + width: 80%; + } diff --git a/public/json/calendar.json b/public/json/calendar.json index a26672904..c7294616f 100644 --- a/public/json/calendar.json +++ b/public/json/calendar.json @@ -1 +1 @@ -{"saved_events":[{"clubEvent":"Bonfire","clubName":"VSA","location":"Blacks Beach","month":"2","day":"27","id":"bonfire"},{"clubEvent":"GBM #1","clubName":"ACM","location":"Cognitive Science Building","month":"1","day":"21","id":"acm"}]} \ No newline at end of file +{"saved_events":[{"clubEvent":"Bonfire","clubName":"VSA","location":"Blacks Beach","month":"2","day":"27","id":"bonfire"},{"clubEvent":"GBM #1","clubName":"ACM","location":"Cognitive Science Building","month":"1","day":"21","id":"acm"},{"clubEvent":"GBM #1","clubName":"TED@UCSD","location":"Center Hall","month":"2","day":"2","id":"ted"}]} \ No newline at end of file diff --git a/views/calendar.handlebars b/views/calendar.handlebars index 4c2ef10cb..4f3e8d387 100644 --- a/views/calendar.handlebars +++ b/views/calendar.handlebars @@ -40,6 +40,10 @@
+
+

Calendar

+
+ {{#each calendar.saved_events}}
diff --git a/views/event.handlebars b/views/event.handlebars index 284b5c8fe..0439c2edd 100644 --- a/views/event.handlebars +++ b/views/event.handlebars @@ -47,6 +47,10 @@
+
+

Upcoming Events

+
+ {{#each upcoming.events}}
diff --git a/views/index.handlebars b/views/index.handlebars index 6bb628c23..a06339de0 100644 --- a/views/index.handlebars +++ b/views/index.handlebars @@ -36,6 +36,10 @@ +
+

Club Listings

+
+ {{#each club}}
@@ -44,9 +48,6 @@

{{description}}

-
- -
{{/each}} From 767be690f8d9a7fd250edc0a327cd24a45b4f7f7 Mon Sep 17 00:00:00 2001 From: Lucas Ryan Date: Fri, 12 Mar 2021 15:27:41 -0800 Subject: [PATCH 49/54] updated blue --- public/css/calendar.css | 2 +- public/css/event.css | 2 +- public/css/index.css | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/css/calendar.css b/public/css/calendar.css index c0f32b45b..cf811371f 100644 --- a/public/css/calendar.css +++ b/public/css/calendar.css @@ -53,7 +53,7 @@ header { width: 100%; height: 10%; border-bottom: solid 1px; - background-color: #0006b5; + background-color: #0080ff; } .headerUnit { diff --git a/public/css/event.css b/public/css/event.css index e6a9a691f..c20e8cd71 100644 --- a/public/css/event.css +++ b/public/css/event.css @@ -54,7 +54,7 @@ header { width: 100%; height: 10%; border-bottom: solid 1px; - background-color: #0006b5; + background-color: #0080ff; } .headerUnit { diff --git a/public/css/index.css b/public/css/index.css index 18ab7e62d..8ab2481b1 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -27,7 +27,7 @@ body { width: 100%; height: 10%; border-bottom: solid 1px; - background-color: #0006b5; + background-color: #0080ff; } section { From 6689ca3219adf62c9098a943d747528deaabbc16 Mon Sep 17 00:00:00 2001 From: Lucas Ryan Date: Fri, 12 Mar 2021 15:29:53 -0800 Subject: [PATCH 50/54] white --- public/css/club.css | 1 - 1 file changed, 1 deletion(-) diff --git a/public/css/club.css b/public/css/club.css index 209f7e667..e6176206b 100644 --- a/public/css/club.css +++ b/public/css/club.css @@ -15,7 +15,6 @@ body { align-items: center; width: 100%; height: 850px; - background-color: #a8d9f0; } .head{ From a35028260e1f3d3f6671f7d62ef7a6bec2246db3 Mon Sep 17 00:00:00 2001 From: Fernando Reyes Jr Date: Fri, 12 Mar 2021 20:25:08 -0800 Subject: [PATCH 51/54] added some hierarchy for upcoming and calendar --- public/css/calendar.css | 20 +++++++++----------- public/css/event.css | 3 +++ public/json/calendar.json | 2 +- views/calendar.handlebars | 8 ++++---- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/public/css/calendar.css b/public/css/calendar.css index cf811371f..a824e6716 100644 --- a/public/css/calendar.css +++ b/public/css/calendar.css @@ -13,6 +13,8 @@ section { border: 0px solid; border-radius: 10px; height: 15%; + margin-top: 20px; + margin-bottom: 20px; margin: auto; background-color: white; } @@ -24,6 +26,7 @@ section { width: 505px; height: 850px; background-color: #f2f2f2; + overflow: visible; } h1 { @@ -33,21 +36,11 @@ h1 { text-align: left; } -h2 { - margin-bottom: 5px; -} - p { font-size: 12px; margin-bottom: 3px; } -a { - text-decoration: none; - color: black; -} - - header { display: flex; width: 100%; @@ -99,13 +92,18 @@ header { font-size: 18px; font-style: italic; } + .date { + padding-top: 3%; margin: auto; } + .event-name { margin-top: auto; + font-weight: bold; + padding-top: 2%; } .label { width: 80%; -} +} \ No newline at end of file diff --git a/public/css/event.css b/public/css/event.css index c20e8cd71..5899441ef 100644 --- a/public/css/event.css +++ b/public/css/event.css @@ -103,11 +103,14 @@ header { } .date { + padding-top: 3%; margin: auto; } .event-name { margin-top: auto; + font-weight: bold; + padding-top: 2%; } .label { diff --git a/public/json/calendar.json b/public/json/calendar.json index c7294616f..22395c055 100644 --- a/public/json/calendar.json +++ b/public/json/calendar.json @@ -1 +1 @@ -{"saved_events":[{"clubEvent":"Bonfire","clubName":"VSA","location":"Blacks Beach","month":"2","day":"27","id":"bonfire"},{"clubEvent":"GBM #1","clubName":"ACM","location":"Cognitive Science Building","month":"1","day":"21","id":"acm"},{"clubEvent":"GBM #1","clubName":"TED@UCSD","location":"Center Hall","month":"2","day":"2","id":"ted"}]} \ No newline at end of file +{"saved_events":[{"clubEvent":"Bonfire","clubName":"VSA","location":"Blacks Beach","month":"2","day":"27","id":"bonfire"},{"clubEvent":"GBM #1","clubName":"ACM","location":"Cognitive Science Building","month":"1","day":"21","id":"acm"},{"clubEvent":"GBM #1","clubName":"TED@UCSD","location":"Center Hall","month":"2","day":"2","id":"ted"},{"clubEvent":"Portfolio Review","clubName":"Design Co.","location":"Rady School of Management","month":"1","day":"24","id":"desco"},{"clubEvent":"GBM #1","clubName":"ACM","location":"Cognitive Science Building","month":"1","day":"21","id":"acm"},{"clubEvent":"Portfolio Review","clubName":"Design Co.","location":"Rady School of Management","month":"1","day":"24","id":"desco"},{"clubEvent":"Bonfire","clubName":"VSA","location":"Geisel Loop(pickup)","month":"1","day":"24","id":"vsa"},{"clubEvent":"GBM #1","clubName":"TED@UCSD","location":"Center Hall","month":"2","day":"2","id":"ted"}]} \ No newline at end of file diff --git a/views/calendar.handlebars b/views/calendar.handlebars index 4f3e8d387..a5aadc3a9 100644 --- a/views/calendar.handlebars +++ b/views/calendar.handlebars @@ -47,10 +47,10 @@ {{#each calendar.saved_events}}
-

{{month}}/{{day}}

-

{{clubEvent}}

-

{{clubName}}

-

{{location}}

+

{{month}}/{{day}}

+

{{clubEvent}}

+

{{clubName}}

+

{{location}}

From 172539d32ee6c1d2a3893493d3498b9ef851ada1 Mon Sep 17 00:00:00 2001 From: Lucas Ryan Date: Fri, 12 Mar 2021 21:43:57 -0800 Subject: [PATCH 52/54] changes --- routes/calendar.js | 2 ++ views/acm.handlebars | 5 ++--- views/astro.handlebars | 5 ++--- views/beatz.handlebars | 5 ++--- views/dsgn.handlebars | 5 ++--- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/routes/calendar.js b/routes/calendar.js index a888029eb..e47fdf6a0 100644 --- a/routes/calendar.js +++ b/routes/calendar.js @@ -1,6 +1,8 @@ /* * GET home page. */ + + exports.view = function (req, res) { var fs = require('fs'); var calendar = JSON.parse(fs.readFileSync('public/json/calendar.json', 'utf8')); diff --git a/views/acm.handlebars b/views/acm.handlebars index 70d204d58..ac318bc4a 100644 --- a/views/acm.handlebars +++ b/views/acm.handlebars @@ -21,9 +21,8 @@
- diff --git a/views/astro.handlebars b/views/astro.handlebars index 0804cee80..393777fa3 100644 --- a/views/astro.handlebars +++ b/views/astro.handlebars @@ -21,9 +21,8 @@
- diff --git a/views/beatz.handlebars b/views/beatz.handlebars index dc2c4f5b3..f59afc080 100644 --- a/views/beatz.handlebars +++ b/views/beatz.handlebars @@ -21,9 +21,8 @@
- diff --git a/views/dsgn.handlebars b/views/dsgn.handlebars index 0073e772a..471f6b5e0 100644 --- a/views/dsgn.handlebars +++ b/views/dsgn.handlebars @@ -21,9 +21,8 @@
- From 09e96dba582a89c3df450cf20fc2888fb55e08ef Mon Sep 17 00:00:00 2001 From: Lucas Ryan Date: Fri, 12 Mar 2021 21:44:22 -0800 Subject: [PATCH 53/54] changes --- public/json/calendar.json | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/public/json/calendar.json b/public/json/calendar.json index c7294616f..792c9465e 100644 --- a/public/json/calendar.json +++ b/public/json/calendar.json @@ -1 +1,12 @@ -{"saved_events":[{"clubEvent":"Bonfire","clubName":"VSA","location":"Blacks Beach","month":"2","day":"27","id":"bonfire"},{"clubEvent":"GBM #1","clubName":"ACM","location":"Cognitive Science Building","month":"1","day":"21","id":"acm"},{"clubEvent":"GBM #1","clubName":"TED@UCSD","location":"Center Hall","month":"2","day":"2","id":"ted"}]} \ No newline at end of file +{ + "saved_events": [ + { + "clubEvent": "Bonfire", + "clubName": "VSA", + "location": "Blacks Beach", + "month": "2", + "day": "27", + "id": "bonfire" + } + ] +} From b07eb9499316cb451a21ff357fcaa7ccc9e6b9a8 Mon Sep 17 00:00:00 2001 From: Lucas Ryan Date: Sat, 13 Mar 2021 18:36:27 -0800 Subject: [PATCH 54/54] updated calendar --- public/json/calendar.json | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/public/json/calendar.json b/public/json/calendar.json index 950518e21..6b1c52eac 100644 --- a/public/json/calendar.json +++ b/public/json/calendar.json @@ -1,16 +1,12 @@ -<<<<<<< HEAD { "saved_events": [ { - "clubEvent": "Bonfire", - "clubName": "VSA", - "location": "Blacks Beach", - "month": "2", - "day": "27", - "id": "bonfire" + "clubEvent": "Boba Run", + "clubName": "Design Co", + "location": "Tapioca Express", + "month": "1", + "day": "20", + "id": "boba" } ] } -======= -{"saved_events":[{"clubEvent":"Bonfire","clubName":"VSA","location":"Blacks Beach","month":"2","day":"27","id":"bonfire"},{"clubEvent":"GBM #1","clubName":"ACM","location":"Cognitive Science Building","month":"1","day":"21","id":"acm"},{"clubEvent":"GBM #1","clubName":"TED@UCSD","location":"Center Hall","month":"2","day":"2","id":"ted"},{"clubEvent":"Portfolio Review","clubName":"Design Co.","location":"Rady School of Management","month":"1","day":"24","id":"desco"},{"clubEvent":"GBM #1","clubName":"ACM","location":"Cognitive Science Building","month":"1","day":"21","id":"acm"},{"clubEvent":"Portfolio Review","clubName":"Design Co.","location":"Rady School of Management","month":"1","day":"24","id":"desco"},{"clubEvent":"Bonfire","clubName":"VSA","location":"Geisel Loop(pickup)","month":"1","day":"24","id":"vsa"},{"clubEvent":"GBM #1","clubName":"TED@UCSD","location":"Center Hall","month":"2","day":"2","id":"ted"}]} ->>>>>>> a35028260e1f3d3f6671f7d62ef7a6bec2246db3