From 314cefdc70442df33d2f284ed89e38ae56ca9bec Mon Sep 17 00:00:00 2001 From: Lorenzo Iovino Date: Fri, 29 Jan 2016 19:10:26 +0100 Subject: [PATCH] Aggiunto layout home --- hackatonApp/scss/home-items.scss | 179 ++++++++++++++++++ hackatonApp/scss/ionic.app.scss | 1 + .../scss/sidemenu/side-menu.styles.scss | 11 ++ hackatonApp/www/home-categories.json | 22 +++ hackatonApp/www/img/icons/park2.png | Bin 0 -> 1849 bytes hackatonApp/www/img/laura.jpg | Bin 0 -> 23890 bytes hackatonApp/www/js/app.js | 84 +++++++- hackatonApp/www/js/controllers.js | 92 ++++++++- hackatonApp/www/js/factories.js | 1 + hackatonApp/www/js/services.js | 2 + .../www/views/app/addTicketWithPhoto.html | 35 ++++ hackatonApp/www/views/app/allTickets.html | 38 ++++ hackatonApp/www/views/app/booking.html | 35 ++++ hackatonApp/www/views/app/category.html | 48 +++++ hackatonApp/www/views/app/home-entries.html | 34 ++++ hackatonApp/www/views/app/home.html | 29 +++ hackatonApp/www/views/app/ranks.html | 35 ++++ hackatonApp/www/views/app/shop.html | 50 +++++ hackatonApp/www/views/app/side-menu.html | 35 ++-- 19 files changed, 705 insertions(+), 26 deletions(-) create mode 100644 hackatonApp/scss/home-items.scss create mode 100644 hackatonApp/www/home-categories.json create mode 100644 hackatonApp/www/img/icons/park2.png create mode 100644 hackatonApp/www/img/laura.jpg create mode 100644 hackatonApp/www/views/app/addTicketWithPhoto.html create mode 100644 hackatonApp/www/views/app/allTickets.html create mode 100644 hackatonApp/www/views/app/booking.html create mode 100644 hackatonApp/www/views/app/category.html create mode 100644 hackatonApp/www/views/app/home-entries.html create mode 100644 hackatonApp/www/views/app/home.html create mode 100644 hackatonApp/www/views/app/ranks.html create mode 100644 hackatonApp/www/views/app/shop.html diff --git a/hackatonApp/scss/home-items.scss b/hackatonApp/scss/home-items.scss new file mode 100644 index 0000000..a6edb8e --- /dev/null +++ b/hackatonApp/scss/home-items.scss @@ -0,0 +1,179 @@ +$home-category-bg: $theme-color-3; +$home-category-color: #FFFFFF; + +//home entries +$entry-heading-color: $theme-color-3; +$entry-title-color: #FFFFFF; + +$entry-excerpt-lines: 5; +$entry-font-size: 14px; + +$home-categories-img-ratio: 1 1; + +// Merge maps +$pre-img-ratios: append($pre-img-ratios, $home-categories-img-ratio); + +.category-homes-view +{ + background-color: $content-bg !important; + + .category-homes + { + .item + { + padding-left: 60px; + } + + .item .thumbnail-outer + { + position: absolute; + left: 10px; + width: 40px; + + .thumbnail + { + width: 100%; + } + } + + .item .title + { + font-weight: 500; + } + + .item .description + { + color: lighten($content-color, 35%); + } + } +} +.homes-categories-view +{ + background-color: $content-bg !important; + + .categories-list + { + @include flex-wrap(wrap); + } + + .home-category + { + // THIS IS FUCKING AWESOME: http://caniuse.com/#feat=viewport-units + @include calc(height, "50vw - 15px"); + box-shadow: 0 1px 3px rgba(darken($home-category-bg, 30%), 0.3); + border-radius: 2px; + position: relative; + display: block; + + .category-image + { + width: 100%; + height: 100%; + border-radius: 2px; + } + + .category-bg + { + position: absolute; + top: 0px; + left: 0px; + width: 100%; + height: 100%; + -webkit-box-shadow: 0px 5px 10px 0px rgba(50, 50, 50, 0.5); + -moz-box-shadow: 0px 5px 10px 0px rgba(50, 50, 50, 0.5); + box-shadow: 0px 5px 10px 0px rgba(50, 50, 50, 0.5); + background-color: #FF4C4C; + } + + .category-title + { + color: $home-category-color; + position: absolute; + top: 2px; + left: 8px; + font-weight: 500; + text-transform: capitalize; + } + } +} +.home-entries-view +{ + background-color: $content-bg !important; + + .entry-heading + { + padding-top: 8px; + padding-bottom: 8px; + background-color: darken($entry-heading-color, 10%); + border-color: #000; + + .entry-title + { + color: $entry-title-color; + } + + .entry-author + { + font-weight: 500; + } + } + + .entry-content + { + padding-top: 8px; + padding-bottom: 0px; + + .entry-excerpt + { + overflow: hidden; + text-overflow: ellipsis; + @include display(flex); + @include flex-direction(column); + -webkit-line-clamp: $entry-excerpt-lines; /* number of lines to show */ + line-height: $entry-font-size + 4; /* fallback */ + font-size: $entry-font-size; /* fallback */ + max-height: ($entry-font-size + 4) * $entry-excerpt-lines; /* fallback */ + + * + { + font-size: inherit !important; + } + } + + .entry-actions + { + padding: 10px 0px; + + .col + { + padding:0px; + } + + .actions + { + .button-icon + { + min-height: initial; + line-height: 28px; + padding: 0px; + vertical-align: middle; + margin-right: 10px; + } + + .button-icon:before + { + font-size: 28px; + line-height: 28px; + } + } + + .read-more + { + .button + { + margin:0px; + } + } + } + } +} diff --git a/hackatonApp/scss/ionic.app.scss b/hackatonApp/scss/ionic.app.scss index 4b2ed9b..d72674f 100644 --- a/hackatonApp/scss/ionic.app.scss +++ b/hackatonApp/scss/ionic.app.scss @@ -56,3 +56,4 @@ @import "scss/forms/forms.styles"; @import "scss/settings/settings.styles"; +@import "scss/home-items"; diff --git a/hackatonApp/scss/sidemenu/side-menu.styles.scss b/hackatonApp/scss/sidemenu/side-menu.styles.scss index ee0c2b8..598e0c5 100644 --- a/hackatonApp/scss/sidemenu/side-menu.styles.scss +++ b/hackatonApp/scss/sidemenu/side-menu.styles.scss @@ -42,11 +42,22 @@ ion-side-menu ion-item.item:first-child { border-top:none; + .icon:before + { + background-image: url("/img/icons/park2.png"); + background-repeat: no-repeat; + } } ion-item.item:last-child { border-bottom:none; + + .icon:before + { + color:red; + + } } .heading-item diff --git a/hackatonApp/www/home-categories.json b/hackatonApp/www/home-categories.json new file mode 100644 index 0000000..b0eb0cf --- /dev/null +++ b/hackatonApp/www/home-categories.json @@ -0,0 +1,22 @@ +[ + { + "id":"booking", + "title":"Prenota", + "image":"img/feeds/news.jpg" + }, + { + "id":"addticketwithphoto", + "title":"Aggiungi un biglietto", + "image":"img/feeds/sports.jpg" + }, + { + "id":"shop", + "title":"Spendi i crediti", + "image":"img/feeds/business.jpg" + }, + { + "id":"ranks", + "title":"Classifica", + "image":"img/feeds/entertainment.jpg" + } +] diff --git a/hackatonApp/www/img/icons/park2.png b/hackatonApp/www/img/icons/park2.png new file mode 100644 index 0000000000000000000000000000000000000000..da8de81b24343178bd1d54ce32d335775fb47134 GIT binary patch literal 1849 zcmV-92gdk`P)j zHZjITUsO$B5!0bb2_s-Aa0uw`;6u=)_#>qu#eNnHfdl|3r4|5h0A+djwMp@!r6frSB>-AU z*qBmV0vzG;NU6@6lsE#q0Ox^Rf!eo8u_NVlf!b?>NCE(qQpbV8#pw>9Njc1=NGT{O zaS?D6urtE`EN~1Mn{vPWuu1VEr8*T-L?lpv-oS3tc#!-B3^2MYBJ>I+Ex@n9yTD@L zHsH#z@q~^uVBo`mx6yMyssk@tHn(IzKpZJg0Jp}G;vam@JXx2D{|I_BBnb5)Qe%BDY6MuHqloVYTqx{sUY<=d%5gTE4Iv1Dqo~ zq_$bQ3Qb6{ra*<&_Hz+>&A^jD|9oGEt0J7Q&L{ykVb$`$ClR`@xePq268tUTHxF68 z0qz%(3)c6jDX=_=V}Bhm1eg|~f84PXX~Rx{<-pJg-Cju?w-TU~>Ib|E^o-D-tuzJ$ z4qngam7F7ja7n*g^s*faox zU6bI5z_=(K_!FQ@@zo2M;o>|8JdWPdD%BHSI{^*_20GX@pf^HMN>wPO`h;rw=EF!} zHn0*sHR{QJ3fSB4_r&Pd0c(M4jDA;iiT^LK4jAUNCFZO4MgenxRlqiiTm1>}3osm= ztoKIfod9}Seb1pwVO!@S@D6aj69EyVi~;5XtATHdKuVM8e3Z_7)4wucDNq}u{{=AF zWx)5Mi=%!qq>M$s9c{+j3E|=5c{lEnCwU)NmW9mZea_C5@L}%_w z;0B@#t@hw<5!tMi8iszK>E~ecdfe0RL;RDhMV})q1*QUhBK+lm>(H;>>wxdj2`Y^U z*bekG?Tka0?Lm6=hM=`TdDP&q0`}zDnHu0D;2B^#&^LyZaliuLCG_%jHqUlb_`1>8 zUSP8Jhu-tRNeaJYC6N~3An+cr1c#d-=m+_?&(AI(7h4IUkDC?|Ur1yr&FBhoBd`#d zf?i%b0e7Nri3Hg_)jQ1uQaVQ2Li3Tx3aJ1Xx5&0zLr#D}lkd zNF#drTLavMOAc@(VkCP1FzO5;YqQFa*EAtI+@Es7lh0TEG#ejSdwm*675W6lE-wVyQsJ~E~PU*<``!}+vX z@FbW7BC=IPrlVJmP3YHNSDeVF&5|O(gNRg%$UJmm^)i>XxuW25X4nRqCBY;xmp2|Y z(mzD44!BlCP9}1m^}J7*Bf6vSG1m~B2bOi{91sT)IWHm`&?ioFxcur2K;NW3JH!-- nf>P=Z^jSj>^Z{vY68rxFw3gX&K`Q6|B-pAwqb?-fSpX5A}bMiRPbKW_x@qFfD@?sHi>$Qry3V?!w0`UIw z0l2^bY?b{SYykjGO@JT(0JsjgLcsyJdfB45tcnzz|I=2XcnF~SU+-T&Q-}d5FWa{+ ztJY<`EJ-;40M+{c_3CEn;Nm6XV&ir9smK$NXMl?tfD(X`g5tmHe;2B&RR5K0SFTW9 zrM^Z@{a?LKLrZi0`i<+<)HmpE+@QUAS*U5~8R%}(|JVNSOa2@F->A#$=5^}p|MmF) zRxbVk7_U=YqoAasxDTLYq@ZG?xaa@?FCksMT$TS8=6{#V9#^hjyPVPu+RF~rw=Sno zMMZfz*{fHsT=ovS{2XwF@ha0ju@~2F>sV6XcfTVZlJM&~@5}Nw=654FK8X(=p)@yG zSlQS)_#X&7d?ff(@|l#hjI7ctWffI5_1C(3`UYS_BV#LT8(TYj2S-mYZy#Sj|A4U1 z;SrHvqM{R%z9pxmeosr!&dJToFDNW3uBfc4uBol7Z}{8Z(bdR@c@yHu3uhheyXJgwwPCa8UrL{!du{gY5r-i}4Z{<>ek+q5cmS1*Pw0rDD8t z^`6)@rWZQYmhQLji-%ml^D^OAc^eI{#5)}G2ak~(EPPKf{P_Q%{V!zy?|_B=|3daZ z!2WMs(}0^)6qlPv#Rvca{xDK1Zj$x?o4M%W4twj~ z#PCxzQn+RG!AXX~or5NP$gVhbjpuZOD2vlH^zXuz1#>5+=f!ZvpC0{%+f`2J6^kDcGTc{MdB}oW&?;2aYSy}0 z`_DcR-kP}2x(g4bZ}dw?JYjX^e)4QzXt)JH;!V;T{a=4>K&J=J(_l_<5jEUxpyy%TxqlFtzxs9#Rxu?M5EyG z%eCPaccy(aBYE6*2LYsI$W`KYpQSg1JDz?aDWDbazqkODP+>-6FU$n)fef9GIg<-%K}R)Y>hPq6`Nbow%+vPc(`MGy{~vn z@k5vM@Ow6F($7DbT=N(F;IHE?a!ev4GC4ywb z;FNQd&Qhnee_6y9oiI#8g<;PYIPda((ZeYv>==TV>ZqSFMwhYt8;9*lnwfpp`F$8d z{|uQw4C0w@&m~FJ5R9z2I}4_Ek8Ih=!%eW0x3|ZXXek*AeNMk0m|DQB#;b`@=_;+` zWuR!2sPB)1my`Bk@2`634CF2dv-*T9;1FUAVIOqk47rGE zpL%LDn`6elesEhTX?Lb%If%6@Jtdq8k@=Se%aFPA2Q_+7*4hr`Y%;TPivxbi)42ec z8MP|k1;f6-MHp43D?H|Y?Nz!R{E487iO(ox5}DD9P+5sCO&bcyUi_5hL^925-HGksRh}b+&za#a0HKNICVwo6x=+8e33$09 z>z#9NlaCiPFnS!{@)k$k+eeIJf}ZBKNZd zctxm7a?V^Gq-iLB0Q~jd5GsnQwOM4Cne=P4X+}@(DwuV{6i?q-fd-p7hL(i0s_kE* zZn$v9zI(-P3e;D4afDPXEwA%+M9UTF{+)>1fXi=MR2pvvSc%STd-L&L@B0{Ox0G80 zx`AK#0;iC?07NDX1zNh&=h>&tr}VV~b;g44f~PnN+Jz;+R^Gn`8#J-pJCrg`4$wt~ zJH+_3GHr`tjv%G&6R{qrqKEgOA@KEu{oz2c0fSW0Yh$^xqRhJ38m74P%Jrc*k_1+U z&#e6<)c90fDEN43 z%IB#naj+TXJa@2TDiS4UXi6I3l;H9&2PSGCm(Tnr3C$v3rwGF3nVVn_zHMSwdU$t` zl%$uDoo`mkznF^lb6GJxT6ZdXTj1I&v-Y4xgJ6WGICNUJfqWklioY5pv$%J=bLqze zxz8WPbP}QoBwN<0H?M-8F);5~6;-Y<>>_ynGa_9c^#x#>S&3fYobjW>w}66`?59pq z&+d2k&oSRA2Yo6F!$h|CGzBg_4L4A_;^&~YE-?!KgC3do{W}1}_ml*i@D(uG~W8}h=o5prbJrM{e~ z*5-31u3xnVqEg@3IC?mDjoNC^?G6X(jYq+u&*fDa{Xs!^q(5*Ln& zl_Y+dz`pZI5&nlsP@S_=cvAOR?bP=PiqAkGnglL_DB(34EW$CTe^;@3b(-ZS%EMI- zW6QDEHv1WHA?DFB-lzOdN4xp`D9!D5jfh9ka}?W%T}=fgXvkeIAZDENmB9<8PgKP4m|-!lRDO0I|o$ zsU4YR9+ESw?pvhM;!{u@v?0yzJ4d<)=8XpcjgKz?Qw58pX_XlI0^#pYTSd>+OjZZ} z#>Frm?Nji>NJst*jx+2T14?NizGGsls|1W8Q@#;!+b_GC=VSkN z`H^a!A_;VzF2-$~js$J${E ztLNTsOf=e#K0VbqseQ+I0l3YXx7e+|n9a3Ax4+1uAT-n>y)|(rj2Q1o4BlkY$qfA! zFRhd1zRsXQME4Hn&LV;?$IKV7O?989E_Dt>hVx)`#$>J-b5_N@$Z}Dd=xs4QYRmN<~qM~({97UGEpa7!L~kcCR@=?ymYfn-#!mrzj(56 z)BBO`;8>ZFlIH>F8wj8-Kt3(afJY9Ss8>Vk!NflK#>mxA9EX}#OIcBpqrzpe|Lh1& z6~xv>Ef45kf}Rz=_%tx}O(OH4U#uv(7la6^me=>@wz67TiOhRsB$pYU8a8q5Ml9Lj zMLPreH-ack)nD!Ut!!9d6%E9gT}712_LlHzG}gD76~O=4);_hM&=#Uvkx-!ycGrFE z`DR}B(R){1<{*4=^d5lJT*vKX36ZUNvNKyM7x(D`AiGyJL?uqOpVgdFWzuFjO2>9` z>NJq`zAQke&jlvfG>WCEa@J~hyyZ`#^9(qN#5TZB(C<{)Fgb=X63~06=xTEUJETS* z=Gr1=npMBJcW*{)ZNBQ)ccIPxlJ^|)6DXaGzfxqMR8Hd_;G6@kB7UJBnELu?;qwKc z%6lR+AtE6+?z)5XkC=}~*7Cnkrs<`-yVREUAcBgvK+*DbC-_*E?`Tj@s2E6hAO#XH5txB zQ-n0|s!{gN{o`)H`-874TGHI?=FfB-XA}lM_T5OYUnVn+|1%o3U0<hmg&0)6|>+Bo&~WDWU@Y~zp?P7 zOAb6*xBuc@R6aLxcF!7;goRDhYtsa`?k1SJ{J%aVus7OTc@InRk7jVY}tMamu ze2P~R-F~A~O8-Kl6&@Lilw6x=vf-;gUumz3%KE&x1I!DGBwnZCY%^XhW^by0@G1uA zt^Ft~C?5NtN- z!37|E18;ut4*fs~6Lgg{@M7?#x#?GlTPU1Lq-zno&Pj!0CgDfU6I@D6{`9wK^=!2} zJRxaUDtfhvGS@00K-?K=;bYbQ2VfFkIu{D>rc~oPgHJP&MrpSFg-T`0~g6K=4 zD;~KF^rpC8Widn9rw}XsAWIxMqYM7NZ>4JzWBj%$OZ+80b#D%Fd~M;5JTxD|jN3AL z@zkyFo^PVI7-SXxS8{GWm$xdq3tn-JCrfNy0Jxf*k$#E0M#9@Wh^&df;~q?7YHe;bWZ}jh`F(Z1 z^kWbC{4zz&f$49)2mA7~Ge9oB%k!?8@n~&Z!MTt;GMzz)aC-ZDGqo(mO#+gTEpN>( zaqvW3-lp;d8?VppbjY!KU7lj`>Atb07;Kv*9*U;;XQW*k*T~u0ERl}aCI|rkXcNE} zfGZ>cmx+AZ?vL2#VuP!5_1YupZqNmk;~AB9WhBbtwv}e_w00yawUNze(u>qve^!A` z%bW<;coQeN+qD6SFRh8qiF^m|IO2t=CbhLPEWPWydYlJLON0x5yK5Ih?q;W|x8bHh zW-30KQd)ANjdL|k@VZ>2jm@s>wn>&>z3118L{!w-g|ohQDV7qF^EDL`0ujBo!7AeJ zT@*mmB=VrpLB{a{p}-$6+Ueo&%=rSqr0}H5t*w!Q{<4>U*p^9&3RZzr0n3d#u? z=&jFX2@_ugj|8N4a86Y%Fmy}=nDTzOV^PUXeCbjM?3FRE3Su=IU&=nFWP&h z{XG5=iEx3(PfLcf0x~5dKmUsT9M4uOYB^t1wQ$9M_Hkg)6Nv%e27wSuagj+Ke_;DW z!vOD}z_sb(+o2w;`C>+6sOqup_LZK-$$f+0=xd~Xb%uhnD)km;s!gp*Xi&XLkiG05borzTkk6bIgW0#Ze%CfT!H@jaqC`Ive{LwD365Ms&SyH(? zQ8PU_Pby`D_X2>5Yx|=PnoIc2xj^0Q9xxRCtprlw`x>)*C5v(56~1c+C?sol?#Pp~ z6^kAI8VD}Xox(nnmDnjL!t(3V=;)gO16~wEZ8qQb2qIG|f>OLeUe~01NZn`PEYe%t zfuCJR>hHg$10UM3hbjLoj_lTRcR+g_&A5^-Mv?}>##L%sam4L+u18O-Yr=EE3&1-? z-SrpT#Y3Gz`emfsm<2{=+YHqoRV7DV#%jRbP{p4iyH_F3*JYW{zrnJRI{JA7K;6II zCDPOChh3;Cm$2C>#*>5yqa4s%iKAQUX-P(1SN#VP1nfaN4jnOBu0Zyvgx-0PI7mApWJqz84lZ}0ap&tkyqk`L0 zEgXcbH+R2QIwy{IF%Sg`_K`oUxQ!%(WMv{2`+weYTH&U8d%!fm?N&i?=TnyYw$nO8 z82PT$w39NgO`3nXHcSbAEisr? z^w|uV#stfsgn2b>ongK2YE}1Q)aM59oW7y5@U_21wNtUi>1@qwwi8XbHA&;kmbpNr zdgb|Ybe6j1NevDGJEbll6=JNeVVYqu(yoYB#HX_S7`xNTf+9pqKQn#>0e)dOH01bqRx%1p?beilE^RrS5<-<#u@(V;!-w&~9> z%!?jwoDk;8;fir~-on0OIznwU2CfGYCc2V5#uVlKHV);0vNM`dG4h&W$9}B$^sq3o z?wf%gfYX;_7M18f(j@1lAsRxk^mkOL6K;C;A=l}x@I)O#$!}1&?kI$7*i4~gCVgo$ zXmHo3Qc;RW`(<&ShoAD*h8<*K>mt0Bj(4mDM0#2mGhh ziPC;T+h-ZOBnDZ$AT^LBUZM^zt`_Ow!Pkta|%AhAQN z{aWG^c?FDeqW&rU_~K2lH)e=Jcyvz;slkw%=iq1cSF>4bp0E*pc)4@(s<%#^X!KT% ze|XvFdQ4k{C=M1kLL+}8=6Kr_HJs`>WxAIdV?cC*#U#Wb6~a7Hc{*%)<^n)bCIa?s zOfBzG!gvcEJOqX-dt*9z!+~GQmK|oO=gtLb4y)hKfo_c0i@e$O&o9ArQt!h4fW;65 zli8HPw@A~!33kkw6gp<(@clD z*u)vp9+=2|iK?0`T+j17=K>%m<4{%=QDOj8kE3>*t_MhhgtZ-YQV%W zH~+LI@evX6z(`zs{0=eH=|R`ku_lnWRY=Q>#7nu~Ab1h>DD zRU5cZAvOgu^0iQa*bbj)4qV)eic3B(jYV1aGM;}~YGPpb zc_^Fr*}q|zlkT2F&-EiLwKg)|ZyKv3Mh=%MDq!$x=58auwv<7}W7s0FH~Q4odMM|t z9c1ltxa!xk^WHD1U2MTnEm0)!@B*M%jh-1C6|4bqM82&#V6Is_4+Jl~&a^HYl9kLf zI_leD{L1KgR7c7Pb8Y?L$V2Q3bTn&x--2`-je&n@p(puQ;%e%h z_`po2ecT?Odn_WhJ0Z^H{z*2E8lC80y`j;thP>zUfK%=d46}-3xF`sJ^nu$t_hQ$65>w<0GEEX_g!G(pYd-_#F!rL z$?x+&mLVZnIzi4j==MnV%(Uv44lS_;(6?=Y^D+*lxz`1xDkKuRm=$2ugkMea=kk>U zxBI%kvgI^oX?2idB+2Zzp+2H}&cbsOOikzeXQpNTN)tDPM_2ltvPMpLOI){~125gs zHnA#QV8qX{{G`EzkFFma_&yB5sB?LR0cy+LD58Z!oR+pXmP-Q`Z<`v^q2kxEt`_D%hBZCww#@^eN10mKTwsgG_E z(dMYlu>0A5{P6kuuDY#jr#h(w9^dx6QFS1C_^Wyl)ZOh=*!^BItVjWrY;U+RQ{Grq zR?43&$2)xd;BkP&8yD_#nHM@VO90}fS~CL)v2j`RmT()eZ7)fId_QJQ6G9wa))T(d%$<17h5{gc1Kvq9wiVT!76~m?Rd<(>RVz?T znXl={*WG2i8mHeaJkNbx8wZ7w@QP(AjpRMr;dJ+Xi6SQ+=u-2o`VK! zlaYMSl9u$W)0iTNWK)Z?jggN~K45d!ryDy1qm09xEI3GSx7pK-a30Wc*z1%1+1m*J zf$4{*O?_NN)z^i3k_e3*9QsF%wwn*E(5AUq?V$DpqIh3l8L($(R%LnV{T&Q$ao z;artOqhkNh)>#~rvsr?|%v@#zRE06UXIzJHAx)k+`aG@#A)1;9KuFd%aAs$jR{6uB z=MRyhn~^z3QSjllNY@E()3f&mxg)1h@j{U}EyS9M3gTo8?fQ`%u+}0p|4XNC>W5#n zPx8o+UyPc>Ov5%v%F|qQ$q=oHF5`nX@_@KJVgFh}8^hrd<`U*~_`%_g+LLZY3kfRn z8TM?o33B8yyrybK#6A>x2|9UZ-d5ClnTaP7t2S+B1xF97qPSb6@5wuVPVaMZJ zB}N;#hV#_d*5Q;Md|%6F{}3}N$h}3Inn8%mXd74Q1p1u*E#q}igixKHui0OT3&1ZS zFbYKfl;CY9_~?#*_|IsJ-&|wLrCab5M%-*!JWt-?9hO(X(z2!13=~u^@eF)b3jPG_ zYLMXgr?VWG1Ek71eYc*R+)2`G^dU$V&$&*cS@uO2_c)-h zX9*^S;znBrmS2dEYv07r*h~pxkIKMUZuC?OBb$=DWTpq>7CDLSGSls}wlTJv!@PU} zUU1(dmWemIF z3=-C>6SVqxBTA)Rg?~2C)9_?H{~4mM(6`d3G=os1G9^Qz;1bMIb0j`BLEow^js8k zoOQQW@8FK*^3;LMk!0HzS?VA8_J$BgMMkKHn~asY6M_^xE?IEt7S+bHbuX#Y^mGP! zxp@n9zD%rwN-W#O=e;=4oL3!5FM#o;(B(zeT$3=j!qWNfh?kCJs#DS2B8HheS>mnq z)RT4`V@us$Cv^o^Pi!2te#t&y)+_Ov^-~byNDKVM*=K9V)%Jn=XCN&02wS$v;XDSF zni0l$A3g@NkphAxR~FctMh{htXvFzY$U;>e1rgr*Vy!(8jGgn{N!3O zc2((=V`Jx6OqcA{t~A9t^rmgK?uo%$?KD>O=(^LIzuApwC#&J);`ZcSf0me%?gS<1 z$2aDNWj2=@0pX<~i}o{gwnb1z2Zxtza*ThL#~x}~4V3I}kZ0+=ICM*`K+#&bD?s)F z;6-KwhI`LbqIpN*UN-R=UJLS<=2m1dfXtJ1v|&)-Rs8(m$$nKPpMB6zrTw6Mj1Q^q zu#>rIo-0D-aan(<$Bm$W3eAP3K^3y~e8D(BDzL6Q`%TJjia$q4?a`I_kkneB@u}3Y z9pO(4|M1ScB^9T>cf84L%lKh3=wC|??tEz4nGr?tNiyYHt89Z}DkIDIz#okSAO;1o zZAv|k8&0tswbiNJ0lUxCb;ZV$A+n7eD>(I-n#sMhg;5Z|o1!RA(9VwR{uJ7y&pHYIM~oUj5Nt;t&jLCzT%VUH+bbVR47{H& zaaslyJdLesEQniPAB?pTfe68MLC1#pn*kBw`IYK*GkyG@KV>GwvvBXNX{3a=-aQat|K-?<;L z(5_SGKGu~P{Uw21*+`QTT zbrKW>#6-`1+0*at+B~seua>2i)eE$~6bboaI2rk(5#41{D$0q<=6|9O;S|QF2M=}T z8?ws|AG|A{UY8Y3yJc43%Pr()Z>dK~AGEm;aX7(we40G9H!9V_)-tY3IwU`&=K^au+5`-mzmh%M9wj5k^PShszuKo*6_S0zRak zCm5a>!`Qj$+}?Or$lY<(qO!(DuR%16AEXs%N=WO+se_)$8RS<>++ED7UutSx+O1r* zmr$<%RHKz zf{z0A5lLt)SYV6x+As0lzIy`eSN$cc6F1HI>&HdwtN-aabNjxYpF0a#Na5lj$`{b5 zt2Z-z8YrhfG0C#R=2qiEoZobyfsSLyd*VvBzCF|ma~Dt$7pGi4E0b9Z=CE&H0>x|} z){F9Vy0pd1^uOL*LsHAz)%au650PX|m$<8ZU!qn{$Ix5GCFakc zZRMcP1zO2`yO3B**=o~|mJn5fs#N>V^ITt*T{g65>f2ndkjeBzXyo*}*+~p;N*)@@wCegq44EBzb^KEG`|gxE<+rzMj6o*dzvoRf+CA zv^3ni?<#`1a{&Oph4N_n2PXxBBC2Va)Ml)J!tFO7NlyD&EIppq+*bTh6^peKc;p73 zLqUJ8Wyu=UG%s#3a2hG>WbxX7#IyJO6rzu8whjP>U@h*3H;Kh3+Tzucx(i`rE4p1Q zd93I6ZLkG-cP0q_Zk#bCFXb3L0HE(fYXi)|U6GzVj^}A-4!E$cN`hS1t=H@+oDqyY z@#N$)VcZ~b2-lg>y&&-_7u~i{ancs0C`cGqcPnks%Itewrp@%5_d1C86g=0Um#}eM z-cHXVJ$7}i@aQs7O~x$a9p(Sc{5sY*cKWuNQ>V`zzh}Hg(k~R;WMM2fp!2BXiKM!I z+15`~mM27U5gCv8|8EMvJYacT;J+6tnlxDMIr^7Aw2i$#*a&K6r!Ic1MPSZT4d}9 zX4rG7w>C2mU_Lb`cgv(Ypgx|P>~29(%xCwAw@AuniYG+L+;`K?f6ZoooC~Jwal+&hzx5)OsJJTy zO}D>(YIuIf`Ro_+H%c=04~mid-`Hs;UobMtE35zf2LAK{@Y!|gyt)5XAxvjJ4Ctj+ z03_gFyn}c*Okp{Z8OzDoMs2^c`-0H>hQZ8AONg^gg8-L2PX8>MD)DRF^UtQCdIo0+ zMi&51l1l0T#w1yWBQG=E>d7vi@={q6UjqEajB}5PEntv?oBeydPbW#LzxgrPesJ{Y z3T(rSITL=jOq6Kh`o-vt=My6aV#j;(PqbC8_#krtx|!WvP;ExFe9X@nHI%HFQyp*t zXh(2cB?s7LE`Ml(|J_Bx{D57;ifYcwz(7QhUltqdEnuq0@1-U%7TwNjkdUI# zJ3rMabuGDnMbVjI5E#u;0d?s{jKqsY7hqt3EwHMpnaCh}>!|YVkhJ1k+U~h{_coG* zc{m>XhiN0dq}$51IU!`&x489Yb=0p=HRE@PSb=}d+s~v@QX3!xrh>_DwCmA+EnN&8 zG5+$(Jn&L8Ct9B09l?~5f{)@!?}@N{s%j*kfeH5^?T2vrs-31ic* zvhNdx+U|)PRrDO(V!NjJ834))j#Q;pVh<0ux1Sy(wK9Jx3Ge7ln)!9~7Qb2-fcl84 zcb1_6=|&5!<>I;jD4%1!$mh)M=de|W^E}=&`|}J%j!Pj-6TzuqO1yYZEi|ynH=&*v zw_*P41PrjEEZ$&w**mlP7BLENtHa*Wet@=Wj6N;)8ka6Ci(GK&Z5W^L^Vu3=UTwVv zQ96gcN57tYw#(P1;B%=ZoFF+N@a7f5*sm$4%6_an6xhPZ$URX>CmQsX=drR)=7+8Vw9_)pBYF#~J>)H6Mc} zyiT*fLYwMH*O6HTksieuk!*x+qLgX{#Ean15a-q9t=xs+d}>vUdP2m*NnSAL%gkfA zYsMcQ5YcAX?^hk@{n!|O<(U?rYX=i_LGs9V8->3w8V9FCKFuie4w4s2?lP1;?*i`K zJP!cJkVnW@V$|?lsavjWF>h7g3gT@%{kLo=rYlq3!|pkqn2|P8A$#NOPWecm!eGgEeKPh-YT};_#12a1)xsllGGX2 z^oMRIEXg#zz{zzOd#a6UI@@j(8dh2TLBL zqAaGV|3InrtIk=qBj1kUKS$qdQJTRmN3UK0K7wYLRyWU_snuKJS@(PDGP|k2X4UNm z;CC!U*EvM;@Z45$WxsHHA>Pf(&aO?m#U^qppC8$N*rb(WRGdVoI2X%UnvspK{W8DG7%HMy5+ zIHsTL-1juGDS9Es8aM=VJQ$k3-9~1;q`VxVIK*z#8*kk4?VAR-ojO_0mP^$hq$|fd zza15-K=SJqC#p%GA&(6!VH)SjziP*L&Csb58O%0v)8d485;N|OCt_o6gxAmV6AtRQ z40xH%4r+WYs1!vU!MWtaswc?d)e)O08- z%T4puZtCDQn=+>sD8N|Ql9-11Oul`Hmf|`jSMN&~jb@$?!0P^vX7cU<)d;Ujj~x*y zvrjzrgYOaO6^wgYeaGB8?Fq6&y`l0&>q15K6(%JAluw3+05$t(>0h8@!`Cin zKki_A10MV+;M0jX-Z8#W9Oi6exM}hpD5+4bow27!RBHSdT*6ePiIQBgxa~|4t(}^b zen@9xG{Xs5kn|sdiSTS#D|Y3d_)>E-BwhfVv?E(_-~FidtM&UcAnSD(fRv~M(S1q$ zgCCa1g}vSI$1zc?Ag}lfKyRxGSzv0n)_E3b!1L1ss)256k@yG2&=JCljK8#cyL#b& zA1Q^ME=CixfE^&~4WDsf8lHzc&~WUOYZ8Z8ina4?MKDkCCzoV@Ka#VFjV*Nf=`+B* zOH}a-?gWn6w4eWYMrlG>aYWlH!g5$tR>nT4-su_qV1o4BXLrv6K9+7=dBmo?JqTJ7 zh`K4({gYJeiDuph?yzEQzo`Si`y~3&nV;h=ImC)u2cPlImqK%!#<-g7M0zbHD)_;v9`H8FjNwbw4#>1RwLj1%dIEZ!{Nz5g z(6p<)HKh*AoQ9|OR!d<%HG-KQmN81^k0!n`V(*u-?gGo8TCwLsWzsgF!1Cn}LOnvh za_}%X*}=3$KSo)iyH+|x4Iu9e_sHs;4#O+4~AXjxgmJV+JX1J zkROUR79V8FG)CzjdMrKK4HNBnWd7~gj+w~qm+2?e)sT|po*c1>?Vb+e18bkBIsL@h z9M}Wz2yYwKNcGum1L#}3IZCj|$Q|6l5{J3UPk*#n_Y-Ni+=|+bGkqY_0@N1bGapHN z{`23%3xIW32UK?7U7y*uSfoUExV?Rf*kX4TKR>>VGbneyMJ$*%jaV-NwHSf4eBi;y&IRW!rxw0UwwKrXS0`KUDMyUt=X5%2xXTn+g5ForJ9xE zJ&isR@0BO0oaI}Y7d+tiu_wwYH3fd*)xSCGJ*Q9l=*m01TchMIW7tDOuhEL*^3)<& z$Zop-eIwd03r0*ro<&+z8Lq|UMr%+qPf0Il>4nWq)V43(;ZB#^vdp{8ER!PfW?6Z7 z>Lprx{IsLESw`#}JMT5awp}&O2mp%D8`%J%#;d9ilWz^+h{iZBj;x4@?xe}n$-j#q zG%~L`&&DAdrIEQ!QbZww@9V~NCo@s)+JifSf-hP7dgL+_)%lj~9^{X;TnP%@J+m*x zf}F)jOJe(4nOvIRV%P8btAaeoy zZnUuO+eE*dds0`$Fti@C)Q`mxKjxa>JSS)~=V$*@zhu%_r2m+e|D^ggfT~zQNj9)OJ!NyyM0Bv z*&+mAE&IQ_x@J!e(kvP;$>-wZXBPlpSZ~!%&S~q7jc`SGvuM zLaP=qI9-^s*#5VoA;&YULG{6{-$+S9(PHvM)zq_sfw1X1{P(~zYcI=9qbYbsFbJ1p zU;FP;Ol6o95^HdCdg51}F`~0XzQv;dt@j^fFkuBp)|AON_!3tjL&c2oJ$BAF``9x* zFnow)R~P2<(nIUHlAfLa{0PxxLLGnNGnnq(38f3*;+XXF*_B^Q;Jyu+p8s$uLF@IR}PGmk>=1>)L<(adKM*84Gf(W3h-9nc~c;eT6EM zAWI$@-9#AlmE%atz}bZX9`)ltO^^$~$=n@SevuDx&K_B|9EES0Ry_h0I?~=TsZiVt zIB4be3wc>PD0f(v)G-ZDc0zH1zg~*>1yb)UNLg8=qDzL)Lo>bQTd}aXWM?~=@0Nw2 zUn_V4`ZT=mowo6jb{x-RDPLX4CEK|;FWP#yJ6e6Nr_(AjZpFvuONGn=<3d$MRqWh} z=f7V#gDQ1j%D=$FUc8RZA?mOxG7Xa2x zvC~R+=BDb@o;c60z}q_}I!UFo{J2cX=8inpqGOv#SZS+0GTePZ<*$NE$D{gKw-4U{ zm#J{?Ptqs4=5}~~2rMRn3yNxPkpCnFeJDym{~!;gx0L7kRZNga`%Tz);tOKKQec+;Jm@OA(i24tZH-ZI>L-FE*Vmg)Ur_f3%Saxn8S>G{|Lv~^wl zqZ^O!g$kU&peyEfL9EA-k-OKnq4`%0=3;Mi{yulw@{kuihWr>}5bux@u^A>3kA3ih z^HWoG-qwqh48M^`MK09wmSJi!R`RrfNK4X_ZAKmkjlnN-_65a<)OgBP@ou z-yxu<8t%*-V@n7KTNG@Lq0>pLz5S)=sjWhb@iyk4uIn5y?)6hd$&V8AOt%et_lA?< z)y0tsk&-k0a*vd#6BSjBafH%2yHOn*b)NhDWBj|RBIn5)vH=tN#VXgQ;{+tiYSH>W z%ZUTS1}nLjJVb4Q_UqH&HLP;4-^8SUY|U^#t;n{BEO^+Q3x7q*r?^kB;z+mgZhZAX zWT%RAzQdPxSs%L>kHArpE0@trc5_um!;?K-M@5mEQACDkp=1XkXDK|dHI3N0=q52y zR&8(GKlp=PL0gD$viN;hnE$H^V%_~;ivVE&>V#3ZPWNYKQp^DcPPYsaO7Nk7xn*6& z)w*eW!z|zyRVg`A@$yDbQ#MB?d08xu2mCx@?R2|0i!&Wgv$U5MZVh1>Zuhtg0XSEl zgF*uJjKk+zBdgxTlteJLJF_Ru#(#pEFT~l4MxwP|CEDuox!iz8H?N-dV8?>Sz!_6n3|6AtBo*{Ap2S{cUU9N`YW=DGWX&(2v#hCsWh!+PQReZ@i5LscyN*2lP(wMG+Azr$Bn!IX_gVzGl%hmk-hal_t1bNt!>ld~+yetBISjiRH!JlZR@~y_`t){@@ zplpAd_fB7$K@LfdD=}_>BL$%n2G+6tawg}=4Km$&k?#_X_oJ@$k999%S6aJCe~_l zw*4ctq5qOGdyPSUSt~qMixuY9mc{!d@T6uB6gjdPx$@ga$iL6Noy^Uk6Ba+!=~e+z z8?_u)9OBQkX(|^OSRu76zvmgBCcPQY9iK8@Vl`Bqn>uk{I7Gsm^f3r4U36J)Jgb9% zbG9l-uuF0M?EL`&T$Exth89*WU&ad7LFr77oj|e2Vn%8c&fFb+UthVl_Wj}WBNB4m4|$$1SSFoLh(>tJ zG)WcA^l-AR5p@#pD;|qq2lbPgM;_ONuC9y?O82J5qz-VSJA(MV7;cwFx7ODQcwpIF zs2EVN-X?h0vGY%dv+ydv`RP#8SXjd|QD70$o={uVUgnT;67mY_sGJ=1f|u(8Ao{n- z4kZP0osbisec9MNG>6(So1%0y2)cRj=Haw}5s`00@qRNN>u3%vZ)k#PScq?{WIpCg zs5=)QKXb*&b-F9UT?H$zda+$OKrx?2;i!)H##*h~OE->L?0brp$SK<)XI$^8Hip(L zRD=J(Yx2|ZP}7EyY3=*_|3?6v8)M{VdEoO1kIm$k0DTQ@onR}?ePu@Jb@Dp09LAI+ zu2tw&^GBf`q!}W z(6Q(JMs4{UUM}%$cJZ)QZuR2-01>=*h@}1DJ#n9!9KO)KNY-b{gv9wpuAG5T3(XOTg%(!y-C$3Lw`kTRX`IcLEeFbNSreRvFukM-Jy^g)BBW74( zj~FLAnEfltzA9Sko*TE4MY?GZBj;N8%h`lB?9Aw+2aMw%jd)ka?}}O;n9@YD9YX5_ z7~$qI{_(9VVf@I$O07v*Bf&MxjZN zIQW@&;wjqR(HCoQmbPeHpMAeE{3}P`x9oGP{A^~_wQHHQ-5xm_GaOvcBMx@|0J1%O ze+n@8X4%(>R4BuqtN9-|Cxx%PQGVARO~jUQ%ocg0UzHS`9DN2);ao56HSmJk+u}x* zab`AIM`C0#^~8XM4gUZF2Q~KRk3JUI{?2gC4)U5rhDnl1hFMNdS3aCq$=)W@+flmJ zby+;df>~VJq^JE%MTt}%z!6^N67YBGeB`6`x{amoBboSfX12E0>b(@;aoAVTZLTG^ z!*IL)ZMemFUxgqx@kRd8$R3s6YdZTy;gEr{z-JZbK$G z(+1llk(g7SrN|%4HRJyPv-P^o;B7|S?+mE2_3O2c@9SFMweN`A{t-xF>TYg}o_ZpT zkLGHJ?5A>*y2l~PH=AxodmcygucDzx+2!tC-{gF5GOso}m&od3(;<>2X5G1fC+kI8 zpGdi}nc?65rHX!BQCw>n>>pQ=`k~{ka4c=p?(>TI{{Z4)yUDoNmw2s>;aopA=sC^GE>AKjFWJ8(r}{A(!_spE6INtoz3MMdNoJ z{{R~H4}rc3F!*)vB#$k5^L73nK>k(NUb3f5^8P7kcD7em^I0mn*vc>&F_rv3D&>4_ z9Fn^zJ69hmQW;(Y`rj-|+nF zy}s~-QAm8N>GcWI_#j3R{RusB?O0l?PaV?6%N&;(`C*9gxav=^?t5mtBU*1n&TnTM z>STE9QfJX)vp~eefkE`f4SBbSV=`(HvgEFOfKR9!zpZwjD!h*0ZK!pU;$j2sJa_5- zJ?os-EW}net;r2JB#?uNBDEarJ+@3JHEB}9s3r3*jm@@ zb@4{t@qW>H;hX1JwJRXScgNFk^pFlg@6CSDd?EO~qkLrWEsu!&JE&Xg8h)Ug(pcCY zf4WETk<)Kt53PQ8#2GzI1!qz^(|bPNO#MrS^SEPaa!LO2Zo8h({{RVVMz{y{s@J|P zX=1@@;pEk&jxFCcQJY(v8+rBSydSJ+eNwfoZ1|tV%7wme*{_>FXwQsRx;Cj5z0}Jb zLA=SB{{RY){{UTk2D>%I>N6z;m62iG|Vy?d1CVWh1|%Krc(iw{z&_|$%PJ#blkQuxUC7Pi(?LmYS# zeWFjY#+e!9WESHbn%3|y{1c~A_=Vx?tB(?El4UW?(s8~j?+rn;a05wWOSPM8qE z9}z!Hh73su1B{NHeS0Y2;eUNe{l?genDrK@xJ7BM-FC@29WH(uR88tSPi)2Hr6-lvy_$!g*&UcFS;TRWbA@$<*`AGB`2Yj>$xE}Nq1 zvKO+mCv=5~`|d{_Gk`jC$*&6d!>dDX8r~iwUIscGfPaw{)%eTe216_?x#`Dj^Pj@J z_Txdg@kXXDCM+Sy+A*ES*1Y-RIc0es>m* zlU;SMg5lp@f?0N%KTQaEl6b<{8E9AbXQ2I}h-_7oL9-=;_q|qu`!bcr|25GYp)PoTfoxWm13{^$lJf6{JqE2RN}vT zE>-timeSIs+{6VUu6ERq4W*s(>{vx_d--@xp6D`$?GiL## zZ2o(W@64aAa2_@Ig&oVgTfsW^{{UCl^C$G8h90HuW1h80?pgl;gtGAe0H}s_9;`f$vGUr^S;MHdRa_qk9%@1N^b$A=dmzQ?O)RRM_J)14Es)gfrK2`UxHSwIcTJ`#?WsguB^H8~-ZFoyvVoR7`jspH0HGS{l|?GNvDqB4rqv#4ZqF3)Rm7H;32_X9 zIhAeX4V-ywRE+1>gs(#JAcMz#4YAi1f8*`}4eV+$v4_jZ^$b5+;PvYdwHxT8&zTG{ zvi(r5fAQ9>Z-U+_{?ER=(`I4h-YIoM{4I>1&JEOydm$Yz}%=7OTcy3KD z`Js?`iP2xXFI7K)#d;s?k^5x$ul7apV@agV_U#JdK-XGS%*z$R@tvRCeoh#A^V+KX zRnb<`Sp#6LsRU#Aqi_%DkJh;hpAD_l8&#t$S9DHC1b=qAqf(t}9?r77Ugt8ETs?1T zMcJpJ`(67p{?(on{ii$`Z>nf|gnwvd#od&xvg+1Mav4V)ez~tmnN~&I6cuiTc^LJt z=kvlJ5;f0+z9ffH(RB;GF8a~Ktk6m2$URh_Pip&P_IUpQg3Rk0eWZ4tI@2T9A=(x1 zZ7~hfp8J>XH}kKD&3HbwH|;QQnmxL&^FKt&c+!nn`#fK|`}Ak&6C&gIfA5;*e1Gtl zO!$Rl(cH$l>Kh+2A5mOy!oS-yz#kc`VSOiFw2IZt7$KfyYkni8kHlg8P!i2J*BVQc;||I zY2t}hzvMBwmmf5Qet$K1caHuac!$JN$vwn^Hj%RX-z|^K*VWqBhu&a+hl72~khscwBDHhXw(9LlmJeF^iAE$ciyfN^F%wK4l zFgA>U1~7YZUj23OzRuk77dh)t>KYt&R!pHsPW8@U3buq}e1E(UsDgCy*OBRFREm@Ve$#_1=7d=aL z{Q<7LzMnm4#dk-Gn@Llm<f@0V*PHwFiv$F6@0{U;M&+1Wpl`CU4G z(Y9cs>X9H{DVJ!*Jt(h0TUdgR^vKU0an_3A`s{lntLjVnkG4E_tdWHc&MVIEAAF2X zcW&+0x4c=aHPy=!-o5IdgS4jCd_`*(&C2oueuJ9)-X7#zXX%xnGtl)f1L%jr-T?rq z^Q1#8nH-WwHH)plkxsH&%COBaEW4ZKJn{{9_g3a>H;q^QYHb7Cp#D|m9wo7p?Q>Yj zOj0lUybe(R0QLU>rEuZp%`3KJh`Nr!sA;WpZp}P4}RXKG^MD)aWHU9Q7-ErF}kGHGAJM50^Mn*1 zs~S$2QKAyAU5+AxG05~kTJ9sz*TR}ulH&sIW0D8nQR+u>d;Ke-rCwL=ob>5)tFo2Z zk44kgIJpt1jR5P@pVuSnit?|CI->bWX05nLL&`_@MsLiJWqVmT}T;=O)&Y1{uTcKIIVK}ZOfUM<0@HlqK1nH_Jp_B4V*L*oce+=Kb3P4 z%Gz&=e8~P&8-fq6F>=lKfbHF(XIw$hczXURUJa2518dEQb? z@aspFBhtPnX^SS8qunsw9nw9dp6iy!=oY-QOm>PRZzkW}HV6ASuV?Yh0e%{IXRn!Y zG=+cQ8$kY5;uiNFWyhJ%$lDltk;Q3&_n^@@)oG@K#abkKuAKLg^D1#Ff3yAS=JZxz zWKsUJZb!Kv{c7wqeM|d4RyOm0seVE2vAZ9pE1%aiX7JC7|>-{((Fr=@z7YCAYc z^Xf%gnkMgt?j&6T;xNpwZz9Nrdf|>c@&5qouWR@-`*i$4_*bXd{g+yr`pV7xne8t> zeHl`6tQ+qP<%M{zm1bn{)~7UVL5*Yo0MMzP6VwE^jE;YIFxcbN5nLFYB`VRiNT>2U zF!;)}T6Cn=ozK&++3Wranc*KB-P>utCsX0wNygDD0`{|ehZ!r5oR7-B$M6S_to3_H z?lk+$d#hOv;Vcsg6pq}C{{TPAzXEUVS|neY{L44q4?KW>`t|h3?1=}Dt{VF1!G0iZ zC3N_O#F4$$7Ga;eu;)LQD8^O?jXM9GtODniv$(H)r6i2&o!D#s)`jCGr z`wQW>$9)Il7MTs^kE_{gHu3<$p_DhTUgPnvot_@G2m8c*o*OX3;uY!1U$Z?W?NOK4 z6`iO>95FH4dUmGA;zgY|9gW;DIjWcX+$$RsjCbabYL4DlxrMLXDkt#Zis5`=ufc5# zZgGG)tuG$iN6lSM3F+=!S9jjnaP%ai5(1E1#R1Ug{#GqfK5+m*a1b z?d&Wk+cHL>a#(inUz`5`wztF?yjQO2{!4Ds>}PcVe-mVuZ^+lUd|mjhedAYUX*|1j zJSTHr3-Lq4W5haT#A))r2~Vi!`d8CrlvN7qtwZB8>|3u-lAgz!>RuRoizK*(e9tXG zW>K7up#E5{+u@&$EpD{&W2!QkMgq>iD@WJ8W&A4E&AbK)RavcmQm@L$oqAWI+k7DK zzm0@<3q8h-aW)9((Kpb45B1G^c-&MVojUiobbPKG4>#}8wfhqd8rgI=vi6DPu6$7*anJ7-it&EAgZ_8_0D%7h!96dl;y;mn{{Zk0Vbv}S%-ILmf$Lqz zz`YyJn(FbgJinE5TnwMRae>rx^sj9AX`=rCVfbF%8Gm^o-v0noUoDKAP_pWMgi~@l zNFrC4kO{|n!}y8dl-Hp9Qhx5@G{a!yBiQ=Z>Ju5<4?oJOYkK5*b-(X?$q!^m_m@6^ zde@H$ILSDj60?n&gtjc!h*@v$JykEzk3GNO2+K^wiw8zW_GrMoL zFl*`f{5y5xsoLW9C9;KvBZ+_35BIB|@pr-ow2h>Nvma00`k%npzk|nnIazPi@^M%% zX}3e=8*K|+*GY{}+2P&y86;A1?Y9-sX@3kZ<16-y)wPcqI~V59(>bqJi{X9aOv=}C zr$2SNpZs=-eiq3N=8|XHyx=wo{RMju9VxGN$CoT0BfOKj&UjbD_C6GcHgNg3P06{O zckV*<{Og_Z$B0%5B#k7J>gDsjkIRAXf2DOg)D3R~q;Z%6f-=pPuRZZCfws8|<_6q1 zutBt9v!<^r$SO4$*&I&2dSjmjjF%Fe3=9B1mCNcH9FpHOjKNqOk@T*vEiksM(qnlo z@~J&P`qb@DPiZFF7iueRb|defLG51UDJVwglTw?O<^|P(T|3L%p<_cK$8vZT%iCxN zU(_RwM(H~L$dERwr}IkC~aRFNK~ADv>i3!gIG zzG3PcikrpJ{{U`yV#4`$wALg>-|Z^`N9$5XjVzv0t`^~ZvF=F9{{Z8_QQ-@BzO}fp zUAdWdmT$U%9#7%TdeUt*F2|h|z8AAD_*OXVd;-#3F;DFYLJ)t22UGc)=a$*@ZE51p zLbgHm^fja6yT9~^?BU(^dswzY5Ak5~e;?^t(@pmKMRi@$Tl7Aw*nSv4olJGReMzZh zq0&h{`*`P7-M{5={Oi!Z4SZE^hti-+$t>MYRnhj6Ju_Z&;k7!2p^vFx2wYTmQ06v@ zMQ`1(V5g3mu3C^!-8$h?Npr;Qe`xQEH-0)_vDqr^E+w8)+W{V+R62dv_-DjB(SB{9cCOPw@l1&8hChXP7@V#OSF!ZiT;jS`a%a$f zG5G%g;tv+Y%WS6Mrlw=hY2BPlq~LTd+I@bg5UDy*GJ`d3?Vc&IlVap_o^h3B6u z{{VFKuBvN8j<%004={l#|?1L01G9c=HpRIKs1@YY40vJg1p(A&dAQ|`M*734O zl~scE;5SD0{A%6b!pL=P9!r}=8&n5pnF52?{7>o}9^PY7xM0NUOpw}Flo+yngU-Xn`- zYQ2C1`cXxE4n4c1edRT&ZaWV#6pT}#(!gx|v{7Dd&EvT#u~co`eiaLaf17VZj8R2t zOM9DBTA4l~(LUY^l7o!r6~t?v3WnO!;_63cHsdRfp!(_7a6T{HS@XmQyZZk~m+3Ij{&*eoGGL!aw+)uY;a33jC*mt6e*;0b2-Gxr1xp{A)uc1gjR$Q%g z`ecm&+^t0w!&_6nlQyiinKyjDD=&K2wDA*@hF#6;MHS}Niak0{L2fUkxC5tJp!1(F z{YavUbhatIO4G02SM;e?n{GqXs!_kLvMHLkm!FE}?*EH0+ky}e$ W%ETS7ft>cDiYu4e&$#`ZPyg9k_BdGp literal 0 HcmV?d00001 diff --git a/hackatonApp/www/js/app.js b/hackatonApp/www/js/app.js index 73f5005..966457c 100644 --- a/hackatonApp/www/js/app.js +++ b/hackatonApp/www/js/app.js @@ -238,15 +238,6 @@ angular.module('your_app_name', [ }) //OTHERS - .state('app.settings', { - url: "/settings", - views: { - 'menuContent': { - templateUrl: "views/app/settings.html", - controller: 'SettingsCtrl' - } - } - }) .state('app.forms', { url: "/forms", @@ -276,6 +267,81 @@ angular.module('your_app_name', [ } }) + .state('app.allTickets', { + url: "/allTickets", + views: { + 'menuContent': { + templateUrl: "views/app/allTickets.html", + controller: 'AllTicketsCtrl' + } + } + }) + + .state('app.settings', { + url: "/settings", + views: { + 'menuContent': { + templateUrl: "views/app/settings.html", + controller: 'SettingsCtrl' + } + } + }) + + .state('app.booking', { + url: "/booking", + views: { + 'menuContent': { + templateUrl: "views/app/booking.html", + controller: 'BookingCtrl' + } + } + }) + .state('app.addTicketWithPhoto', { + url: "/addTicketWithPhoto", + views: { + 'menuContent': { + templateUrl: "views/app/addTicketWithPhoto.html", + controller: 'AddTicketWithPhotoCtrl' + } + } + }) + .state('app.shop', { + url: "/shop", + views: { + 'menuContent': { + templateUrl: "views/app/shop.html", + controller: 'ShopCtrl' + } + } + }) + .state('app.ranks', { + url: "/ranks", + views: { + 'menuContent': { + templateUrl: "views/app/ranks.html", + controller: 'RanksCtrl' + } + } + }) + .state('app.home', { + url: "/home", + views: { + 'menuContent': { + templateUrl: "views/app/home.html", + controller: 'HomeCtrl' + } + } + }) + +.state('app.category', { + url: "/category/:categoryId", + views: { + 'menuContent': { + templateUrl: "views/app/category.html", + controller: 'CategoryCtrl' + } + } + }) ; // if none of the above states are matched, use this as the fallback diff --git a/hackatonApp/www/js/controllers.js b/hackatonApp/www/js/controllers.js index 7ebbdd5..91b918e 100644 --- a/hackatonApp/www/js/controllers.js +++ b/hackatonApp/www/js/controllers.js @@ -7,10 +7,17 @@ angular.module('your_app_name.controllers', []) // APP .controller('AppCtrl', function($scope, $ionicConfig) { + $scope.user={}; + $scope.user.name="Laura"; + $scope.user.surname="Rossi"; + $scope.user.email="laura.rossi@email.it"; + $scope.user.telephone="3477608470"; + $scope.user.picture="img/laura.jpg"; + $scope.user.score="15463"; }) //LOGIN -.controller('LoginCtrl', function($scope, $state, $templateCache, $q, $rootScope) { +/*.controller('LoginCtrl', function($scope, $state, $templateCache, $q, $rootScope) { $scope.doLogIn = function(){ $state.go('app.feeds-categories'); }; @@ -27,9 +34,26 @@ angular.module('your_app_name.controllers', []) $scope.selected_tab = data.title; }); -}) +})*/ +.controller('LoginCtrl', function($scope, $state, $templateCache, $q, $rootScope) { + $scope.doLogIn = function(){ + $state.go('app.home'); + }; -.controller('SignupCtrl', function($scope, $state) { + $scope.user = {}; + + $scope.user.email = "tuaemail@dominio.com"; + $scope.user.pin = "12345"; + + // We need this for the form validation + $scope.selected_tab = ""; + + $scope.$on('my-tabs-changed', function (event, data) { + $scope.selected_tab = data.title; + }); + +}) +/*.controller('SignupCtrl', function($scope, $state) { $scope.user = {}; $scope.user.email = "john@doe.com"; @@ -37,16 +61,35 @@ angular.module('your_app_name.controllers', []) $scope.doSignUp = function(){ $state.go('app.feeds-categories'); }; +})*/ +.controller('SignupCtrl', function($scope, $state) { + $scope.user = {}; + + $scope.user.email = "tuaemail@dominio.com"; + + $scope.doSignUp = function(){ + $state.go('app.home'); + }; }) -.controller('ForgotPasswordCtrl', function($scope, $state) { +/*.controller('ForgotPasswordCtrl', function($scope, $state) { $scope.recoverPassword = function(){ $state.go('app.feeds-categories'); }; + $scope.user = {}; +})*/ + +.controller('ForgotPasswordCtrl', function($scope, $state) { + $scope.recoverPassword = function(){ + //$state.go('app.home'); + alert("non implementato"); + }; + $scope.user = {}; }) + .controller('RateApp', function($scope) { $scope.rateApp = function(){ if(ionic.Platform.isIOS()){ @@ -216,6 +259,8 @@ angular.module('your_app_name.controllers', []) }); }) + + //this method brings posts for a source provider .controller('FeedEntriesCtrl', function($scope, $stateParams, $http, FeedList, $q, $ionicLoading, BookMarkService) { $scope.feed = []; @@ -461,5 +506,44 @@ angular.module('your_app_name.controllers', []) window.plugins.socialsharing.share(null, null, $scope.images); }; }) +.controller('BookingCtrl', function($scope, $http) { +}) +.controller('RanksCtrl', function($scope, $http) { +}) +.controller('ShopCtrl', function($scope, $http) { + console.log("icic"); +}) +.controller('BookingCtrl', function($scope, $http) { +}) +.controller('AddTicketWithCtrl', function($scope, $http) { +}) +.controller('AllTicketsCtrl', function($scope, $http) { +}) +.controller('HomeCtrl', function($scope, $http) { + + $scope.home_categories = []; + + $http.get('home-categories.json').success(function(response) { + $scope.home_categories = response; + }); + console.log("HOME"); +}) +.controller('CategoryCtrl', function($scope, $http, $stateParams) { + $scope.category_sources = []; + + $scope.categoryId = $stateParams.categoryId; + + $http.get('home-categories.json').success(function(response) { + var category = _.find(response, {id: $scope.categoryId}); + $scope.categoryTitle = category.title; + $scope.category_sources = category.home_sources; + }); +}) +.controller('HomeEntriesCtrl', function($scope, $stateParams, $http, $q, $ionicLoading) { + $scope.home = []; + + var categoryId = $stateParams.categoryId, + sourceId = $stateParams.sourceId; +}) ; diff --git a/hackatonApp/www/js/factories.js b/hackatonApp/www/js/factories.js index 798010e..d794111 100644 --- a/hackatonApp/www/js/factories.js +++ b/hackatonApp/www/js/factories.js @@ -209,4 +209,5 @@ angular.module('your_app_name.factories', []) }; }) + ; diff --git a/hackatonApp/www/js/services.js b/hackatonApp/www/js/services.js index 3d6b9bf..b916dbc 100644 --- a/hackatonApp/www/js/services.js +++ b/hackatonApp/www/js/services.js @@ -224,4 +224,6 @@ angular.module('your_app_name.services', []) }) + + ; diff --git a/hackatonApp/www/views/app/addTicketWithPhoto.html b/hackatonApp/www/views/app/addTicketWithPhoto.html new file mode 100644 index 0000000..eefe39d --- /dev/null +++ b/hackatonApp/www/views/app/addTicketWithPhoto.html @@ -0,0 +1,35 @@ + + + Bookmarks + + +
+
+
+ +

There's nothing here yet. Start exploring!

+
+
+
+ + + diff --git a/hackatonApp/www/views/app/allTickets.html b/hackatonApp/www/views/app/allTickets.html new file mode 100644 index 0000000..0f33389 --- /dev/null +++ b/hackatonApp/www/views/app/allTickets.html @@ -0,0 +1,38 @@ + + + + + + Bookmarks + + +
+
+
+ +

There's nothing here yet. Start exploring!

+
+
+
+ + + diff --git a/hackatonApp/www/views/app/booking.html b/hackatonApp/www/views/app/booking.html new file mode 100644 index 0000000..eefe39d --- /dev/null +++ b/hackatonApp/www/views/app/booking.html @@ -0,0 +1,35 @@ + + + Bookmarks + + +
+
+
+ +

There's nothing here yet. Start exploring!

+
+
+
+ + + diff --git a/hackatonApp/www/views/app/category.html b/hackatonApp/www/views/app/category.html new file mode 100644 index 0000000..de8be83 --- /dev/null +++ b/hackatonApp/www/views/app/category.html @@ -0,0 +1,48 @@ + + + + Settings + + +
    + +
    TOGGLE
    + + Airplane Mode + Wi-Fi + Bluetooth + Personal Hotspot + +
    CHECKBOXES
    + + Option 1 + Option 2 + Option 3 + +
    RADIO
    + + Choose A + Choose B + Choose C + +
    RANGES
    + +
    + + + +
    +
    + + + +
    + +
    + + +
+ + diff --git a/hackatonApp/www/views/app/home-entries.html b/hackatonApp/www/views/app/home-entries.html new file mode 100644 index 0000000..aa70b09 --- /dev/null +++ b/hackatonApp/www/views/app/home-entries.html @@ -0,0 +1,34 @@ + + + {{sourceTitle}} + + + + + + +
+
+
+

+

+ Published {{ entry.publishedDate | parseDate | amTimeAgo }} +

+
+
+

+
+
+ +
+
+ + Read more + +
+
+
+
+
+ + diff --git a/hackatonApp/www/views/app/home.html b/hackatonApp/www/views/app/home.html new file mode 100644 index 0000000..5c9e687 --- /dev/null +++ b/hackatonApp/www/views/app/home.html @@ -0,0 +1,29 @@ + + + + + + Home + + +
+ +
+ +

Punti {{user.score}}

+

dkdkdk

+
+
+
+
+ + + + +
+ {{category.title}} + +
+
+ + diff --git a/hackatonApp/www/views/app/ranks.html b/hackatonApp/www/views/app/ranks.html new file mode 100644 index 0000000..eefe39d --- /dev/null +++ b/hackatonApp/www/views/app/ranks.html @@ -0,0 +1,35 @@ + + + Bookmarks + + +
+
+
+ +

There's nothing here yet. Start exploring!

+
+
+
+ + + diff --git a/hackatonApp/www/views/app/shop.html b/hackatonApp/www/views/app/shop.html new file mode 100644 index 0000000..42d7a22 --- /dev/null +++ b/hackatonApp/www/views/app/shop.html @@ -0,0 +1,50 @@ + + + + + + Settings + + +
    + +
    TOGGLE
    + + Airplane Mode + Wi-Fi + Bluetooth + Personal Hotspot + +
    CHECKBOXES
    + + Option 1 + Option 2 + Option 3 + +
    RADIO
    + + Choose A + Choose B + Choose C + +
    RANGES
    + +
    + + + +
    +
    + + + +
    + +
    + + +
+ + diff --git a/hackatonApp/www/views/app/side-menu.html b/hackatonApp/www/views/app/side-menu.html index bcc15bf..116b457 100644 --- a/hackatonApp/www/views/app/side-menu.html +++ b/hackatonApp/www/views/app/side-menu.html @@ -3,10 +3,7 @@ - - - + @@ -14,26 +11,38 @@ - +
- +
-

Hi Brynn

-

Welcome back

+

Ciao {{user.name}}.

+

Bentornata!

 - + + +

Tutti i biglietti

+ + + +

Impostazioni

+ + + +

Logout

+ +