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..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/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..0f65850 100644 --- a/youreffect/src/main/webapp/public/CO2Checker/houseCO2.html +++ b/youreffect/src/main/webapp/public/CO2Checker/houseCO2.html @@ -1,273 +1,272 @@ - - 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..c90f850 100644 --- a/youreffect/src/main/webapp/public/CostCalculator/index.html +++ b/youreffect/src/main/webapp/public/CostCalculator/index.html @@ -1,49 +1,147 @@ - Your Effect - - - - - - -
-

Item Specifics

-
-
- -
-
-
- - - +Your Effect + + + + + + + + + +
+

Item Specifics

+
+
+
+ +
+
+
+
+ + + +
+
+ +
+ +
+ +
+ + + + +
+ + \ 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..c531bdf --- /dev/null +++ b/youreffect/src/main/webapp/public/CostCalculator/lightbulbs.html @@ -0,0 +1,135 @@ + + + +Your Effect + + + + + + + + +
+

Cost Calculator

+ +
+ +
+
+

Light Bulbs

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

Central Air Conditioning

+
+ + +
+
+ +
+
+
+ +
+
+
+
+ + +
+
+
+
+
+ +
    +
  • Thermostat?
    • +
  • Yes
    • +
  • No
    • +
+
+
+
+ + +
+
+
+ + + \ No newline at end of file diff --git a/youreffect/src/main/webapp/public/assets/css/MainStyles.css b/youreffect/src/main/webapp/public/assets/css/MainStyles.css index 1fb6a7c..ecbc107 100644 --- a/youreffect/src/main/webapp/public/assets/css/MainStyles.css +++ b/youreffect/src/main/webapp/public/assets/css/MainStyles.css @@ -1,67 +1,84 @@ 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; +} +.input-group{ + margin-right: 5px; } 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..b43ceec --- /dev/null +++ b/youreffect/src/main/webapp/public/assets/js/add.js @@ -0,0 +1,52 @@ +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": + $(".mainForm") + .append( + '

Central Air Conditioning





'); + $(".removeable").hide(); + break; + case "acRoom": + break; + case "purifier": + break; + case "washer": + break; + case "dehumidifier": + break; + case "dishwasher": + break; + case "freezer": + break; + case "lightBulb": + console.log($(".bulbWrap").length); + if ($(".mainForm").children(".bulbWrap").length == 0) { + $(".mainForm") + .append( + '

Light Bulbs





'); + $(".removeable").hide(); + } + + break; + case "fridge": + break; + case "compactFridge": + + break; + } +} +function removeButt(domElement) { + $(domElement).parents(".formWrapper").siblings(".break").remove(); + $(domElement).parents(".formWrapper").fadeOut(300, function() { + $(domElement).parents(".formWrapper").remove(); + }); +} diff --git a/youreffect/src/main/webapp/public/assets/js/lib.js b/youreffect/src/main/webapp/public/assets/js/lib.js index 6edcf7c..f21748b 100644 --- a/youreffect/src/main/webapp/public/assets/js/lib.js +++ b/youreffect/src/main/webapp/public/assets/js/lib.js @@ -1,7 +1,7 @@ function register(username, email, password, country) { var user = new User(username, email, password, country); $.ajax({ - url: '/user/register', + url: 'http://54.214.154.98:8080/user/register', type: 'POST', dataType: 'json', data: JSON.stringify(user), @@ -15,7 +15,7 @@ function register(username, email, password, country) { function login(username, password) { var user = new User(username, '', password, ''); $.ajax({ - url: '/user/login', + url: 'http://54.214.154.98:8080/user/login', type: 'POST', dataType: 'json', data: JSON.stringify(user), 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 292e184..f96ac3b 100644 Binary files a/youreffect/target/classes/com/youreffect/controller/HelloController.class and b/youreffect/target/classes/com/youreffect/controller/HelloController.class differ diff --git a/youreffect/target/classes/com/youreffect/controller/UserController.class b/youreffect/target/classes/com/youreffect/controller/UserController.class index 7ca03ef..0147195 100644 Binary files a/youreffect/target/classes/com/youreffect/controller/UserController.class and b/youreffect/target/classes/com/youreffect/controller/UserController.class differ diff --git a/youreffect/target/classes/com/youreffect/dao/UserDao.class b/youreffect/target/classes/com/youreffect/dao/UserDao.class index 7a9f714..56eda85 100644 Binary files a/youreffect/target/classes/com/youreffect/dao/UserDao.class and b/youreffect/target/classes/com/youreffect/dao/UserDao.class differ diff --git a/youreffect/target/classes/com/youreffect/dao/UserDaoImpl.class b/youreffect/target/classes/com/youreffect/dao/UserDaoImpl.class index 3cf3dc9..3b3b138 100644 Binary files a/youreffect/target/classes/com/youreffect/dao/UserDaoImpl.class and b/youreffect/target/classes/com/youreffect/dao/UserDaoImpl.class differ diff --git a/youreffect/target/classes/com/youreffect/exception/LoginException.class b/youreffect/target/classes/com/youreffect/exception/LoginException.class index 9a0db38..e283521 100644 Binary files a/youreffect/target/classes/com/youreffect/exception/LoginException.class and b/youreffect/target/classes/com/youreffect/exception/LoginException.class differ diff --git a/youreffect/target/classes/com/youreffect/exception/RegisterException.class b/youreffect/target/classes/com/youreffect/exception/RegisterException.class index 6b3ea96..647a820 100644 Binary files a/youreffect/target/classes/com/youreffect/exception/RegisterException.class and b/youreffect/target/classes/com/youreffect/exception/RegisterException.class differ diff --git a/youreffect/target/classes/com/youreffect/model/User.class b/youreffect/target/classes/com/youreffect/model/User.class index 4d12c32..fd23766 100644 Binary files a/youreffect/target/classes/com/youreffect/model/User.class and b/youreffect/target/classes/com/youreffect/model/User.class differ diff --git a/youreffect/target/classes/com/youreffect/service/HashService.class b/youreffect/target/classes/com/youreffect/service/HashService.class index 1b57efd..f0e4441 100644 Binary files a/youreffect/target/classes/com/youreffect/service/HashService.class and b/youreffect/target/classes/com/youreffect/service/HashService.class differ diff --git a/youreffect/target/classes/com/youreffect/service/ResponseService.class b/youreffect/target/classes/com/youreffect/service/ResponseService.class index 0b1baeb..6486ffb 100644 Binary files a/youreffect/target/classes/com/youreffect/service/ResponseService.class and b/youreffect/target/classes/com/youreffect/service/ResponseService.class differ diff --git a/youreffect/target/classes/com/youreffect/service/UserService.class b/youreffect/target/classes/com/youreffect/service/UserService.class index 9c335b7..c8d728c 100644 Binary files a/youreffect/target/classes/com/youreffect/service/UserService.class and b/youreffect/target/classes/com/youreffect/service/UserService.class differ 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..24b2ba5 --- /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 +#Wed Jan 22 17:00:51 MST 2014 +version=1.0-SNAPSHOT +groupId=com.springapp +m2e.projectName=BPA +m2e.projectLocation=C\:\\Users\\themickeynick\\Programming\\GitHub\\BPA +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 edb886e..725e311 100644 Binary files a/youreffect/target/test-classes/com/youreffect/AppTests.class and b/youreffect/target/test-classes/com/youreffect/AppTests.class differ