From c7c1ebdfa9dfb1197b86a7b488e193a58e6230f0 Mon Sep 17 00:00:00 2001 From: Yasha Mostofi Date: Sat, 18 Feb 2017 00:17:26 -0600 Subject: [PATCH] Working on new event view --- HackIllinois: QR.xcodeproj/project.pbxproj | 4 + .../UserInterfaceState.xcuserstate | Bin 33679 -> 35688 bytes HackIllinois: QR/AddViewController.swift | 43 ++++++++ HackIllinois: QR/Base.lproj/Main.storyboard | 98 ++++++++++++++---- HackIllinois: QR/ScanViewController.swift | 17 ++- HackIllinois: QR/ViewController.swift | 7 +- 6 files changed, 143 insertions(+), 26 deletions(-) create mode 100644 HackIllinois: QR/AddViewController.swift diff --git a/HackIllinois: QR.xcodeproj/project.pbxproj b/HackIllinois: QR.xcodeproj/project.pbxproj index c0dcc4d..a4d0e2f 100644 --- a/HackIllinois: QR.xcodeproj/project.pbxproj +++ b/HackIllinois: QR.xcodeproj/project.pbxproj @@ -10,6 +10,7 @@ 2C2EFF3751D864194E8AAF57 /* Pods_HackIllinois__QRTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 66B938DD4A3F3CC85BE83D48 /* Pods_HackIllinois__QRTests.framework */; }; 3DA2A117F80259320E343F6A /* Pods_HackIllinois__QR.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 305529D902BF1604EEA51AF9 /* Pods_HackIllinois__QR.framework */; }; 84C7D6CF1E5394110018AA46 /* ScanViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84C7D6CE1E5394110018AA46 /* ScanViewController.swift */; }; + 84EF44C21E581BD200581079 /* AddViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84EF44C11E581BD200581079 /* AddViewController.swift */; }; 84EFA7471E51407B00424F8F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84EFA7461E51407B00424F8F /* AppDelegate.swift */; }; 84EFA7491E51407B00424F8F /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84EFA7481E51407B00424F8F /* ViewController.swift */; }; 84EFA74C1E51407B00424F8F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 84EFA74A1E51407B00424F8F /* Main.storyboard */; }; @@ -46,6 +47,7 @@ 66B938DD4A3F3CC85BE83D48 /* Pods_HackIllinois__QRTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_HackIllinois__QRTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 6B154F548C1D70B49E437A8B /* Pods-HackIllinois: QR.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-HackIllinois: QR.release.xcconfig"; path = "Pods/Target Support Files/Pods-HackIllinois: QR/Pods-HackIllinois: QR.release.xcconfig"; sourceTree = ""; }; 84C7D6CE1E5394110018AA46 /* ScanViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScanViewController.swift; sourceTree = ""; }; + 84EF44C11E581BD200581079 /* AddViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddViewController.swift; sourceTree = ""; }; 84EFA7431E51407B00424F8F /* HackIllinois: QR.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "HackIllinois: QR.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 84EFA7461E51407B00424F8F /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 84EFA7481E51407B00424F8F /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; @@ -132,6 +134,7 @@ 84EFA7461E51407B00424F8F /* AppDelegate.swift */, 84EFA7481E51407B00424F8F /* ViewController.swift */, 84EFA74A1E51407B00424F8F /* Main.storyboard */, + 84EF44C11E581BD200581079 /* AddViewController.swift */, 84C7D6CE1E5394110018AA46 /* ScanViewController.swift */, 84EFA74D1E51407B00424F8F /* Assets.xcassets */, 84EFA74F1E51407B00424F8F /* LaunchScreen.storyboard */, @@ -454,6 +457,7 @@ files = ( 84EFA7491E51407B00424F8F /* ViewController.swift in Sources */, 84EFA7471E51407B00424F8F /* AppDelegate.swift in Sources */, + 84EF44C21E581BD200581079 /* AddViewController.swift in Sources */, 84C7D6CF1E5394110018AA46 /* ScanViewController.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/HackIllinois: QR.xcworkspace/xcuserdata/ymostofi.xcuserdatad/UserInterfaceState.xcuserstate b/HackIllinois: QR.xcworkspace/xcuserdata/ymostofi.xcuserdatad/UserInterfaceState.xcuserstate index a0f49a6eeac9d6cc9cda296c06b015f146f90ef7..9d576d1ab5ba385b45dcc079e353a43ad4456416 100644 GIT binary patch delta 19248 zcmbWecU)7~`v-o{-S@I*9H1bmKp+GXMo^ZZD0|2rAwbw9Aq1^6_o&rswT`HDS8&$7 zXWe^Mt*hE&Ie{hb7H^yByUd%b@Ap}A*1=Na$wJkL32@;LnNOnizfag0Ac zwWBZapBfiptir0X8mtzp!?c(VYr=+LL$P6)5u1!n!KPxw7{sj=_BZwq z_8fbGy~JJt0+4_M4!{vO0cYTn4n&|U@Bp5m8|VQfAP`7FI8cBH&OK>G#hu7l`xCYnaI=m6r<0Ek+F5nO!g^$L^;Gg1C@oBgT{|aA-x8SSs zHTYV59sUiz3*U|J!S~|(@csA!{4{&V(D`PWTdjgqR2;!U+WtLG&Ve6Olv|kw_#F$wUf~PZSV^L={m@)DX?Y zAYw4_2{DHFlo(5lBR(U>6BCG;#FxY@Vm7gaSV}A-mJ?qSD~OfEDqB6mmK_ zhn!2!BiE7Z$qnR2aud0k+(K?8w;9Rp?+)W-Qza>wT=g9Nq_vB^rDtV2( zL;gbEC4VLFk&np7`N6E&ThMa`z>Qwyk8 zY7w=JT2Aetc2eI^yQtmN9%?VOkJ?Wirmj&xQP-&()J^IZb({K`x>ZB zL1)r=bO~KS*V1)#Bi&3-rl-(T>1niyo=(r8XVPENv*_9M9C|LjfNrIi)9dK<^agq( zy@~#Y-bL@G57Xb#=jikF1^Oa=g}z4rL|>i^BQTKplo`)VV7_3cF(zg@GmDwc%wgs-%b4ZN*UVaGBeR{^#q4GdGe?-C%(u*W z=11l#bB(#f{KDL29xxA?f0*Y+<^}7*y0Rj+1KW}9#CB%gSa-Gy+m-cTy;(n2%m%T+ zY;QJ_jbfwOI5wNjVRP9$HlHnE3)v#Jn5|(OSPg4n$FQHWW7)~9iJi{QVdt_f>=O2C zb~U?(UCVA{H?f=9E$j|u~*p}?9Z(6SN0zJ8~Z2wfPKn7XJ2y!$8xru z6W5XJ#C7I8xo(^n*OT+%{5dHX%7t-}Tmsjh8^9%Usaz?i;>x&ku7Xo@m0T59&FQ%& z&cF@j1a1uXDL0;*zQ~CLP3%`tC&9CP-^V|6y{7!xk zzn3Qt@<&aDbTqMD$T!WWM?0z@sDPjef=?m%8iEyq_r_qx4%mbVeFX?XGz0?#Z&PYs zgeivWYMRCBOno>XQz|R&cn;$*9<#y*U`d!y3zjIjwqVIZN7Q;W=WEJ}9c=2z_v)#_ zd=_KHSP7=YN`+2BXTeQyUyPMurC0@~7P<)Tf~U|O^*I(~=!?~3nii}<=qh*=3<%E) zNGuOX9xD3|%fWK7MogcZniZ?ptA@0qkAn8u4cH*_?9D>A7HqKKg+|f_cjwyr497;8 zc3XAG8jg*`3W`#*;%mwcHCl~IKcv04fQ`d^mSPYag^k9>V4q@Rg&smr!AI~F`~>k* z>@#dUHUaw_n}~S`{z8Bt5kiDe!3NE8J$Rh)dhuU2zXYvU+WQU*4h{*I1S!Ho$3sH2;Gwkd7}u{)v!O&$SWr+X`WYH3AMu7q$FY+w*a@MJ5Z^ZDx7g{0LR_0*&tl(|q-Lcw8&qZW zYKu-R!p@qtBDbynJaz$z`%Qh8+OP;ak6pwHvQx9rM>_|;$9}+kTCvO66``NdzZLrt zyDB6KH6L=~riBv;rfAz{{uj&d0ZRK~lc#sGiMQ)0zlS}*e3oFpVfV4$u|Kdsg(M+a zND)$nv?bU>>=E`DdxAX`(uEA6SSS&y1#hK&fa!*vld0D3fy2K5GmGH0kl6x&kcBu| zoYheZDC~4ApaCNc6bgj6H`D?i*kF#WzzSFk*+Nb$umyHPu8@bUxQlaw>4m+G??~X< zYF7029vwjE4|=!(ccD-yLOp^Ux_9irt;F`ASyL@$Ewg0XbqF2nI5tT&QRTAs|#x3zcXE{*K6h0a2zp$8JP4 zh%rrZjEU?6;@Xt3y?Z}^5Mwb&0R6!LkSNp&bwa(+uoxtR6p#wi1dZ^CFhmf{-14z- z%fo50Lk`G8+yc3Rwgu!1x^`|Ao4Hj2ltQC0=pDDpfZDwFa!?`Yg{D?e391Bx&}`vW zPDc%B{GiqiG$GCmMzxciy?cCO=FAXb==+=*4n}~HAV3%)3>St8Rqs^5!6bKa=r|gT z{eU0iz-Pip!H8%qaS4%40$+T%{;6Os=Cjt`9ZUlzFdfVQGr^Z&7MKm@fVp5Em=6}1 zM6Mo2VU#dN7%O}xOb{jtUkFo#X~J}2rZ7vGBg_*P2n&T)VX?4OST3v(Rtal_b;1T= zldwhDChRbey$-Ag8^A`e32X*iz*evgYzI5QPVf!b1$KiyU@zDQ_Jaf9AUFgLgCpQ5 zI0lY`6X2xqjc`ynDV)w1z7sAA*MvL5ufl!df$&)POZW!@$nakTQ_UwqNVs#lg@ou$4~^I z71H;R2>f8F9cL=-9?q3XgUf=#D$1m$mhPTGK|zWhO$JqYT|d35L7l0tj0~$pEfi8| znOyb37}qUhj7KvJHOV_TF+W?rKS$raO%pm~@b@g=la%&rOc5S^Om*G*m`-|hGL7!& z#{X%lnyj?nimFzbvO9^GCzhhAW_nG3baG_=v3#2>qr=Wl{J)m(8A^MdWtq=AcV%(H zQud|E(`_S*vzCw9mgzgVr?a??rC=^9n8@OemXG=71)F+z$+E&lmV&R8_T`rG{_5gn z>e`J4EhhV}lNe7+{9cBJ4L8MjX7f_Z_t$3ro8jv> zPdOiADO#zt-|=SUW0(j_(P}jM@XjHM@DDhNM_Ve_D(#yPEyZ|6g~>k78A;KK#p5ki z>n&^`y`7i=mhX+GF5XH$)$)6@(*Cf8i?Z%Lm@G@tRz&zjKF{)dyV8Dxxw>Ocje4-8 z`aLDUi!BXyn!X6v2U>g%ycAa>1i@8!8D5T82)l&c!X9DoV!RTs!aVRAVV|%c?a~L3 z0Y>`_OU`p2R*@24I4mec?(Y#48Y&%;H!M8Jvh%!wB)kd##5|w@Z^j4VgM~xFVd02y zbTK{zABqMXE*uk%qXAE}4QNvK^fZpeKmRBR6Y)uw9;bwF+j=1M%yX}bX?D*yZ+5|Q zS;&a?S*PQ(KRW9ie6D4TGs4-oW90rwhi^JlI4oFd9wo%Iv!|7BE57Wb{g>lkqy8&} zbHaJl{{o`=&z?Pf*W+8vtvBEs@lE(<;gayZa9Oyr7~hI-L#=lRKL|gf)>kcSTY^3gu7gviq8iSYEzN+0^U$%rn5*GHRs6WuM%p9z1zHwEK7W(-=Yv!6c^ zgt`#{goFqrq{4IIh44~%wU`JdWS9pLBK#}77HlBE-iY9Dv4?*&5&zMd`V#$6m;Mmo z5D?~0B%o=BVKPw{s*77=EL{(tO*C?m?-+H(-_?-q0A z#6H!+kL zMhquLKwuAn0|br`I4vfO2x={KJ44{|hHeA_re6X?{+|<5%(MPi|B0!@G&JjU2t*Kc zFwbg^Vf-XM(mBLe=85JK^N9Jx0th-o;0A#^1YH&r3yBugX%PfnA@DGF@_ZwPR}vrb zYGT7j*SC?_)JB~bM7~!WSJMOCjXR0G=Jx;9X<{F-A5C%)f*ug`G*9Bwrq*uu;uDfQ zGn|Bng&>^{3JXIz9rjkIj}xaqI{z8sY}@>P5QyJN$uuvpqyP8BRr6y1N87FuKOq`! zKo9_d#7sjVTIh{HFaKYN`{qgh3lPNb#2=``0|`H*^%so21P>e4MC)N&?vN)lTt5FvK#4*+))w< zGNy$@zE7VIoE_57B$CHF1(1Q}MiL0(T1ey<#iQODc{dL^axqD?+P;Fv1>|@8km10W zRFDx^1{Os6kx`~~aw>SimWDUAQ%Wi4g`4+#Zff9mJ#19j1v?iNSutypo$QI&F?pAJgD6c?% zVlEp3k;iW?>tq^Z)w4S}k~DtcOOvC>G3J$whM=&8{1k#BG$gPVbtcD?pSO?`ASi~Q zBty~`7hWX4XvHp?f~-4qC#RCrJ{)NV`6cGqLe7Mstc9EfK{<*CR)_fJ%_o;)j?2jf zS`gVgP?vnxr|(nbY=y)l3YcuCYM9d0D;D= zJ6Z^I5Hv!dHy7k@l!S7i{~q!n(mZl6xsTjW9)JKbVGsnLKrnPMd5Anr9wCoHfN&T> zfYvzXLphyllT&lMPj@0rZuMPT+2HpaP>#IRRyYK?P{XZ$Z2K7Y#-;QRmNX5nscesn z$)CuZC^{mqlQ$qh=sL2MyhYxIzzBhWI5J<+)A$?t$N#i=U}-T*$oGmFYmb@#+7;#r z`RxC0-QMUW`TBnvy`A(;BZ{P0l!~A{D2k>S2*yG%4ua1XQ5?lnC>j|L!7>PzBL&b! z)Mru-*y$ydBjrRnQ!W$=Q;;r9gNMC zSIPr|FCdruE9ek)zD&k{p zdr`fqNC=R&eF?!VL~~5<9srCEfBOWMf@nGR8$%Ix75OwMG!28U?~LX$09R(x*^PoMftTsHKrZW zE~XXHMq?c!s-9{6DQY zz-np~HChhAN(fd9Yam!FAZ1w(!A4;l1e+n)YL@@od>8dun?;RmW|h9#{kE7lr3#5-)4?|jF#Ak`kGpg0GL`qt)x~_tEn~AT525xJ0REz z!8Z`>f?ziUdmz}m4D+BiQkyVaY8|=GP^aGl5YMN?LUajP9g(bpP+MAg8sVKFRQryvWHmR!~Q&W7Ki#1a*=+MSV-1rp{1jAvg%ZAqWmba0CK`YsVls4#5csPC{^M1$7RQ zd4ak}U826HE>l;~*N+fRw8f*%F1D$u24w;?hQ1Xw z2Ccp+Sv5r4Y*5JjxAg6|->^bSP+qW(efMLnbbhTt3o=Ub`g z)C&kMKycBLbMiE%d&PXV*J8A9_(bD0_1``;LN(OqdozmG#eC4(igrX+N?X%5v@LB% z+tUsZT!G*R2oR61LU0X&pO(^2v@`8OyV4@M0|eJ0cm{D#h|3_(WkGzPnOhzv2c^g~ zxx~t3uk1o7?K@k(FO?`jH}fxJAH;|{owi0}Xlf_allC!B-HrC5z3J|B54tA=Xm7X) z!7T_7NdFAMou#xd?MI6-4>|zzfZ!Jh{)FIxS>?=;5SrK7%<4~cD&)RY3^1r0ng;6C z78QG=ZJFwFBr-cIv&_`>=tEs$+Ntz2O;ZNixS0#%QnCyxLvxeqk1~-n9Y!nAW=)4f zaJPkyfZ$ie=BUz+UFaw}7Nz3oXgUUhdl3BAO824TAh-{~?+9caGM&T&)3p_E*Vdm# zsmNA3jz;kMI|P52f1>8-Cu*Kk{-w9rKmJTmXz79*yWG>W5I%(MQ{LYG1C_+6Ent}<6uLhz&o(ZZN1d83#{ zx}Mg&n+-V>f4!ScPd9zw(9nbEQJBw4dNBP7J%k=g52J_EBj}N|krrqO0n${I&3g_3 z($kj^yn^6g2wp=RgE)XVz7mOY47r>hOOK;U>GAXg%mef2Mo&T_#R-e`kr1cM@Q-(a zcvmE3RN;Y6j}mHZKps60JGt;p=AQlv;WfPw;`AH9rWawS7txF9CG=8=GZ43ixZPV* zqQ9nBA+w-Y&?_O%BE@Z`SJP`C&O_V^$#_+*TNipWz3o3uw$nQxjtHYI&4DQLbLO_fJwO?}&@NdICv9?7U_BjLCA*#F0SzaLtDw=3Zj`Z+qipr6uz z(a-3=>3<;J4dPx9_l9_Pi1%1Rzc34({+C8-fx=I-gryJ<7UchzJ)_eev#FL>s~gn) zYU&MYJtDHN#(YXsVcJ*b6=C355_3K)-++%I+7U`WfY(O2(5xft$JB z%UmD$UOhUG>W}it1M2H*G}@Xbr7|OPpt|WT4l;g>|2wJzARhEqlNc$3QZ?ptHq+E< zktwhO9jb>gy%B0Mp-dPP&M0UvrWeHJ5D$TPD8x~A{3gW1mtr1FlzH1@VwpZ>_A1`& zcX$TGGtp>2S9q9aR%Dn)RCH`V31SkNbR;z!>gZGAbB*deZFd0lH zxg3p|4e@A*BOF9qJ=!hf(0KjT2R%@dTqak`!o#E%U13VFldX)BDTR0}#L;n^=|*J- zGw}6jt5zfHWhx;aFT`D7YM5Hgim7Aju?$ATXc-;TXnLHKVJjfi=m+t1i1&qfnkk@4 zk-!)*&0?mR8N>``K7n`w#1kQ&4Dl3X70fVZI2vaJRmvC(22`LBwWhL0tk$y;;p1zu8fFwT+T@VZm1t$gnCw!zrMww< zEOm}CLOjXLO?*J!z-qLqRd@uo&s*A7-KVX(y>xP0X=+=k(%##YRqf>z(>F)avjnEA|tHhV)N%4svU#Y`(whQ-Vh zi07I$As^yMW!v`6IOH&@bWQ3C^S)_XuJX@oA8!SNz_Q&?Rzn<}2ewzOW00F@R>}5) zP0W^eZMQ^EE5US=P}iy>Zus6%Jq2m_E7U8s-EVvaE<+Fc~( zB*alD-=;685x6sFn6u1x5LZFG0^(I~!JWCleE*@(!(3*rK)ej%=4iX7!OO_}#F)d+ z_gpFF7IPcoYKT_~`5!uLUNO@=-glCiUzz*=>HE8R_-f1WZ4P0!p{BmZP@`@#dwlJz zdBi+5FZMC>1c6B{#Oqqk2GnLaXuZ8P-X;%?o3Xw5OBThUE16f!zszeEV*xtTAy|^7 zSeixKSp&q8wP_))gLosv^$>4@xB=qL5FZ5b!7EvgUC zArN0|ne|(X1?+`5TKPYaz)_*udK0{mMwpX3ZBA>7wnD8$UXi9krLQQcx46A#R5e}b zm+0(-n#HRtRn7H=cy(EGm3h4;_k@5*d$Uh$DXLQI-{S)7$#(ldW7zI&Pb6Zt2gHZA zus#qUhGhc0K}74)_Z!&~ zwj6W(-@7Pm1y;&dvQ-eDD7ZuX3y4n^@-3>&)|x4+gZLzLCnG#b7f`JYs42^AU!<08 zL`-<^=1F@+Gdmn1|9>u(7~kD0VMnkdStBd35V^|u6o^lS_%w){AU@q}US82}@0Iur z3kwaFNP`seuuy4ecxaF;NQUl}gvcaeq39SZTox1-9ug`KZ@V(Vjx%2?S%5B<%){oO zYbA5hWs*R2sYHsdl?27T1LFj8{e@`JXE#VTzy;BhIsX*?sJO%!)n09%K)(hfPt1$zE$Az8>NTarazgkFv*5 z?Q!-5dlJh)txl7D*fZ2!)2hNWBWkxB;!EG>(s%4R3zsfJ9Kr6gb}p@Iqv(4xdoHtA z*dHK{Ec+`RNRJvj{VnFA2t_@7Q_u7g$V zX=XOZPesM-vaUNZxxku z=3J45aV`+w+QK20?wE7Q`+}LsSz*hR5V>HCpKrZECr^>Vvghj zIEg8-xF^X4BDW#2xJTzVV8I1(GBf?b5Z~9rA^&iH8^*?Q;T*~vzQI@yxpyd8)7~eF z>x1Bxi{@fDgqui`hai4<5f?|D(znygxI8YOE8q&bBCeP#f%qASpN05&i2nrfOAx;f z@f&a8m8;8G~{;>KPTi{4s+!4aOnth@YBhsi{F9w zb)=aaWVR^|?SfY!exco_er!{cVaTSq;oJyrB*c-`q4?^`TbtsFLM)hLrpb&sC|ovg zN0KI#4jNLXMZ4o06yn}^hL_*klap(E)#q(cgfc20ni@B?P5jr|Ozli3ZfYC+Tx%l? zVPOl0pz@aBVe-rB+KX%9mLeyQYvmSki#dcYKSTTu#D9VK-NoE8ZaG!Tt$_Hi5Jwpj z6g@u^yz`RPl?L;*2h*v94k-m~`7870o}XD$Rc)zh7yWw9e1^|$;5KrbIAlimApRS~ z??e3e#VFf%j@wQyN8Y1(1qf)(K7)Jz!EKlFxP6#r;X55T$Q?%NWyx@HM zc^4j?JGSz!$dw`(U?I_2@J4xW1X>z|Pj95pcj3Ez#INGLsB?UGNN{Gk z6CK}pFT4*5+<0F|@NZec`}64D-aEg_`2XTq@gaODAI69C3O<7G1qmxipk>%Y!UYnp zkPtzlgE>5L(lwXW*Oa%NAO$pOoAu>ysg362k;8?n{&Pu(@5}eYJox^QFxo)E7O5*? zhZ3IXsJ2VlSI2|VF@G3xa?mxGVDoK_pb*PJ?fW>v@oDe&5(4cS@9ic0K(v?e*?bNp z93kQSR^R!2-kghT+e`Q&NH`(tO-fBC-*(=X@@3`*?(c0R#UI3-rV@=i=wZrW-Apf8 z9&JExv-F&I8zAhm00Q4&X1oRxorJg#g2Rw7lsmMzBkgnQ`9U9(=U^nyA&_vh$kVS~ zp2HE&@FO7MZdsJkyqWU?|JnNj{eO`so5D}vKj$Z!9c6y9*-<9CK*9qOK5ral!uRb4 z!%ySUQRx4=%KWUhYuk|MDj3}b^Tq8pPnlnUXluK;{hpxsR(_Eg(D|j1=m`nWH-JvG zB^LPQ2+;Yj`4#+1NOXgQ7bLvj0{Z{A583gZYsqi1AUDz7f_oMx$=K#ZzUL$fSbl6p zg$KHWtU)K8Z$-!6Zxh{`Hqjk2^Y}0%#Q(P|i7Y=gD@i>>T@kACtDJGgJqtAl;$)xjC`-rzQO z2fa49$CslQ1A~zgjYXO<9laM=!LQ=i@ay;u=(WHu^j=^ee}F&4-{7BGb+(dQMOwvJ z^|6Y#O0&wdDz#Eu>8+Zr23rla8g4bxYL3++t5sI}t&Uk;w7O;Wz-aZz>WS4~R)1SP zw|Z&KSzB4#Sld}USUXv}Sc|N?Sxc<@TWhVyThFszVtv;7iuEtnzgquh{k!#_)(@>8 zTR*kIY^-ctZ9HxKZNhBgZTi~uv*~Y>VN+tGvMINzw5hhKwHa(P#AcYy2%9@Lk8PgY zytMh(7PDn+Ia@1R8(TYDqtrIb)?horR`)?Co6byzG4J{OtVgg6w2=A$DPQ@pk>}`r9SiZM55Kx8Lrd-C_G4_A>h@ z`xyH^_VM=p?EBki*=O75+UMIB+85g^?I+vsu>aMegF~!Cu|usxgM-%Spm#7h404#@ zU~-t{Fvnq@!vcqu4(l8?IBas*?y%Egm%|>1Qx4Z1Nk z5stkbBOUuW7CKfqRyo!<);SJ$9P2p6ah~G>$Aylqj*FdaoLrr}oP3=8ocx`FoMcWR zPGKld)z_)OsljQG(@dxNPR3nM=bWxP-Eg|;bld5n({rbnPX9V%&bYIcvyHQzvxBpf zvx{?#v(|Zm^AYFs&X=4oJOAi>&H1|X6X#bhxC`k*yRa@UE}dN5T)Mb;xpa5w>Ei1W z=91{5aT)9~#$~+A=Pr|6rnyXandvgirNw27%O02gE(cu>yIgX)?DB)lRin#KuFIkhpvxZpSnJC{m1o%>nqpSA|N6} zl!y^=A}f)N$WG)SauT_SM52zO&LVeFSCOa4OVnM|Q{*cWi>gJnqI!`=q!Z~y2GJnV zC!(RE;i8cuK{QGu|lp%?`IaR&;Fa*wnGPG+g`W*ZU^1_x@Wo%bk8xm=eeJ7|K9zI z`;YF|x{U2&>N2CtmtAIe?bNkrSKqGUt^r-wblur?SJypV_j$y6q5L$^KM_H{eZ?T}YLuPm=@uUxNuuQOg( zy?*k#;dRS)y9}Lib(Wk9R-W{oC$mdSvt{=~3FFtVczU ztvwF*INalCkK;W}Js0+D?YX$;QlB0^GM^BiFdv1_A3iU9UirNC1-^~GBYnsDj`#iC zcara9-&wwMeCPQt@LlNJ>buMLw(ldqPJUi~fqvnBef?7X()}|12KwdrDg9J_<$h|v zDx+VG-x$A@e%t+S_}%mS%kPz#7dwev#3FG=ac8l&xQEzB>?igYOT=N~SaGU2SDY^{ z6c>w?;%afNxL&Lg>%@BTF!4C?bn$%gSK=1&BJmRO8u2>u2Jt5G7V$RmKJh8>CGlb|Be4{|0Dj# z{7?9w@;~i=*8hHhQ-Ei{fPl<^l7Q-f=75m_LcpkiF#%%(CI?InFa^vA_%dL2Kx@F7 zfSmyc0}clq4LBZfGT=hMrGU!;KLlJ2_$lCSz!M3O@Dgi@t;Am9DCsP5mvohQ8YNzm z?h=V4LJ}{@kQ7LYBqfqkNtvWh(jd`F8YNAVX30p&XObC`1(Jo5R>@+?QpsA$ddWt~ zX318`cFBIpw~`+uw% z$iV2p*ueO}eu1jM&jM!#?hZ5_2|N>cIq**4pMehp9|t}Sd?v-Dgp`)DQY)#A)K%I| zDwc*zW2JG@zS0Eg0BNQ)Tbd^=kQPZxq*c-;sURIM{aiXpI$1hZI!8KRx=`9GT`XNH zT`S!#JuE#fJu5vYy&%0Ly)L~ay(7IV{Z0D2^sgX1$U3NFP`9A&#vq>{agYQ(fQkr; z42lkl4T=jY3Hmh16tpwwV9=?cD?zt{eh&I2=+~g%f}R9D3wj>(GU#<2;r{%2NLEcI3C6~$-@?P>t zd9*xMo+wX|r^_?t+45X@sk}ixL_StNSw2;6lFu;8zmzYOFOn~nFPE>7uaa+;?~$LB zUyxstUzYzMzbd~Y|5bip{)hab{IUFH2p8fM;t}E-A`S@%2@DAei3o`di3#Zw(l;a_ zBt4`cq&!3y(iAc%WJt*HkdYyuhfE5Y95OBBNXYq+OCeW6u7+F>xf$|rC=<$u+JxGL zdWVLE8e>D_L;Hm$geHcjgcgKqLSg9W&`(1@3!NG|KeRP;P3YFpGohD4AB53iPGPQL z9mCwhx`ug%Ny4OI!C@g`i^JB3?F~B+b~x-<*vYWdVc&&a2)iBjOW3`z-@_h+Jr4UT z?4Pg~;V$8x;qvf4;o0F;;mzSA!(sTC@Uh_w!@mw+Wei^%zCQd!_;2BVhyN4)Jp84C zQ&=nP6pjiPg-GG62v(rC1&UsZNJT$IlA=ISrKncaDC!iSD26FUDxhMFVyt4iVwqx- z;*jE~;)LQ`#aYF9#U;fR#Z|>0iie6PioX>9C|)XFN8k}u1QX#9;T91RksP6l7!>hE z#IgwErijfE4m}@Qz3=qC+xxf3jL4G6^2o}_nn+D#W27N+P~`B) z(UB7)XGFF}E{j|dxjJ$~i(RTLIQ zMX^yihenT%o)A4hdPVg5=uOdEqjyB_i#`~AB>H&t z$>ZQ-#4F4nA@#Esh$4`u(96vRFLHxq_*7zlT-TM0W755G3EA9Jr-z|N&_1)2TS3haL$bQlN zV*AA>5DE4PjtR~QqJ$q4eogo-;rE0G1M~xo1K@zs1I7;cE0IWaOms=?kk~n~OQL6@ zcVf@P(8Tb>UWrkOF^R^w#D0kb5|a`u6PpufCmv0_mqaHeBq@`slj@Q*NxGyFNz;;M zB+W{io3tRQC24WevZNJBtCQ9x9ZEWybRy~7q_auqlP)D)NxGVJJ?U1`&q@C#J0!a& zrzDpq4@zE=ydn8e^10*-$-g8&Nq(06Px8y;*C`-{Pq9mJOmRsOrFa`td{g{W0#oEE zVJQ(Qy;BlXic?Bbs!|LoLsEvP7*ocij7yo2GBIUFN^8p6lnp7HQ?{k-Oxc~XFXh{m zvnl6OE~Q*axtel4fF@jshd-`rS44Kow_geVCs?7^Qo6oucTg0 z{VDZk>h07!sjt$k)4HVfNo!0qPDz`ewlHl`+S0VI(^jVKN;{r*I_C4ksrmsm~pS~%5OZw6D3+dmd|B!wy{YLt&^atq=(;uZjF=l{_ z4jG*@x@34}cxUv?@XH9ukY>m-LNgQ@=^2?B*%^5mg&8Fos*H+^s*IY9x(rQ*F5~lz zIT_nCPG$U@@g$SYbjy@xCTFTLKgoodqcX>2PRg8;Y08|Dxgc{%=JL#ynQJoFW$wz{ zpLrU3mX(oJl2w&eo7Iq|%WBFRo@LA$mGx=XXIT@n7G$l+TAQ^!Yk$_EtfN`Svo2*_ z$-0_#ec)#Urw*JmaNWSo15acdvnOWH$ex)!D|=4%qU^=lOS9Kzugl($y)*lp?A_TX zjM*2nFK7Rl{ZsbM?4PqAWIxV+n*A*MdG@R9*Ey~^!8utu>KsE3%o&q2E@wi{q@2k) zEjep)Hs)-}*`BjIXJ5|2oWnWSbN~ubI0V4%N?IPGxy8fS-Ep^jq7uF=bp&@Hur4q`P@snS8}iB-pjq8 z`)BT>+^4yJ=f22&mFJ!pmY0!NpEoXVdfr!gt$9oGmglX^Ta&jv@0+|mdHeGY`4u&iK3!Rmr_1se+X6dW%&Q*f@}V!`D?ve2f`zc8pUy|B2jw6MIe zvQS$%ywF%Us_@goX@xTiXBEyZ++TR2@OD ztN20j)8fC2UzA`aLi zP%^sY(~?;wON=EeN>-PwE7@GKtz>7(u9BZhUMYE{r_x*5Q|YG+P)e0DWvEi2?5&Je z_EF|5izHuw7#^V zR8y)e9Z@QjjxHTrI==Mt(v78iOAnMDE?hY(bd z>YVB))$=mjGQYC^WdqA#*%xJBmd!4kTQ6YFzbilmTVYjUTj5aQ zRN+zKRneouw<5GcQPI01x+1wEts=7`yP~?Hv0`L}5mt<;7+djLO{-(nDe5$JhI*j7 zSY4_vSF6<{)L*C_Ecdz!T7FSEErPZ?P-qo?y@zn{{1FCbX^Q()hmDOd{71cwkr&qUBFRorzy`p+` z_1fwk)qmGeHEfMljZMv%nn^WVYrd(uQ}bu7OKqoGV@z#IZF+51ZBA`|ZDH-`+9|cB z+L^VpYv}iaw%VPw`)d!?9<4o5d#d)II)^&ny5PEyy70P)x`eu%y8ODL zI%Qp1ow}~NuC8uq-H1A&Zgkz)y76@r>n7Jtty@sHqV7=L<+`W!PW4^ulk4;AOY6(( zE9xuj8|t;jdVPI!{os07KcW7s`qug-^~>v5)~~7GTEDw~U;V-QBlXAXFV1QfobT}(6hm>A)rCp5Z930kl#?$plnbzTxoc$@zw-sWSS67xF%K;uSw7h z(5N&T&0x(?%?OR48LgS9nXH+nnW34bnWI^x*{Lxe)|}B?)!fnis=2TEQ}amkLi0+C zX$dW@WwkxDaoS3)QTv&8y!LbLEbUzFeCq+*3Hu`(5=+1({0pk(e2dj*6q_B(4Ep<)ZNnE)%~XXL-$zsm+l|ki$Y;v&eyo17ey)CreusXSey{$3{*eBt{;d9@{<8i@ z{Wbk>`akp!^-uKA^#3$DH+eRBH}!1tYYJ!zY>I5kYl2N*G)-xm)-rri zrd>_Po6a_!Z@ScUrRhe~?WSLv?ls+SdfN1N(~G882Hw!o;AZG*=w|3{@G*!D5<{dR z#t>)dXBc2eHl!Ic4Fge9wboE?&=_MUkZ_iiiVL5aEB4w2a@6_x->9Kzr}G&pGFLzUSHZ-dYA1%zz7>NTo<+ zSeW2T?X)E=7bS)3+lY3egBU@KBsz&MqMH~?j3Xuyh?qi5C1wzFh(*L=Vi~cVSV^oR zUL!UTTZpa19^x%xFYz|OHm#Mi`+#81R+;%DLx@e6U6 zxKI2^`~yfp0U9uX1w60?cEBDu0B7J{2t0r%kb(dp1A!n2gn~$r1d>4tNCjyi2jl`J zC$a|&R%fGi}Hq>3yeHDoPWN7j=g$dP0x*+q7fqsY>+!}H^`mjF7i$CAbE&9OnyS1B2SZN$n)fvrnXSKsD0FaJ@qbijQWuJh&oPvN?oG9qQ0gsQ{PZmsH@bE)KAoH z>SyXt>M!bV>H$sC6iw4SZAH7%ZuAh^of=Ae&_1+;_NS$E5FJa$(+PAkokC~OnREqR zNmtR;bPcVcYw0?A0zHwQL{Fymv_K7VI)^nLnI`Vsvv zLoyU&&Dbzv#+Gqp{1^%2&q$d7M#cm(K};|c%fvB5nPE&ilfmRMMNBbMqG!sPYNm#% zXS9rtX=d7)PNs|LX2voTnMur4W*Re_S;8!3mNCnj)y(V68_Z5-7xN~wo7uy>#q4Dc zGw(A;nB&Z8<}C9$bB_6f`I5QJe8XH}ZZO|6-!V6tADKJMFU&pWKJ$=;EXh)=C2Pf6 zvrg;))|u72upX=@D`VyCa5jm}W0kCmEn}P67Iq{%iXF{PWT&z-*qQ8Hb_u(bUB)hF zSFo?KYuR;d54(}w#BOG{ushgY?3?TX_Aq;v{f525US+Sb-?Klnzq0q(zu5=uzwBf7 z2}g1)$8naN1Lwwhb5bsdQ*aS_E|QDo61Ze8oy+D5xe~6LtKl@9j%((|a}&6U+$3%? zr{@H2A-9NI%o(^P+){2C_bRuB+sJL=Hgj9JUEJH;yW9cp2zQ)2&7I?}a@V-)+zswq z?nmwp_X~HA`3jyC$!GCuzKk#D zEBH#jim&FIcpcx&xA3ie8{f`%@?-gNyueT6r}MM;+58-S0dL@!@Jsn+{Br(HemB2| ze~aJCzsy>ojz7;|;4ku5_^bRi{uX~PfxplH$^XUw z%|8+mA|Rqfw1^S0B9X{SBo;Y~Ttov!?jm1NkSJIr7e$GpMKPk`q9jq4C|i^x$`$1q zRx|PBDxuKu4Kvj)1A%M=$`R;5U@-y)L9(ZlwEbnR%DKdRqm=UmX%DeL2oNOIVjJz)5t{aTZGA?!wk;#M%e<3;SlUA@ z5oAJOL6CXziNuOtBR^GL9iuwywAs3@?!->5rhnzt#H(gj&JlrTMAs5M#=X`FAw5K| z5GqK{5qTKse4>CTBsL3#;4CPr#SKppzHDXZv5k0xkgO-R6FZ34g)kvph*(eTBz6&R z3XwvLFcjlwW9?-qvL0fPTYKrvtiD6+?;-XHQ9^XJ*d-}-_^9^!R&BC&w6?WlgznQ2TO95iJhIAalOQQM45So!$w%&7h(l3^Zilc*g7H3JmVwcc-7NWF-=@g zd}N$jEjIL8J4N=(f08&&NP3A+h*Ltmkl0I{AwCt7gxVLSK5vpbp?Og4j2j!CK z@o>Xc$C~K=buSY)2+2m`8{!IamAFP+7m|e(Ayr5d(l-*{65kOwiSLOYgbX25C>BZt z4Yq-5F#~LWC4M)8|C^B2L;N9RW8khixX6jWh-1CP-^2qUM^FlJ{d+tjo)C7u#J|L2 zAy>%j1q1*>zEFV8?69rMe>UKHjSAIA4Mf1|1!`+xBdCNTOdV(EGsqF225=Heh3NCZ z1q=j(2n#S6xB@pY#4yp$LsTx532LF{83aKtUceVa2fTrgP$5+I0zV)Ts)TCHbEJJ7 z84ToxHTLfGdJqB>hSl~7F<~IQU)4;S2BN@FLb3rwgBTDC;)FV(UeF2+8^ACS4-!D4 z&?t-)I)!m~!3E;oF8y+(gG>w&$Pk)(K$f60K{PNp45xSm7rX6&E z5nzZgS{NmC3pM!UN4ksxV_$${92hT*5yoQvdK?`Mlbzi4dLXS33G&b!UAEDU=WrH%Y~J~YGIAAR_GDd3mb*a!d78BExeBRGMsgCZvs2PF7PJU z4fcSyz+Uh+cn9ngb_(wZ2ZTey2f|6=bK!#UrEpoeD%=om3U`FxgnPnY!aoQ=1Q-OY z5wJzT0Rd+O1|tl_^G*UBG}*(%YH{~dC*hXiY>=l~aNq;ev&n{h=XvaL)3t!F#~Xfg zv1d=2?x*1UI78aN0`{!wewtzJz=NWTrt4R##qStS`|dE<4IaRLZ5ousOgHll*OXhHw_9-6G``TZ-vzgP4%{;hEXD&93|ofS za^Qh!V2R<#kU19MvFT=6wYaWNEMJy14XrRqkmg~}a;E!L293vDk(KHC)oSqp6UXa4 z2eEdhq1P~Zl;K~`BGCZT{W>#HxrS|C3ejNGP;a&PT|8^JLE=4)^)L->Fl`d(W6%1U z?l)ms=ZOML*ITN^`Ix8d0S&rV?Q@<9%1w{A8BY3MV8czest4Fm8W z>pv6@$Ce0(!FZSe6NO#Eo5F5k&jy$TlL>d2D!e7^6|97}u`ZvLO~@&^785=#pnO7T zgk0tx5*4kOq@EC>2nm7H${^QEhF!EU_DXyLH%K3?UBATh0y zxoX{3yh?b8%-!&DzySY=5E*Arf|H>h3c^w0nDC+S(FQmLPQ|mQ3&(|z@$3_33=C6c zKK={f661`8a1mS#4ZObm*E*JginRf@Qkyj8EgG};pUfew*_uB$#_mU zZbK!LChCjA7k$)M16}op;L(>-AA=ua>f^#C;VVr2wOR73+m0+c zT`?gfJXC=Jl!wdl@hKEx7|mzLcN%{F(gn}K^QP^;5w4iGH$fRcI7pYFo?z4ldE~Q2 zzJ}Lcy2y2S!?egX;d-A8`-28c;g9f_my+LwznaLu6~5~ue_|y63qCTE{|z6&hwvZa zd*KJ+mhj^S_%D1+xRZqNlW-f8|J-+8M}pn`MWoHkHXy~MEuLX7{36`NGk(Q0tmMA_ zE~MK_sfUp6CU$-o{^(<;O75!nBV{k84kUw2)c1uy&D2J~zPi5eVY&$~MObKfzy6Zp zWXwy~h$Z7Nf5U{og$HB1x7 zU*WOvWCNK=W*K=vfIv7yFk9VO*+j$P5GPqNS#I3(Kee8$AS>~n)d-LXP=XZ#G=>Ez zByug;Y}}-QY$TgV9Re%@90EK7q77sV*@`E%BVd7mrE!u~ANuDNl7O+~q?bxJnbe!P zvq3=I$DLoOYrreyoR`wiCFhyx?GUii*dq#nlHJP+=eIYK)?lofyN1g@Pv{uX~1ssotJX7kKAwO$Q1#%K8|*T z4GbjTCqI1YgpbJMc!v`RxFg_U+`$v?kQVMGAwMP0;^c<>3<2*R@^b`yUx=*a7e=3r zfR91bHm*O_B)=lB;$6tE$;;$7ia<~g`8xu}8fdbGPj>(FzsSdg zWE1%}`G9;#{zE<@|3x4K0R;k~2!tUJjzGjF@(D#yfPxfBU`Znph(aJ5fuRTt!!St< z11x9gZ_KNjzGU?u)ndtnh=|Cba7BnbB21x(3=a(p4Ks$9$e@t0$k52Butla8)E-@N=(^OSPfzjh($Pqj4o^MPzAPx2C6g>Wd&Usfo*Mp^%0?E!_{Shp;3X| z^3Fc?DQC*XoQj2b#eYVae)=D|QbVxhlp6vGJrrhp_zOos`55MeCp$?fsgVeSoYX^M zY?F;8nTz2G{{J|faSz7WQgQ@Rgy;)6kse5efNmTiPGc+)*HdX! zy5T}Zw0$O(P1yBNSqNnIP&o)^#)XDgqWzr;sdB<@3#Ft~R1sB7l~ARWnkqBAAL)p7 zLA8adps<}&)l?0op=zm01d0$&ma$5fAW(_`b{b{IfxPjVdg^`Z2=xI1T?i~fU@|s{xM8h@)W^iJjnoP1B=re( ziaL!zHv$t7&?7JvftgQh8|pLaym8I5)aTSW1V$k+8i6tEsSDIa>I($$;fzDL0>NtO zYbc0!GdRc3l~C8H?_M_NCiT6MkBJE2<1_McD&AQ_-J!4x`0ovVr~aVsAs`@t5SW6A zEfahbsfQHy2mej{geGW!z%&G=Bk&52T=Bn}t*wr5_ko1_=QKlD&@9dE=}PE;`WdF; zofgp+l~0TJWKFkbJsz?o%8GGs1mE=?1Z_<_Vjo1ErNy)@b&j^DaY2G{n1#S>3a+c?ir$U?BqdVxAEnPi$L>xZ^TfXDEwzG>lHt>pd}3UbHvv zIRtg<+O)=)ea&*C@>K*Dm^t*N{mjg0dud-|Q$eiisMm~h*L1r_#)OBs=jYhMW|O0$ z1Bhcigtb5#I}^BLMF$hdwt;DM2(6$)!5UoV&A`RpbTCK2hr9#5Y_w$WO;fo`OmXdT^5x6rM08;vu9^$2W009)QB z1U4hE1%a&yY(ro>0z07>l!t99DB{gt}fi~(zJJ*DZ8>Y<2pul z8(g!u=*uy=N>iJysnxdj3-AiPn2>CzXV5e0S@djr4n3EiN6)7h&xYJ$cHWX}eIY&KLOJ6J~2TMeJWE^rtfPr?fHsp+7_5 zqaL~w&oN?So7BxFrL(GQF={f)rqJ@i8a&S3=R)C8x~j~T-F;0Xffdl>8_ zF9;GZ_+{%RO~{OH^QpRS4WQL3{_BV7jKRC8M=f*WRJ) zig7O}?B7dcCj9MxCNwot2Qm#zBT<0BAIR8a`j5sKZ|0?iX*K*B;Y9Z`ZA6*zs&Bl5 z8DThIE~A){c=&vIfOX|)Y@o@y`s@x(y~N)j4k zxf*5;v%sjLbD4Pzj;T)&BoGAanS~gZ#Rx(pEYPiAMOPSES&1O|OhsR1HW*cO4f7ha zmRZO2Fulxr1Ste*1Q`Tb1UUqG1Vx*fjm#!yGqZ)+%4}n{BWQu3C4x2x4noil!NCZ+ znpE@yJ@Yp6E@le;gBt^X3qRtv!1wE+nt6{oD7=fH6@u2-T#Yz{g+<9H8TE6Z#7%ni zc}@I)Icn5I<|71M5ES<*A#^rF`ms^_PB15#PY|?4&;dcGXWF;5hWQlhj*%y9jaYYV zj3yn_h2zn<+73-;y%_c@&v}#bK*#@CdHU4xl9_OTnb06_bF($J=La%ZOt(k2*x9rgJ3QeVn}P4o=s*m zuq%CO?apSBSJ-S8Q->LAcNl?SWIuoT_+;4v1jBL3TR*ZWFtRRC)2!~ZO16kC!N>eU z?cV>WoUMJXY}fw}bvyNht!K4t1KViK0;eGug^yd%QHkcW3lJQR zU{Wu;h+T|eGJ+|_)WfMw(>_Ymn%vQbjrdtesTSL{o3c#&#@G1zwYpu?hV!KU2<2j! z9Y3&!UCFM-$H1;aFs+Au6~T0jobG8@!gWV!9nNKfuq|Zix`WcR?YdE2NmyeWv8xEm zF>P$Ge`5YQXO1Imui4_W%oaa^RvD8u!+b8rkf62Dv%O~f&oZO;x>1YYKrmm3d%^dI zg-2uG9})W0_p`g%w_j!)?_lHDk6@w6IBNTq?>(dP9Yj$1?2O-MKgPzP|G(uL>`C?$ z_LMQ#U~%$v13~OAOA)N;%QYZ=8QQO|pR-@QEYo1WWG@l!?AHhuA!zJYz!GDop+8h| z4Y$a>9xdDmBSi$oxNesGZ3so#Il?f9h76*+KUWv-izzyV5-RvMi$SP#>BPwfberfgbCcvQE=(JZGE- zcXxKQwrX)3>uE*EJ~W?swTXR>!iU4*=vnvDc>mm)b37+9+vR!AinHcy2n$Y36mWJN zt~u;FJ36{eC4ga-Ho>#qXp#*Gj=ab@a!#0V0O!oPU}7;hm>SBt(kBi7YV-8%2#!Fo z@j0xyA)I?Z)@=wjy@)mEgR$m(IX_NESib-@7ixrBk6`Qn59=2bu@}VQ z;;=x2>61hOeG{f1vadt0LVVnZ)8fW*KX3u@5)m;3D*B~C+Mdq#Pm`_oL>kKqIE3I2|Tdx#}@ge7^5AjW7Jf;}c# zdN=X}4+wYO_<{lAlih9<=yhX~Vp5v0Vh@pvQLMTqZJX90)=uWDVPcp(_k05UF95uF_;HM@iT1y8RTuTcKPfFa9`hexL`9cgV zpTpXKa z%-nb2REZyf;87v&x$s34@ZC%bKbjw7j0U)0b|1lG2%a%il|}3M@i;lp@5?$r&rncbSw+1b&VqwVU_G-@Tv zZv0-SPTAe5Yj2df|8IAC+}G%qxi_?G8oRLY#=B63zkA>?_gwr9U1whs!oR}LFqWey z5XAkiJEf{7+*qu44-wP-1hr-!51M)GA6-ZfFitydY7ycpHaxE0*p_tf!hGWQPVNmI zhMnbhivL1=*wc*lg^W{S%s8XuIOD`|LaOIi@VM^Z&adQG@vHe)`8E7&{91k;-^2Iv z*oZ$z@En5Y5xjulMFhV<5Ie9-2!4eiPWdix$M(JnE9Mq{D?NbU&hIcr4t}T6@^M=W ztLPO3ac65Df`20TmpPE&{#CWu8G8aF+Iz+qkU-BLBF3!i`*e^$Vm$v35WLpcrRP5+ zj;-fE;*azAP_HBSJ%T?zjmP{a{23fz`BVI91aBbtZ7=^RkHg@12;LM53w8B{-Qy~Z z!Nq+{54)s?~LMjna0hy2p*smN$%QZ7u9mMYCNzz=;q45J6*q4Van^;3uY$e0PZ0iOq|m@sdFe$VqOkuU2^U2m5+afm3ZK1qF!tiT z66U`Dd@?196%G53x$$^;k~S@mlMSqbMcq2wOV??;j0^M&n=DE*3Y#KIwMQh2NUqoD ze9cZ5%X_uT&2X^F+YsM1$dHjWNG~#W0O)M|UdEW`+vF;4*mf5%}Ot z-k%HL0=Zx=gd2uGm>-TmnNP(@a5k6AjpNpH-{4Q&6Y!VnWBBpdZ|Zr(PvsXHy#c=o zoAWmOA-Sh0P!u7G6D5i=MJ1vJQIn`y)GBHhjSzK;x_X(mV+&aSbA7`S^8K8S%z8;x6HH5w=A$!TGm+B zS!yktESoJ`Eyr0-u$*M6*IVAQyl?r)^05_R1+9213o9!t8!KBYg_Y83w3Xg!iq$l$ zSFC!iwp;D7+Glmd>X_9>Rv%lPwffxZywx{WKU@7_ZDH+f?P@*5+QZt{T4F7=mRUzz z$661yj;2XTYzEm#Y(j0qZ6a-=ZDMVP+N9fL+GN}0+T`2l3vE<3(`$c$av$_$~1V;tS#j zw$RqXR&48P>uKw4>uVce8)zGB8)B=ljkV3URohnBR@v6rje+KVg5${*3)u`*Zde?0>ZX-Tp882loHi z|LY)fuyL?;uy=5F80awA!OcPD5bsdu(CRSGVX}kZFvVep!z_n64*Gcx%N({lyyftY z!+wVY4yPQ>IDF>txx;zKFvp>enT~mm1&&I`QpYmK3dbtPF2^~JD;!rku5x_UajWAs z#~Y5{IezbW%kd}2pB;a3{MGSy$9s-{I{xkW(D9MuV<*B1I#EuH6XzsyvUIX`57eCcJ~8;>;4cS%HTbe?rE9Zmt82UK2-n|SAG;B5(2a7N=C;Vq;I`Clx!b=( zL_;ixSPu~oSv2IeA?t?p4%y)D?H=MD>K=}hulpX*gYsZJIFDH#%RE+itnzr()85nF z)6>)2)7SG`&tE-%_q^x%r`H&-XW`RaXzVm$-`Y!fe;=9xLqVIQp zmVS?e;t5_le(mzl(lf`hDeh+3%*`4}L%T-S)fVch~Q42_>M!`u@?Yw|)_;fpUjKLW{`>t8_#gED$p2&ilm4gt&-j1lf64!*|L^|) z`2XwwL<*#&)KY3K6-(`;4pJxS5NUukN}4E5lBP)0q#4pesY+TbEtQr@E2LU!r*xup zmUOXniFBECg>;p4y>z2=vvjL;yYzMG+tT-?r==IAUrN7{UY1^w{viEPdRwZ$BfTsA zP5Ll^39t_s9N-q<9^e_^9S|5091s!^8W0{38ITZ=9iR@V4X6)j2xtmu4(JLP6)+}X zT)>2YNdYSY4hNhLxF7IX#>&JpSDCL&B9qEwvLIQcELs*T8!C&JCCV~o#jPLY}s7de7$U;Y^7|YY`5%y?4azh?1=2B?3C<`>@(Ttvh%Wwva7Nm zWq-<^1cE>^kPc)6#esH#4uMXA&Vd61y#j*+qXSa|^8yP3m4QWpC4n`8b%70mO@YmU zt${NF-w1p!@Vme}fqw>(L6$+*LE<30Acr8=Aon1zAfF&fkTfVXNS_dt8B`Kf6I2(} z5Tpxg4H^|RHfTc7q#z+^O3<31V?mz>Jq#v;ZG&BdrNN=W;lYu?(ZR97$-!yCnZen? zxxx9t>R@efXYhpJNx}MH6g)L}Zt#NO#lcI0mj$l~?g@T9_}$>6!5;=64?Yq6N$~mL zFM_`cz8rit_=KXGvt9{ zh$2dns7O|%DKZo)g+@`YXjC*S+7um%If^BU9>p7qHx+Lw-ch`(IH-7Eaa!@2;+*25 z;*#RB;)>#$;$b3UdonhSh}Cg*Alf!dk=H!)AvW!j^@t3|k$xE9_|4 z>9EhjJ`Xz=b}{Ty*!N)%!>z(?!fnGH!d=7t!-K+O!jr-)!t25(hA$3Z8{QkfF?>t- z_VCxk4}_ly|2q8V@Vnu^hu;tXJN%#U#}Occig1i@ju;f-8sQ$H_loe1@Q;v11Vuze zBt=w2bVbaJSQD`~;!MQX5tk#KBi$l>B7-C2B2yyMBeNoNBMTzSA}b?nBI_a>BAX&d zMUIIa7dbKVk0>GvMp030)cB|wQM01vM9q(S9BmP86>Sr37d7}u=3&gESUy%9Yaik{i8>lN!8>mM5stBRcx`$p_Lv4>*M#_F%c-i*B!dpq`* z*!!`6$Nm%hIF5+p<1FHAO@#^@B`0DuDcx`-B{HXY` z@e|@F$D{aZ@iXFQ#lI1MP9Ohof?t9>Au1s;Avqx@L6x9RXiexy7@II5VN!xVVP?Xb zgtZC12^$l(By3CAk?=;su7uqQZza5)a5Uk=gyRV(6Ne^dCT1t*CKe=~O#CA8QsUQ% zSCVRy+L9(F>64};O;4JcG$(0((xRkwN$Zm~C2dXGp7ci2n@M|;_9p$AOegF8lS`Aw zCofBWGx<>Rx#Ww&2 z3(^*+ElpdI)|0j&ZFAbTwAa&irtM4nAnkP8&9vXs{z-eB4$`S~HeH-YV)32moPyaUk`}7~vZ>Qf&e~_+! zl>Q_GWLRg|XEmSzMH#PU z^ki(v*qpH~V@JmMjO!WSW&DuwQ^uW)yBYT~K_-`Jk!hW2o9Uc6DAO&|BhxE0FS9XI zpE)ygPUif~g_&zIcVzC&+?}~Mb6@6x%tQLjBblFNp3A(Lc`5U9=GDv_nKv_k$h?3$apS?7DMfU3K*Rt1Tzn;A>`%w0g>|@!-vu|X7mwhM4GRHPY zo-;H@pOBN3lbWN>X~@y#wB~f=Ovzc0vp8pI&hlLA+yS|Pxr*HM+=ASRxhQu>?z_3) z=Kh-dd+xp5zw(GYGLOmQ@`mKe@`CdedEt3cc`imlQ z>ipV#ZGKaJOMZL)i2OvM#bMawr;5G_c6E$i2v` z$fu~VsJf`BsHLdAXk<}$(WD}wXll_bMYD?L6fG%QUbL#{)uPQsZxy{$^ls6?qW6nF zDAIpgbh+qi(T$>;MYoD>7yVN7PtoIIP)rrG#iC-%V(Vg;V$Wj#Vp(x;v7$JvII(zm zaZ+(gac*&4aYM1LxV5;wcx3VT;;F^26wfN2TfCrnQSocVJ;fV}Hy7_O{;2pw@u}iZ zi!T>nFaEChhvJ`$?-u`Fe6Pf+#Ir*wRB_YmeTE|ua_PxJzM%^>DQ%KO0SpRD!pC$OX+W=f0RBd zeWHeHN^PrlS9_^_)&6RkI#{hxhpUs-Y3fXMjyhkhR2Qq&>T-3HdZfBbJxV=BJx)DE zJzcGzsh+K#r(U35q3%_0SHG`5s{TlQLVZg8srpOxRrL+^P4zAHPwKza57qyc5oK0o z;xhX(r!ucH-!lI)Sy_Bpc3ECoVVSDzld@}NcgpUT{Z@9b?B8;toGhoy2bcSoOUnbw z1Ive%E6dx;XO_X-g;#}d zMQ}w#MRY}6MSMkKMQ%kwg{q>YqQ0WBqPe22VtmD<3ZY_Z#j=X^6`LxyR&1|0R&l)I zM8&C!GZkM{d{yyH#np;im3EZ_DibR+D@Rn0s$5;UrE+`a>y^7I_f+n!JXCqK@}tTV zm7i38S*ib~@>=D$mA5KySN>A@Yvpg153ATJ%PN~HyQ%?I1FKxChEz$a!mEZ?rBtO? zWmV-?6;!FJG*$IgjaAK6ZB-+xx~fK1t*AO!^>x+5YU}Et>e%Y^>a6PA>Vj%jbxCzu zbz^mNbz5~u^~mb(>M_;hsuxxtuKuSP#J2dAt-)bJ#vbCaGt6FibeXV1yXRTMQcdc*j(Avz} zoZ9?aWo>b7X|1-lp|-JBS39~E)lRFOQ9HYKUhTr#)wQqH_SCMg-Bi1!c3bU{+8ecx z>n!T5>ul>B>IT%g)cMv0)CJXr)J4=q*TvNh)7O>Oji{ScH>GZR-ORdqbqnhZbxZ4Z z*1cDEr0!VV@w!uWpVoa|cfRiDx(9WS>YmiYdb*yicc^!)cdB=;53Y}^F?&#N!2 zFRCxCFRyQ^Z>evuA6egBKc;?M{e=2u^}Fg%*5B09T05<))?MqR_0{@oW!gw>jCQCt zL90*FrfSo*o!Z&j-P-RP*aoMDAq}#I;08rQctcb}Y{RgIgoe6?84bG{jy7Cxc+dzN z=|-+m)HtNkqtUz3uTk0<*r;i2ZtQ9t-8imsVxzthHO_Bb)VQQ^c@xH`0YszfOY07V!*|ex>i@xcTrZ1cBHvQgozv=I$f0`cafR56!I+4yw zC)WAt{B<&2uuh>1*G1`Kb;EQCy5YJMU7D^|H&VAyw?X%w?i1Zr-5WU@omG~lG_T}irds}6>XZf`nJY4UE9RA>1~VKmba~HThrFtwy|wX+qSlSZAaS9 zw4H0a*mkMyO563e@7lg^d(h6bTeMrZ+qOHkyR;8(cWaMpuWBFHzNmdw` - + @@ -78,7 +78,7 @@ - + @@ -96,33 +96,91 @@ - - - - - - - + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HackIllinois: QR/ScanViewController.swift b/HackIllinois: QR/ScanViewController.swift index 146c92f..14d73a7 100644 --- a/HackIllinois: QR/ScanViewController.swift +++ b/HackIllinois: QR/ScanViewController.swift @@ -15,9 +15,20 @@ import Foundation class ScanViewController: BaseViewController { let scanner = QRCode() - @IBOutlet var add_event: UIButton! + @IBOutlet var add_event: UIBarButtonItem! +// @IBOutlet var add_event: UIButton! +// @IBAction func addEventButton(_ sender: Any) { +// print("button clicked") +// if self.check_permissions(key: self.login_session) != "ADMIN" { +// return +// } +// +// } @IBAction func addEventButton(_ sender: Any) { print("button clicked") + if self.check_permissions(key: self.login_session) != "ADMIN" { + return + } } override func viewDidLoad() { super.viewDidLoad() @@ -28,11 +39,11 @@ class ScanViewController: BaseViewController { } print(self.check_permissions(key: self.login_session)) if self.check_permissions(key: self.login_session) == "ADMIN" { - self.add_event.isHidden = false +// self.add_event.isHidden = false self.add_event.isEnabled = true } else { - self.add_event.isHidden = true +// self.add_event.isHidden = true self.add_event.isEnabled = false } scanner.prepareScan(view) { (stringValue) -> () in diff --git a/HackIllinois: QR/ViewController.swift b/HackIllinois: QR/ViewController.swift index ab2ce31..6afef84 100644 --- a/HackIllinois: QR/ViewController.swift +++ b/HackIllinois: QR/ViewController.swift @@ -63,14 +63,15 @@ class ViewController: BaseViewController { let image = UIImage(named: "hackillinois") imageView.image = image navigationItem.titleView = imageView - email_input.text = "yasha.mostofi+vol@gmail.com" - password_input.text = "qqqqqqqq" +// email_input.text = "yasha.mostofi+vol@gmail.com" +// password_input.text = "qqqqqqqq" + email_input.text = "yasha.mostofi@hackillinois.org" // TODO: make it so you don't have to click the log in each time } func logIn(email: String, password: String) { - if email == "" && password == "" { + if email == "" || password == "" { let preferences = UserDefaults.standard if preferences.object(forKey: "session") != nil {