From 1ff79837c4fdbab883da08b79d35711787aef31a Mon Sep 17 00:00:00 2001 From: Nick Home Computer Date: Mon, 20 Jan 2014 10:36:30 -0700 Subject: [PATCH 1/9] Added some better db connection ability? --- youreffect/.springBeans | 13 +++ .../webapp/WEB-INF/mvc-dispatcher-servlet.xml | 4 +- .../WEB-INF/mvc-dispatcher-servlet.xml | 4 +- .../controller/HelloController.class | Bin 706 -> 706 bytes .../controller/UserController.class | Bin 3075 -> 3056 bytes .../classes/com/youreffect/dao/UserDao.class | Bin 355 -> 355 bytes .../com/youreffect/dao/UserDaoImpl.class | Bin 2820 -> 2761 bytes .../youreffect/exception/LoginException.class | Bin 750 -> 750 bytes .../exception/RegisterException.class | Bin 759 -> 759 bytes .../classes/com/youreffect/model/User.class | Bin 1744 -> 1752 bytes .../com/youreffect/service/HashService.class | Bin 1461 -> 1516 bytes .../youreffect/service/ResponseService.class | Bin 1079 -> 1079 bytes .../com/youreffect/service/UserService.class | Bin 1406 -> 1406 bytes .../web-resources/META-INF/MANIFEST.MF | 5 + .../com.springapp/YourEffect/pom.properties | 7 ++ .../maven/com.springapp/YourEffect/pom.xml | 95 ++++++++++++++++++ .../com/youreffect/AppTests.class | Bin 2661 -> 2669 bytes 17 files changed, 124 insertions(+), 4 deletions(-) create mode 100644 youreffect/.springBeans create mode 100644 youreffect/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF create mode 100644 youreffect/target/m2e-wtp/web-resources/META-INF/maven/com.springapp/YourEffect/pom.properties create mode 100644 youreffect/target/m2e-wtp/web-resources/META-INF/maven/com.springapp/YourEffect/pom.xml diff --git a/youreffect/.springBeans b/youreffect/.springBeans new file mode 100644 index 0000000..4d9eb32 --- /dev/null +++ b/youreffect/.springBeans @@ -0,0 +1,13 @@ + + + 1 + + + + + + + + + + diff --git a/youreffect/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml b/youreffect/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml index 1339460..fc367d2 100644 --- a/youreffect/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml +++ b/youreffect/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml @@ -14,8 +14,8 @@ - - + + diff --git a/youreffect/target/ROOT##0.0.9/WEB-INF/mvc-dispatcher-servlet.xml b/youreffect/target/ROOT##0.0.9/WEB-INF/mvc-dispatcher-servlet.xml index 1339460..ffdf9d2 100644 --- a/youreffect/target/ROOT##0.0.9/WEB-INF/mvc-dispatcher-servlet.xml +++ b/youreffect/target/ROOT##0.0.9/WEB-INF/mvc-dispatcher-servlet.xml @@ -14,8 +14,8 @@ - - + diff --git a/youreffect/target/classes/com/youreffect/controller/HelloController.class b/youreffect/target/classes/com/youreffect/controller/HelloController.class index 292e184d74acf32079c50c2d3f221b57d1ad88fd..f96ac3baf1e8a25a83a5b3207eb89e0d2d2d0195 100644 GIT binary patch delta 275 zcmX@adWcov)W2Q(7#J9g7-ZNPm>3x}Cnji`u`{qRG6-ZPmL=-vB<7{-`zK|kCYLZW zu-RnhWtP}6GB9gshA}d*IOnINaxpM7aPly)GO%sbQ(_e7U=U+u5G+bf$t(hDvC=On zP0Gnk)}I`}7{|t-$NP9_E}Ajt+4WMJTA;0BUBU^Xj|<^}Q?8Tc6Z zfvN<6Yyluo5Qv4M85mO;gc(E_*ny(DKoO8`W+BlHKnmGF9wY;qp$0NBh=Wy0NPx{0 S0&0*13V_U&0-9UQAPoQo#~}#- delta 255 zcmYj}%MQU{5QWe5qAo?DAFoLZrMQygog@e2-$>osQv(QyB=5o diff --git a/youreffect/target/classes/com/youreffect/controller/UserController.class b/youreffect/target/classes/com/youreffect/controller/UserController.class index 7ca03efaef5c3cf719939556517e2ab1a7ee2d07..0147195c6a374a8a56879aa155f287c15a75dce4 100644 GIT binary patch literal 3056 zcmb7GYjYD-7=E_5w8<7QToe!uXrV2I1+;(!!P0Uyf!aW&fR~faNxHDv4ZEAP@mlZx z1^okl)fp$u=#2W=-{h#z*<72ZTqct}d(L^!dwJgHeb4^=?{9wqIDzjY=+iK6x<#Yv zmOYuzOEWM`*9kn=wxws>@})Q1nnp07VcUIC5r!?Cf^j2zpYj@FWr}5_SFuc~;nh@^ zK5nX=P+3DNsbTj**$J$oT(o>EYs(qOaRU)puH$PsopQZ`;g>wiDdas-lq;_Hz{pDB z_(oosf$LQb(K=wvlmmCg@??%`W6Q!{ezGrD+EP3;Q1D$x!>-Wtg6kG+X{aURG9TRE z>Pf#u&tyyS_+~*ate52Bp|h4_1?M#Mk54Sp)~uV8QS@WGj;+{63%J8V-)9+KI~q3fbhu#-+`$Uy)fO zYdN`2*car(vh;(rD3z2p4TBY7m+AkA(Y8BOl)MO zEjx^yE{ylcd=#(aWCYX1t1Akg3+uO|W^|mwZZf)=D4k zqLO}7$GN6c^9+N6lSkV${-HSK-X+7{rj0xTxcjIyuq^=PJ)#!LQ2T&qogi2SB5dKA(SENsD{1WZLk9k4SgP2KGiMqm>e>)(M%xB2W)1IemiKp1&f!$kP*J9)C7t^WetaV zPIPSYpJ-D>8D`S@)MYdoM)ouTD0*c08DYvxtOX6*m80#i zhocGz4TpO+T6IZDH>j4R(LO6@BTD-Lz9?J&@z?;zVDeYIayUL#!=b-0mY(AD$W#qR4X@R3 zx;Z@?PS11m0ypPsxcmb~e@A*Le&Z3|`LnT};rMQRsfN2hVe54@Ia0%ioT^uzGu2o_ z;b;0W#XfVJHQdj@fTO&`z!tj&hp>;A)f8`}GknewlN63o_BfXK$(Z9cVPiUkVzTak z0}4ih`*=XjTac$rkx(pAs{@xdO4L4z{(mqR!B{4Obc})zH^I((0(M%gf!!M8d1ma0 z1JU$|1!1IM)%j%zI(y#|hwIDUz*I&r*09PdU@i4o?n32q<030WBD+qazW KA-;7ce)m7-nKdy0 literal 3075 zcmb7GYj+b>6x}yzn>3wLEDx<9L_{ckFbWos^01Tw#TIG<)fQiqnmNNt(3jL-;Ur@45G$bI;!AG4uDozx@H=6uwU&iQDZs zjHwvjNMIT%5$+@q#oYvE@TSb(lGm)f=4AJt%-&Am9lRUEdvUyYYC zoGj;MHZLz*4&0C7K^%nyda4S=I2;l3F}N`-D0Gy3?WMH0XlJy-(TR*(G|O(u)480^ z1SU6S$GqD(HLTDxU2+1usAp{7P8alu;W(rm}P<#h zR$<2SY>{h=Ey27^Li(Do%eYS9xrKuELRv@bA}@@4I&b@d_7slwPTaQ^Ewf-bc{3FV zpTj3MFDXPkdN9y@i(by?1&N6{T{Ahhwj!)$t-un$H(kL!NeP7m%@&IUUkF{MfzDK5 zWgbjg3n5tMGBb0#;4kU4nYNwm`nXT)hb8R?G_WAR6j~RpLWw}y%?1T+MIFq$S%tG( zCe==MLq!2Pbvt!O;mi{lsHV#mH(RFuk&UT7Wl2giJ{xj==n1TcuxrL!3vS+K@LHFLANr;tdoUNicdEmrnOr8ZLPq{LUDe@h1? z&$Jtq7qr>XkWiSC0S5XpVBk1gWYu{C-{L!kz16iP%TG40r`0Apwrvy&yBl?TJAI#>nnp#txdF1H za|K5T8(JlN*8IfiL1r$kNR z(58<>Bjtz1yJOpcZTg0=I_dZ%6U@q!xdi>L3o-6o4cqVr3TmXwCGo(mHhzWUTd=e) zc5B}UB54nks|sV}@w9g6^sL&${AB@J5RnRo!V8qzI3DE~k+R>k#-6chjb+!g7NyJ< z!}lO9nH&|z*1lD!UqaI-`Id`-z1#+j>H)ljmnkX!PMzkD5tUU7#}=-Y`hG>Ee-EM+ zwETtWE!OaeC8WnW@fX?5sYqq;<6}$hetv|)FyL(Rsdw)XL zEfEGQ*hf*O)Y~s(1yBD>R|fg(Hp}0yD8%VgbQNT#i{0}OxfmqQVImzPj7hpbL&s+c zVvZ*@UO^Ea!YEWf%24{Is7jigk55{5`PQ`GcBMi(z zZe8Sa=^m7i%Xp2W#t5!plnPh*#DwQDP86=y3EW*HaD|wjoIsL6N}u^rNbH&Ies&cH z)<`s}dj}_ltnTMFl6h!5GSj4`X9Jn%34NGkULcv5i0d-OiE5U((gdT4E=P0^38{?h zbux1#^Ez&XWUkc7T&a`kHIq3`GVjGOz7?4_cOo-_*GXvv6JZp(Ih&+>ktA0maqB<- CUo@it diff --git a/youreffect/target/classes/com/youreffect/dao/UserDao.class b/youreffect/target/classes/com/youreffect/dao/UserDao.class index 7a9f7145d31c193de65f75de6e781e4a9110eb90..56eda85bc3f93c5fd06d552676ebb1b2d247b166 100644 GIT binary patch delta 135 zcmaFN^q9%v)W2Q(7#J9g82H#3m>3zPlJj%*EAvZ>Qq$5>lS}kd67%&#i&KkS67$&^ zSQr@uvJ%S@^>Y&Q()In5vVbZk3Ou!AV`N}tU!88|C PoEt;~b?^X5CI(&r9DW!F delta 109 zcmaFN^q5KD)W2Q(7#J9g82H#3c-R?uCptWx$SWJj$RLoFSeB@tlbDyT@1K;Fnq0!h s$iT?J1XRnwz{R diff --git a/youreffect/target/classes/com/youreffect/dao/UserDaoImpl.class b/youreffect/target/classes/com/youreffect/dao/UserDaoImpl.class index 3cf3dc9e7790e174a0326d7f4c751124c825ce94..3b3b1386e4a3fe18305530b3dc336a5dd6d58fa9 100644 GIT binary patch literal 2761 zcmbVNYgZdZ7=9)MmWFMisii_|fwpRr0&B~~mQ-v?t+s|s%f%vU-6R7nO?K1GrW}5Q zU;HWRvEZ>skDvWf9-rCW+_)(4VP|&cyqD*F-pl;`&+mT%xD7``MBr-PDH%IX)s^e( zGVd7$(=nDS(tT(;k4xpEhNwW#migK=il)6`%;&Z!rJ+Nh|7cBtvn9vgaF!%Zn4T1v z$U5$ZQ7OBYy|M0^CAsamFX_xP4PUa5GxClrjoD_kv_Rjps_j`NxnfnUTv29h+wn}# za_ox0okMNrq-j@-bu;fd?v7#B6^u;PbG9v47HGEPo@HC!v_M-TxgrpqaSAeqHgxOg zf-caVwQM<8E#;)UWYVudJnQ7m;)>~7>KtB1y-kZi2D3*~p-7~|o{IEZVk7*-q4@ug zljO=72wc*kp;I81cO?l{8DlOJ`+<}gSJBUBTIpTJdm65^By@47;>nVZs~8{~PSq2* znDz5*ImQChE$>2~6}K$m3`hR55f!59Ydz9RDj+Dilm z{Q?Tqh(<{ybR>~tI?Qre+694;X3?P5(#Zqbq0_W7F|1<*qXM0t6POlwCvi}PvLE5L zhFby`4v9|3m_n+l`t*u+3={ZR!=%92DauyI9o%J50Ui6|uLY&5uIgv)@_!_aagqE& zklsu)IU$b+xFKEpim|B%G<+&>>v$o(s!I0HQ?+&?!`gUZ6=ImdXBr*~jGx5FjB9z4 zjicicJ{M@;-jps|>d7JTB#+q>0lJ!DW_JdUbv(hB0uj}cEw*c%pU!qCW|@YvS*dVl z`4r6SSin;jylEHa%hEMDY6P6b+UXpeI_7CCsuo)kxO?1LvX8gqiUw9<-;pJwI^nsF zRea6vShpCj&CESNnLEFT(oLm0QzV-$jUA>)WshSZ-Xt3qI?Kk#&Xzn8%YknJ{WD|)$)H=LYflpvU1 z!nw*-K@A)Y)Ey0A3TZkJxQ9%SkBhsQ z+rzUt<#r^#yo;~?!tzwKFZvTT1BwFw{kXx0atv2||Kow>y8lV6;T!s;H_Y-cLg_fZ z#dpL$#!sP(`siMS=w9(0rTkC}IzpLMP=;$z=0^4d86tpd7{GNONGdQ=2Qm}_InRtJ z_Yq1)eD|tUzOQFt!ViyGZtxtGLb8cpwwzxIsu*hgnspODkYAOVj2}TR;J469F&W=z uu-qD2Hca(a147)7W&|mW^0hQ@pU<;O_h8_t4kr`BN#Rl$r9jD#$o?024a5Eb literal 2820 zcmbVOYgZdp6y1{qCWL8$@Mr-=8ebtiMhb{Ptpc^$8Xheai&g57T*A;~CY?;m;y?Js zf1)l0mtDI2?2mG}?@X9HhzNYhy}6Tf_St8jb5G{)e}4ZHz-_#YVG#3e7{Eds?%-n; zcVmcPK8jD|{;6CR<+2pRGVaCj8Sbn2Jc=)3=)?oLJXG;z6u0HqbPO6+RIEz7wJ6qO z=)ohoJeE&3RBWnvqGC(IwSsNs>`hT9<_%XUm`U4CPA?T5)5`5RMnN3f&I>(jxQ6ao zW_R_B?FfCP)@?yS|Kqadngy|CmdxF}ShOtLHC)rSN(w$|in%KctEBH48P|4>bR%%k z7t5}FXgVTG*w#CyWx972gp(s=8(FrqB-xQREwNfI>>2InS|J z*MAjVIZ$%Kl_N=BK>xHJjL=p`6zo@m_jrK+?+V`FCnP5o_qX`R-^zWMyULwIjO*Jx z>D(3WEvXYIKk-Wl?{JmIKpWoWs`&(s^qDUqwA0=Rts4(fGm5d*v zWyq5!%*Y=GrI?|wEbEzm7^zWM31F2#;n@JWNCd+CfbtqIJrmWxbBraA0K3ivEl_@r>Nk|y7b%7 diff --git a/youreffect/target/classes/com/youreffect/exception/LoginException.class b/youreffect/target/classes/com/youreffect/exception/LoginException.class index 9a0db38bd87874de9eb9c591bc603d7941eaef3e..e2835212e42c02acc1c524c107960b1e7a74e8de 100644 GIT binary patch delta 301 zcmaFI`i@oL)W2Q(7#J9g7-ZQQm>3z z=P@#{*<|Krme?^eFl%UrF*2|?=clA{F)%Z5@-VP6uuZfo;sWsmKs>&QYuvy*Q4mjf z;wO7BPYT47m~6`2Z-PU5rQB>WFoJY4I_haR$^JAeokUuy1r{ga%w?IW_})nA_FVXG!S56 zU<7FelAJ)EF_2~i(yUtB85k#@W7LuWnh2G%V_*V81_m}Q?d=RqlLeS`6!{qhz#4!y zLKS&3Fase21G|>C&UOao$+1j2S`bx0F$N(9VW1Hp3q`OQ$})K~lMX*f5y%yyKx3E~ F!~h0+A}s&_ diff --git a/youreffect/target/classes/com/youreffect/exception/RegisterException.class b/youreffect/target/classes/com/youreffect/exception/RegisterException.class index 6b3ea966e58209c5944f671f650e2426f861de49..647a8200d1adba1caa0a3f5197a078344cb4e7cf 100644 GIT binary patch delta 299 zcmey)`kj^c)W2Q(7#J9g7-ZQQm?q~j>RPfhurM+RXC;;;>gOcprR%#^B&QaXWaj5F zGO*cX=4F=HF)}b~XofK|usG+Zq;fGZGjQ@Surjbsv?}ES@dQ9TzKQGIz&ue9Pk7>2 zdoWK5#FLn8!l50ef*ND;^t(m-RF7-Rs|cqTCb delta 296 zcmey)`kmG4)W2Q(7#J9g7-YE^*cik?gan9?1QAl~4ASfjGK>stHko;uC3cJq%o>_u zj0`N!`6;Ori%Tbda+~bLXg|4|QB8!0ft`T^MDT$KK@cG_kyqD-kwG{su`E$PCowNw z-?bt+wV)(3KaW9?ffZ;02(U0Pg0uojP9V=1NHYRyR;}#}jFYc3YDoZ1gv!}5FaaS0 z1Dlrib_S-&l1w^^{0stM4L}>AiaZ&ZfslcLT}xYMI|K9NG$tJ_h$^5MgAju-&Bsm-5ci%7WJt|9`(N-u8Wl?$bt+)-R1tFRDxr=pkCx z6t<~ikaj}Ka&n0kBw=v=vR!kk=*r6P16~%LjQ-u49T@pLCDcA`2%d=>TXHj|2qPVa! zbQnXdqu4315^TKugT}skvI(plj1cxZR(9ZIlQab@(KOw_dfE9K&3wVf2o0RaL!EEZ zobP-9bp$?%^740@8Klm5r&CBc?M0aGsr>Ye*1NMrw?aYYgCMh^Aa}w+=7S*fNOyY( z2p5{mw-5@F3xecALGFfw zp&+Fo$a*NqayUpS2(k%~tsx*h>kP7T4)P9a9^}HrYVtQlYtb@>wpxq9%vWo1m|V4% sfXP>Xk}@D2@!r}l-qs#1(#{3qfAU-#U=cC2IDw;LVnsq2b>2exp1 z2BoU-+J@gH*Otc}>yz+47)>5t)YrSl%0s6vQe_-Z|!;O?LD#6}-0*Yp!Yv$2b!` z&uXt2`m*Jr9bB@J1G^M<-UziNJckDi zb|k|&xiGJOo?Xe1VG(}?4SyE}5>zTMxPq37`YP%KRUT?AKGax$sIdj8$sfCfavCiI zHAAgbz61Lby3L@Z%K*}F9VG=&vKugqn!!z&LwPy)DT8+dukP*l~a}FK5?F62^z5k4n0-4BZbDON5UNuzc2VO}a zd(RJiwI+}*6n7cA-fc<~Xh%k6_R$caj&5y&Pcab4>$N03oucXh;v7CypFD(UokGH41cj|x3k*RX(+PBCxc z6D$biR5xKPFjW{qD2D>Yt8J{BSi~&@O9Hd8Fp+fop|6hYnv5dHlN-J#BV}P3w*@YH zQdNRTIf2Xetz67*bQUt4!Dkj$aEA<;t9+y+dz~p1_saV2u7y>6K>^w_@Kh`Qlq#Cx zR~Ej;H@xWgnvNp2QP?Y2D#cv`_gG=fyyK{rUG}|7prj{5{cO#`eT|iE##NXo;eqZ# znXW=*uUw?;C2VNT9_q$aMkr-s3l#&8*z30is&^ZGxAmayb*WdY^YABE_LScZEPNk- z?mfk$_x$4LNFj8cenGBI$L6hLCeL9Vo9s?HCbJNOS)?}3n+eR3 z!aPZ=a4Obug>h4OjOm!{T~92b+~o~M=K%NzW3s?5Db@-@_HZS&1I(*Gi7 zVCH87TUw+i1WM{$ Q-xPcy48uRSx2dANQdtF~`+7%gwjwe^5W8whJ3dSCqhGdt1m0nkqop}46eOF5C7UoVn% zQwE-DL|swhve&6Qis(jey;v&gMoHyL>qTv3bET10Fxg>;si?-DbRAb>mfbwXE*I=& z=9pH3Hj9DdVXkb>f^#yz4e^FX3`aPoqD=!wX80hRh~zFh_$Oah1%k!uT?)WQuT$%>)ij$3O_~w diff --git a/youreffect/target/classes/com/youreffect/service/ResponseService.class b/youreffect/target/classes/com/youreffect/service/ResponseService.class index 0b1baeb1531e0c1c65b8de0b899cbab71d420103..6486ffbb82e94fef4608bb8644ca3f47d822fbad 100644 GIT binary patch literal 1079 zcma)4+iuf95IyT$oEWDeAqfO%xwlC`SmJ>fP+veGp#T!8BK6Tpx5iasqu8y)Ux7ra z1QH*>Mf$ecPbv}p3GkJI@$FUR1*@-`v z&IcKN3WG=v65m8#;PR1s;yM#I@SOLfBW4SjQyE3BCk5*L^XMR+`GNOLAb;S-?s64iy_^YzX8!-C-GIW}|?jI@N8MC<#>iejwi+ zPe*dL=Z+?tU^sRsLwDvYKfTPyAN@$6)BisiNV^n=$#?>dPB+6d9oocoMpQX3484hT zyeJHu*EAN|s3@~(V+*&aKpei|J(rMGU_S4~(v;hi@k=e~a_@zxW;9P|uB%B6EtYsY zUz)}Ag|mc6r%|d~13r(jeB~<@8!HdvvD!NBQ288RmBEjT&?l~e{~{x0ShSbu?K7_O zs=YJVy@#hfJUT_~s|H-5ts_rcqAhFK24M}}+)iLk9T!qbRBl|0=K0`-a*oxRwDI7T~+Mmx6cM z%22J;jG6H)ecL4YmafoBvKC_%)#KHT?=ObQ5~;2dX|E;n0Nd+`RL^xzh-{L`)<1}- MH7W&mIEI1FU;3}a>;M1& literal 1079 zcma)4TWi!n6#gcgO|~(1+qzq=+MD*0jbgwDUzENm3bHD=Qs`qgoyL^ij3jBnf2Ck8 zDEI^XQQ|pCnr62vNZ`zznRC9&$^8EF;}?L(=vioCeGVozIBc4@XF3z}ff{?C)kz|cj)>YzWpWw? z(t9t{PbyC3pvXy5D^rDZfsWIwX{ZdDq0C<7o+b+_S7v%q(5>65nXm}r&BfF#DzB1> zj*^mXTLTgw$d?gY?M%sj#ACN{9XmGWVA;3^o2uAzs8l$TUYM%bdqu&`hD~}vEqYZNeIzp9kxp6-2+}@Ju}#?l-8X1$yXO$@ zgEMIE!!tC#<_!xJm+0|+tZe>W$-U74v1(WZs0%oK75cV`LFF6UebStTKB{}95{=LxKm IObu&)0pNecxBvhE diff --git a/youreffect/target/classes/com/youreffect/service/UserService.class b/youreffect/target/classes/com/youreffect/service/UserService.class index 9c335b7ec85abe40471662db4156b275891e05e4..c8d728c495bda6a2646caf166647c6542747609a 100644 GIT binary patch literal 1406 zcma)5U2hUW6g>kJ%69os+iIouyB28e8lOyRnh=fA1T~S$Lto6W3^*<9lHH}X|EUj} zXia?Z(FcE&@y_mKODG|Rgt@bG?>T4Az4Pbq&tCwZ;Bf{Ch7H^8TNm!o6P=E*1IriQ znY4xVfr3U9XOLnjp71kn^|;fu-nC9BlVNU1IWM^Tx2}^p)MWqcGzzT?}!sG!|l3j^InsCQtkD} zRPafXkgf51OmIYziqFyyD1WD1zqY0kDE$XFzf_L1U|29QgS3IWSjylY!^(8aOx#C_ zVb&A8t@^=G`#-YrEA+{cUf2v$o{(+jzzxwvG~m8ZzSDWG5petT4IgN87A6o^j@3;z zl*&y8Yf{EkA*Ls~bfSX1 zF9H?Cqq}*7d3<)&Tp0~|CAN4e)dUq4KqGn|`^rkJQ-726u*hK5WLh({Q|qi=X&7lY zM>~sFM(a%V2h6V&B#_rhpt1tRW|V*;Zqbe!hCB4Hia!#KA}UtDVSab-3X8unle$b^ z(zj%YlMl~xgpsFTF~nPoYBU~IV;K)Zjv`hlN?T~8B16g|^Vx-4x)5V0yKC~ZO3_+)}1X*5QYs)VCz!N;SkjG{LIXtlN5LY7uGIE|6=Ph}uF1e<#%J*oB?($(4_ zL*}{P5e%iK^u*iIpe=#}PHYT|P2c7HLmo)IH-{PZSrYwbQauSjk*%_ zqW4?X<`F;PPM>={r=_&&z3G$MM~0N_XzHog40A&shLk4VFSHbQkKgd2QMEh+UW3_z z=#c;sXk!`fR+F*^lzTrCy%%|*OTfldE(+?=uzazE1bAj|9WHaaKb2>{$ zIK}9GfiQ~nD@Sn+%lJY6cvRG}=le!vuD<;PsieXUWU)D+Fc+idOe;_WM=Cb{ E12P>b%K!iX diff --git a/youreffect/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF b/youreffect/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF new file mode 100644 index 0000000..f9a3342 --- /dev/null +++ b/youreffect/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF @@ -0,0 +1,5 @@ +Manifest-Version: 1.0 +Built-By: themickeynick +Build-Jdk: 1.7.0_45 +Created-By: Maven Integration for Eclipse + diff --git a/youreffect/target/m2e-wtp/web-resources/META-INF/maven/com.springapp/YourEffect/pom.properties b/youreffect/target/m2e-wtp/web-resources/META-INF/maven/com.springapp/YourEffect/pom.properties new file mode 100644 index 0000000..21e93cb --- /dev/null +++ b/youreffect/target/m2e-wtp/web-resources/META-INF/maven/com.springapp/YourEffect/pom.properties @@ -0,0 +1,7 @@ +#Generated by Maven Integration for Eclipse +#Mon Jan 20 00:34:02 MST 2014 +version=1.0-SNAPSHOT +groupId=com.springapp +m2e.projectName=BPAProjectNickSide +m2e.projectLocation=C\:\\Users\\themickeynick\\Programming\\GitHub\\BPAProjectNickSide +artifactId=YourEffect diff --git a/youreffect/target/m2e-wtp/web-resources/META-INF/maven/com.springapp/YourEffect/pom.xml b/youreffect/target/m2e-wtp/web-resources/META-INF/maven/com.springapp/YourEffect/pom.xml new file mode 100644 index 0000000..6a9bee7 --- /dev/null +++ b/youreffect/target/m2e-wtp/web-resources/META-INF/maven/com.springapp/YourEffect/pom.xml @@ -0,0 +1,95 @@ + + 4.0.0 + com.springapp + YourEffect + war + 1.0-SNAPSHOT + YourEffect + + + 3.2.0.RELEASE + + + + + + org.springframework + spring-core + ${spring.version} + + + + org.springframework + spring-web + ${spring.version} + + + + javax.servlet + servlet-api + 2.5 + + + + javax.servlet.jsp + jsp-api + 2.1 + provided + + + + org.springframework + spring-webmvc + ${spring.version} + + + + org.springframework + spring-test + ${spring.version} + test + + + + junit + junit + 4.8.2 + test + + + + org.springframework.data + spring-data-mongodb + 1.3.3.RELEASE + + + + com.google.code.gson + gson + 2.2.4 + + + + + + ROOT##0.0.9 + + + maven-compiler-plugin + + 1.6 + 1.6 + + + + maven-surefire-plugin + + + **/*Tests.java + + + + + + \ No newline at end of file diff --git a/youreffect/target/test-classes/com/youreffect/AppTests.class b/youreffect/target/test-classes/com/youreffect/AppTests.class index edb886e850e18ef805aadba83cefa43e3f54c2bf..725e311e243beb3a3129b50bd2e45c7a17a1cc6c 100644 GIT binary patch delta 810 zcmYk3T~8B16o%i~?e3KA@>N>}iX!q|kyR8?D$;`Zfgp$|Dx%h=APAJuf|8i<2fQJ3 z;id7`3nNi$CD9*XV*Cl-sCWJa<2#K3v&oz@=bU}scV>Queusv>{Mr5tpcD5b41s;A z%%ZoRSzSrb%%oE}FR{Elk7`Q%#CTSzX=dZQ2K*%pwCnbf0^wUj`IO2}sQ z-IANnUONshI4a=@ z3=q|#>a1F#j-gYFo4EYM%1KKECL=zmPWdYE2V$T%3sgv2$K@hABIb=**I{Nr!Gif*xidftY~ zmoxbBN|^cd1+!Yh+-7tbO-8-~*HZ30M!{%BKcH-jiGd2PdKd_!lB*u&0D{=VC=g=B z*g=L_)1clB7WH6xH2MyE3#iKDz>G+1v1IrXYH)L*2yLsv1o znzc&V<-9fXplIh-I4%iX#ubjM0yCK9m=nn08pm~k8@S0aFR*}H0=Kcqpg*!pr837I zfxEcJ(48wUS+(+$$F?joAH@uA8f@fb7?(ecA^Dw!fchEy9HGOvW?S7m}`Q#2cv z&(%KpLVZR!=5W?4Tt3v+2&M_fWLOVNOP_5^#AHzq$!~g!aJ(g{dF7l@6AapF!G6jx zIWj79kaP2wBt_ zbv^nH>=iu}?4;_DL2JEKMT>ww>>|Xlo0b)KIYHgw`J>S{s4GpV4QOwnZ|a!D0B!it zzeUU6*7_f--__kix~i+Y;D!VoSv_E=AHkdOG|l5*dro@x From b0edd4d40c89408b78af6784813dadda5ae6dd1b Mon Sep 17 00:00:00 2001 From: Nick Home Computer Date: Mon, 20 Jan 2014 14:29:44 -0700 Subject: [PATCH 2/9] Working on adding the electricity savings --- .../webapp/public/CO2Checker/Secondary.html | 616 +++++++++--------- .../webapp/public/CO2Checker/houseCO2.html | 492 +++++++------- .../webapp/public/CostCalculator/index.html | 97 +-- .../public/CostCalculator/lightbulbs.html | 174 +++++ 4 files changed, 783 insertions(+), 596 deletions(-) create mode 100644 youreffect/src/main/webapp/public/CostCalculator/lightbulbs.html diff --git a/youreffect/src/main/webapp/public/CO2Checker/Secondary.html b/youreffect/src/main/webapp/public/CO2Checker/Secondary.html index 0820930..be1428a 100644 --- a/youreffect/src/main/webapp/public/CO2Checker/Secondary.html +++ b/youreffect/src/main/webapp/public/CO2Checker/Secondary.html @@ -1,333 +1,333 @@ - - Your Effect - - - - - - - - - - -
- -

Secondary Options

+ + Your Effect + + + + + + + + + + +
+ +

Secondary Options

-
-
-Food Preference: -
-
+ +
+
-Organic Produce: -
+ Organic Produce: + +
+ In season food: + +
+ Imported food and goods: + +
+ Fashion: +
-
+
- - -
-
-
-Packaging: -
+ + +
+
+
+ Packaging: + +
+ Furniture and Electricals: + +
+ Recycling: +
-
+
- - -
-
-
-Recreation: -
+ + +
+
+
+ Recreation: + +
+ Finance and other services: +
-
+
- - -
-
-
-
- - - - -
-
-
- - + }); + + \ No newline at end of file diff --git a/youreffect/src/main/webapp/public/CO2Checker/houseCO2.html b/youreffect/src/main/webapp/public/CO2Checker/houseCO2.html index b018a32..402d392 100644 --- a/youreffect/src/main/webapp/public/CO2Checker/houseCO2.html +++ b/youreffect/src/main/webapp/public/CO2Checker/houseCO2.html @@ -1,273 +1,273 @@ - - Your Effect - - - - - - + + - - - -
- -

House

+ $('.myTip').tooltip(); + }); + + + + +
+ +

House

-
-
- - -
-
+ +
+ + +
+
-
- +
+ -
- - -
-
-
+
+ + +
+
+
-
- +
+ -
- - -
+
+ + +
-
-
+
+
-
+
- + -
- - -
-
-
-
+
+ + +
+
+
+
-
- +
+ -
- - -
-
-
-
+
+ + +
+
+
+
-
- +
+ -
- - -
-
-
-
+
+ + +
+
+
+
-
- +
+ -
- - -
-
-
-
+
+ + +
+
+
+
-
- - Metric Tons -
-
-
-
- - - -
+
+ + Metric Tons +
+
+
+
+ + + + -
+
- - + + \ No newline at end of file diff --git a/youreffect/src/main/webapp/public/CostCalculator/index.html b/youreffect/src/main/webapp/public/CostCalculator/index.html index b337019..39b7844 100644 --- a/youreffect/src/main/webapp/public/CostCalculator/index.html +++ b/youreffect/src/main/webapp/public/CostCalculator/index.html @@ -1,49 +1,62 @@ - - Your Effect - - + + Your Effect + + + + + + + + - - +
+

Item Specifics

+ +
+
+ +
+ + +
+
-
-

Item Specifics

-
- + +
+ - - - $('.myTip').tooltip(); - }); - - - + \ No newline at end of file diff --git a/youreffect/src/main/webapp/public/CostCalculator/lightbulbs.html b/youreffect/src/main/webapp/public/CostCalculator/lightbulbs.html new file mode 100644 index 0000000..bcda539 --- /dev/null +++ b/youreffect/src/main/webapp/public/CostCalculator/lightbulbs.html @@ -0,0 +1,174 @@ + + + + Your Effect + + + + + + + + +
+

Cost Calculator

+ +
+ +
+
+
+ Quantity: + + +
+
+ Comparable Incandescent/Halogen Bulb +
+ +
+ + +
+
+
+ ENERGY STAR Bulb +
+ +
+ + +
+
+
+
+ Average Daily Use (Hours): + + +
+
+ + Additional Cost for ENERGY STAR Bulbs: +
+ $ + + +
+
+ + Rated Lifetime of ENERGY STAR Bulb (hours): +
+
+ + +
+
+
+
+
+ + + + Date: Mon, 20 Jan 2014 16:52:03 -0700 Subject: [PATCH 3/9] Starting the Cost Calculator --- .../webapp/public/CO2Checker/houseCO2.html | 1 - .../webapp/public/CostCalculator/index.html | 92 ++++++++++++++++--- .../public/CostCalculator/lightbulbs.html | 84 +---------------- .../webapp/public/assets/css/MainStyles.css | 72 +++++++++------ .../src/main/webapp/public/assets/js/add.js | 3 + 5 files changed, 126 insertions(+), 126 deletions(-) create mode 100644 youreffect/src/main/webapp/public/assets/js/add.js diff --git a/youreffect/src/main/webapp/public/CO2Checker/houseCO2.html b/youreffect/src/main/webapp/public/CO2Checker/houseCO2.html index 402d392..0f65850 100644 --- a/youreffect/src/main/webapp/public/CO2Checker/houseCO2.html +++ b/youreffect/src/main/webapp/public/CO2Checker/houseCO2.html @@ -71,7 +71,6 @@

House

-
+ +
+
+ + + +
diff --git a/youreffect/src/main/webapp/public/CostCalculator/lightbulbs.html b/youreffect/src/main/webapp/public/CostCalculator/lightbulbs.html index bcda539..69bbc0d 100644 --- a/youreffect/src/main/webapp/public/CostCalculator/lightbulbs.html +++ b/youreffect/src/main/webapp/public/CostCalculator/lightbulbs.html @@ -38,29 +38,14 @@

Cost Calculator


- -
+

Incandescent Bulbs

- Quantity: - +
-
- Comparable Incandescent/Halogen Bulb
-
+
-
- ENERGY STAR Bulb -
- -
- - -
-
-
-
- Average Daily Use (Hours): - - -
-
- - Additional Cost for ENERGY STAR Bulbs: -
- $ - - -
-
- - Rated Lifetime of ENERGY STAR Bulb (hours): -
-
- - -
-
-
diff --git a/youreffect/src/main/webapp/public/assets/css/MainStyles.css b/youreffect/src/main/webapp/public/assets/css/MainStyles.css index 1fb6a7c..eec26a6 100644 --- a/youreffect/src/main/webapp/public/assets/css/MainStyles.css +++ b/youreffect/src/main/webapp/public/assets/css/MainStyles.css @@ -1,67 +1,81 @@ body { - min-width: 753px; - height: 100%; - background-color: #101010; - color: #fff; + min-width: 753px; + height: 100%; + background-color: #101010; + color: #fff; } .body { - margin-left: 17%; - margin-right: 17%; + margin-left: 17%; + margin-right: 17%; } .navbar { - margin-left: 12%; - margin-right: 12%; + margin-left: 12%; + margin-right: 12%; } footer { - color: #003a75; - font-size: small; + color: #003a75; + font-size: small; } +.select-option { + color: #D43F3A; + font-style: underline; +} +.select-option > a { + color: #D43F3A; + font-style: underline; +} +.eOptions > li > a:hover { + color: #D43F3A; +} +.modal-content { + background-color: #101010; +} .navbar.center .navbar-inner { - text-align: center; + text-align: center; } .navbar.center .navbar-inner .nav { - display: inline-block; - float: none; + display: inline-block; + float: none; } .nav > li > a { - transition: all .5s ease; + transition: all .5s ease; } .nav > li > a:hover { - transition: all .35s ease; + transition: all .35s ease; } .imageContainer { - background-color: #aaa; - width: auto; - height: 250px; + background-color: #aaa; + width: auto; + height: 250px; } .big-image { - display: block; - margin: 0 auto; - width: auto; - height: inherit; + display: block; + margin: 0 auto; + width: auto; + height: inherit; } .registerForm { - float: left; - clear: right; - width: 225px; + float: left; + clear: right; + width: 225px; } .loginForm { - margin-left: 10%; - float: left; - width: 225px; + margin-left: 10%; + float: left; + width: 225px; } .nav-pills { - margin: 0 auto; + margin: 0 auto; } diff --git a/youreffect/src/main/webapp/public/assets/js/add.js b/youreffect/src/main/webapp/public/assets/js/add.js new file mode 100644 index 0000000..9dcee7b --- /dev/null +++ b/youreffect/src/main/webapp/public/assets/js/add.js @@ -0,0 +1,3 @@ +function addOption(){ + var lightbulb = '' +} From 986a94de4d9ee7e30a4ea80d557a577e96f24e93 Mon Sep 17 00:00:00 2001 From: Nick Home Computer Date: Mon, 20 Jan 2014 17:31:53 -0700 Subject: [PATCH 4/9] Got adding elements working --- .../webapp/public/CostCalculator/index.html | 13 ++++--- .../src/main/webapp/public/assets/js/add.js | 36 +++++++++++++++++-- 2 files changed, 43 insertions(+), 6 deletions(-) diff --git a/youreffect/src/main/webapp/public/CostCalculator/index.html b/youreffect/src/main/webapp/public/CostCalculator/index.html index 3d2f0ea..d81c3a7 100644 --- a/youreffect/src/main/webapp/public/CostCalculator/index.html +++ b/youreffect/src/main/webapp/public/CostCalculator/index.html @@ -35,7 +35,7 @@

Item Specifics


-
+
+
+
diff --git a/youreffect/src/main/webapp/public/assets/js/add.js b/youreffect/src/main/webapp/public/assets/js/add.js index 9dcee7b..5225dd6 100644 --- a/youreffect/src/main/webapp/public/assets/js/add.js +++ b/youreffect/src/main/webapp/public/assets/js/add.js @@ -1,3 +1,35 @@ -function addOption(){ - var lightbulb = '' +function addOptionElec() { + var radios = document.getElementsByName('eOptions'); + var selected = ""; + for (var i = 0, length = radios.length; i < length; i++) { + if (radios[i].checked) { + selected = radios[i].value; + break; + } + } + console.log(selected); + switch(selected) { + case "acCentral": + break; + case "acRoom": + break; + case "purifier": + break; + case "washer": + break; + case "dehumidifier": + break; + case "dishwasher": + break; + case "freezer": + break; + case "lightBulb": + $(".mainForm").append('

Incandescent Bulbs


'); + break; + case "fridge": + break; + case "compactFridge": + + break; + } } From b726e6c2f03317a9a2be9b20be4360eae403c153 Mon Sep 17 00:00:00 2001 From: Nick Home Computer Date: Mon, 20 Jan 2014 17:51:51 -0700 Subject: [PATCH 5/9] Added location for Electricity rate --- youreffect/src/main/webapp/public/CostCalculator/index.html | 3 +++ .../src/main/webapp/public/CostCalculator/lightbulbs.html | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/youreffect/src/main/webapp/public/CostCalculator/index.html b/youreffect/src/main/webapp/public/CostCalculator/index.html index d81c3a7..871b760 100644 --- a/youreffect/src/main/webapp/public/CostCalculator/index.html +++ b/youreffect/src/main/webapp/public/CostCalculator/index.html @@ -36,6 +36,9 @@

Item Specifics


+
+ +
-
+ +
+
+
+ <
From c0f6e9bdc79d393696331f88e46fa0fcd4cc4498 Mon Sep 17 00:00:00 2001 From: Nick Home Computer Date: Tue, 21 Jan 2014 15:44:23 -0700 Subject: [PATCH 6/9] changed lib.js did some other stuff --- .../webapp/WEB-INF/mvc-dispatcher-servlet.xml | 4 +- .../webapp/public/CostCalculator/index.html | 248 +++++++++--------- .../public/CostCalculator/lightbulbs.html | 165 ++++++------ .../webapp/public/assets/css/MainStyles.css | 3 + .../src/main/webapp/public/assets/js/lib.js | 4 +- .../com.springapp/YourEffect/pom.properties | 6 +- 6 files changed, 213 insertions(+), 217 deletions(-) diff --git a/youreffect/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml b/youreffect/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml index fc367d2..607eb6d 100644 --- a/youreffect/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml +++ b/youreffect/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml @@ -14,8 +14,8 @@ - - + + diff --git a/youreffect/src/main/webapp/public/CostCalculator/index.html b/youreffect/src/main/webapp/public/CostCalculator/index.html index 871b760..9a8c055 100644 --- a/youreffect/src/main/webapp/public/CostCalculator/index.html +++ b/youreffect/src/main/webapp/public/CostCalculator/index.html @@ -1,132 +1,144 @@ - - Your Effect - - - - - - - - - + +Your Effect + + + + + + + + + -
-

Item Specifics

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

Item Specifics

+
+ +
+ +
+
+
+
+ + +
- -
+
- + + + + diff --git a/youreffect/src/main/webapp/public/assets/js/add.js b/youreffect/src/main/webapp/public/assets/js/add.js index 0981e50..f737820 100644 --- a/youreffect/src/main/webapp/public/assets/js/add.js +++ b/youreffect/src/main/webapp/public/assets/js/add.js @@ -10,7 +10,9 @@ function addOptionElec() { console.log(selected); switch (selected) { case "acCentral": - $(".mainForm").append('

Central Air Conditioning






'); + $(".mainForm") + .append( + '

Central Air Conditioning





'); $(".removeable").hide(); break; case "acRoom": @@ -26,10 +28,14 @@ function addOptionElec() { case "freezer": break; case "lightBulb": - $(".mainForm") - .append( - '

Light Bulbs





'); - $(".removeable").hide(); + console.log($(".bulbWrap").length); + if ($(".mainForm").children(".bulbWrap").length == 0) { + $(".mainForm") + .append( + '

Light Bulbs





'); + $(".removeable").hide(); + } + break; case "fridge": break; @@ -38,7 +44,9 @@ function addOptionElec() { break; } } -function removeButt(domElement){ - $(domElement).parents(".formWrapper").fadeOut().remove(); +function removeButt(domElement) { + $(domElement).parents(".formWrapper").siblings(".break").remove(); + $(domElement).parents(".formWrapper").fadeOut(300, function() { + $(this).remove; + }); } - diff --git a/youreffect/target/m2e-wtp/web-resources/META-INF/maven/com.springapp/YourEffect/pom.properties b/youreffect/target/m2e-wtp/web-resources/META-INF/maven/com.springapp/YourEffect/pom.properties index 4806591..269ad6f 100644 --- a/youreffect/target/m2e-wtp/web-resources/META-INF/maven/com.springapp/YourEffect/pom.properties +++ b/youreffect/target/m2e-wtp/web-resources/META-INF/maven/com.springapp/YourEffect/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven Integration for Eclipse -#Tue Jan 21 22:00:08 MST 2014 +#Wed Jan 22 13:54:05 MST 2014 version=1.0-SNAPSHOT groupId=com.springapp m2e.projectName=BPA From e0a72b5e0805c2c3046b209871b2d6b1102cfe48 Mon Sep 17 00:00:00 2001 From: Nick Home Computer Date: Wed, 22 Jan 2014 17:04:55 -0700 Subject: [PATCH 9/9] Fixed a bug with removing elements --- youreffect/src/main/webapp/public/assets/js/add.js | 2 +- .../META-INF/maven/com.springapp/YourEffect/pom.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/youreffect/src/main/webapp/public/assets/js/add.js b/youreffect/src/main/webapp/public/assets/js/add.js index f737820..b43ceec 100644 --- a/youreffect/src/main/webapp/public/assets/js/add.js +++ b/youreffect/src/main/webapp/public/assets/js/add.js @@ -47,6 +47,6 @@ function addOptionElec() { function removeButt(domElement) { $(domElement).parents(".formWrapper").siblings(".break").remove(); $(domElement).parents(".formWrapper").fadeOut(300, function() { - $(this).remove; + $(domElement).parents(".formWrapper").remove(); }); } diff --git a/youreffect/target/m2e-wtp/web-resources/META-INF/maven/com.springapp/YourEffect/pom.properties b/youreffect/target/m2e-wtp/web-resources/META-INF/maven/com.springapp/YourEffect/pom.properties index 269ad6f..24b2ba5 100644 --- a/youreffect/target/m2e-wtp/web-resources/META-INF/maven/com.springapp/YourEffect/pom.properties +++ b/youreffect/target/m2e-wtp/web-resources/META-INF/maven/com.springapp/YourEffect/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven Integration for Eclipse -#Wed Jan 22 13:54:05 MST 2014 +#Wed Jan 22 17:00:51 MST 2014 version=1.0-SNAPSHOT groupId=com.springapp m2e.projectName=BPA